fix: pass correct arguments to sub-script

Update argument forwarding logic in run-script wrapper to dynamically
find sub-script command and therefore pass correct arguments to script
withou hard-coding the script names. I was not aware of this hard-coded
bit and therefore some scripts were receiving the sub-script command
erroneously.

Author: jrolfs

src/run-script.js

@@ -1,6 +1,7 @@
+const fs = require('fs')
 const path = require('path')
-const spawn = require('cross-spawn')
 const glob = require('glob')
+const spawn = require('cross-spawn')
 
 const [executor, ignoredBin, script] = process.argv
 
@@ -55,15 +56,14 @@ function getEnv() {
 function spawnScript() {
   // get all the arguments of the script and find the position of our script commands
   const args = process.argv.slice(2)
-  const scriptIndex = args.findIndex(
-    x =>
-      x === 'format' ||
-      x === 'lint' ||
-      x === 'pre-commit' ||
-      x === 'test' ||
-      x === 'validate' ||
-      x === 'build',
-  )
+  const scriptsPath = path.join(__dirname, './scripts')
+
+  const scripts = fs
+    .readdirSync(scriptsPath)
+    .filter(f => fs.statSync(path.join(scriptsPath, f)).isFile())
+    .map(f => f.replace(/\.js$/, ''))
+
+  const scriptIndex = args.findIndex(x => scripts.includes(x))
 
   // Extract the node arguments so we can pass them to node later on
   const buildCommand = scriptIndex === -1 ? args[0] : args[scriptIndex]
@@ -73,7 +73,7 @@ function spawnScript() {
     throw new Error(`Unknown script "${script}".`)
   }
 
-  const relativeScriptPath = path.join(__dirname, './scripts', buildCommand)
+  const relativeScriptPath = path.join(scriptsPath, buildCommand)
   const scriptPath = attemptResolve(relativeScriptPath)
   if (!scriptPath) {
     throw new Error(`Unknown script "${script}".`)

src/scripts/__tests__/__snapshots__/commit.js.snap

@@ -21,25 +21,3 @@ Object {
 `;
 
 exports[`commit forwards arguments 2`] = `node ../commit --retry`;
-
-exports[`commit strips errant "commit" argument 1`] = `
-Object {
-  cliPath: <PROJECT_ROOT>/node_modules/commitizen,
-  config: Object {
-    path: @commitlint/prompt,
-  },
-}
-`;
-
-exports[`commit strips errant "commit" argument 2`] = `node ../commit`;
-
-exports[`commit strips errant "commit" argument and forwards arguments 1`] = `
-Object {
-  cliPath: <PROJECT_ROOT>/node_modules/commitizen,
-  config: Object {
-    path: @commitlint/prompt,
-  },
-}
-`;
-
-exports[`commit strips errant "commit" argument and forwards arguments 2`] = `node ../commit --retry`;

src/scripts/__tests__/commit.js

@@ -49,14 +49,8 @@ cases(
   },
   {
     'bootstraps @commitlint/prompt': {},
-    'strips errant "commit" argument': {
-      args: ['commit'],
-    },
     'forwards arguments': {
       args: ['--retry'],
     },
-    'strips errant "commit" argument and forwards arguments': {
-      args: ['commit', '--retry'],
-    },
   },
 )

src/scripts/commit.js

@@ -3,22 +3,12 @@ const {bootstrap} = require('commitizen/dist/cli/git-cz')
 const commitizenPaths = require.resolve('commitizen/package.json').split('/')
 const cliPath = commitizenPaths.slice(0, -1).join('/')
 
-// eslint-disable-next-line no-warning-comments
-// FIXME: for some reason invoking this script with `yarn commit` now passes
-// through `'commit'` in the arguments that get parsed as "raw git arguments"
-// in the adapter which blows up said parsing behavior. I'm not sure if this
-// was related to a yarn change (`yarn [script] args` vs. `yarn [script] --
-// args`) or something else...
-//
-// Either way, this is a band-aid to filter out the rogue argument for now.
-const args = process.argv.filter(arg => arg !== 'commit')
-
 bootstrap(
   {
     cliPath,
     config: {
       path: '@commitlint/prompt',
     },
   },
-  args,
+  process.argv,
 )