wip

lib/internal/main/test_runner.js

@@ -22,9 +22,8 @@ if (isUsingInspector()) {
   inspectPort = process.debugPort;
 }
 
-const tapStream = run({ concurrency, inspectPort, watch: getOptionValue('--watch') });
-const reporters = setupTestReporters(tapStream);
-reporters.pipe(process.stdout);
-tapStream.once('test:fail', () => {
+const reporterStream = run({ concurrency, inspectPort, watch: getOptionValue('--watch') });
+reporterStream.once('test:fail', () => {
   process.exitCode = kGenericUserError;
 });
+setupTestReporters(reporterStream);

lib/internal/test_runner/harness.js

@@ -110,7 +110,7 @@ function setup(root) {
   }
 
   root.startTime = hrtime();
-  root.reporter.version();
+  root.reporter.start();
 
   wasRootSetup.add(root);
   return root;
@@ -120,11 +120,10 @@ let globalRoot;
 function getGlobalRoot() {
   if (!globalRoot) {
     globalRoot = createTestTree();
-    const reporter = setupTestReporters(globalRoot.reporter);
-    reporter.pipe(process.stdout);
-    reporter.once('test:fail', () => {
+    globalRoot.reporter.once('test:fail', () => {
       process.exitCode = kGenericUserError;
     });
+    setupTestReporters(globalRoot.reporter);
   }
   return globalRoot;
 }

lib/internal/test_runner/reporter_stream.js

@@ -19,9 +19,9 @@ class ReporterStream extends Readable {
     this.#canPush = true;
 
     while (this.#buffer.length > 0) {
-      const chunk = ArrayPrototypeShift(this.#buffer);
+      const obj = ArrayPrototypeShift(this.#buffer);
 
-      if (!this.#tryPush(chunk)) {
+      if (!this.#tryPush(obj)) {
         return;
       }
     }
@@ -35,8 +35,8 @@ class ReporterStream extends Readable {
     this.#emit('test:pass', { __proto__: null, name, nesting, testNumber, details, ...directive });
   }
 
-  plan() {
-    // NOT IMPLEMENTED
+  plan(nesting, count, explanation) {
+    this.#emit('test:plan', { __proto__: null, nesting, count, explanation });
   }
 
   getSkip(reason) {
@@ -48,15 +48,15 @@ class ReporterStream extends Readable {
   }
 
   subtest(nesting, name) {
-    this.#emit('test:subtest', { nesting, name });
+    this.#emit('test:subtest', { __proto__: null, nesting, name });
   }
 
   diagnostic(nesting, message) {
-    this.#emit('test:diagnostic', { nesting, message });
+    this.#emit('test:diagnostic', { __proto__: null, nesting, message });
   }
 
-  version() {
-    // NOT IMPLEMENTED
+  start() {
+    this.#emit('test:start', { __proto__: null });
   }
 
   #emit(type, data) {

lib/internal/test_runner/runner.js

@@ -37,7 +37,6 @@ const { kEmptyObject } = require('internal/util');
 const { createTestTree } = require('internal/test_runner/harness');
 const { kSubtestsFailed, Test } = require('internal/test_runner/test');
 const { TapParser } = require('internal/test_runner/tap_parser');
-const { kDefaultIndent } = require('internal/test_runner/tap_stream');
 const { TokenKind } = require('internal/test_runner/tap_lexer');
 
 const {
@@ -130,6 +129,8 @@ function getRunArgs({ path, inspectPort }) {
   return argv;
 }
 
+const kDefaultIndent = '    '; // 4 spaces
+
 class FileTest extends Test {
   #buffer = [];
   #handleReportItem({ kind, node, nesting = 0 }) {

lib/internal/test_runner/test.js

@@ -7,7 +7,6 @@ const {
   ArrayPrototypeSlice,
   ArrayPrototypeSome,
   ArrayPrototypeUnshift,
-  Boolean,
   FunctionPrototype,
   MathMax,
   Number,
@@ -34,7 +33,6 @@ const {
 } = require('internal/errors');
 const { getOptionValue } = require('internal/options');
 const { MockTracker } = require('internal/test_runner/mock');
-const { TapStream } = require('internal/test_runner/tap_stream');
 const { ReporterStream } = require('internal/test_runner/reporter_stream');
 const {
   convertStringToRegExp,
@@ -67,7 +65,6 @@ const kHookFailure = 'hookFailed';
 const kDefaultTimeout = null;
 const noop = FunctionPrototype;
 const isTestRunner = getOptionValue('--test');
-const hasReporters = Boolean(getOptionValue('--test-reporter'));
 const testOnlyFlag = !isTestRunner && getOptionValue('--test-only');
 const testNamePatternFlag = isTestRunner ? null :
   getOptionValue('--test-name-pattern');
@@ -191,7 +188,7 @@ class Test extends AsyncResource {
       this.concurrency = 1;
       this.nesting = 0;
       this.only = testOnlyFlag;
-      this.reporter = hasReporters ? new ReporterStream() : new TapStream();
+      this.reporter = new ReporterStream();
       this.runOnlySubtests = this.only;
       this.testNumber = 0;
       this.timeout = kDefaultTimeout;

lib/internal/test_runner/utils.js

@@ -1,8 +1,13 @@
 'use strict';
-const { RegExp, RegExpPrototypeExec } = primordials;
+const { ObjectGetOwnPropertyDescriptor, RegExp, RegExpPrototypeExec, SafeMap } = primordials;
 const { basename } = require('path');
+const { createWriteStream } = require('fs');
 const { createDeferredPromise } = require('internal/util');
 const { getOptionValue } = require('internal/options');
+const specReporter = require('test/reporter/spec');
+const dotReporter = require('test/reporter/dot');
+const tapReporter = require('test/reporter/tap');
+
 const {
   codes: {
     ERR_INVALID_ARG_VALUE,
@@ -11,7 +16,6 @@ const {
   kIsNodeError,
 } = require('internal/errors');
 const { compose } = require('stream');
-const { Module } = require('internal/modules/cjs/loader');
 
 const kMultipleCallbackInvocations = 'multipleCallbackInvocations';
 const kRegExpPattern = /^\/(.*)\/([a-z]*)$/;
@@ -77,14 +81,56 @@ function convertStringToRegExp(str, name) {
   }
 }
 
-let _module;
-function setupTestReporters(reporter) {
-  if (getOptionValue('--test-reporter')) {
-    _module ??= new Module('node:test');
-    const reporters = _module.require(getOptionValue('--test-reporter'));
-    return compose(reporter, reporters);
+const kBuiltinDestinations = new SafeMap([
+  ['stdout', process.stdout],
+  ['stderr', process.stderr],
+]);
+
+const kBuiltinReporters = new SafeMap([
+  ['spec', specReporter],
+  ['dot', dotReporter],
+  ['tap', tapReporter],
+]);
+
+const kDefaultReporter = 'tap';
+const kDefaltDestination = 'stdout';
+
+function getReportersMap(reporters, destinations) {
+  const result = [];
+  reporters.forEach((name, i) => {
+    const destination = kBuiltinDestinations.get(destinations[i]) ?? createWriteStream(destinations[i]);
+    let reporter = kBuiltinReporters.get(name) ?? require(name);
+
+    if (ObjectGetOwnPropertyDescriptor(reporter.prototype, 'constructor')) {
+      reporter = new reporter();
+    }
+
+    result.push({ reporter, destination });
+  });
+  return result;
+}
+
+
+function setupTestReporters(reporterStream) {
+  const destinations = getOptionValue('--test-reporter-destination');
+  const reporters = getOptionValue('--test-reporter');
+
+  if (reporters.length === 0 && destinations.length === 0) {
+    reporters.push(kDefaultReporter);
+  }
+
+  if (reporters.length === 1 && destinations.length === 0) {
+    destinations.push(kDefaltDestination);
+  }
+
+  if (destinations.length !== reporters.length) {
+    throw new ERR_INVALID_ARG_VALUE('The number of reporters and destinations must match');
+  }
+
+  const reportersMap = getReportersMap(reporters, destinations);
+  for (const { reporter, destination } of reportersMap) {
+    compose(reporterStream, reporter).pipe(destination);
   }
-  return reporter;
 }
 
 module.exports = {

lib/test/reporter/spec.js

@@ -65,4 +65,4 @@ class SpecReporter extends Transform {
   }
 }
 
-module.exports = new SpecReporter();
+module.exports = SpecReporter;