borp 0.14.0 → 0.16.0

package/.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 21.x]
+        node-version: [18.x, 20.x, 21.x, 22.x]
         os: [ubuntu-latest, windows-latest]
         exclude:
           - os: windows-latest
@@ -39,4 +39,4 @@ jobs:
 
       - name: Run tests
         run: |
-          npm run unit -- --reporter spec
+          npm run unit

package/lib/run.js

@@ -3,7 +3,7 @@ import { glob } from 'glob'
 import { findUp } from 'find-up'
 import { createRequire } from 'node:module'
 import { join, dirname } from 'node:path'
-import { access, readFile } from 'node:fs/promises'
+import { access } from 'node:fs/promises'
 import { execa } from 'execa'
 
 function deferred () {
@@ -17,7 +17,7 @@ function deferred () {
 }
 
 function enableSourceMapSupport (tsconfig) {
-  if (!tsconfig?.compilerOptions?.sourceMap) {
+  if (!tsconfig?.options?.sourceMap) {
     return
   }
 
@@ -56,13 +56,21 @@ export default async function runWithTypeScript (config) {
   }
 
   if (tsconfigPath && config.typescript !== false) {
-    const tsconfig = JSON.parse(await readFile(tsconfigPath))
     const _require = createRequire(tsconfigPath)
+    const { parseJsonConfigFileContent, readConfigFile, sys } = _require('typescript')
+
+    const configFile = readConfigFile(tsconfigPath, sys.readFile)
+    const tsconfig = parseJsonConfigFileContent(
+      configFile.config,
+      sys,
+      dirname(tsconfigPath)
+    )
+
     const typescriptPathCWD = _require.resolve('typescript')
     tscPath = join(typescriptPathCWD, '..', '..', 'bin', 'tsc')
-    const outDir = tsconfig.compilerOptions.outDir
+    const outDir = tsconfig.options.outDir
     if (outDir) {
-      prefix = join(dirname(tsconfigPath), outDir)
+      prefix = outDir
     }
 
     enableSourceMapSupport(tsconfig)
@@ -73,7 +81,7 @@ export default async function runWithTypeScript (config) {
 
       // Watch is handled aftterwards
       if (!config.watch) {
-        if (Array.isArray(tsconfig.references) && tsconfig.references.length > 0) {
+        if (Array.isArray(tsconfig.projectReferences) && tsconfig.projectReferences.length > 0) {
           typescriptCliArgs.push('--build')
         }
         const start = Date.now()
@@ -123,8 +131,17 @@ export default async function runWithTypeScript (config) {
     p = deferred()
     let outDir = ''
     if (config['post-compile'] && tsconfigPath) {
-      const tsconfig = JSON.parse(await readFile(tsconfigPath))
-      outDir = tsconfig.compilerOptions.outDir
+      const _require = createRequire(tsconfigPath)
+      const { parseJsonConfigFileContent, readConfigFile, sys } = _require('typescript')
+
+      const configFile = readConfigFile(tsconfigPath, sys.readFile)
+      const tsconfig = parseJsonConfigFileContent(
+        configFile.config,
+        sys,
+        dirname(tsconfigPath)
+      )
+
+      outDir = tsconfig.options.outDir
 
       enableSourceMapSupport(tsconfig)
     }
@@ -158,6 +175,9 @@ export default async function runWithTypeScript (config) {
         })
       }
     })
+    // We must noop `.catch()`, otherwise `tscChild` will
+    // reject.
+    tscChild.catch(() => {})
     if (config.signal) {
       config.signal.addEventListener('abort', () => {
         tscChild.kill()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "borp",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "type": "module",
   "description": "node:test wrapper with TypeScript support",
   "main": "borp.js",
@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "@reporters/github": "^1.5.4",
-    "c8": "^9.0.0",
-    "execa": "^8.0.1",
+    "c8": "^10.0.0",
+    "execa": "^9.3.0",
     "find-up": "^7.0.0",
     "glob": "^10.3.10"
   }

package/test/watch.test.js

@@ -6,7 +6,10 @@ import { mkdtemp, cp, writeFile, rm } from 'node:fs/promises'
 import path from 'node:path'
 import { once } from 'node:events'
 
-test('watch', async (t) => {
+// These tests are currently broken on node v22
+const skip = process.platform === 'darwin' && process.version.startsWith('v22')
+
+test('watch', { skip }, async (t) => {
   const { strictEqual, completed, match } = tspl(t, { plan: 3 })
 
   const dir = path.resolve(await mkdtemp('.test-watch'))
@@ -24,15 +27,17 @@ test('watch', async (t) => {
 
   const config = {
     files: [],
-    cwd: dir,
     signal: controller.signal,
+    cwd: dir,
     watch: true
   }
 
+  process._rawDebug('dir', dir)
   const stream = await runWithTypeScript(config)
 
   const fn = (test) => {
     if (test.type === 'test:fail') {
+      console.log('test', test)
       match(test.data.name, /add/)
       stream.removeListener('data', fn)
     }
@@ -58,7 +63,7 @@ test('add', () => {
   await completed
 })
 
-test('watch file syntax error', async (t) => {
+test('watch file syntax error', { skip }, async (t) => {
   const { strictEqual, completed, match } = tspl(t, { plan: 3 })
 
   const dir = path.resolve(await mkdtemp('.test-watch'))
@@ -110,7 +115,7 @@ test('add', () => {
   await completed
 })
 
-test('watch with post compile hook should call the hook the right number of times', async (t) => {
+test('watch with post compile hook should call the hook the right number of times', { skip }, async (t) => {
   const { completed, ok, match } = tspl(t, { plan: 2 })
 
   const dir = path.resolve(await mkdtemp('.test-watch-with-post-compile-hook'))