Fix CLI flags parsing of config selectors

src/bin/config/all.js

@@ -5,7 +5,6 @@ export const ALL_CONFIG = {
   config: {
     group: CONFIG,
     alias: 'c',
-    string: true,
     describe: `Configuration file location.
 
 This can be:
@@ -34,7 +33,6 @@ The configuration property must then be an object where:
   },
   cwd: {
     group: CONFIG,
-    string: true,
     requiresArg: true,
     describe: `Customize the current directory used:
   - In task files

src/bin/config/combinations.js

@@ -5,7 +5,6 @@ export const COMBINATIONS_CONFIG = {
   tasks: {
     group: TASKS,
     alias: 't',
-    string: true,
     requiresArg: true,
     describe: `Path to the tasks files.
 This should only specify their main files.
@@ -20,7 +19,6 @@ Can be a globbing pattern.`,
   },
   runner: {
     group: TASKS,
-    string: true,
     describe: `Tasks' programming language or platform.
 Can be specified several times.
 

src/bin/config/remove.js

@@ -5,7 +5,6 @@ export const REMOVE_CONFIG = {
   force: {
     group: REPORT,
     alias: 'f',
-    boolean: true,
     describe: `Do not report the result nor ask for confirmation.
 Default: true unless the terminal is interactive.`,
   },

src/bin/config/report.js

@@ -1,12 +1,10 @@
-/* eslint-disable max-lines */
 import { REPORT, HISTORY } from './groups.js'
 
 // Configuration shared by commands that report results: `run`, `show`, `remove`
 export const REPORT_CONFIG = {
   reporter: {
     group: REPORT,
     alias: 'r',
-    string: true,
     describe: `Modules to report the result.
 
 Can be empty, if no reporters should be used.
@@ -33,7 +31,6 @@ reporter.`,
   output: {
     group: REPORT,
     alias: 'o',
-    string: true,
     requiresArg: true,
     describe: `Output the result to "stdout" or to a file path.
 
@@ -46,7 +43,6 @@ The default value depends on the reporter`,
   },
   colors: {
     group: REPORT,
-    boolean: true,
     describe: `Use colors in output.
 Default: true if the output is an interactive terminal.`,
   },
@@ -59,35 +55,29 @@ The id can be any identifier: task, runner, system, variation.`,
   },
   showTitles: {
     group: REPORT,
-    boolean: true,
     describe: `Show titles instead of identifiers.
 Default: false`,
   },
   showSystem: {
     group: REPORT,
-    boolean: true,
     describe: `Show hardware and software information.
 Default: true when the "system" configuration property is set, false otherwise`,
   },
   showMetadata: {
     group: REPORT,
-    boolean: true,
     describe: `Show metadata such as id, timestamp, commit/branch or CI build.
 Default: true for command "show" and "remove", false otherwise`,
   },
   showPrecision: {
     group: REPORT,
-    boolean: true,
     describe: `Show the results confidence interval.
 Default: false.`,
   },
   showDiff: {
     group: HISTORY,
-    boolean: true,
     describe: `Show the difference with previous results.
 Default: true if the output is an interactive terminal.`,
   },
-  // We do not use `number: true` to avoid parsing invalid numbers as NaN
   limit: {
     group: HISTORY,
     alias: 'l',
@@ -102,4 +92,3 @@ Negative numbers like "-50" can be used for decreases instead.
 Default: none`,
   },
 }
-/* eslint-enable max-lines */

src/bin/config/run.js

@@ -2,7 +2,6 @@ import { TASKS, REPORT, HISTORY } from './groups.js'
 
 // Configuration specific to `run`
 export const RUN_CONFIG = {
-  // We do not use `number: true` to avoid parsing invalid numbers as NaN
   precision: {
     group: TASKS,
     alias: 'p',
@@ -14,20 +13,17 @@ A higher level increases precision but makes the benchmark last longer.`,
   quiet: {
     group: REPORT,
     alias: 'q',
-    boolean: true,
     describe: `Preview the results and display a progress bar.
 Reporters are still used.
 Default: false if the output is an interactive terminal.`,
   },
   save: {
     group: HISTORY,
-    boolean: true,
     describe: `Save the results.
 Default: false`,
   },
   merge: {
     group: HISTORY,
-    string: true,
     requiresArg: true,
     describe: `Merge this result with a previous one.
 The value is the previous result's identifier.
@@ -38,7 +34,6 @@ Default: none`,
   },
   outliers: {
     group: TASKS,
-    boolean: true,
     describe: `Some measures can be extremely slower than others.
 Most of the times, those outliers are due to concurrent logic unrelated to
 your tasks such as garbage collection or OS background processes.

src/bin/config/select.js

@@ -6,7 +6,6 @@ export const SELECT_CONFIG = {
   select: {
     group: SELECT,
     alias: 's',
-    string: true,
     describe: `Select only specific combinations.
 The value is a space-separated list of identifiers to select.
 Those can be the identifiers of any task, runner, system or variation.

src/bin/parse.js

@@ -1,6 +1,13 @@
 import filterObj from 'filter-obj'
 import mapObj from 'map-obj'
 
+// We do not use yargs types as it conflicts with our own validation and
+// normalization logic, e.g.:
+//  - `number` parses invalid numbers as NaN
+//  - `boolean` parses strings as boolean
+//  - many configuration properties are objects or are polymorphic
+// One downside is that typing then relies on yargs' guess, which is fine:
+//  - string configuration properties cannot be "true", "false" or "1"
 export const parseCliFlags = function (yargs) {
   const {
     _: [command = DEFAULT_COMMAND],

src/config/normalize.js

@@ -37,14 +37,6 @@ const normalizePropValue = function (value, propName, name) {
   return newValue === undefined ? value : newValue
 }
 
-const validateInputs = function (value, name) {
-  checkJsonObject(value, name)
-}
-
-const validateOutliers = function (value, name) {
-  checkBoolean(value, name)
-}
-
 const normalizeReporter = function (value, name) {
   const valueA = normalizeOptionalArray(value)
   checkDefinedStringArray(valueA, name)
@@ -64,10 +56,6 @@ const normalizeSelect = function (value, name) {
   return valueA
 }
 
-const validateSystem = function (system) {
-  checkStringsObject(system, 'system')
-}
-
 const normalizeTasks = function (value, name) {
   const valueA = normalizeOptionalArray(value)
   checkDefinedStringArray(valueA, name)
@@ -81,15 +69,18 @@ const validateTitles = function (value, name) {
 }
 
 const NORMALIZERS = {
-  inputs: validateInputs,
+  inputs: checkJsonObject,
   limit: normalizeLimit,
   merge: validateMerge,
-  outliers: validateOutliers,
+  outliers: checkBoolean,
   precision: normalizePrecision,
   reporter: normalizeReporter,
   runner: normalizeRunner,
   select: normalizeSelect,
-  system: validateSystem,
+  showDiff: checkBoolean,
+  showPrecision: checkBoolean,
+  showTitles: checkBoolean,
+  system: checkStringsObject,
   tasks: normalizeTasks,
   titles: validateTitles,
 }