fix(executor-http): improve the fetch signature

ardatan · Jan 31, 2023 · cecf4c9 · cecf4c9
1 parent d1a0b7c
commit cecf4c9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.changeset/ninety-snakes-hear.md b/.changeset/ninety-snakes-hear.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/executor-http': patch
+---
+
+Fix fetch signature
diff --git a/packages/executors/http/src/index.ts b/packages/executors/http/src/index.ts
@@ -27,9 +27,11 @@ export type AsyncFetchFn = (
   options?: RequestInit,
   context?: any,
   info?: GraphQLResolveInfo
-) => Promise<Response>;
+) => Promise<Response> | Response;
 
-export type FetchFn = AsyncFetchFn | SyncFetchFn;
+export type RegularFetchFn = (url: string) => Promise<Response> | Response;
+
+export type FetchFn = AsyncFetchFn | SyncFetchFn | RegularFetchFn;
 
 export type AsyncImportFn = (moduleName: string) => PromiseLike<any>;
 export type SyncImportFn = (moduleName: string) => any;
@@ -74,6 +76,10 @@ export function buildHTTPExecutor(
   options?: Omit<HTTPExecutorOptions, 'fetch'> & { fetch: AsyncFetchFn }
 ): AsyncExecutor<any, HTTPExecutorOptions>;
 
+export function buildHTTPExecutor(
+  options?: Omit<HTTPExecutorOptions, 'fetch'> & { fetch: RegularFetchFn }
+): AsyncExecutor<any, HTTPExecutorOptions>;
+
 export function buildHTTPExecutor(
   options?: Omit<HTTPExecutorOptions, 'fetch'>
 ): AsyncExecutor<any, HTTPExecutorOptions>;

diff --git a/packages/executors/http/tests/buildHTTPExecutor.test.ts b/packages/executors/http/tests/buildHTTPExecutor.test.ts
@@ -7,7 +7,7 @@ describe('buildHTTPExecutor', () => {
   it('method should be POST for mutations even if useGETForQueries=true', async () => {
     const executor = buildHTTPExecutor({
       useGETForQueries: true,
-      async fetch(_url, init) {
+      fetch(_url, init) {
         return new Response(JSON.stringify({ data: init }), {
           headers: { 'Content-Type': 'application/json' },
         });