@travetto/test 3.4.3 → 4.0.0-rc.1

package/README.md

@@ -27,7 +27,7 @@ A simple example would be:
 
 **Code: Example Test Suite**
 ```typescript
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
 
@@ -58,7 +58,7 @@ A common aspect of the tests themselves are the assertions that are made.  [Node
 
 **Code: Example assertion for deep comparison**
 ```typescript
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
 
@@ -81,13 +81,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const Ⲑ_util_1 = tslib_1.__importStar(require("@travetto/test/src/execute/util.js"));
 const Ⲑ_check_1 = tslib_1.__importStar(require("@travetto/test/src/assert/check.js"));
-const Ⲑ_root_index_1 = tslib_1.__importStar(require("@travetto/manifest/src/root-index.js"));
+const Ⲑ_runtime_1 = tslib_1.__importStar(require("@travetto/manifest/src/runtime.js"));
 const Ⲑ_decorator_1 = tslib_1.__importStar(require("@travetto/registry/src/decorator.js"));
 var ᚕf = "@travetto/test/doc/assert-example.js";
-const assert_1 = tslib_1.__importDefault(require("assert"));
+const node_assert_1 = tslib_1.__importDefault(require("node:assert"));
 const test_1 = require("@travetto/test");
 let SimpleTest = class SimpleTest {
-    static Ⲑinit = Ⲑ_root_index_1.RootIndex.registerFunction(SimpleTest, ᚕf, 1887908328, { test: { hash: 102834457 } }, false, false);
+    static Ⲑinit = Ⲑ_runtime_1.RuntimeIndex.registerFunction(SimpleTest, ᚕf, 1887908328, { test: { hash: 102834457 } }, false, false);
     async test() {
         if (Ⲑ_util_1.RunnerUtil.tryDebugger)
             debugger;
@@ -131,7 +131,7 @@ In addition to the standard operations, there is support for throwing/rejecting
 
 **Code: Throws vs Does Not Throw**
 ```typescript
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
 
@@ -157,7 +157,7 @@ class SimpleTest {
 
 **Code: Rejects vs Does Not Reject**
 ```typescript
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
 
@@ -186,7 +186,7 @@ Additionally, the `throws`/`rejects` assertions take in a secondary parameter to
 
 **Code: Example of different Error matching paradigms**
 ```typescript
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Suite, Test } from '@travetto/test';
 

package/__index__.ts

@@ -1,3 +1,4 @@
+/// <reference path="./src/trv.d.ts" />
 export * from './src/decorator/suite';
 export * from './src/decorator/test';
 export * from './src/model/suite';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/test",
-  "version": "3.4.3",
+  "version": "4.0.0-rc.1",
   "description": "Declarative test framework",
   "keywords": [
     "unit-testing",
@@ -27,15 +27,15 @@
     "directory": "module/test"
   },
   "dependencies": {
-    "@travetto/base": "^3.4.2",
-    "@travetto/registry": "^3.4.2",
-    "@travetto/terminal": "^3.4.0",
-    "@travetto/worker": "^3.4.2",
-    "@travetto/yaml": "^3.4.2"
+    "@travetto/base": "^4.0.0-rc.1",
+    "@travetto/registry": "^4.0.0-rc.1",
+    "@travetto/terminal": "^4.0.0-rc.1",
+    "@travetto/worker": "^4.0.0-rc.1",
+    "@travetto/yaml": "^4.0.0-rc.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.7",
-    "@travetto/transformer": "^3.4.2"
+    "@travetto/cli": "^4.0.0-rc.1",
+    "@travetto/transformer": "^4.0.0-rc.1"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/assert/capture.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 
 import { Assertion, TestConfig } from '../model/test';
 

package/src/assert/check.ts

@@ -1,6 +1,6 @@
-import assert from 'assert';
+import assert from 'node:assert';
 
-import { RootIndex } from '@travetto/manifest';
+import { RuntimeIndex } from '@travetto/manifest';
 import { ObjectUtil, AppError, ClassInstance, Class } from '@travetto/base';
 
 import { ThrowableError, TestConfig, Assertion } from '../model/test';
@@ -30,7 +30,7 @@ export class AssertCheck {
    * @param args The arguments passed in
    */
   static check(assertion: CaptureAssert, positive: boolean, ...args: unknown[]): void {
-    assertion.file = RootIndex.getSourceFile(assertion.file);
+    assertion.file = RuntimeIndex.getSourceFile(assertion.file);
 
     let fn = assertion.operator;
     assertion.operator = ASSERT_FN_OPERATOR[fn];
@@ -115,7 +115,7 @@ export class AssertCheck {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         case 'greaterThanEqual': assertFn((actual as number) >= (expected as number), message); break;
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        case 'ok': assertFn.apply(null, args as [unknown, string]); break; // eslint-disable-line prefer-spread
+        case 'ok': assertFn(...args as [unknown, string]); break; // eslint-disable-line prefer-spread
         default:
           // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
           if (fn && assert[fn as keyof typeof assert]) { // Assert call
@@ -161,11 +161,19 @@ export class AssertCheck {
 
       // If a string, check if error exists, and then see if the string is included in the message
       if (typeof shouldThrow === 'string' && (!err || !(err instanceof Error ? err.message : err).includes(shouldThrow))) {
-        return new assert.AssertionError({ message: `Expected error containing text '${shouldThrow}', but got ${actual}` });
+        return new assert.AssertionError({
+          message: `Expected error containing text '${shouldThrow}', but got ${actual}`,
+          actual,
+          expected: shouldThrow
+        });
       }
       // If a regexp, check if error exists, and then test the error message against the regex
       if (shouldThrow instanceof RegExp && (!err || !shouldThrow.test(typeof err === 'string' ? err : err.message))) {
-        return new assert.AssertionError({ message: `Expected error with message matching '${shouldThrow.source}', but got ${actual} ` });
+        return new assert.AssertionError({
+          message: `Expected error with message matching '${shouldThrow.source}', but got ${actual}`,
+          actual,
+          expected: shouldThrow.source
+        });
       }
       // If passing in a constructor
     } else if (shouldThrow === Error ||
@@ -173,7 +181,11 @@ export class AssertCheck {
       Object.getPrototypeOf(shouldThrow) !== Object.getPrototypeOf(Function)
     ) { // if not simple function, treat as class
       if (!err || !(err instanceof shouldThrow)) {
-        return new assert.AssertionError({ message: `Expected to throw ${shouldThrow.name}, but got ${err ?? 'nothing'} ` });
+        return new assert.AssertionError({
+          message: `Expected to throw ${shouldThrow.name}, but got ${err ?? 'nothing'}`,
+          actual: (err ?? 'nothing'),
+          expected: shouldThrow.name
+        });
       }
     } else {
       // Else treat as a simple function to build an error or not
@@ -227,7 +239,7 @@ export class AssertCheck {
   ): void {
     let missed: Error | undefined;
 
-    assertion.file = RootIndex.getSourceFile(assertion.file);
+    assertion.file = RuntimeIndex.getSourceFile(assertion.file);
 
     try {
       action();
@@ -261,7 +273,7 @@ export class AssertCheck {
   ): Promise<void> {
     let missed: Error | undefined;
 
-    assertion.file = RootIndex.getSourceFile(assertion.file);
+    assertion.file = RuntimeIndex.getSourceFile(assertion.file);
 
     try {
       if ('then' in action) {

package/src/assert/util.ts

@@ -1,6 +1,6 @@
-import util from 'util';
+import util from 'node:util';
 
-import { path, RootIndex } from '@travetto/manifest';
+import { path, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 import { Class, ClassInstance, ObjectUtil } from '@travetto/base';
 
 import { TestConfig, Assertion, TestResult } from '../model/test';
@@ -41,7 +41,7 @@ export class AssertUtil {
    * Determine file location for a given error and the stack trace
    */
   static getPositionOfError(err: Error, filename: string): { file: string, line: number } {
-    const cwd = RootIndex.mainModule.sourcePath;
+    const cwd = RuntimeIndex.mainModule.sourcePath;
     const lines = path.toPosix(err.stack ?? new Error().stack!)
       .split('\n')
       // Exclude node_modules, target self
@@ -94,7 +94,7 @@ export class AssertUtil {
 
     const msg = error.message.split(/\n/)[0];
 
-    const core = { file, classId: suite.classId, methodName, module: RootIndex.manifest.mainModule };
+    const core = { file, classId: suite.classId, methodName, module: RuntimeContext.main.name };
     const coreAll = { ...core, description: msg, lines: { start: line, end: line, codeStart: line } };
 
     const assert: Assertion = {

package/src/consumer/enhancer.ts

@@ -1,18 +1,18 @@
-import { GlobalTerminal } from '@travetto/terminal';
+import { StyleUtil } from '@travetto/terminal';
 
-export const CONSOLE_ENHANCER = GlobalTerminal.palette({
-  assertDescription: 'lightGray',
-  testDescription: 'white',
-  success: 'green',
-  failure: 'red',
-  assertNumber: 'brightCyan',
-  testNumber: 'dodgerBlue',
-  assertFile: 'lightGreen',
-  assertLine: 'lightYellow',
-  objectInspect: 'magenta',
-  suiteName: 'yellow',
-  testName: 'cyan',
-  total: 'white'
+export const CONSOLE_ENHANCER = StyleUtil.getPalette({
+  assertDescription: '#d3d3d3', // light gray
+  testDescription: '#e5e5e5', // White
+  success: '#00cd00', // Green
+  failure: '#cd0000', // Red
+  assertNumber: '#00ffff', // Bright cyan
+  testNumber: '#1e90ff', // dodger blue
+  assertFile: '#90e90', // lightGreen
+  assertLine: '#ffffe0', // light yellow
+  objectInspect: '#cd00cd', // Magenta
+  suiteName: '#cdcd00', // Yellow
+  testName: '#00cdcd',  // Cyan
+  total: '#e5e5e5', // White
 });
 
 export type TestResultsEnhancer = typeof CONSOLE_ENHANCER;

package/src/consumer/error.ts

@@ -28,8 +28,8 @@ export class ErrorUtil {
       if (ObjectUtil.hasToJSON(e)) {
         Object.assign(error, e.toJSON());
       }
-      error.message ??= e.message;
-      error.stack ??= e.stack;
+      error.message ||= e.message;
+      error.stack ??= e.stack?.replace(/.*\[ERR_ASSERTION\]:\s*/, '');
     }
 
     return error;

package/src/consumer/types/cumulative.ts

@@ -1,4 +1,4 @@
-import { existsSync } from 'fs';
+import { existsSync } from 'node:fs';
 
 import { Class } from '@travetto/base';
 

package/src/consumer/types/event.ts

@@ -1,4 +1,4 @@
-import { Writable } from 'stream';
+import { Writable } from 'node:stream';
 
 import { TestEvent } from '../../model/event';
 import { TestConsumer } from '../types';

package/src/consumer/types/json.ts

@@ -1,4 +1,4 @@
-import { Writable } from 'stream';
+import { Writable } from 'node:stream';
 
 import { TestEvent } from '../../model/event';
 import { SuitesSummary, TestConsumer } from '../types';

package/src/consumer/types/tap-streamed.ts

@@ -1,5 +1,6 @@
-import { GlobalTerminal, TermStyleInput, Terminal } from '@travetto/terminal';
-import { ManualAsyncIterator } from '@travetto/worker';
+import { Util } from '@travetto/base';
+import { StyleUtil, Terminal, TerminalUtil } from '@travetto/terminal';
+import { WorkQueue } from '@travetto/worker';
 
 import { TestEvent } from '../../model/event';
 import { TestResult } from '../../model/test';
@@ -15,35 +16,12 @@ import { TapEmitter } from './tap';
 @Consumable('tap-streamed')
 export class TapStreamedEmitter implements TestConsumer {
 
-  static makeProgressBar(term: Terminal, total: number): (t: TestResult, idx: number) => string {
-    let failed = 0;
-    const palette: TermStyleInput[] = [
-      { text: 'white', background: 'darkGreen' },
-      { text: 'white', background: 'darkRed' }
-    ];
-    const styles = palette.map(s => GlobalTerminal.colorer(s));
-
-    return (t: TestResult, idx: number): string => {
-      if (t.status === 'failed') {
-        failed += 1;
-      }
-      const i = idx + 1;
-      const digits = total.toString().length;
-      const paddedI = `${i}`.padStart(digits);
-      const paddedFailed = `${failed}`.padStart(digits);
-      const line = `Tests ${paddedI}/${total} [${paddedFailed} failed] -- ${t.classId}`.padEnd(term.width);
-      const pos = Math.trunc(line.length * (i / total));
-      const colorer = styles[Math.min(failed, styles.length - 1)];
-      return `${colorer(line.substring(0, pos))}${line.substring(pos)}`;
-    };
-  }
-
   #terminal: Terminal;
-  #results = new ManualAsyncIterator<TestResult>();
+  #results = new WorkQueue<TestResult>();
   #progress: Promise<unknown> | undefined;
   #consumer: TapEmitter;
 
-  constructor(terminal: Terminal = new Terminal({ output: process.stderr })) {
+  constructor(terminal: Terminal = new Terminal(process.stderr)) {
     this.#terminal = terminal;
     this.#consumer = new TapEmitter(this.#terminal);
   }
@@ -51,9 +29,19 @@ export class TapStreamedEmitter implements TestConsumer {
   async onStart(state: TestRunState): Promise<void> {
     this.#consumer.onStart();
 
-    this.#progress = this.#terminal.streamToPosition(this.#results,
-      TapStreamedEmitter.makeProgressBar(this.#terminal, state.testCount ?? 0),
-      { position: 'bottom', minDelay: 100 }
+    let failed = 0;
+    const succ = StyleUtil.getStyle({ text: '#e5e5e5', background: '#026020' }); // White on dark green
+    const fail = StyleUtil.getStyle({ text: '#e5e5e5', background: '#8b0000' }); // White on dark red
+    this.#progress = this.#terminal.streamToBottom(
+      Util.mapAsyncItr(
+        this.#results,
+        (value, idx) => {
+          failed += (value.status === 'failed' ? 1 : 0);
+          return { value: `Tests %idx/%total [${failed} failed] -- ${value.classId}`, total: state.testCount, idx };
+        },
+        TerminalUtil.progressBarUpdater(this.#terminal, { style: () => ({ complete: failed ? fail : succ }) })
+      ),
+      { minDelay: 100 }
     );
   }
 

package/src/consumer/types/tap.ts

@@ -1,5 +1,5 @@
-import { RootIndex } from '@travetto/manifest';
-import { GlobalTerminal, Terminal } from '@travetto/terminal';
+import { RuntimeIndex } from '@travetto/manifest';
+import { Terminal } from '@travetto/terminal';
 import { ObjectUtil, TimeUtil } from '@travetto/base';
 import { YamlUtil } from '@travetto/yaml';
 
@@ -20,7 +20,7 @@ export class TapEmitter implements TestConsumer {
   #start: number;
 
   constructor(
-    terminal = new Terminal({ output: process.stdout }),
+    terminal = new Terminal(),
     enhancer: TestResultsEnhancer = CONSOLE_ENHANCER
   ) {
     this.#terminal = terminal;
@@ -28,7 +28,7 @@ export class TapEmitter implements TestConsumer {
   }
 
   log(message: string): void {
-    this.#terminal.writeLines(message);
+    this.#terminal.writer.writeLine(message).commit();
   }
 
   /**
@@ -43,7 +43,7 @@ export class TapEmitter implements TestConsumer {
    * Output supplemental data (e.g. logs)
    */
   logMeta(obj: Record<string, unknown>): void {
-    const lineLength = GlobalTerminal.width - 5;
+    const lineLength = this.#terminal.width - 5;
     let body = YamlUtil.serialize(obj, { wordwrap: lineLength });
     body = body.split('\n').map(x => `  ${x}`).join('\n');
     this.log(`---\n${this.#enhancer.objectInspect(body)}\n...`);
@@ -71,7 +71,7 @@ export class TapEmitter implements TestConsumer {
             this.#enhancer.assertNumber(++subCount),
             '-',
             this.#enhancer.assertDescription(text),
-            `${this.#enhancer.assertFile(asrt.file.replace(RootIndex.mainModule.sourcePath, '.'))}:${this.#enhancer.assertLine(asrt.line)}`
+            `${this.#enhancer.assertFile(asrt.file.replace(RuntimeIndex.mainModule.sourcePath, '.'))}:${this.#enhancer.assertLine(asrt.line)}`
           ].join(' ');
 
           if (asrt.error) {

package/src/consumer/types/xunit.ts

@@ -1,4 +1,4 @@
-import { Writable } from 'stream';
+import { Writable } from 'node:stream';
 
 import { YamlUtil } from '@travetto/yaml';
 

package/src/decorator/suite.ts

@@ -1,4 +1,4 @@
-import { RootIndex } from '@travetto/manifest';
+import { RuntimeIndex } from '@travetto/manifest';
 import { Class, ClassInstance } from '@travetto/base';
 
 import { SuiteRegistry } from '../registry/suite';
@@ -27,7 +27,7 @@ export function Suite(description?: string | Partial<SuiteConfig>, ...rest: Part
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
   const decorator = ((target: Class) => {
     const cfg = { description: descriptionString, ...extra };
-    if (RootIndex.getFunctionMetadata(target)?.abstract) {
+    if (RuntimeIndex.getFunctionMetadata(target)?.abstract) {
       cfg.skip = true;
     }
     SuiteRegistry.register(target, cfg);

package/src/decorator/test.ts

@@ -1,5 +1,5 @@
 import { ClassInstance } from '@travetto/base';
-import { RootIndex } from '@travetto/manifest';
+import { RuntimeIndex } from '@travetto/manifest';
 
 import { SuiteRegistry } from '../registry/suite';
 import { TestConfig } from '../model/test';
@@ -32,7 +32,7 @@ export function Test(description?: string | Partial<TestConfig>, ...rest: Partia
   return (inst: ClassInstance, prop: string | symbol, descriptor: PropertyDescriptor) => {
     SuiteRegistry.registerField(inst.constructor, descriptor.value, {
       ...extra,
-      file: RootIndex.getFunctionMetadata(inst.constructor)!.source,
+      file: RuntimeIndex.getFunctionMetadata(inst.constructor)!.source,
       description: descriptionString
     });
     return descriptor;

package/src/execute/console.ts

@@ -1,4 +1,4 @@
-import util from 'util';
+import util from 'node:util';
 
 import { ConsoleEvent, ConsoleManager } from '@travetto/base';
 

package/src/execute/executor.ts

@@ -1,7 +1,8 @@
-import timers from 'timers/promises';
+import timers from 'node:timers/promises';
+import { AssertionError } from 'node:assert';
 
-import { path, RootIndex } from '@travetto/manifest';
-import { TimeUtil, Util } from '@travetto/base';
+import { path, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
+import { Env, Util } from '@travetto/base';
 import { Barrier, ExecutionError } from '@travetto/worker';
 
 import { SuiteRegistry } from '../registry/suite';
@@ -15,7 +16,7 @@ import { TestPhaseManager } from './phase';
 import { PromiseCapture } from './promise';
 import { AssertUtil } from '../assert/util';
 
-const TEST_TIMEOUT = TimeUtil.getEnvTime('TRV_TEST_TIMEOUT', '5s');
+const TEST_TIMEOUT = Env.TRV_TEST_TIMEOUT.time ?? 5000;
 
 /**
  * Support execution of the tests
@@ -68,10 +69,10 @@ export class TestExecutor {
    */
   static failFile(consumer: TestConsumer, file: string, err: Error): void {
     const name = path.basename(file);
-    const classId = RootIndex.getId(file, name);
+    const classId = RuntimeIndex.getId(file, name);
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const suite = { class: { name }, classId, duration: 0, lines: { start: 1, end: 1 }, file, } as SuiteConfig & SuiteResult;
-    err.message = err.message.replaceAll(RootIndex.mainModule.sourcePath, '.');
+    err.message = err.message.replaceAll(RuntimeIndex.mainModule.sourcePath, '.');
     const res = AssertUtil.generateSuiteError(suite, 'require', err);
     consumer.onEvent({ type: 'suite', phase: 'before', suite });
     consumer.onEvent({ type: 'test', phase: 'before', test: res.testConfig });
@@ -109,7 +110,7 @@ export class TestExecutor {
 
     const result: TestResult = {
       methodName: test.methodName,
-      module: RootIndex.manifest.mainModule,
+      module: RuntimeContext.main.name,
       description: test.description,
       classId: test.classId,
       lines: { ...test.lines },
@@ -139,11 +140,17 @@ export class TestExecutor {
     // Run method and get result
     let error = await this.#executeTestMethod(test);
 
-    if (error) {
-      if (error instanceof ExecutionError) { // Errors that are not expected
+    if (!error) {
+      error = AssertCheck.checkError(test.shouldThrow, error); // Rewrite error
+    } else {
+      if (error instanceof AssertionError) {
+        // Pass, do nothing
+      } else if (error instanceof ExecutionError) { // Errors that are not expected
+        AssertCheck.checkUnhandled(test, error);
+      } else if (test.shouldThrow) {
+        error = AssertCheck.checkError(test.shouldThrow, error); // Rewrite error
+      } else if (error instanceof Error) {
         AssertCheck.checkUnhandled(test, error);
-      } else if (test.shouldThrow) { // Errors that are
-        error = AssertCheck.checkError(test.shouldThrow!, error); // Rewrite error
       }
     }
 
@@ -254,7 +261,7 @@ export class TestExecutor {
 
     file = path.resolve(file);
 
-    const entry = RootIndex.getEntry(file)!;
+    const entry = RuntimeIndex.getEntry(file)!;
 
     try {
       await import(entry.import);

package/src/execute/phase.ts

@@ -1,5 +1,5 @@
 import { Barrier } from '@travetto/worker';
-import { TimeUtil } from '@travetto/base';
+import { Env } from '@travetto/base';
 
 import { TestConsumer } from '../consumer/types';
 import { SuiteConfig, SuiteResult } from '../model/suite';
@@ -8,7 +8,7 @@ import { TestResult } from '../model/test';
 
 class TestBreakout extends Error { }
 
-const TEST_PHASE_TIMEOUT = TimeUtil.getEnvTime('TRV_TEST_PHASE_TIMEOUT', '15s');
+const TEST_PHASE_TIMEOUT = Env.TRV_TEST_PHASE_TIMEOUT.time ?? 15000;
 
 /**
  * Test Phase Execution Manager.

package/src/execute/runner.ts

@@ -1,6 +1,6 @@
 import { path } from '@travetto/manifest';
 import { TimeUtil } from '@travetto/base';
-import { WorkPool, IterableWorkSet } from '@travetto/worker';
+import { WorkPool } from '@travetto/worker';
 
 import { buildStandardTestManager } from '../worker/standard';
 import { RunnableTestConsumer } from '../consumer/types/runnable';
@@ -34,17 +34,17 @@ export class Runner {
 
     console.debug('Running', { files, patterns: this.patterns });
 
-    const manager = buildStandardTestManager;
-
-    const pool = new WorkPool(manager(consumer), {
-      idleTimeoutMillis: TimeUtil.timeToMs('10s'),
-      min: 1,
-      max: this.#state.concurrency
-    });
-
     const testCount = await RunnerUtil.getTestCount(this.#state.args);
     await consumer.onStart({ testCount });
-    await pool.process(new IterableWorkSet(files));
+    await WorkPool.run(
+      () => buildStandardTestManager(consumer),
+      files,
+      {
+        idleTimeoutMillis: TimeUtil.timeToMs('10s'),
+        min: 1,
+        max: this.#state.concurrency,
+      });
+
     return consumer.summarizeAsBoolean();
   }
 

package/src/execute/util.ts

@@ -1,8 +1,10 @@
-import { createReadStream } from 'fs';
-import readline from 'readline';
+import { spawn } from 'node:child_process';
+import { createReadStream } from 'node:fs';
+import readline from 'node:readline';
+import timers from 'node:timers/promises';
 
-import { ExecUtil, ShutdownManager, TimeUtil } from '@travetto/base';
-import { IndexedFile, RootIndex } from '@travetto/manifest';
+import { Env, ExecUtil, ShutdownManager } from '@travetto/base';
+import { IndexedFile, RuntimeIndex } from '@travetto/manifest';
 
 /**
  * Simple Test Utilities
@@ -12,7 +14,7 @@ export class RunnerUtil {
    * Add 50 ms to the shutdown to allow for buffers to output properly
    */
   static registerCleanup(scope: string): void {
-    ShutdownManager.onShutdown(`test.${scope}.bufferOutput`, () => TimeUtil.wait(50));
+    ShutdownManager.onGracefulShutdown(() => timers.setTimeout(50), `test.${scope}.bufferOutput`);
   }
 
   /**
@@ -37,12 +39,12 @@ export class RunnerUtil {
    * Find all valid test files given the globs
    */
   static async getTestFiles(globs?: RegExp[]): Promise<IndexedFile[]> {
-    const files = RootIndex.find({
+    const files = RuntimeIndex.find({
       module: m => m.roles.includes('test') || m.roles.includes('std'),
       folder: f => f === 'test',
       file: f => f.role === 'test'
     })
-      .filter(f => globs?.some(g => g.test(f.import)) ?? true);
+      .filter(f => globs?.some(g => g.test(f.sourceFile)) ?? true);
 
     const validFiles = files
       .map(f => this.isTestFile(f.sourceFile).then(valid => ({ file: f, valid })));
@@ -58,8 +60,12 @@ export class RunnerUtil {
    * @returns
    */
   static async getTestCount(patterns: string[]): Promise<number> {
-    const proc = ExecUtil.spawn('npx', ['trv', 'test:count', ...patterns], { stdio: 'pipe', catchAsResult: true, env: { FORCE_COLOR: '0', NO_COLOR: '1' } });
-    const countRes = await proc.result;
+    const countRes = await ExecUtil.getResult(
+      spawn('npx', ['trv', 'test:count', ...patterns], {
+        env: { ...process.env, ...Env.FORCE_COLOR.export(0), ...Env.NO_COLOR.export(true) }
+      }),
+      { catch: true }
+    );
     if (!countRes.valid) {
       throw new Error(countRes.stderr);
     }
@@ -70,6 +76,6 @@ export class RunnerUtil {
    * Determine if we should invoke the debugger
    */
   static get tryDebugger(): boolean {
-    return process.env.TRV_TEST_BREAK_ENTRY === '1';
+    return Env.TRV_TEST_BREAK_ENTRY.isTrue;
   }
 }

package/src/execute/watcher.ts

@@ -1,6 +1,6 @@
 import { RootRegistry, MethodSource } from '@travetto/registry';
-import { WorkPool, IterableWorkSet, ManualAsyncIterator } from '@travetto/worker';
-import { RootIndex } from '@travetto/manifest';
+import { WorkPool, WorkQueue } from '@travetto/worker';
+import { RuntimeIndex } from '@travetto/manifest';
 import { ObjectUtil } from '@travetto/base';
 
 import { SuiteRegistry } from '../registry/suite';
@@ -9,11 +9,18 @@ import { TestConsumerRegistry } from '../consumer/registry';
 import { CumulativeSummaryConsumer } from '../consumer/types/cumulative';
 import { RunEvent } from '../worker/types';
 import { RunnerUtil } from './util';
+import { TestEvent } from '../model/event';
 
 function isRunEvent(ev: unknown): ev is RunEvent {
   return ObjectUtil.isPlainObject(ev) && 'type' in ev && typeof ev.type === 'string' && ev.type === 'run-test';
 }
 
+export type TestWatchEvent =
+  TestEvent |
+  { type: 'removeTest', method: string, file: string, classId: string } |
+  { type: 'ready' } |
+  { type: 'log', message: string };
+
 /**
  * Test Watcher.
  *
@@ -27,22 +34,16 @@ export class TestWatcher {
   static async watch(format: string, runAllOnStart = true): Promise<void> {
     console.debug('Listening for changes');
 
-    const itr = new ManualAsyncIterator<string>();
-    const src = new IterableWorkSet(itr);
+    const itr = new WorkQueue<string>();
 
     await SuiteRegistry.init();
     SuiteRegistry.listen(RootRegistry);
 
     const consumer = new CumulativeSummaryConsumer(await TestConsumerRegistry.getInstance(format));
-    const pool = new WorkPool(buildStandardTestManager(consumer), {
-      idleTimeoutMillis: 120000,
-      min: 2,
-      max: WorkPool.DEFAULT_SIZE
-    });
 
     new MethodSource(RootRegistry).on(e => {
       const [cls, method] = (e.prev ?? e.curr ?? []);
-      if (!cls || RootIndex.getFunctionMetadata(cls)?.abstract) {
+      if (!cls || RuntimeIndex.getFunctionMetadata(cls)?.abstract) {
         return;
       }
       if (!method) {
@@ -60,7 +61,7 @@ export class TestWatcher {
           type: 'removeTest',
           method: method?.name,
           classId: cls?.Ⲑid,
-          file: RootIndex.getFunctionMetadata(cls)?.source
+          file: RuntimeIndex.getFunctionMetadata(cls)?.source
         });
       }
     });
@@ -72,11 +73,12 @@ export class TestWatcher {
 
     process.on('message', ev => {
       if (isRunEvent(ev)) {
+        console.debug('Manually triggered', ev);
         itr.add([ev.file, ev.class, ev.method].filter(x => !!x).join('#'), true);
       }
     });
 
-    process.send?.('ready');
+    process.send?.({ type: 'ready' });
 
     if (runAllOnStart) {
       for (const test of await RunnerUtil.getTestFiles()) {
@@ -85,6 +87,14 @@ export class TestWatcher {
       }
     }
 
-    await pool.process(src);
+    await WorkPool.run(
+      () => buildStandardTestManager(consumer),
+      itr,
+      {
+        idleTimeoutMillis: 120000,
+        min: 2,
+        max: WorkPool.DEFAULT_SIZE
+      }
+    );
   }
 }

package/src/registry/suite.ts

@@ -1,5 +1,5 @@
 import { Class, ConcreteClass } from '@travetto/base';
-import { RootIndex } from '@travetto/manifest';
+import { RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 import { MetadataRegistry } from '@travetto/registry';
 
 import { SuiteConfig } from '../model/suite';
@@ -14,15 +14,15 @@ class $SuiteRegistry extends MetadataRegistry<SuiteConfig, TestConfig> {
    * Find all valid tests (ignoring abstract)
    */
   getValidClasses(): Class[] {
-    return this.getClasses().filter(c => !RootIndex.getFunctionMetadata(c)?.abstract);
+    return this.getClasses().filter(c => !RuntimeIndex.getFunctionMetadata(c)?.abstract);
   }
 
   createPending(cls: Class): Partial<SuiteConfig> {
     return {
       class: cls,
-      module: RootIndex.manifest.mainModule,
+      module: RuntimeContext.main.name,
       classId: cls.Ⲑid,
-      file: RootIndex.getFunctionMetadata(cls)!.source,
+      file: RuntimeIndex.getFunctionMetadata(cls)!.source,
       tests: [],
       beforeAll: [],
       beforeEach: [],
@@ -34,8 +34,8 @@ class $SuiteRegistry extends MetadataRegistry<SuiteConfig, TestConfig> {
   override createPendingField(cls: Class, fn: Function): Partial<TestConfig> {
     return {
       class: cls,
-      module: RootIndex.manifest.mainModule,
-      file: RootIndex.getFunctionMetadata(cls)!.source,
+      module: RuntimeContext.main.name,
+      file: RuntimeIndex.getFunctionMetadata(cls)!.source,
       methodName: fn.name
     };
   }
@@ -91,7 +91,7 @@ class $SuiteRegistry extends MetadataRegistry<SuiteConfig, TestConfig> {
   getRunParams(file: string, clsName?: string, method?: string): { suites: SuiteConfig[] } | { suite: SuiteConfig, test?: TestConfig } {
     if (clsName && /^\d+$/.test(clsName)) { // If we only have a line number
       const line = parseInt(clsName, 10);
-      const suites = this.getValidClasses().filter(cls => RootIndex.getFunctionMetadata(cls)!.source === file).map(x => this.get(x)).filter(x => !x.skip);
+      const suites = this.getValidClasses().filter(cls => RuntimeIndex.getFunctionMetadata(cls)!.source === file).map(x => this.get(x)).filter(x => !x.skip);
       const suite = suites.find(x => x.lines && (line >= x.lines.start && line <= x.lines.end));
 
       if (suite) {
@@ -113,7 +113,7 @@ class $SuiteRegistry extends MetadataRegistry<SuiteConfig, TestConfig> {
       } else {
         const suites = this.getValidClasses()
           .map(x => this.get(x))
-          .filter(x => !RootIndex.getFunctionMetadata(x.class)?.abstract);  // Do not run abstract suites
+          .filter(x => !RuntimeIndex.getFunctionMetadata(x.class)?.abstract);  // Do not run abstract suites
         return { suites };
       }
     }

package/src/trv.d.ts

@@ -0,0 +1,24 @@
+import { TimeSpan } from '@travetto/base';
+
+declare global {
+  interface TravettoEnv {
+    /**
+     * The default time to wait for each phase to finish.
+     * @default 15s
+     */
+    TRV_TEST_PHASE_TIMEOUT: TimeSpan | number;
+    /**
+     * The default time for a single test to finish.
+     * @default 5s
+     */
+    TRV_TEST_TIMEOUT: TimeSpan | number;
+    /**
+     * An additional wait for triggering test runs, useful for code that takes time to warm up
+     */
+    TRV_TEST_DELAY: TimeSpan | number;
+    /**
+     * Should the test break on the first line of debugging
+     */
+    TRV_TEST_BREAK_ENTRY: boolean;
+  }
+}

package/src/worker/child.ts

@@ -1,7 +1,8 @@
-import { createWriteStream } from 'fs';
+import { createWriteStream } from 'node:fs';
+import timers from 'node:timers/promises';
 
-import { ManifestFileUtil, RootIndex } from '@travetto/manifest';
-import { ConsoleManager, TimeUtil } from '@travetto/base';
+import { RuntimeContext } from '@travetto/manifest';
+import { ConsoleManager, Env, TimeUtil } from '@travetto/base';
 import { ChildCommChannel } from '@travetto/worker';
 
 import { ErrorUtil } from '../consumer/error';
@@ -32,8 +33,9 @@ export class TestChildWorker extends ChildCommChannel<RunEvent> {
    * Start the worker
    */
   async activate(): Promise<void> {
-    if (/\b@travetto[/]test\b/.test(process.env.DEBUG ?? '')) {
-      const stdout = createWriteStream(ManifestFileUtil.toolPath(RootIndex, `test-worker.${process.pid}.log`), { flags: 'a' });
+    if (/\b@travetto[/]test\b/.test(Env.DEBUG.val ?? '')) {
+      const file = RuntimeContext.toolPath(`test-worker.${process.pid}.log`);
+      const stdout = createWriteStream(file, { flags: 'a' });
       const c = new console.Console({ stdout, inspectOptions: { depth: 4, colors: false } });
       ConsoleManager.set({ onLog: (ev) => c[ev.level](process.pid, ...ev.args) });
     } else {
@@ -48,7 +50,7 @@ export class TestChildWorker extends ChildCommChannel<RunEvent> {
     // Let parent know the child is ready for handling commands
     this.send(Events.READY);
 
-    await TimeUtil.wait('10m');
+    await timers.setTimeout(TimeUtil.timeToMs('10m'));
   }
 
   /**

package/src/worker/standard.ts

@@ -1,5 +1,7 @@
-import { RootIndex } from '@travetto/manifest';
-import { ExecUtil } from '@travetto/base';
+import { fork } from 'node:child_process';
+
+import { RuntimeIndex } from '@travetto/manifest';
+import { Env } from '@travetto/base';
 import { ParentCommChannel, Worker } from '@travetto/worker';
 
 import { Events, RunEvent } from './types';
@@ -21,11 +23,11 @@ function buildEvent(ev: string): RunEvent {
 /**
  *  Produce a handler for the child worker
  */
-export function buildStandardTestManager(consumer: TestConsumer): () => Worker<string> {
+export function buildStandardTestManager(consumer: TestConsumer): Worker<string> {
   /**
    * Spawn a child
    */
-  return () => ({
+  return {
     id: i += 1,
     active: true,
     async destroy(): Promise<void> { },
@@ -35,16 +37,19 @@ export function buildStandardTestManager(consumer: TestConsumer): () => Worker<s
 
       const event = buildEvent(file);
 
-      const { module } = RootIndex.getEntry(event.file!)!;
-      const cwd = RootIndex.getModule(module)!.sourcePath;
+      const { module } = RuntimeIndex.getEntry(event.file!)!;
+      const cwd = RuntimeIndex.getModule(module)!.sourcePath;
 
       const channel = new ParentCommChannel<TestEvent & { error?: Error }>(
-        ExecUtil.fork(
-          RootIndex.resolveFileImport('@travetto/cli/support/entry.trv'),
-          ['test:child'],
+        fork(
+          RuntimeIndex.resolveFileImport('@travetto/cli/support/entry.trv'), ['test:child'],
           {
             cwd,
-            env: { TRV_MANIFEST: RootIndex.getModule(module)!.outputPath, TRV_QUIET: '1' },
+            env: {
+              ...process.env,
+              ...Env.TRV_MANIFEST.export(RuntimeIndex.getModule(module)!.outputPath),
+              ...Env.TRV_QUIET.export(true)
+            },
             stdio: ['ignore', 'ignore', 2, 'ipc']
           }
         )
@@ -80,5 +85,5 @@ export function buildStandardTestManager(consumer: TestConsumer): () => Worker<s
         throw ErrorUtil.deserializeError(error);
       }
     },
-  });
+  };
 }

package/support/bin/run.ts

@@ -1,15 +1,8 @@
-import { ShutdownManager, TimeUtil } from '@travetto/base';
+import timers from 'node:timers/promises';
 
-import type { RunState } from '../../src/execute/types';
+import { Env } from '@travetto/base';
 
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace NodeJS {
-    interface ProcessEnv {
-      TRV_TEST_DELAY?: '2s';
-    }
-  }
-}
+import type { RunState } from '../../src/execute/types';
 
 /**
  * Run tests given the input state
@@ -21,15 +14,13 @@ export async function runTests(opts: RunState): Promise<void> {
 
   RunnerUtil.registerCleanup('runner');
 
-  if (process.env.TRV_TEST_DELAY) {
-    await TimeUtil.wait(process.env.TRV_TEST_DELAY);
-  }
+  await timers.setTimeout(Env.TRV_TEST_DELAY.time ?? 0);
 
   try {
     const res = await new Runner(opts).run();
-    return ShutdownManager.exit(res ? 0 : 1);
+    process.exitCode = res ? 0 : 1;
   } catch (err) {
     console.error('Test Worker Failed', { error: err });
-    return ShutdownManager.exit(1);
+    process.exitCode = 1;
   }
 }

package/support/bin/types.ts

@@ -1,2 +1,2 @@
-export type TestFormat = 'tap' | 'tap-streamed' | 'xunit' | 'event' | 'exec';
+export type TestFormat = 'tap' | 'tap-streamed' | 'xunit' | 'event' | 'exec' | 'json';
 export type TestMode = 'single' | 'standard';

package/support/cli.test.ts

@@ -1,8 +1,8 @@
-import { EventEmitter } from 'events';
-import fs from 'fs/promises';
+import { EventEmitter } from 'node:events';
+import fs from 'node:fs/promises';
 
 import { path } from '@travetto/manifest';
-import { defineEnv } from '@travetto/base';
+import { Env } from '@travetto/base';
 import { CliCommandShape, CliCommand, CliValidationError } from '@travetto/cli';
 import { WorkPool } from '@travetto/worker';
 import { Max, Min } from '@travetto/schema';
@@ -24,7 +24,11 @@ export class TestCommand implements CliCommandShape {
 
   preMain(): void {
     EventEmitter.defaultMaxListeners = 1000;
-    defineEnv({ envName: 'test' });
+    Env.TRV_ROLE.set('test');
+    Env.TRV_ENV.set('test');
+    Env.DEBUG.set(false);
+    Env.TRV_LOG_PLAIN.set(true);
+    Env.TRV_LOG_TIME.clear();
   }
 
   isFirstFile(first: string): Promise<boolean> {
@@ -41,8 +45,6 @@ export class TestCommand implements CliCommandShape {
 
     if (mode === 'single' && !await this.isFirstFile(first)) {
       return { message: 'You must specify a proper test file to run in single mode', source: 'arg' };
-    } else if (!/test\//.test(first)) {
-      return { message: 'Only files in the test/ folder are permitted to be run', source: 'arg' };
     }
   }
 

package/support/cli.test_child.ts

@@ -1,6 +1,6 @@
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 
-import { defineEnv, ShutdownManager } from '@travetto/base';
+import { Env } from '@travetto/base';
 import { CliCommand } from '@travetto/cli';
 
 /** Test child worker target */
@@ -8,15 +8,16 @@ import { CliCommand } from '@travetto/cli';
 export class TestChildWorkerCommand {
   preMain(): void {
     EventEmitter.defaultMaxListeners = 1000;
-    process.env.FORCE_COLOR = '0';
-    defineEnv({ envName: 'test' });
+    Env.TRV_ROLE.set('test');
+    Env.TRV_ENV.set('test');
+    Env.DEBUG.set(false);
+    Env.FORCE_COLOR.set(false);
+    Env.TRV_LOG_PLAIN.set(true);
+    Env.TRV_LOG_TIME.clear();
   }
 
   async main(): Promise<void> {
-    if (process.send) {
-      // Shutdown when ipc bridge is closed
-      process.on('disconnect', () => ShutdownManager.execute());
-    }
+    process.once('disconnect', () => process.exit());
     const { TestChildWorker } = await import('../src/worker/child.js');
     return new TestChildWorker().activate();
   }

package/support/cli.test_count.ts

@@ -1,6 +1,6 @@
 import { CliCommand } from '@travetto/cli';
-import { RootIndex } from '@travetto/manifest';
-import { defineEnv } from '@travetto/base';
+import { RuntimeIndex } from '@travetto/manifest';
+import { Env } from '@travetto/base';
 
 import { SuiteRegistry } from '../src/registry/suite';
 import { RunnerUtil } from '../src/execute/util';
@@ -9,7 +9,8 @@ import { RunnerUtil } from '../src/execute/util';
 export class TestCountCommand {
 
   preMain(): void {
-    defineEnv({ debug: false, envName: 'test' });
+    Env.TRV_ROLE.set('test');
+    Env.DEBUG.set(false);
   }
 
   async main(patterns: string[]) {
@@ -30,7 +31,7 @@ export class TestCountCommand {
     const suites = SuiteRegistry.getClasses();
     const total = suites
       .map(c => SuiteRegistry.get(c))
-      .filter(c => !RootIndex.getFunctionMetadata(c.class)?.abstract)
+      .filter(c => !RuntimeIndex.getFunctionMetadata(c.class)?.abstract)
       .reduce((acc, c) => acc + (c.tests?.length ?? 0), 0);
 
     console.log(total);

package/support/cli.test_direct.ts

@@ -1,4 +1,4 @@
-import { defineEnv } from '@travetto/base';
+import { Env } from '@travetto/base';
 import { CliCommand } from '@travetto/cli';
 
 import { runTests } from './bin/run';
@@ -11,7 +11,10 @@ export class TestDirectCommand {
   format: TestFormat = 'tap';
 
   preMain(): void {
-    defineEnv({ envName: 'test' });
+    Env.TRV_ROLE.set('test');
+    Env.TRV_ENV.set('test');
+    Env.TRV_LOG_PLAIN.set(true);
+    Env.TRV_LOG_TIME.clear();
   }
 
   main(file: string, args: string[]): Promise<void> {

package/support/cli.test_watch.ts

@@ -1,4 +1,4 @@
-import { defineEnv } from '@travetto/base';
+import { Env } from '@travetto/base';
 import { CliCommand, CliUtil } from '@travetto/cli';
 
 import { TestFormat } from './bin/types';
@@ -13,7 +13,8 @@ export class TestWatcherCommand {
   mode: 'all' | 'change' = 'all';
 
   preMain(): void {
-    defineEnv({ envName: 'test', dynamic: true });
+    Env.TRV_ROLE.set('test');
+    Env.TRV_DYNAMIC.set(true);
   }
 
   async main(): Promise<void> {
@@ -21,10 +22,7 @@ export class TestWatcherCommand {
       return;
     }
 
-    // Quit on parent disconnect
-    if (process.send) {
-      process.on('disconnect', () => process.exit(0));
-    }
+    process.once('disconnect', () => process.exit());
 
     try {
       const { TestWatcher } = await import('../src/execute/watcher.js');