🐛 fix: honor importOperationTypesFrom in graphql-request generator (#…

…7115)
dotansimha · Jul 5, 2022 · 28f8346 · 28f8346 · vercel · Jul 5, 2022
1 parent d84afec
commit 28f8346
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/.changeset/fuzzy-bears-speak.md b/.changeset/fuzzy-bears-speak.md
@@ -0,0 +1,5 @@
+---
+'@graphql-codegen/typescript-graphql-request': patch
+---
+
+Honor importOperationTypesFrom config option
diff --git a/packages/plugins/typescript/graphql-request/src/visitor.ts b/packages/plugins/typescript/graphql-request/src/visitor.ts
@@ -23,6 +23,7 @@ export class GraphQLRequestVisitor extends ClientSideBaseVisitor<
   RawGraphQLRequestPluginConfig,
   GraphQLRequestPluginConfig
 > {
+  private _externalImportPrefix: string;
   private _operationsToInclude: {
     node: OperationDefinitionNode;
     documentVariableName: string;
@@ -47,6 +48,8 @@ export class GraphQLRequestVisitor extends ClientSideBaseVisitor<
     if (this.config.rawRequest && this.config.documentMode !== DocumentMode.string) {
       this._additionalImports.push(`import { print } from 'graphql'`);
     }
+
+    this._externalImportPrefix = this.config.importOperationTypesFrom ? `${this.config.importOperationTypesFrom}.` : '';
   }
 
   public OperationDefinition(node: OperationDefinitionNode) {
@@ -72,6 +75,9 @@ export class GraphQLRequestVisitor extends ClientSideBaseVisitor<
     operationResultType: string,
     operationVariablesTypes: string
   ): string {
+    operationResultType = this._externalImportPrefix + operationResultType;
+    operationVariablesTypes = this._externalImportPrefix + operationVariablesTypes;
+
     this._operationsToInclude.push({
       node,
       documentVariableName,

diff --git a/packages/plugins/typescript/graphql-request/tests/graphql-request.spec.ts b/packages/plugins/typescript/graphql-request/tests/graphql-request.spec.ts
@@ -348,5 +348,19 @@ async function test() {
         `(Operations.Feed3Document, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'feed3', 'query');`
       );
     });
+
+    it('#7114 - honor importOperationTypesFrom', async () => {
+      const config = { importOperationTypesFrom: 'Types' };
+      const docs = [{ location: '', document: basicDoc }];
+      const result = (await plugin(schema, docs, config, {
+        outputFile: 'graphql.ts',
+      })) as Types.ComplexPluginOutput;
+      const output = await validate(result, config, docs, schema, '');
+
+      expect(output).toContain(`Types.FeedQuery`);
+      expect(output).toContain(`Types.Feed2Query`);
+      expect(output).toContain(`Types.Feed3Query`);
+      expect(output).toContain(`Types.Feed4Query`);
+    });
   });
 });