borp 0.13.0 → 0.14.0

package/borp.js

@@ -2,6 +2,7 @@
 
 import { parseArgs } from 'node:util'
 import Reporters from 'node:test/reporters'
+import { findUp } from 'find-up'
 import { mkdtemp, rm, readFile } from 'node:fs/promises'
 import { createWriteStream } from 'node:fs'
 import { finished } from 'node:stream/promises'
@@ -141,10 +142,12 @@ try {
       const localPrefix = relative(process.cwd(), config.prefix)
       exclude = exclude.map((file) => posix.join(localPrefix, file))
     }
+    const nycrc = await findUp(['.c8rc', '.c8rc.json', '.nycrc', '.nycrc.json'], { cwd: config.cwd })
     const report = Report({
       reporter: ['text'],
       tempDirectory: covDir,
-      exclude
+      exclude,
+      ...nycrc && JSON.parse(await readFile(nycrc, 'utf8'))
     })
 
     if (args.values['check-coverage']) {

package/fixtures/ts-esm-source-map/src/add.ts

@@ -0,0 +1,4 @@
+
+export function add (x: number, y: number): number {
+  return x + y
+}

package/fixtures/ts-esm-source-map/test/add.test.ts

@@ -0,0 +1,7 @@
+import { test } from 'node:test'
+import { add } from '../src/add.js'
+import { strictEqual } from 'node:assert'
+
+test('add', () => {
+  strictEqual(add(1, 2), 5)
+})

package/fixtures/ts-esm-source-map/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "compilerOptions": {
+    "outDir": "dist",
+    "sourceMap": true,
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "strict": true,
+    "resolveJsonModule": true,
+    "removeComments": true,
+    "newLine": "lf",
+    "noUnusedLocals": true,
+    "noFallthroughCasesInSwitch": true,
+    "isolatedModules": true,
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
+    "lib": [
+      "ESNext"
+    ],
+    "incremental": true
+  }
+}

package/lib/run.js

@@ -16,6 +16,13 @@ function deferred () {
   return { resolve, reject, promise }
 }
 
+function enableSourceMapSupport (tsconfig) {
+  if (!tsconfig?.compilerOptions?.sourceMap) {
+    return
+  }
+
+  process.env.NODE_OPTIONS = (process.env.NODE_OPTIONS || '') + ' --enable-source-maps'
+}
 export default async function runWithTypeScript (config) {
   // This is a hack to override
   // https://github.com/nodejs/node/commit/d5c9adf3df
@@ -58,6 +65,8 @@ export default async function runWithTypeScript (config) {
       prefix = join(dirname(tsconfigPath), outDir)
     }
 
+    enableSourceMapSupport(tsconfig)
+
     if (tscPath) {
       // This will throw if we cannot find the `tsc` binary
       await access(tscPath)
@@ -116,6 +125,8 @@ export default async function runWithTypeScript (config) {
     if (config['post-compile'] && tsconfigPath) {
       const tsconfig = JSON.parse(await readFile(tsconfigPath))
       outDir = tsconfig.compilerOptions.outDir
+
+      enableSourceMapSupport(tsconfig)
     }
     let start = Date.now()
     tscChild = execa('node', [tscPath, ...typescriptCliArgs], { cwd })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "borp",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "type": "module",
   "description": "node:test wrapper with TypeScript support",
   "main": "borp.js",

package/test/sourceMap.test.js

@@ -0,0 +1,87 @@
+'use strict'
+
+import { test } from 'node:test'
+import { execa } from 'execa'
+import { existsSync } from 'node:fs'
+import { AssertionError, equal, fail, match, strictEqual } from 'node:assert'
+import { tspl } from '@matteo.collina/tspl'
+import path from 'node:path'
+import { cp, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import runWithTypeScript from '../lib/run.js'
+import { join } from 'desm'
+
+test('borp should return ts file path in error message when sourceMap is active in tsconfig', async (t) => {
+  const borp = join(import.meta.url, '..', 'borp.js')
+
+  try {
+    await execa('node', [
+      borp
+    ], {
+      cwd: join(import.meta.url, '..', 'fixtures', 'ts-esm-source-map')
+    })
+    fail('Should not complete borp without error')
+  } catch (e) {
+    if (e instanceof AssertionError) {
+      throw e
+    }
+
+    equal(e.exitCode, 1)
+    match(e.message, /at TestContext\..*add\.test\.ts/, 'Error message should contain ts file path')
+  }
+
+  const fileMapPath = join(import.meta.url, '..', 'fixtures', 'ts-esm-source-map', 'dist', 'src', 'add.js.map')
+  strictEqual(existsSync(fileMapPath), true, 'Map file should be generated')
+})
+
+test('source map should be generated when watch is active', async (t) => {
+  const { strictEqual, completed } = tspl(t, { plan: 1 })
+
+  const dir = path.resolve(await mkdtemp('.test-watch'))
+  await cp(join(import.meta.url, '..', 'fixtures', 'ts-esm-source-map'), dir, {
+    recursive: true
+  })
+
+  const passTest = `
+import { test } from 'node:test'
+import { add } from '../src/add.js'
+import { strictEqual } from 'node:assert'
+
+test('addSuccess', () => {
+  strictEqual(add(1,2), 3)
+})
+`
+  await writeFile(path.join(dir, 'test', 'add.test.ts'), passTest)
+
+  const controller = new AbortController()
+  t.after(async () => {
+    controller.abort()
+    try {
+      await rm(dir, { recursive: true, retryDelay: 100, maxRetries: 10 })
+    } catch {}
+  })
+
+  const config = {
+    files: [],
+    cwd: dir,
+    signal: controller.signal,
+    watch: true
+  }
+
+  await runWithTypeScript(config)
+
+  const failureTestToWrite = `
+import { test } from 'node:test'
+import { add } from '../src/add.js'
+import { strictEqual } from 'node:assert'
+
+test('addFailure', () => {
+  strictEqual(add(1,2), 4)
+})
+`
+  await writeFile(path.join(dir, 'test', 'add.test.ts'), failureTestToWrite)
+
+  const expectedMapFilePath = path.join(dir, 'dist', 'src', 'add.js.map')
+  strictEqual(existsSync(expectedMapFilePath), true, 'Map file should be generated')
+
+  await completed
+})

package/test/watch.test.js

@@ -33,7 +33,7 @@ test('watch', async (t) => {
 
   const fn = (test) => {
     if (test.type === 'test:fail') {
-      strictEqual(test.data.name, 'add')
+      match(test.data.name, /add/)
       stream.removeListener('data', fn)
     }
   }
@@ -85,7 +85,7 @@ test('watch file syntax error', async (t) => {
 
   const fn = (test) => {
     if (test.type === 'test:fail') {
-      match(test.data.name, /add\.test\.ts/)
+      match(test.data.name, /add/)
       stream.removeListener('data', fn)
     }
   }
@@ -111,7 +111,7 @@ test('add', () => {
 })
 
 test('watch with post compile hook should call the hook the right number of times', async (t) => {
-  const { strictEqual, completed, ok } = tspl(t, { plan: 2 })
+  const { completed, ok, match } = tspl(t, { plan: 2 })
 
   const dir = path.resolve(await mkdtemp('.test-watch-with-post-compile-hook'))
   await cp(join(import.meta.url, '..', 'fixtures', 'ts-esm-post-compile'), dir, {
@@ -138,7 +138,7 @@ test('watch with post compile hook should call the hook the right number of time
 
   const fn = (test) => {
     if (test.type === 'test:fail') {
-      strictEqual(test.data.name, 'add')
+      match(test.data.name, /add/)
       stream.removeListener('data', fn)
     }
   }

package/test-utils/clock.js

@@ -4,9 +4,10 @@ let clock
 
 if (process.argv[1].endsWith('borp.js')) {
   clock = FakeTimers.install({
-    node: Date.now(),
+    now: Date.now(),
     shouldAdvanceTime: true,
-    advanceTimeDelta: 100
+    advanceTimeDelta: 100,
+    toFake: ['Date', 'setTimeout', 'clearTimeout']
   })
   process.on('message', listener)
 }