Improve cli runner validation

package.json

@@ -49,7 +49,6 @@
     "is-interactive": "^2.0.0",
     "is-plain-obj": "^4.0.0",
     "is-unicode-supported": "^1.1.0",
-    "jest-validate": "^27.4.2",
     "js-yaml": "^4.0.0",
     "junk": "^4.0.0",
     "map-obj": "^5.0.0",

src/config/normalize/validate.js

@@ -1,9 +1,24 @@
-import { isDeepStrictEqual } from 'util'
+import { isDeepStrictEqual, inspect } from 'util'
 
 import isPlainObj from 'is-plain-obj'
 import { pathExists } from 'path-exists'
 import { isFile, isDirectory } from 'path-type'
 
+export const validateEnum = function (value, set) {
+  if (set.has(value)) {
+    return
+  }
+
+  const setItems = [...set].map(inspect)
+  const separator = setItems.some(hasNewline) ? '\n' : ', '
+  const setItemsStr = setItems.join(separator)
+  throw new Error(`must be one of: ${setItemsStr}.`)
+}
+
+const hasNewline = function (string) {
+  return string.includes('\n')
+}
+
 export const validateBoolean = function (value) {
   if (typeof value !== 'boolean') {
     throw new TypeError('must be true or false.')

src/runners/cli/launch.js

@@ -0,0 +1,18 @@
+import { fileURLToPath } from 'url'
+
+const HANDLER_MAIN_PATH = fileURLToPath(
+  new URL('./handler/main.js', import.meta.url),
+)
+
+export const launch = function ({ shell }) {
+  return {
+    spawn: ['node', HANDLER_MAIN_PATH],
+    versions: SHELL_VERSIONS[shell],
+  }
+}
+
+const SHELL_VERSIONS = {
+  none: {},
+  sh: {},
+  bash: { Bash: ['bash', '-c', 'echo $BASH_VERSION'] },
+}

src/runners/cli/main.js

@@ -1 +1,5 @@
-export { launch } from './launch/main.js'
+import { shellDefinition } from './shell.js'
+
+export { launch } from './launch.js'
+
+export const config = [shellDefinition]

src/runners/cli/shell.js

@@ -0,0 +1,18 @@
+import {
+  validateDefinedString,
+  validateEnum,
+} from '../../config/normalize/validate.js'
+
+// We only allow shells that are cross-platform
+const SHELL_VALUES = new Set(['none', 'sh', 'bash'])
+// Shells have a performance impact and are less portable, so they are opt-in
+const DEFAULT_SHELL = 'none'
+
+export const shellDefinition = {
+  name: 'shell',
+  default: DEFAULT_SHELL,
+  validate(value) {
+    validateDefinedString(value)
+    validateEnum(value, SHELL_VALUES)
+  },
+}

src/runners/node/main.js

@@ -1,19 +1,5 @@
-import { normalizeNumberString } from '../../config/normalize/transform.js'
-import { validateNumberString } from '../../config/normalize/validate.js'
-
-import { transformVersion, validateVersion } from './version.js'
+import { versionDefinitions } from './version.js'
 
 export { launch } from './launch.js'
 
-export const config = [
-  {
-    name: 'version',
-    validate: validateNumberString,
-    transform: normalizeNumberString,
-  },
-  {
-    name: 'version',
-    validate: validateVersion,
-    transform: transformVersion,
-  },
-]
+export const config = [...versionDefinitions]

src/runners/node/version.js

@@ -4,6 +4,8 @@ import { fileURLToPath } from 'url'
 import { readPackageUp } from 'read-pkg-up'
 import semver from 'semver'
 
+import { normalizeNumberString } from '../../config/normalize/transform.js'
+import { validateNumberString } from '../../config/normalize/validate.js'
 import { wrapError } from '../../error/wrap.js'
 
 // Validate the Node.js version
@@ -42,3 +44,16 @@ export const transformVersion = async function (version) {
     throw wrapError(error, 'must be a valid Node.js version:')
   }
 }
+
+export const versionDefinitions = [
+  {
+    name: 'version',
+    validate: validateNumberString,
+    transform: normalizeNumberString,
+  },
+  {
+    name: 'version',
+    validate: validateVersion,
+    transform: transformVersion,
+  },
+]