fix: revert subscription event source stream handling (#5965)

* fix: revert subscription event source stream handling * fix: wrap error * test: ensure location is there * better assertion condition
ardatan · Mar 11, 2024 · 3e10da6 · 3e10da6
1 parent baf3c28
commit 3e10da6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/.changeset/spotty-ways-give.md b/.changeset/spotty-ways-give.md
@@ -0,0 +1,5 @@
+---
+"@graphql-tools/executor": patch
+---
+
+revert subscription event source error handling to graphql-js behaviour
diff --git a/packages/executor/src/execution/__tests__/subscribe-test.ts b/packages/executor/src/execution/__tests__/subscribe-test.ts
@@ -1287,18 +1287,9 @@ describe('Subscription Publish Phase', () => {
       },
     });
 
-    const resultThree = await iterator.next();
-
-    expect(JSON.parse(JSON.stringify(resultThree))).toEqual({
-      done: false,
-      value: {
-        errors: [
-          {
-            message: 'test error',
-            locations: [{ line: 2, column: 9 }],
-          },
-        ],
-      },
+    await expect(iterator.next()).rejects.toMatchObject({
+      message: 'test error',
+      locations: [{ line: 2, column: 9 }],
     });
 
     const endResult = await iterator.next();

diff --git a/packages/executor/src/execution/execute.ts b/packages/executor/src/execution/execute.ts
@@ -1631,14 +1631,12 @@ function mapSourceToResponse(
           await executeImpl(buildPerEventExecutionContext(exeContext, payload)),
           exeContext.signal,
         ),
-      async function* (error: Error) {
+      (error: Error) => {
         const wrappedError = createGraphQLError(error.message, {
           originalError: error,
           nodes: [exeContext.operation],
         });
-        yield {
-          errors: [wrappedError],
-        };
+        throw wrappedError;
       },
     ),
   );