Improve plugin error handling

src/config/plugin/lib/config.js

@@ -80,8 +80,8 @@ const normalizeSharedConfig = async function ({
   return await safeNormalizeConfig(pluginConfig, [...shared, ...dummyRules], {
     all: { cwd, prefix, parent, context: { ...context, plugin } },
     keywords,
-    UserErrorType: ConsumerError,
-    SystemErrorType: UserError,
+    InputErrorType: ConsumerError,
+    DefinitionErrorType: UserError,
   })
 }
 
@@ -98,8 +98,8 @@ const normalizeSpecificConfig = async function ({
     {
       all: { cwd, prefix, parent, context },
       keywords,
-      UserErrorType: ConsumerError,
-      SystemErrorType: PluginError,
+      InputErrorType: ConsumerError,
+      DefinitionErrorType: PluginError,
     },
   )
 }

src/config/plugin/lib/location_normalize.js

@@ -18,8 +18,8 @@ export const normalizeLocation = async function ({
       context: { locationType, builtins, modulePrefix },
     },
     keywords,
-    UserErrorType: ConsumerError,
-    SystemErrorType: CoreError,
+    InputErrorType: ConsumerError,
+    DefinitionErrorType: CoreError,
   })
 }
 

src/config/plugin/lib/normalize.js

@@ -1,29 +1,22 @@
 import { wrapError } from '../../../error/wrap.js'
 import { normalizeInputs } from '../../normalize/lib/main.js'
 
-// Call `normalizeConfig` while assigning the right error types
-export const safeNormalizeConfig = async function (
-  config,
-  rules,
-  { UserErrorType, ...opts },
-) {
-  const { inputs, error } = await callNormalizeConfig(config, rules, opts)
+import { CoreError } from './error.js'
 
-  if (error) {
-    throw wrapError(error, '', UserErrorType)
+// Call `normalizeConfig` while assigning the right error types
+export const safeNormalizeConfig = async function (config, rules, opts) {
+  try {
+    const { inputs } = await normalizeInputs(config, rules, opts)
+    return inputs
+  } catch (error) {
+    throw wrapError(error, '', getErrorType(error, opts))
   }
-
-  return inputs
 }
 
-const callNormalizeConfig = async function (
-  config,
-  rules,
-  { SystemErrorType, ...opts },
-) {
-  try {
-    return await normalizeInputs(config, rules, { ...opts, soft: true })
-  } catch (error) {
-    throw wrapError(error, '', SystemErrorType)
+const getErrorType = function (error, { InputErrorType, DefinitionErrorType }) {
+  if (error.name === 'InputError') {
+    return InputErrorType
   }
+
+  return error.name === 'DefinitionError' ? DefinitionErrorType : CoreError
 }

src/config/plugin/lib/shape.js

@@ -17,8 +17,8 @@ export const normalizeShape = async function ({
       context: { sharedPropNames, locationType, originalLocation },
     },
     keywords,
-    UserErrorType: PluginError,
-    SystemErrorType: CoreError,
+    InputErrorType: PluginError,
+    DefinitionErrorType: CoreError,
   })
 
   if (shape === undefined) {
@@ -31,8 +31,8 @@ export const normalizeShape = async function ({
     {
       all: { prefix: PLUGIN_PREFIX, context },
       keywords,
-      UserErrorType: PluginError,
-      SystemErrorType: UserError,
+      InputErrorType: PluginError,
+      DefinitionErrorType: UserError,
     },
   )
 }

src/config/plugin/lib/top.js

@@ -16,8 +16,8 @@ export const normalizePluginConfigTop = async function (
     await safeNormalizeConfig(pluginConfig, [normalizeTop], {
       all: { cwd, prefix, parent: name, context: { pluginProp, builtins } },
       keywords,
-      UserErrorType: ConsumerError,
-      SystemErrorType: CoreError,
+      InputErrorType: ConsumerError,
+      DefinitionErrorType: CoreError,
     })
   return { originalLocation, pluginConfig: pluginConfigA, locationName }
 }