@travetto/cli 5.0.0-rc.6 → 5.0.0-rc.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cli",
-  "version": "5.0.0-rc.6",
+  "version": "5.0.0-rc.7",
   "description": "CLI infrastructure for Travetto framework",
   "keywords": [
     "cli",
@@ -29,8 +29,8 @@
     "directory": "module/cli"
   },
   "dependencies": {
-    "@travetto/schema": "^5.0.0-rc.6",
-    "@travetto/terminal": "^5.0.0-rc.6"
+    "@travetto/schema": "^5.0.0-rc.7",
+    "@travetto/terminal": "^5.0.0-rc.7"
   },
   "travetto": {
     "displayName": "Command Line Interface",

package/src/registry.ts

@@ -76,7 +76,7 @@ class $CliCommandRegistry {
   async getInstance(name: string, failOnMissing = false): Promise<CliCommandShape | undefined> {
     const found = this.getCommandMapping().get(name);
     if (found) {
-      const values = Object.values<Class>(await import(found));
+      const values = Object.values(await Runtime.importFrom<Record<string, Class>>(found));
       for (const v of values) {
         const cfg = this.getByClass(v);
         if (cfg) {

package/support/cli.main.ts

@@ -1,7 +1,4 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-
-import { Runtime, RuntimeIndex } from '@travetto/runtime';
+import { Runtime } from '@travetto/runtime';
 import { CliCommandShape, CliCommand, CliValidationError, ParsedState } from '@travetto/cli';
 import { Ignore } from '@travetto/schema';
 
@@ -14,19 +11,10 @@ export class MainCommand implements CliCommandShape {
   @Ignore()
   _parsed: ParsedState;
 
-  async #getImport(fileOrImport: string): Promise<string | undefined> {
-    // If referenced file exists
-    let file = fileOrImport;
-    if (await (fs.stat(path.resolve(fileOrImport)).then(() => true, () => false))) {
-      file = path.join(Runtime.main.name, fileOrImport);
-    }
-
-    return RuntimeIndex.getFromImport(file)?.import;
-  }
-
   async validate(fileOrImport: string): Promise<CliValidationError | undefined> {
-    const imp = await this.#getImport(fileOrImport);
-    if (!imp) {
+    try {
+      await Runtime.importFrom(fileOrImport);
+    } catch {
       return { message: `Unknown file: ${fileOrImport}` };
     }
   }
@@ -34,8 +22,7 @@ export class MainCommand implements CliCommandShape {
   async main(fileOrImport: string, args: string[] = []): Promise<void> {
     let res: unknown;
     try {
-      const imp = await this.#getImport(fileOrImport);
-      const mod = await import(imp!);
+      const mod = await Runtime.importFrom<{ main(..._: unknown[]): Promise<unknown> }>(fileOrImport);
       res = await mod.main(...args, ...this._parsed.unknown);
     } catch (err) {
       res = err;