tape-six 1.1.1 → 1.2.0

package/README.md

@@ -236,6 +236,8 @@ See [set-up tests](https://github.com/uhop/tape-six/wiki/Set-up-tests) for detai
 
 The most recent releases:
 
+- 1.2.0 _Updated dependencies + added an optional prefix for JSON lines._
+- 1.1.2 _Updated dependencies._
 - 1.1.1 _Technical re-release with the missing `index.d.ts` file._
 - 1.1.0 _Added TypeScript support._
 - 1.0.4 _Bugfix for platform-specific tests, old platforms, minor updates to accommodate Deno 2, updated dev deps._

package/bin/tape6-bun.js

@@ -2,11 +2,14 @@
 
 import {fileURLToPath} from 'node:url';
 
-import {resolveTests, resolvePatterns} from '../src/utils/config.js';
+import {
+  resolveTests,
+  resolvePatterns,
+  getReporter as getReporterType
+} from '../src/utils/config.js';
 
 import {getReporter, setReporter} from '../src/test.js';
 import State, {StopTest} from '../src/State.js';
-import TapReporter from '../src/TapReporter.js';
 import {selectTimer} from '../src/utils/timer.js';
 
 import TestWorker from '../src/bun/TestWorker.js';
@@ -88,25 +91,22 @@ const config = () => {
   if (!parallel) parallel = globalThis.navigator?.hardwareConcurrency || 1;
 };
 
+const reporters = {
+  jsonl: 'JSONLReporter.js',
+  tap: 'TapReporter.js',
+  tty: 'TTYReporter.js'
+};
+
 const init = async () => {
-  let reporter = getReporter();
-  if (!reporter) {
-    if (Bun.env.TAPE6_JSONL) {
-      const JSONLReporter = (await import('../src/JSONLReporter.js')).default,
-        jsonlReporter = new JSONLReporter(options);
-      reporter = jsonlReporter.report.bind(jsonlReporter);
-    } else if (!Bun.env.TAPE6_TAP) {
-      const TTYReporter = (await import('../src/TTYReporter.js')).default,
-        ttyReporter = new TTYReporter(options);
-      ttyReporter.testCounter = -2;
-      ttyReporter.technicalDepth = 1;
-      reporter = ttyReporter.report.bind(ttyReporter);
-    }
-    if (!reporter) {
-      const tapReporter = new TapReporter({useJson: true, hasColors: !options.monochrome});
-      reporter = tapReporter.report.bind(tapReporter);
-    }
-    setReporter(reporter);
+  const currentReporter = getReporter();
+  if (!currentReporter) {
+    const reporterType = getReporterType(),
+      reporterFile = reporters[reporterType] || reporters.tty,
+      CustomReporter = (await import('../src/' + reporterFile)).default,
+      customOptions =
+        reporterType === 'tap' ? {useJson: true, hasColors: !options.monochrome} : options,
+      customReporter = new CustomReporter(customOptions);
+    setReporter(customReporter.report.bind(customReporter));
   }
 
   if (files.length) {

package/bin/tape6-deno.js

@@ -2,11 +2,14 @@
 
 import {fileURLToPath} from 'node:url';
 
-import {resolveTests, resolvePatterns} from '../src/utils/config.js';
+import {
+  resolveTests,
+  resolvePatterns,
+  getReporter as getReporterType
+} from '../src/utils/config.js';
 
 import {getReporter, setReporter} from '../src/test.js';
 import State, {StopTest} from '../src/State.js';
-import TapReporter from '../src/TapReporter.js';
 import {selectTimer} from '../src/utils/timer.js';
 
 import TestWorker from '../src/deno/TestWorker.js';
@@ -88,25 +91,22 @@ const config = () => {
   if (!parallel) parallel = globalThis.navigator?.hardwareConcurrency || 1;
 };
 
+const reporters = {
+  jsonl: 'JSONLReporter.js',
+  tap: 'TapReporter.js',
+  tty: 'TTYReporter.js'
+};
+
 const init = async () => {
-  let reporter = getReporter();
-  if (!reporter) {
-    if (Deno.env.get('TAPE6_JSONL')) {
-      const JSONLReporter = (await import('../src/JSONLReporter.js')).default,
-        jsonlReporter = new JSONLReporter(options);
-      reporter = jsonlReporter.report.bind(jsonlReporter);
-    } else if (!Deno.env.get('TAPE6_TAP')) {
-      const TTYReporter = (await import('../src/TTYReporter.js')).default,
-        ttyReporter = new TTYReporter(options);
-      ttyReporter.testCounter = -2;
-      ttyReporter.technicalDepth = 1;
-      reporter = ttyReporter.report.bind(ttyReporter);
-    }
-    if (!reporter) {
-      const tapReporter = new TapReporter({useJson: true, hasColors: !options.monochrome});
-      reporter = tapReporter.report.bind(tapReporter);
-    }
-    setReporter(reporter);
+  const currentReporter = getReporter();
+  if (!currentReporter) {
+    const reporterType = getReporterType(),
+      reporterFile = reporters[reporterType] || reporters.tty,
+      CustomReporter = (await import('../src/' + reporterFile)).default,
+      customOptions =
+        reporterType === 'tap' ? {useJson: true, hasColors: !options.monochrome} : options,
+      customReporter = new CustomReporter(customOptions);
+    setReporter(customReporter.report.bind(customReporter));
   }
 
   if (files.length) {

package/bin/tape6-node.js

@@ -3,11 +3,14 @@
 import process from 'node:process';
 import {fileURLToPath} from 'node:url';
 
-import {resolveTests, resolvePatterns} from '../src/utils/config.js';
+import {
+  resolveTests,
+  resolvePatterns,
+  getReporter as getReporterType
+} from '../src/utils/config.js';
 
 import {getReporter, setReporter} from '../src/test.js';
 import State, {StopTest} from '../src/State.js';
-import TapReporter from '../src/TapReporter.js';
 import {selectTimer} from '../src/utils/timer.js';
 
 import TestWorker from '../src/node/TestWorker.js';
@@ -89,25 +92,22 @@ const config = () => {
   if (!parallel) parallel = globalThis.navigator?.hardwareConcurrency || 1;
 };
 
+const reporters = {
+  jsonl: 'JSONLReporter.js',
+  tap: 'TapReporter.js',
+  tty: 'TTYReporter.js'
+};
+
 const init = async () => {
-  let reporter = getReporter();
-  if (!reporter) {
-    if (process.env.TAPE6_JSONL) {
-      const JSONLReporter = (await import('../src/JSONLReporter.js')).default,
-        jsonlReporter = new JSONLReporter(options);
-      reporter = jsonlReporter.report.bind(jsonlReporter);
-    } else if (!process.env.TAPE6_TAP) {
-      const TTYReporter = (await import('../src/TTYReporter.js')).default,
-        ttyReporter = new TTYReporter(options);
-      ttyReporter.testCounter = -2;
-      ttyReporter.technicalDepth = 1;
-      reporter = ttyReporter.report.bind(ttyReporter);
-    }
-    if (!reporter) {
-      const tapReporter = new TapReporter({useJson: true, hasColors: !options.monochrome});
-      reporter = tapReporter.report.bind(tapReporter);
-    }
-    setReporter(reporter);
+  const currentReporter = getReporter();
+  if (!currentReporter) {
+    const reporterType = getReporterType(),
+      reporterFile = reporters[reporterType] || reporters.tty,
+      CustomReporter = (await import('../src/' + reporterFile)).default,
+      customOptions =
+        reporterType === 'tap' ? {useJson: true, hasColors: !options.monochrome} : options,
+      customReporter = new CustomReporter(customOptions);
+    setReporter(customReporter.report.bind(customReporter));
   }
 
   if (files.length) {

package/bin/tape6-runner.js

@@ -3,16 +3,17 @@
 import process from 'node:process';
 import {fileURLToPath} from 'node:url';
 
-const requestedRuntime = {
+const runtimeFiles = {
   node: 'tape6-node.js',
   deno: 'tape6-deno.js',
   bun: 'tape6-bun.js',
   server: 'tape6-server.js',
   runner: 'tape6-runner.js',
   main: 'tape6.js'
-}[process.argv[2]];
+};
+const requestedRuntime = runtimeFiles[process.argv[2]] || runtimeFiles.main;
 
-const runtime = requestedRuntime || 'tape6.js',
+const runtime = requestedRuntime,
   url = new URL('./' + runtime, import.meta.url),
   fileName = url.protocol === 'file:' ? fileURLToPath(url) : url.href;
 

package/bin/tape6.js

@@ -11,11 +11,11 @@ if (process.argv.includes('--self')) {
     console.log(self);
   }
 } else {
-  if (typeof Deno == 'object') {
+  if (typeof Deno == 'object' && Deno?.version) {
     await import('./tape6-deno.js');
-  } else if (typeof Bun == 'object') {
+  } else if (typeof Bun == 'object' && Bun?.version) {
     await import('./tape6-bun.js');
-  } else if (typeof process == 'object' && process.versions?.node) {
+  } else if (typeof process == 'object' && process?.versions?.node) {
     await import('./tape6-node.js');
   } else {
     throw new Error('tape6 is not supported in this environment');

package/index.js

@@ -1,3 +1,5 @@
+// @ts-self-types="./index.d.ts"
+
 import {
   test,
   getTests,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tape-six",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "TAP the test harness for the modern JavaScript (ES6).",
   "type": "module",
   "main": "index.js",
@@ -71,8 +71,8 @@
     }
   },
   "devDependencies": {
-    "@types/node": "^22.13.10",
-    "puppeteer": "^24.4.0",
-    "typescript": "^5.8.2"
+    "@types/node": "^25.0.5",
+    "puppeteer": "^24.34.0",
+    "typescript": "^5.9.3"
   }
 }

package/src/JSONLReporter.js

@@ -1,13 +1,22 @@
+import {getEnv} from './utils/config.js';
+
 class JSONLReporter {
   constructor({renumberAsserts = false} = {}) {
     this.renumberAsserts = renumberAsserts;
     this.assertCounter = 0;
+
+    const env = getEnv({});
+    this.prefix = env.TAPE6_JSONL_PREFIX || '';
   }
   report(event) {
     if (event.type === 'assert' && this.renumberAsserts) {
       event = {...event, id: ++this.assertCounter};
     }
-    console.log(JSON.stringify(event));
+    if (this.prefix) {
+      console.log('\n' + this.prefix + JSON.stringify(event));
+    } else {
+      console.log(JSON.stringify(event));
+    }
   }
 }
 

package/src/TTYReporter.js

@@ -76,7 +76,40 @@ class TTYReporter {
     this.failure = this.paint(failureStyle, reset);
     this.skipped = this.paint(skippedStyle, reset);
 
-    this.output.isTTY && this.out('');
+    // watching for console output
+
+    this.consoleWasUsed = false;
+    this.consoleLastNewLine = false;
+    this.consoleSkipChecks = false;
+
+    while (this.output.isTTY) {
+      this.out('');
+
+      const isCurrentTTY = this.output === process.stdout || this.output === process.stderr;
+      if (!isCurrentTTY) break;
+
+      const oldStdoutWrite = process.stdout.write;
+      process.stdout.write = process.stderr.write = (chunk, ...args) => {
+        if (!this.consoleSkipChecks && chunk) {
+          this.consoleWasUsed = true;
+          const text = chunk.toString();
+          this.consoleLastNewLine = text[text.length - 1] === '\n';
+        }
+        return oldStdoutWrite.call(process.stdout, chunk, ...args);
+      };
+
+      const oldStderrWrite = process.stderr.write;
+      process.stderr.write = (chunk, ...args) => {
+        if (!this.consoleSkipChecks && chunk) {
+          this.consoleWasUsed = true;
+          const text = chunk.toString();
+          this.consoleLastNewLine = text[text.length - 1] === '\n';
+        }
+        return oldStderrWrite.call(process.stderr, chunk, ...args);
+      };
+
+      break;
+    }
   }
   paint(prefix, suffix = '\x1B[39m') {
     return this.hasColors ? text => join(prefix, text, suffix) : text => text;
@@ -100,9 +133,22 @@ class TTYReporter {
     return this;
   }
   report(event) {
+    this.consoleSkipChecks = true;
+    try {
+      this.reportInternal(event);
+    } finally {
+      this.consoleSkipChecks = false;
+    }
+  }
+  reportInternal(event) {
     if (this.output.isTTY) {
-      this.output.moveCursor(0, -1);
-      this.output.clearLine(0);
+      if (this.consoleWasUsed) {
+        if (!this.consoleLastNewLine) this.output.write('\n');
+        this.consoleWasUsed = this.consoleLastNewLine = false;
+      } else {
+        this.output.moveCursor(0, -1);
+        this.output.clearLine(0);
+      }
     }
     let text;
     switch (event.type) {

package/src/utils/config.js

@@ -64,3 +64,36 @@ export const resolveTests = async (rootFolder, type, traceFn) => {
   // resolve patterns
   return resolvePatterns(rootFolder, patterns);
 };
+
+export const runtime = {name: 'unknown', env: null};
+
+if (typeof Deno == 'object' && Deno?.version) {
+  runtime.name = 'deno';
+  runtime.env = Deno.env;
+} else if (typeof Bun == 'object' && Bun?.version) {
+  runtime.name = 'bun';
+  runtime.env = Bun.env;
+} else if (typeof process == 'object' && process?.versions?.node) {
+  runtime.name = 'node';
+  runtime.env = process.env;
+} else if (typeof window == 'object' && window?.document) {
+  runtime.name = 'browser';
+}
+
+export const getEnv = (defaultEnv = null) => runtime.env || defaultEnv;
+
+export const getReporter = () => {
+  const env = getEnv();
+  if (!env) return null;
+  if (env.TAPE6_REPORTER) return env.TAPE6_REPORTER;
+  if (env.TAPE6_JSONL) return 'jsonl';
+  if (env.TAPE6_TAP) return 'tap';
+  return 'tty';
+};
+
+export const getRunner = () => {
+  const env = getEnv();
+  if (!env) return null;
+  if (env.TAPE6_RUNNER) return env.TAPE6_RUNNER;
+  return 'thread';
+};