@graphql-tools/stitch 10.2.5 → 10.2.6-alpha-8f117bcbea98536ce3233d8bc38febf5e9a2ebe5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @graphql-tools/stitch
 
+## 10.2.6-alpha-8f117bcbea98536ce3233d8bc38febf5e9a2ebe5
+### Patch Changes
+
+
+
+- [#2604](https://github.com/graphql-hive/gateway/pull/2604) [`19e4040`](https://github.com/graphql-hive/gateway/commit/19e404065a9d88215d1530749b43ce5e39262a56) Thanks [@enisdenjo](https://github.com/enisdenjo)! - dependencies updates:
+  
+  - Updated dependency [`@graphql-tools/executor@^2.0.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor/v/2.0.1) (from `^1.4.13`, in `dependencies`)
+  - Updated dependency [`@graphql-tools/merge@^9.2.4` ↗︎](https://www.npmjs.com/package/@graphql-tools/merge/v/9.2.4) (from `^9.1.5`, in `dependencies`)
+  - Updated dependency [`@graphql-tools/schema@^10.1.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/schema/v/10.1.1) (from `^10.0.29`, in `dependencies`)
+  - Updated dependency [`@graphql-tools/utils@^12.0.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/utils/v/12.0.1) (from `^11.0.0`, in `dependencies`)
+- Updated dependencies [[`19e4040`](https://github.com/graphql-hive/gateway/commit/19e404065a9d88215d1530749b43ce5e39262a56), [`19e4040`](https://github.com/graphql-hive/gateway/commit/19e404065a9d88215d1530749b43ce5e39262a56), [`19e4040`](https://github.com/graphql-hive/gateway/commit/19e404065a9d88215d1530749b43ce5e39262a56)]:
+  - @graphql-tools/batch-delegate@10.0.33-alpha-8f117bcbea98536ce3233d8bc38febf5e9a2ebe5
+  - @graphql-tools/delegate@12.1.5-alpha-8f117bcbea98536ce3233d8bc38febf5e9a2ebe5
+  - @graphql-tools/wrap@11.1.25-alpha-8f117bcbea98536ce3233d8bc38febf5e9a2ebe5
+
 ## 10.2.5
 ### Patch Changes
 

package/dist/index.cjs

@@ -189,10 +189,11 @@ function resolveOne(value, context, info, stitchingInfo, providedFields) {
 
 function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaType, fieldNodes, fragments, variableValues, subschema, providedSelectionNode, context, info) {
   const sourceSchema = subschema.transformedSchema;
+  const normalizedVariableValues = delegate.getVariableValues(variableValues);
   let { fields: subFieldNodesByResponseKey } = utils.collectSubFields(
     schema,
     fragments,
-    variableValues,
+    normalizedVariableValues,
     gatewayType,
     fieldNodes
   );
@@ -210,7 +211,7 @@ function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaTy
       const { fields: subFieldNodesOfPossibleType } = utils.collectSubFields(
         schema,
         fragments,
-        variableValues,
+        normalizedVariableValues,
         possibleType,
         fieldNodes
       );
@@ -1315,7 +1316,7 @@ function completeStitchingInfo(stitchingInfo, resolvers, schema) {
       }
     }
   }
-  const variableValues = /* @__PURE__ */ Object.create(null);
+  const variableValues = delegate.getVariableValues(void 0);
   const fragments = /* @__PURE__ */ Object.create(null);
   const fieldNodeMap = /* @__PURE__ */ Object.create(null);
   for (const typeName in selectionSetsByField) {
@@ -1397,6 +1398,7 @@ function isolateComputedFieldsTransformer(subschemaConfig) {
   }
   const baseSchemaTypes = /* @__PURE__ */ Object.create(null);
   const isolatedSchemaTypes = /* @__PURE__ */ Object.create(null);
+  const variableValues = delegate.getVariableValues(void 0);
   for (const typeName in subschemaConfig.merge) {
     const mergedTypeConfig = subschemaConfig.merge[typeName];
     const objectType = subschemaConfig.schema.getType(
@@ -1434,7 +1436,7 @@ function isolateComputedFieldsTransformer(subschemaConfig) {
             const keyFields = utils.collectFields(
               subschemaConfig.schema,
               {},
-              {},
+              variableValues,
               objectType,
               parsedSelectionSet
             );
@@ -1449,7 +1451,7 @@ function isolateComputedFieldsTransformer(subschemaConfig) {
               const keyFields = utils.collectFields(
                 subschemaConfig.schema,
                 {},
-                {},
+                variableValues,
                 objectType,
                 parsedSelectionSet
               );
@@ -1506,7 +1508,7 @@ function isolateComputedFieldsTransformer(subschemaConfig) {
                 const keyFields = utils.collectFields(
                   subschemaConfig.schema,
                   {},
-                  {},
+                  variableValues,
                   type,
                   parsedSelectionSet
                 );
@@ -1520,7 +1522,7 @@ function isolateComputedFieldsTransformer(subschemaConfig) {
                     const keyFields2 = utils.collectFields(
                       subschemaConfig.schema,
                       {},
-                      {},
+                      variableValues,
                       type,
                       parsedSelectionSet2
                     );
@@ -3607,7 +3609,7 @@ function createStitchingExecutor(stitchedSchema) {
     const { fields } = utils.collectFields(
       stitchedSchema,
       fragments,
-      executorRequest.variables,
+      delegate.getVariableValues(executorRequest.variables),
       rootType,
       operation.selectionSet
     );
@@ -3635,23 +3637,29 @@ function createStitchingExecutor(stitchedSchema) {
         fieldNode,
         executorRequest.variables
       );
+      const info = {
+        schema: stitchedSchema,
+        fieldName,
+        fieldNodes,
+        operation,
+        fragments,
+        parentType: rootType,
+        returnType: fieldInstance.type,
+        variableValues: executorRequest.variables,
+        rootValue: executorRequest.rootValue,
+        path: { typename: void 0, key: responseKey, prev: void 0 },
+        getAbortSignal: () => executorRequest.signal,
+        getAsyncHelpers: () => ({
+          promiseAll: Promise.all.bind(Promise),
+          track: () => void 0
+        })
+      };
       let result = await delegate.delegateToSchema({
         schema: subschemaForField || stitchedSchema,
         rootValue: executorRequest.rootValue,
         args,
         context: executorRequest.context,
-        info: {
-          schema: stitchedSchema,
-          fieldName,
-          fieldNodes,
-          operation,
-          fragments,
-          parentType: rootType,
-          returnType: fieldInstance.type,
-          variableValues: executorRequest.variables,
-          rootValue: executorRequest.rootValue,
-          path: { typename: void 0, key: responseKey, prev: void 0 }
-        }
+        info
       });
       if (Array.isArray(result)) {
         result = await Promise.all(result);

package/dist/index.js

@@ -1,4 +1,4 @@
-import { isExternalObject, handleOverrideByDelegation, subtractSelectionSets, extractUnavailableFields, leftOverByDelegationPlan, extractUnavailableFieldsFromSelectionSet, delegateToSchema, cloneSubschemaConfig, isSubschemaConfig, defaultMergedResolver, Subschema } from '@graphql-tools/delegate';
+import { isExternalObject, getVariableValues, handleOverrideByDelegation, subtractSelectionSets, extractUnavailableFields, leftOverByDelegationPlan, extractUnavailableFieldsFromSelectionSet, delegateToSchema, cloneSubschemaConfig, isSubschemaConfig, defaultMergedResolver, Subschema } from '@graphql-tools/delegate';
 import { mergeType, mergeInputType, mergeInterface, mergeUnion, mergeEnum, mergeScalar, mergeTypeDefs, mergeResolvers, mergeExtensions, applyExtensions } from '@graphql-tools/merge';
 import { extendResolversFromInterfaces, addResolversToSchema, assertResolversPresent, makeExecutableSchema } from '@graphql-tools/schema';
 import { mergeDeep, collectSubFields, memoize3, memoize2, memoize1, parseSelectionSet, collectFields, isSome, getImplementingTypes, getRootTypeNames, filterSchema, getDescription, createNamedStub, createStub, getRootTypeMap, getRootTypes, inspect, rewireTypes, getOperationASTFromRequest, getDefinedRootType, getArgumentValues } from '@graphql-tools/utils';
@@ -187,10 +187,11 @@ function resolveOne(value, context, info, stitchingInfo, providedFields) {
 
 function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaType, fieldNodes, fragments, variableValues, subschema, providedSelectionNode, context, info) {
   const sourceSchema = subschema.transformedSchema;
+  const normalizedVariableValues = getVariableValues(variableValues);
   let { fields: subFieldNodesByResponseKey } = collectSubFields(
     schema,
     fragments,
-    variableValues,
+    normalizedVariableValues,
     gatewayType,
     fieldNodes
   );
@@ -208,7 +209,7 @@ function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaTy
       const { fields: subFieldNodesOfPossibleType } = collectSubFields(
         schema,
         fragments,
-        variableValues,
+        normalizedVariableValues,
         possibleType,
         fieldNodes
       );
@@ -1313,7 +1314,7 @@ function completeStitchingInfo(stitchingInfo, resolvers, schema) {
       }
     }
   }
-  const variableValues = /* @__PURE__ */ Object.create(null);
+  const variableValues = getVariableValues(void 0);
   const fragments = /* @__PURE__ */ Object.create(null);
   const fieldNodeMap = /* @__PURE__ */ Object.create(null);
   for (const typeName in selectionSetsByField) {
@@ -1395,6 +1396,7 @@ function isolateComputedFieldsTransformer(subschemaConfig) {
   }
   const baseSchemaTypes = /* @__PURE__ */ Object.create(null);
   const isolatedSchemaTypes = /* @__PURE__ */ Object.create(null);
+  const variableValues = getVariableValues(void 0);
   for (const typeName in subschemaConfig.merge) {
     const mergedTypeConfig = subschemaConfig.merge[typeName];
     const objectType = subschemaConfig.schema.getType(
@@ -1432,7 +1434,7 @@ function isolateComputedFieldsTransformer(subschemaConfig) {
             const keyFields = collectFields(
               subschemaConfig.schema,
               {},
-              {},
+              variableValues,
               objectType,
               parsedSelectionSet
             );
@@ -1447,7 +1449,7 @@ function isolateComputedFieldsTransformer(subschemaConfig) {
               const keyFields = collectFields(
                 subschemaConfig.schema,
                 {},
-                {},
+                variableValues,
                 objectType,
                 parsedSelectionSet
               );
@@ -1504,7 +1506,7 @@ function isolateComputedFieldsTransformer(subschemaConfig) {
                 const keyFields = collectFields(
                   subschemaConfig.schema,
                   {},
-                  {},
+                  variableValues,
                   type,
                   parsedSelectionSet
                 );
@@ -1518,7 +1520,7 @@ function isolateComputedFieldsTransformer(subschemaConfig) {
                     const keyFields2 = collectFields(
                       subschemaConfig.schema,
                       {},
-                      {},
+                      variableValues,
                       type,
                       parsedSelectionSet2
                     );
@@ -3605,7 +3607,7 @@ function createStitchingExecutor(stitchedSchema) {
     const { fields } = collectFields(
       stitchedSchema,
       fragments,
-      executorRequest.variables,
+      getVariableValues(executorRequest.variables),
       rootType,
       operation.selectionSet
     );
@@ -3633,23 +3635,29 @@ function createStitchingExecutor(stitchedSchema) {
         fieldNode,
         executorRequest.variables
       );
+      const info = {
+        schema: stitchedSchema,
+        fieldName,
+        fieldNodes,
+        operation,
+        fragments,
+        parentType: rootType,
+        returnType: fieldInstance.type,
+        variableValues: executorRequest.variables,
+        rootValue: executorRequest.rootValue,
+        path: { typename: void 0, key: responseKey, prev: void 0 },
+        getAbortSignal: () => executorRequest.signal,
+        getAsyncHelpers: () => ({
+          promiseAll: Promise.all.bind(Promise),
+          track: () => void 0
+        })
+      };
       let result = await delegateToSchema({
         schema: subschemaForField || stitchedSchema,
         rootValue: executorRequest.rootValue,
         args,
         context: executorRequest.context,
-        info: {
-          schema: stitchedSchema,
-          fieldName,
-          fieldNodes,
-          operation,
-          fragments,
-          parentType: rootType,
-          returnType: fieldInstance.type,
-          variableValues: executorRequest.variables,
-          rootValue: executorRequest.rootValue,
-          path: { typename: void 0, key: responseKey, prev: void 0 }
-        }
+        info
       });
       if (Array.isArray(result)) {
         result = await Promise.all(result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/stitch",
-  "version": "10.2.5",
+  "version": "10.2.6-alpha-8f117bcbea98536ce3233d8bc38febf5e9a2ebe5",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -38,13 +38,13 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/batch-delegate": "^10.0.32",
-    "@graphql-tools/delegate": "^12.1.4",
-    "@graphql-tools/executor": "^1.4.13",
-    "@graphql-tools/merge": "^9.1.5",
-    "@graphql-tools/schema": "^10.0.29",
-    "@graphql-tools/utils": "^11.0.0",
-    "@graphql-tools/wrap": "^11.1.24",
+    "@graphql-tools/batch-delegate": "10.0.33-alpha-8f117bcbea98536ce3233d8bc38febf5e9a2ebe5",
+    "@graphql-tools/delegate": "12.1.5-alpha-8f117bcbea98536ce3233d8bc38febf5e9a2ebe5",
+    "@graphql-tools/executor": "^2.0.1",
+    "@graphql-tools/merge": "^9.2.4",
+    "@graphql-tools/schema": "^10.1.1",
+    "@graphql-tools/utils": "^12.0.1",
+    "@graphql-tools/wrap": "11.1.25-alpha-8f117bcbea98536ce3233d8bc38febf5e9a2ebe5",
     "@whatwg-node/promise-helpers": "^1.3.2",
     "tslib": "^2.8.1"
   },