@graphql-tools/executor 2.0.0-alpha-20240804115549-7dfd59247669dee6217565e3327c429dc5d3bff2 → 2.0.0-alpha-20240805144842-131e76d507ce82e59a400bf90758e7af71493abf

package/cjs/execution/IncrementalPublisher.js

@@ -40,10 +40,14 @@ class IncrementalPublisher {
     }
     buildResponse(data, errors, incrementalDataRecords) {
         const newPending = this._incrementalGraph.getNewPending(incrementalDataRecords);
-        const pending = this._pendingSourcesToResults(newPending);
-        const initialResult = errors === undefined
-            ? { data, pending, hasNext: true }
-            : { errors, data, pending, hasNext: true };
+        const initialResult = this._context
+            .useIncrementalNotifications
+            ? errors === undefined
+                ? { data, pending: this._pendingSourcesToResults(newPending), hasNext: true }
+                : { errors, data, pending: this._pendingSourcesToResults(newPending), hasNext: true }
+            : errors === undefined
+                ? { data, hasNext: true }
+                : { errors, data, hasNext: true };
         return {
             initialResult,
             subsequentResults: this._subscribe(),
@@ -158,33 +162,29 @@ class IncrementalPublisher {
         if ((0, types_js_1.isFailedExecutionGroup)(completedExecutionGroup)) {
             for (const deferredFragmentRecord of completedExecutionGroup.pendingExecutionGroup
                 .deferredFragmentRecords) {
-                const id = deferredFragmentRecord.id;
                 if (!this._incrementalGraph.removeDeferredFragment(deferredFragmentRecord)) {
                     // This can occur if multiple deferred grouped field sets error for a fragment.
                     continue;
                 }
-                (0, invariant_js_1.invariant)(id !== undefined);
-                if (this._context.sendIncrementalErrorsAsNull) {
-                    const incrementalEntry = {
+                if (this._context.useIncrementalNotifications) {
+                    const id = deferredFragmentRecord.id;
+                    (0, invariant_js_1.invariant)(id !== undefined);
+                    context.completed.push({
                         id,
-                        data: null,
                         errors: completedExecutionGroup.errors,
-                    };
-                    if (this._context.sendPathAndLabelOnIncremental) {
-                        const { path, label } = deferredFragmentRecord;
-                        incrementalEntry.path = (0, utils_1.pathToArray)(path);
-                        if (label !== undefined) {
-                            incrementalEntry.label = label;
-                        }
-                    }
-                    context.incremental.push(incrementalEntry);
-                    context.completed.push({ id });
+                    });
                 }
                 else {
-                    context.completed.push({
-                        id,
+                    const incrementalEntry = {
                         errors: completedExecutionGroup.errors,
-                    });
+                        data: null,
+                    };
+                    const { path, label } = deferredFragmentRecord;
+                    incrementalEntry.path = (0, utils_1.pathToArray)(path);
+                    if (label !== undefined) {
+                        incrementalEntry.label = label;
+                    }
+                    context.incremental.push(incrementalEntry);
                 }
             }
             return;
@@ -196,58 +196,62 @@ class IncrementalPublisher {
             if (completion === undefined) {
                 continue;
             }
-            const id = deferredFragmentRecord.id;
-            (0, invariant_js_1.invariant)(id !== undefined);
             const incremental = context.incremental;
-            const { newPending, successfulExecutionGroups } = completion;
-            context.pending.push(...this._pendingSourcesToResults(newPending));
-            for (const successfulExecutionGroup of successfulExecutionGroups) {
-                const { bestId, subPath } = this._getBestIdAndSubPath(id, deferredFragmentRecord, successfulExecutionGroup);
-                const incrementalEntry = {
-                    ...successfulExecutionGroup.result,
-                    id: bestId,
-                };
-                if (this._context.sendPathAndLabelOnIncremental) {
+            const successfulExecutionGroups = completion.successfulExecutionGroups;
+            if (this._context.useIncrementalNotifications) {
+                const id = deferredFragmentRecord.id;
+                (0, invariant_js_1.invariant)(id !== undefined);
+                context.pending.push(...this._pendingSourcesToResults(completion.newPending));
+                for (const successfulExecutionGroup of successfulExecutionGroups) {
+                    const { bestId, subPath } = this._getBestIdAndSubPath(id, deferredFragmentRecord, successfulExecutionGroup);
+                    const incrementalEntry = {
+                        ...successfulExecutionGroup.result,
+                        id: bestId,
+                    };
+                    if (subPath !== undefined) {
+                        incrementalEntry.subPath = subPath;
+                    }
+                    incremental.push(incrementalEntry);
+                }
+                context.completed.push({ id });
+            }
+            else {
+                for (const successfulExecutionGroup of successfulExecutionGroups) {
+                    const incrementalEntry = {
+                        ...successfulExecutionGroup.result,
+                    };
                     const { path, label } = deferredFragmentRecord;
                     incrementalEntry.path = (0, utils_1.pathToArray)(path);
                     if (label !== undefined) {
                         incrementalEntry.label = label;
                     }
+                    incremental.push(incrementalEntry);
                 }
-                if (subPath !== undefined) {
-                    incrementalEntry.subPath = subPath;
-                }
-                incremental.push(incrementalEntry);
             }
-            context.completed.push({ id });
         }
     }
     _handleCompletedStreamItems(streamItemsResult, context) {
         const streamRecord = streamItemsResult.streamRecord;
-        const id = streamRecord.id;
-        (0, invariant_js_1.invariant)(id !== undefined);
         if (streamItemsResult.errors !== undefined) {
-            if (this._context.sendIncrementalErrorsAsNull) {
-                const incrementalEntry = {
-                    items: null,
+            if (this._context.useIncrementalNotifications) {
+                const id = streamRecord.id;
+                (0, invariant_js_1.invariant)(id !== undefined);
+                context.completed.push({
                     id,
                     errors: streamItemsResult.errors,
-                };
-                if (this._context.sendPathAndLabelOnIncremental) {
-                    const { path, label, index } = streamRecord;
-                    incrementalEntry.path = (0, utils_1.pathToArray)((0, utils_1.addPath)(path, index, undefined));
-                    if (label !== undefined) {
-                        incrementalEntry.label = label;
-                    }
-                }
-                context.incremental.push(incrementalEntry);
-                context.completed.push({ id });
+                });
             }
             else {
-                context.completed.push({
-                    id,
+                const incrementalEntry = {
                     errors: streamItemsResult.errors,
-                });
+                    items: null,
+                };
+                const { path, label, index } = streamRecord;
+                incrementalEntry.path = (0, utils_1.pathToArray)((0, utils_1.addPath)(path, index, undefined));
+                if (label !== undefined) {
+                    incrementalEntry.label = label;
+                }
+                context.incremental.push(incrementalEntry);
             }
             this._incrementalGraph.removeStream(streamRecord);
             if ((0, types_js_1.isCancellableStreamRecord)(streamRecord)) {
@@ -260,7 +264,11 @@ class IncrementalPublisher {
             }
         }
         else if (streamItemsResult.result === undefined) {
-            context.completed.push({ id });
+            if (this._context.useIncrementalNotifications) {
+                const id = streamRecord.id;
+                (0, invariant_js_1.invariant)(id !== undefined);
+                context.completed.push({ id });
+            }
             this._incrementalGraph.removeStream(streamRecord);
             if ((0, types_js_1.isCancellableStreamRecord)(streamRecord)) {
                 (0, invariant_js_1.invariant)(this._context.cancellableStreams !== undefined);
@@ -270,10 +278,14 @@ class IncrementalPublisher {
         else {
             const bareResult = streamItemsResult.result;
             const incrementalEntry = {
-                id,
                 ...bareResult,
             };
-            if (this._context.sendPathAndLabelOnIncremental) {
+            if (this._context.useIncrementalNotifications) {
+                const id = streamRecord.id;
+                (0, invariant_js_1.invariant)(id !== undefined);
+                incrementalEntry.id = id;
+            }
+            else {
                 const { path, label, index } = streamRecord;
                 incrementalEntry.path = (0, utils_1.pathToArray)((0, utils_1.addPath)(path, index, undefined));
                 streamRecord.index += bareResult.items.length;
@@ -285,7 +297,9 @@ class IncrementalPublisher {
             const incrementalDataRecords = streamItemsResult.incrementalDataRecords;
             if (incrementalDataRecords !== undefined) {
                 const newPending = this._incrementalGraph.getNewPending(incrementalDataRecords);
-                context.pending.push(...this._pendingSourcesToResults(newPending));
+                if (this._context.useIncrementalNotifications) {
+                    context.pending.push(...this._pendingSourcesToResults(newPending));
+                }
             }
         }
     }

package/cjs/execution/collectFields.js

@@ -14,7 +14,7 @@ const invariant_js_1 = require("./invariant.js");
  *
  * @internal
  */
-function collectFields(schema, fragments, variableValues, runtimeType, selectionSet, errorWithIncrementalSubscription) {
+function collectFields(schema, fragments, variableValues, runtimeType, selectionSet, errorOnSubscriptionWithIncrementalDelivery) {
     const groupedFieldSet = new AccumulatorMap_js_1.AccumulatorMap();
     const newDeferUsages = [];
     const context = {
@@ -22,7 +22,7 @@ function collectFields(schema, fragments, variableValues, runtimeType, selection
         fragments,
         variableValues,
         runtimeType,
-        errorWithIncrementalSubscription,
+        errorOnSubscriptionWithIncrementalDelivery,
         visitedFragmentNames: new Set(),
     };
     collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsages);
@@ -39,13 +39,13 @@ exports.collectFields = collectFields;
  *
  * @internal
  */
-function collectSubfields(schema, fragments, variableValues, errorWithIncrementalSubscription, returnType, fieldGroup) {
+function collectSubfields(schema, fragments, variableValues, errorOnSubscriptionWithIncrementalDelivery, returnType, fieldGroup) {
     const context = {
         schema,
         fragments,
         variableValues,
         runtimeType: returnType,
-        errorWithIncrementalSubscription,
+        errorOnSubscriptionWithIncrementalDelivery,
         visitedFragmentNames: new Set(),
     };
     const subGroupedFieldSet = new AccumulatorMap_js_1.AccumulatorMap();
@@ -63,7 +63,7 @@ function collectSubfields(schema, fragments, variableValues, errorWithIncrementa
 }
 exports.collectSubfields = collectSubfields;
 function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsages, deferUsage) {
-    const { schema, fragments, variableValues, runtimeType, errorWithIncrementalSubscription, visitedFragmentNames, } = context;
+    const { schema, fragments, variableValues, runtimeType, errorOnSubscriptionWithIncrementalDelivery, visitedFragmentNames, } = context;
     for (const selection of selectionSet.selections) {
         switch (selection.kind) {
             case graphql_1.Kind.FIELD: {
@@ -81,7 +81,7 @@ function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsage
                     !doesFragmentConditionMatch(schema, selection, runtimeType)) {
                     continue;
                 }
-                const newDeferUsage = getDeferUsage(errorWithIncrementalSubscription, variableValues, selection, deferUsage);
+                const newDeferUsage = getDeferUsage(errorOnSubscriptionWithIncrementalDelivery, variableValues, selection, deferUsage);
                 if (!newDeferUsage) {
                     collectFieldsImpl(context, selection.selectionSet, groupedFieldSet, newDeferUsages, deferUsage);
                 }
@@ -93,7 +93,7 @@ function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsage
             }
             case graphql_1.Kind.FRAGMENT_SPREAD: {
                 const fragName = selection.name.value;
-                const newDeferUsage = getDeferUsage(errorWithIncrementalSubscription, variableValues, selection, deferUsage);
+                const newDeferUsage = getDeferUsage(errorOnSubscriptionWithIncrementalDelivery, variableValues, selection, deferUsage);
                 if (!newDeferUsage &&
                     (visitedFragmentNames.has(fragName) || !shouldIncludeNode(variableValues, selection))) {
                     continue;
@@ -120,7 +120,7 @@ function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsage
  * deferred based on the experimental flag, defer directive present and
  * not disabled by the "if" argument.
  */
-function getDeferUsage(errorWithIncrementalSubscription, variableValues, node, parentDeferUsage) {
+function getDeferUsage(errorOnSubscriptionWithIncrementalDelivery, variableValues, node, parentDeferUsage) {
     const defer = (0, graphql_1.getDirectiveValues)(utils_1.GraphQLDeferDirective, node, variableValues);
     if (!defer) {
         return;
@@ -128,7 +128,7 @@ function getDeferUsage(errorWithIncrementalSubscription, variableValues, node, p
     if (defer['if'] === false) {
         return;
     }
-    (0, invariant_js_1.invariant)(!errorWithIncrementalSubscription, '`@defer` directive not supported on subscription operations. Disable `@defer` by setting the `if` argument to `false`.');
+    (0, invariant_js_1.invariant)(!errorOnSubscriptionWithIncrementalDelivery, '`@defer` directive not supported on subscription operations. Disable `@defer` by setting the `if` argument to `false`.');
     return {
         label: typeof defer['label'] === 'string' ? defer['label'] : undefined,
         parentDeferUsage,

package/cjs/execution/execute.js

@@ -19,7 +19,7 @@ const values_js_1 = require("./values.js");
  * type. Memoizing ensures the subfields are not repeatedly calculated, which
  * saves overhead when resolving lists of values.
  */
-const collectSubfields = (0, utils_1.memoize3)((exeContext, returnType, fieldGroup) => (0, collectFields_js_1.collectSubfields)(exeContext.schema, exeContext.fragments, exeContext.variableValues, exeContext.errorWithIncrementalSubscription, returnType, fieldGroup));
+const collectSubfields = (0, utils_1.memoize3)((exeContext, returnType, fieldGroup) => (0, collectFields_js_1.collectSubfields)(exeContext.schema, exeContext.fragments, exeContext.variableValues, exeContext.errorOnSubscriptionWithIncrementalDelivery, returnType, fieldGroup));
 /**
  * Implements the "Executing requests" section of the GraphQL specification,
  * including `@defer` and `@stream` as proposed in
@@ -155,7 +155,7 @@ exports.getFragmentsFromDocument = (0, utils_1.memoize1)(function getFragmentsFr
  * @internal
  */
 function buildExecutionContext(args) {
-    const { schema, document, rootValue, contextValue, variableValues: rawVariableValues, operationName, fieldResolver, typeResolver, subscribeFieldResolver, enableEarlyExecution, deduplicateDefers, sendIncrementalErrorsAsNull, sendPathAndLabelOnIncremental, errorWithIncrementalSubscription, signal, } = args;
+    const { schema, document, rootValue, contextValue, variableValues: rawVariableValues, operationName, fieldResolver, typeResolver, subscribeFieldResolver, enableEarlyExecution, incrementalPreset, deferWithoutDuplication, useIncrementalNotifications, errorOnSubscriptionWithIncrementalDelivery, signal, } = args;
     // If the schema used for execution is invalid, throw an error.
     (0, graphql_1.assertValidSchema)(schema);
     const fragments = (0, exports.getFragmentsFromDocument)(document);
@@ -194,6 +194,7 @@ function buildExecutionContext(args) {
     if (coercedVariableValues.errors) {
         return coercedVariableValues.errors;
     }
+    const latestPreset = incrementalPreset !== 'v17.0.0-alpha.2';
     return {
         schema,
         fragments,
@@ -205,10 +206,12 @@ function buildExecutionContext(args) {
         typeResolver: typeResolver ?? exports.defaultTypeResolver,
         subscribeFieldResolver: subscribeFieldResolver ?? exports.defaultFieldResolver,
         enableEarlyExecution: enableEarlyExecution !== false,
-        deduplicateDefers: deduplicateDefers !== false,
-        sendIncrementalErrorsAsNull: sendIncrementalErrorsAsNull === true,
-        sendPathAndLabelOnIncremental: sendPathAndLabelOnIncremental === true,
-        errorWithIncrementalSubscription: operation.operation === 'subscription' && errorWithIncrementalSubscription !== false,
+        deferWithoutDuplication: deferWithoutDuplication != null ? deferWithoutDuplication : latestPreset,
+        useIncrementalNotifications: useIncrementalNotifications != null ? useIncrementalNotifications : latestPreset,
+        errorOnSubscriptionWithIncrementalDelivery: operation.operation === 'subscription' &&
+            (errorOnSubscriptionWithIncrementalDelivery != null
+                ? errorOnSubscriptionWithIncrementalDelivery
+                : latestPreset),
         signal,
         errors: undefined,
         cancellableStreams: undefined,
@@ -231,14 +234,14 @@ function executeOperation(exeContext) {
         throw exeContext.signal.reason;
     }
     try {
-        const { operation, schema, fragments, variableValues, rootValue, deduplicateDefers, errorWithIncrementalSubscription, } = exeContext;
+        const { operation, schema, fragments, variableValues, rootValue, deferWithoutDuplication, errorOnSubscriptionWithIncrementalDelivery, } = exeContext;
         const rootType = (0, utils_1.getDefinedRootType)(schema, operation.operation, [operation]);
         if (rootType == null) {
             (0, utils_1.createGraphQLError)(`Schema is not configured to execute ${operation.operation} operation.`, {
                 nodes: operation,
             });
         }
-        const collectedFields = (0, collectFields_js_1.collectFields)(schema, fragments, variableValues, rootType, operation.selectionSet, errorWithIncrementalSubscription);
+        const collectedFields = (0, collectFields_js_1.collectFields)(schema, fragments, variableValues, rootType, operation.selectionSet, errorOnSubscriptionWithIncrementalDelivery);
         let groupedFieldSet = collectedFields.groupedFieldSet;
         const newDeferUsages = collectedFields.newDeferUsages;
         let data;
@@ -246,7 +249,7 @@ function executeOperation(exeContext) {
             data = executeRootGroupedFieldSet(exeContext, operation.operation, rootType, rootValue, groupedFieldSet, undefined);
         }
         else {
-            const executionPlan = deduplicateDefers
+            const executionPlan = deferWithoutDuplication
                 ? (0, buildExecutionPlan_js_1.buildExecutionPlan)(groupedFieldSet)
                 : (0, buildExecutionPlan_js_1.buildBranchingExecutionPlan)(groupedFieldSet);
             groupedFieldSet = executionPlan.groupedFieldSet;
@@ -560,7 +563,7 @@ function getStreamUsage(exeContext, fieldGroup, path) {
     }
     (0, invariant_js_1.invariant)(typeof stream['initialCount'] === 'number', 'initialCount must be a number');
     (0, invariant_js_1.invariant)(stream['initialCount'] >= 0, 'initialCount must be a positive integer');
-    (0, invariant_js_1.invariant)(!exeContext.errorWithIncrementalSubscription, '`@stream` directive not supported on subscription operations. Disable `@stream` by setting the `if` argument to `false`.');
+    (0, invariant_js_1.invariant)(!exeContext.errorOnSubscriptionWithIncrementalDelivery, '`@stream` directive not supported on subscription operations. Disable `@stream` by setting the `if` argument to `false`.');
     const streamedFieldGroup = fieldGroup.map(fieldDetails => ({
         node: fieldDetails.node,
         deferUsage: undefined,
@@ -869,7 +872,7 @@ function collectAndExecuteSubfields(exeContext, returnType, fieldGroup, path, re
     if (deferMap === undefined && newDeferUsages.length === 0) {
         return executeFields(exeContext, returnType, result, path, groupedFieldSet, incrementalContext, undefined);
     }
-    const subExecutionPlan = buildSubExecutionPlan(groupedFieldSet, incrementalContext?.deferUsageSet, exeContext.deduplicateDefers);
+    const subExecutionPlan = buildSubExecutionPlan(groupedFieldSet, incrementalContext?.deferUsageSet, exeContext.deferWithoutDuplication);
     groupedFieldSet = subExecutionPlan.groupedFieldSet;
     const newGroupedFieldSets = subExecutionPlan.newGroupedFieldSets;
     const newDeferMap = addNewDeferredFragments(newDeferUsages, new Map(deferMap), path);
@@ -881,13 +884,13 @@ function collectAndExecuteSubfields(exeContext, returnType, fieldGroup, path, re
     }
     return subFields;
 }
-function buildSubExecutionPlan(originalGroupedFieldSet, deferUsageSet, deduplicateDefers) {
+function buildSubExecutionPlan(originalGroupedFieldSet, deferUsageSet, deferWithoutDuplication) {
     let executionPlan = originalGroupedFieldSet
         ._executionPlan;
     if (executionPlan !== undefined) {
         return executionPlan;
     }
-    executionPlan = deduplicateDefers
+    executionPlan = deferWithoutDuplication
         ? (0, buildExecutionPlan_js_1.buildExecutionPlan)(originalGroupedFieldSet, deferUsageSet)
         : (0, buildExecutionPlan_js_1.buildBranchingExecutionPlan)(originalGroupedFieldSet, deferUsageSet);
     originalGroupedFieldSet._executionPlan =
@@ -1059,14 +1062,14 @@ function createSourceEventStreamImpl(exeContext) {
     }
 }
 function executeSubscription(exeContext) {
-    const { schema, fragments, operation, variableValues, rootValue, errorWithIncrementalSubscription, } = exeContext;
+    const { schema, fragments, operation, variableValues, rootValue, errorOnSubscriptionWithIncrementalDelivery, } = exeContext;
     const rootType = schema.getSubscriptionType();
     if (rootType == null) {
         throw (0, utils_1.createGraphQLError)('Schema is not configured to execute subscription operation.', {
             nodes: operation,
         });
     }
-    const { groupedFieldSet } = (0, collectFields_js_1.collectFields)(schema, fragments, variableValues, rootType, operation.selectionSet, errorWithIncrementalSubscription);
+    const { groupedFieldSet } = (0, collectFields_js_1.collectFields)(schema, fragments, variableValues, rootType, operation.selectionSet, errorOnSubscriptionWithIncrementalDelivery);
     const firstRootField = [...groupedFieldSet.entries()][0];
     const [responseName, fieldGroup] = firstRootField;
     const fieldName = fieldGroup[0].node.name.value;

package/esm/execution/IncrementalPublisher.js

@@ -36,10 +36,14 @@ class IncrementalPublisher {
     }
     buildResponse(data, errors, incrementalDataRecords) {
         const newPending = this._incrementalGraph.getNewPending(incrementalDataRecords);
-        const pending = this._pendingSourcesToResults(newPending);
-        const initialResult = errors === undefined
-            ? { data, pending, hasNext: true }
-            : { errors, data, pending, hasNext: true };
+        const initialResult = this._context
+            .useIncrementalNotifications
+            ? errors === undefined
+                ? { data, pending: this._pendingSourcesToResults(newPending), hasNext: true }
+                : { errors, data, pending: this._pendingSourcesToResults(newPending), hasNext: true }
+            : errors === undefined
+                ? { data, hasNext: true }
+                : { errors, data, hasNext: true };
         return {
             initialResult,
             subsequentResults: this._subscribe(),
@@ -154,33 +158,29 @@ class IncrementalPublisher {
         if (isFailedExecutionGroup(completedExecutionGroup)) {
             for (const deferredFragmentRecord of completedExecutionGroup.pendingExecutionGroup
                 .deferredFragmentRecords) {
-                const id = deferredFragmentRecord.id;
                 if (!this._incrementalGraph.removeDeferredFragment(deferredFragmentRecord)) {
                     // This can occur if multiple deferred grouped field sets error for a fragment.
                     continue;
                 }
-                invariant(id !== undefined);
-                if (this._context.sendIncrementalErrorsAsNull) {
-                    const incrementalEntry = {
+                if (this._context.useIncrementalNotifications) {
+                    const id = deferredFragmentRecord.id;
+                    invariant(id !== undefined);
+                    context.completed.push({
                         id,
-                        data: null,
                         errors: completedExecutionGroup.errors,
-                    };
-                    if (this._context.sendPathAndLabelOnIncremental) {
-                        const { path, label } = deferredFragmentRecord;
-                        incrementalEntry.path = pathToArray(path);
-                        if (label !== undefined) {
-                            incrementalEntry.label = label;
-                        }
-                    }
-                    context.incremental.push(incrementalEntry);
-                    context.completed.push({ id });
+                    });
                 }
                 else {
-                    context.completed.push({
-                        id,
+                    const incrementalEntry = {
                         errors: completedExecutionGroup.errors,
-                    });
+                        data: null,
+                    };
+                    const { path, label } = deferredFragmentRecord;
+                    incrementalEntry.path = pathToArray(path);
+                    if (label !== undefined) {
+                        incrementalEntry.label = label;
+                    }
+                    context.incremental.push(incrementalEntry);
                 }
             }
             return;
@@ -192,58 +192,62 @@ class IncrementalPublisher {
             if (completion === undefined) {
                 continue;
             }
-            const id = deferredFragmentRecord.id;
-            invariant(id !== undefined);
             const incremental = context.incremental;
-            const { newPending, successfulExecutionGroups } = completion;
-            context.pending.push(...this._pendingSourcesToResults(newPending));
-            for (const successfulExecutionGroup of successfulExecutionGroups) {
-                const { bestId, subPath } = this._getBestIdAndSubPath(id, deferredFragmentRecord, successfulExecutionGroup);
-                const incrementalEntry = {
-                    ...successfulExecutionGroup.result,
-                    id: bestId,
-                };
-                if (this._context.sendPathAndLabelOnIncremental) {
+            const successfulExecutionGroups = completion.successfulExecutionGroups;
+            if (this._context.useIncrementalNotifications) {
+                const id = deferredFragmentRecord.id;
+                invariant(id !== undefined);
+                context.pending.push(...this._pendingSourcesToResults(completion.newPending));
+                for (const successfulExecutionGroup of successfulExecutionGroups) {
+                    const { bestId, subPath } = this._getBestIdAndSubPath(id, deferredFragmentRecord, successfulExecutionGroup);
+                    const incrementalEntry = {
+                        ...successfulExecutionGroup.result,
+                        id: bestId,
+                    };
+                    if (subPath !== undefined) {
+                        incrementalEntry.subPath = subPath;
+                    }
+                    incremental.push(incrementalEntry);
+                }
+                context.completed.push({ id });
+            }
+            else {
+                for (const successfulExecutionGroup of successfulExecutionGroups) {
+                    const incrementalEntry = {
+                        ...successfulExecutionGroup.result,
+                    };
                     const { path, label } = deferredFragmentRecord;
                     incrementalEntry.path = pathToArray(path);
                     if (label !== undefined) {
                         incrementalEntry.label = label;
                     }
+                    incremental.push(incrementalEntry);
                 }
-                if (subPath !== undefined) {
-                    incrementalEntry.subPath = subPath;
-                }
-                incremental.push(incrementalEntry);
             }
-            context.completed.push({ id });
         }
     }
     _handleCompletedStreamItems(streamItemsResult, context) {
         const streamRecord = streamItemsResult.streamRecord;
-        const id = streamRecord.id;
-        invariant(id !== undefined);
         if (streamItemsResult.errors !== undefined) {
-            if (this._context.sendIncrementalErrorsAsNull) {
-                const incrementalEntry = {
-                    items: null,
+            if (this._context.useIncrementalNotifications) {
+                const id = streamRecord.id;
+                invariant(id !== undefined);
+                context.completed.push({
                     id,
                     errors: streamItemsResult.errors,
-                };
-                if (this._context.sendPathAndLabelOnIncremental) {
-                    const { path, label, index } = streamRecord;
-                    incrementalEntry.path = pathToArray(addPath(path, index, undefined));
-                    if (label !== undefined) {
-                        incrementalEntry.label = label;
-                    }
-                }
-                context.incremental.push(incrementalEntry);
-                context.completed.push({ id });
+                });
             }
             else {
-                context.completed.push({
-                    id,
+                const incrementalEntry = {
                     errors: streamItemsResult.errors,
-                });
+                    items: null,
+                };
+                const { path, label, index } = streamRecord;
+                incrementalEntry.path = pathToArray(addPath(path, index, undefined));
+                if (label !== undefined) {
+                    incrementalEntry.label = label;
+                }
+                context.incremental.push(incrementalEntry);
             }
             this._incrementalGraph.removeStream(streamRecord);
             if (isCancellableStreamRecord(streamRecord)) {
@@ -256,7 +260,11 @@ class IncrementalPublisher {
             }
         }
         else if (streamItemsResult.result === undefined) {
-            context.completed.push({ id });
+            if (this._context.useIncrementalNotifications) {
+                const id = streamRecord.id;
+                invariant(id !== undefined);
+                context.completed.push({ id });
+            }
             this._incrementalGraph.removeStream(streamRecord);
             if (isCancellableStreamRecord(streamRecord)) {
                 invariant(this._context.cancellableStreams !== undefined);
@@ -266,10 +274,14 @@ class IncrementalPublisher {
         else {
             const bareResult = streamItemsResult.result;
             const incrementalEntry = {
-                id,
                 ...bareResult,
             };
-            if (this._context.sendPathAndLabelOnIncremental) {
+            if (this._context.useIncrementalNotifications) {
+                const id = streamRecord.id;
+                invariant(id !== undefined);
+                incrementalEntry.id = id;
+            }
+            else {
                 const { path, label, index } = streamRecord;
                 incrementalEntry.path = pathToArray(addPath(path, index, undefined));
                 streamRecord.index += bareResult.items.length;
@@ -281,7 +293,9 @@ class IncrementalPublisher {
             const incrementalDataRecords = streamItemsResult.incrementalDataRecords;
             if (incrementalDataRecords !== undefined) {
                 const newPending = this._incrementalGraph.getNewPending(incrementalDataRecords);
-                context.pending.push(...this._pendingSourcesToResults(newPending));
+                if (this._context.useIncrementalNotifications) {
+                    context.pending.push(...this._pendingSourcesToResults(newPending));
+                }
             }
         }
     }

package/esm/execution/collectFields.js

@@ -11,7 +11,7 @@ import { invariant } from './invariant.js';
  *
  * @internal
  */
-export function collectFields(schema, fragments, variableValues, runtimeType, selectionSet, errorWithIncrementalSubscription) {
+export function collectFields(schema, fragments, variableValues, runtimeType, selectionSet, errorOnSubscriptionWithIncrementalDelivery) {
     const groupedFieldSet = new AccumulatorMap();
     const newDeferUsages = [];
     const context = {
@@ -19,7 +19,7 @@ export function collectFields(schema, fragments, variableValues, runtimeType, se
         fragments,
         variableValues,
         runtimeType,
-        errorWithIncrementalSubscription,
+        errorOnSubscriptionWithIncrementalDelivery,
         visitedFragmentNames: new Set(),
     };
     collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsages);
@@ -35,13 +35,13 @@ export function collectFields(schema, fragments, variableValues, runtimeType, se
  *
  * @internal
  */
-export function collectSubfields(schema, fragments, variableValues, errorWithIncrementalSubscription, returnType, fieldGroup) {
+export function collectSubfields(schema, fragments, variableValues, errorOnSubscriptionWithIncrementalDelivery, returnType, fieldGroup) {
     const context = {
         schema,
         fragments,
         variableValues,
         runtimeType: returnType,
-        errorWithIncrementalSubscription,
+        errorOnSubscriptionWithIncrementalDelivery,
         visitedFragmentNames: new Set(),
     };
     const subGroupedFieldSet = new AccumulatorMap();
@@ -58,7 +58,7 @@ export function collectSubfields(schema, fragments, variableValues, errorWithInc
     };
 }
 function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsages, deferUsage) {
-    const { schema, fragments, variableValues, runtimeType, errorWithIncrementalSubscription, visitedFragmentNames, } = context;
+    const { schema, fragments, variableValues, runtimeType, errorOnSubscriptionWithIncrementalDelivery, visitedFragmentNames, } = context;
     for (const selection of selectionSet.selections) {
         switch (selection.kind) {
             case Kind.FIELD: {
@@ -76,7 +76,7 @@ function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsage
                     !doesFragmentConditionMatch(schema, selection, runtimeType)) {
                     continue;
                 }
-                const newDeferUsage = getDeferUsage(errorWithIncrementalSubscription, variableValues, selection, deferUsage);
+                const newDeferUsage = getDeferUsage(errorOnSubscriptionWithIncrementalDelivery, variableValues, selection, deferUsage);
                 if (!newDeferUsage) {
                     collectFieldsImpl(context, selection.selectionSet, groupedFieldSet, newDeferUsages, deferUsage);
                 }
@@ -88,7 +88,7 @@ function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsage
             }
             case Kind.FRAGMENT_SPREAD: {
                 const fragName = selection.name.value;
-                const newDeferUsage = getDeferUsage(errorWithIncrementalSubscription, variableValues, selection, deferUsage);
+                const newDeferUsage = getDeferUsage(errorOnSubscriptionWithIncrementalDelivery, variableValues, selection, deferUsage);
                 if (!newDeferUsage &&
                     (visitedFragmentNames.has(fragName) || !shouldIncludeNode(variableValues, selection))) {
                     continue;
@@ -115,7 +115,7 @@ function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsage
  * deferred based on the experimental flag, defer directive present and
  * not disabled by the "if" argument.
  */
-function getDeferUsage(errorWithIncrementalSubscription, variableValues, node, parentDeferUsage) {
+function getDeferUsage(errorOnSubscriptionWithIncrementalDelivery, variableValues, node, parentDeferUsage) {
     const defer = getDirectiveValues(GraphQLDeferDirective, node, variableValues);
     if (!defer) {
         return;
@@ -123,7 +123,7 @@ function getDeferUsage(errorWithIncrementalSubscription, variableValues, node, p
     if (defer['if'] === false) {
         return;
     }
-    invariant(!errorWithIncrementalSubscription, '`@defer` directive not supported on subscription operations. Disable `@defer` by setting the `if` argument to `false`.');
+    invariant(!errorOnSubscriptionWithIncrementalDelivery, '`@defer` directive not supported on subscription operations. Disable `@defer` by setting the `if` argument to `false`.');
     return {
         label: typeof defer['label'] === 'string' ? defer['label'] : undefined,
         parentDeferUsage,

package/esm/execution/execute.js

@@ -16,7 +16,7 @@ import { getVariableValues } from './values.js';
  * type. Memoizing ensures the subfields are not repeatedly calculated, which
  * saves overhead when resolving lists of values.
  */
-const collectSubfields = memoize3((exeContext, returnType, fieldGroup) => _collectSubfields(exeContext.schema, exeContext.fragments, exeContext.variableValues, exeContext.errorWithIncrementalSubscription, returnType, fieldGroup));
+const collectSubfields = memoize3((exeContext, returnType, fieldGroup) => _collectSubfields(exeContext.schema, exeContext.fragments, exeContext.variableValues, exeContext.errorOnSubscriptionWithIncrementalDelivery, returnType, fieldGroup));
 /**
  * Implements the "Executing requests" section of the GraphQL specification,
  * including `@defer` and `@stream` as proposed in
@@ -149,7 +149,7 @@ export const getFragmentsFromDocument = memoize1(function getFragmentsFromDocume
  * @internal
  */
 export function buildExecutionContext(args) {
-    const { schema, document, rootValue, contextValue, variableValues: rawVariableValues, operationName, fieldResolver, typeResolver, subscribeFieldResolver, enableEarlyExecution, deduplicateDefers, sendIncrementalErrorsAsNull, sendPathAndLabelOnIncremental, errorWithIncrementalSubscription, signal, } = args;
+    const { schema, document, rootValue, contextValue, variableValues: rawVariableValues, operationName, fieldResolver, typeResolver, subscribeFieldResolver, enableEarlyExecution, incrementalPreset, deferWithoutDuplication, useIncrementalNotifications, errorOnSubscriptionWithIncrementalDelivery, signal, } = args;
     // If the schema used for execution is invalid, throw an error.
     assertValidSchema(schema);
     const fragments = getFragmentsFromDocument(document);
@@ -188,6 +188,7 @@ export function buildExecutionContext(args) {
     if (coercedVariableValues.errors) {
         return coercedVariableValues.errors;
     }
+    const latestPreset = incrementalPreset !== 'v17.0.0-alpha.2';
     return {
         schema,
         fragments,
@@ -199,10 +200,12 @@ export function buildExecutionContext(args) {
         typeResolver: typeResolver ?? defaultTypeResolver,
         subscribeFieldResolver: subscribeFieldResolver ?? defaultFieldResolver,
         enableEarlyExecution: enableEarlyExecution !== false,
-        deduplicateDefers: deduplicateDefers !== false,
-        sendIncrementalErrorsAsNull: sendIncrementalErrorsAsNull === true,
-        sendPathAndLabelOnIncremental: sendPathAndLabelOnIncremental === true,
-        errorWithIncrementalSubscription: operation.operation === 'subscription' && errorWithIncrementalSubscription !== false,
+        deferWithoutDuplication: deferWithoutDuplication != null ? deferWithoutDuplication : latestPreset,
+        useIncrementalNotifications: useIncrementalNotifications != null ? useIncrementalNotifications : latestPreset,
+        errorOnSubscriptionWithIncrementalDelivery: operation.operation === 'subscription' &&
+            (errorOnSubscriptionWithIncrementalDelivery != null
+                ? errorOnSubscriptionWithIncrementalDelivery
+                : latestPreset),
         signal,
         errors: undefined,
         cancellableStreams: undefined,
@@ -224,14 +227,14 @@ function executeOperation(exeContext) {
         throw exeContext.signal.reason;
     }
     try {
-        const { operation, schema, fragments, variableValues, rootValue, deduplicateDefers, errorWithIncrementalSubscription, } = exeContext;
+        const { operation, schema, fragments, variableValues, rootValue, deferWithoutDuplication, errorOnSubscriptionWithIncrementalDelivery, } = exeContext;
         const rootType = getDefinedRootType(schema, operation.operation, [operation]);
         if (rootType == null) {
             createGraphQLError(`Schema is not configured to execute ${operation.operation} operation.`, {
                 nodes: operation,
             });
         }
-        const collectedFields = collectFields(schema, fragments, variableValues, rootType, operation.selectionSet, errorWithIncrementalSubscription);
+        const collectedFields = collectFields(schema, fragments, variableValues, rootType, operation.selectionSet, errorOnSubscriptionWithIncrementalDelivery);
         let groupedFieldSet = collectedFields.groupedFieldSet;
         const newDeferUsages = collectedFields.newDeferUsages;
         let data;
@@ -239,7 +242,7 @@ function executeOperation(exeContext) {
             data = executeRootGroupedFieldSet(exeContext, operation.operation, rootType, rootValue, groupedFieldSet, undefined);
         }
         else {
-            const executionPlan = deduplicateDefers
+            const executionPlan = deferWithoutDuplication
                 ? buildExecutionPlan(groupedFieldSet)
                 : buildBranchingExecutionPlan(groupedFieldSet);
             groupedFieldSet = executionPlan.groupedFieldSet;
@@ -552,7 +555,7 @@ function getStreamUsage(exeContext, fieldGroup, path) {
     }
     invariant(typeof stream['initialCount'] === 'number', 'initialCount must be a number');
     invariant(stream['initialCount'] >= 0, 'initialCount must be a positive integer');
-    invariant(!exeContext.errorWithIncrementalSubscription, '`@stream` directive not supported on subscription operations. Disable `@stream` by setting the `if` argument to `false`.');
+    invariant(!exeContext.errorOnSubscriptionWithIncrementalDelivery, '`@stream` directive not supported on subscription operations. Disable `@stream` by setting the `if` argument to `false`.');
     const streamedFieldGroup = fieldGroup.map(fieldDetails => ({
         node: fieldDetails.node,
         deferUsage: undefined,
@@ -861,7 +864,7 @@ function collectAndExecuteSubfields(exeContext, returnType, fieldGroup, path, re
     if (deferMap === undefined && newDeferUsages.length === 0) {
         return executeFields(exeContext, returnType, result, path, groupedFieldSet, incrementalContext, undefined);
     }
-    const subExecutionPlan = buildSubExecutionPlan(groupedFieldSet, incrementalContext?.deferUsageSet, exeContext.deduplicateDefers);
+    const subExecutionPlan = buildSubExecutionPlan(groupedFieldSet, incrementalContext?.deferUsageSet, exeContext.deferWithoutDuplication);
     groupedFieldSet = subExecutionPlan.groupedFieldSet;
     const newGroupedFieldSets = subExecutionPlan.newGroupedFieldSets;
     const newDeferMap = addNewDeferredFragments(newDeferUsages, new Map(deferMap), path);
@@ -873,13 +876,13 @@ function collectAndExecuteSubfields(exeContext, returnType, fieldGroup, path, re
     }
     return subFields;
 }
-function buildSubExecutionPlan(originalGroupedFieldSet, deferUsageSet, deduplicateDefers) {
+function buildSubExecutionPlan(originalGroupedFieldSet, deferUsageSet, deferWithoutDuplication) {
     let executionPlan = originalGroupedFieldSet
         ._executionPlan;
     if (executionPlan !== undefined) {
         return executionPlan;
     }
-    executionPlan = deduplicateDefers
+    executionPlan = deferWithoutDuplication
         ? buildExecutionPlan(originalGroupedFieldSet, deferUsageSet)
         : buildBranchingExecutionPlan(originalGroupedFieldSet, deferUsageSet);
     originalGroupedFieldSet._executionPlan =
@@ -1047,14 +1050,14 @@ function createSourceEventStreamImpl(exeContext) {
     }
 }
 function executeSubscription(exeContext) {
-    const { schema, fragments, operation, variableValues, rootValue, errorWithIncrementalSubscription, } = exeContext;
+    const { schema, fragments, operation, variableValues, rootValue, errorOnSubscriptionWithIncrementalDelivery, } = exeContext;
     const rootType = schema.getSubscriptionType();
     if (rootType == null) {
         throw createGraphQLError('Schema is not configured to execute subscription operation.', {
             nodes: operation,
         });
     }
-    const { groupedFieldSet } = collectFields(schema, fragments, variableValues, rootType, operation.selectionSet, errorWithIncrementalSubscription);
+    const { groupedFieldSet } = collectFields(schema, fragments, variableValues, rootType, operation.selectionSet, errorOnSubscriptionWithIncrementalDelivery);
     const firstRootField = [...groupedFieldSet.entries()][0];
     const [responseName, fieldGroup] = firstRootField;
     const fieldName = fieldGroup[0].node.name.value;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-tools/executor",
-  "version": "2.0.0-alpha-20240804115549-7dfd59247669dee6217565e3327c429dc5d3bff2",
+  "version": "2.0.0-alpha-20240805144842-131e76d507ce82e59a400bf90758e7af71493abf",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "10.4.0-alpha-20240804115549-7dfd59247669dee6217565e3327c429dc5d3bff2",
+    "@graphql-tools/utils": "10.4.0-alpha-20240805144842-131e76d507ce82e59a400bf90758e7af71493abf",
     "@graphql-typed-document-node/core": "3.2.0",
     "@repeaterjs/repeater": "^3.0.4",
     "tslib": "^2.4.0",

package/typings/execution/IncrementalPublisher.d.cts

@@ -2,8 +2,7 @@ import type { GraphQLError } from 'graphql';
 import type { CancellableStreamRecord, IncrementalDataRecord, IncrementalExecutionResults } from './types.cjs';
 export declare function buildIncrementalResponse<TData = any>(context: IncrementalPublisherContext, result: TData, errors: ReadonlyArray<GraphQLError> | undefined, incrementalDataRecords: ReadonlyArray<IncrementalDataRecord>): IncrementalExecutionResults<TData>;
 interface IncrementalPublisherContext {
-    sendIncrementalErrorsAsNull: boolean;
-    sendPathAndLabelOnIncremental: boolean;
+    useIncrementalNotifications: boolean;
     signal: AbortSignal | undefined;
     cancellableStreams: Set<CancellableStreamRecord> | undefined;
 }

package/typings/execution/IncrementalPublisher.d.ts

@@ -2,8 +2,7 @@ import type { GraphQLError } from 'graphql';
 import type { CancellableStreamRecord, IncrementalDataRecord, IncrementalExecutionResults } from './types.js';
 export declare function buildIncrementalResponse<TData = any>(context: IncrementalPublisherContext, result: TData, errors: ReadonlyArray<GraphQLError> | undefined, incrementalDataRecords: ReadonlyArray<IncrementalDataRecord>): IncrementalExecutionResults<TData>;
 interface IncrementalPublisherContext {
-    sendIncrementalErrorsAsNull: boolean;
-    sendPathAndLabelOnIncremental: boolean;
+    useIncrementalNotifications: boolean;
     signal: AbortSignal | undefined;
     cancellableStreams: Set<CancellableStreamRecord> | undefined;
 }

package/typings/execution/collectFields.d.cts

@@ -18,7 +18,7 @@ export type GroupedFieldSet = ReadonlyMap<string, FieldGroup>;
  *
  * @internal
  */
-export declare function collectFields<TVariables = any>(schema: GraphQLSchema, fragments: Record<string, FragmentDefinitionNode>, variableValues: TVariables, runtimeType: GraphQLObjectType, selectionSet: SelectionSetNode, errorWithIncrementalSubscription: boolean): {
+export declare function collectFields<TVariables = any>(schema: GraphQLSchema, fragments: Record<string, FragmentDefinitionNode>, variableValues: TVariables, runtimeType: GraphQLObjectType, selectionSet: SelectionSetNode, errorOnSubscriptionWithIncrementalDelivery: boolean): {
     groupedFieldSet: GroupedFieldSet;
     newDeferUsages: ReadonlyArray<DeferUsage>;
 };
@@ -34,7 +34,7 @@ export declare function collectFields<TVariables = any>(schema: GraphQLSchema, f
  */
 export declare function collectSubfields(schema: GraphQLSchema, fragments: Record<string, FragmentDefinitionNode>, variableValues: {
     [variable: string]: unknown;
-}, errorWithIncrementalSubscription: boolean, returnType: GraphQLObjectType, fieldGroup: FieldGroup): {
+}, errorOnSubscriptionWithIncrementalDelivery: boolean, returnType: GraphQLObjectType, fieldGroup: FieldGroup): {
     groupedFieldSet: GroupedFieldSet;
     newDeferUsages: ReadonlyArray<DeferUsage>;
 };

package/typings/execution/collectFields.d.ts

@@ -18,7 +18,7 @@ export type GroupedFieldSet = ReadonlyMap<string, FieldGroup>;
  *
  * @internal
  */
-export declare function collectFields<TVariables = any>(schema: GraphQLSchema, fragments: Record<string, FragmentDefinitionNode>, variableValues: TVariables, runtimeType: GraphQLObjectType, selectionSet: SelectionSetNode, errorWithIncrementalSubscription: boolean): {
+export declare function collectFields<TVariables = any>(schema: GraphQLSchema, fragments: Record<string, FragmentDefinitionNode>, variableValues: TVariables, runtimeType: GraphQLObjectType, selectionSet: SelectionSetNode, errorOnSubscriptionWithIncrementalDelivery: boolean): {
     groupedFieldSet: GroupedFieldSet;
     newDeferUsages: ReadonlyArray<DeferUsage>;
 };
@@ -34,7 +34,7 @@ export declare function collectFields<TVariables = any>(schema: GraphQLSchema, f
  */
 export declare function collectSubfields(schema: GraphQLSchema, fragments: Record<string, FragmentDefinitionNode>, variableValues: {
     [variable: string]: unknown;
-}, errorWithIncrementalSubscription: boolean, returnType: GraphQLObjectType, fieldGroup: FieldGroup): {
+}, errorOnSubscriptionWithIncrementalDelivery: boolean, returnType: GraphQLObjectType, fieldGroup: FieldGroup): {
     groupedFieldSet: GroupedFieldSet;
     newDeferUsages: ReadonlyArray<DeferUsage>;
 };

package/typings/execution/execute.d.cts

@@ -39,15 +39,15 @@ export interface ExecutionContext<TVariables = any, TContext = any> {
     typeResolver: GraphQLTypeResolver<any, TContext>;
     subscribeFieldResolver: GraphQLFieldResolver<any, TContext>;
     enableEarlyExecution: boolean;
-    deduplicateDefers: boolean;
-    sendIncrementalErrorsAsNull: boolean;
-    sendPathAndLabelOnIncremental: boolean;
-    errorWithIncrementalSubscription: boolean;
+    deferWithoutDuplication: boolean;
+    useIncrementalNotifications: boolean;
+    errorOnSubscriptionWithIncrementalDelivery: boolean;
     signal: AbortSignal | undefined;
     errors: AccumulatorMap<Path | undefined, GraphQLError> | undefined;
     cancellableStreams: Set<CancellableStreamRecord> | undefined;
     incrementalDataRecords: Array<IncrementalDataRecord> | undefined;
 }
+export type IncrementalPreset = 'v17.0.0-alpha.2' | 'v17.0.0-alpha.3';
 export interface ExecutionArgs<TData = any, TVariables = any, TContext = any> {
     schema: GraphQLSchema;
     document: TypedDocumentNode<TData, TVariables>;
@@ -59,10 +59,10 @@ export interface ExecutionArgs<TData = any, TVariables = any, TContext = any> {
     typeResolver?: Maybe<GraphQLTypeResolver<any, TContext>>;
     subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, TContext>>;
     enableEarlyExecution?: Maybe<boolean>;
-    deduplicateDefers?: Maybe<boolean>;
-    sendIncrementalErrorsAsNull?: Maybe<boolean>;
-    sendPathAndLabelOnIncremental?: Maybe<boolean>;
-    errorWithIncrementalSubscription?: Maybe<boolean>;
+    incrementalPreset?: Maybe<IncrementalPreset>;
+    deferWithoutDuplication?: Maybe<boolean>;
+    useIncrementalNotifications?: Maybe<boolean>;
+    errorOnSubscriptionWithIncrementalDelivery?: Maybe<boolean>;
     signal?: AbortSignal;
 }
 /**
@@ -160,7 +160,7 @@ export declare const defaultFieldResolver: GraphQLFieldResolver<unknown, unknown
  * Accepts an object with named arguments.
  */
 export declare function subscribe<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext> & {
-    errorWithIncrementalSubscription: true | undefined | null;
+    errorOnSubscriptionWithIncrementalDelivery: true | undefined | null;
 }): MaybePromise<AsyncGenerator<SingularExecutionResult<TData>, void, void> | SingularExecutionResult<TData>>;
 export declare function subscribe<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext>): MaybePromise<AsyncGenerator<SingularExecutionResult<TData> | InitialIncrementalExecutionResult<TData> | SubsequentIncrementalExecutionResult<TData>, void, void> | SingularExecutionResult<TData>>;
 export declare function flattenIncrementalResults<TData>(incrementalResults: IncrementalExecutionResults<TData>): AsyncGenerator<SubsequentIncrementalExecutionResult<TData, Record<string, unknown>>, void, void>;

package/typings/execution/execute.d.ts

@@ -39,15 +39,15 @@ export interface ExecutionContext<TVariables = any, TContext = any> {
     typeResolver: GraphQLTypeResolver<any, TContext>;
     subscribeFieldResolver: GraphQLFieldResolver<any, TContext>;
     enableEarlyExecution: boolean;
-    deduplicateDefers: boolean;
-    sendIncrementalErrorsAsNull: boolean;
-    sendPathAndLabelOnIncremental: boolean;
-    errorWithIncrementalSubscription: boolean;
+    deferWithoutDuplication: boolean;
+    useIncrementalNotifications: boolean;
+    errorOnSubscriptionWithIncrementalDelivery: boolean;
     signal: AbortSignal | undefined;
     errors: AccumulatorMap<Path | undefined, GraphQLError> | undefined;
     cancellableStreams: Set<CancellableStreamRecord> | undefined;
     incrementalDataRecords: Array<IncrementalDataRecord> | undefined;
 }
+export type IncrementalPreset = 'v17.0.0-alpha.2' | 'v17.0.0-alpha.3';
 export interface ExecutionArgs<TData = any, TVariables = any, TContext = any> {
     schema: GraphQLSchema;
     document: TypedDocumentNode<TData, TVariables>;
@@ -59,10 +59,10 @@ export interface ExecutionArgs<TData = any, TVariables = any, TContext = any> {
     typeResolver?: Maybe<GraphQLTypeResolver<any, TContext>>;
     subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, TContext>>;
     enableEarlyExecution?: Maybe<boolean>;
-    deduplicateDefers?: Maybe<boolean>;
-    sendIncrementalErrorsAsNull?: Maybe<boolean>;
-    sendPathAndLabelOnIncremental?: Maybe<boolean>;
-    errorWithIncrementalSubscription?: Maybe<boolean>;
+    incrementalPreset?: Maybe<IncrementalPreset>;
+    deferWithoutDuplication?: Maybe<boolean>;
+    useIncrementalNotifications?: Maybe<boolean>;
+    errorOnSubscriptionWithIncrementalDelivery?: Maybe<boolean>;
     signal?: AbortSignal;
 }
 /**
@@ -160,7 +160,7 @@ export declare const defaultFieldResolver: GraphQLFieldResolver<unknown, unknown
  * Accepts an object with named arguments.
  */
 export declare function subscribe<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext> & {
-    errorWithIncrementalSubscription: true | undefined | null;
+    errorOnSubscriptionWithIncrementalDelivery: true | undefined | null;
 }): MaybePromise<AsyncGenerator<SingularExecutionResult<TData>, void, void> | SingularExecutionResult<TData>>;
 export declare function subscribe<TData = any, TVariables = any, TContext = any>(args: ExecutionArgs<TData, TVariables, TContext>): MaybePromise<AsyncGenerator<SingularExecutionResult<TData> | InitialIncrementalExecutionResult<TData> | SubsequentIncrementalExecutionResult<TData>, void, void> | SingularExecutionResult<TData>>;
 export declare function flattenIncrementalResults<TData>(incrementalResults: IncrementalExecutionResults<TData>): AsyncGenerator<SubsequentIncrementalExecutionResult<TData, Record<string, unknown>>, void, void>;

package/typings/execution/types.d.cts

@@ -26,13 +26,13 @@ export interface IncrementalExecutionResults<TData = unknown, TExtensions = Reco
 }
 export interface InitialIncrementalExecutionResult<TData = Record<string, unknown>, TExtensions = Record<string, unknown>> extends SingularExecutionResult<TData, TExtensions> {
     data: TData;
-    pending: ReadonlyArray<PendingResult>;
+    pending?: ReadonlyArray<PendingResult>;
     hasNext: true;
     extensions?: TExtensions;
 }
 export interface FormattedInitialIncrementalExecutionResult<TData = Record<string, unknown>, TExtensions = Record<string, unknown>> extends FormattedExecutionResult<TData, TExtensions> {
     data: TData;
-    pending: ReadonlyArray<PendingResult>;
+    pending?: ReadonlyArray<PendingResult>;
     hasNext: boolean;
     extensions?: TExtensions;
 }
@@ -57,7 +57,7 @@ interface ExecutionGroupResult<TData = Record<string, unknown>> {
 export interface IncrementalDeferResult<TData = Record<string, unknown>, TExtensions = Record<string, unknown>> {
     errors?: ReadonlyArray<GraphQLError>;
     data: TData | null;
-    id: string;
+    id?: string;
     path?: ReadonlyArray<string | number>;
     label?: string;
     subPath?: ReadonlyArray<string | number>;
@@ -79,7 +79,7 @@ interface StreamItemsRecordResult<TData = ReadonlyArray<unknown>> {
 export interface IncrementalStreamResult<TData = ReadonlyArray<unknown>, TExtensions = Record<string, unknown>> {
     errors?: ReadonlyArray<GraphQLError>;
     items: TData | null;
-    id: string;
+    id?: string;
     path?: ReadonlyArray<string | number>;
     label?: string;
     extensions?: TExtensions;

package/typings/execution/types.d.ts

@@ -26,13 +26,13 @@ export interface IncrementalExecutionResults<TData = unknown, TExtensions = Reco
 }
 export interface InitialIncrementalExecutionResult<TData = Record<string, unknown>, TExtensions = Record<string, unknown>> extends SingularExecutionResult<TData, TExtensions> {
     data: TData;
-    pending: ReadonlyArray<PendingResult>;
+    pending?: ReadonlyArray<PendingResult>;
     hasNext: true;
     extensions?: TExtensions;
 }
 export interface FormattedInitialIncrementalExecutionResult<TData = Record<string, unknown>, TExtensions = Record<string, unknown>> extends FormattedExecutionResult<TData, TExtensions> {
     data: TData;
-    pending: ReadonlyArray<PendingResult>;
+    pending?: ReadonlyArray<PendingResult>;
     hasNext: boolean;
     extensions?: TExtensions;
 }
@@ -57,7 +57,7 @@ interface ExecutionGroupResult<TData = Record<string, unknown>> {
 export interface IncrementalDeferResult<TData = Record<string, unknown>, TExtensions = Record<string, unknown>> {
     errors?: ReadonlyArray<GraphQLError>;
     data: TData | null;
-    id: string;
+    id?: string;
     path?: ReadonlyArray<string | number>;
     label?: string;
     subPath?: ReadonlyArray<string | number>;
@@ -79,7 +79,7 @@ interface StreamItemsRecordResult<TData = ReadonlyArray<unknown>> {
 export interface IncrementalStreamResult<TData = ReadonlyArray<unknown>, TExtensions = Record<string, unknown>> {
     errors?: ReadonlyArray<GraphQLError>;
     items: TData | null;
-    id: string;
+    id?: string;
     path?: ReadonlyArray<string | number>;
     label?: string;
     extensions?: TExtensions;