GraphQLError: Fixed a regression for extensions before the refactoring

graphql · Oct 28, 2021 · 463f075 · 463f075
1 parent 7dc29fd
commit 463f075
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 3 deletions.
diff --git a/src/error/GraphQLError.js b/src/error/GraphQLError.js
@@ -102,11 +102,12 @@ export class GraphQLError extends Error {
 
     this.path = path ?? undefined;
 
-    this.extensions = extensions ?? {};
-
     const originalExtensions = originalError?.extensions;
-    if (isObjectLike(originalExtensions)) {
+
+    if (extensions == null && isObjectLike(originalExtensions)) {
       this.extensions = { ...originalExtensions };
+    } else {
+      this.extensions = extensions ?? {};
     }
 
     // By being enumerable, JSON.stringify will include bellow properties in the resulting output.

diff --git a/src/error/__tests__/GraphQLError-test.js b/src/error/__tests__/GraphQLError-test.js
@@ -164,6 +164,66 @@ describe('GraphQLError', () => {
       }
     `);
   });
+
+  it('uses the provided extensions when original extensions are undefined', () => {
+    const original = new Error('original');
+    const graphqlError = new GraphQLError(
+      'msg',
+      null,
+      null,
+      null,
+      null,
+      original,
+      {
+        someKey: 'someValue',
+      },
+    );
+
+    const e = new GraphQLError(
+      graphqlError.message,
+      null,
+      null,
+      null,
+      null,
+      graphqlError,
+      { correlationId: '123-echo-tango-delta' },
+    );
+
+    expect(JSON.stringify(e.extensions, null, 2) + '\n').to.equal(dedent`
+      {
+        "correlationId": "123-echo-tango-delta"
+      }
+    `);
+  });
+
+  it('uses the provided extensions when original extensions are empty object', () => {
+    const original = new Error('original');
+    const graphqlError = new GraphQLError(
+      'msg',
+      null,
+      null,
+      null,
+      null,
+      original,
+      {},
+    );
+
+    const e = new GraphQLError(
+      graphqlError.message,
+      null,
+      null,
+      null,
+      null,
+      graphqlError,
+      { correlationId: '123-echo-tango-delta' },
+    );
+
+    expect(JSON.stringify(e.extensions, null, 2) + '\n').to.equal(dedent`
+      {
+        "correlationId": "123-echo-tango-delta"
+      }
+    `);
+  });
 });
 
 describe('printError', () => {