whoops 4.1.8 → 5.0.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "whoops",
   "description": "It makes simple throw qualified errors.",
   "homepage": "https://github.com/Kikobeats/whoops",
-  "version": "4.1.8",
+  "version": "5.0.0",
   "main": "src/index.js",
   "author": {
     "email": "josefrancisco.verdu@gmail.com",
@@ -33,10 +33,6 @@
     "simple",
     "throw"
   ],
-  "dependencies": {
-    "clean-stack": "~3.0.0",
-    "mimic-fn": "~3.1.0"
-  },
   "devDependencies": {
     "@commitlint/cli": "latest",
     "@commitlint/config-conventional": "latest",
@@ -46,7 +42,6 @@
     "finepack": "latest",
     "git-authors-cli": "latest",
     "github-generate-release": "latest",
-    "mocha": "latest",
     "nano-staged": "latest",
     "should": "latest",
     "simple-git-hooks": "latest",
@@ -70,7 +65,7 @@
     "release": "standard-version -a",
     "release:github": "github-generate-release",
     "release:tags": "git push --follow-tags origin HEAD:master",
-    "test": "c8 mocha"
+    "test": "c8 node --test"
   },
   "license": "MIT",
   "commitlint": {

package/src/index.js

@@ -1,11 +1,37 @@
 'use strict'
 
-const createExtendError = require('./create-extend-error')
-const createError = require('./create-error')
+function createErrorClass (ErrorClass) {
+  return (name, defaults) => {
+    class CustomError extends ErrorClass {
+      constructor (raw = {}) {
+        super(raw)
 
-const createErrorClass = ErrorClass => (className, props) => {
-  const errorClass = createError(className || ErrorClass.name)
-  return createExtendError(errorClass, props)
+        const { message, ...props } = typeof raw === 'string' ? { message: raw } : raw
+        const mergedProps = Object.assign({}, defaults, props)
+        Object.keys(mergedProps).forEach(key => (this[key] = mergedProps[key]))
+
+        if (message) this.description = typeof message === 'function' ? message(this) : message
+        this.message = this.code ? `${this.code}, ${this.description}` : this.description
+        this.name = name || ErrorClass.name
+      }
+    }
+
+    // Function to create an instance, allowing use without `new`
+    function CustomErrorFactory (props) {
+      return new CustomError(props)
+    }
+
+    // Ensure the function's name matches the class name for consistency
+    Object.defineProperty(CustomErrorFactory, 'name', {
+      value: name || ErrorClass.name,
+      writable: false
+    })
+
+    // Make `instanceof` checks work with both the class and factory
+    CustomErrorFactory.prototype = CustomError.prototype
+
+    return CustomErrorFactory
+  }
 }
 
 module.exports = createErrorClass(Error)

package/src/add-error-props.js

@@ -1,15 +0,0 @@
-'use strict'
-
-const { isFunction, composeErrorMessage } = require('./helpers')
-
-function interfaceObject (error, ...props) {
-  Object.assign(error, ...props)
-
-  error.description = isFunction(error.message) ? error.message(error) : error.message
-
-  error.message = error.code
-    ? composeErrorMessage(error.code, error.description)
-    : error.description
-}
-
-module.exports = interfaceObject

package/src/create-error.js

@@ -1,34 +0,0 @@
-'use strict'
-
-const { inherits } = require('./helpers')
-const mimicFn = require('mimic-fn')
-
-const REGEX_CLASS_NAME = /[^0-9a-zA-Z_$]/
-
-function createError (className) {
-  if (typeof className !== 'string') {
-    throw new TypeError('Expected className to be a string')
-  }
-
-  if (REGEX_CLASS_NAME.test(className)) {
-    throw new Error('className contains invalid characters')
-  }
-
-  function ErrorClass () {
-    Object.defineProperty(this, 'name', {
-      configurable: true,
-      value: className,
-      writable: true
-    })
-
-    if ('captureStackTrace' in Error) {
-      Error.captureStackTrace(this, this.constructor)
-    }
-  }
-
-  inherits(ErrorClass, Error)
-  mimicFn(ErrorClass, Error)
-  return ErrorClass
-}
-
-module.exports = createError

package/src/create-extend-error.js

@@ -1,25 +0,0 @@
-'use strict'
-
-const cleanStack = require('clean-stack')
-const mimicFn = require('mimic-fn')
-
-const addErrorProps = require('./add-error-props')
-const { isString } = require('./helpers')
-
-function createExtendError (ErrorClass, classProps) {
-  function ExtendError (props) {
-    const error = new ErrorClass()
-    const errorProps = isString(props) ? { message: props } : props
-    addErrorProps(error, classProps, errorProps)
-
-    error.stack = typeof error.stack === 'string' ? cleanStack(error.stack) : undefined
-    return error
-  }
-
-  ExtendError.prototype = ErrorClass.prototype
-  mimicFn(ExtendError, ErrorClass)
-
-  return ExtendError
-}
-
-module.exports = createExtendError

package/src/helpers.js

@@ -1,18 +0,0 @@
-'use strict'
-
-module.exports = {
-  isFunction: obj => typeof obj === 'function',
-  isString: obj => typeof obj === 'string',
-  composeErrorMessage: (code, description) => `${code}, ${description}`,
-  inherits: (ctor, superCtor) => {
-    ctor.super_ = superCtor
-    ctor.prototype = Object.create(superCtor.prototype, {
-      constructor: {
-        value: ctor,
-        enumerable: false,
-        writable: true,
-        configurable: true
-      }
-    })
-  }
-}