@jcoreio/toolchain-mocha 3.4.1 → 3.6.0

package/.mocharc.cjs

@@ -1,17 +1,9 @@
 const getPluginsArraySync = require('@jcoreio/toolchain/util/getPluginsArraySync.cjs')
 const extensions = getPluginsArraySync('sourceExtensions')
-const path = require('path')
-
-const files = process.argv.slice(2).filter((f) => {
-  const ext = path.extname(f)
-  return ext && extensions.includes(ext.substring(1))
-})
+const getSpecs = require('./getSpecs.cjs')
 
 module.exports = {
   require: [require.resolve('./util/configureMocha.cjs')],
   reporter: 'spec',
-  spec: [
-    require.resolve('./util/mochaWatchClearConsole.cjs'),
-    ...(files.length ? files : getPluginsArraySync('mochaSpecs')),
-  ],
+  spec: getSpecs(getPluginsArraySync('mochaSpecs')),
 }

package/cliSpecs.cjs

@@ -0,0 +1,42 @@
+const valuedOptions = new Set([
+  '--global',
+  '--globals',
+  '-j',
+  '--jobs',
+  '--retries',
+  '-s',
+  '--slow',
+  '-t',
+  '--timeout',
+  '--timeouts',
+  '-u',
+  '--ui',
+  '-R',
+  '--reporter',
+  '-O',
+  '--reporter-option',
+  '--reporter-options',
+  '--config',
+  '-n',
+  '--no-options',
+  '--package',
+  '--extension',
+  '--file',
+  '--ignore',
+  '--exclude',
+  '-r',
+  '--require',
+  '--watch-files',
+  '--watch-ignore',
+  '-f',
+  '--fgrep',
+  '-g',
+  '--grep',
+])
+
+module.exports = process.argv
+  .slice(2)
+  .filter(
+    (f, index, argv) =>
+      !f.startsWith('-') && !valuedOptions.has(argv[index - 1])
+  )

package/getSpecs.cjs

@@ -0,0 +1,8 @@
+const cliSpecs = require('./cliSpecs.cjs')
+
+module.exports = function getSpecs(defaultSpecs) {
+  return [
+    require.resolve('./util/mochaWatchClearConsole.cjs'),
+    ...(cliSpecs.length ? cliSpecs : defaultSpecs),
+  ]
+}

package/index.cjs

@@ -0,0 +1 @@
+exports.getSpecs = require('./getSpecs.cjs')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain-mocha",
-  "version": "3.4.1",
+  "version": "3.6.0",
   "description": "Mocha build toolchain",
   "repository": {
     "type": "git",
@@ -17,15 +17,16 @@
     "mocha": "./bin/mocha",
     "nyc": "./bin/nyc"
   },
+  "main": "./index.cjs",
   "dependencies": {
     "dedent-js": "^1.0.1",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "resolve-bin": "^1.0.0",
-    "@jcoreio/toolchain": "3.4.1"
+    "@jcoreio/toolchain": "3.6.0"
   },
   "peerDependencies": {
-    "@jcoreio/toolchain": "3.4.1"
+    "@jcoreio/toolchain": "3.6.0"
   },
   "toolchainManaged": {
     "devDependencies": {

package/plugins/scripts.cjs

@@ -1,17 +1,45 @@
 const execa = require('@jcoreio/toolchain/util/execa.cjs')
+const { toolchainConfig } = require('@jcoreio/toolchain/util/findUps.cjs')
+
+const testScripts = Object.entries(toolchainConfig.scripts || {}).filter(
+  ([name]) => /^test\W/.test(name)
+)
 
 module.exports = [
   {
     coverage: {
-      description: 'run tests with code coverage',
+      description: `run ${
+        testScripts.length ? 'all tests' : 'tests'
+      } with code coverage`,
       run: async (args = []) => {
         await execa('nyc', ['tc', 'test', ...args])
       },
     },
+    ...Object.fromEntries(
+      testScripts.map(([name, value]) => [
+        `coverage${name.substring(4)}`,
+        {
+          description: `${
+            typeof value.description === 'string'
+              ? value.description
+              : `run ${name}`
+          } with code coverage`,
+          run: async (args = []) => {
+            await execa('nyc', ['tc', name, ...args])
+          },
+        },
+      ])
+    ),
     test: {
-      description: 'run tests',
+      description: `run ${testScripts.length ? 'all tests' : 'tests'}`,
       run: async (args = []) => {
-        await execa('mocha', [...args])
+        if (testScripts.length) {
+          for (const [name] of testScripts) {
+            await execa('tc', [name, ...args])
+          }
+        } else {
+          await execa('mocha', [...args])
+        }
       },
     },
   },