@graphql-tools/delegate 12.0.19 → 12.0.20-alpha-c35121316ffa963b01e5550763795df2a3c493df

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @graphql-tools/delegate
 
+## 12.0.20-alpha-c35121316ffa963b01e5550763795df2a3c493df
+### Patch Changes
+
+
+
+- [#2474](https://github.com/graphql-hive/gateway/pull/2474) [`c351213`](https://github.com/graphql-hive/gateway/commit/c35121316ffa963b01e5550763795df2a3c493df) Thanks [@enisdenjo](https://github.com/enisdenjo)! - Fix delegated argument variable type compatibility
+  
+  Avoid reusing variables whose types are incompatible with target schema argument types, and create correctly typed variables instead.
+
 ## 12.0.19
 ### Patch Changes
 

package/dist/index.cjs

@@ -2354,10 +2354,18 @@ function createRequest({
       const existingArgNode = fieldNode?.arguments?.find(
         (argNode) => argNode.name.value === argName
       );
-      if (existingArgNode?.value.kind === graphql.Kind.VARIABLE) {
+      if (existingArgNode?.value.kind === graphql.Kind.VARIABLE && argInstance) {
         const varName = existingArgNode.value.name.value;
         const varValue = newVariables[varName];
-        if (varValue === argValue) {
+        const variableDefinition = variableDefinitions.find(
+          (definition) => definition.variable.name.value === varName
+        );
+        const variableType = variableDefinition && targetSchema ? graphql.typeFromAST(info?.schema ?? targetSchema, variableDefinition.type) : void 0;
+        if (varValue === argValue && variableType && graphql.isTypeSubTypeOf(
+          info?.schema ?? targetSchema,
+          variableType,
+          argInstance.type
+        )) {
           argNodes.push(existingArgNode);
           continue;
         }
@@ -2378,6 +2386,16 @@ function createRequest({
             varName = `_${i++}_${rootFieldName}_${argName}`;
           }
         }
+        if (existingArgNode?.value.kind === graphql.Kind.VARIABLE) {
+          const existingVarName = existingArgNode.value.name.value;
+          const existingVarIndex = variableDefinitions.findIndex(
+            (definition) => definition.variable.name.value === existingVarName
+          );
+          if (existingVarIndex !== -1) {
+            variableDefinitions.splice(existingVarIndex, 1);
+            delete newVariables[existingVarName];
+          }
+        }
         variableDefinitions.push({
           kind: graphql.Kind.VARIABLE_DEFINITION,
           variable: {

package/dist/index.js

@@ -1,6 +1,6 @@
 import { memoize2, memoize1, collectFields, relocatedError, mergeDeep, promiseReduce, pathToArray, getResponseKeyFromInfo, memoize3, getDefinedRootType, createGraphQLError, implementsAbstractType, getRootTypeNames, astFromArg, astFromValueUntyped, asArray, isAsyncIterable, getOperationASTFromRequest } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
-import { GraphQLError, locatedError, isAbstractType, getNullableType, isLeafType, isCompositeType, isListType, responsePathAsArray, Kind, TypeInfo, versionInfo, visit, visitWithTypeInfo, isNullableType, isUnionType, getNamedType, isObjectType, isInterfaceType, isNonNullType, isInputObjectType, defaultFieldResolver, isSchema, validate } from 'graphql';
+import { GraphQLError, locatedError, isAbstractType, getNullableType, isLeafType, isCompositeType, isListType, responsePathAsArray, Kind, TypeInfo, versionInfo, visit, visitWithTypeInfo, isNullableType, isUnionType, getNamedType, isObjectType, isInterfaceType, typeFromAST, isTypeSubTypeOf, isNonNullType, isInputObjectType, defaultFieldResolver, isSchema, validate } from 'graphql';
 import { handleMaybePromise, isPromise, createDeferredPromise, mapAsyncIterator } from '@whatwg-node/promise-helpers';
 import { CRITICAL_ERROR, executorFromSchema } from '@graphql-tools/executor';
 export { executorFromSchema as createDefaultExecutor } from '@graphql-tools/executor';
@@ -2354,10 +2354,18 @@ function createRequest({
       const existingArgNode = fieldNode?.arguments?.find(
         (argNode) => argNode.name.value === argName
       );
-      if (existingArgNode?.value.kind === Kind.VARIABLE) {
+      if (existingArgNode?.value.kind === Kind.VARIABLE && argInstance) {
         const varName = existingArgNode.value.name.value;
         const varValue = newVariables[varName];
-        if (varValue === argValue) {
+        const variableDefinition = variableDefinitions.find(
+          (definition) => definition.variable.name.value === varName
+        );
+        const variableType = variableDefinition && targetSchema ? typeFromAST(info?.schema ?? targetSchema, variableDefinition.type) : void 0;
+        if (varValue === argValue && variableType && isTypeSubTypeOf(
+          info?.schema ?? targetSchema,
+          variableType,
+          argInstance.type
+        )) {
           argNodes.push(existingArgNode);
           continue;
         }
@@ -2378,6 +2386,16 @@ function createRequest({
             varName = `_${i++}_${rootFieldName}_${argName}`;
           }
         }
+        if (existingArgNode?.value.kind === Kind.VARIABLE) {
+          const existingVarName = existingArgNode.value.name.value;
+          const existingVarIndex = variableDefinitions.findIndex(
+            (definition) => definition.variable.name.value === existingVarName
+          );
+          if (existingVarIndex !== -1) {
+            variableDefinitions.splice(existingVarIndex, 1);
+            delete newVariables[existingVarName];
+          }
+        }
         variableDefinitions.push({
           kind: Kind.VARIABLE_DEFINITION,
           variable: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "12.0.19",
+  "version": "12.0.20-alpha-c35121316ffa963b01e5550763795df2a3c493df",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {