@travetto/test 7.0.4 → 7.0.5

package/README.md

@@ -82,15 +82,15 @@ import * as Δdebug from "@travetto/runtime/src/debug.js";
 import * as Δcheck from "@travetto/test/src/assert/check.js";
 import * as Δfunction from "@travetto/runtime/src/function.js";
 import * as Δschema from "@travetto/schema/src/decorator/schema.js";
-var mod_1 = ["@travetto/test", "doc/assert-example.ts"];
+var Δm_1 = ["@travetto/test", "doc/assert-example.ts"];
 import assert from 'node:assert';
 import { Suite, Test } from '@travetto/test';
 let SimpleTest = class SimpleTest {
-    static { Δfunction.registerFunction(SimpleTest, mod_1, { hash: 1887908328, lines: [5, 12] }, { test: { hash: 102834457, lines: [8, 11, 10] } }, false); }
+    static { Δfunction.registerFunction(SimpleTest, Δm_1, { hash: 1887908328, lines: [5, 12] }, { test: { hash: 102834457, lines: [8, 11, 10] } }, false); }
     async test() {
         if (Δdebug.tryDebugger)
             debugger;
-        Δcheck.AssertCheck.check({ module: mod_1, line: 10, text: "{ size: 20, address: { state: 'VA' } }", operator: "deepStrictEqual" }, true, { size: 20, address: { state: 'VA' } }, {});
+        Δcheck.AssertCheck.check({ module: Δm_1, line: 10, text: "{ size: 20, address: { state: 'VA' } }", operator: "deepStrictEqual" }, true, { size: 20, address: { state: 'VA' } }, {});
     }
 };
 __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/test",
-  "version": "7.0.4",
+  "version": "7.0.5",
   "type": "module",
   "description": "Declarative test framework",
   "keywords": [
@@ -28,15 +28,15 @@
     "directory": "module/test"
   },
   "dependencies": {
-    "@travetto/registry": "^7.0.4",
-    "@travetto/runtime": "^7.0.3",
-    "@travetto/terminal": "^7.0.3",
-    "@travetto/worker": "^7.0.3",
+    "@travetto/registry": "^7.0.5",
+    "@travetto/runtime": "^7.0.4",
+    "@travetto/terminal": "^7.0.4",
+    "@travetto/worker": "^7.0.4",
     "yaml": "^2.8.2"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.4",
-    "@travetto/transformer": "^7.0.3"
+    "@travetto/cli": "^7.0.6",
+    "@travetto/transformer": "^7.0.4"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/assert/capture.ts

@@ -1,8 +1,8 @@
 import { EventEmitter } from 'node:events';
 
-import { Assertion, TestConfig } from '../model/test.ts';
+import type { Assertion, TestConfig } from '../model/test.ts';
 
-export interface CaptureAssert extends Partial<Assertion> {
+export interface CapturedAssertion extends Partial<Assertion> {
   module?: [string, string];
   line: number;
   text: string;
@@ -25,7 +25,7 @@ class $AssertCapture {
     const assertions: Assertion[] = [];
 
     // Emit and collect, every assertion as it occurs
-    const handler = (a: CaptureAssert): void => {
+    const handler = (a: CapturedAssertion): void => {
       const asrt: Assertion = {
         ...a,
         import: a.import ?? a.module!.join('/'),
@@ -46,7 +46,7 @@ class $AssertCapture {
     };
   }
 
-  add(a: CaptureAssert): void {
+  add(a: CapturedAssertion): void {
     this.#emitter.emit('assert', a);
   }
 }

package/src/assert/check.ts

@@ -1,10 +1,10 @@
 import assert from 'node:assert';
 import { isPromise } from 'node:util/types';
 
-import { AppError, Class, castTo, castKey, asConstructable } from '@travetto/runtime';
+import { AppError, type Class, castTo, castKey, asConstructable } from '@travetto/runtime';
 
-import { ThrowableError, TestConfig, Assertion } from '../model/test.ts';
-import { AssertCapture, CaptureAssert } from './capture.ts';
+import type { ThrowableError, TestConfig, Assertion } from '../model/test.ts';
+import { AssertCapture, type CapturedAssertion } from './capture.ts';
 import { AssertUtil } from './util.ts';
 import { ASSERT_FN_OPERATOR, OP_MAPPING } from './types.ts';
 
@@ -25,7 +25,7 @@ export class AssertCheck {
    * @param positive Is the check positive or negative
    * @param args The arguments passed in
    */
-  static check(assertion: CaptureAssert, positive: boolean, ...args: unknown[]): void {
+  static check(assertion: CapturedAssertion, positive: boolean, ...args: unknown[]): void {
     let fn = assertion.operator;
     assertion.operator = ASSERT_FN_OPERATOR[fn];
 
@@ -180,7 +180,7 @@ export class AssertCheck {
     error: unknown,
     missed: Error | undefined,
     shouldThrow: ThrowableError | undefined,
-    assertion: CaptureAssert
+    assertion: CapturedAssertion
   ): void {
     if (!(error instanceof Error)) {
       error = new Error(`${error}`);
@@ -209,7 +209,7 @@ export class AssertCheck {
    * @param message Message to share on failure
    */
   static checkThrow(
-    assertion: CaptureAssert,
+    assertion: CapturedAssertion,
     positive: boolean,
     action: Function,
     shouldThrow?: ThrowableError,
@@ -241,7 +241,7 @@ export class AssertCheck {
    * @param message Message to share on failure
    */
   static async checkThrowAsync(
-    assertion: CaptureAssert,
+    assertion: CapturedAssertion,
     positive: boolean,
     action: Function | Promise<unknown>,
     shouldThrow?: ThrowableError,

package/src/assert/util.ts

@@ -1,10 +1,10 @@
 import util from 'node:util';
 import path from 'node:path';
 
-import { asFull, Class, hasFunction, Runtime, RuntimeIndex } from '@travetto/runtime';
+import { asFull, type Class, hasFunction, Runtime, RuntimeIndex } from '@travetto/runtime';
 
-import { TestConfig, Assertion, TestResult } from '../model/test.ts';
-import { SuiteConfig, SuiteFailure, SuiteResult } from '../model/suite.ts';
+import type { TestConfig, Assertion, TestResult } from '../model/test.ts';
+import type { SuiteConfig, SuiteFailure, SuiteResult } from '../model/suite.ts';
 
 const isCleanable = hasFunction<{ toClean(): unknown }>('toClean');
 

package/src/consumer/decorator.ts

@@ -1,7 +1,7 @@
-import { Class } from '@travetto/runtime';
+import type { Class } from '@travetto/runtime';
 
-import { TestConsumerShape } from './types';
-import { TestConsumerRegistryIndex } from './registry-index';
+import type { TestConsumerShape } from './types.ts';
+import { TestConsumerRegistryIndex } from './registry-index.ts';
 
 /**
  * Registers a class a valid test consumer

package/src/consumer/enhancer.ts

@@ -1,18 +1,20 @@
-import { StyleUtil } from '@travetto/terminal';
+import { StyleUtil, type TermStyleFn } from '@travetto/terminal';
 
-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
-});
+const input = {
+  assertDescription: ['#d3d3d3'], // light gray
+  testDescription: ['#e5e5e5'], // White
+  success: ['#00cd00'], // Green
+  failure: ['#cd0000'], // Red
+  assertNumber: ['#00ffff'], // Bright cyan
+  testNumber: ['#1e90ff'], // dodger blue
+  assertFile: ['#90ee90'], // lightGreen
+  assertLine: ['#ffffe0'], // light yellow
+  objectInspect: ['#cd00cd'], // Magenta
+  suiteName: ['#cdcd00'], // Yellow
+  testName: ['#00cdcd'],  // Cyan
+  total: ['#e5e5e5'], // White
+} as const;
 
-export type TestResultsEnhancer = typeof CONSOLE_ENHANCER;
+export const CONSOLE_ENHANCER = StyleUtil.getPalette(input);
+
+export type TestResultsEnhancer = Record<keyof typeof input, TermStyleFn>;

package/src/consumer/registry-adapter.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 
 import { classConstruct, describeFunction, type Class } from '@travetto/runtime';
-import { RegistryAdapter } from '@travetto/registry';
+import type { RegistryAdapter } from '@travetto/registry';
 
 import type { TestConsumerShape, TestConsumerConfig } from './types.ts';
 

package/src/consumer/registry-index.ts

@@ -1,5 +1,5 @@
 import { RuntimeIndex, type Class } from '@travetto/runtime';
-import { Registry, RegistryIndex, RegistryIndexStore } from '@travetto/registry';
+import { Registry, type RegistryIndex, RegistryIndexStore } from '@travetto/registry';
 
 import type { TestConsumerShape } from './types.ts';
 import type { TestConsumerConfig } from '../execute/types.ts';
@@ -41,7 +41,7 @@ export class TestConsumerRegistryIndex implements RegistryIndex {
    */
   async #init(): Promise<void> {
     const allFiles = RuntimeIndex.find({
-      module: mod => mod.name === '@travetto/test',
+      module: module => module.name === '@travetto/test',
       file: file => file.relativeFile.startsWith('src/consumer/types/')
     });
     for (const file of allFiles) {

package/src/consumer/types/cumulative.ts

@@ -3,7 +3,7 @@ import type { TestEvent, TestRemoveEvent } from '../../model/event.ts';
 import type { TestConfig, TestDiffSource, TestResult } from '../../model/test.ts';
 import type { Counts, SuiteConfig, SuiteResult } from '../../model/suite.ts';
 import { DelegatingConsumer } from './delegating.ts';
-import { SuiteCore } from '../../model/common.ts';
+import type { SuiteCore } from '../../model/common.ts';
 import { TestModelUtil } from '../../model/util.ts';
 
 type ClassId = string;

package/src/consumer/types/event.ts

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

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

@@ -8,7 +8,7 @@ import type { SuitesSummary, TestConsumerShape, TestRunState } from '../types.ts
 import { TestConsumer } from '../decorator.ts';
 
 import { TapEmitter } from './tap.ts';
-import { CONSOLE_ENHANCER, TestResultsEnhancer } from '../enhancer.ts';
+import { CONSOLE_ENHANCER, type TestResultsEnhancer } from '../enhancer.ts';
 
 type Result = {
   key: string;

package/src/consumer/types/tap.ts

@@ -7,7 +7,7 @@ import { TimeUtil, RuntimeIndex, hasToJSON } from '@travetto/runtime';
 import type { TestEvent } from '../../model/event.ts';
 import type { SuitesSummary, TestConsumerShape } from '../types.ts';
 import { TestConsumer } from '../decorator.ts';
-import { TestResultsEnhancer, CONSOLE_ENHANCER } from '../enhancer.ts';
+import { type TestResultsEnhancer, CONSOLE_ENHANCER } from '../enhancer.ts';
 
 /**
  * TAP Format consumer

package/src/consumer/types.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/runtime';
+import type { Class } from '@travetto/runtime';
 
 import type { TestEvent, TestRemoveEvent } from '../model/event.ts';
 import type { Counts, SuiteResult } from '../model/suite.ts';

package/src/decorator/suite.ts

@@ -1,6 +1,6 @@
-import { castTo, Class, ClassInstance, describeFunction, getClass } from '@travetto/runtime';
+import { castTo, type Class, type ClassInstance, describeFunction, getClass } from '@travetto/runtime';
 
-import { SuiteConfig } from '../model/suite.ts';
+import type { SuiteConfig } from '../model/suite.ts';
 import { SuiteRegistryIndex } from '../registry/registry-index.ts';
 
 export type SuitePhase = 'beforeAll' | 'beforeEach' | 'afterAll' | 'afterEach';

package/src/decorator/test.ts

@@ -1,6 +1,6 @@
-import { ClassInstance, getClass } from '@travetto/runtime';
+import { type ClassInstance, getClass } from '@travetto/runtime';
 
-import { TestConfig, ThrowableError } from '../model/test.ts';
+import type { TestConfig, ThrowableError } from '../model/test.ts';
 import { SuiteRegistryIndex } from '../registry/registry-index.ts';
 
 type MethodDecorator = (instance: ClassInstance, property: string, descriptor: PropertyDescriptor) => PropertyDescriptor | void;

package/src/execute/barrier.ts

@@ -1,7 +1,7 @@
 import { isPromise } from 'node:util/types';
 import { createHook, executionAsyncId } from 'node:async_hooks';
 
-import { TimeSpan, TimeUtil, Util } from '@travetto/runtime';
+import { type TimeSpan, TimeUtil, Util } from '@travetto/runtime';
 
 import { ExecutionError, TimeoutError } from './error.ts';
 

package/src/execute/console.ts

@@ -1,7 +1,7 @@
 import util from 'node:util';
 
-import { ConsoleEvent, ConsoleListener, ConsoleManager } from '@travetto/runtime';
-import { TestLog } from '../model/test';
+import { type ConsoleEvent, type ConsoleListener, ConsoleManager } from '@travetto/runtime';
+import type { TestLog } from '../model/test.ts';
 
 /**
  * Console capturer.  Hooks into the Console manager, and collects the

package/src/execute/executor.ts

@@ -3,9 +3,9 @@ import { AssertionError } from 'node:assert';
 import { Env, TimeUtil, Runtime, castTo, classConstruct } from '@travetto/runtime';
 import { Registry } from '@travetto/registry';
 
-import { TestConfig, TestResult, type TestRun } from '../model/test.ts';
-import { SuiteConfig, SuiteFailure, SuiteResult } from '../model/suite.ts';
-import { TestConsumerShape } from '../consumer/types.ts';
+import type { TestConfig, TestResult, TestRun } from '../model/test.ts';
+import type { SuiteConfig, SuiteFailure, SuiteResult } from '../model/suite.ts';
+import type { TestConsumerShape } from '../consumer/types.ts';
 import { AssertCheck } from '../assert/check.ts';
 import { AssertCapture } from '../assert/capture.ts';
 import { ConsoleCapture } from './console.ts';

package/src/execute/phase.ts

@@ -1,6 +1,6 @@
 import { Env, TimeUtil } from '@travetto/runtime';
 
-import { SuiteConfig, SuiteFailure, SuiteResult } from '../model/suite.ts';
+import type { SuiteConfig, SuiteFailure, SuiteResult } from '../model/suite.ts';
 import { AssertUtil } from '../assert/util.ts';
 import { Barrier } from './barrier.ts';
 

package/src/execute/run.ts

@@ -56,7 +56,7 @@ export class RunUtil {
    */
   static async* getTestImports(globs?: string[]): AsyncIterable<string> {
     const all = RuntimeIndex.find({
-      module: mod => mod.roles.includes('test') || mod.roles.includes('std'),
+      module: module => module.roles.includes('test') || module.roles.includes('std'),
       folder: folder => folder === 'test',
       file: file => file.role === 'test'
     });

package/src/fixture.ts

@@ -5,7 +5,7 @@ export class TestFixtures extends FileLoader {
     super([
       '@#test/fixtures',
       '@#support/fixtures',
-      ...modules.flat().map(mod => `${mod}#support/fixtures`),
+      ...modules.flat().map(module => `${module}#support/fixtures`),
       '@@#support/fixtures'
     ].map(value => Runtime.modulePath(value)));
   }

package/src/model/event.ts

@@ -1,5 +1,5 @@
-import { Assertion, TestConfig, TestResult } from './test.ts';
-import { SuiteConfig, SuiteResult } from './suite.ts';
+import type { Assertion, TestConfig, TestResult } from './test.ts';
+import type { SuiteConfig, SuiteResult } from './suite.ts';
 
 /**
  * Targets

package/src/model/suite.ts

@@ -1,7 +1,7 @@
 import type { Class } from '@travetto/runtime';
 
-import { Assertion, TestConfig, TestResult, type TestStatus } from './test.ts';
-import { Skip, SuiteCore } from './common.ts';
+import type { Assertion, TestConfig, TestResult, TestStatus } from './test.ts';
+import type { Skip, SuiteCore } from './common.ts';
 
 /**
  * Suite configuration

package/src/model/test.ts

@@ -1,6 +1,6 @@
 import type { Class, ConsoleEvent, TimeSpan } from '@travetto/runtime';
 
-import { Skip, TestCore } from './common.ts';
+import type { Skip, TestCore } from './common.ts';
 
 export type ThrowableError = string | RegExp | Class<Error> | ((error: Error | string) => boolean | void | undefined);
 export type TestLog = Omit<ConsoleEvent, 'args' | 'scope'> & { message: string };

package/src/model/util.ts

@@ -1,5 +1,5 @@
-import type { Counts } from './suite';
-import type { TestStatus } from './test';
+import type { Counts } from './suite.ts';
+import type { TestStatus } from './test.ts';
 
 export class TestModelUtil {
   static countsToTestStatus(counts: Counts): TestStatus {

package/src/registry/registry-adapter.ts

@@ -1,9 +1,9 @@
-import { RegistryAdapter } from '@travetto/registry';
-import { AppError, asFull, Class, describeFunction, Runtime, safeAssign } from '@travetto/runtime';
+import type { RegistryAdapter } from '@travetto/registry';
+import { AppError, asFull, type Class, describeFunction, Runtime, safeAssign } from '@travetto/runtime';
 import { SchemaRegistryIndex } from '@travetto/schema';
 
-import { SuiteConfig } from '../model/suite';
-import { TestConfig } from '../model/test';
+import type { SuiteConfig } from '../model/suite.ts';
+import type { TestConfig } from '../model/test.ts';
 
 function combineClasses(baseConfig: SuiteConfig, ...subConfig: Partial<SuiteConfig>[]): SuiteConfig {
   for (const config of subConfig) {

package/src/registry/registry-index.ts

@@ -1,8 +1,8 @@
-import { AppError, Class, Runtime, describeFunction } from '@travetto/runtime';
-import { RegistryIndex, RegistryIndexStore, Registry } from '@travetto/registry';
+import { AppError, type Class, Runtime, describeFunction } from '@travetto/runtime';
+import { type RegistryIndex, RegistryIndexStore, Registry } from '@travetto/registry';
 
-import { SuiteConfig } from '../model/suite.ts';
-import { TestConfig, TestRun } from '../model/test.ts';
+import type { SuiteConfig } from '../model/suite.ts';
+import type { TestConfig, TestRun } from '../model/test.ts';
 import { SuiteRegistryAdapter } from './registry-adapter.ts';
 
 const sortedTests = (config: SuiteConfig): TestConfig[] =>

package/src/worker/child.ts

@@ -5,7 +5,7 @@ import { IpcChannel } from '@travetto/worker';
 
 import { RunUtil } from '../execute/run.ts';
 import { TestWorkerEvents } from './types.ts';
-import { TestRun } from '../model/test.ts';
+import type { TestRun } from '../model/test.ts';
 import { CommunicationUtil } from '../communication.ts';
 
 /**

package/src/worker/types.ts

@@ -1,4 +1,4 @@
-import { TestEvent, TestRemoveEvent } from '../model/event.ts';
+import type { TestEvent, TestRemoveEvent } from '../model/event.ts';
 
 /**
  * Test Run Event Keys

package/support/cli.test.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'node:events';
 
 import { Env, RuntimeIndex } from '@travetto/runtime';
-import { CliCommandShape, CliCommand, CliUtil } from '@travetto/cli';
+import { type CliCommandShape, CliCommand, CliUtil } from '@travetto/cli';
 import { WorkPool } from '@travetto/worker';
 import { Max, Min } from '@travetto/schema';
 

package/support/transformer.assert.ts

@@ -1,6 +1,6 @@
 import ts from 'typescript';
 
-import { TransformerState, OnCall, DeclarationUtil, CoreUtil, OnMethod, AfterMethod } from '@travetto/transformer';
+import { type TransformerState, DeclarationUtil, CoreUtil, TransformerHandler } from '@travetto/transformer';
 
 /**
  * Which types are candidates for deep literal checking
@@ -90,6 +90,12 @@ interface Command {
  */
 export class AssertTransformer {
 
+  static {
+    TransformerHandler(this, this.onAssertCheck, 'before', 'method', ['AssertCheck']);
+    TransformerHandler(this, this.afterAssertCheck, 'after', 'method', ['AssertCheck']);
+    TransformerHandler(this, this.onAssertCall, 'before', 'call');
+  }
+
   /**
    * Resolves optoken to syntax kind.  Relies on `ts`
    */
@@ -266,13 +272,11 @@ export class AssertTransformer {
     }
   }
 
-  @OnMethod('AssertCheck')
   static onAssertCheck(state: TransformerState & AssertState, node: ts.MethodDeclaration): ts.MethodDeclaration {
     state[IsTestSymbol] = true;
     return node;
   }
 
-  @AfterMethod('AssertCheck')
   static afterAssertCheck(state: TransformerState & AssertState, node: ts.MethodDeclaration): ts.MethodDeclaration {
     state[IsTestSymbol] = false;
     return node;
@@ -281,7 +285,6 @@ export class AssertTransformer {
   /**
    * Listen for all call expression
    */
-  @OnCall()
   static onAssertCall(state: TransformerState & AssertState, node: ts.CallExpression): ts.CallExpression {
     // Only check in test mode
     if (!state[IsTestSymbol]) {