narrow diff

Author: yaacovCR

src/execution/execute.ts

@@ -619,10 +619,6 @@ function executeSubscription(
     sharedExecutionContext.getAsyncHelpers,
   );
 
-  const onError = (error: unknown): PromiseOrValue<never> => {
-    throw locatedError(error, fieldNodes, pathToArray(path));
-  };
-
   try {
     // Implements the "ResolveFieldEventStream" algorithm from GraphQL specification.
     // It differs from "ResolveFieldValue" due to providing a different `resolveFn`.
@@ -651,11 +647,19 @@ function executeSubscription(
       const promise = externalAbortSignal
         ? cancellablePromise(result, externalAbortSignal)
         : result;
-      return promise.then(assertEventStream).then(undefined, onError);
+      return promise
+        .then(assertEventStream)
+        .then(undefined, (error: unknown) => {
+          throw locatedError(
+            error,
+            toNodes(fieldDetailsList),
+            pathToArray(path),
+          );
+        });
     }
     return assertEventStream(result);
   } catch (error) {
-    return onError(error);
+    throw locatedError(error, fieldNodes, pathToArray(path));
   }
 }
 
@@ -708,3 +712,7 @@ export function buildResolveInfo(
     getAsyncHelpers,
   };
 }
+
+function toNodes(fieldDetailsList: FieldDetailsList): ReadonlyArray<FieldNode> {
+  return fieldDetailsList.map((fieldDetails) => fieldDetails.node);
+}