Use modern-errors

package.json

@@ -61,6 +61,7 @@
     "junk": "^4.0.0",
     "map-obj": "^5.0.1",
     "merge-error-cause": "^1.1.2",
+    "modern-errors": "^1.0.0",
     "moize": "^6.1.1",
     "normalize-exception": "^1.1.3",
     "nvexeca": "^8.0.0",

src/config/normalize/lib/error.js

@@ -1,18 +1,14 @@
-import { modernErrors } from '../../../error/modern/main.js'
-import { packageJson } from '../../../utils/package.js'
+import modernErrors from 'modern-errors'
 
-const { InputError, DefinitionError, KeywordError, onError } = modernErrors(
-  ['InputError', 'DefinitionError', 'KeywordError'],
-  { bugsUrl: packageJson.bugs.url },
-)
+import { packageJson } from '../../../utils/package.js'
 
-export {
+export const {
   // Invalid `inputs`
   InputError,
   // Invalid `rules` or `options`
   DefinitionError,
   // Bug in a keyword|plugin
   KeywordError,
   // Top-level error handler
-  onError,
-}
+  errorHandler,
+} = modernErrors({ bugsUrl: packageJson.bugs.url })

src/config/normalize/lib/main.js

@@ -2,7 +2,7 @@ import { list } from 'wild-wild-path'
 
 import { cleanObject } from '../../../utils/clean.js'
 
-import { InputError, onError } from './error.js'
+import { errorHandler } from './error.js'
 import { getInfo } from './info.js'
 import { applyKeywords } from './keywords/main.js'
 import { normalizeOpts } from './options.js'
@@ -115,9 +115,9 @@ const LIST_OPTS = { childFirst: true, sort: true, missing: true, entries: true }
 // When in `sort` mode, input errors are returned instead of being thrown.
 // Other errors are always propagated.
 const handleError = function (error, soft) {
-  const errorA = onError(error)
+  const errorA = errorHandler(error)
 
-  if (soft && errorA instanceof InputError) {
+  if (soft && errorA.name === 'InputError') {
     return { error: errorA, warnings: [] }
   }
 

src/config/plugin/lib/error.js

@@ -1,18 +1,14 @@
-import { modernErrors } from '../../../error/modern/main.js'
-import { packageJson } from '../../../utils/package.js'
+import modernErrors from 'modern-errors'
 
-const { UserError, PluginError, ConsumerError, onError } = modernErrors(
-  ['UserError', 'PluginError', 'ConsumerError'],
-  { bugsUrl: packageJson.bugs.url },
-)
+import { packageJson } from '../../../utils/package.js'
 
-export {
+export const {
   // Error from the library's user, who defines available plugin types
   UserError,
   // Error from a plugin author, who defines a specific plugin
   PluginError,
   // Error from a plugin user
   ConsumerError,
   // Top-level error handler
-  onError,
-}
+  errorHandler,
+} = modernErrors({ bugsUrl: packageJson.bugs.url })

src/config/plugin/lib/main.js

@@ -1,5 +1,5 @@
 import { validateDuplicatePlugins } from './duplicates.js'
-import { UserError, onError } from './error.js'
+import { UserError, errorHandler } from './error.js'
 import { getPluginInfo } from './info.js'
 import { normalizeMultipleOpts, normalizeSingleOpts } from './options.js'
 
@@ -30,7 +30,7 @@ export const getPlugins = async function (pluginConfigs, opts) {
     validateDuplicatePlugins(pluginInfos, optsA)
     return pluginInfos
   } catch (error) {
-    throw onError(error)
+    throw errorHandler(error)
   }
 }
 
@@ -55,7 +55,7 @@ export const getPlugin = async function (pluginConfig, opts) {
     const plugin = await getPluginInfo(pluginConfig, optsA)
     return plugin
   } catch (error) {
-    throw onError(error)
+    throw errorHandler(error)
   }
 }
 

src/config/plugin/main.js

@@ -1,10 +1,10 @@
+import { PluginError, UserError } from '../../error/main.js'
 import { normalizeReporters } from '../../report/config/main.js'
 import { REPORTER_PLUGIN_TYPE } from '../../report/reporters/plugin/main.js'
 import { RUNNER_PLUGIN_TYPE } from '../../runners/plugin/main.js'
 import { cleanObject } from '../../utils/clean.js'
 import { PREFIX } from '../normalize/main.js'
 
-import { handlePluginsError } from './error.js'
 import { getPlugins } from './lib/main.js'
 
 // Handle the configuration plugins: runners and reporters
@@ -51,11 +51,25 @@ const normalizePluginConfigs = async function ({
     })
     const pluginInfosA = pluginInfos.map(normalizePluginInfo)
     return { [name]: pluginInfosA }
-  } catch (error) {
-    throw handlePluginsError(error)
+  } catch (cause) {
+    throw handlePluginsError(cause)
   }
 }
 
 const normalizePluginInfo = function ({ plugin, config }) {
   return cleanObject({ ...plugin, config })
 }
+
+// Translate error classes from the plugins library to error classes from this
+// library
+const handlePluginsError = function (cause) {
+  const ErrorType = cause.name in ERROR_MAP ? ERROR_MAP[cause.name] : Error
+  return new ErrorType('', { cause })
+}
+
+const ERROR_MAP = {
+  SystemError: Error,
+  UserError: Error,
+  PluginError,
+  ConsumerError: UserError,
+}

src/error/main.js

@@ -1,20 +1,8 @@
-import { packageJson } from '../utils/package.js'
-
-import { modernErrors } from './modern/main.js'
+import modernErrors from 'modern-errors'
 
-const {
-  PluginError,
-  UserCodeError,
-  UserError,
-  LimitError,
-  StopError,
-  onError,
-} = modernErrors(
-  ['PluginError', 'UserCodeError', 'UserError', 'LimitError', 'StopError'],
-  { bugsUrl: packageJson.bugs.url },
-)
+import { packageJson } from '../utils/package.js'
 
-export {
+export const {
   // Bug in a plugin (reporter|runner)
   PluginError,
   // Invalid tasks or tasks file
@@ -26,5 +14,5 @@ export {
   // User aborting the benchmark
   StopError,
   // Top-level error handler
-  onError,
-}
+  errorHandler,
+} = modernErrors({ bugsUrl: packageJson.bugs.url })