@tryghost/errors 3.0.0 → 3.0.1

package/cjs/GhostError.js

@@ -23,7 +23,7 @@ __export(GhostError_exports, {
   GhostError: () => GhostError
 });
 module.exports = __toCommonJS(GhostError_exports);
-var import_uuid = require("uuid");
+var import_crypto = require("crypto");
 var import_wrap_stack = require("./wrap-stack");
 class GhostError extends Error {
   constructor(options = {}) {
@@ -44,7 +44,7 @@ class GhostError extends Error {
     this.errorType = "InternalServerError";
     this.level = "normal";
     this.message = "The server has encountered an error.";
-    this.id = (0, import_uuid.v1)();
+    this.id = (0, import_crypto.randomUUID)();
     this.id = options.id || this.id;
     this.statusCode = options.statusCode || this.statusCode;
     this.level = options.level || this.level;

package/cjs/utils.js

@@ -34,9 +34,28 @@ __export(utils_exports, {
   serialize: () => serialize
 });
 module.exports = __toCommonJS(utils_exports);
-var import_utils_copy = __toESM(require("@stdlib/utils-copy"));
 var import_GhostError = require("./GhostError");
 var errors = __toESM(require("./errors"));
+function deepCloneValue(value) {
+  if (value === null || typeof value !== "object") {
+    return value;
+  }
+  if (value instanceof Error) {
+    const clone2 = Object.create(Object.getPrototypeOf(value));
+    for (const key of Object.getOwnPropertyNames(value)) {
+      clone2[key] = deepCloneValue(value[key]);
+    }
+    return clone2;
+  }
+  if (Array.isArray(value)) {
+    return value.map(deepCloneValue);
+  }
+  const clone = {};
+  for (const key of Object.keys(value)) {
+    clone[key] = deepCloneValue(value[key]);
+  }
+  return clone;
+}
 const errorsWithBase = { ...errors, GhostError: import_GhostError.GhostError };
 const _private = {
   serialize(err) {
@@ -182,7 +201,7 @@ function prepareStackForUser(error) {
   if ("context" in error && error.context) {
     stackbits.splice(1, 0, `${error.context}`);
   }
-  const errorClone = (0, import_utils_copy.default)(error);
+  const errorClone = deepCloneValue(error);
   errorClone.stack = stackbits.join("\n");
   return errorClone;
 }

package/es/GhostError.js

@@ -1,7 +1,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { v1 as uuidv1 } from "uuid";
+import { randomUUID } from "crypto";
 import { wrapStack } from "./wrap-stack";
 class GhostError extends Error {
   constructor(options = {}) {
@@ -22,7 +22,7 @@ class GhostError extends Error {
     this.errorType = "InternalServerError";
     this.level = "normal";
     this.message = "The server has encountered an error.";
-    this.id = uuidv1();
+    this.id = randomUUID();
     this.id = options.id || this.id;
     this.statusCode = options.statusCode || this.statusCode;
     this.level = options.level || this.level;

package/es/utils.js

@@ -1,6 +1,25 @@
-import deepCopy from "@stdlib/utils-copy";
 import { GhostError } from "./GhostError";
 import * as errors from "./errors";
+function deepCloneValue(value) {
+  if (value === null || typeof value !== "object") {
+    return value;
+  }
+  if (value instanceof Error) {
+    const clone2 = Object.create(Object.getPrototypeOf(value));
+    for (const key of Object.getOwnPropertyNames(value)) {
+      clone2[key] = deepCloneValue(value[key]);
+    }
+    return clone2;
+  }
+  if (Array.isArray(value)) {
+    return value.map(deepCloneValue);
+  }
+  const clone = {};
+  for (const key of Object.keys(value)) {
+    clone[key] = deepCloneValue(value[key]);
+  }
+  return clone;
+}
 const errorsWithBase = { ...errors, GhostError };
 const _private = {
   serialize(err) {
@@ -146,7 +165,7 @@ function prepareStackForUser(error) {
   if ("context" in error && error.context) {
     stackbits.splice(1, 0, `${error.context}`);
   }
-  const errorClone = deepCopy(error);
+  const errorClone = deepCloneValue(error);
   errorClone.stack = stackbits.join("\n");
   return errorClone;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/errors",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/TryGhost/framework.git",
@@ -21,7 +21,7 @@
     "build:cjs": "esbuild src/*.ts --target=es2020 --outdir=cjs --format=cjs",
     "build:es": "esbuild src/*.ts --target=es2020 --outdir=es --format=esm",
     "build:types": "tsc --emitDeclarationOnly --declaration --declarationMap --outDir types",
-    "test": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' NODE_ENV=testing c8 --check-coverage --100 --all -n src --reporter text --reporter cobertura  mocha -r ts-node/register './test/**/*.test.ts'",
+    "test": "NODE_ENV=testing vitest run --coverage",
     "lint": "eslint . --ext .js --cache",
     "posttest": "yarn lint"
   },
@@ -36,17 +36,10 @@
   },
   "devDependencies": {
     "@types/lodash": "4.17.24",
-    "@types/mocha": "10.0.10",
-    "@types/uuid": "11.0.0",
-    "c8": "11.0.0",
     "esbuild": "0.27.3",
     "lodash": "4.17.23",
-    "mocha": "11.7.5",
     "ts-node": "10.9.2",
     "typescript": "5.9.3"
   },
-  "dependencies": {
-    "@stdlib/utils-copy": "0.2.3",
-    "uuid": "13.0.0"
-  }
+  "dependencies": {}
 }

package/src/GhostError.ts

@@ -1,4 +1,4 @@
-import {v1 as uuidv1} from 'uuid';
+import {randomUUID} from 'crypto';
 import {wrapStack} from './wrap-stack';
 
 export interface GhostErrorOptions {
@@ -42,7 +42,7 @@ export class GhostError extends Error {
         this.errorType = 'InternalServerError';
         this.level = 'normal';
         this.message = 'The server has encountered an error.';
-        this.id = uuidv1();
+        this.id = randomUUID();
 
         /**
          * custom overrides

package/src/utils.ts

@@ -1,10 +1,33 @@
-import deepCopy from '@stdlib/utils-copy';
 import {GhostError} from './GhostError';
 import * as errors from './errors';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AnyObject = Record<string, any>
 
+// structuredClone doesn't preserve custom properties on Error subclasses
+// (see https://github.com/ungap/structured-clone/issues/12)
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function deepCloneValue(value: any): any {
+    if (value === null || typeof value !== 'object') {
+        return value;
+    }
+    if (value instanceof Error) {
+        const clone = Object.create(Object.getPrototypeOf(value));
+        for (const key of Object.getOwnPropertyNames(value)) {
+            clone[key] = deepCloneValue((value as AnyObject)[key]);
+        }
+        return clone;
+    }
+    if (Array.isArray(value)) {
+        return value.map(deepCloneValue);
+    }
+    const clone: AnyObject = {};
+    for (const key of Object.keys(value)) {
+        clone[key] = deepCloneValue(value[key]);
+    }
+    return clone;
+}
+
 const errorsWithBase: Record<string, typeof GhostError> = {...errors, GhostError};
 
 const _private = {
@@ -205,11 +228,7 @@ export function prepareStackForUser(error: Error): Error {
         stackbits.splice(1, 0, `${error.context}`);
     }
 
-    // @NOTE: would be a good idea to swap out the cloning implementation with native
-    //        `structuredClone` one once we use Node v17 or higher. Before making an
-    //        upgrade make sure structuredClone does a full copy of all properties
-    //        present on a custom error (see issue: https://github.com/ungap/structured-clone/issues/12)
-    const errorClone = deepCopy(error);
+    const errorClone = deepCloneValue(error);
     errorClone.stack = stackbits.join('\n');
     return errorClone;
 };

package/types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAIxC,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AA+HpC;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;IAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAA;CAAC,aAiBjF;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,WAAW,EAAE,SAAS,GAAG,SAAS,CAU7D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAAA;AAClE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAA;AAiCxD;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,WAkBtC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAIxC,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAuJpC;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;IAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAA;CAAC,aAiBjF;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,WAAW,EAAE,SAAS,GAAG,SAAS,CAU7D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAAA;AAClE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAA;AA6BxD;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,WAkBtC"}