EPR completeValueWithLocatedError

Author: mohawk2

src/execution/execute.js

@@ -856,14 +856,19 @@ function completeValueCatchingError(
   // 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)) {
-    return completeValueWithLocatedError(
+    const completed = 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
@@ -883,12 +888,12 @@ 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(undefined, error => {
+      return promise.then(r => r.data).then(undefined, error => {
         exeContext.errors.push(error);
         return null;
       });
     }
-    return completed;
+    return completed.data;
   } catch (error) {
     // If `completeValueWithLocatedError` returned abruptly (threw an error),
     // log the error and return null.
@@ -906,7 +911,7 @@ function completeValueWithLocatedError(
   info: GraphQLResolveInfo,
   path: ResponsePath,
   result: mixed,
-): mixed {
+): ExecutionPartialResult<mixed> {
   try {
     const completed = completeValue(
       exeContext,
@@ -918,7 +923,7 @@ function completeValueWithLocatedError(
     );
     const promise = getPromise(completed);
     if (promise) {
-      return promise.then(r => r.data).then(undefined, error =>
+      return promise.then(undefined, error =>
         Promise.reject(
           locatedError(
             asErrorInstance(error),
@@ -928,7 +933,7 @@ function completeValueWithLocatedError(
         ),
       );
     }
-    return completed.data;
+    return completed;
   } catch (error) {
     throw locatedError(
       asErrorInstance(error),