@graphql-tools/delegate 7.0.8-alpha-f9bebbe6.0 → 7.0.8

package/es5/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate/es5",
-  "version": "7.0.8-alpha-f9bebbe6.0",
+  "version": "7.0.8",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -8,14 +8,18 @@
   },
   "dependencies": {
     "@ardatan/aggregate-error": "0.0.6",
-    "@graphql-tools/batch-execute": "7.0.1-alpha-f9bebbe6.0",
-    "@graphql-tools/schema": "7.1.3-alpha-f9bebbe6.0",
-    "@graphql-tools/utils": "7.1.4-alpha-f9bebbe6.0",
+    "@graphql-tools/batch-execute": "^7.0.0",
+    "@graphql-tools/schema": "^7.0.0",
+    "@graphql-tools/utils": "^7.1.6",
     "dataloader": "2.0.0",
     "is-promise": "4.0.0",
     "tslib": "~2.0.1"
   },
-  "repository": "git@github.com:ardatan/graphql-tools.git",
+  "repository": {
+    "type": "git",
+    "url": "ardatan/graphql-tools",
+    "directory": "packages/delegate"
+  },
   "license": "MIT",
   "main": "index.cjs.js",
   "module": "index.esm.js",

package/es5/types.d.ts

@@ -137,6 +137,7 @@ export interface MergedFieldConfig {
 export declare type MergedTypeResolver = (originalResult: any, context: Record<string, any>, info: GraphQLResolveInfo, subschema: GraphQLSchema | SubschemaConfig, selectionSet: SelectionSetNode, key?: any) => any;
 export interface StitchingInfo {
     subschemaMap: Map<GraphQLSchema | SubschemaConfig, Subschema>;
+    selectionSetsByType: Record<string, SelectionSetNode>;
     selectionSetsByField: Record<string, Record<string, SelectionSetNode>>;
     dynamicSelectionSetsByField: Record<string, Record<string, Array<(node: FieldNode) => SelectionSetNode>>>;
     mergedTypes: Record<string, MergedTypeInfo>;

package/index.cjs.js

@@ -623,8 +623,13 @@ function resolveExternalValue(result, unpathedErrors, subschema, context, info,
 }
 function resolveExternalObject(type, object, unpathedErrors, subschema, context, info, skipTypeMerging) {
     var _a;
-    const stitchingInfo = (_a = info === null || info === void 0 ? void 0 : info.schema.extensions) === null || _a === void 0 ? void 0 : _a.stitchingInfo;
+    // if we have already resolved this object, for example, when the identical object appears twice
+    // in a list, see https://github.com/ardatan/graphql-tools/issues/2304
+    if (isExternalObject(object)) {
+        return object;
+    }
     annotateExternalObject(object, unpathedErrors, subschema);
+    const stitchingInfo = (_a = info === null || info === void 0 ? void 0 : info.schema.extensions) === null || _a === void 0 ? void 0 : _a.stitchingInfo;
     if (skipTypeMerging || !stitchingInfo) {
         return object;
     }
@@ -1529,7 +1534,7 @@ function defaultDelegationBinding(delegationContext) {
     if (stitchingInfo != null) {
         delegationTransforms = delegationTransforms.concat([
             new ExpandAbstractTypes(),
-            new AddSelectionSets({}, stitchingInfo.selectionSetsByField, stitchingInfo.dynamicSelectionSetsByField),
+            new AddSelectionSets(stitchingInfo.selectionSetsByType, stitchingInfo.selectionSetsByField, stitchingInfo.dynamicSelectionSetsByField),
             new WrapConcreteTypes(),
         ]);
     }