@tryghost/errors 1.0.4 → 1.1.0

package/lib/errors.js

@@ -1,6 +1,7 @@
 const uuid = require('uuid');
 const merge = require('lodash/merge');
 const isString = require('lodash/isString');
+const cloneDeep = require('lodash/cloneDeep');
 const utils = require('./utils');
 
 class GhostError extends Error {
@@ -59,7 +60,10 @@ class GhostError extends Error {
                 }
 
                 if (property === 'stack') {
-                    this[property] += '\n\n' + options.err[property];
+                    if (this.hideStack) {
+                        return;
+                    }
+                    this[property] = utils.wrapStack(this, options.err);
                     return;
                 }
 
@@ -67,6 +71,34 @@ class GhostError extends Error {
             });
         }
     }
+
+    prepareErrorForUser() {
+        const error = cloneDeep(this);
+
+        let stackbits = error.stack.split(/\n/);
+    
+        // We build this up backwards, so we always insert at position 1
+    
+        if (process.env.NODE_ENV === 'production') {
+            stackbits.splice(1, stackbits.length - 1);
+        } else {
+            // Clearly mark the strack trace
+            stackbits.splice(1, 0, `Stack Trace:`);
+        }
+    
+        // Add in our custom cotext and help methods
+    
+        if (this.help) {
+            stackbits.splice(1, 0, `${this.help}`);
+        }
+    
+        if (this.context) {
+            stackbits.splice(1, 0, `${this.context}`);
+        }
+    
+        error.stack = stackbits.join('\n');
+        return error;
+    }
 }
 
 const ghostErrors = {
@@ -95,7 +127,8 @@ const ghostErrors = {
             super(merge({
                 statusCode: 404,
                 errorType: 'NotFoundError',
-                message: 'Resource could not be found.'
+                message: 'Resource could not be found.',
+                hideStack: true
             }, options));
         }
     },

package/lib/utils.js

@@ -127,6 +127,12 @@ _private.JSONAPIDeserialize = function JSONAPIDeserialize(errorFormat) {
     return internalError;
 };
 
+exports.wrapStack = function wrapStack(err, internalErr) {
+    const extraLine = err.stack.split(/\n/g)[1];
+    const [firstLine, ...rest] = internalErr.stack.split(/\n/g);
+    return [firstLine, extraLine, ...rest].join('\n');
+};
+
 /**
  * @description Serialize GhostError instance to error JSON format
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/errors",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "repository": "https://github.com/TryGhost/Utils/tree/main/packages/errors",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -28,5 +28,5 @@
     "lodash": "^4.17.21",
     "uuid": "^8.3.2"
   },
-  "gitHead": "646fbc5aac374659c3a469ecf99dc5defb1901cf"
+  "gitHead": "4e480d2c089b3896a1fe51545b9853bc4163c38f"
 }