@tryghost/errors 1.0.2 → 1.1.1

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));
         }
     },
@@ -299,6 +332,14 @@ const ghostErrors = {
                 hideStack: true
             }, options));
         }
+    },
+    ConflictError: class ConflictError extends GhostError {
+        constructor(options) {
+            super(merge({
+                errorType: 'ConflictError',
+                statusCode: 409
+            }, 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
  *
@@ -182,6 +188,7 @@ exports.deserialize = function deserialize(errorFormat) {
  */
 exports.isGhostError = function isGhostError(err) {
     const errorName = this.GhostError.name;
+    const legacyErrorName = 'IgnitionError';
 
     const recursiveIsGhostError = function recursiveIsGhostError(obj) {
         // no super constructor available anymore
@@ -189,7 +196,7 @@ exports.isGhostError = function isGhostError(err) {
             return false;
         }
 
-        if (obj.name === errorName) {
+        if (obj.name === errorName || obj.name === legacyErrorName) {
             return true;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/errors",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "repository": "https://github.com/TryGhost/Utils/tree/main/packages/errors",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -25,7 +25,8 @@
     "sinon": "11.1.2"
   },
   "dependencies": {
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "uuid": "^8.3.2"
   },
-  "gitHead": "b7a0671a2697bc386af52df3b13312236e295d01"
+  "gitHead": "deb1552864a7da3430e0f0854ff013b5d0aa4a0c"
 }