beartest-js 7.0.1 → 7.1.0

package/cli.js

@@ -1,16 +1,54 @@
 #!/usr/bin/env node
+
 const { run } = require('./beartest')
 const fs = require('node:fs')
+const path = require('node:path')
 
-async function cli() {
-  const globStr = process.argv[2] || '**/*.test.*'
+const INCLUDE = ['**/*.{test,spec}.{js,ts,jsx,tsx}']
+const EXCLUDE = ['**/node_modules/**', '**/dist/**', '**/.git/**', '**/build/**', '**/coverage/**']
+
+const hasGlob = (s) => /[*?\[\]{}()!]/.test(s)
+const norm = (p) => p.split(path.sep).join('/')
+
+async function discoverAll() {
+  const seen = new Set()
+  for (const pat of INCLUDE) {
+    for await (const f of fs.promises.glob(pat, { ignore: EXCLUDE })) seen.add(norm(f))
+  }
+  return [...seen].sort()
+}
 
-  const files = await Array.fromAsync(fs.promises.glob(globStr))
+async function applyFilters(files, args) {
+  if (!args.length) return files
+
+  let out = files
+  for (const arg of args) {
+    if (hasGlob(arg)) {
+      const gset = new Set()
+      for await (const f of fs.promises.glob(arg, { ignore: EXCLUDE })) gset.add(norm(f))
+      out = out.filter((f) => gset.has(f)) // glob filter
+    } else {
+      const needle = norm(arg)
+      out = out.filter((f) => f.includes(needle)) // substring filter
+    }
+  }
+  return out
+}
+
+async function cli() {
+  const discovered = await discoverAll()
+  console.log(discovered)
+  const selected = await applyFilters(discovered, process.argv.slice(2))
+  console.log(selected)
 
-  for await (let event of run({ files: files })) {
+  for await (let event of run({ files: selected.map((f) => path.resolve(f)) })) {
     const prefix = '  '.repeat(event.data.nesting)
     if (event.type === 'test:start' && event.data.type === 'suite') {
-      process.stdout.write(`\x1b[36m${prefix}${event.data.name} \n\x1b[0m`)
+      if (path.isAbsolute(event.data.name)) {
+        console.log(`\x1b[36m${prefix}${path.parse(event.data.name).name} (${path.relative('./', event.data.name)})\x1b[0m`)
+      } else {
+        console.log(`\x1b[36m${prefix}${event.data.name}\x1b[0m`)
+      }
     } else if (event.type === 'test:pass' && event.data.details.type === 'test' && !event.data.skip) {
       process.stdout.write(`\x1b[32m${prefix}✓\x1b[0m\x1b[90m ${event.data.name}\n\x1b[0m`)
     } else if (event.type === 'test:fail' && event.data.details.type === 'test') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beartest-js",
-  "version": "7.0.1",
+  "version": "7.1.0",
   "description": "Bear Bones Testing",
   "repository": {
     "type": "git",