@graphql-tools/delegate 12.0.17-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb → 12.0.17

package/CHANGELOG.md

@@ -1,40 +1,13 @@
 # @graphql-tools/delegate
 
-## 12.0.17-alpha-cc6e877dd43c47e20e00638efc161a0bed4e2ccb
+## 12.0.17
 ### 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.
+- [#2382](https://github.com/graphql-hive/gateway/pull/2382) [`3e774e0`](https://github.com/graphql-hive/gateway/commit/3e774e050bc2d3c33e0f36a258ab6a8d94bf0750) Thanks [@gonzo-32](https://github.com/gonzo-32)! - Fix cross-subgraph delegation for unavailable fields selected through inline fragments or fragment spreads on interface fields.
   
-  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.
+  The fix in `extractUnavailableFieldsFromSelectionSet` within `extractUnavailableFields.ts` now preserves the fragment wrapper and type condition, so concrete-type fields do not lose their type context and get treated as missing.
 
 ## 12.0.16
 ### Patch Changes

package/dist/index.cjs

@@ -590,7 +590,7 @@ const handleOverrideByDelegation = utils.memoize3(
   }
 );
 
-function finalizeGatewayDocument(targetSchema, originalDocument, fragments, operations, onOverlappingAliases, delegationContext) {
+function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlappingAliases, delegationContext) {
   let usedVariables = [];
   let usedFragments = [];
   const newOperations = [];
@@ -687,102 +687,38 @@ function finalizeGatewayDocument(targetSchema, originalDocument, fragments, oper
     definitions: [...newOperations, ...newFragments]
   };
   const stitchingInfo = delegationContext.info?.schema?.extensions?.["stitchingInfo"];
-  if (stitchingInfo != null && subschemaHasProvidedSelections(
-    stitchingInfo,
-    delegationContext.subschema
-  )) {
-    const {
-      selectionSetsByPath: originalFieldSelectionSetsByPath,
-      fragments: originalFragmentsByName
-    } = collectFieldSelectionSetsByPath(originalDocument);
+  if (stitchingInfo != null) {
     const typeInfo = getTypeInfo(targetSchema);
-    const pathStack = [];
-    const inlineFragmentCounterStack = [];
     newDocument = graphql.visit(
       newDocument,
       graphql.visitWithTypeInfo(typeInfo, {
-        [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];
+        [graphql.Kind.FIELD](fieldNode) {
+          const parentType = typeInfo.getParentType();
+          if (parentType) {
+            const parentTypeName = parentType.name;
+            const typeConfig = stitchingInfo?.mergedTypes?.[parentTypeName];
+            if (typeConfig) {
               const providedSelectionsByField = typeConfig?.providedSelectionsByField?.get(
                 delegationContext.subschema
               );
-              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 ?? []
-                  ]
+              if (providedSelectionsByField) {
+                const providedSelection = providedSelectionsByField[fieldNode.name.value];
+                if (providedSelection) {
+                  return {
+                    ...fieldNode,
+                    selectionSet: {
+                      kind: graphql.Kind.SELECTION_SET,
+                      selections: [
+                        ...providedSelection.selections,
+                        ...fieldNode.selectionSet?.selections ?? []
+                      ]
+                    }
+                  };
                 }
-              };
-            } finally {
-              pathStack.pop();
+              }
             }
           }
+          return fieldNode;
         }
       })
     );
@@ -797,7 +733,6 @@ function finalizeGatewayRequest(originalRequest, delegationContext, onOverlappin
   const { targetSchema } = delegationContext;
   const { usedVariables, newDocument } = finalizeGatewayDocument(
     targetSchema,
-    originalRequest.document,
     fragments,
     operations,
     onOverlappingAliases,
@@ -826,251 +761,6 @@ function finalizeGatewayRequest(originalRequest, delegationContext, onOverlappin
 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) => {
@@ -3205,6 +2895,7 @@ function extractUnavailableFieldsFromSelectionSet(schema, fieldType, fieldSelect
           });
         }
       } else if (graphql.isObjectType(subFieldType) || graphql.isInterfaceType(subFieldType)) {
+        const unavailableSubSelections = [];
         const subFieldTypeFields = subFieldType.getFields();
         for (const subSelection of selection.selectionSet.selections) {
           if (subSelection.kind === graphql.Kind.FIELD) {
@@ -3215,11 +2906,20 @@ function extractUnavailableFieldsFromSelectionSet(schema, fieldType, fieldSelect
             const subSelectionField = subFieldTypeFields[subSelection.name.value];
             if (!subSelectionField) {
               if (shouldAdd(subFieldType, subSelection)) {
-                unavailableSelections.push(subSelection);
+                unavailableSubSelections.push(subSelection);
               }
             }
           }
         }
+        if (unavailableSubSelections.length) {
+          unavailableSelections.push({
+            ...selection,
+            selectionSet: {
+              kind: graphql.Kind.SELECTION_SET,
+              selections: unavailableSubSelections
+            }
+          });
+        }
       }
     } else if (selection.kind === graphql.Kind.FRAGMENT_SPREAD) {
       const fragment = fragments[selection.name.value];

package/dist/index.js

@@ -590,7 +590,7 @@ const handleOverrideByDelegation = memoize3(
   }
 );
 
-function finalizeGatewayDocument(targetSchema, originalDocument, fragments, operations, onOverlappingAliases, delegationContext) {
+function finalizeGatewayDocument(targetSchema, fragments, operations, onOverlappingAliases, delegationContext) {
   let usedVariables = [];
   let usedFragments = [];
   const newOperations = [];
@@ -687,102 +687,38 @@ function finalizeGatewayDocument(targetSchema, originalDocument, fragments, oper
     definitions: [...newOperations, ...newFragments]
   };
   const stitchingInfo = delegationContext.info?.schema?.extensions?.["stitchingInfo"];
-  if (stitchingInfo != null && subschemaHasProvidedSelections(
-    stitchingInfo,
-    delegationContext.subschema
-  )) {
-    const {
-      selectionSetsByPath: originalFieldSelectionSetsByPath,
-      fragments: originalFragmentsByName
-    } = collectFieldSelectionSetsByPath(originalDocument);
+  if (stitchingInfo != null) {
     const typeInfo = getTypeInfo(targetSchema);
-    const pathStack = [];
-    const inlineFragmentCounterStack = [];
     newDocument = visit(
       newDocument,
       visitWithTypeInfo(typeInfo, {
-        [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];
+        [Kind.FIELD](fieldNode) {
+          const parentType = typeInfo.getParentType();
+          if (parentType) {
+            const parentTypeName = parentType.name;
+            const typeConfig = stitchingInfo?.mergedTypes?.[parentTypeName];
+            if (typeConfig) {
               const providedSelectionsByField = typeConfig?.providedSelectionsByField?.get(
                 delegationContext.subschema
               );
-              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 ?? []
-                  ]
+              if (providedSelectionsByField) {
+                const providedSelection = providedSelectionsByField[fieldNode.name.value];
+                if (providedSelection) {
+                  return {
+                    ...fieldNode,
+                    selectionSet: {
+                      kind: Kind.SELECTION_SET,
+                      selections: [
+                        ...providedSelection.selections,
+                        ...fieldNode.selectionSet?.selections ?? []
+                      ]
+                    }
+                  };
                 }
-              };
-            } finally {
-              pathStack.pop();
+              }
             }
           }
+          return fieldNode;
         }
       })
     );
@@ -797,7 +733,6 @@ function finalizeGatewayRequest(originalRequest, delegationContext, onOverlappin
   const { targetSchema } = delegationContext;
   const { usedVariables, newDocument } = finalizeGatewayDocument(
     targetSchema,
-    originalRequest.document,
     fragments,
     operations,
     onOverlappingAliases,
@@ -826,251 +761,6 @@ function finalizeGatewayRequest(originalRequest, delegationContext, onOverlappin
 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) => {
@@ -3205,6 +2895,7 @@ function extractUnavailableFieldsFromSelectionSet(schema, fieldType, fieldSelect
           });
         }
       } else if (isObjectType(subFieldType) || isInterfaceType(subFieldType)) {
+        const unavailableSubSelections = [];
         const subFieldTypeFields = subFieldType.getFields();
         for (const subSelection of selection.selectionSet.selections) {
           if (subSelection.kind === Kind.FIELD) {
@@ -3215,11 +2906,20 @@ function extractUnavailableFieldsFromSelectionSet(schema, fieldType, fieldSelect
             const subSelectionField = subFieldTypeFields[subSelection.name.value];
             if (!subSelectionField) {
               if (shouldAdd(subFieldType, subSelection)) {
-                unavailableSelections.push(subSelection);
+                unavailableSubSelections.push(subSelection);
               }
             }
           }
         }
+        if (unavailableSubSelections.length) {
+          unavailableSelections.push({
+            ...selection,
+            selectionSet: {
+              kind: Kind.SELECTION_SET,
+              selections: unavailableSubSelections
+            }
+          });
+        }
       }
     } else if (selection.kind === Kind.FRAGMENT_SPREAD) {
       const fragment = fragments[selection.name.value];

package/package.json

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