@graphql-tools/delegate 12.0.18 → 12.0.19-rc-fb25f307dd73dbdd994a65a01120efa6c42a2a52

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @graphql-tools/delegate
 
+## 12.0.19-rc-fb25f307dd73dbdd994a65a01120efa6c42a2a52
+### Patch Changes
+
+
+
+- [#2351](https://github.com/graphql-hive/gateway/pull/2351) [`0bbdbbc`](https://github.com/graphql-hive/gateway/commit/0bbdbbc22b75d9705a77f96144af002c796a695d) 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: "nested { nestedNested { name description } }")`) 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.
+  - Fragment spreads in the client query are correctly handled when selecting nested `@provides`-covered fields. Previously, using a fragment spread (e.g. `...MyFrag`) for nested `@external` fields could cause an unnecessary delegation to the owner because selection subtraction compared only the spread name with the explicit `@provides` fields. The planner now resolves fragment spreads before subtracting provided selections, while preserving the fragment type condition and directives when only part of a fragment remains.
+  
+  Aliases, direct field selections, fragments, fragment spreads, `@include`/`@skip` directives wrapping a `@provides` field, and nested `@provides` selections are preserved without unnecessary owner delegations.
+
 ## 12.0.18
 ### Patch Changes
 

package/dist/index.cjs

@@ -590,7 +590,7 @@ const handleOverrideByDelegation = utils.memoize3(
   }
 );
 
-function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlappingAliases, delegationContext) {
+function finalizeGatewayDocument(targetSchema, originalDocument, fragments, operations, onOverlappingAliases, delegationContext) {
   let usedVariables = [];
   let usedFragments = [];
   const newOperations = [];
@@ -682,47 +682,128 @@ function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlapp
       }
     );
   }
+  const includedFragmentNames = new Set(newFragments.map((f) => f.name.value));
+  const hasDroppedFragments = includedFragmentNames.size < usedFragments.length;
   let newDocument = {
     kind: graphql.Kind.DOCUMENT,
     definitions: [...newOperations, ...newFragments]
   };
   const stitchingInfo = delegationContext.info?.schema?.extensions?.["stitchingInfo"];
-  if (stitchingInfo != null) {
+  if (stitchingInfo != null && subschemaHasProvidedSelections(
+    stitchingInfo,
+    delegationContext.subschema
+  )) {
+    const {
+      selectionSetsByPath: originalFieldSelectionSetsByPath,
+      fragments: originalFragmentsByName
+    } = collectFieldSelectionSetsByPath(originalDocument);
     const typeInfo = getTypeInfo(targetSchema);
+    const pathStack = [];
+    const inlineFragmentCounterStack = [];
     newDocument = graphql.visit(
       newDocument,
       graphql.visitWithTypeInfo(typeInfo, {
-        [graphql.Kind.FIELD](fieldNode) {
-          const parentType = typeInfo.getParentType();
-          if (parentType) {
-            const parentTypeName = parentType.name;
-            const typeConfig = stitchingInfo?.mergedTypes?.[parentTypeName];
-            if (typeConfig) {
+        [graphql.Kind.SELECTION_SET]: {
+          enter() {
+            inlineFragmentCounterStack.push(/* @__PURE__ */ new Map());
+          },
+          leave() {
+            inlineFragmentCounterStack.pop();
+          }
+        },
+        [graphql.Kind.OPERATION_DEFINITION]: {
+          enter(node) {
+            pathStack.push(`op:${node.operation}:${node.name?.value ?? ""}`);
+          },
+          leave() {
+            pathStack.pop();
+          }
+        },
+        [graphql.Kind.FRAGMENT_DEFINITION]: {
+          enter(node) {
+            pathStack.push(`frag:${node.name.value}`);
+          },
+          leave() {
+            pathStack.pop();
+          }
+        },
+        [graphql.Kind.INLINE_FRAGMENT]: {
+          enter(node) {
+            pathStack.push(
+              nextInlineFragmentPathSegment(
+                node,
+                inlineFragmentCounterStack[inlineFragmentCounterStack.length - 1]
+              )
+            );
+          },
+          leave() {
+            pathStack.pop();
+          }
+        },
+        [graphql.Kind.FIELD]: {
+          enter(fieldNode) {
+            pathStack.push(fieldNode.alias?.value ?? fieldNode.name.value);
+          },
+          leave(fieldNode) {
+            try {
+              const parentType = typeInfo.getParentType();
+              if (!parentType) {
+                return void 0;
+              }
+              const typeConfig = stitchingInfo?.mergedTypes?.[parentType.name];
               const providedSelectionsByField = typeConfig?.providedSelectionsByField?.get(
                 delegationContext.subschema
               );
-              if (providedSelectionsByField) {
-                const providedSelection = providedSelectionsByField[fieldNode.name.value];
-                if (providedSelection) {
-                  return {
-                    ...fieldNode,
-                    selectionSet: {
-                      kind: graphql.Kind.SELECTION_SET,
-                      selections: [
-                        ...providedSelection.selections,
-                        ...fieldNode.selectionSet?.selections ?? []
-                      ]
-                    }
-                  };
-                }
+              const providedSelection = providedSelectionsByField?.[fieldNode.name.value];
+              if (!providedSelection) {
+                return void 0;
               }
+              const originalSelectionSet = lookupOriginalSelectionSet(
+                pathStack,
+                fieldNode,
+                originalFieldSelectionSetsByPath
+              );
+              const requestedProvidedSelections = intersectProvidedSelections(
+                providedSelection.selections,
+                originalSelectionSet,
+                originalFragmentsByName
+              );
+              if (!requestedProvidedSelections.length) {
+                return void 0;
+              }
+              return {
+                ...fieldNode,
+                selectionSet: {
+                  kind: graphql.Kind.SELECTION_SET,
+                  selections: [
+                    ...requestedProvidedSelections,
+                    ...fieldNode.selectionSet?.selections ?? []
+                  ]
+                }
+              };
+            } finally {
+              pathStack.pop();
             }
           }
-          return fieldNode;
         }
       })
     );
   }
+  if (hasDroppedFragments) {
+    const ops = newDocument.definitions.filter(
+      (d) => d.kind === graphql.Kind.OPERATION_DEFINITION
+    );
+    const frags = newDocument.definitions.filter(
+      (d) => d.kind === graphql.Kind.FRAGMENT_DEFINITION
+    );
+    newDocument = {
+      kind: graphql.Kind.DOCUMENT,
+      definitions: [
+        ...removeDeadFragmentSpreads(ops, includedFragmentNames),
+        ...frags
+      ]
+    };
+  }
   return {
     usedVariables,
     newDocument
@@ -733,6 +814,7 @@ function finalizeGatewayRequest(originalRequest, delegationContext, onOverlappin
   const { targetSchema } = delegationContext;
   const { usedVariables, newDocument } = finalizeGatewayDocument(
     targetSchema,
+    originalRequest.document,
     fragments,
     operations,
     onOverlappingAliases,
@@ -758,9 +840,293 @@ function finalizeGatewayRequest(originalRequest, delegationContext, onOverlappin
     variables: newVariables
   };
 }
+function removeDeadFragmentSpreads(operations, included) {
+  function cleanSelections(selections) {
+    const out = [];
+    for (const sel of selections) {
+      if (sel.kind === graphql.Kind.FRAGMENT_SPREAD) {
+        if (included.has(sel.name.value)) {
+          out.push(sel);
+        }
+      } else if ((sel.kind === graphql.Kind.FIELD || sel.kind === graphql.Kind.INLINE_FRAGMENT) && sel.selectionSet) {
+        const cleaned = cleanSelections(sel.selectionSet.selections);
+        if (cleaned.length === 0 && sel.kind === graphql.Kind.INLINE_FRAGMENT) {
+          continue;
+        }
+        if (cleaned.length === 0 && sel.kind === graphql.Kind.FIELD) {
+          continue;
+        }
+        out.push(
+          cleaned === sel.selectionSet.selections ? sel : {
+            ...sel,
+            selectionSet: {
+              kind: graphql.Kind.SELECTION_SET,
+              selections: cleaned
+            }
+          }
+        );
+      } else {
+        out.push(sel);
+      }
+    }
+    return out;
+  }
+  return operations.map((op) => ({
+    ...op,
+    selectionSet: {
+      ...op.selectionSet,
+      selections: cleanSelections(op.selectionSet.selections)
+    }
+  }));
+}
 function isTypeNameField(selection) {
   return selection.kind === graphql.Kind.FIELD && !selection.alias && selection.name.value === "__typename";
 }
+function collectFieldSelectionSetsByPathImpl(document) {
+  const selectionSetsByPath = /* @__PURE__ */ new Map();
+  const fragments = /* @__PURE__ */ new Map();
+  for (const def of document.definitions) {
+    if (def.kind === graphql.Kind.FRAGMENT_DEFINITION) {
+      fragments.set(def.name.value, def);
+    }
+  }
+  const pathStack = [];
+  const inlineFragmentCounterStack = [];
+  graphql.visit(document, {
+    [graphql.Kind.SELECTION_SET]: {
+      enter() {
+        inlineFragmentCounterStack.push(/* @__PURE__ */ new Map());
+      },
+      leave() {
+        inlineFragmentCounterStack.pop();
+      }
+    },
+    [graphql.Kind.OPERATION_DEFINITION]: {
+      enter(node) {
+        pathStack.push(`op:${node.operation}:${node.name?.value ?? ""}`);
+      },
+      leave() {
+        pathStack.pop();
+      }
+    },
+    [graphql.Kind.FRAGMENT_DEFINITION]: {
+      enter(node) {
+        pathStack.push(`frag:${node.name.value}`);
+      },
+      leave() {
+        pathStack.pop();
+      }
+    },
+    [graphql.Kind.INLINE_FRAGMENT]: {
+      enter(node) {
+        pathStack.push(
+          nextInlineFragmentPathSegment(
+            node,
+            inlineFragmentCounterStack[inlineFragmentCounterStack.length - 1]
+          )
+        );
+      },
+      leave() {
+        pathStack.pop();
+      }
+    },
+    [graphql.Kind.FIELD]: {
+      enter(node) {
+        pathStack.push(node.alias?.value ?? node.name.value);
+        if (node.selectionSet) {
+          selectionSetsByPath.set(pathStack.join(">"), node.selectionSet);
+          if (node.alias) {
+            const namePath = [...pathStack.slice(0, -1), node.name.value].join(
+              ">"
+            );
+            if (!selectionSetsByPath.has(namePath)) {
+              selectionSetsByPath.set(namePath, node.selectionSet);
+            }
+          }
+        }
+      },
+      leave() {
+        pathStack.pop();
+      }
+    }
+  });
+  return { selectionSetsByPath, fragments };
+}
+const collectFieldSelectionSetsByPath = utils.memoize1(
+  collectFieldSelectionSetsByPathImpl
+);
+function nextInlineFragmentPathSegment(node, counter) {
+  const typeName = node.typeCondition?.name.value ?? "";
+  if (!counter) {
+    return `inline:${typeName}:0`;
+  }
+  const idx = counter.get(typeName) ?? 0;
+  counter.set(typeName, idx + 1);
+  return `inline:${typeName}:${idx}`;
+}
+function subschemaHasProvidedSelectionsImpl(stitchingInfo, subschema) {
+  const mergedTypes = stitchingInfo.mergedTypes;
+  if (!mergedTypes) {
+    return false;
+  }
+  for (const typeConfig of Object.values(mergedTypes)) {
+    if (typeConfig?.providedSelectionsByField?.has(subschema)) {
+      return true;
+    }
+  }
+  return false;
+}
+const subschemaHasProvidedSelections = utils.memoize2(
+  subschemaHasProvidedSelectionsImpl
+);
+function lookupOriginalSelectionSet(pathStack, fieldNode, selectionSetsByPath) {
+  const exact = selectionSetsByPath.get(pathStack.join(">"));
+  if (exact || !fieldNode.alias) {
+    return exact;
+  }
+  const fallback = [...pathStack.slice(0, -1), fieldNode.name.value].join(">");
+  return selectionSetsByPath.get(fallback);
+}
+function intersectProvidedSelections(providedSelections, originalSelectionSet, fragments) {
+  if (!originalSelectionSet) {
+    return [];
+  }
+  const providedFieldsByName = /* @__PURE__ */ new Map();
+  const otherProvided = [];
+  for (const provided of providedSelections) {
+    if (provided.kind === graphql.Kind.FIELD) {
+      providedFieldsByName.set(provided.name.value, provided);
+    } else {
+      otherProvided.push(provided);
+    }
+  }
+  const result = [];
+  collectMatchingOriginalSelections(
+    originalSelectionSet,
+    providedFieldsByName,
+    fragments,
+    /* @__PURE__ */ new Set(),
+    /* @__PURE__ */ new Set(),
+    result
+  );
+  return [...result, ...otherProvided];
+}
+function collectMatchingOriginalSelections(selectionSet, providedFieldsByName, fragments, seenFieldNames, seenFragmentNames, result) {
+  for (const sel of selectionSet.selections) {
+    if (sel.kind === graphql.Kind.FIELD) {
+      const provided = providedFieldsByName.get(sel.name.value);
+      if (!provided) {
+        continue;
+      }
+      const dedupKey = sel.alias?.value ?? sel.name.value;
+      if (seenFieldNames.has(dedupKey)) {
+        continue;
+      }
+      seenFieldNames.add(dedupKey);
+      if (provided.selectionSet && sel.selectionSet) {
+        const nested = intersectProvidedSelections(
+          provided.selectionSet.selections,
+          sel.selectionSet,
+          fragments
+        );
+        if (!nested.length) {
+          continue;
+        }
+        result.push({
+          ...sel,
+          selectionSet: {
+            kind: graphql.Kind.SELECTION_SET,
+            selections: nested
+          }
+        });
+      } else {
+        result.push(sel);
+      }
+    } else if (sel.kind === graphql.Kind.INLINE_FRAGMENT && sel.selectionSet) {
+      const hasDirectives = (sel.directives?.length ?? 0) > 0;
+      const hasTypeCondition = sel.typeCondition != null;
+      if (hasDirectives || hasTypeCondition) {
+        const inner = [];
+        collectMatchingOriginalSelections(
+          sel.selectionSet,
+          providedFieldsByName,
+          fragments,
+          /* @__PURE__ */ new Set(),
+          /* @__PURE__ */ new Set(),
+          inner
+        );
+        if (inner.length === 0) {
+          continue;
+        }
+        result.push({
+          kind: graphql.Kind.INLINE_FRAGMENT,
+          typeCondition: sel.typeCondition,
+          directives: sel.directives,
+          selectionSet: {
+            kind: graphql.Kind.SELECTION_SET,
+            selections: inner
+          }
+        });
+      } else {
+        collectMatchingOriginalSelections(
+          sel.selectionSet,
+          providedFieldsByName,
+          fragments,
+          seenFieldNames,
+          seenFragmentNames,
+          result
+        );
+      }
+    } else if (sel.kind === graphql.Kind.FRAGMENT_SPREAD) {
+      const fragmentDef = fragments.get(sel.name.value);
+      if (!fragmentDef) {
+        continue;
+      }
+      const hasSpreadDirectives = (sel.directives?.length ?? 0) > 0;
+      const hasFragmentDirectives = (fragmentDef.directives?.length ?? 0) > 0;
+      if (hasSpreadDirectives || hasFragmentDirectives) {
+        const inner = [];
+        collectMatchingOriginalSelections(
+          fragmentDef.selectionSet,
+          providedFieldsByName,
+          fragments,
+          /* @__PURE__ */ new Set(),
+          /* @__PURE__ */ new Set(),
+          inner
+        );
+        if (inner.length === 0) {
+          continue;
+        }
+        const combinedDirectives = [
+          ...sel.directives ?? [],
+          ...fragmentDef.directives ?? []
+        ];
+        result.push({
+          kind: graphql.Kind.INLINE_FRAGMENT,
+          typeCondition: fragmentDef.typeCondition,
+          directives: combinedDirectives.length > 0 ? combinedDirectives : void 0,
+          selectionSet: {
+            kind: graphql.Kind.SELECTION_SET,
+            selections: inner
+          }
+        });
+      } else {
+        if (seenFragmentNames.has(sel.name.value)) {
+          continue;
+        }
+        seenFragmentNames.add(sel.name.value);
+        collectMatchingOriginalSelections(
+          fragmentDef.selectionSet,
+          providedFieldsByName,
+          fragments,
+          seenFieldNames,
+          seenFragmentNames,
+          result
+        );
+      }
+    }
+  }
+}
 function filterTypenameFields(selections) {
   let hasTypeNameField = false;
   const filteredSelections = selections.filter((selection) => {
@@ -809,15 +1175,17 @@ function collectFragmentVariables(targetSchema, fragmentSet, validFragments, val
       usedVariables = union(usedVariables, fragmentUsedVariables);
       if (name && !(name in fragmentSet)) {
         fragmentSet[name] = true;
-        newFragments.push({
-          kind: graphql.Kind.FRAGMENT_DEFINITION,
-          name: {
-            kind: graphql.Kind.NAME,
-            value: name
-          },
-          typeCondition: fragment.typeCondition,
-          selectionSet
-        });
+        if (selectionSet.selections.length > 0) {
+          newFragments.push({
+            kind: graphql.Kind.FRAGMENT_DEFINITION,
+            name: {
+              kind: graphql.Kind.NAME,
+              value: name
+            },
+            typeCondition: fragment.typeCondition,
+            selectionSet
+          });
+        }
       }
     }
   }
@@ -2967,7 +3335,7 @@ function extractUnavailableFields(schema, field, fieldNode, shouldAdd, fragments
   }
   return [];
 }
-function subtractSelectionSets(selectionSetA, selectionSetB) {
+function subtractSelectionSets(selectionSetA, selectionSetB, fragments = {}) {
   const newSelections = [];
   for (const selectionA of selectionSetA.selections) {
     switch (selectionA.kind) {
@@ -2983,7 +3351,7 @@ function subtractSelectionSets(selectionSetA, selectionSetB) {
         );
         if (fieldsInOtherSelectionSet.length > 0 && fieldA.selectionSet?.selections?.length) {
           const newSubSelection = fieldsInOtherSelectionSet.reduce(
-            (acc, fieldB) => fieldB.selectionSet ? subtractSelectionSets(acc, fieldB.selectionSet) : acc,
+            (acc, fieldB) => fieldB.selectionSet ? subtractSelectionSets(acc, fieldB.selectionSet, fragments) : acc,
             {
               kind: graphql.Kind.SELECTION_SET,
               selections: fieldA.selectionSet.selections
@@ -3013,7 +3381,11 @@ function subtractSelectionSets(selectionSetA, selectionSetB) {
         );
         if (inlineFragmentsFromB.length > 0) {
           const newSubSelection = inlineFragmentsFromB.reduce(
-            (acc, subselectionB) => subselectionB.selectionSet ? subtractSelectionSets(acc, subselectionB.selectionSet) : acc,
+            (acc, subselectionB) => subselectionB.selectionSet ? subtractSelectionSets(
+              acc,
+              subselectionB.selectionSet,
+              fragments
+            ) : acc,
             {
               kind: graphql.Kind.SELECTION_SET,
               selections: inlineFragmentA.selectionSet.selections
@@ -3041,7 +3413,25 @@ function subtractSelectionSets(selectionSetA, selectionSetB) {
       }
       case graphql.Kind.FRAGMENT_SPREAD: {
         const fragmentSpreadA = selectionA;
-        if (!selectionSetB.selections.some(
+        const fragment = fragments[fragmentSpreadA.name.value];
+        if (fragment) {
+          const newSubSelection = subtractSelectionSets(
+            fragment.selectionSet,
+            selectionSetB,
+            fragments
+          );
+          if (newSubSelection.selections.length) {
+            newSelections.push({
+              kind: graphql.Kind.INLINE_FRAGMENT,
+              typeCondition: fragment.typeCondition,
+              directives: [
+                ...fragment.directives ?? [],
+                ...fragmentSpreadA.directives ?? []
+              ],
+              selectionSet: newSubSelection
+            });
+          }
+        } else if (!selectionSetB.selections.some(
           (subselectionB) => subselectionB.kind === graphql.Kind.FRAGMENT_SPREAD && subselectionB.name.value === fragmentSpreadA.name.value
         )) {
           newSelections.push(selectionA);

package/dist/index.d.cts

@@ -210,7 +210,7 @@ declare function cloneSubschemaConfig(subschemaConfig: SubschemaConfig): Subsche
 
 declare function extractUnavailableFieldsFromSelectionSet(schema: GraphQLSchema, fieldType: GraphQLNamedOutputType, fieldSelectionSet: SelectionSetNode, shouldAdd: (fieldType: GraphQLObjectType | GraphQLInterfaceType, selection: FieldNode) => boolean, fragments?: Record<string, FragmentDefinitionNode>): SelectionNode[];
 declare function extractUnavailableFields(schema: GraphQLSchema, field: GraphQLField<any, any>, fieldNode: FieldNode, shouldAdd: (fieldType: GraphQLObjectType | GraphQLInterfaceType, selection: FieldNode) => boolean, fragments?: Record<string, FragmentDefinitionNode>): SelectionNode[];
-declare function subtractSelectionSets(selectionSetA: SelectionSetNode, selectionSetB: SelectionSetNode): SelectionSetNode;
+declare function subtractSelectionSets(selectionSetA: SelectionSetNode, selectionSetB: SelectionSetNode, fragments?: Record<string, FragmentDefinitionNode>): SelectionSetNode;
 
 type Deferred<T = unknown> = {
     promise: Promise<T>;

package/dist/index.d.ts

@@ -210,7 +210,7 @@ declare function cloneSubschemaConfig(subschemaConfig: SubschemaConfig): Subsche
 
 declare function extractUnavailableFieldsFromSelectionSet(schema: GraphQLSchema, fieldType: GraphQLNamedOutputType, fieldSelectionSet: SelectionSetNode, shouldAdd: (fieldType: GraphQLObjectType | GraphQLInterfaceType, selection: FieldNode) => boolean, fragments?: Record<string, FragmentDefinitionNode>): SelectionNode[];
 declare function extractUnavailableFields(schema: GraphQLSchema, field: GraphQLField<any, any>, fieldNode: FieldNode, shouldAdd: (fieldType: GraphQLObjectType | GraphQLInterfaceType, selection: FieldNode) => boolean, fragments?: Record<string, FragmentDefinitionNode>): SelectionNode[];
-declare function subtractSelectionSets(selectionSetA: SelectionSetNode, selectionSetB: SelectionSetNode): SelectionSetNode;
+declare function subtractSelectionSets(selectionSetA: SelectionSetNode, selectionSetB: SelectionSetNode, fragments?: Record<string, FragmentDefinitionNode>): SelectionSetNode;
 
 type Deferred<T = unknown> = {
     promise: Promise<T>;

package/dist/index.js

@@ -590,7 +590,7 @@ const handleOverrideByDelegation = memoize3(
   }
 );
 
-function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlappingAliases, delegationContext) {
+function finalizeGatewayDocument(targetSchema, originalDocument, fragments, operations, onOverlappingAliases, delegationContext) {
   let usedVariables = [];
   let usedFragments = [];
   const newOperations = [];
@@ -682,47 +682,128 @@ function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlapp
       }
     );
   }
+  const includedFragmentNames = new Set(newFragments.map((f) => f.name.value));
+  const hasDroppedFragments = includedFragmentNames.size < usedFragments.length;
   let newDocument = {
     kind: Kind.DOCUMENT,
     definitions: [...newOperations, ...newFragments]
   };
   const stitchingInfo = delegationContext.info?.schema?.extensions?.["stitchingInfo"];
-  if (stitchingInfo != null) {
+  if (stitchingInfo != null && subschemaHasProvidedSelections(
+    stitchingInfo,
+    delegationContext.subschema
+  )) {
+    const {
+      selectionSetsByPath: originalFieldSelectionSetsByPath,
+      fragments: originalFragmentsByName
+    } = collectFieldSelectionSetsByPath(originalDocument);
     const typeInfo = getTypeInfo(targetSchema);
+    const pathStack = [];
+    const inlineFragmentCounterStack = [];
     newDocument = visit(
       newDocument,
       visitWithTypeInfo(typeInfo, {
-        [Kind.FIELD](fieldNode) {
-          const parentType = typeInfo.getParentType();
-          if (parentType) {
-            const parentTypeName = parentType.name;
-            const typeConfig = stitchingInfo?.mergedTypes?.[parentTypeName];
-            if (typeConfig) {
+        [Kind.SELECTION_SET]: {
+          enter() {
+            inlineFragmentCounterStack.push(/* @__PURE__ */ new Map());
+          },
+          leave() {
+            inlineFragmentCounterStack.pop();
+          }
+        },
+        [Kind.OPERATION_DEFINITION]: {
+          enter(node) {
+            pathStack.push(`op:${node.operation}:${node.name?.value ?? ""}`);
+          },
+          leave() {
+            pathStack.pop();
+          }
+        },
+        [Kind.FRAGMENT_DEFINITION]: {
+          enter(node) {
+            pathStack.push(`frag:${node.name.value}`);
+          },
+          leave() {
+            pathStack.pop();
+          }
+        },
+        [Kind.INLINE_FRAGMENT]: {
+          enter(node) {
+            pathStack.push(
+              nextInlineFragmentPathSegment(
+                node,
+                inlineFragmentCounterStack[inlineFragmentCounterStack.length - 1]
+              )
+            );
+          },
+          leave() {
+            pathStack.pop();
+          }
+        },
+        [Kind.FIELD]: {
+          enter(fieldNode) {
+            pathStack.push(fieldNode.alias?.value ?? fieldNode.name.value);
+          },
+          leave(fieldNode) {
+            try {
+              const parentType = typeInfo.getParentType();
+              if (!parentType) {
+                return void 0;
+              }
+              const typeConfig = stitchingInfo?.mergedTypes?.[parentType.name];
               const providedSelectionsByField = typeConfig?.providedSelectionsByField?.get(
                 delegationContext.subschema
               );
-              if (providedSelectionsByField) {
-                const providedSelection = providedSelectionsByField[fieldNode.name.value];
-                if (providedSelection) {
-                  return {
-                    ...fieldNode,
-                    selectionSet: {
-                      kind: Kind.SELECTION_SET,
-                      selections: [
-                        ...providedSelection.selections,
-                        ...fieldNode.selectionSet?.selections ?? []
-                      ]
-                    }
-                  };
-                }
+              const providedSelection = providedSelectionsByField?.[fieldNode.name.value];
+              if (!providedSelection) {
+                return void 0;
               }
+              const originalSelectionSet = lookupOriginalSelectionSet(
+                pathStack,
+                fieldNode,
+                originalFieldSelectionSetsByPath
+              );
+              const requestedProvidedSelections = intersectProvidedSelections(
+                providedSelection.selections,
+                originalSelectionSet,
+                originalFragmentsByName
+              );
+              if (!requestedProvidedSelections.length) {
+                return void 0;
+              }
+              return {
+                ...fieldNode,
+                selectionSet: {
+                  kind: Kind.SELECTION_SET,
+                  selections: [
+                    ...requestedProvidedSelections,
+                    ...fieldNode.selectionSet?.selections ?? []
+                  ]
+                }
+              };
+            } finally {
+              pathStack.pop();
             }
           }
-          return fieldNode;
         }
       })
     );
   }
+  if (hasDroppedFragments) {
+    const ops = newDocument.definitions.filter(
+      (d) => d.kind === Kind.OPERATION_DEFINITION
+    );
+    const frags = newDocument.definitions.filter(
+      (d) => d.kind === Kind.FRAGMENT_DEFINITION
+    );
+    newDocument = {
+      kind: Kind.DOCUMENT,
+      definitions: [
+        ...removeDeadFragmentSpreads(ops, includedFragmentNames),
+        ...frags
+      ]
+    };
+  }
   return {
     usedVariables,
     newDocument
@@ -733,6 +814,7 @@ function finalizeGatewayRequest(originalRequest, delegationContext, onOverlappin
   const { targetSchema } = delegationContext;
   const { usedVariables, newDocument } = finalizeGatewayDocument(
     targetSchema,
+    originalRequest.document,
     fragments,
     operations,
     onOverlappingAliases,
@@ -758,9 +840,293 @@ function finalizeGatewayRequest(originalRequest, delegationContext, onOverlappin
     variables: newVariables
   };
 }
+function removeDeadFragmentSpreads(operations, included) {
+  function cleanSelections(selections) {
+    const out = [];
+    for (const sel of selections) {
+      if (sel.kind === Kind.FRAGMENT_SPREAD) {
+        if (included.has(sel.name.value)) {
+          out.push(sel);
+        }
+      } else if ((sel.kind === Kind.FIELD || sel.kind === Kind.INLINE_FRAGMENT) && sel.selectionSet) {
+        const cleaned = cleanSelections(sel.selectionSet.selections);
+        if (cleaned.length === 0 && sel.kind === Kind.INLINE_FRAGMENT) {
+          continue;
+        }
+        if (cleaned.length === 0 && sel.kind === Kind.FIELD) {
+          continue;
+        }
+        out.push(
+          cleaned === sel.selectionSet.selections ? sel : {
+            ...sel,
+            selectionSet: {
+              kind: Kind.SELECTION_SET,
+              selections: cleaned
+            }
+          }
+        );
+      } else {
+        out.push(sel);
+      }
+    }
+    return out;
+  }
+  return operations.map((op) => ({
+    ...op,
+    selectionSet: {
+      ...op.selectionSet,
+      selections: cleanSelections(op.selectionSet.selections)
+    }
+  }));
+}
 function isTypeNameField(selection) {
   return selection.kind === Kind.FIELD && !selection.alias && selection.name.value === "__typename";
 }
+function collectFieldSelectionSetsByPathImpl(document) {
+  const selectionSetsByPath = /* @__PURE__ */ new Map();
+  const fragments = /* @__PURE__ */ new Map();
+  for (const def of document.definitions) {
+    if (def.kind === Kind.FRAGMENT_DEFINITION) {
+      fragments.set(def.name.value, def);
+    }
+  }
+  const pathStack = [];
+  const inlineFragmentCounterStack = [];
+  visit(document, {
+    [Kind.SELECTION_SET]: {
+      enter() {
+        inlineFragmentCounterStack.push(/* @__PURE__ */ new Map());
+      },
+      leave() {
+        inlineFragmentCounterStack.pop();
+      }
+    },
+    [Kind.OPERATION_DEFINITION]: {
+      enter(node) {
+        pathStack.push(`op:${node.operation}:${node.name?.value ?? ""}`);
+      },
+      leave() {
+        pathStack.pop();
+      }
+    },
+    [Kind.FRAGMENT_DEFINITION]: {
+      enter(node) {
+        pathStack.push(`frag:${node.name.value}`);
+      },
+      leave() {
+        pathStack.pop();
+      }
+    },
+    [Kind.INLINE_FRAGMENT]: {
+      enter(node) {
+        pathStack.push(
+          nextInlineFragmentPathSegment(
+            node,
+            inlineFragmentCounterStack[inlineFragmentCounterStack.length - 1]
+          )
+        );
+      },
+      leave() {
+        pathStack.pop();
+      }
+    },
+    [Kind.FIELD]: {
+      enter(node) {
+        pathStack.push(node.alias?.value ?? node.name.value);
+        if (node.selectionSet) {
+          selectionSetsByPath.set(pathStack.join(">"), node.selectionSet);
+          if (node.alias) {
+            const namePath = [...pathStack.slice(0, -1), node.name.value].join(
+              ">"
+            );
+            if (!selectionSetsByPath.has(namePath)) {
+              selectionSetsByPath.set(namePath, node.selectionSet);
+            }
+          }
+        }
+      },
+      leave() {
+        pathStack.pop();
+      }
+    }
+  });
+  return { selectionSetsByPath, fragments };
+}
+const collectFieldSelectionSetsByPath = memoize1(
+  collectFieldSelectionSetsByPathImpl
+);
+function nextInlineFragmentPathSegment(node, counter) {
+  const typeName = node.typeCondition?.name.value ?? "";
+  if (!counter) {
+    return `inline:${typeName}:0`;
+  }
+  const idx = counter.get(typeName) ?? 0;
+  counter.set(typeName, idx + 1);
+  return `inline:${typeName}:${idx}`;
+}
+function subschemaHasProvidedSelectionsImpl(stitchingInfo, subschema) {
+  const mergedTypes = stitchingInfo.mergedTypes;
+  if (!mergedTypes) {
+    return false;
+  }
+  for (const typeConfig of Object.values(mergedTypes)) {
+    if (typeConfig?.providedSelectionsByField?.has(subschema)) {
+      return true;
+    }
+  }
+  return false;
+}
+const subschemaHasProvidedSelections = memoize2(
+  subschemaHasProvidedSelectionsImpl
+);
+function lookupOriginalSelectionSet(pathStack, fieldNode, selectionSetsByPath) {
+  const exact = selectionSetsByPath.get(pathStack.join(">"));
+  if (exact || !fieldNode.alias) {
+    return exact;
+  }
+  const fallback = [...pathStack.slice(0, -1), fieldNode.name.value].join(">");
+  return selectionSetsByPath.get(fallback);
+}
+function intersectProvidedSelections(providedSelections, originalSelectionSet, fragments) {
+  if (!originalSelectionSet) {
+    return [];
+  }
+  const providedFieldsByName = /* @__PURE__ */ new Map();
+  const otherProvided = [];
+  for (const provided of providedSelections) {
+    if (provided.kind === Kind.FIELD) {
+      providedFieldsByName.set(provided.name.value, provided);
+    } else {
+      otherProvided.push(provided);
+    }
+  }
+  const result = [];
+  collectMatchingOriginalSelections(
+    originalSelectionSet,
+    providedFieldsByName,
+    fragments,
+    /* @__PURE__ */ new Set(),
+    /* @__PURE__ */ new Set(),
+    result
+  );
+  return [...result, ...otherProvided];
+}
+function collectMatchingOriginalSelections(selectionSet, providedFieldsByName, fragments, seenFieldNames, seenFragmentNames, result) {
+  for (const sel of selectionSet.selections) {
+    if (sel.kind === Kind.FIELD) {
+      const provided = providedFieldsByName.get(sel.name.value);
+      if (!provided) {
+        continue;
+      }
+      const dedupKey = sel.alias?.value ?? sel.name.value;
+      if (seenFieldNames.has(dedupKey)) {
+        continue;
+      }
+      seenFieldNames.add(dedupKey);
+      if (provided.selectionSet && sel.selectionSet) {
+        const nested = intersectProvidedSelections(
+          provided.selectionSet.selections,
+          sel.selectionSet,
+          fragments
+        );
+        if (!nested.length) {
+          continue;
+        }
+        result.push({
+          ...sel,
+          selectionSet: {
+            kind: Kind.SELECTION_SET,
+            selections: nested
+          }
+        });
+      } else {
+        result.push(sel);
+      }
+    } else if (sel.kind === Kind.INLINE_FRAGMENT && sel.selectionSet) {
+      const hasDirectives = (sel.directives?.length ?? 0) > 0;
+      const hasTypeCondition = sel.typeCondition != null;
+      if (hasDirectives || hasTypeCondition) {
+        const inner = [];
+        collectMatchingOriginalSelections(
+          sel.selectionSet,
+          providedFieldsByName,
+          fragments,
+          /* @__PURE__ */ new Set(),
+          /* @__PURE__ */ new Set(),
+          inner
+        );
+        if (inner.length === 0) {
+          continue;
+        }
+        result.push({
+          kind: Kind.INLINE_FRAGMENT,
+          typeCondition: sel.typeCondition,
+          directives: sel.directives,
+          selectionSet: {
+            kind: Kind.SELECTION_SET,
+            selections: inner
+          }
+        });
+      } else {
+        collectMatchingOriginalSelections(
+          sel.selectionSet,
+          providedFieldsByName,
+          fragments,
+          seenFieldNames,
+          seenFragmentNames,
+          result
+        );
+      }
+    } else if (sel.kind === Kind.FRAGMENT_SPREAD) {
+      const fragmentDef = fragments.get(sel.name.value);
+      if (!fragmentDef) {
+        continue;
+      }
+      const hasSpreadDirectives = (sel.directives?.length ?? 0) > 0;
+      const hasFragmentDirectives = (fragmentDef.directives?.length ?? 0) > 0;
+      if (hasSpreadDirectives || hasFragmentDirectives) {
+        const inner = [];
+        collectMatchingOriginalSelections(
+          fragmentDef.selectionSet,
+          providedFieldsByName,
+          fragments,
+          /* @__PURE__ */ new Set(),
+          /* @__PURE__ */ new Set(),
+          inner
+        );
+        if (inner.length === 0) {
+          continue;
+        }
+        const combinedDirectives = [
+          ...sel.directives ?? [],
+          ...fragmentDef.directives ?? []
+        ];
+        result.push({
+          kind: Kind.INLINE_FRAGMENT,
+          typeCondition: fragmentDef.typeCondition,
+          directives: combinedDirectives.length > 0 ? combinedDirectives : void 0,
+          selectionSet: {
+            kind: Kind.SELECTION_SET,
+            selections: inner
+          }
+        });
+      } else {
+        if (seenFragmentNames.has(sel.name.value)) {
+          continue;
+        }
+        seenFragmentNames.add(sel.name.value);
+        collectMatchingOriginalSelections(
+          fragmentDef.selectionSet,
+          providedFieldsByName,
+          fragments,
+          seenFieldNames,
+          seenFragmentNames,
+          result
+        );
+      }
+    }
+  }
+}
 function filterTypenameFields(selections) {
   let hasTypeNameField = false;
   const filteredSelections = selections.filter((selection) => {
@@ -809,15 +1175,17 @@ function collectFragmentVariables(targetSchema, fragmentSet, validFragments, val
       usedVariables = union(usedVariables, fragmentUsedVariables);
       if (name && !(name in fragmentSet)) {
         fragmentSet[name] = true;
-        newFragments.push({
-          kind: Kind.FRAGMENT_DEFINITION,
-          name: {
-            kind: Kind.NAME,
-            value: name
-          },
-          typeCondition: fragment.typeCondition,
-          selectionSet
-        });
+        if (selectionSet.selections.length > 0) {
+          newFragments.push({
+            kind: Kind.FRAGMENT_DEFINITION,
+            name: {
+              kind: Kind.NAME,
+              value: name
+            },
+            typeCondition: fragment.typeCondition,
+            selectionSet
+          });
+        }
       }
     }
   }
@@ -2967,7 +3335,7 @@ function extractUnavailableFields(schema, field, fieldNode, shouldAdd, fragments
   }
   return [];
 }
-function subtractSelectionSets(selectionSetA, selectionSetB) {
+function subtractSelectionSets(selectionSetA, selectionSetB, fragments = {}) {
   const newSelections = [];
   for (const selectionA of selectionSetA.selections) {
     switch (selectionA.kind) {
@@ -2983,7 +3351,7 @@ function subtractSelectionSets(selectionSetA, selectionSetB) {
         );
         if (fieldsInOtherSelectionSet.length > 0 && fieldA.selectionSet?.selections?.length) {
           const newSubSelection = fieldsInOtherSelectionSet.reduce(
-            (acc, fieldB) => fieldB.selectionSet ? subtractSelectionSets(acc, fieldB.selectionSet) : acc,
+            (acc, fieldB) => fieldB.selectionSet ? subtractSelectionSets(acc, fieldB.selectionSet, fragments) : acc,
             {
               kind: Kind.SELECTION_SET,
               selections: fieldA.selectionSet.selections
@@ -3013,7 +3381,11 @@ function subtractSelectionSets(selectionSetA, selectionSetB) {
         );
         if (inlineFragmentsFromB.length > 0) {
           const newSubSelection = inlineFragmentsFromB.reduce(
-            (acc, subselectionB) => subselectionB.selectionSet ? subtractSelectionSets(acc, subselectionB.selectionSet) : acc,
+            (acc, subselectionB) => subselectionB.selectionSet ? subtractSelectionSets(
+              acc,
+              subselectionB.selectionSet,
+              fragments
+            ) : acc,
             {
               kind: Kind.SELECTION_SET,
               selections: inlineFragmentA.selectionSet.selections
@@ -3041,7 +3413,25 @@ function subtractSelectionSets(selectionSetA, selectionSetB) {
       }
       case Kind.FRAGMENT_SPREAD: {
         const fragmentSpreadA = selectionA;
-        if (!selectionSetB.selections.some(
+        const fragment = fragments[fragmentSpreadA.name.value];
+        if (fragment) {
+          const newSubSelection = subtractSelectionSets(
+            fragment.selectionSet,
+            selectionSetB,
+            fragments
+          );
+          if (newSubSelection.selections.length) {
+            newSelections.push({
+              kind: Kind.INLINE_FRAGMENT,
+              typeCondition: fragment.typeCondition,
+              directives: [
+                ...fragment.directives ?? [],
+                ...fragmentSpreadA.directives ?? []
+              ],
+              selectionSet: newSubSelection
+            });
+          }
+        } else if (!selectionSetB.selections.some(
           (subselectionB) => subselectionB.kind === Kind.FRAGMENT_SPREAD && subselectionB.name.value === fragmentSpreadA.name.value
         )) {
           newSelections.push(selectionA);

package/package.json

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