@graphql-codegen/typescript-urql 3.1.3 → 3.2.1-alpha-16421e2d7.0

package/index.js

@@ -17,6 +17,18 @@ class UrqlVisitor extends visitorPluginCommon.ClientSideBaseVisitor {
             withHooks: visitorPluginCommon.getConfigValue(rawConfig.withHooks, true),
             urqlImportFrom: visitorPluginCommon.getConfigValue(rawConfig.urqlImportFrom, null),
         });
+        this._externalImportPrefix = '';
+        if (this.config.importOperationTypesFrom) {
+            this._externalImportPrefix = `${this.config.importOperationTypesFrom}.`;
+            if (this.config.documentMode !== visitorPluginCommon.DocumentMode.external || !this.config.importDocumentNodeExternallyFrom) {
+                // eslint-disable-next-line no-console
+                console.warn('"importOperationTypesFrom" should be used with "documentMode=external" and "importDocumentNodeExternallyFrom"');
+            }
+            if (this.config.importOperationTypesFrom !== 'Operations') {
+                // eslint-disable-next-line no-console
+                console.warn('importOperationTypesFrom only works correctly when left empty or set to "Operations"');
+            }
+        }
         autoBind(this);
     }
     getImports() {
@@ -77,11 +89,15 @@ export function use${operationName}(options: Omit<Urql.Use${operationType}Args<$
 };`;
     }
     buildOperation(node, documentVariableName, operationType, operationResultType, operationVariablesTypes) {
+        const documentVariablePrefixed = this._externalImportPrefix + documentVariableName;
+        const operationTypePrefixed = this._externalImportPrefix + operationType;
+        const operationResultTypePrefixed = this._externalImportPrefix + operationResultType;
+        const operationVariablesTypesPrefixed = this._externalImportPrefix + operationVariablesTypes;
         const component = this.config.withComponent
-            ? this._buildComponent(node, documentVariableName, operationType, operationResultType, operationVariablesTypes)
+            ? this._buildComponent(node, documentVariablePrefixed, operationTypePrefixed, operationResultTypePrefixed, operationVariablesTypesPrefixed)
             : null;
         const hooks = this.config.withHooks
-            ? this._buildHooks(node, operationType, documentVariableName, operationResultType, operationVariablesTypes)
+            ? this._buildHooks(node, operationTypePrefixed, documentVariablePrefixed, operationResultTypePrefixed, operationVariablesTypesPrefixed)
             : null;
         return [component, hooks].filter(a => a).join('\n');
     }

package/index.mjs

@@ -1,5 +1,5 @@
 import { Kind, concatAST, visit } from 'graphql';
-import { ClientSideBaseVisitor, getConfigValue, OMIT_TYPE } from '@graphql-codegen/visitor-plugin-common';
+import { ClientSideBaseVisitor, getConfigValue, DocumentMode, OMIT_TYPE } from '@graphql-codegen/visitor-plugin-common';
 import autoBind from 'auto-bind';
 import { pascalCase } from 'change-case-all';
 import { extname } from 'path';
@@ -11,6 +11,18 @@ class UrqlVisitor extends ClientSideBaseVisitor {
             withHooks: getConfigValue(rawConfig.withHooks, true),
             urqlImportFrom: getConfigValue(rawConfig.urqlImportFrom, null),
         });
+        this._externalImportPrefix = '';
+        if (this.config.importOperationTypesFrom) {
+            this._externalImportPrefix = `${this.config.importOperationTypesFrom}.`;
+            if (this.config.documentMode !== DocumentMode.external || !this.config.importDocumentNodeExternallyFrom) {
+                // eslint-disable-next-line no-console
+                console.warn('"importOperationTypesFrom" should be used with "documentMode=external" and "importDocumentNodeExternallyFrom"');
+            }
+            if (this.config.importOperationTypesFrom !== 'Operations') {
+                // eslint-disable-next-line no-console
+                console.warn('importOperationTypesFrom only works correctly when left empty or set to "Operations"');
+            }
+        }
         autoBind(this);
     }
     getImports() {
@@ -71,11 +83,15 @@ export function use${operationName}(options: Omit<Urql.Use${operationType}Args<$
 };`;
     }
     buildOperation(node, documentVariableName, operationType, operationResultType, operationVariablesTypes) {
+        const documentVariablePrefixed = this._externalImportPrefix + documentVariableName;
+        const operationTypePrefixed = this._externalImportPrefix + operationType;
+        const operationResultTypePrefixed = this._externalImportPrefix + operationResultType;
+        const operationVariablesTypesPrefixed = this._externalImportPrefix + operationVariablesTypes;
         const component = this.config.withComponent
-            ? this._buildComponent(node, documentVariableName, operationType, operationResultType, operationVariablesTypes)
+            ? this._buildComponent(node, documentVariablePrefixed, operationTypePrefixed, operationResultTypePrefixed, operationVariablesTypesPrefixed)
             : null;
         const hooks = this.config.withHooks
-            ? this._buildHooks(node, operationType, documentVariableName, operationResultType, operationVariablesTypes)
+            ? this._buildHooks(node, operationTypePrefixed, documentVariablePrefixed, operationResultTypePrefixed, operationVariablesTypesPrefixed)
             : null;
         return [component, hooks].filter(a => a).join('\n');
     }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-codegen/typescript-urql",
-  "version": "3.1.3",
+  "version": "3.2.1-alpha-16421e2d7.0",
   "description": "GraphQL Code Generator plugin for generating an introspection file for Urql's Schema Awareness",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0",
     "graphql-tag": "^2.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^2.1.1",
-    "@graphql-codegen/visitor-plugin-common": "2.2.0",
+    "@graphql-codegen/plugin-helpers": "2.2.0-alpha-16421e2d7.0",
+    "@graphql-codegen/visitor-plugin-common": "2.2.2-alpha-16421e2d7.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"

package/visitor.d.ts

@@ -7,6 +7,7 @@ export interface UrqlPluginConfig extends ClientSideBasePluginConfig {
     urqlImportFrom: string;
 }
 export declare class UrqlVisitor extends ClientSideBaseVisitor<UrqlRawPluginConfig, UrqlPluginConfig> {
+    private _externalImportPrefix;
     constructor(schema: GraphQLSchema, fragments: LoadedFragment[], rawConfig: UrqlRawPluginConfig);
     getImports(): string[];
     private _buildComponent;