Move list definitions

ehmicky · Feb 20, 2022 · abdfe48 · abdfe48
1 parent 339f711
commit abdfe48
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 29 deletions.
diff --git a/src/config/normalize/definitions.js b/src/config/normalize/definitions.js
@@ -35,7 +35,11 @@ import { normalizeConfigSelectors } from '../select/normalize.js'
 import { getDummyDefinitions } from './dummy.js'
 import { amongCommands } from './pick.js'
 import { normalizeArray } from './transform.js'
-import { validateJson, validateObject } from './validate/complex.js'
+import {
+  validateJson,
+  validateObject,
+  validateEmptyArray,
+} from './validate/complex.js'
 import { validateFileExists, validateDirectory } from './validate/fs.js'
 import {
   validateBoolean,
@@ -47,18 +51,6 @@ import {
 
 const configProps = getDummyDefinitions(CONFIG_DEFINITIONS)
 
-const runner = {
-  name: 'runner',
-  pick: amongCommands(['dev', 'run']),
-  default: DEFAULT_RUNNERS,
-}
-
-const reporter = {
-  name: 'reporter',
-  pick: amongCommands(['remove', 'run', 'show']),
-  default: DEFAULT_REPORTERS,
-}
-
 const cwd = {
   name: 'cwd',
   pick: amongCommands(['dev', 'remove', 'run', 'show']),
@@ -193,10 +185,24 @@ const titlesAny = {
   example: EXAMPLE_TITLE,
 }
 
+const runner = {
+  name: 'runner',
+  pick: amongCommands(['dev', 'run']),
+  default: DEFAULT_RUNNERS,
+  validate: validateEmptyArray,
+}
+
+const reporter = {
+  name: 'reporter',
+  pick: amongCommands(['remove', 'run', 'show']),
+  default: DEFAULT_REPORTERS,
+  transform(value, { config }) {
+    return config.force ? [] : value
+  },
+}
+
 export const DEFINITIONS = [
   ...configProps,
-  runner,
-  reporter,
   cwd,
   delta,
   force,
@@ -214,5 +220,7 @@ export const DEFINITIONS = [
   systemAny,
   titles,
   titlesAny,
+  runner,
+  reporter,
 ].flatMap(normalizeConfigSelectors)
 /* eslint-enable max-lines */
diff --git a/src/report/reporters/plugin/main.js b/src/report/reporters/plugin/main.js
@@ -44,10 +44,5 @@ export const REPORTER_PLUGIN_TYPE = {
       validate: validateDefinedString,
     },
   ],
-  list: {
-    transform(value, { config }) {
-      return config.force ? [] : value
-    },
-  },
   item,
 }
diff --git a/src/runners/plugin/main.js b/src/runners/plugin/main.js
@@ -1,7 +1,4 @@
-import {
-  validateEmptyArray,
-  validateFunction,
-} from '../../config/normalize/validate/complex.js'
+import { validateFunction } from '../../config/normalize/validate/complex.js'
 import { BUILTIN_RUNNERS } from '../main.js'
 
 import { item } from './item.js'
@@ -31,11 +28,6 @@ export const RUNNER_PLUGIN_TYPE = {
       validate: validateFunction,
     },
   ],
-  // Configuration property selecting and configuring the plugin
-  // Default: empty object
-  list: {
-    validate: validateEmptyArray,
-  },
   // Properties of the `list` item shared by all plugins
   // Default: empty array
   item,