tape-six-proc 1.1.6 → 1.2.0

package/README.md

@@ -22,6 +22,7 @@ has the same usage as `tape6`.
 
 The most recent releases:
 
+- 1.2.0 _Updated dependencies and synchronized the implementation with `tape-six` 1.5.0._
 - 1.1.6 _Updated dependencies._
 - 1.1.5 _Updated dependencies._
 - 1.1.4 _Updated dependencies._

package/bin/tape6-proc-node.js

@@ -9,8 +9,7 @@ import {fileURLToPath} from 'node:url';
 import {resolveTests, resolvePatterns} from 'tape-six/utils/config.js';
 
 import {getReporter, setReporter} from 'tape-six/test.js';
-import State, {StopTest} from 'tape-six/State.js';
-import TapReporter from 'tape-six/TapReporter.js';
+import TapReporter from 'tape-six/reporters/TapReporter.js';
 import {selectTimer} from 'tape-six/utils/timer.js';
 
 import TestWorker from '../src/TestWorker.js';
@@ -115,19 +114,14 @@ const init = async () => {
   let reporter = getReporter();
   if (!reporter) {
     if (process.env.TAPE6_JSONL) {
-      const {JSONLReporter} = await import('tape-six/JSONLReporter.js'),
-        jsonlReporter = new JSONLReporter(options);
-      reporter = jsonlReporter.report.bind(jsonlReporter);
+      const {JSONLReporter} = await import('tape-six/reporters/JSONLReporter.js');
+      reporter = new JSONLReporter(options);
     } else if (!process.env.TAPE6_TAP) {
-      const {TTYReporter} = await import('tape-six/TTYReporter.js'),
-        ttyReporter = new TTYReporter(options);
-      ttyReporter.testCounter = -2;
-      ttyReporter.technicalDepth = 1;
-      reporter = ttyReporter.report.bind(ttyReporter);
+      const {TTYReporter} = await import('tape-six/reporters/TTYReporter.js');
+      reporter = new TTYReporter(options);
     }
     if (!reporter) {
-      const tapReporter = new TapReporter({useJson: true});
-      reporter = tapReporter.report.bind(tapReporter);
+      reporter = new TapReporter({useJson: true});
     }
     setReporter(reporter);
   }
@@ -145,14 +139,6 @@ const init = async () => {
   }
 };
 
-const safeEmit = rootState => event => {
-  try {
-    rootState.emit(event);
-  } catch (error) {
-    if (!(error instanceof StopTest)) throw error;
-  }
-};
-
 const main = async () => {
   config();
   await init();
@@ -162,25 +148,25 @@ const main = async () => {
     console.error('UNHANDLED ERROR:', origin, error)
   );
 
-  const rootState = new State(null, {callback: getReporter(), failOnce: options.failOnce}),
-    worker = new TestWorker(safeEmit(rootState), parallel, options);
+  const reporter = getReporter(),
+    worker = new TestWorker(reporter, parallel, options);
 
-  rootState.emit({type: 'test', test: 0, time: rootState.timer.now()});
+  reporter.report({type: 'test', test: 0, name: ''});
 
   await new Promise(resolve => {
     worker.done = () => resolve();
     worker.execute(files);
   });
 
-  rootState.emit({
+  const hasFailed = reporter.state && reporter.state.failed > 0;
+
+  reporter.report({
     type: 'end',
     test: 0,
-    time: rootState.timer.now(),
-    fail: rootState.failed > 0,
-    data: rootState
+    fail: hasFailed
   });
 
-  process.exit(rootState.failed > 0 ? 1 : 0);
+  process.exit(hasFailed ? 1 : 0);
 };
 
 main().catch(error => console.error('ERROR:', error));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tape-six-proc",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "description": "Helper for TAP the test harness for the modern JavaScript (ES6) to run tests in separate processes.",
   "type": "module",
   "bin": {
@@ -32,8 +32,8 @@
   },
   "homepage": "https://github.com/uhop/tape-six-proc#readme",
   "dependencies": {
-    "dollar-shell": "^1.1.5",
-    "tape-six": "^1.4.5"
+    "dollar-shell": "^1.1.6",
+    "tape-six": "^1.5.0"
   },
   "tape6": {
     "tests": [

package/src/TestWorker.js

@@ -6,7 +6,7 @@ import crypto from 'node:crypto';
 
 import {spawn, currentExecPath, runFileArgs} from 'dollar-shell';
 
-import {StopTest} from 'tape-six/State.js';
+import {isStopTest} from 'tape-six/State.js';
 import EventServer from 'tape-six/utils/EventServer.js';
 import getDeferred from 'tape-six/utils/getDeferred.js';
 
@@ -55,7 +55,7 @@ export default class TestWorker extends EventServer {
             try {
               self.report(id, msg);
             } catch (error) {
-              if (!(error instanceof StopTest)) {
+              if (!isStopTest(error)) {
                 stdoutDeferred.reject(error);
                 throw error;
               }
@@ -81,9 +81,28 @@ export default class TestWorker extends EventServer {
           }
         })
       );
-    Promise.allSettled([worker.exited, stdoutDeferred.promise, stderrDeferred.promise]).then(() =>
-      self.close(id)
-    );
+    Promise.allSettled([worker.exited, stdoutDeferred.promise, stderrDeferred.promise]).then(() => {
+      if (!self.reporter.state || !self.reporter.state.failed) {
+        const reason = [];
+        if (worker.exitCode) {
+          reason.push(`exit code: ${worker.exitCode}`);
+        }
+        if (worker.signalCode) {
+          reason.push(`signal: ${worker.signalCode}`);
+        }
+        if (reason.length) {
+          self.report(id, {
+            name: 'process has failed, ' + reason.join(', '),
+            test: 0,
+            marker: new Error(),
+            operator: 'error',
+            fail: true
+          });
+          self.report(id, {type: 'terminated', test: 0, name: 'FILE: /' + fileName});
+        }
+      }
+      self.close(id);
+    });
     return id;
   }
   destroyTask(id) {

package/tests/manual/test-bad-exit.js

@@ -0,0 +1,7 @@
+import test from 'tape-six';
+import process from 'node:process';
+
+test('bad exit', t => {
+  t.pass();
+  process.exit(1);
+});

package/tests/manual/test-bad-import.js

@@ -0,0 +1,7 @@
+import test from 'tape-six';
+
+import x from 'bad-import';
+
+test('non-working test', t => {
+  t.ok(typeof x === 'object');
+});

package/tests/manual/test-bad-signal.js

@@ -0,0 +1,7 @@
+import test from 'tape-six';
+import process from 'node:process';
+
+test('bad signal', t => {
+  t.pass();
+  process.kill(process.pid, 'SIGKILL');
+});

package/wiki/Release-notes.md

@@ -1,5 +1,6 @@
 # The current version: 1.x
 
+- 1.2.0 _Updated dependencies and synchronized the implementation with `tape-six` 1.5.0._
 - 1.1.6 _Updated dependencies._
 - 1.1.5 _Updated dependencies._
 - 1.1.4 _Updated dependencies._