tape-six 1.2.0 → 1.3.0

package/README.md

@@ -236,6 +236,7 @@ See [set-up tests](https://github.com/uhop/tape-six/wiki/Set-up-tests) for detai
 
 The most recent releases:
 
+- 1.3.0 _Bugfixes, updated dependencies, new feature: proxied console calls._
 - 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._

package/bin/tape6-bun.js

@@ -41,7 +41,8 @@ const config = () => {
     d: 'showData',
     o: 'failOnce',
     n: 'showAssertNumber',
-    m: 'monochrome'
+    m: 'monochrome',
+    c: 'dontCaptureConsole'
   };
 
   let flagIsSet = false,

package/bin/tape6-deno.js

@@ -41,7 +41,8 @@ const config = () => {
     d: 'showData',
     o: 'failOnce',
     n: 'showAssertNumber',
-    m: 'monochrome'
+    m: 'monochrome',
+    c: 'dontCaptureConsole'
   };
 
   let flagIsSet = false,

package/bin/tape6-node.js

@@ -42,7 +42,8 @@ const config = () => {
     d: 'showData',
     o: 'failOnce',
     n: 'showAssertNumber',
-    m: 'monochrome'
+    m: 'monochrome',
+    c: 'dontCaptureConsole'
   };
 
   let flagIsSet = false,

package/index.js

@@ -22,7 +22,8 @@ const optionNames = {
   o: 'failOnce',
   n: 'showAssertNumber',
   m: 'monochrome',
-  j: 'useJsonL'
+  j: 'useJsonL',
+  c: 'dontCaptureConsole'
 };
 
 const init = async () => {

package/package.json

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

package/src/JSONLReporter.js

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

package/src/TTYReporter.js

@@ -24,7 +24,7 @@ const successStyle = `\x1B[48;5;${buildColor(0, 32, 0)};1;97m`,
 
 // main
 
-class TTYReporter {
+export class TTYReporter {
   constructor({
     output = process.stdout,
     renumberAsserts = false,
@@ -33,7 +33,8 @@ class TTYReporter {
     showTime = true,
     showData = true,
     showAssertNumber = false,
-    hasColors = true
+    hasColors = true,
+    dontCaptureConsole = false
   } = {}) {
     this.output = output;
     this.hasColors =
@@ -75,6 +76,8 @@ class TTYReporter {
     this.success = this.paint(successStyle, reset);
     this.failure = this.paint(failureStyle, reset);
     this.skipped = this.paint(skippedStyle, reset);
+    this.stdoutPaint = this.paint('\x1B[90m');
+    this.stderrPaint = this.paint('\x1B[31m');
 
     // watching for console output
 
@@ -82,31 +85,27 @@ class TTYReporter {
     this.consoleLastNewLine = false;
     this.consoleSkipChecks = false;
 
-    while (this.output.isTTY) {
+    while (!dontCaptureConsole && 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';
+      const console = globalThis.console,
+        self = this;
+      globalThis.console = new Proxy(console, {
+        get(target, property, receiver) {
+          const prop = Reflect.get(target, property, receiver);
+          if (typeof prop !== 'function') return prop;
+          return (...args) => {
+            if (!self.consoleSkipChecks) {
+              self.consoleWasUsed = true;
+              self.consoleLastNewLine = true;
+            }
+            return prop.apply(receiver, args);
+          };
         }
-        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;
     }
@@ -123,8 +122,8 @@ class TTYReporter {
     }
     return this.red(this.italic(JSON.stringify(value)));
   }
-  out(text) {
-    if (this.depth < 2 + this.technicalDepth) {
+  out(text, noIndent) {
+    if (this.depth < 2 + this.technicalDepth || noIndent) {
       this.output.write(text + '\n');
     } else {
       this.output.write(stringRep(this.depth - 1 - this.technicalDepth, '  ') + text + '\n');
@@ -273,6 +272,45 @@ class TTYReporter {
       case 'comment':
         !this.failureOnly && this.out(this.blue(this.italic(event.name || 'empty comment')));
         break;
+      case 'console-log':
+      case 'console-info':
+      case 'console-warn':
+        {
+          const lines = event.name.split(/\r?\n/),
+            type = /\-(\w+)$/.exec(event.type)[1],
+            prefix = this.stdoutPaint(type + ':') + ' ';
+          for (const line of lines) {
+            this.out(prefix + line, true);
+          }
+        }
+        break;
+      case 'console-error':
+        {
+          const lines = event.name.split(/\r?\n/),
+            prefix = this.stderrPaint('error:') + ' ';
+          for (const line of lines) {
+            this.out(prefix + line, true);
+          }
+        }
+        break;
+      case 'stdout':
+        {
+          const lines = event.name.split(/\r?\n/),
+            prefix = this.stdoutPaint('stdout:') + ' ';
+          for (const line of lines) {
+            this.out(prefix + line, true);
+          }
+        }
+        break;
+      case 'stderr':
+        {
+          const lines = event.name.split(/\r?\n/),
+            prefix = this.stderrPaint('stderr:') + ' ';
+          for (const line of lines) {
+            this.out(prefix + line, true);
+          }
+        }
+        break;
       case 'bail-out':
         {
           text = 'Bail out!';

package/src/TapReporter.js

@@ -15,7 +15,9 @@ const styles = {
     'font-weight: bold; color: white; background-color: green; padding: 0.5em 1em;',
   'summary-result-failure':
     'font-weight: bold; color: white; background-color: red; padding: 0.5em 1em;',
-  'bail-out': 'color: white; background-color: red; font-weight: bold; padding: 0.5em 1em;'
+  'bail-out': 'color: white; background-color: red; font-weight: bold; padding: 0.5em 1em;',
+  stdout: 'color: gray; font-style: italic;',
+  stderr: 'color: darkred; font-style: italic;'
 };
 
 const logger = (text, style) => {
@@ -36,7 +38,7 @@ const formatValue = value => {
   return JSON.stringify(value);
 };
 
-class TapReporter {
+export class TapReporter {
   constructor({write, useJson = false, renumberAsserts = false, hasColors = true} = {}) {
     this.write = write || (hasColors ? logger : console.log.bind(console));
     this.renumberAsserts = renumberAsserts;
@@ -63,6 +65,24 @@ class TapReporter {
         this.open();
         this.write('# ' + event.name);
         break;
+      case 'console-log':
+      case 'console-info':
+      case 'console-warn':
+        this.open();
+        this.write('# ' + /\-(\w+)$/.exec(event.type)[1] + ': ' + event.name, 'stdout');
+        break;
+      case 'console-error':
+        this.open();
+        this.write('# error: ' + event.name, 'stderr');
+        break;
+      case 'stdout':
+        this.open();
+        this.write('# stdout: ' + event.name, 'stdout');
+        break;
+      case 'stderr':
+        this.open();
+        this.write('# stderr: ' + event.name, 'stderr');
+        break;
       case 'end':
         --this.depth;
         event.name &&

package/src/bun/TestWorker.js

@@ -3,7 +3,7 @@ import {sep} from 'node:path';
 import {StopTest} from '../State.js';
 import EventServer from '../utils/EventServer.js';
 
-const utilName = new URL('../test.js', import.meta.url),
+const srcName = new URL('../', import.meta.url),
   baseName = Bun.pathToFileURL(Bun.cwd + sep);
 
 export default class TestWorker extends EventServer {
@@ -47,7 +47,7 @@ export default class TestWorker extends EventServer {
       });
       this.close(id);
     });
-    worker.postMessage({testName: testName.href, utilName: utilName.href});
+    worker.postMessage({testName: testName.href, srcName: srcName.href, options: this.options});
     return id;
   }
   destroyTask(id) {

package/src/bun/worker.js

@@ -1,3 +1,5 @@
+import {format} from 'node:util';
+
 const sanitizeMsg = msg => {
   if (msg.type !== 'end') return msg;
   const state = {};
@@ -8,11 +10,32 @@ const sanitizeMsg = msg => {
   return {...msg, data: state};
 };
 
+const consoleVerbs = {log: 1, info: 1, warn: 1, error: 1};
+
 addEventListener('message', async event => {
   const msg = event.data;
   try {
-    const {setReporter} = await import(msg.utilName);
+    const {setReporter} = await import(new URL('test.js', msg.srcName));
     setReporter(msg => postMessage(sanitizeMsg(msg)));
+
+    if (!msg.options.dontCaptureConsole) {
+      const console = globalThis.console;
+      globalThis.console = new Proxy(console, {
+        get(target, property, receiver) {
+          const prop = Reflect.get(target, property, receiver);
+          if (typeof prop === 'function') {
+            if (consoleVerbs[property] === 1) {
+              const type = 'console-' + property;
+              return (...args) => {
+                postMessage({type, name: format(...args)});
+              };
+            }
+          }
+          return prop;
+        }
+      });
+    }
+
     await import(msg.testName);
   } catch (error) {
     postMessage({type: 'test', test: 0, time: 0});

package/src/deno/TestWorker.js

@@ -4,7 +4,7 @@ import {sep} from 'node:path';
 import {StopTest} from '../State.js';
 import EventServer from '../utils/EventServer.js';
 
-const utilName = new URL('../test.js', import.meta.url),
+const srcName = new URL('../', import.meta.url),
   baseName = pathToFileURL(Deno.cwd() + sep);
 
 export default class TestWorker extends EventServer {
@@ -41,7 +41,7 @@ export default class TestWorker extends EventServer {
       });
       this.close(id);
     });
-    worker.postMessage({testName: testName.href, utilName: utilName.href});
+    worker.postMessage({testName: testName.href, srcName: srcName.href, options: this.options});
     return id;
   }
   destroyTask(id) {

package/src/deno/worker.js

@@ -1,3 +1,5 @@
+import {format} from 'node:util';
+
 const sanitizeMsg = msg => {
   if (msg.type !== 'end') return msg;
   const state = {};
@@ -8,11 +10,32 @@ const sanitizeMsg = msg => {
   return {...msg, data: state};
 };
 
+const consoleVerbs = {log: 1, info: 1, warn: 1, error: 1};
+
 addEventListener('message', async event => {
   const msg = event.data;
   try {
-    const {setReporter} = await import(msg.utilName);
+    const {setReporter} = await import(new URL('test.js', msg.srcName));
     setReporter(msg => postMessage(sanitizeMsg(msg)));
+
+    if (!msg.options.dontCaptureConsole) {
+      const console = globalThis.console;
+      globalThis.console = new Proxy(console, {
+        get(target, property, receiver) {
+          const prop = Reflect.get(target, property, receiver);
+          if (typeof prop === 'function') {
+            if (consoleVerbs[property] === 1) {
+              const type = 'console-' + property;
+              return (...args) => {
+                postMessage({type, name: format(...args)});
+              };
+            }
+          }
+          return prop;
+        }
+      });
+    }
+
     await import(msg.testName);
   } catch (error) {
     postMessage({type: 'test', test: 0, time: 0});

package/src/node/TestWorker.js

@@ -6,7 +6,7 @@ import {Worker} from 'node:worker_threads';
 import {StopTest} from '../State.js';
 import EventServer from '../utils/EventServer.js';
 
-const utilName = new URL('../test.js', import.meta.url),
+const srcName = new URL('../', import.meta.url),
   baseName = pathToFileURL(process.cwd() + sep);
 
 export default class TestWorker extends EventServer {
@@ -49,7 +49,7 @@ export default class TestWorker extends EventServer {
       });
       this.close(id);
     });
-    worker.postMessage({testName: testName.href, utilName: utilName.href});
+    worker.postMessage({testName: testName.href, srcName: srcName.href, options: this.options});
     return id;
   }
   destroyTask(id) {

package/src/node/worker.js

@@ -1,4 +1,5 @@
 import {parentPort} from 'node:worker_threads';
+import {format} from 'node:util';
 
 const sanitizeMsg = msg => {
   if (msg.type !== 'end') return msg;
@@ -10,10 +11,31 @@ const sanitizeMsg = msg => {
   return {...msg, data: state};
 };
 
+const consoleVerbs = {log: 1, info: 1, warn: 1, error: 1};
+
 parentPort.on('message', async msg => {
   try {
-    const {setReporter} = await import(msg.utilName);
+    const {setReporter} = await import(new URL('test.js', msg.srcName));
     setReporter(msg => parentPort.postMessage(sanitizeMsg(msg)));
+
+    if (!msg.options.dontCaptureConsole) {
+      const console = globalThis.console;
+      globalThis.console = new Proxy(console, {
+        get(target, property, receiver) {
+          const prop = Reflect.get(target, property, receiver);
+          if (typeof prop === 'function') {
+            if (consoleVerbs[property] === 1) {
+              const type = 'console-' + property;
+              return (...args) => {
+                parentPort.postMessage({type, name: format(...args)});
+              };
+            }
+          }
+          return prop;
+        }
+      });
+    }
+
     await import(msg.testName);
   } catch (error) {
     parentPort.postMessage({type: 'test', test: 0, time: 0});

package/src/utils/EventServer.js

@@ -11,8 +11,10 @@ export default class EventServer {
     this.passThroughId = null;
     this.backlog = {};
     this.closed = {};
+    this.finalized = {};
   }
   report(id, event) {
+    if (this.finalized[id] === 1) return this.reporter(event);
     if (this.passThroughId === null) this.passThroughId = id;
     if (this.passThroughId === id) return this.reporter(event);
     const events = this.backlog[id];
@@ -24,6 +26,7 @@ export default class EventServer {
   }
   close(id) {
     this.destroyTask(id);
+    this.finalized[id] = 1;
     --this.totalTasks;
     if (this.fileQueue.length) {
       ++this.totalTasks;
@@ -54,7 +57,16 @@ export default class EventServer {
     } else {
       this.closed[id] = 1;
     }
-    !this.totalTasks && this.done && this.done();
+    if (!this.totalTasks) {
+      Object.keys(this.backlog).forEach(id => {
+        this.finalized[id] = 1;
+        const events = this.backlog[id];
+        events.forEach(event => this.reporter(event));
+      });
+      this.closed = {};
+      this.backlog = {};
+      this.done && this.done();
+    }
   }
   createTask(fileName) {
     if (this.totalTasks < this.numberOfTasks) {