custom fetch per call

Author: HugeLetters

packages/openapi-fetch/src/index.test.ts

@@ -396,18 +396,26 @@ describe("client", () => {
     });
 
     it("accepts a custom fetch function", async () => {
-      const data = { works: true };
-      const customFetch = {
-        clone: () => ({ ...customFetch }),
-        headers: new Headers(),
-        json: async () => data,
-        status: 200,
-        ok: true,
-      };
-      const client = createClient<paths>({
-        fetch: async () => Promise.resolve(customFetch as Response),
-      });
-      expect((await client.GET("/self")).data).toBe(data);
+      function createCustomFetch(data: any) {
+        const response = {
+          clone: () => ({ ...response }),
+          headers: new Headers(),
+          json: async () => data,
+          status: 200,
+          ok: true,
+        } as Response;
+        return async () => Promise.resolve(response);
+      }
+
+      const baseData = { works: true };
+      const customBaseFetch = createCustomFetch(baseData);
+      const client = createClient<paths>({ fetch: customBaseFetch });
+      expect((await client.GET("/self")).data).toBe(baseData);
+
+      const data = { result: "it's working" };
+      const customFetch = createCustomFetch(data);
+      const customResponse = await client.GET("/self", { fetch: customFetch });
+      expect(customResponse.data).toBe(data);
     });
   });
 

packages/openapi-fetch/src/index.ts

@@ -70,7 +70,8 @@ export type RequestBodyOption<T> = OperationRequestBodyContent<T> extends never
   ? { body?: OperationRequestBodyContent<T> }
   : { body: OperationRequestBodyContent<T> };
 
-export type FetchOptions<T> = RequestOptions<T> & Omit<RequestInit, "body">;
+export type FetchOptions<T> = RequestOptions<T> &
+  Omit<RequestInit, "body"> & { fetch?: ClientOptions["fetch"] };
 
 export type FetchResponse<T> =
   | {
@@ -95,7 +96,7 @@ export default function createClient<Paths extends {}>(
   clientOptions: ClientOptions = {},
 ) {
   const {
-    fetch = globalThis.fetch,
+    fetch: baseFetch = globalThis.fetch,
     querySerializer: globalQuerySerializer,
     bodySerializer: globalBodySerializer,
     ...options
@@ -110,6 +111,7 @@ export default function createClient<Paths extends {}>(
     fetchOptions: FetchOptions<M extends keyof Paths[P] ? Paths[P][M] : never>,
   ): Promise<FetchResponse<M extends keyof Paths[P] ? Paths[P][M] : unknown>> {
     const {
+      fetch = baseFetch,
       headers,
       body: requestBody,
       params = {},