introduce addError instead of handleFieldError

addError calls locatedError and then adds the error as previously in
handleFieldError, throwing if the type is non-null

Author: yaacovCR

src/execution/execute.ts

@@ -667,7 +667,6 @@ function executeField(
   path: Path,
   asyncPayloadRecord?: AsyncPayloadRecord,
 ): PromiseOrValue<unknown> {
-  const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
   const fieldName = fieldNodes[0].name.value;
   const fieldDef = exeContext.schema.getField(parentType, fieldName);
   if (!fieldDef) {
@@ -704,8 +703,14 @@ function executeField(
 
     result = resolveFn(source, args, contextValue, info);
   } catch (rawError) {
-    const error = locatedError(rawError, fieldNodes, pathToArray(path));
-    const handledError = handleFieldError(error, returnType, errors);
+    const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
+    const handledError = addError(
+      rawError,
+      fieldNodes,
+      returnType,
+      path,
+      errors,
+    );
     filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
     return handledError;
   }
@@ -760,11 +765,15 @@ export function buildResolveInfo(
   };
 }
 
-function handleFieldError(
-  error: GraphQLError,
+function addError(
+  rawError: unknown,
+  fieldNodes: ReadonlyArray<FieldNode>,
   returnType: GraphQLOutputType,
+  path: Path,
   errors: Array<GraphQLError>,
 ): null {
+  const error = locatedError(rawError, fieldNodes, pathToArray(path));
+
   // If the field type is non-nullable, then it is resolved without any
   // protection from errors, however it still properly locates the error.
   if (isNonNullType(returnType)) {
@@ -918,8 +927,13 @@ async function completePromiseCatchingErrors(
     return completed;
   } catch (rawError) {
     const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
-    const error = locatedError(rawError, fieldNodes, pathToArray(path));
-    const handledError = handleFieldError(error, returnType, errors);
+    const handledError = addError(
+      rawError,
+      fieldNodes,
+      returnType,
+      path,
+      errors,
+    );
     filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
     return handledError;
   }
@@ -947,8 +961,13 @@ function completeValueCatchingErrors(
     );
   } catch (rawError) {
     const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
-    const error = locatedError(rawError, fieldNodes, pathToArray(path));
-    const handledError = handleFieldError(error, returnType, errors);
+    const handledError = addError(
+      rawError,
+      fieldNodes,
+      returnType,
+      path,
+      errors,
+    );
     filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
     return handledError;
   }
@@ -958,8 +977,13 @@ function completeValueCatchingErrors(
     // to take a second callback for the error case.
     completedValue = completedValue.then(undefined, (rawError) => {
       const errors = asyncPayloadRecord?.errors ?? exeContext.errors;
-      const error = locatedError(rawError, fieldNodes, pathToArray(path));
-      const handledError = handleFieldError(error, returnType, errors);
+      const handledError = addError(
+        rawError,
+        fieldNodes,
+        returnType,
+        path,
+        errors,
+      );
       filterSubsequentPayloads(exeContext, path, asyncPayloadRecord);
       return handledError;
     });
@@ -1065,8 +1089,9 @@ async function completeAsyncIteratorValue(
       // eslint-disable-next-line no-await-in-loop
       iteration = await iterator.next();
     } catch (rawError) {
-      const error = locatedError(rawError, fieldNodes, pathToArray(itemPath));
-      completedResults.push(handleFieldError(error, itemType, errors));
+      completedResults.push(
+        addError(rawError, fieldNodes, itemType, itemPath, errors),
+      );
       break;
     }
 
@@ -1957,8 +1982,13 @@ async function executeStreamIteratorItem(
   try {
     iteration = await iterator.next();
   } catch (rawError) {
-    const error = locatedError(rawError, fieldNodes, pathToArray(itemPath));
-    const value = handleFieldError(error, itemType, asyncPayloadRecord.errors);
+    const value = addError(
+      rawError,
+      fieldNodes,
+      itemType,
+      itemPath,
+      asyncPayloadRecord.errors,
+    );
     // don't continue if iterator throws
     return { done: true, value };
   }