@travetto/test 3.0.0-rc.9 → 3.0.1-rc.1

package/README.md

@@ -6,6 +6,10 @@
 **Install: @travetto/test**
 ```bash
 npm install @travetto/test
+
+# or
+
+yarn add @travetto/test
 ```
 
 This module provides unit testing functionality that integrates with the framework. It is a declarative framework, using decorators to define tests and suites. The test produces results in the following formats:
@@ -80,12 +84,13 @@ const tslib_1 = require("tslib");
 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 Ⲑ_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 test_1 = require("@travetto/test");
 let SimpleTest = class SimpleTest {
-    static Ⲑinit = Ⲑ_root_index_1.RootIndex.registerFunction(SimpleTest, __filename, 1887908328, { test: { hash: 102834457 } }, false, false);
+    static Ⲑinit = Ⲑ_root_index_1.RootIndex.registerFunction(SimpleTest, ᚕf, 1887908328, { test: { hash: 102834457 } }, false, false);
     async test() {
-        Ⲑ_check_1.AssertCheck.check({ file: __filename, line: 10, text: "{ size: 20, address: { state: 'VA' } }", operator: "deepStrictEqual" }, true, { size: 20, address: { state: 'VA' } }, {});
+        Ⲑ_check_1.AssertCheck.check({ file: ᚕf, line: 10, text: "{ size: 20, address: { state: 'VA' } }", operator: "deepStrictEqual" }, true, { size: 20, address: { state: 'VA' } }, {});
     }
 };
 tslib_1.__decorate([
@@ -217,7 +222,7 @@ class SimpleTest {
 
 ## Running Tests
 
-To run the tests you can either call the [Command Line Interface](https://github.com/travetto/travetto/tree/main/module/cli#readme "CLI infrastructure for travetto framework") by invoking
+To run the tests you can either call the [Command Line Interface](https://github.com/travetto/travetto/tree/main/module/cli#readme "CLI infrastructure for Travetto framework") by invoking
 
 **Terminal: Test Help Output**
 ```bash
@@ -230,8 +235,6 @@ Options:
   -c, --concurrency <concurrency>  Number of tests to run concurrently (default: 4)
   -m, --mode <mode>                Test run mode (default: "standard")
   -h, --help                       display help for command
-
-
 ```
 
 The regexes are the patterns of tests you want to run, and all tests must be found under the `test/` folder.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/test",
-  "version": "3.0.0-rc.9",
+  "version": "3.0.1-rc.1",
   "description": "Declarative test framework",
   "keywords": [
     "unit-testing",
@@ -27,15 +27,15 @@
     "directory": "module/test"
   },
   "dependencies": {
-    "@travetto/base": "^3.0.0-rc.7",
-    "@travetto/registry": "^3.0.0-rc.9",
-    "@travetto/terminal": "^3.0.0-rc.4",
-    "@travetto/worker": "^3.0.0-rc.7",
-    "@travetto/yaml": "^3.0.0-rc.7"
+    "@travetto/base": "^3.0.1-rc.1",
+    "@travetto/registry": "^3.0.1-rc.1",
+    "@travetto/terminal": "^3.0.0",
+    "@travetto/worker": "^3.0.1-rc.1",
+    "@travetto/yaml": "^3.0.1-rc.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.0.0-rc.7",
-    "@travetto/transformer": "^3.0.0-rc.9"
+    "@travetto/cli": "^3.0.1-rc.1",
+    "@travetto/transformer": "^3.0.1-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/consumer/types/tap.ts

@@ -142,7 +142,7 @@ export class TapEmitter implements TestConsumer {
       `${this.#enhancer.total(summary.failed)}`,
       'skipped',
       this.#enhancer.total(summary.skipped),
-      `# (Total Test Time: ${TimeUtil.prettyDelta(summary.duration)}, Total Run Time: ${TimeUtil.prettyDelta(Date.now() - this.#start)})`
+      `# (Total Test Time: ${TimeUtil.prettyDelta(summary.duration)}, Total Run Time: ${TimeUtil.prettyDeltaSinceTime(this.#start)})`
     ].join(' '));
   }
 }

package/src/execute/util.ts

@@ -41,7 +41,7 @@ export class RunnerUtil {
       .filter(f => globs.some(g => g.test(f.import)));
 
     const validFiles = files
-      .map(f => this.isTestFile(f.source).then(valid => ({ file: f.source, valid })));
+      .map(f => this.isTestFile(f.sourceFile).then(valid => ({ file: f.sourceFile, valid })));
 
     return (await Promise.all(validFiles))
       .filter(x => x.valid)

package/src/execute/watcher.ts

@@ -1,8 +1,7 @@
 import { RootRegistry, MethodSource } from '@travetto/registry';
 import { WorkPool, IterableWorkSet, ManualAsyncIterator } from '@travetto/worker';
 import { RootIndex } from '@travetto/manifest';
-import { ObjectUtil } from '@travetto/base';
-import { DynamicFileLoader } from '@travetto/base/src/internal/file-loader';
+import { ConsoleManager, defineGlobalEnv, ObjectUtil } from '@travetto/base';
 
 import { SuiteRegistry } from '../registry/suite';
 import { buildStandardTestManager } from '../worker/standard';
@@ -65,9 +64,10 @@ export class TestWatcher {
       }
     });
 
-    await RootRegistry.init();
+    // If a file is changed, but doesn't emit classes, re-run whole file
+    RootRegistry.onNonClassChanges(file => itr.add(file));
 
-    process.send?.({ type: 'watch-init' });
+    await RootRegistry.init();
 
     process.on('message', ev => {
       if (isRunEvent(ev)) {
@@ -75,20 +75,31 @@ export class TestWatcher {
       }
     });
 
-    // Re-run all tests on file change
-    DynamicFileLoader.onLoadEvent(ev => {
-      if (ev.action === 'update') {
-        itr.add(ev.file);
-      }
-    });
+    process.send?.('ready');
 
     if (runAllOnStart) {
       for (const test of await RootIndex.findTest({})) {
-        await import(test.output);
-        itr.add(test.source);
+        await import(test.import);
+        itr.add(test.sourceFile);
       }
     }
 
     await pool.process(src);
   }
+}
+
+export async function main(format: string = 'tap', runAllOnStart: string = 'true'): Promise<void> {
+  defineGlobalEnv({ test: true, dynamic: true });
+  console.log('Starting');
+  ConsoleManager.setDebugFromEnv();
+  // Quit on parent disconnect
+  if (process.send) {
+    process.on('disconnect', () => process.exit(0));
+  }
+  try {
+    await TestWatcher.watch(format, runAllOnStart !== 'false');
+    console.log('Done');
+  } catch (err) {
+    console.error(err);
+  }
 }

package/src/worker/child.ts

@@ -1,4 +1,7 @@
-import { ErrorUtil, TimeUtil } from '@travetto/base';
+import fs from 'fs/promises';
+
+import { path } from '@travetto/manifest';
+import { ConsoleManager, defineGlobalEnv, ErrorUtil, TimeUtil } from '@travetto/base';
 import { ChildCommChannel } from '@travetto/worker';
 
 import { RunnerUtil } from '../execute/util';
@@ -28,6 +31,16 @@ export class TestChildWorker extends ChildCommChannel<RunEvent> {
    * Start the worker
    */
   async activate(): Promise<void> {
+    if (/\b@travetto[/]test\b/.test(process.env.DEBUG ?? '')) {
+      const handle = await fs.open(path.resolve(`.trv-test-worker.${process.pid}.log`), 'a');
+      const stdout = handle.createWriteStream();
+
+      const c = new console.Console({ stdout, inspectOptions: { depth: 4, colors: false } });
+      ConsoleManager.set({ onLog: (ev) => c[ev.level](process.pid, ...ev.args) });
+    } else {
+      ConsoleManager.set({ onLog: () => { } });
+    }
+
     RunnerUtil.registerCleanup('worker');
 
     // Listen for inbound requests
@@ -75,4 +88,10 @@ export class TestChildWorker extends ChildCommChannel<RunEvent> {
       concurrency: 1
     }).run();
   }
+}
+
+export async function main(): Promise<void> {
+  defineGlobalEnv({ test: true, set: { FORCE_COLOR: 0 } });
+  ConsoleManager.setDebugFromEnv();
+  await new TestChildWorker().activate();
 }

package/src/worker/standard.ts

@@ -32,14 +32,18 @@ export function buildStandardTestManager(consumer: TestConsumer): () => Worker<s
       const event = buildEvent(file);
 
       const { module } = RootIndex.getEntry(event.file!)!;
-      const cwd = RootIndex.getModule(module)!.source;
+      const cwd = RootIndex.getModule(module)!.sourcePath;
 
       const channel = new ParentCommChannel<TestEvent & { error?: Error }>(
-        ExecUtil.fork(RootIndex.resolveFileImport('@travetto/test/support/main.test-child.ts'), [], {
-          cwd,
-          env: { TRV_MANIFEST: module },
-          stdio: [0, 'ignore', 2, 'ipc']
-        })
+        ExecUtil.fork(
+          RootIndex.resolveFileImport('@travetto/cli/support/entry.cli'),
+          ['main', '@travetto/test/src/worker/child.ts'],
+          {
+            cwd,
+            env: { TRV_MANIFEST: RootIndex.getModule(module)!.outputPath },
+            stdio: [0, 'ignore', 2, 'ipc']
+          }
+        )
       );
 
       await channel.once(Events.READY); // Wait for the child to be ready

package/support/{main.test-direct.ts → bin/direct.ts}

@@ -1,5 +1,5 @@
 import { ConsoleManager, defineGlobalEnv } from '@travetto/base';
-import { runTests } from './bin/run';
+import { runTests } from './run';
 
 // Direct entry point
 export function main(...args: string[]): Promise<void> {

package/support/cli.test.ts

@@ -27,7 +27,7 @@ export class TestCommand extends CliCommand<Options> {
     if (!this._types) {
       this._types = RootIndex
         .findSrc({ filter: /consumer\/types\/.*/, profiles: ['test'] })
-        .map(x => readFileSync(`${x.output}`, 'utf8').match(/Consumable.?[(]'([^']+)/)?.[1])
+        .map(x => readFileSync(`${x.outputFile}`, 'utf8').match(/Consumable.?[(]'([^']+)/)?.[1])
         .filter((x?: string): x is string => !!x);
     }
     return this._types;

package/support/main.test-child.ts

@@ -1,32 +0,0 @@
-import fs from 'fs/promises';
-
-import { ConsoleManager, defineGlobalEnv } from '@travetto/base';
-import { path } from '@travetto/manifest';
-
-import { TestChildWorker } from '../src/worker/child';
-
-export async function customLogs(): Promise<void> {
-  if (/\b@travetto[/]test\b/.test(process.env.DEBUG ?? '')) {
-    const handle = await fs.open(path.resolve(`.trv-test-worker.${process.pid}.log`), 'a');
-    const stdout = handle.createWriteStream();
-
-    const c = new console.Console({
-      stdout,
-      inspectOptions: { depth: 4 },
-    });
-
-    ConsoleManager.set({
-      onLog: (ev) => c[ev.level](process.pid, ...ev.args)
-    });
-  } else {
-    ConsoleManager.set({ onLog: () => { } });
-  }
-}
-
-export async function main(): Promise<void> {
-  defineGlobalEnv({ test: true });
-  ConsoleManager.setDebugFromEnv();
-
-  await customLogs();
-  return new TestChildWorker().activate();
-}

package/support/main.test-watch.ts

@@ -1,8 +0,0 @@
-import { ConsoleManager, defineGlobalEnv } from '@travetto/base';
-import { TestWatcher } from '../src/execute/watcher';
-
-export async function main(format: string = 'tap', runAllOnStart: string = 'true'): Promise<void> {
-  defineGlobalEnv({ test: true, dynamic: true });
-  ConsoleManager.setDebugFromEnv();
-  await TestWatcher.watch(format, runAllOnStart !== 'false');
-}