introduce handleRawError

to include filtering

Author: yaacovCR

src/execution/execute.ts

@@ -707,16 +707,14 @@ function executeField(
 
     result = resolveFn(source, args, contextValue, info);
   } catch (rawError) {
-    const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
-    const handledError = addError(
+    return handleRawError(
       rawError,
+      exeContext,
       fieldNodes,
       returnType,
       path,
-      errors,
+      asyncPayloadRecord,
     );
-    filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
-    return handledError;
   }
 
   if (isPromise(result)) {
@@ -769,6 +767,20 @@ export function buildResolveInfo(
   };
 }
 
+function handleRawError(
+  rawError: unknown,
+  exeContext: ExecutionContext,
+  fieldNodes: ReadonlyArray<FieldNode>,
+  returnType: GraphQLOutputType,
+  path: Path,
+  asyncPayloadRecord: AsyncPayloadRecord | undefined,
+): null {
+  const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
+  addError(rawError, fieldNodes, returnType, path, errors);
+  filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
+  return null;
+}
+
 function addError(
   rawError: unknown,
   fieldNodes: ReadonlyArray<FieldNode>,
@@ -930,16 +942,14 @@ async function completePromiseCatchingErrors(
     }
     return completed;
   } catch (rawError) {
-    const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
-    const handledError = addError(
+    return handleRawError(
       rawError,
+      exeContext,
       fieldNodes,
       returnType,
       path,
-      errors,
+      asyncPayloadRecord,
     );
-    filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
-    return handledError;
   }
 }
 
@@ -964,16 +974,14 @@ function completeValueCatchingErrors(
       asyncPayloadRecord,
     );
   } catch (rawError) {
-    const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
-    const handledError = addError(
+    return handleRawError(
       rawError,
+      exeContext,
       fieldNodes,
       returnType,
       path,
-      errors,
+      asyncPayloadRecord,
     );
-    filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
-    return handledError;
   }
 
   if (isPromise(completedValue)) {