check-error 1.0.3 → 2.1.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,16 @@
-'use strict';
+function isErrorInstance(obj) {
+  // eslint-disable-next-line prefer-reflect
+  return obj instanceof Error || Object.prototype.toString.call(obj) === '[object Error]';
+}
 
-/* !
- * Chai - checkError utility
- * Copyright(c) 2012-2016 Jake Luer <jake@alogicalparadox.com>
- * MIT Licensed
- */
+function isErrorClass(obj) {
+  return obj === Error || (typeof obj === 'function' && obj.name === 'Error');
+}
 
-var getFunctionName = require('get-func-name');
-/**
- * ### .checkError
- *
- * Checks that an error conforms to a given set of criteria and/or retrieves information about it.
- *
- * @api public
- */
+function isRegExp(obj) {
+  // eslint-disable-next-line prefer-reflect
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
+}
 
 /**
  * ### .compatibleInstance(thrown, errorLike)
@@ -30,7 +27,7 @@ var getFunctionName = require('get-func-name');
  */
 
 function compatibleInstance(thrown, errorLike) {
-  return errorLike instanceof Error && thrown === errorLike;
+  return isErrorInstance(errorLike) && thrown === errorLike;
 }
 
 /**
@@ -50,10 +47,10 @@ function compatibleInstance(thrown, errorLike) {
  */
 
 function compatibleConstructor(thrown, errorLike) {
-  if (errorLike instanceof Error) {
+  if (isErrorInstance(errorLike)) {
     // 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) {
+  } else if (isErrorClass(Object.getPrototypeOf(errorLike)) || isErrorClass(errorLike)) {
     // If `errorLike` is a constructor that inherits from Error, we compare `thrown` to `errorLike` directly
     return thrown.constructor === errorLike || thrown instanceof errorLike;
   }
@@ -76,8 +73,8 @@ function compatibleConstructor(thrown, errorLike) {
  */
 
 function compatibleMessage(thrown, errMatcher) {
-  var comparisonString = typeof thrown === 'string' ? thrown : thrown.message;
-  if (errMatcher instanceof RegExp) {
+  const comparisonString = typeof thrown === 'string' ? thrown : thrown.message;
+  if (isRegExp(errMatcher)) {
     return errMatcher.test(comparisonString);
   } else if (typeof errMatcher === 'string') {
     return comparisonString.indexOf(errMatcher) !== -1; // eslint-disable-line no-magic-numbers
@@ -98,16 +95,16 @@ function compatibleMessage(thrown, errMatcher) {
  */
 
 function getConstructorName(errorLike) {
-  var constructorName = errorLike;
-  if (errorLike instanceof Error) {
-    constructorName = getFunctionName(errorLike.constructor);
+  let constructorName = errorLike;
+  if (isErrorInstance(errorLike)) {
+    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);
+    constructorName = errorLike.name;
     if (constructorName === '') {
-      var newConstructorName = getFunctionName(new errorLike()); // eslint-disable-line new-cap
+      const newConstructorName = (new errorLike().name); // eslint-disable-line new-cap
       constructorName = newConstructorName || constructorName;
     }
   }
@@ -129,7 +126,7 @@ function getConstructorName(errorLike) {
  */
 
 function getMessage(errorLike) {
-  var msg = '';
+  let msg = '';
   if (errorLike && errorLike.message) {
     msg = errorLike.message;
   } else if (typeof errorLike === 'string') {
@@ -139,10 +136,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

@@ -1,4 +1,5 @@
 {
+  "version": "2.1.0",
   "name": "check-error",
   "description": "Error comparison and information related utility for node and the browser",
   "keywords": [
@@ -18,21 +19,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",
+    "test:node": "mocha"
   },
   "config": {
     "ghooks": {
@@ -41,7 +43,7 @@
   },
   "eslintConfig": {
     "extends": [
-      "strict/es5"
+      "strict/es6"
     ],
     "env": {
       "es6": true
@@ -50,38 +52,29 @@
       "HTMLElement": false
     },
     "rules": {
-      "complexity": 0,
-      "max-statements": 0
+      "complexity": "off",
+      "max-statements": "off",
+      "prefer-arrow-callback": "off",
+      "prefer-reflect": "off"
     }
   },
-  "dependencies": {
-    "get-func-name": "^2.0.2"
-  },
   "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": "*"
-  },
-  "version": "1.0.3"
+    "node": ">= 16"
+  }
 }

package/check-error.js

@@ -1 +0,0 @@
-(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({},{},[])