Merge pull request #19 from dotansimha/fix/react-query-graphql-reques…

…t-5.1.x
dotansimha · Nov 24, 2022 · 8e29022 · 8e29022
2 parents aa1d817 + 032f598
commit 8e29022
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -9,7 +9,7 @@
   "changelog": [
     "@changesets/changelog-github",
     {
-      "repo": "dotansimha/graphql-code-generator"
+      "repo": "dotansimha/graphql-code-generator-community"
     }
   ],
   "snapshot": {

diff --git a/.changeset/shy-timers-lay.md b/.changeset/shy-timers-lay.md
@@ -0,0 +1,5 @@
+---
+'@graphql-codegen/typescript-react-query': patch
+---
+
+Fix compatibility of graphql-request fetcher with >5.0
diff --git a/packages/plugins/typescript/react-query/src/fetcher-graphql-request.ts b/packages/plugins/typescript/react-query/src/fetcher-graphql-request.ts
@@ -14,8 +14,12 @@ export class GraphQLRequestClientFetcher implements FetcherRenderer {
 
   generateFetcherImplementaion(): string {
     return `
-function fetcher<TData, TVariables>(client: GraphQLClient, query: string, variables?: TVariables, headers?: RequestInit['headers']) {
-  return async (): Promise<TData> => client.request<TData, TVariables>(query, variables, headers);
+function fetcher<TData, TVariables extends { [key: string]: any }>(client: GraphQLClient, query: string, variables?: TVariables, requestHeaders?: RequestInit['headers']) {
+  return async (): Promise<TData> => client.request({
+    document: query,
+    variables,
+    requestHeaders
+  });
 }`;
   }
 

diff --git a/packages/plugins/typescript/react-query/tests/react-query.spec.ts b/packages/plugins/typescript/react-query/tests/react-query.spec.ts
@@ -584,9 +584,12 @@ export const useTestMutation = <
       expect(out.prepend).toContain(`import { GraphQLClient } from 'graphql-request';`);
       expect(out.prepend).toContain(`import { RequestInit } from 'graphql-request/dist/types.dom';`);
       expect(out.prepend[3])
-        .toBeSimilarStringTo(`    function fetcher<TData, TVariables>(client: GraphQLClient, query: string, variables?: TVariables, headers?: RequestInit['headers']) {
-          return async (): Promise<TData> => client.request<TData, TVariables>(query, variables, headers);
-        }`);
+        .toBeSimilarStringTo(`    function fetcher<TData, TVariables extends { [key: string]: any }>(client: GraphQLClient, query: string, variables?: TVariables, requestHeaders?: RequestInit['headers']) {
+           return async (): Promise<TData> => client.request({
+             document: query,
+             variables,
+             requestHeaders
+          `);
       expect(out.content).toBeSimilarStringTo(`export const useTestQuery = <
       TData = TTestQuery,
       TError = unknown