From f07597b939ba023e8119de51e05123cbf19d192c Mon Sep 17 00:00:00 2001
From: Yaacov Rydzinski <yaacovCR@gmail.com>
Date: Tue, 21 Apr 2026 15:22:48 +0300
Subject: [PATCH] refactor(execution): separate response construction from
 finish checks

---
 src/execution/Executor.ts                     | 36 +++++++++----------
 .../incremental/IncrementalExecutor.ts        | 15 ++++----
 .../BranchingIncrementalExecutor.ts           |  1 -
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/execution/Executor.ts b/src/execution/Executor.ts
index 71ce5e6b01..507058b5dd 100644
--- a/src/execution/Executor.ts
+++ b/src/execution/Executor.ts
@@ -234,7 +234,7 @@ export class Executor<
   abortReason: unknown;
   sharedExecutionContext: SharedExecutionContext;
   collectedErrors: CollectedErrors;
-  abortResultPromise: ((reason?: unknown) => void) | undefined;
+  abortResultPromise: (() => void) | undefined;
   resolverAbortController: AbortController | undefined;
   getAbortSignal: () => AbortSignal | undefined;
   getAsyncHelpers: () => GraphQLResolveInfoHelpers;
@@ -285,6 +285,7 @@ export class Executor<
       removeExternalAbortListener?.();
     };
 
+    let result: PromiseOrValue<ObjMap<unknown>>;
     try {
       const {
         schema,
@@ -314,7 +315,7 @@ export class Executor<
         hideSuggestions,
       );
 
-      const result = this.executeCollectedRootFields(
+      result = this.executeCollectedRootFields(
         operation.operation,
         rootType,
         rootValue,
@@ -336,26 +337,22 @@ export class Executor<
         );
         this.sharedExecutionContext.asyncWorkTracker.add(promise);
         const { promise: cancellablePromise, abort: abortResultPromise } =
-          withCancellation(promise);
-        this.abortResultPromise = abortResultPromise;
-        if (this.aborted) {
+          withCancellation(promise.then((resolved) => this.finish(resolved)));
+        this.abortResultPromise = () => {
           abortResultPromise(this.abortReason);
+        };
+        if (this.aborted) {
+          this.abortResultPromise();
         }
         return cancellablePromise;
       }
       maybeRemoveExternalAbortListener();
-      return this.buildResponse(result);
     } catch (error) {
       maybeRemoveExternalAbortListener();
       this.collectedErrors.add(ensureGraphQLError(error), undefined);
-      return this.buildResponse(null);
-    }
-  }
-
-  throwIfAborted(): void {
-    if (this.aborted) {
-      throw this.abortReason;
+      return this.finish(this.buildResponse(null));
     }
+    return this.finish(this.buildResponse(result));
   }
 
   abort(reason?: unknown): void {
@@ -366,13 +363,16 @@ export class Executor<
     if (reason !== undefined) {
       this.abortReason = reason;
     }
-    this.abortResultPromise?.(this.abortReason);
+    this.abortResultPromise?.();
     this.resolverAbortController?.abort(this.abortReason);
   }
 
-  finish(): void {
-    this.throwIfAborted();
+  finish<T>(result: T): T {
+    if (this.aborted) {
+      throw this.abortReason;
+    }
     this.aborted = true;
+    return result;
   }
 
   getFinishSharedExecution(): () => void {
@@ -403,10 +403,8 @@ export class Executor<
     data: ObjMap<unknown> | null,
   ): ExecutionResult | TAlternativeInitialResponse {
     this.getFinishSharedExecution()();
-    this.finish();
     const errors = this.collectedErrors.errors;
-    const result = errors.length ? { errors, data } : { data };
-    return result;
+    return errors.length ? { errors, data } : { data };
   }
 
   executeCollectedRootFields(
diff --git a/src/execution/incremental/IncrementalExecutor.ts b/src/execution/incremental/IncrementalExecutor.ts
index 1fbd13bd65..00b4264624 100644
--- a/src/execution/incremental/IncrementalExecutor.ts
+++ b/src/execution/incremental/IncrementalExecutor.ts
@@ -349,7 +349,6 @@ export class IncrementalExecutor<
       return super.buildResponse(data);
     }
 
-    this.finish();
     const errors = this.collectedErrors.errors;
     invariant(data !== null);
     const incrementalPublisher = new IncrementalPublisher();
@@ -573,15 +572,14 @@ export class IncrementalExecutor<
     path: Path | undefined,
     result: ObjMap<unknown>,
   ): ExecutionGroupResult {
-    this.finish();
     const data = result;
     const errors = this.collectedErrors.errors;
-    return {
+    return this.finish({
       value: errors.length
         ? { deliveryGroups, path: pathToArray(path), errors, data }
         : { deliveryGroups, path: pathToArray(path), data },
       work: this.getIncrementalWork(),
-    };
+    });
   }
 
   getIncrementalWork(): IncrementalWork {
@@ -912,13 +910,14 @@ export class IncrementalExecutor<
   }
 
   buildStreamItemResult(result: unknown): StreamItemResult {
-    this.finish();
     const item = result;
     const errors = this.collectedErrors.errors;
     const work = this.getIncrementalWork();
-    return errors.length > 0
-      ? { value: { item, errors }, work }
-      : { value: { item }, work };
+    return this.finish(
+      errors.length > 0
+        ? { value: { item, errors }, work }
+        : { value: { item }, work },
+    );
   }
 }
 
diff --git a/src/execution/legacyIncremental/BranchingIncrementalExecutor.ts b/src/execution/legacyIncremental/BranchingIncrementalExecutor.ts
index 1fd512eac6..3b6c109e43 100644
--- a/src/execution/legacyIncremental/BranchingIncrementalExecutor.ts
+++ b/src/execution/legacyIncremental/BranchingIncrementalExecutor.ts
@@ -197,7 +197,6 @@ export class BranchingIncrementalExecutor extends IncrementalExecutor<LegacyExpe
       return super.buildResponse(data);
     }
 
-    this.finish();
     const errors = this.collectedErrors.errors;
     invariant(data !== null);
     const incrementalPublisher = new BranchingIncrementalPublisher();