@graphql-tools/stitch 10.1.4-alpha-6ac197bf92d989542ec403d525b5611cc3291cbf → 10.1.4-alpha-818c8406fd595e3e7774079d54f09027720344b3

package/CHANGELOG.md

@@ -1,16 +1,12 @@
 # @graphql-tools/stitch
 
-## 10.1.4-alpha-6ac197bf92d989542ec403d525b5611cc3291cbf
+## 10.1.4-alpha-818c8406fd595e3e7774079d54f09027720344b3
 ### Patch Changes
 
-
-
-- [#1727](https://github.com/graphql-hive/gateway/pull/1727) [`b1295c5`](https://github.com/graphql-hive/gateway/commit/b1295c5d6bdccb8187816c72d40a55a5fca35bdd) Thanks [@ardatan](https://github.com/ardatan)! - Avoid extra `__typename` in the root selection
-
-- Updated dependencies [[`b1295c5`](https://github.com/graphql-hive/gateway/commit/b1295c5d6bdccb8187816c72d40a55a5fca35bdd)]:
-  - @graphql-tools/delegate@11.1.4-alpha-6ac197bf92d989542ec403d525b5611cc3291cbf
-  - @graphql-tools/batch-delegate@10.0.6-alpha-6ac197bf92d989542ec403d525b5611cc3291cbf
-  - @graphql-tools/wrap@11.0.6-alpha-6ac197bf92d989542ec403d525b5611cc3291cbf
+- Updated dependencies [[`5f4795d`](https://github.com/graphql-hive/gateway/commit/5f4795dbd945f8147d12cdaa40267f848c885dfb), [`5f4795d`](https://github.com/graphql-hive/gateway/commit/5f4795dbd945f8147d12cdaa40267f848c885dfb)]:
+  - @graphql-tools/wrap@11.1.0-alpha-818c8406fd595e3e7774079d54f09027720344b3
+  - @graphql-tools/delegate@12.0.0-alpha-818c8406fd595e3e7774079d54f09027720344b3
+  - @graphql-tools/batch-delegate@10.0.6-alpha-818c8406fd595e3e7774079d54f09027720344b3
 
 ## 10.1.3
 ### Patch Changes

package/dist/index.cjs

@@ -992,18 +992,9 @@ function completeStitchingInfo(stitchingInfo, resolvers, schema) {
   const rootTypes = [schema.getQueryType(), schema.getMutationType()];
   for (const rootType of rootTypes) {
     if (rootType) {
-      const rootTypeFields = rootType.getFields();
-      for (const fieldName in rootTypeFields) {
-        const field = rootTypeFields[fieldName];
-        if (field != null) {
-          const fieldType = graphql.getNamedType(field.type);
-          if (rootType.name === fieldType.name) {
-            fieldNodesByType[rootType.name] ||= [
-              utils.parseSelectionSet("{ __typename }", { noLocation: true }).selections[0]
-            ];
-          }
-        }
-      }
+      fieldNodesByType[rootType.name] = [
+        utils.parseSelectionSet("{ __typename }", { noLocation: true }).selections[0]
+      ];
     }
   }
   const selectionSetsByField = /* @__PURE__ */ Object.create(null);
@@ -3226,7 +3217,15 @@ function createStitchingExecutor(stitchedSchema) {
     );
     const data = {};
     for (const [fieldName, fieldNodes] of fields) {
-      const responseKey = fieldNodes[0]?.alias?.value ?? fieldName;
+      const fieldNode = fieldNodes[0];
+      if (!fieldNode) {
+        continue;
+      }
+      const fieldInstance = rootType.getFields()[fieldName];
+      if (!fieldInstance) {
+        continue;
+      }
+      const responseKey = fieldNode.alias?.value ?? fieldName;
       const subschemaForField = subschemas.find((subschema) => {
         const subschemaSchema = delegate.isSubschemaConfig(subschema) ? subschema.schema : subschema;
         const rootType2 = utils.getDefinedRootType(
@@ -3235,9 +3234,15 @@ function createStitchingExecutor(stitchedSchema) {
         );
         return rootType2.getFields()[fieldName] != null;
       });
+      const args = utils.getArgumentValues(
+        fieldInstance,
+        fieldNode,
+        executorRequest.variables
+      );
       let result = await delegate.delegateToSchema({
         schema: subschemaForField || stitchedSchema,
         rootValue: executorRequest.rootValue,
+        args,
         context: executorRequest.context,
         info: {
           schema: stitchedSchema,
@@ -3246,8 +3251,10 @@ function createStitchingExecutor(stitchedSchema) {
           operation,
           fragments,
           parentType: rootType,
-          returnType: rootType.getFields()[fieldName]?.type,
-          variableValues: executorRequest.variables
+          returnType: fieldInstance.type,
+          variableValues: executorRequest.variables,
+          rootValue: executorRequest.rootValue,
+          path: { typename: void 0, key: responseKey, prev: void 0 }
         }
       });
       if (Array.isArray(result)) {

package/dist/index.js

@@ -1,7 +1,7 @@
 import { handleOverrideByDelegation as handleOverrideByDelegation$1, 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 { memoize3, collectSubFields, memoize2, memoize1, parseSelectionSet, collectFields, isSome, getImplementingTypes, getRootTypeNames, filterSchema, mergeDeep, getDescription, createNamedStub, createStub, getRootTypeMap, getRootTypes, inspect, rewireTypes, getOperationASTFromRequest, getDefinedRootType } from '@graphql-tools/utils';
+import { memoize3, collectSubFields, memoize2, memoize1, parseSelectionSet, collectFields, isSome, getImplementingTypes, getRootTypeNames, filterSchema, mergeDeep, getDescription, createNamedStub, createStub, getRootTypeMap, getRootTypes, inspect, rewireTypes, getOperationASTFromRequest, getDefinedRootType, getArgumentValues } from '@graphql-tools/utils';
 import { isAbstractType, Kind, TypeNameMetaFieldDef, getNamedType, GraphQLList, isLeafType, isInputObjectType, isUnionType, print, isObjectType, isInterfaceType, visit, isScalarType, isCompositeType, isNonNullType, isEnumType, isListType, getNullableType, isNullableType, GraphQLObjectType, GraphQLInputObjectType, GraphQLInterfaceType, GraphQLUnionType, GraphQLEnumType, GraphQLScalarType, GraphQLDirective, valueFromASTUntyped, getDirectiveValues, GraphQLDeprecatedDirective, DirectiveLocation, isNamedType, isIntrospectionType, isDirective, isSpecifiedScalarType, specifiedDirectives, GraphQLSchema, extendSchema } from 'graphql';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { batchDelegateToSchema } from '@graphql-tools/batch-delegate';
@@ -990,18 +990,9 @@ function completeStitchingInfo(stitchingInfo, resolvers, schema) {
   const rootTypes = [schema.getQueryType(), schema.getMutationType()];
   for (const rootType of rootTypes) {
     if (rootType) {
-      const rootTypeFields = rootType.getFields();
-      for (const fieldName in rootTypeFields) {
-        const field = rootTypeFields[fieldName];
-        if (field != null) {
-          const fieldType = getNamedType(field.type);
-          if (rootType.name === fieldType.name) {
-            fieldNodesByType[rootType.name] ||= [
-              parseSelectionSet("{ __typename }", { noLocation: true }).selections[0]
-            ];
-          }
-        }
-      }
+      fieldNodesByType[rootType.name] = [
+        parseSelectionSet("{ __typename }", { noLocation: true }).selections[0]
+      ];
     }
   }
   const selectionSetsByField = /* @__PURE__ */ Object.create(null);
@@ -3224,7 +3215,15 @@ function createStitchingExecutor(stitchedSchema) {
     );
     const data = {};
     for (const [fieldName, fieldNodes] of fields) {
-      const responseKey = fieldNodes[0]?.alias?.value ?? fieldName;
+      const fieldNode = fieldNodes[0];
+      if (!fieldNode) {
+        continue;
+      }
+      const fieldInstance = rootType.getFields()[fieldName];
+      if (!fieldInstance) {
+        continue;
+      }
+      const responseKey = fieldNode.alias?.value ?? fieldName;
       const subschemaForField = subschemas.find((subschema) => {
         const subschemaSchema = isSubschemaConfig(subschema) ? subschema.schema : subschema;
         const rootType2 = getDefinedRootType(
@@ -3233,9 +3232,15 @@ function createStitchingExecutor(stitchedSchema) {
         );
         return rootType2.getFields()[fieldName] != null;
       });
+      const args = getArgumentValues(
+        fieldInstance,
+        fieldNode,
+        executorRequest.variables
+      );
       let result = await delegateToSchema({
         schema: subschemaForField || stitchedSchema,
         rootValue: executorRequest.rootValue,
+        args,
         context: executorRequest.context,
         info: {
           schema: stitchedSchema,
@@ -3244,8 +3249,10 @@ function createStitchingExecutor(stitchedSchema) {
           operation,
           fragments,
           parentType: rootType,
-          returnType: rootType.getFields()[fieldName]?.type,
-          variableValues: executorRequest.variables
+          returnType: fieldInstance.type,
+          variableValues: executorRequest.variables,
+          rootValue: executorRequest.rootValue,
+          path: { typename: void 0, key: responseKey, prev: void 0 }
         }
       });
       if (Array.isArray(result)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/stitch",
-  "version": "10.1.4-alpha-6ac197bf92d989542ec403d525b5611cc3291cbf",
+  "version": "10.1.4-alpha-818c8406fd595e3e7774079d54f09027720344b3",
   "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.6-alpha-6ac197bf92d989542ec403d525b5611cc3291cbf",
-    "@graphql-tools/delegate": "11.1.4-alpha-6ac197bf92d989542ec403d525b5611cc3291cbf",
+    "@graphql-tools/batch-delegate": "10.0.6-alpha-818c8406fd595e3e7774079d54f09027720344b3",
+    "@graphql-tools/delegate": "12.0.0-alpha-818c8406fd595e3e7774079d54f09027720344b3",
     "@graphql-tools/executor": "^1.4.13",
     "@graphql-tools/merge": "^9.1.5",
     "@graphql-tools/schema": "^10.0.29",
     "@graphql-tools/utils": "^10.10.3",
-    "@graphql-tools/wrap": "11.0.6-alpha-6ac197bf92d989542ec403d525b5611cc3291cbf",
+    "@graphql-tools/wrap": "11.1.0-alpha-818c8406fd595e3e7774079d54f09027720344b3",
     "@whatwg-node/promise-helpers": "^1.3.2",
     "tslib": "^2.8.1"
   },