@travetto/cli 3.0.0-rc.20 → 3.0.0-rc.22

package/README.md

@@ -21,12 +21,13 @@ $ trv --help
 Usage:  [options] [command]
 
 Options:
-  -V, --version             output the version number
-  -h, --help                display help for command
+  -V, --version                  output the version number
+  -h, --help                     display help for command
 
 Commands:
   echo [options] [args...]
-  help [command]            display help for command
+  main <fileOrImport> [args...]
+  help [command]                 display help for command
 ```
 
 This will show all the available options/choices that are exposed given the currently installed modules.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cli",
-  "version": "3.0.0-rc.20",
+  "version": "3.0.0-rc.22",
   "description": "CLI infrastructure for travetto framework",
   "keywords": [
     "cli",
@@ -24,9 +24,9 @@
     "directory": "module/cli"
   },
   "dependencies": {
-    "@travetto/base": "^3.0.0-rc.17",
+    "@travetto/base": "^3.0.0-rc.19",
     "@travetto/terminal": "^3.0.0-rc.10",
-    "@travetto/worker": "^3.0.0-rc.17",
+    "@travetto/worker": "^3.0.0-rc.19",
     "commander": "^10.0.0"
   },
   "travetto": {

package/src/execute.ts

@@ -1,9 +1,7 @@
-import fs from 'fs/promises';
 import { program as commander } from 'commander';
 
-import { PackageUtil, path, RootIndex } from '@travetto/manifest';
+import { PackageUtil } from '@travetto/manifest';
 import { GlobalTerminal } from '@travetto/terminal';
-import { ShutdownManager } from '@travetto/base';
 
 import { CliCommandManager } from './command-manager';
 import { HelpUtil } from './help';
@@ -43,28 +41,6 @@ export class ExecutionManager {
     }
   }
 
-  /**
-   * Run file expecting a main method
-   */
-  static async runMain(file: string, args: string[]): Promise<void> {
-    try {
-      // If referenced file exists
-      if (await (fs.stat(path.resolve(file)).then(() => true, () => false))) {
-        file = path.join(RootIndex.manifest.mainModule, file);
-      }
-
-      const imp = RootIndex.getFromImport(file)?.import;
-      if (!imp) {
-        throw new Error(`Unknown file: ${file}`);
-      }
-
-      const mod = await import(imp);
-      await ShutdownManager.exitWithResponse(await mod.main(...args));
-    } catch (err) {
-      await ShutdownManager.exitWithResponse(err, true);
-    }
-  }
-
   /**
    * Execute the command line
    * @param args
@@ -83,10 +59,7 @@ export class ExecutionManager {
     await init();
 
     const [, , cmd, ...args] = argv;
-    if (cmd === 'main') {
-      const [file, ...rest] = args;
-      await this.runMain(file, rest);
-    } else if (cmd && !cmd.startsWith('-')) {
+    if (cmd && !cmd.startsWith('-')) {
       await this.runCommand(cmd, args);
     } else {
       // Load all commands

package/support/cli.main.ts

@@ -0,0 +1,38 @@
+import fs from 'fs/promises';
+
+import { ShutdownManager } from '@travetto/base';
+import { CliCommand } from '@travetto/cli';
+import { path, RootIndex } from '@travetto/manifest';
+
+/**
+ * `npx trv main`
+ *
+ * Allows for running of main entry points
+ */
+export class MainCommand extends CliCommand {
+
+  name = 'main';
+
+  getArgs(): string {
+    return '<fileOrImport> [args...]';
+  }
+
+  async action(file: string, args: string[]): Promise<void> {
+    try {
+      // If referenced file exists
+      if (await (fs.stat(path.resolve(file)).then(() => true, () => false))) {
+        file = path.join(RootIndex.manifest.mainModule, file);
+      }
+
+      const imp = RootIndex.getFromImport(file)?.import;
+      if (!imp) {
+        throw new Error(`Unknown file: ${file}`);
+      }
+
+      const mod = await import(imp);
+      await ShutdownManager.exitWithResponse(await mod.main(...args));
+    } catch (err) {
+      await ShutdownManager.exitWithResponse(err, true);
+    }
+  }
+}