@graphql-tools/executor 4.1.2-alpha-20261020173910-a605a674247c515b91bf401145ced64cc938b464 → 4.1.2

package/cjs/execution/execute.js

@@ -1010,10 +1010,15 @@ function collectAndExecuteSubfields(exeContext, returnType, fieldNodes, path, re
     ensureIncrementalCollectState(exeContext);
     const parentDeferUsage = asyncPayloadRecord?.type === 'defer' ? asyncPayloadRecord.deferUsage : undefined;
     const subfieldCache = (exeContext.incrementalSubfieldCache ??= new WeakMap());
-    let collected = subfieldCache.get(fieldNodes);
+    let collectedByType = subfieldCache.get(fieldNodes);
+    if (collectedByType == null) {
+        collectedByType = new WeakMap();
+        subfieldCache.set(fieldNodes, collectedByType);
+    }
+    let collected = collectedByType.get(returnType);
     if (collected == null) {
         collected = (0, incrementalCollect_js_1.collectIncrementalSubfields)(exeContext.schema, exeContext.fragments, exeContext.variableValues, returnType, fieldNodes, parentDeferUsage, exeContext.deferUsageByFieldNode);
-        subfieldCache.set(fieldNodes, collected);
+        collectedByType.set(returnType, collected);
     }
     const { groupedFieldSet } = collected;
     const parentDeferUsages = new Set();

package/esm/execution/execute.js

@@ -995,10 +995,15 @@ function collectAndExecuteSubfields(exeContext, returnType, fieldNodes, path, re
     ensureIncrementalCollectState(exeContext);
     const parentDeferUsage = asyncPayloadRecord?.type === 'defer' ? asyncPayloadRecord.deferUsage : undefined;
     const subfieldCache = (exeContext.incrementalSubfieldCache ??= new WeakMap());
-    let collected = subfieldCache.get(fieldNodes);
+    let collectedByType = subfieldCache.get(fieldNodes);
+    if (collectedByType == null) {
+        collectedByType = new WeakMap();
+        subfieldCache.set(fieldNodes, collectedByType);
+    }
+    let collected = collectedByType.get(returnType);
     if (collected == null) {
         collected = collectIncrementalSubfields(exeContext.schema, exeContext.fragments, exeContext.variableValues, returnType, fieldNodes, parentDeferUsage, exeContext.deferUsageByFieldNode);
-        subfieldCache.set(fieldNodes, collected);
+        collectedByType.set(returnType, collected);
     }
     const { groupedFieldSet } = collected;
     const parentDeferUsages = new Set();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "4.1.2-alpha-20261020173910-a605a674247c515b91bf401145ced64cc938b464",
+  "version": "4.1.2",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^16.0.0 || ^17.0.0"

package/typings/execution/execute.d.cts

@@ -69,10 +69,12 @@ export interface ExecutionContext<TVariables = any, TContext = any> {
      */
     deferUsagesForFieldNodes?: WeakMap<ReadonlyArray<FieldNode>, DeferUsageSet>;
     /**
-     * Memoize incremental subfield collect per fieldNodes array so list
-     * items reuse the same DeferUsage objects.
+     * Memoize incremental subfield collect per fieldNodes array and
+     * concrete return type so list items of the same type reuse DeferUsage
+     * objects without sharing type-conditioned selections across a
+     * heterogeneous interface or union list.
      */
-    incrementalSubfieldCache?: WeakMap<ReadonlyArray<FieldNode>, ReturnType<typeof collectIncrementalSubfields>>;
+    incrementalSubfieldCache?: WeakMap<ReadonlyArray<FieldNode>, WeakMap<GraphQLObjectType, ReturnType<typeof collectIncrementalSubfields>>>;
     signal?: AbortSignal;
     getAbortSignal: () => AbortSignal | undefined;
     getAsyncHelpers: () => {

package/typings/execution/execute.d.ts

@@ -69,10 +69,12 @@ export interface ExecutionContext<TVariables = any, TContext = any> {
      */
     deferUsagesForFieldNodes?: WeakMap<ReadonlyArray<FieldNode>, DeferUsageSet>;
     /**
-     * Memoize incremental subfield collect per fieldNodes array so list
-     * items reuse the same DeferUsage objects.
+     * Memoize incremental subfield collect per fieldNodes array and
+     * concrete return type so list items of the same type reuse DeferUsage
+     * objects without sharing type-conditioned selections across a
+     * heterogeneous interface or union list.
      */
-    incrementalSubfieldCache?: WeakMap<ReadonlyArray<FieldNode>, ReturnType<typeof collectIncrementalSubfields>>;
+    incrementalSubfieldCache?: WeakMap<ReadonlyArray<FieldNode>, WeakMap<GraphQLObjectType, ReturnType<typeof collectIncrementalSubfields>>>;
     signal?: AbortSignal;
     getAbortSignal: () => AbortSignal | undefined;
     getAsyncHelpers: () => {