@graphql-tools/delegate 12.0.4 → 12.0.5-alpha-6bcca2bc60aea3f017e008bd95b91f282608f123

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @graphql-tools/delegate
 
+## 12.0.5-alpha-6bcca2bc60aea3f017e008bd95b91f282608f123
+### Patch Changes
+
+
+
+- [#1901](https://github.com/graphql-hive/gateway/pull/1901) [`8ee616a`](https://github.com/graphql-hive/gateway/commit/8ee616a668eea6cf2b4539a17642ed1f85a9560d) Thanks [@ardatan](https://github.com/ardatan)! - Do not add required fields if they are already present in the original selection set
+
 ## 12.0.4
 ### Patch Changes
 

package/dist/index.cjs

@@ -1283,7 +1283,7 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
     const fieldNodes = fieldNodesByType[parentTypeName];
     if (fieldNodes) {
       for (const fieldNode of fieldNodes) {
-        newSelections.add(fieldNode);
+        addSelectionNodeToSelections(newSelections, fieldNode);
       }
     }
     const interfaceExtensions = interfaceExtensionsMap[parentType.name];
@@ -1300,7 +1300,7 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
             );
             const extraPossibleTypes = getExtraPossibleTypes2(typeName);
             for (const extraPossibleTypeName of extraPossibleTypes) {
-              newSelections.add({
+              addSelectionNodeToSelections(newSelections, {
                 ...selection,
                 typeCondition: {
                   kind: graphql.Kind.NAMED_TYPE,
@@ -1319,13 +1319,13 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
                   const fieldName = subSelection.name.value;
                   const field = fieldMap[fieldName];
                   if (!field) {
-                    newSelections.add(subSelection);
+                    addSelectionNodeToSelections(newSelections, subSelection);
                   }
                 }
               }
             } else if (!typeInSubschema) {
               for (const subSelection of selection.selectionSet.selections) {
-                newSelections.add(subSelection);
+                addSelectionNodeToSelections(newSelections, subSelection);
               }
             }
           }
@@ -1334,10 +1334,10 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
             const fieldNodesForTypeName = fieldNodesByField[parentTypeName]?.["__typename"];
             if (fieldNodesForTypeName) {
               for (const fieldNode of fieldNodesForTypeName) {
-                newSelections.add(fieldNode);
+                addSelectionNodeToSelections(newSelections, fieldNode);
               }
             }
-            newSelections.add(selection);
+            addSelectionNodeToSelections(newSelections, selection);
             continue;
           }
           for (const possibleTypeName of possibleTypes) {
@@ -1347,7 +1347,8 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
               parentType,
               maybePossibleType
             )) {
-              newSelections.add(
+              addSelectionNodeToSelections(
+                newSelections,
                 generateInlineFragment(
                   possibleTypeName,
                   selection.selectionSet
@@ -1356,22 +1357,22 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
             }
           }
           if (possibleTypes.length === 0) {
-            newSelections.add(selection);
+            addSelectionNodeToSelections(newSelections, selection);
           }
         } else {
-          newSelections.add(selection);
+          addSelectionNodeToSelections(newSelections, selection);
         }
       } else if (selection.kind === graphql.Kind.FRAGMENT_SPREAD) {
         const fragmentName = selection.name.value;
         if (!fragmentReplacements[fragmentName]) {
-          newSelections.add(selection);
+          addSelectionNodeToSelections(newSelections, selection);
           continue;
         }
         for (const replacement of fragmentReplacements[fragmentName]) {
           const typeName = replacement.typeName;
           const maybeReplacementType = transformedSchema.getType(typeName);
           if (maybeReplacementType != null && utils.implementsAbstractType(transformedSchema, parentType, maybeType)) {
-            newSelections.add({
+            addSelectionNodeToSelections(newSelections, {
               kind: graphql.Kind.FRAGMENT_SPREAD,
               name: {
                 kind: graphql.Kind.NAME,
@@ -1382,11 +1383,16 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
         }
       } else {
         const fieldName = selection.name.value;
+        if (interfaceExtensions?.[fieldName]) {
+          interfaceExtensionFields.push(selection);
+        } else {
+          addSelectionNodeToSelections(newSelections, selection);
+        }
         if (graphql.isAbstractType(parentType)) {
           const fieldNodesForTypeName = fieldNodesByField[parentTypeName]?.["__typename"];
           if (fieldNodesForTypeName) {
             for (const fieldNode of fieldNodesForTypeName) {
-              newSelections.add(fieldNode);
+              addSelectionNodeToSelections(newSelections, fieldNode);
             }
           }
         }
@@ -1405,20 +1411,15 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
             const selectionSet = selectionSetFn(selection);
             if (selectionSet != null) {
               for (const selection2 of selectionSet.selections) {
-                newSelections.add(selection2);
+                addSelectionNodeToSelections(newSelections, selection2);
               }
             }
           }
         }
-        if (interfaceExtensions?.[fieldName]) {
-          interfaceExtensionFields.push(selection);
-        } else {
-          newSelections.add(selection);
-        }
       }
     }
     if (reversePossibleTypesMap2[parentType.name]) {
-      newSelections.add({
+      addSelectionNodeToSelections(newSelections, {
         kind: graphql.Kind.FIELD,
         name: {
           kind: graphql.Kind.NAME,
@@ -1430,7 +1431,8 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
       const possibleTypes = possibleTypesMap[parentType.name];
       if (possibleTypes != null) {
         for (const possibleType of possibleTypes) {
-          newSelections.add(
+          addSelectionNodeToSelections(
+            newSelections,
             generateInlineFragment(possibleType, {
               kind: graphql.Kind.SELECTION_SET,
               selections: interfaceExtensionFields
@@ -1446,6 +1448,62 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
   }
   return node;
 }
+function isFieldNodeSatisfiedBySelections(fieldNode, existing) {
+  for (const existingSelection of existing) {
+    if (existingSelection.kind === graphql.Kind.FIELD && existingSelection.name.value === fieldNode.name.value && existingSelection.alias?.value === fieldNode.alias?.value) {
+      if (fieldNode.selectionSet && !existingSelection.selectionSet) {
+        return false;
+      }
+      if (fieldNode.selectionSet && existingSelection.selectionSet) {
+        const satisfied = isSelectionSetSatisfied({
+          incoming: fieldNode.selectionSet,
+          existing: existingSelection.selectionSet.selections
+        });
+        if (!satisfied) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }
+  return false;
+}
+function isSelectionSetSatisfied({
+  incoming,
+  existing
+}) {
+  for (const incomingSelection of incoming.selections) {
+    if (incomingSelection.kind === graphql.Kind.FIELD) {
+      const existingField = existing.find((selection) => {
+        return selection.kind === graphql.Kind.FIELD && selection.name.value === incomingSelection.name.value && selection.alias?.value === incomingSelection.alias?.value;
+      });
+      if (!existingField) {
+        return false;
+      }
+      if (incomingSelection.selectionSet && !existingField.selectionSet) {
+        return false;
+      }
+      if (incomingSelection.selectionSet && existingField.selectionSet) {
+        const satisfied = isSelectionSetSatisfied({
+          incoming: incomingSelection.selectionSet,
+          existing: existingField.selectionSet.selections
+        });
+        if (!satisfied) {
+          return false;
+        }
+      }
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+function addSelectionNodeToSelections(selections, selectionNode) {
+  if (selectionNode.kind === graphql.Kind.FIELD && isFieldNodeSatisfiedBySelections(selectionNode, selections)) {
+    return;
+  }
+  selections.add(selectionNode);
+}
 function addDependenciesNestedly(fieldNode, seenFieldNames, fieldNodesByField, newSelections) {
   if (seenFieldNames.has(fieldNode.name.value)) {
     return;
@@ -1454,7 +1512,7 @@ function addDependenciesNestedly(fieldNode, seenFieldNames, fieldNodesByField, n
   const fieldNodes = fieldNodesByField[fieldNode.name.value];
   if (fieldNodes != null) {
     for (const nestedFieldNode of fieldNodes) {
-      newSelections.add(nestedFieldNode);
+      addSelectionNodeToSelections(newSelections, nestedFieldNode);
       addDependenciesNestedly(
         nestedFieldNode,
         seenFieldNames,

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import { ExecutionRequest, ExecutionResult, Executor, Maybe, GraphQLResolveInfo as GraphQLResolveInfo$1 } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import * as graphql from 'graphql';
-import { GraphQLSchema, OperationTypeNode, GraphQLFieldResolver, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, FragmentDefinitionNode, FieldNode, GraphQLNamedType, GraphQLObjectType, GraphQLNamedOutputType, GraphQLInterfaceType, SelectionNode, GraphQLField, TypeInfo, GraphQLType } from 'graphql';
+import { GraphQLSchema, OperationTypeNode, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, GraphQLFieldResolver, FragmentDefinitionNode, FieldNode, GraphQLNamedType, GraphQLObjectType, GraphQLField, GraphQLInterfaceType, SelectionNode, GraphQLNamedOutputType, TypeInfo, GraphQLType } from 'graphql';
 import DataLoader from 'dataloader';
 import { MaybePromise } from '@whatwg-node/promise-helpers';
 export { executorFromSchema as createDefaultExecutor } from '@graphql-tools/executor';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { ExecutionRequest, ExecutionResult, Executor, Maybe, GraphQLResolveInfo as GraphQLResolveInfo$1 } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import * as graphql from 'graphql';
-import { GraphQLSchema, OperationTypeNode, GraphQLFieldResolver, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, FragmentDefinitionNode, FieldNode, GraphQLNamedType, GraphQLObjectType, GraphQLNamedOutputType, GraphQLInterfaceType, SelectionNode, GraphQLField, TypeInfo, GraphQLType } from 'graphql';
+import { GraphQLSchema, OperationTypeNode, GraphQLResolveInfo, GraphQLOutputType, GraphQLError, SelectionSetNode, GraphQLFieldResolver, FragmentDefinitionNode, FieldNode, GraphQLNamedType, GraphQLObjectType, GraphQLField, GraphQLInterfaceType, SelectionNode, GraphQLNamedOutputType, TypeInfo, GraphQLType } from 'graphql';
 import DataLoader from 'dataloader';
 import { MaybePromise } from '@whatwg-node/promise-helpers';
 export { executorFromSchema as createDefaultExecutor } from '@graphql-tools/executor';

package/dist/index.js

@@ -1,4 +1,4 @@
-import { memoize2, memoize1, promiseReduce, collectFields, relocatedError, mergeDeep, pathToArray, getResponseKeyFromInfo, memoize3, getDefinedRootType, createGraphQLError, implementsAbstractType, getRootTypeNames, astFromArg, astFromValueUntyped, asArray, isAsyncIterable, getOperationASTFromRequest } from '@graphql-tools/utils';
+import { memoize2, memoize1, collectFields, relocatedError, mergeDeep, promiseReduce, pathToArray, getResponseKeyFromInfo, memoize3, getDefinedRootType, createGraphQLError, implementsAbstractType, getRootTypeNames, astFromArg, astFromValueUntyped, asArray, isAsyncIterable, getOperationASTFromRequest } from '@graphql-tools/utils';
 export { createDeferred } from '@graphql-tools/utils';
 import { GraphQLError, locatedError, isAbstractType, getNullableType, isLeafType, isCompositeType, isListType, responsePathAsArray, Kind, TypeInfo, versionInfo, visit, visitWithTypeInfo, isNullableType, isUnionType, getNamedType, isObjectType, isInterfaceType, isNonNullType, isInputObjectType, defaultFieldResolver, isSchema, validate } from 'graphql';
 import { handleMaybePromise, isPromise, createDeferredPromise, mapAsyncIterator } from '@whatwg-node/promise-helpers';
@@ -1283,7 +1283,7 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
     const fieldNodes = fieldNodesByType[parentTypeName];
     if (fieldNodes) {
       for (const fieldNode of fieldNodes) {
-        newSelections.add(fieldNode);
+        addSelectionNodeToSelections(newSelections, fieldNode);
       }
     }
     const interfaceExtensions = interfaceExtensionsMap[parentType.name];
@@ -1300,7 +1300,7 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
             );
             const extraPossibleTypes = getExtraPossibleTypes2(typeName);
             for (const extraPossibleTypeName of extraPossibleTypes) {
-              newSelections.add({
+              addSelectionNodeToSelections(newSelections, {
                 ...selection,
                 typeCondition: {
                   kind: Kind.NAMED_TYPE,
@@ -1319,13 +1319,13 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
                   const fieldName = subSelection.name.value;
                   const field = fieldMap[fieldName];
                   if (!field) {
-                    newSelections.add(subSelection);
+                    addSelectionNodeToSelections(newSelections, subSelection);
                   }
                 }
               }
             } else if (!typeInSubschema) {
               for (const subSelection of selection.selectionSet.selections) {
-                newSelections.add(subSelection);
+                addSelectionNodeToSelections(newSelections, subSelection);
               }
             }
           }
@@ -1334,10 +1334,10 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
             const fieldNodesForTypeName = fieldNodesByField[parentTypeName]?.["__typename"];
             if (fieldNodesForTypeName) {
               for (const fieldNode of fieldNodesForTypeName) {
-                newSelections.add(fieldNode);
+                addSelectionNodeToSelections(newSelections, fieldNode);
               }
             }
-            newSelections.add(selection);
+            addSelectionNodeToSelections(newSelections, selection);
             continue;
           }
           for (const possibleTypeName of possibleTypes) {
@@ -1347,7 +1347,8 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
               parentType,
               maybePossibleType
             )) {
-              newSelections.add(
+              addSelectionNodeToSelections(
+                newSelections,
                 generateInlineFragment(
                   possibleTypeName,
                   selection.selectionSet
@@ -1356,22 +1357,22 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
             }
           }
           if (possibleTypes.length === 0) {
-            newSelections.add(selection);
+            addSelectionNodeToSelections(newSelections, selection);
           }
         } else {
-          newSelections.add(selection);
+          addSelectionNodeToSelections(newSelections, selection);
         }
       } else if (selection.kind === Kind.FRAGMENT_SPREAD) {
         const fragmentName = selection.name.value;
         if (!fragmentReplacements[fragmentName]) {
-          newSelections.add(selection);
+          addSelectionNodeToSelections(newSelections, selection);
           continue;
         }
         for (const replacement of fragmentReplacements[fragmentName]) {
           const typeName = replacement.typeName;
           const maybeReplacementType = transformedSchema.getType(typeName);
           if (maybeReplacementType != null && implementsAbstractType(transformedSchema, parentType, maybeType)) {
-            newSelections.add({
+            addSelectionNodeToSelections(newSelections, {
               kind: Kind.FRAGMENT_SPREAD,
               name: {
                 kind: Kind.NAME,
@@ -1382,11 +1383,16 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
         }
       } else {
         const fieldName = selection.name.value;
+        if (interfaceExtensions?.[fieldName]) {
+          interfaceExtensionFields.push(selection);
+        } else {
+          addSelectionNodeToSelections(newSelections, selection);
+        }
         if (isAbstractType(parentType)) {
           const fieldNodesForTypeName = fieldNodesByField[parentTypeName]?.["__typename"];
           if (fieldNodesForTypeName) {
             for (const fieldNode of fieldNodesForTypeName) {
-              newSelections.add(fieldNode);
+              addSelectionNodeToSelections(newSelections, fieldNode);
             }
           }
         }
@@ -1405,20 +1411,15 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
             const selectionSet = selectionSetFn(selection);
             if (selectionSet != null) {
               for (const selection2 of selectionSet.selections) {
-                newSelections.add(selection2);
+                addSelectionNodeToSelections(newSelections, selection2);
               }
             }
           }
         }
-        if (interfaceExtensions?.[fieldName]) {
-          interfaceExtensionFields.push(selection);
-        } else {
-          newSelections.add(selection);
-        }
       }
     }
     if (reversePossibleTypesMap2[parentType.name]) {
-      newSelections.add({
+      addSelectionNodeToSelections(newSelections, {
         kind: Kind.FIELD,
         name: {
           kind: Kind.NAME,
@@ -1430,7 +1431,8 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
       const possibleTypes = possibleTypesMap[parentType.name];
       if (possibleTypes != null) {
         for (const possibleType of possibleTypes) {
-          newSelections.add(
+          addSelectionNodeToSelections(
+            newSelections,
             generateInlineFragment(possibleType, {
               kind: Kind.SELECTION_SET,
               selections: interfaceExtensionFields
@@ -1446,6 +1448,62 @@ function visitSelectionSet(node, fragmentReplacements, transformedSchema, typeIn
   }
   return node;
 }
+function isFieldNodeSatisfiedBySelections(fieldNode, existing) {
+  for (const existingSelection of existing) {
+    if (existingSelection.kind === Kind.FIELD && existingSelection.name.value === fieldNode.name.value && existingSelection.alias?.value === fieldNode.alias?.value) {
+      if (fieldNode.selectionSet && !existingSelection.selectionSet) {
+        return false;
+      }
+      if (fieldNode.selectionSet && existingSelection.selectionSet) {
+        const satisfied = isSelectionSetSatisfied({
+          incoming: fieldNode.selectionSet,
+          existing: existingSelection.selectionSet.selections
+        });
+        if (!satisfied) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }
+  return false;
+}
+function isSelectionSetSatisfied({
+  incoming,
+  existing
+}) {
+  for (const incomingSelection of incoming.selections) {
+    if (incomingSelection.kind === Kind.FIELD) {
+      const existingField = existing.find((selection) => {
+        return selection.kind === Kind.FIELD && selection.name.value === incomingSelection.name.value && selection.alias?.value === incomingSelection.alias?.value;
+      });
+      if (!existingField) {
+        return false;
+      }
+      if (incomingSelection.selectionSet && !existingField.selectionSet) {
+        return false;
+      }
+      if (incomingSelection.selectionSet && existingField.selectionSet) {
+        const satisfied = isSelectionSetSatisfied({
+          incoming: incomingSelection.selectionSet,
+          existing: existingField.selectionSet.selections
+        });
+        if (!satisfied) {
+          return false;
+        }
+      }
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+function addSelectionNodeToSelections(selections, selectionNode) {
+  if (selectionNode.kind === Kind.FIELD && isFieldNodeSatisfiedBySelections(selectionNode, selections)) {
+    return;
+  }
+  selections.add(selectionNode);
+}
 function addDependenciesNestedly(fieldNode, seenFieldNames, fieldNodesByField, newSelections) {
   if (seenFieldNames.has(fieldNode.name.value)) {
     return;
@@ -1454,7 +1512,7 @@ function addDependenciesNestedly(fieldNode, seenFieldNames, fieldNodesByField, n
   const fieldNodes = fieldNodesByField[fieldNode.name.value];
   if (fieldNodes != null) {
     for (const nestedFieldNode of fieldNodes) {
-      newSelections.add(nestedFieldNode);
+      addSelectionNodeToSelections(newSelections, nestedFieldNode);
       addDependenciesNestedly(
         nestedFieldNode,
         seenFieldNames,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "12.0.4",
+  "version": "12.0.5-alpha-6bcca2bc60aea3f017e008bd95b91f282608f123",
   "type": "module",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
@@ -48,9 +48,9 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@types/lodash": "4.17.21",
+    "@types/lodash": "4.17.23",
     "graphql": "^16.12.0",
-    "pkgroll": "2.21.5"
+    "pkgroll": "2.23.0"
   },
   "sideEffects": false
 }