EPR completeValueCatchingError

Author: mohawk2

src/execution/execute.js

@@ -771,14 +771,27 @@ function resolveField(
     info,
   );
 
-  return completeValueCatchingError(
+  const completed = completeValueCatchingError(
     exeContext,
     fieldDef.type,
     fieldNodes,
     info,
     path,
     result,
   );
+  const promise = getPromise(completed);
+  if (promise) {
+    return promise.then(r => {
+      if (r.errors && r.errors.length) {
+        exeContext.errors.push.apply(exeContext.errors, r.errors);
+      }
+      return r.data;
+    });
+  }
+  if (completed.errors && completed.errors.length) {
+    exeContext.errors.push.apply(exeContext.errors, completed.errors);
+  }
+  return completed.data;
 }
 
 export function buildResolveInfo(
@@ -852,23 +865,18 @@ function completeValueCatchingError(
   info: GraphQLResolveInfo,
   path: ResponsePath,
   result: mixed,
-): mixed {
+): ExecutionPartialResult<mixed> {
   // 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)) {
-    const completed = completeValueWithLocatedError(
+    return completeValueWithLocatedError(
       exeContext,
       returnType,
       fieldNodes,
       info,
       path,
       result,
     );
-    const promise = getPromise(completed);
-    if (promise) {
-      return promise.then(r => r.data);
-    }
-    return completed.data;
   }
 
   // Otherwise, error protection is applied, logging the error and resolving
@@ -888,17 +896,16 @@ function completeValueCatchingError(
       // the rejection error and resolve to null.
       // Note: we don't rely on a `catch` method, but we do expect "thenable"
       // to take a second callback for the error case.
-      return promise.then(r => r.data).then(undefined, error => {
-        exeContext.errors.push(error);
-        return null;
-      });
+      return promise.then(undefined, error => ({
+        data: null,
+        errors: [error],
+      }));
     }
-    return completed.data;
+    return completed;
   } catch (error) {
     // If `completeValueWithLocatedError` returned abruptly (threw an error),
     // log the error and return null.
-    exeContext.errors.push(error);
-    return null;
+    return { data: null, errors: [error] };
   }
 }
 
@@ -1107,8 +1114,22 @@ function completeListValue(
   });
 
   return containsPromise
-    ? Promise.all(completedResults).then(data => ({ data }))
-    : { data: completedResults };
+    ? Promise.all(completedResults).then(r => flattenEPRs(r))
+    : flattenEPRs(completedResults);
+}
+
+function flattenEPRs(
+  eprs: $ReadOnlyArray<ExecutionPartialResult<mixed>>,
+): ExecutionPartialResult<mixed> {
+  const errors = [];
+  const data = [];
+  forEach((eprs: any), item => {
+    data.push(item.data);
+    if (item.errors && item.errors.length) {
+      errors.push.apply(errors, item.errors);
+    }
+  });
+  return { data, errors };
 }
 
 /**