Fix notImplemented and more setting Error cause

hapijs · Oct 31, 2024 · e114fbd · e114fbd
1 parent e4ba24d
commit e114fbd
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 9 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -373,11 +373,20 @@ exports.illegal = internals.statusError(451);
 
 // 5xx Server Errors
 
+internals.serverError = function (message, data) {
+
+    const isDataNonBoomError = data instanceof Error && !exports.isBoom(data);
+
+    return [message, isDataNonBoomError ? { cause: data } : { data }];
+};
+
+
 exports.internal = internals.statusError(500, (message, data, statusCode = 500) => {
 
     const res = internals.serverError(message, data);
     if (statusCode !== 500) {
-        res[1].statusCode = statusCode;
+        const [, options] = res;
+        options.statusCode = statusCode;
     }
 
     return res;
@@ -402,11 +411,3 @@ exports.badImplementation = internals.statusError(500, (message, data) => {
     res.push({ isDeveloperError: true });
     return res;
 });
-
-
-internals.serverError = function (message, data) {
-
-    const isDataNonBoomError = data instanceof Error && !exports.isBoom(data);
-
-    return [message, isDataNonBoomError ? { cause: data } : { data }];
-};
diff --git a/test/index.js b/test/index.js
@@ -920,6 +920,14 @@ describe('Boom', () => {
             expect(Boom.internal('my message', { my: 'data' }).data.my).to.equal('data');
         });
 
+        it('uses data with Error as cause', () => {
+
+            const insideErr = new Error('inside');
+            const err = Boom.internal('my message', insideErr);
+            expect(err.data).to.not.exist();
+            expect(err.cause).to.shallow.equal(insideErr);
+        });
+
         it('returns an error with composite message', () => {
 
             const x = {};
@@ -949,6 +957,14 @@ describe('Boom', () => {
 
             expect(Boom.notImplemented('my message').message).to.equal('my message');
         });
+
+        it('uses data with Error as cause', () => {
+
+            const insideErr = new Error('inside');
+            const err = Boom.notImplemented('my message', insideErr);
+            expect(err.data).to.not.exist();
+            expect(err.cause).to.shallow.equal(insideErr);
+        });
     });
 
     describe('badGateway()', () => {
@@ -970,6 +986,14 @@ describe('Boom', () => {
             expect(boom.output.statusCode).to.equal(502);
             expect(boom.data).to.equal(upstream);
         });
+
+        it('uses data with Error as cause', () => {
+
+            const insideErr = new Error('inside');
+            const err = Boom.badGateway('my message', insideErr);
+            expect(err.data).to.not.exist();
+            expect(err.cause).to.shallow.equal(insideErr);
+        });
     });
 
     describe('gatewayTimeout()', () => {
@@ -983,6 +1007,14 @@ describe('Boom', () => {
 
             expect(Boom.gatewayTimeout('my message').message).to.equal('my message');
         });
+
+        it('uses data with Error as cause', () => {
+
+            const insideErr = new Error('inside');
+            const err = Boom.gatewayTimeout('my message', insideErr);
+            expect(err.data).to.not.exist();
+            expect(err.cause).to.shallow.equal(insideErr);
+        });
     });
 
     describe('badImplementation()', () => {