@tryghost/errors 1.1.0 → 1.2.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2013-2021 Ghost Foundation
+Copyright (c) 2013-2022 Ghost Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -36,4 +36,4 @@ Follow the instructions for the top-level repo.
 
 # Copyright & License
 
-Copyright (c) 2013-2021 Ghost Foundation - Released under the [MIT license](LICENSE).
+Copyright (c) 2013-2022 Ghost Foundation - Released under the [MIT license](LICENSE).

package/lib/errors.js

@@ -1,7 +1,6 @@
 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 {
@@ -71,34 +70,6 @@ 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 = {
@@ -332,6 +303,14 @@ const ghostErrors = {
                 hideStack: true
             }, options));
         }
+    },
+    ConflictError: class ConflictError extends GhostError {
+        constructor(options) {
+            super(merge({
+                errorType: 'ConflictError',
+                statusCode: 409
+            }, options));
+        }
     }
 };
 
@@ -341,5 +320,6 @@ const ghostErrorsWithBase = Object.assign({}, ghostErrors, {GhostError});
 module.exports.utils = {
     serialize: utils.serialize.bind(ghostErrorsWithBase),
     deserialize: utils.deserialize.bind(ghostErrorsWithBase),
-    isGhostError: utils.isGhostError.bind(ghostErrorsWithBase)
+    isGhostError: utils.isGhostError.bind(ghostErrorsWithBase),
+    prepareStackForUser: utils.prepareStackForUser
 };

package/lib/utils.js

@@ -183,6 +183,36 @@ exports.deserialize = function deserialize(errorFormat) {
     return internalError;
 };
 
+/**
+ * @description Replace the stack with a user-facing one
+ * @params {Error} err
+ */
+exports.prepareStackForUser = function prepareStackForUser(error) {
+    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;
+};
+
 /**
  * @description Check whether an error instance is a GhostError.
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tryghost/errors",
-  "version": "1.1.0",
-  "repository": "https://github.com/TryGhost/Utils/tree/main/packages/errors",
+  "version": "1.2.2",
+  "repository": "https://github.com/TryGhost/framework/tree/main/packages/errors",
   "author": "Ghost Foundation",
   "license": "MIT",
   "main": "index.js",
@@ -19,14 +19,14 @@
     "access": "public"
   },
   "devDependencies": {
-    "c8": "7.10.0",
-    "mocha": "9.1.3",
+    "c8": "7.11.0",
+    "mocha": "9.2.0",
     "should": "13.2.3",
-    "sinon": "11.1.2"
+    "sinon": "13.0.1"
   },
   "dependencies": {
     "lodash": "^4.17.21",
     "uuid": "^8.3.2"
   },
-  "gitHead": "4e480d2c089b3896a1fe51545b9853bc4163c38f"
+  "gitHead": "e954893434fda3f8c8de1970aaaa6f6a8b297f5d"
 }