tape-six-proc 1.0.2 → 1.1.0

package/.github/workflows/codeql.yml

@@ -0,0 +1,76 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: 'CodeQL'
+
+on:
+  push:
+    branches: ['master']
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ['master']
+  schedule:
+    - cron: '29 23 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['javascript']
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+      # - run: |
+      #     echo "Run, Build Application using script"
+      #     ./location_of_script_within_repo/buildscript.sh
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: '/language:${{matrix.language}}'

package/.github/workflows/tests.yml

@@ -0,0 +1,32 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: ['*']
+  pull_request:
+    branches: [master]
+
+jobs:
+  tests:
+    name: Node.js ${{matrix.node-version}} on ${{matrix.os}}
+    runs-on: ${{matrix.os}}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        node-version: [20, 22, 24, 25]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{matrix.node-version}}
+      - run: |
+          npm ci
+          npm run build --if-present
+          npm test

package/.github/workflows/windows.yml

@@ -0,0 +1,28 @@
+name: Windows
+
+on:
+  workflow_dispatch:
+    inputs:
+      node-version:
+        description: 'Node.js version to run tests'
+        required: true
+        default: 25
+        type: number
+
+jobs:
+  tests:
+    name: Node.js ${{inputs.node-version}} (special test)
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{inputs.node-version}}
+      - run: |
+          npm ci
+          npm run build --if-present
+          npm test
+          node tests/test-sample.js

package/README.md

@@ -1,7 +1,7 @@
 # tape-six-proc [![NPM version][npm-img]][npm-url]
 
-[npm-img]:      https://img.shields.io/npm/v/tape-six-proc.svg
-[npm-url]:      https://npmjs.org/package/tape-six-proc
+[npm-img]: https://img.shields.io/npm/v/tape-six-proc.svg
+[npm-url]: https://npmjs.org/package/tape-six-proc
 
 `tape-six-proc` is a helper for [tape-six](https://www.npmjs.com/package/tape-six)
 to run tests in separate processes.
@@ -16,16 +16,17 @@ has the same usage as `tape6`.
 
 ### Command-line utilities
 
-* [tape6-proc](https://github.com/uhop/tape-six-proc/wiki/Utility-%E2%80%90-tape6-proc) — the main utility of this package to run tests in different environments.
+- [tape6-proc](https://github.com/uhop/tape-six-proc/wiki/Utility-%E2%80%90-tape6-proc) — the main utility of this package to run tests in different environments.
 
 ## Release notes
 
 The most recent releases:
 
-* 1.0.2 *Fixed concurrency detection. Updated dependencies.*
-* 1.0.1 *Updated dependencies.*
-* 1.0.0 *The first official release.*
-* 0.12.1 *Updated dependencies, which included fixes for Deno.*
-* 0.12.0 *Initial release.*
+- 1.1.0 _Added support for stdout/stderr and `tape-six` 1.3.4._
+- 1.0.2 _Fixed concurrency detection. Updated dependencies._
+- 1.0.1 _Updated dependencies._
+- 1.0.0 _The first official release._
+- 0.12.1 _Updated dependencies, which included fixes for Deno._
+- 0.12.0 _Initial release._
 
 For more info consult full [release notes](https://github.com/uhop/tape-six-proc/wiki/Release-notes).

package/bin/tape6-proc-node.js

@@ -43,18 +43,18 @@ const config = () => {
     d: 'showData',
     o: 'failOnce',
     n: 'showAssertNumber',
-    c: 'hasColors'
+    m: 'monochrome',
+    c: 'dontCaptureConsole',
+    h: 'hideStreams'
   };
 
-  let flagIsSet = false,
-    parIsSet = false;
+  let parIsSet = false;
 
   for (let i = 2; i < process.argv.length; ++i) {
     const arg = process.argv[i];
     if (arg == '-f' || arg == '--flags') {
       if (++i < process.argv.length) {
         flags = process.argv[i];
-        flagIsSet = true;
       }
       continue;
     }
@@ -78,9 +78,7 @@ const config = () => {
     files.push(arg);
   }
 
-  if (!flagIsSet) {
-    flags = process.env.TAPE6_FLAGS || flags;
-  }
+  flags = (process.env.TAPE6_FLAGS || '') + flags;
   for (let i = 0; i < flags.length; ++i) {
     const option = flags[i].toLowerCase(),
       name = optionNames[option];
@@ -116,11 +114,11 @@ const init = async () => {
   let reporter = getReporter();
   if (!reporter) {
     if (process.env.TAPE6_JSONL) {
-      const JSONLReporter = (await import('tape-six/JSONLReporter.js')).default,
+      const {JSONLReporter} = await import('tape-six/JSONLReporter.js'),
         jsonlReporter = new JSONLReporter(options);
       reporter = jsonlReporter.report.bind(jsonlReporter);
     } else if (!process.env.TAPE6_TAP) {
-      const TTYReporter = (await import('tape-six/TTYReporter.js')).default,
+      const {TTYReporter} = await import('tape-six/TTYReporter.js'),
         ttyReporter = new TTYReporter(options);
       ttyReporter.testCounter = -2;
       ttyReporter.technicalDepth = 1;

package/package.json

@@ -1,11 +1,18 @@
 {
   "name": "tape-six-proc",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Helper for TAP the test harness for the modern JavaScript (ES6) to run tests in separate processes.",
   "type": "module",
   "bin": {
     "tape6-proc": "bin/tape6-proc.js"
   },
+  "scripts": {
+    "lint": "prettier --check .",
+    "lint:fix": "prettier --write .",
+    "test": "node ./bin/tape6-proc.js",
+    "test:bun": "bun run ./bin/tape6-proc.js",
+    "test:deno": "deno run -A ./bin/tape6-proc.js -r --allow-read -r --allow-env"
+  },
   "keywords": [
     "tap",
     "test",
@@ -26,6 +33,11 @@
   "homepage": "https://github.com/uhop/tape-six-proc#readme",
   "dependencies": {
     "dollar-shell": "^1.1.0",
-    "tape-six": "^1.1.2"
+    "tape-six": "^1.3.4"
+  },
+  "tape6": {
+    "tests": [
+      "/tests/test-*.*js"
+    ]
   }
 }

package/src/TestWorker.js

@@ -2,6 +2,7 @@ import process from 'node:process';
 import os from 'node:os';
 import {sep} from 'node:path';
 import {pathToFileURL, fileURLToPath} from 'node:url';
+import crypto from 'node:crypto';
 
 import {spawn, currentExecPath, runFileArgs} from 'dollar-shell';
 
@@ -9,7 +10,8 @@ import {StopTest} from 'tape-six/State.js';
 import EventServer from 'tape-six/utils/EventServer.js';
 
 import lines from './chain/lines.js';
-import parse from './chain/jsonl-parse.js';
+import parse from './chain/parse-prefixed-jsonl.js';
+import wrap from './chain/wrap-lines.js';
 
 const baseName = pathToFileURL(process.cwd() + sep);
 
@@ -18,21 +20,24 @@ export default class TestWorker extends EventServer {
     super(reporter, numberOfTasks, options);
     this.counter = 0;
     this.idToWorker = {};
+    this.prefix = crypto.randomUUID();
   }
   makeTask(fileName) {
     const testName = new URL(fileName, baseName),
       id = String(++this.counter),
       worker = spawn(
-        [
-          currentExecPath(),
-          ...runFileArgs.concat((this.options.runFileArgs || []).filter(x => x)),
-          fileURLToPath(testName)
-        ],
+        [currentExecPath(), ...runFileArgs, ...this.options.runFileArgs, fileURLToPath(testName)],
         {
           stdin: 'ignore',
           stdout: 'pipe',
-          stderr: 'inherit',
-          env: {...process.env, TAPE6_TEST: id, TAPE6_JSONL: 'Y'}
+          stderr: 'pipe',
+          env: {
+            ...process.env,
+            TAPE6_TEST: id,
+            TAPE6_TEST_FILE_NAME: fileName,
+            TAPE6_JSONL: 'Y',
+            TAPE6_JSONL_PREFIX: this.prefix
+          }
         }
       );
     this.idToWorker[id] = worker;
@@ -40,22 +45,32 @@ export default class TestWorker extends EventServer {
     worker.stdout
       .pipeThrough(new TextDecoderStream())
       .pipeThrough(lines())
-      .pipeThrough(parse())
+      .pipeThrough(parse(this.prefix))
       .pipeTo(
         new WritableStream({
           write(msg) {
             try {
               self.report(id, msg);
             } catch (error) {
-              if (!(error instanceof StopTest)) throw error;
-            }
-            if (msg.type === 'end' && msg.test === 0) {
-              self.close(id);
-              return;
+              if (!(error instanceof StopTest)) {
+                throw error;
+              }
             }
           }
         })
       );
+    worker.stderr
+      .pipeThrough(new TextDecoderStream())
+      .pipeThrough(lines())
+      .pipeThrough(wrap('stderr'))
+      .pipeTo(
+        new WritableStream({
+          write(msg) {
+            self.report(id, msg);
+          }
+        })
+      );
+    worker.exited.finally(() => self.close(id));
     return id;
   }
   destroyTask(id) {

package/src/chain/lines.js

@@ -1,5 +1,3 @@
-'use strict';
-
 export const lines = () => {
   let rest = '';
   return new TransformStream({
@@ -12,7 +10,7 @@ export const lines = () => {
       for (const line of lines) controller.enqueue(line);
     },
     flush(controller) {
-      controller.enqueue(rest);
+      if (rest) controller.enqueue(rest);
       rest = '';
     }
   });

package/src/chain/parse-prefixed-jsonl.js

@@ -0,0 +1,46 @@
+export const parse = (prefix, type = 'stdout') => {
+  let rest = '';
+  let haveRest = false;
+  let lastLineWasJSON = false;
+  return new TransformStream({
+    transform(line, controller) {
+      if (line.startsWith(prefix)) {
+        try {
+          const value = JSON.parse(line.slice(prefix.length));
+          if (value && typeof value == 'object') {
+            controller.enqueue(value);
+          }
+          lastLineWasJSON = true;
+        } catch (_) {
+          // squelch
+        }
+        return;
+      }
+      if (lastLineWasJSON) {
+        rest += line;
+        lastLineWasJSON = false;
+        haveRest = !!rest;
+      } else {
+        if (haveRest) {
+          controller.enqueue({type, name: rest});
+          rest = line;
+          haveRest = !!rest;
+        } else {
+          if (line) {
+            rest = line;
+            haveRest = true;
+          }
+        }
+      }
+    },
+    flush(controller) {
+      if (haveRest) {
+        controller.enqueue({type, name: rest});
+      }
+      rest = '';
+      haveRest = false;
+    }
+  });
+};
+
+export default parse;

package/src/chain/wrap-lines.js

@@ -0,0 +1,8 @@
+export const wrap = (type = 'stdout') =>
+  new TransformStream({
+    transform(line, controller) {
+      controller.enqueue({type, name: line});
+    }
+  });
+
+export default wrap;

package/tests/test-console.js

@@ -0,0 +1,12 @@
+import test from 'tape-six';
+
+test('console test', t => {
+  console.log('#1');
+  t.pass();
+  console.log('#2');
+  console.error('error #1');
+  console.log('#2a');
+  t.ok(1 < 2);
+  console.log('#3');
+  console.error('error #2');
+});

package/wiki/Home.md

@@ -1,4 +1,5 @@
 <!-- markdownlint-disable-next-line first-line-heading -->
+
 `tape-six-proc` is a helper for [tape-six](https://www.npmjs.com/package/tape-six)
 to run tests in separate processes.
 
@@ -17,7 +18,7 @@ Test files are directly executable with `node` or `deno` or `bun` or in a browse
 [tape-six](https://www.npmjs.com/package/tape-six) helps to organize tests. This package
 provides a utility to run tests in isolated processes:
 
-* [tape6-proc](./Utility-‐-tape6‐proc) to run tests in separate processes.
+- [tape6-proc](./Utility-‐-tape6‐proc) to run tests in separate processes.
 
 # Formalities
 
@@ -25,5 +26,5 @@ The project is distributed under the 3-clause BSD license.
 
 Other pertinent information:
 
-* [Release notes](./Release-notes).
-* [Working on this project](./Working-on-this-project).
+- [Release notes](./Release-notes).
+- [Working on this project](./Working-on-this-project).

package/wiki/Release-notes.md

@@ -1,7 +1,8 @@
 # The current version: 1.x
 
-* 1.0.2 *Fixed concurrency detection. Updated dependencies.*
-* 1.0.1 *Updated dependencies.*
-* 1.0.0 *The first official release.*
-* 0.12.1 *Updated dependencies, which included fixes for Deno.*
-* 0.12.0 *Initial release.*
+- 1.1.0 _Added support for stdout/stderr and `tape-six` 1.3.4._
+- 1.0.2 _Fixed concurrency detection. Updated dependencies._
+- 1.0.1 _Updated dependencies._
+- 1.0.0 _The first official release._
+- 0.12.1 _Updated dependencies, which included fixes for Deno._
+- 0.12.0 _Initial release._

package/wiki/Utility-/342/200/220-tape6/342/200/220proc.md

@@ -1,4 +1,5 @@
 <!-- markdownlint-disable-next-line first-line-heading -->
+
 The main utility of the package is `tape6-proc`.
 
 # Usage
@@ -21,9 +22,9 @@ and can be used the same way.
 
 Additionally it supports the following flags:
 
-* `--runFileArgs ARGS` &mdash; sets the arguments to pass to the test file.
-  * Shortcut: `-r ARGS`.
-  * This flag can be used multiple times.
+- `--runFileArgs ARGS` &mdash; sets the arguments to pass to the test file.
+  - Shortcut: `-r ARGS`.
+  - This flag can be used multiple times.
 
 This flag is used mostly with Deno to supply additional arguments to the test file.
 

package/wiki/Working-on-this-project.md

@@ -1,4 +1,5 @@
 <!-- markdownlint-disable-next-line first-line-heading -->
+
 This project uses git submodules, so the correct way to get it is:
 
 ```bash

package/src/chain/jsonl-parse.js

@@ -1,17 +0,0 @@
-'use strict';
-
-export const parse = () =>
-  new TransformStream({
-    transform(line, controller) {
-      try {
-        const value = JSON.parse(line);
-        if (value && typeof value == 'object') {
-          controller.enqueue(value);
-        }
-      } catch (_) {
-        // squelch
-      }
-    }
-  });
-
-export default parse;