check-error 1.0.2 → 2.0.0

package/README.md

@@ -21,12 +21,9 @@
       src="https://img.shields.io/github/tag/chaijs/check-error.svg?style=flat-square"
     />
   </a>
-  <a href="https://travis-ci.org/chaijs/check-error">
-    <img
-      alt="build:?"
-      src="https://img.shields.io/travis/chaijs/check-error/master.svg?style=flat-square"
-    />
-  </a>
+
+  ![example workflow](https://github.com/chaijs/check-error/actions/workflows/nodejs.yml/badge.svg)
+
   <a href="https://coveralls.io/r/chaijs/check-error">
     <img
       alt="coverage:?"

package/index.js

@@ -1,19 +1,3 @@
-'use strict';
-
-/* !
- * Chai - checkError utility
- * Copyright(c) 2012-2016 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### .checkError
- *
- * Checks that an error conforms to a given set of criteria and/or retrieves information about it.
- *
- * @api public
- */
-
 /**
  * ### .compatibleInstance(thrown, errorLike)
  *
@@ -75,7 +59,7 @@ function compatibleConstructor(thrown, errorLike) {
  */
 
 function compatibleMessage(thrown, errMatcher) {
-  var comparisonString = typeof thrown === 'string' ? thrown : thrown.message;
+  const comparisonString = typeof thrown === 'string' ? thrown : thrown.message;
   if (errMatcher instanceof RegExp) {
     return errMatcher.test(comparisonString);
   } else if (typeof errMatcher === 'string') {
@@ -85,34 +69,6 @@ function compatibleMessage(thrown, errMatcher) {
   return false;
 }
 
-/**
- * ### .getFunctionName(constructorFn)
- *
- * Returns the name of a function.
- * This also includes a polyfill function if `constructorFn.name` is not defined.
- *
- * @name getFunctionName
- * @param {Function} constructorFn
- * @namespace Utils
- * @api private
- */
-
-var functionNameMatch = /\s*function(?:\s|\s*\/\*[^(?:*\/)]+\*\/\s*)*([^\(\/]+)/;
-function getFunctionName(constructorFn) {
-  var name = '';
-  if (typeof constructorFn.name === 'undefined') {
-    // Here we run a polyfill if constructorFn.name is not defined
-    var match = String(constructorFn).match(functionNameMatch);
-    if (match) {
-      name = match[1];
-    }
-  } else {
-    name = constructorFn.name;
-  }
-
-  return name;
-}
-
 /**
  * ### .getConstructorName(errorLike)
  *
@@ -125,15 +81,18 @@ function getFunctionName(constructorFn) {
  */
 
 function getConstructorName(errorLike) {
-  var constructorName = errorLike;
+  let constructorName = errorLike;
   if (errorLike instanceof Error) {
-    constructorName = getFunctionName(errorLike.constructor);
+    constructorName = errorLike.constructor.name;
   } else if (typeof errorLike === 'function') {
     // If `err` is not an instance of Error it is an error constructor itself or another function.
     // If we've got a common function we get its name, otherwise we may need to create a new instance
     // of the error just in case it's a poorly-constructed error. Please see chaijs/chai/issues/45 to know more.
-    constructorName = getFunctionName(errorLike).trim() ||
-        getFunctionName(new errorLike()); // eslint-disable-line new-cap
+    constructorName = errorLike.name;
+    if (constructorName === '') {
+      const newConstructorName = (new errorLike().name); // eslint-disable-line new-cap
+      constructorName = newConstructorName || constructorName;
+    }
   }
 
   return constructorName;
@@ -153,7 +112,7 @@ function getConstructorName(errorLike) {
  */
 
 function getMessage(errorLike) {
-  var msg = '';
+  let msg = '';
   if (errorLike && errorLike.message) {
     msg = errorLike.message;
   } else if (typeof errorLike === 'string') {
@@ -163,10 +122,4 @@ function getMessage(errorLike) {
   return msg;
 }
 
-module.exports = {
-  compatibleInstance: compatibleInstance,
-  compatibleConstructor: compatibleConstructor,
-  compatibleMessage: compatibleMessage,
-  getMessage: getMessage,
-  getConstructorName: getConstructorName,
-};
+export { compatibleInstance, compatibleConstructor, compatibleMessage, getMessage, getConstructorName };

package/package.json

@@ -18,21 +18,22 @@
     "index.js",
     "check-error.js"
   ],
+  "type": "module",
   "main": "./index.js",
+  "module": "./index.js",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/chaijs/check-error.git"
   },
   "scripts": {
-    "build": "browserify --bare $npm_package_main --standalone checkError -o check-error.js",
-    "lint": "eslint --ignore-path .gitignore .",
+    "build": "rollup -c rollup.config.js",
+    "lint": "eslint --ignore-path .gitignore index.js test/",
     "prepublish": "npm run build",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post",
-    "pretest": "npm run lint",
-    "test": "npm run test:node && npm run test:browser && npm run upload-coverage",
-    "test:browser": "karma start --singleRun=true",
-    "test:node": "istanbul cover _mocha",
-    "upload-coverage": "lcov-result-merger 'coverage/**/lcov.info' | coveralls; exit 0"
+    "pretest": "npm run lint && npm run build",
+    "test": "npm run test:node && npm run test:browser",
+    "test:browser": "web-test-runner --node-resolve test/",
+    "test:node": "mocha"
   },
   "config": {
     "ghooks": {
@@ -41,7 +42,7 @@
   },
   "eslintConfig": {
     "extends": [
-      "strict/es5"
+      "strict/es6"
     ],
     "env": {
       "es6": true
@@ -50,36 +51,29 @@
       "HTMLElement": false
     },
     "rules": {
-      "complexity": 0,
-      "max-statements": 0
+      "complexity": "off",
+      "max-statements": "off",
+      "prefer-arrow-callback": "off"
     }
   },
-  "dependencies": {},
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^21.0.0",
+    "@rollup/plugin-node-resolve": "^13.0.5",
+    "@web/test-runner": "^0.17.0",
     "browserify": "^13.0.0",
     "browserify-istanbul": "^1.0.0",
-    "coveralls": "2.11.9",
     "eslint": "^2.4.0",
     "eslint-config-strict": "^8.5.0",
     "eslint-plugin-filenames": "^0.2.0",
     "ghooks": "^1.0.1",
-    "istanbul": "^0.4.2",
-    "karma": "^0.13.22",
-    "karma-browserify": "^5.0.2",
-    "karma-coverage": "^0.5.5",
-    "karma-mocha": "^0.2.2",
-    "karma-phantomjs-launcher": "^1.0.0",
-    "karma-sauce-launcher": "^0.3.1",
-    "lcov-result-merger": "^1.0.2",
-    "mocha": "^2.4.5",
-    "phantomjs-prebuilt": "^2.1.5",
+    "mocha": "^9.1.2",
+    "rollup": "^2.58.0",
     "semantic-release": "^4.3.5",
-    "simple-assert": "^1.0.0",
-    "travis-after-all": "^1.4.4",
+    "simple-assert": "^2.0.0",
     "validate-commit-msg": "^2.3.1"
   },
   "engines": {
-    "node": "*"
+    "node": ">= 16"
   },
-  "version": "1.0.2"
-}
+  "version": "2.0.0"
+}

package/check-error.js

@@ -1,176 +0,0 @@
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.checkError = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-'use strict';
-
-/* !
- * Chai - checkError utility
- * Copyright(c) 2012-2016 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
-
-/**
- * ### .checkError
- *
- * Checks that an error conforms to a given set of criteria and/or retrieves information about it.
- *
- * @api public
- */
-
-/**
- * ### .compatibleInstance(thrown, errorLike)
- *
- * Checks if two instances are compatible (strict equal).
- * Returns false if errorLike is not an instance of Error, because instances
- * can only be compatible if they're both error instances.
- *
- * @name compatibleInstance
- * @param {Error} thrown error
- * @param {Error|ErrorConstructor} errorLike object to compare against
- * @namespace Utils
- * @api public
- */
-
-function compatibleInstance(thrown, errorLike) {
-  return errorLike instanceof Error && thrown === errorLike;
-}
-
-/**
- * ### .compatibleConstructor(thrown, errorLike)
- *
- * Checks if two constructors are compatible.
- * This function can receive either an error constructor or
- * an error instance as the `errorLike` argument.
- * Constructors are compatible if they're the same or if one is
- * an instance of another.
- *
- * @name compatibleConstructor
- * @param {Error} thrown error
- * @param {Error|ErrorConstructor} errorLike object to compare against
- * @namespace Utils
- * @api public
- */
-
-function compatibleConstructor(thrown, errorLike) {
-  if (errorLike instanceof Error) {
-    // If `errorLike` is an instance of any error we compare their constructors
-    return thrown.constructor === errorLike.constructor || thrown instanceof errorLike.constructor;
-  } else if (errorLike.prototype instanceof Error || errorLike === Error) {
-    // If `errorLike` is a constructor that inherits from Error, we compare `thrown` to `errorLike` directly
-    return thrown.constructor === errorLike || thrown instanceof errorLike;
-  }
-
-  return false;
-}
-
-/**
- * ### .compatibleMessage(thrown, errMatcher)
- *
- * Checks if an error's message is compatible with a matcher (String or RegExp).
- * If the message contains the String or passes the RegExp test,
- * it is considered compatible.
- *
- * @name compatibleMessage
- * @param {Error} thrown error
- * @param {String|RegExp} errMatcher to look for into the message
- * @namespace Utils
- * @api public
- */
-
-function compatibleMessage(thrown, errMatcher) {
-  var comparisonString = typeof thrown === 'string' ? thrown : thrown.message;
-  if (errMatcher instanceof RegExp) {
-    return errMatcher.test(comparisonString);
-  } else if (typeof errMatcher === 'string') {
-    return comparisonString.indexOf(errMatcher) !== -1; // eslint-disable-line no-magic-numbers
-  }
-
-  return false;
-}
-
-/**
- * ### .getFunctionName(constructorFn)
- *
- * Returns the name of a function.
- * This also includes a polyfill function if `constructorFn.name` is not defined.
- *
- * @name getFunctionName
- * @param {Function} constructorFn
- * @namespace Utils
- * @api private
- */
-
-var functionNameMatch = /\s*function(?:\s|\s*\/\*[^(?:*\/)]+\*\/\s*)*([^\(\/]+)/;
-function getFunctionName(constructorFn) {
-  var name = '';
-  if (typeof constructorFn.name === 'undefined') {
-    // Here we run a polyfill if constructorFn.name is not defined
-    var match = String(constructorFn).match(functionNameMatch);
-    if (match) {
-      name = match[1];
-    }
-  } else {
-    name = constructorFn.name;
-  }
-
-  return name;
-}
-
-/**
- * ### .getConstructorName(errorLike)
- *
- * Gets the constructor name for an Error instance or constructor itself.
- *
- * @name getConstructorName
- * @param {Error|ErrorConstructor} errorLike
- * @namespace Utils
- * @api public
- */
-
-function getConstructorName(errorLike) {
-  var constructorName = errorLike;
-  if (errorLike instanceof Error) {
-    constructorName = getFunctionName(errorLike.constructor);
-  } else if (typeof errorLike === 'function') {
-    // If `err` is not an instance of Error it is an error constructor itself or another function.
-    // If we've got a common function we get its name, otherwise we may need to create a new instance
-    // of the error just in case it's a poorly-constructed error. Please see chaijs/chai/issues/45 to know more.
-    constructorName = getFunctionName(errorLike).trim() ||
-        getFunctionName(new errorLike()); // eslint-disable-line new-cap
-  }
-
-  return constructorName;
-}
-
-/**
- * ### .getMessage(errorLike)
- *
- * Gets the error message from an error.
- * If `err` is a String itself, we return it.
- * If the error has no message, we return an empty string.
- *
- * @name getMessage
- * @param {Error|String} errorLike
- * @namespace Utils
- * @api public
- */
-
-function getMessage(errorLike) {
-  var msg = '';
-  if (errorLike && errorLike.message) {
-    msg = errorLike.message;
-  } else if (typeof errorLike === 'string') {
-    msg = errorLike;
-  }
-
-  return msg;
-}
-
-module.exports = {
-  compatibleInstance: compatibleInstance,
-  compatibleConstructor: compatibleConstructor,
-  compatibleMessage: compatibleMessage,
-  getMessage: getMessage,
-  getConstructorName: getConstructorName,
-};
-
-},{}]},{},[1])(1)
-});