don't use throwIfAborted

yaacovCR · Oct 23, 2024 · 465cb59 · 465cb59
1 parent f05fc11
commit 465cb59
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -517,10 +517,8 @@ export function validateExecutionArgs(
     abortSignal,
   } = args;
 
-  try {
-    abortSignal?.throwIfAborted();
-  } catch (rawError: unknown) {
-    return [locatedError(rawError, undefined)];
+  if (abortSignal?.aborted) {
+    return [locatedError(abortSignal.reason, undefined)];
   }
 
   // If the schema used for execution is invalid, throw an error.
@@ -667,11 +665,11 @@ function executeFieldsSerially(
     groupedFieldSet,
     (graphqlWrappedResult, [responseName, fieldDetailsList]) => {
       const fieldPath = addPath(path, responseName, parentType.name);
-      try {
-        exeContext.validatedExecutionArgs.abortSignal?.throwIfAborted();
-      } catch (rawError) {
+
+      const abortSignal = exeContext.validatedExecutionArgs.abortSignal;
+      if (abortSignal?.aborted) {
         handleFieldError(
-          rawError,
+          abortSignal.reason,
           exeContext,
           parentType,
           fieldDetailsList,
@@ -733,11 +731,10 @@ function executeFields(
     for (const [responseName, fieldDetailsList] of groupedFieldSet) {
       const fieldPath = addPath(path, responseName, parentType.name);
 
-      try {
-        exeContext.validatedExecutionArgs.abortSignal?.throwIfAborted();
-      } catch (rawError) {
+      const abortSignal = exeContext.validatedExecutionArgs.abortSignal;
+      if (abortSignal?.aborted) {
         throw locatedError(
-          rawError,
+          abortSignal.reason,
           toNodes(fieldDetailsList),
           pathToArray(fieldPath),
         );