@travetto/test 5.0.0-rc.1 → 5.0.0-rc.2

package/README.md

@@ -21,7 +21,7 @@ This module provides unit testing functionality that integrates with the framewo
 **Note**: All tests should be under the `test/.*` folders.  The pattern for tests is defined as a regex and not standard globbing.
 
 ## Definition
-A test suite is a collection of individual tests.  All test suites are classes with the [@Suite](https://github.com/travetto/travetto/tree/main/module/test/src/decorator/suite.ts#L14) decorator. Tests are defined as methods on the suite class, using the [@Test](https://github.com/travetto/travetto/tree/main/module/test/src/decorator/test.ts#L19) decorator.  All tests intrinsically support `async`/`await`. 
+A test suite is a collection of individual tests.  All test suites are classes with the [@Suite](https://github.com/travetto/travetto/tree/main/module/test/src/decorator/suite.ts#L13) decorator. Tests are defined as methods on the suite class, using the [@Test](https://github.com/travetto/travetto/tree/main/module/test/src/decorator/test.ts#L19) decorator.  All tests intrinsically support `async`/`await`. 
 
 A simple example would be:
 
@@ -81,17 +81,17 @@ 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 Ⲑ_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 Ⲑ_function_1 = tslib_1.__importStar(require("@travetto/runtime/src/function.js"));
+var ᚕm = ["@travetto/test", "doc/assert-example"];
 const node_assert_1 = tslib_1.__importDefault(require("node:assert"));
 const test_1 = require("@travetto/test");
 let SimpleTest = class SimpleTest {
-    static Ⲑinit = Ⲑ_runtime_1.RuntimeIndex.registerFunction(SimpleTest, ᚕf, { hash: 1887908328, lines: [5, 12] }, { test: { hash: 102834457, lines: [8, 11] } }, false, false);
+    static Ⲑinit = Ⲑ_function_1.register(SimpleTest, ᚕm, { hash: 1887908328, lines: [5, 12] }, { test: { hash: 102834457, lines: [8, 11] } }, false, false);
     async test() {
         if (Ⲑ_util_1.RunnerUtil.tryDebugger)
             debugger;
-        Ⲑ_check_1.AssertCheck.check({ file: ᚕf, line: 10, text: "{ size: 20, address: { state: 'VA' } }", operator: "deepStrictEqual" }, true, { size: 20, address: { state: 'VA' } }, {});
+        Ⲑ_check_1.AssertCheck.check({ module: ᚕm, line: 10, text: "{ size: 20, address: { state: 'VA' } }", operator: "deepStrictEqual" }, true, { size: 20, address: { state: 'VA' } }, {});
     }
 };
 tslib_1.__decorate([

package/package.json

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

package/src/assert/capture.ts

@@ -1,8 +1,10 @@
 import { EventEmitter } from 'node:events';
+import { RuntimeIndex } from '@travetto/runtime';
 
 import { Assertion, TestConfig } from '../model/test';
 
 export interface CaptureAssert extends Partial<Assertion> {
+  module: [string, string];
   file: string;
   line: number;
   text: string;
@@ -28,6 +30,7 @@ class $AssertCapture {
     const handler = (a: CaptureAssert): void => {
       const assrt = {
         ...a,
+        file: RuntimeIndex.getSourceFile(a.module),
         classId: test.classId,
         methodName: test.methodName
       };

package/src/assert/check.ts

@@ -1,7 +1,6 @@
 import assert from 'node:assert';
 
-import { RuntimeIndex } from '@travetto/manifest';
-import { AppError, ClassInstance, Class } from '@travetto/base';
+import { AppError, ClassInstance, Class, RuntimeIndex } from '@travetto/runtime';
 
 import { ThrowableError, TestConfig, Assertion } from '../model/test';
 import { AssertCapture, CaptureAssert } from './capture';
@@ -25,7 +24,7 @@ export class AssertCheck {
    */
   static check(assertion: CaptureAssert, positive: boolean, ...args: unknown[]): void {
     /* eslint-disable @typescript-eslint/consistent-type-assertions */
-    assertion.file = RuntimeIndex.getSourceFile(assertion.file);
+    assertion.file = RuntimeIndex.getSourceFile(assertion.module);
 
     let fn = assertion.operator;
     assertion.operator = ASSERT_FN_OPERATOR[fn];
@@ -215,7 +214,7 @@ export class AssertCheck {
   ): void {
     let missed: Error | undefined;
 
-    assertion.file = RuntimeIndex.getSourceFile(assertion.file);
+    assertion.file = RuntimeIndex.getSourceFile(assertion.module);
 
     try {
       action();
@@ -249,7 +248,7 @@ export class AssertCheck {
   ): Promise<void> {
     let missed: Error | undefined;
 
-    assertion.file = RuntimeIndex.getSourceFile(assertion.file);
+    assertion.file = RuntimeIndex.getSourceFile(assertion.module);
 
     try {
       if ('then' in action) {
@@ -279,7 +278,9 @@ export class AssertCheck {
       line = test.lineStart;
     }
 
+    const entry = RuntimeIndex.getFromSource(test.file)!;
     AssertCapture.add({
+      module: [entry.module, entry.relativeFile],
       file: test.file,
       line,
       operator: 'throws',

package/src/assert/util.ts

@@ -1,7 +1,6 @@
 import util from 'node:util';
 
-import { RuntimeContext } from '@travetto/base';
-import { path } from '@travetto/manifest';
+import { Runtime } from '@travetto/runtime';
 
 import { TestConfig, Assertion, TestResult } from '../model/test';
 import { SuiteConfig } from '../model/suite';
@@ -44,8 +43,9 @@ 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 = RuntimeContext.mainSourcePath;
-    const lines = path.toPosix(err.stack ?? new Error().stack!)
+    const cwd = Runtime.mainSourcePath;
+    const lines = (err.stack ?? new Error().stack!)
+      .replace(/[\\/]/g, '/')
       .split('\n')
       // Exclude node_modules, target self
       .filter(x => x.includes(cwd) && (!x.includes('node_modules') || x.includes('/support/')));
@@ -97,7 +97,7 @@ export class AssertUtil {
 
     const msg = error.message.split(/\n/)[0];
 
-    const core = { file, classId: suite.classId, methodName, module: RuntimeContext.main.name };
+    const core = { file, classId: suite.classId, methodName, module: Runtime.main.name };
     const coreAll = { ...core, description: msg, lineStart: line, lineEnd: line, lineBodyStart: line };
 
     const assert: Assertion = {

package/src/consumer/error.ts

@@ -1,4 +1,4 @@
-import { AppError, TypedObject } from '@travetto/base';
+import { AppError, TypedObject } from '@travetto/runtime';
 
 import { TestEvent, } from '../model/event';
 

package/src/consumer/registry.ts

@@ -1,4 +1,4 @@
-import type { Class, ConcreteClass } from '@travetto/base';
+import type { Class, ConcreteClass } from '@travetto/runtime';
 import { TestConsumer } from './types';
 
 /**

package/src/consumer/types/cumulative.ts

@@ -1,6 +1,6 @@
 import { existsSync } from 'node:fs';
 
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 
 import { TestConsumer } from '../types';
 import { TestEvent } from '../../model/event';

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

@@ -1,4 +1,4 @@
-import { Util } from '@travetto/base';
+import { Util } from '@travetto/runtime';
 import { StyleUtil, Terminal, TerminalUtil } from '@travetto/terminal';
 import { WorkQueue } from '@travetto/worker';
 

package/src/consumer/types/tap.ts

@@ -1,5 +1,5 @@
 import { Terminal } from '@travetto/terminal';
-import { AppError, TimeUtil, RuntimeContext } from '@travetto/base';
+import { AppError, TimeUtil, Runtime } from '@travetto/runtime';
 import { stringify } from 'yaml';
 
 import { TestEvent } from '../../model/event';
@@ -70,7 +70,7 @@ export class TapEmitter implements TestConsumer {
             this.#enhancer.assertNumber(++subCount),
             '-',
             this.#enhancer.assertDescription(text),
-            `${this.#enhancer.assertFile(asrt.file.replace(RuntimeContext.mainSourcePath, '.'))}:${this.#enhancer.assertLine(asrt.line)}`
+            `${this.#enhancer.assertFile(asrt.file.replace(Runtime.mainSourcePath, '.'))}:${this.#enhancer.assertLine(asrt.line)}`
           ].join(' ');
 
           if (asrt.error) {

package/src/decorator/suite.ts

@@ -1,5 +1,4 @@
-import { RuntimeIndex } from '@travetto/manifest';
-import { Class, ClassInstance } from '@travetto/base';
+import { Class, ClassInstance, describeFunction } from '@travetto/runtime';
 
 import { SuiteRegistry } from '../registry/suite';
 import { SuiteConfig } from '../model/suite';
@@ -27,7 +26,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 (RuntimeIndex.getFunctionMetadata(target)?.abstract) {
+    if (describeFunction(target).abstract) {
       cfg.skip = true;
     }
     SuiteRegistry.register(target, cfg);

package/src/decorator/test.ts

@@ -1,4 +1,4 @@
-import { ClassInstance } from '@travetto/base';
+import { ClassInstance } from '@travetto/runtime';
 
 import { SuiteRegistry } from '../registry/suite';
 import { TestConfig } from '../model/test';

package/src/execute/console.ts

@@ -1,6 +1,6 @@
 import util from 'node:util';
 
-import { ConsoleEvent, ConsoleListener, ConsoleManager } from '@travetto/base';
+import { ConsoleEvent, ConsoleListener, ConsoleManager } from '@travetto/runtime';
 
 /**
  * Console capturer.  Hooks into the Console manager, and collects the

package/src/execute/executor.ts

@@ -1,8 +1,7 @@
 import { AssertionError } from 'node:assert';
 import path from 'node:path';
 
-import { RuntimeIndex } from '@travetto/manifest';
-import { Env, TimeUtil, RuntimeContext } from '@travetto/base';
+import { Env, TimeUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
 import { Barrier, ExecutionError } from '@travetto/worker';
 
 import { SuiteRegistry } from '../registry/suite';
@@ -68,10 +67,10 @@ export class TestExecutor {
    */
   static failFile(consumer: TestConsumer, file: string, err: Error): void {
     const name = path.basename(file);
-    const classId = RuntimeIndex.getId(file, name);
+    const classId = `${RuntimeIndex.getEntry(file)?.id}￮${name}`;
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const suite = { class: { name }, classId, duration: 0, lineStart: 1, lineEnd: 1, file, } as SuiteConfig & SuiteResult;
-    err.message = err.message.replaceAll(RuntimeContext.mainSourcePath, '.');
+    err.message = err.message.replaceAll(Runtime.mainSourcePath, '.');
     const res = AssertUtil.generateSuiteError(suite, 'require', err);
     consumer.onEvent({ type: 'suite', phase: 'before', suite });
     consumer.onEvent({ type: 'test', phase: 'before', test: res.testConfig });
@@ -110,7 +109,7 @@ export class TestExecutor {
 
     const result: TestResult = {
       methodName: test.methodName,
-      module: RuntimeContext.main.name,
+      module: Runtime.main.name,
       description: test.description,
       classId: test.classId,
       lineStart: test.lineStart,

package/src/execute/phase.ts

@@ -1,5 +1,5 @@
 import { Barrier } from '@travetto/worker';
-import { Env, TimeUtil } from '@travetto/base';
+import { Env, TimeUtil } from '@travetto/runtime';
 
 import { TestConsumer } from '../consumer/types';
 import { SuiteConfig, SuiteResult } from '../model/suite';

package/src/execute/promise.ts

@@ -1,7 +1,7 @@
 import { createHook, executionAsyncId } from 'node:async_hooks';
 
 import { ExecutionError } from '@travetto/worker';
-import { Util } from '@travetto/base';
+import { Util } from '@travetto/runtime';
 
 /**
  * Promise watcher, to catch any unfinished promises

package/src/execute/runner.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 
-import { path as mp, RuntimeIndex } from '@travetto/manifest';
-import { TimeUtil, RuntimeContext } from '@travetto/base';
+import { path as mp } from '@travetto/manifest';
+import { TimeUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
 import { WorkPool } from '@travetto/worker';
 
 import { buildStandardTestManager } from '../worker/standard';
@@ -55,7 +55,7 @@ export class Runner {
    */
   async runSingle(): Promise<boolean> {
     const mod = RuntimeIndex.getEntry(path.resolve(this.#state.args[0]))!;
-    if (mod.module !== RuntimeContext.main.name) {
+    if (mod.module !== Runtime.main.name) {
       RuntimeIndex.reinitForModule(mod.module);
     }
 

package/src/execute/util.ts

@@ -2,8 +2,8 @@ import { spawn } from 'node:child_process';
 import { createReadStream } from 'node:fs';
 import readline from 'node:readline';
 
-import { Env, ExecUtil, ShutdownManager, Util } from '@travetto/base';
-import { type IndexedFile, RuntimeIndex } from '@travetto/manifest';
+import { Env, ExecUtil, ShutdownManager, Util, RuntimeIndex } from '@travetto/runtime';
+import type { IndexedFile } from '@travetto/manifest';
 
 /**
  * Simple Test Utilities

package/src/execute/watcher.ts

@@ -1,6 +1,6 @@
 import { RootRegistry, MethodSource } from '@travetto/registry';
 import { WorkPool, WorkQueue } from '@travetto/worker';
-import { RuntimeIndex } from '@travetto/manifest';
+import { Runtime, describeFunction } from '@travetto/runtime';
 
 import { SuiteRegistry } from '../registry/suite';
 import { buildStandardTestManager } from '../worker/standard';
@@ -42,7 +42,7 @@ export class TestWatcher {
 
     new MethodSource(RootRegistry).on(e => {
       const [cls, method] = (e.prev ?? e.curr ?? []);
-      if (!cls || RuntimeIndex.getFunctionMetadata(cls)?.abstract) {
+      if (!cls || describeFunction(cls).abstract) {
         return;
       }
       if (!method) {
@@ -60,7 +60,7 @@ export class TestWatcher {
           type: 'removeTest',
           method: method?.name,
           classId: cls?.Ⲑid,
-          file: RuntimeIndex.getFunctionMetadata(cls)?.source
+          file: Runtime.getSource(cls)
         });
       }
     });

package/src/fixture.ts

@@ -1,7 +1,12 @@
-import { FileLoader } from '@travetto/base';
+import { FileLoader, Runtime } from '@travetto/runtime';
 
 export class TestFixtures extends FileLoader {
   constructor(modules: string[] = []) {
-    super(['@#test/fixtures', ...['@', ...modules.flat(), '@@'].map(x => `${x}#support/fixtures`)]);
+    super(Runtime.modulePaths([
+      '@#test/fixtures',
+      '@#support/fixtures',
+      ...modules.flat().map(x => `${x}#support/fixtures`),
+      '@@#support/fixtures'
+    ]));
   }
 }

package/src/model/suite.ts

@@ -1,4 +1,4 @@
-import type { Class } from '@travetto/base';
+import type { Class } from '@travetto/runtime';
 
 import { TestConfig, TestResult } from './test';
 import { Skip, SuiteCore } from './common';

package/src/model/test.ts

@@ -1,4 +1,4 @@
-import type { Class, TimeSpan } from '@travetto/base';
+import type { Class, TimeSpan } from '@travetto/runtime';
 import { Skip, TestCore } from './common';
 
 export type ThrowableError = string | RegExp | Function;

package/src/registry/suite.ts

@@ -1,6 +1,5 @@
-import { Class, ConcreteClass, RuntimeContext } from '@travetto/base';
+import { Class, ConcreteClass, Runtime, describeFunction } from '@travetto/runtime';
 import { MetadataRegistry } from '@travetto/registry';
-import { RuntimeIndex } from '@travetto/manifest';
 
 import { SuiteConfig } from '../model/suite';
 import { TestConfig } from '../model/test';
@@ -14,18 +13,18 @@ class $SuiteRegistry extends MetadataRegistry<SuiteConfig, TestConfig> {
    * Find all valid tests (ignoring abstract)
    */
   getValidClasses(): Class[] {
-    return this.getClasses().filter(c => !RuntimeIndex.getFunctionMetadata(c)?.abstract);
+    return this.getClasses().filter(c => !describeFunction(c).abstract);
   }
 
   createPending(cls: Class): Partial<SuiteConfig> {
-    const meta = RuntimeIndex.getFunctionMetadata(cls)!;
+    const lines = describeFunction(cls)?.lines;
     return {
       class: cls,
-      module: RuntimeContext.main.name,
+      module: Runtime.main.name,
       classId: cls.Ⲑid,
-      file: meta.source,
-      lineStart: meta.lines[0],
-      lineEnd: meta.lines[1],
+      file: Runtime.getSource(cls),
+      lineStart: lines?.[0],
+      lineEnd: lines?.[1],
       tests: [],
       beforeAll: [],
       beforeEach: [],
@@ -35,14 +34,13 @@ class $SuiteRegistry extends MetadataRegistry<SuiteConfig, TestConfig> {
   }
 
   override createPendingField(cls: Class, fn: Function): Partial<TestConfig> {
-    const meta = RuntimeIndex.getFunctionMetadata(cls)!;
-    const meth = meta.methods![fn.name];
+    const lines = describeFunction(cls)?.methods?.[fn.name].lines;
     return {
       class: cls,
-      module: RuntimeContext.main.name,
-      file: meta.source,
-      lineStart: meth?.lines[0],
-      lineEnd: meth?.lines[1],
+      module: Runtime.main.name,
+      file: Runtime.getSource(cls),
+      lineStart: lines?.[0],
+      lineEnd: lines?.[1],
       methodName: fn.name
     };
   }
@@ -98,7 +96,9 @@ 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 => RuntimeIndex.getFunctionMetadata(cls)!.source === file).map(x => this.get(x)).filter(x => !x.skip);
+      const suites = this.getValidClasses()
+        .filter(cls => Runtime.getSource(cls) === file)
+        .map(x => this.get(x)).filter(x => !x.skip);
       const suite = suites.find(x => line >= x.lineStart && line <= x.lineEnd);
 
       if (suite) {
@@ -120,7 +120,7 @@ class $SuiteRegistry extends MetadataRegistry<SuiteConfig, TestConfig> {
       } else {
         const suites = this.getValidClasses()
           .map(x => this.get(x))
-          .filter(x => !RuntimeIndex.getFunctionMetadata(x.class)?.abstract);  // Do not run abstract suites
+          .filter(x => !describeFunction(x.class).abstract);  // Do not run abstract suites
         return { suites };
       }
     }

package/src/trv.d.ts

@@ -1,4 +1,4 @@
-import { TimeSpan } from '@travetto/base';
+import { TimeSpan } from '@travetto/runtime';
 
 declare global {
   interface TravettoEnv {

package/src/worker/child.ts

@@ -1,6 +1,6 @@
 import { createWriteStream } from 'node:fs';
 
-import { ConsoleManager, Env, Util, RuntimeContext } from '@travetto/base';
+import { ConsoleManager, Env, Util, Runtime } from '@travetto/runtime';
 import { ChildCommChannel } from '@travetto/worker';
 
 import { ErrorUtil } from '../consumer/error';
@@ -34,7 +34,7 @@ export class TestChildWorker extends ChildCommChannel<RunEvent> {
    */
   async activate(): Promise<void> {
     if (/\b@travetto[/]test\b/.test(Env.DEBUG.val ?? '')) {
-      const file = RuntimeContext.toolPath(`test-worker.${process.pid}.log`);
+      const file = Runtime.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({ log: (ev) => c[ev.level](process.pid, ...ev.args) });

package/src/worker/standard.ts

@@ -1,7 +1,6 @@
 import { fork } from 'node:child_process';
 
-import { RuntimeIndex } from '@travetto/manifest';
-import { Env } from '@travetto/base';
+import { Env, RuntimeIndex } from '@travetto/runtime';
 import { ParentCommChannel } from '@travetto/worker';
 
 import { Events, RunEvent } from './types';

package/support/cli.test.ts

@@ -2,7 +2,7 @@ import { EventEmitter } from 'node:events';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { Env } from '@travetto/base';
+import { Env } from '@travetto/runtime';
 import { CliCommandShape, CliCommand, CliValidationError } from '@travetto/cli';
 import { WorkPool } from '@travetto/worker';
 import { Max, Min } from '@travetto/schema';

package/support/cli.test_child.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'node:events';
 
-import { Env } from '@travetto/base';
+import { Env } from '@travetto/runtime';
 import { CliCommand } from '@travetto/cli';
 
 /** Test child worker target */

package/support/cli.test_count.ts

@@ -1,6 +1,5 @@
 import { CliCommand } from '@travetto/cli';
-import { RuntimeIndex } from '@travetto/manifest';
-import { Env } from '@travetto/base';
+import { Env, describeFunction } from '@travetto/runtime';
 
 import { SuiteRegistry } from '../src/registry/suite';
 import { RunnerUtil } from '../src/execute/util';
@@ -31,7 +30,7 @@ export class TestCountCommand {
     const suites = SuiteRegistry.getClasses();
     const total = suites
       .map(c => SuiteRegistry.get(c))
-      .filter(c => !RuntimeIndex.getFunctionMetadata(c.class)?.abstract)
+      .filter(c => !describeFunction(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 { Env } from '@travetto/base';
+import { Env } from '@travetto/runtime';
 import { CliCommand } from '@travetto/cli';
 
 import { runTests } from './bin/run';

package/support/cli.test_watch.ts

@@ -1,4 +1,4 @@
-import { Env } from '@travetto/base';
+import { Env } from '@travetto/runtime';
 import { CliCommand, CliUtil } from '@travetto/cli';
 
 import { TestFormat } from './bin/types';

package/support/transformer.assert.ts

@@ -159,7 +159,7 @@ export class AssertTransformer {
     cmd.args = cmd.args.filter(x => x !== undefined && x !== null);
     const check = state.factory.createCallExpression(state[AssertⲐ]!.assertCheck, undefined, state.factory.createNodeArray([
       state.fromLiteral({
-        file: state.getFilenameIdentifier(),
+        module: state.getModuleIdentifier(),
         line: state.fromLiteral(ts.getLineAndCharacterOfPosition(state.source, node.getStart()).line + 1),
         text: state.fromLiteral(firstText),
         operator: state.fromLiteral(cmd.fn)
@@ -184,7 +184,7 @@ export class AssertTransformer {
       undefined,
       state.factory.createNodeArray([
         state.fromLiteral({
-          file: state.getFilenameIdentifier(),
+          module: state.getModuleIdentifier(),
           line: state.fromLiteral(ts.getLineAndCharacterOfPosition(state.source, node.getStart()).line + 1),
           text: state.fromLiteral(`${key} ${firstText}`),
           operator: state.fromLiteral(`${key}`)