@graphql-tools/batch-execute 9.0.7 → 9.0.8-alpha-cb1d4231a392ebe0c30e7bf8fa1dafca0e48be48

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 # @graphql-tools/batch-execute
 
+## 9.0.8-alpha-cb1d4231a392ebe0c30e7bf8fa1dafca0e48be48
+
+### Patch Changes
+
+- [#243](https://github.com/graphql-hive/gateway/pull/243) [`cb1d423`](https://github.com/graphql-hive/gateway/commit/cb1d4231a392ebe0c30e7bf8fa1dafca0e48be48) Thanks [@ardatan](https://github.com/ardatan)! - Fix the issue that batched query generation when optional variables are not prefixed and sent correctly.
+
+  See the use case below;
+
+  When two batched queries are sent like below;
+
+  ```graphql
+  query TestOne($someOptionalVar: String) {
+    foo(someOptionalArg: $someOptionalVar) {
+      id
+      name
+    }
+  }
+  ```
+
+  ```graphql
+  query TestTwo($someOptionalVar: String) {
+    foo(someOptionalArg: $someOptionalVar) {
+      id
+      name
+    }
+  }
+  ```
+
+  And then `someOptionalVar` is not prefixed if the value is not sent by the user. The batched queries will be sent as below, then it will cause issues.
+
+  ```graphql
+  query TestOneTwo($someOptionalVar: String, $someOptionalVar: String) {
+    _0_foo: foo(someOptionalArg: $someOptionalVar) {
+      id
+      name
+    }
+    _1_foo: foo(someOptionalArg: $someOptionalVar) {
+      id
+      name
+    }
+  }
+  ```
+
 ## 9.0.7
 
 ### Patch Changes

package/dist/index.cjs

@@ -111,11 +111,17 @@ function prefixRequest(prefix, request) {
   }
   let prefixedDocument = aliasTopLevelFields(prefix, request.document);
   const executionVariableNames = Object.keys(executionVariables);
-  const hasFragmentDefinitions = request.document.definitions.some(
-    (def) => isFragmentDefinition(def)
-  );
+  let hasFragmentDefinitions = false;
+  let hasVariables = false;
+  for (const def of prefixedDocument.definitions) {
+    if (isFragmentDefinition(def)) {
+      hasFragmentDefinitions = true;
+    } else if (isOperationDefinition(def)) {
+      hasVariables = !!def.variableDefinitions?.length;
+    }
+  }
   const fragmentSpreadImpl = {};
-  if (executionVariableNames.length > 0 || hasFragmentDefinitions) {
+  if (hasVariables || hasFragmentDefinitions) {
     prefixedDocument = graphql.visit(prefixedDocument, {
       [graphql.Kind.VARIABLE]: prefixNode,
       [graphql.Kind.FRAGMENT_DEFINITION]: prefixNode,

package/dist/index.js

@@ -105,11 +105,17 @@ function prefixRequest(prefix, request) {
   }
   let prefixedDocument = aliasTopLevelFields(prefix, request.document);
   const executionVariableNames = Object.keys(executionVariables);
-  const hasFragmentDefinitions = request.document.definitions.some(
-    (def) => isFragmentDefinition(def)
-  );
+  let hasFragmentDefinitions = false;
+  let hasVariables = false;
+  for (const def of prefixedDocument.definitions) {
+    if (isFragmentDefinition(def)) {
+      hasFragmentDefinitions = true;
+    } else if (isOperationDefinition(def)) {
+      hasVariables = !!def.variableDefinitions?.length;
+    }
+  }
   const fragmentSpreadImpl = {};
-  if (executionVariableNames.length > 0 || hasFragmentDefinitions) {
+  if (hasVariables || hasFragmentDefinitions) {
     prefixedDocument = visit(prefixedDocument, {
       [Kind.VARIABLE]: prefixNode,
       [Kind.FRAGMENT_DEFINITION]: prefixNode,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@graphql-tools/batch-execute",
-  "version": "9.0.7",
+  "version": "9.0.8-alpha-cb1d4231a392ebe0c30e7bf8fa1dafca0e48be48",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
-    "url": "graphql-hive/gateway",
+    "url": "git+https://github.com/graphql-hive/gateway.git",
     "directory": "packages/batch-execute"
   },
   "license": "MIT",