From 7c43e2e2d9ae117eccc422198100b14a54370cdd Mon Sep 17 00:00:00 2001
From: Nazarii Romankiv <ayzrian@gmail.com>
Date: Fri, 7 May 2021 17:37:17 +0300
Subject: [PATCH] fix: Include stacktrace into error message

---
 errors.js           | 17 ++++++++++++++---
 test/errors.test.js | 10 +++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/errors.js b/errors.js
index b71f4de..2157369 100644
--- a/errors.js
+++ b/errors.js
@@ -9,7 +9,8 @@ const { LEVEL, MESSAGE } = require('triple-beam');
  * If the `message` property of the `info` object is an instance of `Error`,
  * replace the `Error` object its own `message` property.
  *
- * Optionally, the Error's `stack` property can also be appended to the `info` object.
+ * Optionally, the Error's `stack` property can also be appended to the `message` property.
+ * For backward compatibility also include stack property into info object.
  */
 module.exports = format((einfo, { stack }) => {
   if (einfo instanceof Error) {
@@ -20,7 +21,12 @@ module.exports = format((einfo, { stack }) => {
       [MESSAGE]: einfo[MESSAGE] || einfo.message
     });
 
-    if (stack) info.stack = einfo.stack;
+    if (stack) {
+      info[MESSAGE] += '\n' + einfo.stack;
+      info.message = info[MESSAGE];
+      info.stack = einfo.stack;
+    }
+
     return info;
   }
 
@@ -34,6 +40,11 @@ module.exports = format((einfo, { stack }) => {
   einfo[MESSAGE] = err.message;
 
   // Assign the stack if requested.
-  if (stack) einfo.stack = err.stack;
+  if (stack) {
+    einfo[MESSAGE] += '\n' + err.stack;
+    einfo.message = einfo[MESSAGE];
+    einfo.stack = err.stack;
+  }
+
   return einfo;
 });
diff --git a/test/errors.test.js b/test/errors.test.js
index 5693857..c991681 100644
--- a/test/errors.test.js
+++ b/test/errors.test.js
@@ -53,8 +53,8 @@ describe('errors()({ object })', () => {
       assume(info.level).is.a('string');
       assume(info.message).is.a('string');
       assume(info.level).equals('info');
-      assume(info.message).equals(err.message);
-      assume(info[MESSAGE]).equals(err.message);
+      assume(info.message).equals(err.message + '\n' + err.stack);
+      assume(info[MESSAGE]).equals(err.message + '\n' + err.stack);
       assume(info.stack).equals(err.stack);
     }
   ));
@@ -100,15 +100,15 @@ describe('errors()(Error)', () => {
     { immutable: false }
   ));
 
-  it('errors({ space: 2 }) sets info.stack', assumeFormatted(
+  it('errors({ stack: true }) includes error stack into message.', assumeFormatted(
     errors({ stack: true }),
     errInfo,
     (info) => {
       assume(info.level).is.a('string');
       assume(info.message).is.a('string');
       assume(info.level).equals(errInfo.level);
-      assume(info.message).equals(errInfo.message);
-      assume(info[MESSAGE]).equals(errInfo.message);
+      assume(info.message).equals(errInfo.message + '\n' + errInfo.stack);
+      assume(info[MESSAGE]).equals(errInfo.message + '\n' + errInfo.stack);
       assume(info.stack).equals(errInfo.stack);
     },
     { immutable: false }