beartest-js 7.1.1 → 8.0.1

package/.github/workflows/main.yml

@@ -1,4 +1,7 @@
 name: Node.js Package
+permissions:
+  id-token: write # Required for OIDC
+  contents: read
 on:
   push:
     branches:
@@ -11,9 +14,10 @@ jobs:
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v1
         with:
-          node-version: '14.x'
-          registry-url: 'https://registry.npmjs.org'
-      - run: yarn
-      - run: yarn publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          node-version: "22.x"
+          registry-url: "https://registry.npmjs.org"
+
+      - run: "npm install -g npm@^11.0.0"
+      - run: "npm --version"
+      - run: npm install
+      - run: npm publish ./

package/beartest.js

@@ -1,4 +1,5 @@
-const path = require('node:path')
+import path from 'node:path'
+
 async function RunSerially(fnArray) {
   for (const fn of fnArray) await fn()
 }
@@ -83,7 +84,7 @@ const beforeEach = (fn) => top().beforeEach.push(fn)
 const after = (fn) => top().after.push(fn)
 const afterEach = (fn) => top().afterEach.push(fn)
 
-async function* runTests(options = {}) {
+export async function* run(options = {}) {
   let index = 0
   for await (const file of options.files) {
     const name = file
@@ -91,7 +92,7 @@ async function* runTests(options = {}) {
     suiteStack.push({ before: [], beforeEach: [], after: [], afterEach: [], tests: [], name })
     let suiteStart
     try {
-      require(file)
+      await import(file)
       yield { type: 'test:start', data: { name: name, nesting: 0, type: 'suite' } }
       suiteStart = Date.now()
       for await (let event of runTestSuite({ only: options.only })) {
@@ -141,4 +142,4 @@ if (!suiteStack.length) {
   })
 }
 
-module.exports = { test: Object.assign(it, { describe, before, beforeEach, after, afterEach }), run: runTests }
+export const test = Object.assign(it, { describe, before, beforeEach, after, afterEach })

package/cli.js

@@ -1,19 +1,19 @@
 #!/usr/bin/env node
 
-const { run } = require('./beartest')
-const fs = require('node:fs')
-const path = require('node:path')
+import { run } from './beartest'
+import { promises } from 'node:fs'
+import { sep, resolve, isAbsolute, parse, relative } from 'node:path'
 
 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('/')
+const norm = (p) => p.split(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))
+    for await (const f of promises.glob(pat, { ignore: EXCLUDE })) seen.add(norm(f))
   }
   return [...seen].sort()
 }
@@ -25,7 +25,7 @@ async function applyFilters(files, args) {
   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))
+      for await (const f of promises.glob(arg, { ignore: EXCLUDE })) gset.add(norm(f))
       out = out.filter((f) => gset.has(f)) // glob filter
     } else {
       const needle = norm(arg)
@@ -39,11 +39,11 @@ async function cli() {
   const discovered = await discoverAll()
   const selected = await applyFilters(discovered, process.argv.slice(2))
 
-  for await (let event of run({ files: selected.map((f) => path.resolve(f)) })) {
+  for await (let event of run({ files: selected.map((f) => resolve(f)) })) {
     const prefix = '  '.repeat(event.data.nesting)
     if (event.type === 'test:start' && event.data.type === 'suite') {
-      if (path.isAbsolute(event.data.name)) {
-        console.log(`\x1b[36m${prefix}${path.parse(event.data.name).name} (${path.relative('./', event.data.name)})\x1b[0m`)
+      if (isAbsolute(event.data.name)) {
+        console.log(`\x1b[36m${prefix}${parse(event.data.name).name} (${relative('./', event.data.name)})\x1b[0m`)
       } else {
         console.log(`\x1b[36m${prefix}${event.data.name}\x1b[0m`)
       }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "beartest-js",
-  "version": "7.1.1",
+  "version": "8.0.1",
   "description": "Bear Bones Testing",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/rubber-duck-software/beartest.git"
   },
-  "types": "./index.d.ts",
   "main": "./index.js",
+  "type": "module",
   "exports": {
     ".": {
-      "require": "./index.js",
-      "import": "./index.js"
+      "default": "./beartest.js",
+      "types": "./beartest.d.ts"
     },
     "./package.json": "./package.json"
   },
@@ -20,7 +20,6 @@
   },
   "author": "Grant Colestock",
   "license": "MIT",
-  "type": "commonjs",
   "bugs": {
     "url": "https://github.com/rubber-duck-software/beartest/issues"
   },

package/index.js

@@ -1 +0,0 @@
-module.exports = require("./beartest");