@travetto/test 2.1.0 → 2.1.3

package/bin/cli-test.ts

@@ -1,5 +1,5 @@
 import * as os from 'os';
-import * as fs from 'fs';
+import { readFileSync } from 'fs';
 
 import { FsUtil, PathUtil, ScanFs } from '@travetto/boot';
 import { BasePlugin } from '@travetto/cli/src/plugin-base';
@@ -22,7 +22,7 @@ export class TestPlugin extends BasePlugin {
         PathUtil.resolveUnix(__dirname, '..', 'src/consumer/types/')
       )
         .filter(x => x.stats.isFile())
-        .map(x => fs.readFileSync(x.file, 'utf8').match(/@Consumable[(]'([^']+)/)?.[1] as string);
+        .map(x => readFileSync(x.file, 'utf8').match(/@Consumable[(]'([^']+)/)?.[1] as string);
     }
     return this._types;
   }

package/bin/test-child.ts

@@ -1,4 +1,4 @@
-import * as fs from 'fs';
+import { createWriteStream } from 'fs';
 
 import { AppCache } from '@travetto/boot';
 import { EnvInit } from '@travetto/base/bin/init';
@@ -7,7 +7,7 @@ export async function customLogs() {
   const { ConsoleManager } = await import('@travetto/base');
 
   const c = new console.Console({
-    stdout: fs.createWriteStream(AppCache.toEntryName(`test-worker.${process.pid}.log`), { flags: 'a' }),
+    stdout: createWriteStream(AppCache.toEntryName(`test-worker.${process.pid}.log`), { flags: 'a' }),
     inspectOptions: { depth: 4 },
   });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@travetto/test",
   "displayName": "Testing",
-  "version": "2.1.0",
+  "version": "2.1.3",
   "description": "Declarative test framework",
   "keywords": [
     "unit-testing",
@@ -29,15 +29,15 @@
     "directory": "module/test"
   },
   "dependencies": {
-    "@travetto/base": "^2.1.0",
-    "@travetto/transformer": "^2.1.0",
-    "@travetto/registry": "^2.1.0",
-    "@travetto/watch": "^2.1.0",
-    "@travetto/worker": "^2.1.0",
-    "@travetto/yaml": "^2.1.0"
+    "@travetto/base": "^2.1.2",
+    "@travetto/transformer": "^2.1.2",
+    "@travetto/registry": "^2.1.3",
+    "@travetto/watch": "^2.1.2",
+    "@travetto/worker": "^2.1.2",
+    "@travetto/yaml": "^2.1.3"
   },
   "optionalPeerDependencies": {
-    "@travetto/cli": "^2.1.0"
+    "@travetto/cli": "^2.1.2"
   },
   "publishConfig": {
     "access": "public"

package/src/assert/check.ts

@@ -34,7 +34,7 @@ export class AssertCheck {
     };
 
     // Invert check for negative
-    const asrt = positive ? assert : (x: unknown, msg?: string) => assert(!x, msg);
+    const assertFn = positive ? assert : (x: unknown, msg?: string) => assert(!x, msg);
 
     // Check fn to call
     if (fn === 'fail') {
@@ -81,13 +81,13 @@ export class AssertCheck {
 
       // Actually run the assertion
       switch (fn) {
-        case 'instanceof': asrt(actual instanceof (expected as Class), message); break;
-        case 'in': asrt((actual as string) in (expected as object), message); break;
-        case 'lessThan': asrt((actual as number) < (expected as number), message); break;
-        case 'lessThanEqual': asrt((actual as number) <= (expected as number), message); break;
-        case 'greaterThan': asrt((actual as number) > (expected as number), message); break;
-        case 'greaterThanEqual': asrt((actual as number) >= (expected as number), message); break;
-        case 'ok': asrt.apply(null, args as [unknown, string]); break; // eslint-disable-line prefer-spread
+        case 'instanceof': assertFn(actual instanceof (expected as Class), message); break;
+        case 'in': assertFn((actual as string) in (expected as object), message); break;
+        case 'lessThan': assertFn((actual as number) < (expected as number), message); break;
+        case 'lessThanEqual': assertFn((actual as number) <= (expected as number), message); break;
+        case 'greaterThan': assertFn((actual as number) > (expected as number), message); break;
+        case 'greaterThanEqual': assertFn((actual as number) >= (expected as number), message); break;
+        case 'ok': assertFn.apply(null, args as [unknown, string]); break; // eslint-disable-line prefer-spread
         default:
           if (fn && assert[fn as keyof typeof assert]) { // Assert call
             if (/not/i.test(fn)) {
@@ -95,7 +95,7 @@ export class AssertCheck {
             }
             assert[fn as 'ok'].apply(null, args as [boolean, string | undefined]);
           } else if (expected && !!(expected as Record<string, Function>)[fn]) { // Dotted Method call (e.g. assert.rejects)
-            asrt((expected as typeof assert)[fn as 'ok'](actual));
+            assertFn((expected as typeof assert)[fn as 'ok'](actual));
           }
       }
 

package/src/execute/executor.ts

@@ -1,5 +1,5 @@
 import * as path from 'path';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 
 import { Util } from '@travetto/base';
 import { ExecUtil, PathUtil } from '@travetto/boot';
@@ -271,7 +271,7 @@ export class TestExecutor {
    */
   static async executeIsolated(consumer: TestConsumer, file: string, ...args: string[]) {
     // Read modules for extensions
-    const modules = [...(await fs.promises.readFile(file, 'utf8'))
+    const modules = [...(await fs.readFile(file, 'utf8'))
       .matchAll(/\/\/\s*@file-if\s+(@travetto\/[A-Za-z0-9\-]+)/g)]
       .map(x => x[1]);
 

package/src/execute/util.ts

@@ -1,4 +1,4 @@
-import * as fs from 'fs';
+import { createReadStream } from 'fs';
 import * as readline from 'readline';
 
 import { ShutdownManager, Util } from '@travetto/base';
@@ -20,7 +20,7 @@ export class RunnerUtil {
    */
   static isTestFile(file: string) {
     return new Promise<boolean>((resolve) => {
-      const input = fs.createReadStream(file);
+      const input = createReadStream(file);
       const reader = readline.createInterface({ input })
         .on('line', line => {
           if (line.includes('@Suite')) {

package/src/execute/watcher.ts

@@ -38,6 +38,9 @@ export class TestWatcher {
 
     new MethodSource(RootRegistry).on(e => {
       const [cls, method] = (e.prev ?? e.curr ?? []) as [Class, Function];
+      if (!cls) {
+        return;
+      }
       if (!method) {
         consumer.removeClass(cls.ᚕid);
         return;