@graphql-tools/stitch 10.1.20-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb → 10.1.20

package/CHANGELOG.md

@@ -1,44 +1,12 @@
 # @graphql-tools/stitch
 
-## 10.1.20-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb
+## 10.1.20
 ### Patch Changes
 
-
-
-- [#2351](https://github.com/graphql-hive/gateway/pull/2351) [`96a4674`](https://github.com/graphql-hive/gateway/commit/96a4674a514e93d69c299c07916e06f49feed477) Thanks [@ardatan](https://github.com/ardatan)! - Fix `@provides` so the gateway only requests the provided fields the client actually selected, and stops delegating to the owner subgraph when `@provides` already covers the request.
-  
-  Previously, when a subgraph declared `@provides(fields: "...")` on a field, the gateway would still:
-  
-  1. Forward **every** field listed in `@provides` to that subgraph, even when the client never asked for them.
-  2. After receiving the response, plan additional delegations to the owner subgraph for `@provides`-covered fields whenever the providing subgraph declared them as `@external`, even though the data was already returned.
-  
-  For example with:
-  
-  ```graphql
-  # subgraph B (provider)
-  type Query {
-    entity: Entity @provides(fields: "name description")
-  }
-  
-  type Entity @key(fields: "id") {
-    id: ID!
-    name: String! @external
-    description: String! @external
-  }
-  ```
-  
-  a client query of `{ entity { id name } }` would still cause the gateway to ask subgraph B for `description` *and* fetch `name` again from subgraph A (the owner of `Entity`).
-  
-  After this fix:
-  
-  - Only the `@provides` fields the client actually selected are forwarded to the providing subgraph (request side).
-  - The delegation planner now recognises `@provides` declarations at every nested level (e.g. `@provides(fields: "categories { id name subCategories { id name } }")`) and `@provides` declarations made via inline fragments on union/interface members (e.g. `@provides(fields: "... on Book { title }")`), so the gateway no longer round-trips to the owner subgraph for fields that the providing subgraph has already returned.
-  
-  Aliases, fragments, fragment spreads, `@include`/`@skip` directives wrapping a `@provides` field, and nested `@provides` selections are preserved.
-- Updated dependencies [[`96a4674`](https://github.com/graphql-hive/gateway/commit/96a4674a514e93d69c299c07916e06f49feed477)]:
-  - @graphql-tools/delegate@12.0.17-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb
-  - @graphql-tools/batch-delegate@10.0.23-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb
-  - @graphql-tools/wrap@11.1.16-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb
+- Updated dependencies [[`3e774e0`](https://github.com/graphql-hive/gateway/commit/3e774e050bc2d3c33e0f36a258ab6a8d94bf0750)]:
+  - @graphql-tools/delegate@12.0.17
+  - @graphql-tools/batch-delegate@10.0.23
+  - @graphql-tools/wrap@11.1.16
 
 ## 10.1.19
 ### Patch Changes

package/dist/index.cjs

@@ -108,14 +108,9 @@ function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaTy
           kind: graphql.Kind.SELECTION_SET,
           selections: subFieldNodes
         };
-        const flattenedProvided = flattenSelectionsForType(
-          providedSelectionNode,
-          gatewayType,
-          schema
-        );
         const subtracted = delegate.subtractSelectionSets(
           subFieldSelection,
-          flattenedProvided
+          providedSelectionNode
         );
         if (subtracted?.selections?.length) {
           fieldNotInSchema = true;
@@ -214,38 +209,6 @@ function addMissingRequiredFields({
     }
   }
 }
-const flattenSelectionsForTypeImpl = (selectionSet, gatewayType, schema) => {
-  let changed = false;
-  const flat = [];
-  for (const selection of selectionSet.selections) {
-    if (selection.kind === graphql.Kind.INLINE_FRAGMENT) {
-      const condName = selection.typeCondition?.name.value;
-      const condType = condName ? schema.getType(condName) : gatewayType;
-      const matchesGatewayType = condType != null && (condType.name === gatewayType.name || graphql.isAbstractType(condType) && schema.isSubType(condType, gatewayType));
-      if (matchesGatewayType) {
-        changed = true;
-        const inner = flattenSelectionsForType(
-          selection.selectionSet,
-          gatewayType,
-          schema
-        );
-        for (const innerSel of inner.selections) {
-          flat.push(innerSel);
-        }
-        continue;
-      }
-    }
-    flat.push(selection);
-  }
-  if (!changed) {
-    return selectionSet;
-  }
-  return {
-    kind: graphql.Kind.SELECTION_SET,
-    selections: flat
-  };
-};
-const flattenSelectionsForType = utils.memoize3(flattenSelectionsForTypeImpl);
 
 function memoize5of7(fn) {
   const memoize5Cache = /* @__PURE__ */ new WeakMap();

package/dist/index.js

@@ -1,7 +1,7 @@
 import { 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 { collectSubFields, memoize3, memoize2, memoize1, parseSelectionSet, collectFields, isSome, getImplementingTypes, getRootTypeNames, filterSchema, mergeDeep, getDescription, createNamedStub, createStub, getRootTypeMap, getRootTypes, inspect, rewireTypes, getOperationASTFromRequest, getDefinedRootType, getArgumentValues } from '@graphql-tools/utils';
+import { collectSubFields, memoize2, memoize1, memoize3, 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';
@@ -106,14 +106,9 @@ function getFieldsNotInSubschema(schema, stitchingInfo, gatewayType, subschemaTy
           kind: Kind.SELECTION_SET,
           selections: subFieldNodes
         };
-        const flattenedProvided = flattenSelectionsForType(
-          providedSelectionNode,
-          gatewayType,
-          schema
-        );
         const subtracted = subtractSelectionSets(
           subFieldSelection,
-          flattenedProvided
+          providedSelectionNode
         );
         if (subtracted?.selections?.length) {
           fieldNotInSchema = true;
@@ -212,38 +207,6 @@ function addMissingRequiredFields({
     }
   }
 }
-const flattenSelectionsForTypeImpl = (selectionSet, gatewayType, schema) => {
-  let changed = false;
-  const flat = [];
-  for (const selection of selectionSet.selections) {
-    if (selection.kind === Kind.INLINE_FRAGMENT) {
-      const condName = selection.typeCondition?.name.value;
-      const condType = condName ? schema.getType(condName) : gatewayType;
-      const matchesGatewayType = condType != null && (condType.name === gatewayType.name || isAbstractType(condType) && schema.isSubType(condType, gatewayType));
-      if (matchesGatewayType) {
-        changed = true;
-        const inner = flattenSelectionsForType(
-          selection.selectionSet,
-          gatewayType,
-          schema
-        );
-        for (const innerSel of inner.selections) {
-          flat.push(innerSel);
-        }
-        continue;
-      }
-    }
-    flat.push(selection);
-  }
-  if (!changed) {
-    return selectionSet;
-  }
-  return {
-    kind: Kind.SELECTION_SET,
-    selections: flat
-  };
-};
-const flattenSelectionsForType = memoize3(flattenSelectionsForTypeImpl);
 
 function memoize5of7(fn) {
   const memoize5Cache = /* @__PURE__ */ new WeakMap();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/stitch",
-  "version": "10.1.20-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb",
+  "version": "10.1.20",
   "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.23-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb",
-    "@graphql-tools/delegate": "12.0.17-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb",
+    "@graphql-tools/batch-delegate": "^10.0.23",
+    "@graphql-tools/delegate": "^12.0.17",
     "@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.16-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb",
+    "@graphql-tools/wrap": "^11.1.16",
     "@whatwg-node/promise-helpers": "^1.3.2",
     "tslib": "^2.8.1"
   },