@travetto/test 8.0.0-alpha.24 → 8.0.0-alpha.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/test",
-  "version": "8.0.0-alpha.24",
+  "version": "8.0.0-alpha.25",
   "type": "module",
   "description": "Declarative test framework",
   "keywords": [
@@ -28,15 +28,15 @@
     "directory": "module/test"
   },
   "dependencies": {
-    "@travetto/registry": "^8.0.0-alpha.22",
-    "@travetto/runtime": "^8.0.0-alpha.22",
-    "@travetto/terminal": "^8.0.0-alpha.22",
-    "@travetto/worker": "^8.0.0-alpha.23",
+    "@travetto/registry": "^8.0.0-alpha.23",
+    "@travetto/runtime": "^8.0.0-alpha.23",
+    "@travetto/terminal": "^8.0.0-alpha.23",
+    "@travetto/worker": "^8.0.0-alpha.24",
     "yaml": "^2.9.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.31",
-    "@travetto/transformer": "^8.0.0-alpha.17"
+    "@travetto/cli": "^8.0.0-alpha.32",
+    "@travetto/transformer": "^8.0.0-alpha.18"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/assert/capture.ts

@@ -26,15 +26,15 @@ class $AssertCapture {
 
     // Emit and collect, every assertion as it occurs
     const handler = (a: CapturedAssertion): void => {
-      const asrt: Assertion = {
+      const assertion: Assertion = {
         ...a,
         import: a.import ?? a.module!.join('/'),
         classId: test.classId,
         methodName: test.methodName
       };
-      assertions.push(asrt);
+      assertions.push(assertion);
       if (listener) {
-        listener(asrt);
+        listener(assertion);
       }
     };
 

package/src/consumer/types/tap.ts

@@ -80,29 +80,29 @@ export class TapEmitter implements TestConsumerShape {
       // Handle each assertion
       if (test.assertions.length) {
         let subCount = 0;
-        for (const asrt of test.assertions) {
-          const assertSourceFile = RuntimeIndex.getFromImport(asrt.import)!.sourceFile;
-          const text = asrt.message ? `${asrt.text} (${this.#enhancer.failure(asrt.message)})` : asrt.text;
-          const location = asrt.import ? `./${path.relative(process.cwd(), assertSourceFile)}` : '<unknown>';
+        for (const assertion of test.assertions) {
+          const assertSourceFile = RuntimeIndex.getFromImport(assertion.import)!.sourceFile;
+          const text = assertion.message ? `${assertion.text} (${this.#enhancer.failure(assertion.message)})` : assertion.text;
+          const location = assertion.import ? `./${path.relative(process.cwd(), assertSourceFile)}` : '<unknown>';
           let subMessage = [
             this.#enhancer.assertNumber((subCount += 1)),
             '-',
             this.#enhancer.assertDescription(text),
             StyleUtil.link(
-              `${this.#enhancer.assertFile(location)}:${this.#enhancer.assertLine(asrt.line)}`,
-              `file://${assertSourceFile}#${asrt.line}`
+              `${this.#enhancer.assertFile(location)}:${this.#enhancer.assertLine(assertion.line)}`,
+              `file://${assertSourceFile}#${assertion.line}`
             )
           ].join(' ');
 
-          if (asrt.error) {
+          if (assertion.error) {
             subMessage = `${this.#enhancer.failure('not ok')} ${subMessage}`;
           } else {
             subMessage = `${this.#enhancer.success('ok')} ${subMessage}`;
           }
           this.log(`    ${subMessage}`);
 
-          if (asrt.message && asrt.message.length > 100) {
-            this.logMeta({ message: asrt.message.replace(/\\n/g, '\n') });
+          if (assertion.message && assertion.message.length > 100) {
+            this.logMeta({ message: assertion.message.replace(/\\n/g, '\n') });
           }
         }
         this.log(`    ${this.#enhancer.assertNumber(1)}..${this.#enhancer.assertNumber(subCount)}`);

package/src/execute/run.ts

@@ -8,8 +8,8 @@ import { describeFunction, Env, ExecUtil, JSONUtil, Runtime, RuntimeIndex, TimeU
 import { WorkPool } from '@travetto/worker';
 
 import { TestConsumerRegistryIndex } from '../consumer/registry-index.ts';
-import { RunnableTestConsumer } from '../consumer/types/runnable.ts';
 import type { TestConsumerShape } from '../consumer/types.ts';
+import { RunnableTestConsumer } from '../consumer/types/runnable.ts';
 import type { TestRemoveEvent } from '../model/event.ts';
 import type { TestConfig, TestDiffInput, TestGlobInput, TestRun, TestRunInput } from '../model/test.ts';
 import { SuiteRegistryIndex } from '../registry/registry-index.ts';

package/src/model/util.ts

@@ -88,7 +88,7 @@ export class TestModelUtil {
       status: 'errored',
       errored: 1,
       tests: {
-        impport: asFull<TestResult>({
+        import: asFull<TestResult>({
           ...common,
           status: 'errored',
           assertions: [

package/support/transformer.assert.ts

@@ -18,9 +18,9 @@ export const DEEP_EQUALS_MAPPING: Record<string, string> = {
 };
 
 /**
- * Typescript optoken to assert methods
+ * Typescript op token to assert methods
  */
-export const OPTOKEN_ASSERT = {
+export const OP_TOKEN_ASSERT = {
   InKeyword: 'in',
   EqualsEqualsToken: 'equal',
   ExclamationEqualsToken: 'notEqual',
@@ -46,7 +46,7 @@ const METHODS: Record<string, Function[]> = {
   test: [RegExp]
 };
 
-const OP_TOKEN_TO_NAME = new Map<number, keyof typeof OPTOKEN_ASSERT>();
+const OP_TOKEN_TO_NAME = new Map<number, keyof typeof OP_TOKEN_ASSERT>();
 
 const AssertSymbol = Symbol();
 const IsTestSymbol = Symbol();
@@ -96,21 +96,21 @@ export class AssertTransformer {
   }
 
   /**
-   * Resolves optoken to syntax kind.  Relies on `ts`
+   * Resolves op token to syntax kind.  Relies on `ts`
    */
   static lookupOpToken(key: number): string | undefined {
     if (OP_TOKEN_TO_NAME.size === 0) {
       Object.keys(ts.SyntaxKind)
         .filter(kind => !/^\d+$/.test(kind))
-        .filter((kind): kind is keyof typeof OPTOKEN_ASSERT => !/^(Last|First)/.test(kind))
+        .filter((kind): kind is keyof typeof OP_TOKEN_ASSERT => !/^(Last|First)/.test(kind))
         .forEach(kind => {
           OP_TOKEN_TO_NAME.set(ts.SyntaxKind[kind], kind);
         });
     }
 
     const name = OP_TOKEN_TO_NAME.get(key)!;
-    if (name in OPTOKEN_ASSERT) {
-      return OPTOKEN_ASSERT[name];
+    if (name in OP_TOKEN_ASSERT) {
+      return OP_TOKEN_ASSERT[name];
     } else {
       return;
     }
@@ -142,12 +142,12 @@ export class AssertTransformer {
    */
   static initState(state: TransformerState & AssertState): void {
     if (!state[AssertSymbol]) {
-      const asrt = state.importFile('@travetto/test/src/assert/check.ts').identifier;
+      const assertion = state.importFile('@travetto/test/src/assert/check.ts').identifier;
       state[AssertSymbol] = {
-        assert: asrt,
-        assertCheck: CoreUtil.createAccess(state.factory, asrt, ASSERT_UTIL, 'check'),
-        checkThrow: CoreUtil.createAccess(state.factory, asrt, ASSERT_UTIL, 'checkThrow'),
-        checkThrowAsync: CoreUtil.createAccess(state.factory, asrt, ASSERT_UTIL, 'checkThrowAsync')
+        assert: assertion,
+        assertCheck: CoreUtil.createAccess(state.factory, assertion, ASSERT_UTIL, 'check'),
+        checkThrow: CoreUtil.createAccess(state.factory, assertion, ASSERT_UTIL, 'checkThrow'),
+        checkThrowAsync: CoreUtil.createAccess(state.factory, assertion, ASSERT_UTIL, 'checkThrowAsync')
       };
     }
   }