@graphql-codegen/typescript-react-apollo 3.2.1-alpha-3b5c0246d.0 → 3.2.1

package/index.js

@@ -13,6 +13,10 @@ const path = require('path');
 
 const APOLLO_CLIENT_3_UNIFIED_PACKAGE = `@apollo/client`;
 const GROUPED_APOLLO_CLIENT_3_IDENTIFIER = 'Apollo';
+function hasRequiredVariables(node) {
+    var _a, _b;
+    return ((_b = (_a = node.variableDefinitions) === null || _a === void 0 ? void 0 : _a.some(variableDef => variableDef.type.kind === graphql.Kind.NON_NULL_TYPE && !variableDef.defaultValue)) !== null && _b !== void 0 ? _b : false);
+}
 class ReactApolloVisitor extends visitorPluginCommon.ClientSideBaseVisitor {
     constructor(schema, fragments, rawConfig, documents) {
         super(schema, fragments, rawConfig, {
@@ -158,8 +162,7 @@ class ReactApolloVisitor extends visitorPluginCommon.ClientSideBaseVisitor {
             suffix: this.config.componentSuffix,
             useTypesPrefix: false,
         });
-        const isVariablesRequired = operationType === 'Query' &&
-            node.variableDefinitions.some(variableDef => variableDef.type.kind === graphql.Kind.NON_NULL_TYPE);
+        const isVariablesRequired = operationType === 'Query' && hasRequiredVariables(node);
         this.imports.add(this.getReactImport());
         this.imports.add(this.getApolloReactCommonImport(true));
         this.imports.add(this.getApolloReactComponentsImport(false));
@@ -302,7 +305,8 @@ class ReactApolloVisitor extends visitorPluginCommon.ClientSideBaseVisitor {
             suffix: this._getHookSuffix(nodeName, operationType),
             useTypesPrefix: false,
         }) + this.config.hooksSuffix;
-        return `export function refetch${operationName}(variables?: ${operationVariablesTypes}) {
+        const optional = hasRequiredVariables(node) ? '' : '?';
+        return `export function refetch${operationName}(variables${optional}: ${operationVariablesTypes}) {
       return { query: ${this.getDocumentNodeVariable(node, documentVariableName)}, variables: variables }
     }`;
     }

package/index.mjs

@@ -7,6 +7,10 @@ import { extname } from 'path';
 
 const APOLLO_CLIENT_3_UNIFIED_PACKAGE = `@apollo/client`;
 const GROUPED_APOLLO_CLIENT_3_IDENTIFIER = 'Apollo';
+function hasRequiredVariables(node) {
+    var _a, _b;
+    return ((_b = (_a = node.variableDefinitions) === null || _a === void 0 ? void 0 : _a.some(variableDef => variableDef.type.kind === Kind.NON_NULL_TYPE && !variableDef.defaultValue)) !== null && _b !== void 0 ? _b : false);
+}
 class ReactApolloVisitor extends ClientSideBaseVisitor {
     constructor(schema, fragments, rawConfig, documents) {
         super(schema, fragments, rawConfig, {
@@ -152,8 +156,7 @@ class ReactApolloVisitor extends ClientSideBaseVisitor {
             suffix: this.config.componentSuffix,
             useTypesPrefix: false,
         });
-        const isVariablesRequired = operationType === 'Query' &&
-            node.variableDefinitions.some(variableDef => variableDef.type.kind === Kind.NON_NULL_TYPE);
+        const isVariablesRequired = operationType === 'Query' && hasRequiredVariables(node);
         this.imports.add(this.getReactImport());
         this.imports.add(this.getApolloReactCommonImport(true));
         this.imports.add(this.getApolloReactComponentsImport(false));
@@ -296,7 +299,8 @@ class ReactApolloVisitor extends ClientSideBaseVisitor {
             suffix: this._getHookSuffix(nodeName, operationType),
             useTypesPrefix: false,
         }) + this.config.hooksSuffix;
-        return `export function refetch${operationName}(variables?: ${operationVariablesTypes}) {
+        const optional = hasRequiredVariables(node) ? '' : '?';
+        return `export function refetch${operationName}(variables${optional}: ${operationVariablesTypes}) {
       return { query: ${this.getDocumentNodeVariable(node, documentVariableName)}, variables: variables }
     }`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-react-apollo",
-  "version": "3.2.1-alpha-3b5c0246d.0",
+  "version": "3.2.1",
   "description": "GraphQL Code Generator plugin for generating a ready-to-use React Components/HOC/Hooks 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",
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.3.0",
-    "@graphql-codegen/visitor-plugin-common": "2.5.1-alpha-3b5c0246d.0",
+    "@graphql-codegen/visitor-plugin-common": "2.5.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"