introduce handleRawError

to include filtering

Author: yaacovCR

src/execution/execute.ts

@@ -748,17 +748,27 @@ function executeField(
       // Note: we don't rely on a `catch` method, but we do expect "thenable"
       // to take a second callback for the error case.
       return completed.then(undefined, (rawError) => {
-        const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
-        addError(rawError, fieldNodes, returnType, path, errors);
-        filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+        handleRawError(
+          rawError,
+          exeContext,
+          fieldNodes,
+          returnType,
+          path,
+          asyncPayloadRecord,
+        );
         return null;
       });
     }
     return completed;
   } catch (rawError) {
-    const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
-    addError(rawError, fieldNodes, returnType, path, errors);
-    filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+    handleRawError(
+      rawError,
+      exeContext,
+      fieldNodes,
+      returnType,
+      path,
+      asyncPayloadRecord,
+    );
     return null;
   }
 }
@@ -790,6 +800,19 @@ export function buildResolveInfo(
   };
 }
 
+function handleRawError(
+  rawError: unknown,
+  exeContext: ExecutionContext,
+  fieldNodes: ReadonlyArray<FieldNode>,
+  returnType: GraphQLOutputType,
+  path: Path,
+  asyncPayloadRecord: AsyncPayloadRecord | undefined,
+): void {
+  const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
+  addError(rawError, fieldNodes, returnType, path, errors);
+  filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+}
+
 function addError(
   rawError: unknown,
   fieldNodes: ReadonlyArray<FieldNode>,
@@ -948,9 +971,14 @@ async function completePromisedValue(
     }
     return completed;
   } catch (rawError) {
-    const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
-    addError(rawError, fieldNodes, returnType, path, errors);
-    filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+    handleRawError(
+      rawError,
+      exeContext,
+      fieldNodes,
+      returnType,
+      path,
+      asyncPayloadRecord,
+    );
     return null;
   }
 }
@@ -1025,7 +1053,6 @@ async function completeAsyncIteratorValue(
   iterator: AsyncIterator<unknown>,
   asyncPayloadRecord?: AsyncPayloadRecord,
 ): Promise<ReadonlyArray<unknown>> {
-  const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
   const stream = getStreamValues(exeContext, fieldNodes, path);
   let containsPromise = false;
   const completedResults: Array<unknown> = [];
@@ -1058,6 +1085,7 @@ async function completeAsyncIteratorValue(
       // eslint-disable-next-line no-await-in-loop
       iteration = await iterator.next();
     } catch (rawError) {
+      const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
       addError(rawError, fieldNodes, itemType, itemPath, errors);
       completedResults.push(null);
       break;
@@ -1071,7 +1099,6 @@ async function completeAsyncIteratorValue(
       completeListItemValue(
         iteration.value,
         completedResults,
-        errors,
         exeContext,
         itemType,
         fieldNodes,
@@ -1101,7 +1128,6 @@ function completeListValue(
   asyncPayloadRecord?: AsyncPayloadRecord,
 ): PromiseOrValue<ReadonlyArray<unknown>> {
   const itemType = returnType.ofType;
-  const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
 
   if (isAsyncIterable(result)) {
     const iterator = result[Symbol.asyncIterator]();
@@ -1160,7 +1186,6 @@ function completeListValue(
       completeListItemValue(
         item,
         completedResults,
-        errors,
         exeContext,
         itemType,
         fieldNodes,
@@ -1186,7 +1211,6 @@ function completeListValue(
 function completeListItemValue(
   item: unknown,
   completedResults: Array<unknown>,
-  errors: Array<GraphQLError>,
   exeContext: ExecutionContext,
   itemType: GraphQLOutputType,
   fieldNodes: ReadonlyArray<FieldNode>,
@@ -1226,8 +1250,14 @@ function completeListItemValue(
       // to take a second callback for the error case.
       completedResults.push(
         completedItem.then(undefined, (rawError) => {
-          addError(rawError, fieldNodes, itemType, itemPath, errors);
-          filterSubsequentPayloads(exeContext, itemPath, asyncPayloadRecord);
+          handleRawError(
+            rawError,
+            exeContext,
+            fieldNodes,
+            itemType,
+            itemPath,
+            asyncPayloadRecord,
+          );
           return null;
         }),
       );
@@ -1237,8 +1267,14 @@ function completeListItemValue(
 
     completedResults.push(completedItem);
   } catch (rawError) {
-    addError(rawError, fieldNodes, itemType, itemPath, errors);
-    filterSubsequentPayloads(exeContext, itemPath, asyncPayloadRecord);
+    handleRawError(
+      rawError,
+      exeContext,
+      fieldNodes,
+      itemType,
+      itemPath,
+      asyncPayloadRecord,
+    );
     completedResults.push(null);
   }
 
@@ -1853,15 +1889,15 @@ function executeStreamField(
         asyncPayloadRecord,
       );
     } catch (rawError) {
-      addError(
+      handleRawError(
         rawError,
+        exeContext,
         fieldNodes,
         itemType,
         itemPath,
-        asyncPayloadRecord.errors,
+        asyncPayloadRecord,
       );
       completedItem = null;
-      filterSubsequentPayloads(exeContext, itemPath, asyncPayloadRecord);
     }
   } catch (error) {
     asyncPayloadRecord.errors.push(error);
@@ -1873,14 +1909,14 @@ function executeStreamField(
   if (isPromise(completedItem)) {
     const completedItems = completedItem
       .then(undefined, (rawError) => {
-        addError(
+        handleRawError(
           rawError,
+          exeContext,
           fieldNodes,
           itemType,
           itemPath,
-          asyncPayloadRecord.errors,
+          asyncPayloadRecord,
         );
-        filterSubsequentPayloads(exeContext, itemPath, asyncPayloadRecord);
         return null;
       })
       .then(
@@ -1945,27 +1981,27 @@ async function executeStreamIteratorItem(
 
     if (isPromise(completedItem)) {
       completedItem = completedItem.then(undefined, (rawError) => {
-        addError(
+        handleRawError(
           rawError,
+          exeContext,
           fieldNodes,
           itemType,
           itemPath,
-          asyncPayloadRecord.errors,
+          asyncPayloadRecord,
         );
-        filterSubsequentPayloads(exeContext, itemPath, asyncPayloadRecord);
         return null;
       });
     }
     return { done: false, value: completedItem };
   } catch (rawError) {
-    addError(
+    handleRawError(
       rawError,
+      exeContext,
       fieldNodes,
       itemType,
       itemPath,
-      asyncPayloadRecord.errors,
+      asyncPayloadRecord,
     );
-    filterSubsequentPayloads(exeContext, itemPath, asyncPayloadRecord);
     return { done: false, value: null };
   }
 }