@graphql-codegen/typescript-apollo-angular 3.4.4 → 3.4.7

package/index.js

@@ -203,6 +203,7 @@ class ApolloAngularVisitor extends visitorPluginCommon.ClientSideBaseVisitor {
             operationVariablesTypes,
             serviceName,
         });
+        const namedClient = this._namedClient(node);
         operationResultType = this._externalImportPrefix + operationResultType;
         operationVariablesTypes = this._externalImportPrefix + operationVariablesTypes;
         const content = `
@@ -211,7 +212,7 @@ class ApolloAngularVisitor extends visitorPluginCommon.ClientSideBaseVisitor {
   })
   export class ${serviceName} extends Apollo.${operationType}<${operationResultType}, ${operationVariablesTypes}> {
     ${this.config.addExplicitOverride ? 'override ' : ''}document = ${this._getDocumentNodeVariable(node, documentVariableName)};
-    ${this._namedClient(node)}
+    ${namedClient !== '' ? (this.config.addExplicitOverride ? 'override ' : '') + namedClient : ''}
     constructor(${this.dependencyInjections}) {
       super(${this.dependencyInjectionArgs});
     }
@@ -229,6 +230,9 @@ class ApolloAngularVisitor extends visitorPluginCommon.ClientSideBaseVisitor {
                     return 'fetch';
             }
         };
+        const hasMutations = this._operationsToInclude.find(o => o.operationType === 'Mutation');
+        const hasSubscriptions = this._operationsToInclude.find(o => o.operationType === 'Subscription');
+        const hasQueries = this._operationsToInclude.find(o => o.operationType === 'Query');
         const allPossibleActions = this._operationsToInclude
             .map(o => {
             const operationResultType = this._externalImportPrefix + o.operationResultType;
@@ -266,20 +270,29 @@ ${changeCaseAll.camelCase(o.node.name.value)}Watch(variables${optionalVariables
             : this.config.serviceProvidedInRoot === false
                 ? ''
                 : `{ providedIn: 'root' }`;
+        // Generate these types only if they're going to be used,
+        // to avoid "unused variable" compile errors in generated code
+        const omitType = hasQueries || hasMutations || hasSubscriptions
+            ? `type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;`
+            : '';
+        const watchType = hasQueries
+            ? `interface WatchQueryOptionsAlone<V> extends Omit<ApolloCore.WatchQueryOptions<V>, 'query' | 'variables'> {}`
+            : '';
+        const queryType = hasQueries
+            ? `interface QueryOptionsAlone<V> extends Omit<ApolloCore.QueryOptions<V>, 'query' | 'variables'> {}`
+            : '';
+        const mutationType = hasMutations
+            ? `interface MutationOptionsAlone<T, V> extends Omit<ApolloCore.MutationOptions<T, V>, 'mutation' | 'variables'> {}`
+            : '';
+        const subscriptionType = hasSubscriptions
+            ? `interface SubscriptionOptionsAlone<V> extends Omit<ApolloCore.SubscriptionOptions<V>, 'query' | 'variables'> {}`
+            : '';
+        const types = [omitType, watchType, queryType, mutationType, subscriptionType]
+            .filter(s => s)
+            .map(s => visitorPluginCommon.indent(s, 1))
+            .join('\n\n');
         return `
-  type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
-
-  interface WatchQueryOptionsAlone<V>
-    extends Omit<ApolloCore.WatchQueryOptions<V>, 'query' | 'variables'> {}
-
-  interface QueryOptionsAlone<V>
-    extends Omit<ApolloCore.QueryOptions<V>, 'query' | 'variables'> {}
-
-  interface MutationOptionsAlone<T, V>
-    extends Omit<ApolloCore.MutationOptions<T, V>, 'mutation' | 'variables'> {}
-
-  interface SubscriptionOptionsAlone<V>
-    extends Omit<ApolloCore.SubscriptionOptions<V>, 'query' | 'variables'> {}
+${types}
 
   @Injectable(${providedIn})
   export class ${serviceName} {

package/index.mjs

@@ -1,6 +1,6 @@
 import { oldVisit } from '@graphql-codegen/plugin-helpers';
 import { print, visit, Kind, concatAST, parse } from 'graphql';
-import { ClientSideBaseVisitor, getConfigValue, DocumentMode, indentMultiline } from '@graphql-codegen/visitor-plugin-common';
+import { ClientSideBaseVisitor, getConfigValue, DocumentMode, indentMultiline, indent } from '@graphql-codegen/visitor-plugin-common';
 import autoBind from 'auto-bind';
 import { camelCase } from 'change-case-all';
 import { extname } from 'path';
@@ -197,6 +197,7 @@ class ApolloAngularVisitor extends ClientSideBaseVisitor {
             operationVariablesTypes,
             serviceName,
         });
+        const namedClient = this._namedClient(node);
         operationResultType = this._externalImportPrefix + operationResultType;
         operationVariablesTypes = this._externalImportPrefix + operationVariablesTypes;
         const content = `
@@ -205,7 +206,7 @@ class ApolloAngularVisitor extends ClientSideBaseVisitor {
   })
   export class ${serviceName} extends Apollo.${operationType}<${operationResultType}, ${operationVariablesTypes}> {
     ${this.config.addExplicitOverride ? 'override ' : ''}document = ${this._getDocumentNodeVariable(node, documentVariableName)};
-    ${this._namedClient(node)}
+    ${namedClient !== '' ? (this.config.addExplicitOverride ? 'override ' : '') + namedClient : ''}
     constructor(${this.dependencyInjections}) {
       super(${this.dependencyInjectionArgs});
     }
@@ -223,6 +224,9 @@ class ApolloAngularVisitor extends ClientSideBaseVisitor {
                     return 'fetch';
             }
         };
+        const hasMutations = this._operationsToInclude.find(o => o.operationType === 'Mutation');
+        const hasSubscriptions = this._operationsToInclude.find(o => o.operationType === 'Subscription');
+        const hasQueries = this._operationsToInclude.find(o => o.operationType === 'Query');
         const allPossibleActions = this._operationsToInclude
             .map(o => {
             const operationResultType = this._externalImportPrefix + o.operationResultType;
@@ -260,20 +264,29 @@ ${camelCase(o.node.name.value)}Watch(variables${optionalVariables ? '?' : ''}: $
             : this.config.serviceProvidedInRoot === false
                 ? ''
                 : `{ providedIn: 'root' }`;
+        // Generate these types only if they're going to be used,
+        // to avoid "unused variable" compile errors in generated code
+        const omitType = hasQueries || hasMutations || hasSubscriptions
+            ? `type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;`
+            : '';
+        const watchType = hasQueries
+            ? `interface WatchQueryOptionsAlone<V> extends Omit<ApolloCore.WatchQueryOptions<V>, 'query' | 'variables'> {}`
+            : '';
+        const queryType = hasQueries
+            ? `interface QueryOptionsAlone<V> extends Omit<ApolloCore.QueryOptions<V>, 'query' | 'variables'> {}`
+            : '';
+        const mutationType = hasMutations
+            ? `interface MutationOptionsAlone<T, V> extends Omit<ApolloCore.MutationOptions<T, V>, 'mutation' | 'variables'> {}`
+            : '';
+        const subscriptionType = hasSubscriptions
+            ? `interface SubscriptionOptionsAlone<V> extends Omit<ApolloCore.SubscriptionOptions<V>, 'query' | 'variables'> {}`
+            : '';
+        const types = [omitType, watchType, queryType, mutationType, subscriptionType]
+            .filter(s => s)
+            .map(s => indent(s, 1))
+            .join('\n\n');
         return `
-  type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
-
-  interface WatchQueryOptionsAlone<V>
-    extends Omit<ApolloCore.WatchQueryOptions<V>, 'query' | 'variables'> {}
-
-  interface QueryOptionsAlone<V>
-    extends Omit<ApolloCore.QueryOptions<V>, 'query' | 'variables'> {}
-
-  interface MutationOptionsAlone<T, V>
-    extends Omit<ApolloCore.MutationOptions<T, V>, 'mutation' | 'variables'> {}
-
-  interface SubscriptionOptionsAlone<V>
-    extends Omit<ApolloCore.SubscriptionOptions<V>, 'query' | 'variables'> {}
+${types}
 
   @Injectable(${providedIn})
   export class ${serviceName} {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-codegen/typescript-apollo-angular",
-  "version": "3.4.4",
+  "version": "3.4.7",
   "description": "GraphQL Code Generator plugin for generating ready-to-use Angular Components based on GraphQL operations",
   "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 || ^16.0.0"
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.4.0",
-    "@graphql-codegen/visitor-plugin-common": "2.7.3",
+    "@graphql-codegen/visitor-plugin-common": "2.7.4",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"