Improve fetch typing (#185)

cloudflare · Dec 1, 2022 · ef7dbe2 · ef7dbe2
1 parent a99d365
commit ef7dbe2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/workerd/api/global-scope.h b/src/workerd/api/global-scope.h
@@ -536,7 +536,7 @@ class ServiceWorkerGlobalScope: public WorkerGlobalScope {
 
       structuredClone<T>(value: T, options?: StructuredSerializeOptions): T;
 
-      fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+      fetch(input: RequestInfo, init?: RequestInit<RequestInitCfProperties>): Promise<Response>;
     });
   }
 

diff --git a/src/workerd/api/http.h b/src/workerd/api/http.h
@@ -446,7 +446,7 @@ class Fetcher: public jsg::Object {
     JSG_METHOD_NAMED(delete, delete_);
 
     JSG_TS_OVERRIDE({
-      fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+      fetch(input: RequestInfo, init?: RequestInit<RequestInitCfProperties>): Promise<Response>;
       get: never;
       put: never;
       delete: never;
@@ -529,10 +529,10 @@ struct RequestInitializerDict {
 
   JSG_STRUCT(method, headers, body, redirect, fetcher, cf, mode, credentials, cache,
               referrer, referrerPolicy, integrity, signal, observe);
-  JSG_STRUCT_TS_OVERRIDE(RequestInit {
+  JSG_STRUCT_TS_OVERRIDE(RequestInit<CfType = IncomingRequestCfProperties | RequestInitCfProperties> {
     headers?: HeadersInit;
     body?: BodyInit | null;
-    cf?: IncomingRequestCfProperties | RequestInitCfProperties;
+    cf?: CfType;
   });
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -536,7 +536,7 @@ class ServiceWorkerGlobalScope: public WorkerGlobalScope { @@
           structuredClone<T>(value: T, options?: StructuredSerializeOptions): T;
-          fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+          fetch(input: RequestInfo, init?: RequestInit<RequestInitCfProperties>): Promise<Response>;
         });
       }
@@ Expand Down @@