Remove type

src/config/plugin/id.js

@@ -9,10 +9,10 @@ import { PluginError } from '../../error/main.js'
 // (e.g. runners) because those should use variations instead.
 // Since the list of plugin module names is unknown, users must indicate using
 // this by the usage of a delimiter character.
-export const getModuleId = function (id, type, multiple) {
+export const getModuleId = function (id, multiple, selectPropName) {
   const [moduleId, customId] = splitId(id, multiple)
-  validateModuleId(moduleId, type)
-  validateCustomId(customId, type)
+  validateModuleId(moduleId, selectPropName)
+  validateCustomId(customId, selectPropName)
   return moduleId
 }
 
@@ -34,9 +34,9 @@ const splitId = function (id, multiple) {
 
 const CUSTOM_ID_DELIMITER = '_'
 
-const validateModuleId = function (moduleId, type) {
+const validateModuleId = function (moduleId, selectPropName) {
   if (!MODULE_ID_REGEXP.test(moduleId)) {
-    throw new PluginError(`The identifier of the ${type} "${moduleId}" is invalid.
+    throw new PluginError(`The identifier of the ${selectPropName} "${moduleId}" is invalid.
 It should only contain lowercase letters and digits.`)
   }
 }
@@ -52,8 +52,11 @@ It should only contain lowercase letters and digits.`)
 // This is purposely not applied to shared configs.
 const MODULE_ID_REGEXP = /^[a-z][a-z\d]*$/u
 
-const validateCustomId = function (customId, type) {
+const validateCustomId = function (customId, selectPropName) {
   if (customId !== undefined) {
-    validateUserId({ id: customId, messageName: `${type} identifier suffix` })
+    validateUserId({
+      id: customId,
+      messageName: `${selectPropName} identifier suffix`,
+    })
   }
 }

src/config/plugin/import.js

@@ -11,13 +11,12 @@ import { getModuleId } from './id.js'
 // a dynamic `Module` instance.
 export const importPlugin = async function ({
   id,
-  type,
   selectPropName,
   modulePrefix,
   builtins,
   multiple,
 }) {
-  const moduleId = getModuleId(id, type, multiple)
+  const moduleId = getModuleId(id, multiple, selectPropName)
   const builtin = builtins[moduleId]
 
   if (builtin !== undefined) {
@@ -36,7 +35,7 @@ export const importPlugin = async function ({
   } catch (error) {
     throw wrapError(
       error,
-      `Could not load "${type}" module "${moduleId}"\n\n`,
+      `Could not load "${selectPropName}" module "${moduleId}"\n\n`,
       PluginError,
     )
   }

src/config/plugin/load.js

@@ -26,7 +26,6 @@ export const loadPlugins = async function ({
 const loadPlugin = async function (
   { id, config, topConfig, context, configInfos },
   {
-    type,
     selectProp: { name: selectPropName },
     configProp: { name: configPropName },
     modulePrefix,
@@ -39,7 +38,6 @@ const loadPlugin = async function (
 ) {
   const plugin = await importPlugin({
     id,
-    type,
     selectPropName,
     modulePrefix,
     builtins,

src/config/plugin/types.js

@@ -3,8 +3,8 @@ import { RUNNER_PLUGIN_TYPE } from '../../runners/plugin.js'
 
 // All plugin types
 export const PLUGIN_TYPES = {
-  [RUNNER_PLUGIN_TYPE.type]: RUNNER_PLUGIN_TYPE,
-  [REPORTER_PLUGIN_TYPE.type]: REPORTER_PLUGIN_TYPE,
+  [RUNNER_PLUGIN_TYPE.selectProp.name]: RUNNER_PLUGIN_TYPE,
+  [REPORTER_PLUGIN_TYPE.selectProp.name]: REPORTER_PLUGIN_TYPE,
 }
 
 export const PLUGIN_TYPES_ARRAY = Object.values(PLUGIN_TYPES)

src/report/reporters/plugin.js

@@ -17,7 +17,6 @@ import { sharedProps } from './shared_props.js'
 const pick = amongCommands(['remove', 'run', 'show'])
 
 export const REPORTER_PLUGIN_TYPE = {
-  type: 'reporter',
   modulePrefix: 'spyd-reporter-',
   multiple: true,
   shape: [

src/runners/plugin.js

@@ -10,7 +10,6 @@ import { sharedProps } from './shared_props.js'
 const pick = amongCommands(['dev', 'run'])
 
 export const RUNNER_PLUGIN_TYPE = {
-  type: 'runner',
   // Prefix of the npm package
   modulePrefix: 'spyd-runner-',
   // When `true`, the plugin can be selected twice but with different configs