@graphql-tools/delegate 10.2.20 → 10.2.21-alpha-9e19c4c2d6d51beeb30dcbd905fc776b8e5042e4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @graphql-tools/delegate
 
+## 10.2.21-alpha-9e19c4c2d6d51beeb30dcbd905fc776b8e5042e4
+
+### Patch Changes
+
+- [#1301](https://github.com/graphql-hive/gateway/pull/1301) [`bd1a66a`](https://github.com/graphql-hive/gateway/commit/bd1a66aad2b10351d831f781977cdd2d586c56fd) Thanks [@enisdenjo](https://github.com/enisdenjo)! - Filter selection sets recursively when finalizing gateway requests
+
+  Because abstract types can be nested.
+
 ## 10.2.20
 
 ### Patch Changes

package/dist/index.cjs

@@ -945,7 +945,36 @@ function finalizeSelectionSet(schema, type, validFragments, selectionSet, onOver
   const typeInfo = getTypeInfoWithType(schema, type);
   const seenNonNullableMap = /* @__PURE__ */ new WeakMap();
   const seenNullableMap = /* @__PURE__ */ new WeakMap();
-  const filteredSelectionSet = graphql.visit(
+  const filteredSelectionSet = filterSelectionSet(
+    schema,
+    typeInfo,
+    validFragments,
+    selectionSet,
+    onOverlappingAliases,
+    usedFragments,
+    seenNonNullableMap,
+    seenNullableMap
+  );
+  graphql.visit(
+    filteredSelectionSet,
+    {
+      [graphql.Kind.VARIABLE]: (variableNode) => {
+        usedVariables.push(variableNode.name.value);
+      }
+    },
+    // visitorKeys argument usage a la https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
+    // empty keys cannot be removed only because of typescript errors
+    // will hopefully be fixed in future version of graphql-js to be optional
+    variablesVisitorKeys
+  );
+  return {
+    selectionSet: filteredSelectionSet,
+    usedFragments,
+    usedVariables
+  };
+}
+function filterSelectionSet(schema, typeInfo, validFragments, selectionSet, onOverlappingAliases, usedFragments, seenNonNullableMap, seenNullableMap) {
+  return graphql.visit(
     selectionSet,
     graphql.visitWithTypeInfo(typeInfo, {
       [graphql.Kind.FIELD]: {
@@ -994,30 +1023,78 @@ function finalizeSelectionSet(schema, type, validFragments, selectionSet, onOver
               }
             }
             if (possibleTypeNames.length > 0) {
-              return possibleTypeNames.map((possibleTypeName) => ({
-                kind: graphql.Kind.INLINE_FRAGMENT,
-                typeCondition: {
-                  kind: graphql.Kind.NAMED_TYPE,
-                  name: {
-                    kind: graphql.Kind.NAME,
-                    value: possibleTypeName
-                  }
-                },
-                selectionSet: {
-                  kind: graphql.Kind.SELECTION_SET,
-                  selections: [node]
+              const spreads = possibleTypeNames.map((possibleTypeName) => {
+                if (!node.selectionSet?.selections) {
+                  return {
+                    kind: graphql.Kind.INLINE_FRAGMENT,
+                    typeCondition: {
+                      kind: graphql.Kind.NAMED_TYPE,
+                      name: {
+                        kind: graphql.Kind.NAME,
+                        value: possibleTypeName
+                      }
+                    },
+                    selectionSet: {
+                      kind: graphql.Kind.SELECTION_SET,
+                      selections: [node]
+                    }
+                  };
+                }
+                const possibleType = schema.getType(
+                  possibleTypeName
+                );
+                const possibleField = possibleType.getFields()[node.name.value];
+                if (!possibleField) {
+                  return void 0;
+                }
+                const fieldFilteredSelectionSet = filterSelectionSet(
+                  schema,
+                  getTypeInfoWithType(schema, possibleField.type),
+                  validFragments,
+                  node.selectionSet,
+                  onOverlappingAliases,
+                  usedFragments,
+                  seenNonNullableMap,
+                  seenNullableMap
+                );
+                if (!fieldFilteredSelectionSet.selections.length) {
+                  return void 0;
                 }
-              }));
+                return {
+                  kind: graphql.Kind.INLINE_FRAGMENT,
+                  typeCondition: {
+                    kind: graphql.Kind.NAMED_TYPE,
+                    name: {
+                      kind: graphql.Kind.NAME,
+                      value: possibleTypeName
+                    }
+                  },
+                  selectionSet: {
+                    kind: graphql.Kind.SELECTION_SET,
+                    selections: [
+                      {
+                        ...node,
+                        selectionSet: fieldFilteredSelectionSet
+                      }
+                    ]
+                  }
+                };
+              });
+              const nonEmptySpreads = spreads.filter(Boolean);
+              if (!nonEmptySpreads.length) {
+                return void 0;
+              }
+              return nonEmptySpreads;
             }
           }
           return void 0;
         },
         leave: (node) => {
-          const type2 = typeInfo.getType();
-          if (type2 == null) {
+          const type = typeInfo.getType();
+          if (type == null) {
             return null;
           }
-          const namedType = graphql.getNamedType(type2);
+          const namedType = graphql.getNamedType(type);
           if (schema.getType(namedType.name) == null) {
             return null;
           }
@@ -1164,23 +1241,6 @@ function finalizeSelectionSet(schema, type, validFragments, selectionSet, onOver
     // will hopefully be fixed in future version of graphql-js to be optional
     filteredSelectionSetVisitorKeys
   );
-  graphql.visit(
-    filteredSelectionSet,
-    {
-      [graphql.Kind.VARIABLE]: (variableNode) => {
-        usedVariables.push(variableNode.name.value);
-      }
-    },
-    // visitorKeys argument usage a la https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
-    // empty keys cannot be removed only because of typescript errors
-    // will hopefully be fixed in future version of graphql-js to be optional
-    variablesVisitorKeys
-  );
-  return {
-    selectionSet: filteredSelectionSet,
-    usedFragments,
-    usedVariables
-  };
 }
 function union(...arrays) {
   const cache = /* @__PURE__ */ Object.create(null);

package/dist/index.js

@@ -945,7 +945,36 @@ function finalizeSelectionSet(schema, type, validFragments, selectionSet, onOver
   const typeInfo = getTypeInfoWithType(schema, type);
   const seenNonNullableMap = /* @__PURE__ */ new WeakMap();
   const seenNullableMap = /* @__PURE__ */ new WeakMap();
-  const filteredSelectionSet = visit(
+  const filteredSelectionSet = filterSelectionSet(
+    schema,
+    typeInfo,
+    validFragments,
+    selectionSet,
+    onOverlappingAliases,
+    usedFragments,
+    seenNonNullableMap,
+    seenNullableMap
+  );
+  visit(
+    filteredSelectionSet,
+    {
+      [Kind.VARIABLE]: (variableNode) => {
+        usedVariables.push(variableNode.name.value);
+      }
+    },
+    // visitorKeys argument usage a la https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
+    // empty keys cannot be removed only because of typescript errors
+    // will hopefully be fixed in future version of graphql-js to be optional
+    variablesVisitorKeys
+  );
+  return {
+    selectionSet: filteredSelectionSet,
+    usedFragments,
+    usedVariables
+  };
+}
+function filterSelectionSet(schema, typeInfo, validFragments, selectionSet, onOverlappingAliases, usedFragments, seenNonNullableMap, seenNullableMap) {
+  return visit(
     selectionSet,
     visitWithTypeInfo(typeInfo, {
       [Kind.FIELD]: {
@@ -994,30 +1023,78 @@ function finalizeSelectionSet(schema, type, validFragments, selectionSet, onOver
               }
             }
             if (possibleTypeNames.length > 0) {
-              return possibleTypeNames.map((possibleTypeName) => ({
-                kind: Kind.INLINE_FRAGMENT,
-                typeCondition: {
-                  kind: Kind.NAMED_TYPE,
-                  name: {
-                    kind: Kind.NAME,
-                    value: possibleTypeName
-                  }
-                },
-                selectionSet: {
-                  kind: Kind.SELECTION_SET,
-                  selections: [node]
+              const spreads = possibleTypeNames.map((possibleTypeName) => {
+                if (!node.selectionSet?.selections) {
+                  return {
+                    kind: Kind.INLINE_FRAGMENT,
+                    typeCondition: {
+                      kind: Kind.NAMED_TYPE,
+                      name: {
+                        kind: Kind.NAME,
+                        value: possibleTypeName
+                      }
+                    },
+                    selectionSet: {
+                      kind: Kind.SELECTION_SET,
+                      selections: [node]
+                    }
+                  };
+                }
+                const possibleType = schema.getType(
+                  possibleTypeName
+                );
+                const possibleField = possibleType.getFields()[node.name.value];
+                if (!possibleField) {
+                  return void 0;
+                }
+                const fieldFilteredSelectionSet = filterSelectionSet(
+                  schema,
+                  getTypeInfoWithType(schema, possibleField.type),
+                  validFragments,
+                  node.selectionSet,
+                  onOverlappingAliases,
+                  usedFragments,
+                  seenNonNullableMap,
+                  seenNullableMap
+                );
+                if (!fieldFilteredSelectionSet.selections.length) {
+                  return void 0;
                 }
-              }));
+                return {
+                  kind: Kind.INLINE_FRAGMENT,
+                  typeCondition: {
+                    kind: Kind.NAMED_TYPE,
+                    name: {
+                      kind: Kind.NAME,
+                      value: possibleTypeName
+                    }
+                  },
+                  selectionSet: {
+                    kind: Kind.SELECTION_SET,
+                    selections: [
+                      {
+                        ...node,
+                        selectionSet: fieldFilteredSelectionSet
+                      }
+                    ]
+                  }
+                };
+              });
+              const nonEmptySpreads = spreads.filter(Boolean);
+              if (!nonEmptySpreads.length) {
+                return void 0;
+              }
+              return nonEmptySpreads;
             }
           }
           return void 0;
         },
         leave: (node) => {
-          const type2 = typeInfo.getType();
-          if (type2 == null) {
+          const type = typeInfo.getType();
+          if (type == null) {
             return null;
           }
-          const namedType = getNamedType(type2);
+          const namedType = getNamedType(type);
           if (schema.getType(namedType.name) == null) {
             return null;
           }
@@ -1164,23 +1241,6 @@ function finalizeSelectionSet(schema, type, validFragments, selectionSet, onOver
     // will hopefully be fixed in future version of graphql-js to be optional
     filteredSelectionSetVisitorKeys
   );
-  visit(
-    filteredSelectionSet,
-    {
-      [Kind.VARIABLE]: (variableNode) => {
-        usedVariables.push(variableNode.name.value);
-      }
-    },
-    // visitorKeys argument usage a la https://github.com/gatsbyjs/gatsby/blob/master/packages/gatsby-source-graphql/src/batching/merge-queries.js
-    // empty keys cannot be removed only because of typescript errors
-    // will hopefully be fixed in future version of graphql-js to be optional
-    variablesVisitorKeys
-  );
-  return {
-    selectionSet: filteredSelectionSet,
-    usedFragments,
-    usedVariables
-  };
 }
 function union(...arrays) {
   const cache = /* @__PURE__ */ Object.create(null);

package/package.json

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