@travetto/cli 3.4.0-rc.9 → 3.4.0

package/README.md

@@ -170,7 +170,7 @@ Options:
 $ trv basic:arg 20
 
 Execution failed:
- * Argument  is bigger than (10)
+ * Argument volume is bigger than (10)
 
 Usage: basic:arg [options] [volume:number]
 
@@ -233,7 +233,7 @@ $ trv basic:arglist 10 5 3 9 8 1
 $ trv basic:arglist 10 5 3 9 20 1
 
 Execution failed:
- * Argument [4] is bigger than (10)
+ * Argument volumes[4] is bigger than (10)
 
 Usage: basic:arglist [options] <volumes...:number>
 
@@ -390,7 +390,7 @@ export interface CliCommandShape {
   /**
    * Setup environment before command runs
    */
-  envInit?(): OrProm<GlobalEnvConfig>;
+  envInit?(): OrProm<EnvInit>;
   /**
    * Extra help
    */
@@ -454,7 +454,7 @@ export class RunRestCommand {
 }
 ```
 
-As noted in the example above, `fields` is specified in this execution, with support for `module`, and `env`. These env flag is directly tied to the [GlobalEnv](https://github.com/travetto/travetto/tree/main/module/base/src/global-env.ts#L17) flags defined in the [Base](https://github.com/travetto/travetto/tree/main/module/base#readme "Environment config and common utilities for travetto applications.") module. 
+As noted in the example above, `fields` is specified in this execution, with support for `module`, and `env`. These env flag is directly tied to the [GlobalEnv](https://github.com/travetto/travetto/tree/main/module/base/src/global-env.ts#L9) flags defined in the [Base](https://github.com/travetto/travetto/tree/main/module/base#readme "Environment config and common utilities for travetto applications.") module. 
 
 The `module` field is slightly more complex, but is geared towards supporting commands within a monorepo context.  This flag ensures that a module is specified if running from the root of the monorepo, and that the module provided is real, and can run the desired command.  When running from an explicit module folder in the monorepo, the module flag is ignored.
 

package/package.json

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

package/src/decorators.ts

@@ -1,4 +1,4 @@
-import { Class, ClassInstance, ConsoleManager, GlobalEnv, defineGlobalEnv } from '@travetto/base';
+import { Class, ClassInstance, ConsoleManager, GlobalEnv, defineEnv } from '@travetto/base';
 import { RootIndex } from '@travetto/manifest';
 import { SchemaRegistry } from '@travetto/schema';
 
@@ -26,7 +26,7 @@ export function CliCommand(cfg: CliCommandConfigOptions = {}) {
       hidden: cfg.hidden,
       preMain: async (cmd) => {
         if (addEnv && 'env' in cmd && typeof cmd.env === 'string') {
-          defineGlobalEnv({ envName: cmd.env });
+          defineEnv({ envName: cmd.env });
           ConsoleManager.setDebug(GlobalEnv.debug, GlobalEnv.devMode);
         }
       }

package/src/execute.ts

@@ -1,5 +1,5 @@
 import { GlobalTerminal } from '@travetto/terminal';
-import { ConsoleManager, defineGlobalEnv, ShutdownManager, GlobalEnv } from '@travetto/base';
+import { ConsoleManager, defineEnv, ShutdownManager, GlobalEnv } from '@travetto/base';
 
 import { HelpUtil } from './help';
 import { CliCommandShape } from './types';
@@ -14,7 +14,7 @@ export class ExecutionManager {
 
   static async #envInit(cmd: CliCommandShape): Promise<void> {
     if (cmd.envInit) {
-      defineGlobalEnv(await cmd.envInit());
+      defineEnv(await cmd.envInit());
       ConsoleManager.setDebug(GlobalEnv.debug, GlobalEnv.devMode);
     }
   }

package/src/schema.ts

@@ -237,9 +237,11 @@ export class CliCommandSchemaUtil {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const cls = cmd.constructor as Class<CliCommandShape>;
 
+    const paramNames = SchemaRegistry.getMethodSchema(cls, 'main').map(x => x.name);
+
     const validators = [
       (): Promise<void> => SchemaValidator.validate(cls, cmd).then(() => { }),
-      (): Promise<void> => SchemaValidator.validateMethod(cls, 'main', args),
+      (): Promise<void> => SchemaValidator.validateMethod(cls, 'main', args, paramNames),
       async (): Promise<void> => {
         const res = await cmd.validate?.(...args);
         if (res) {

package/src/types.ts

@@ -1,4 +1,4 @@
-import { Closeable, GlobalEnvConfig } from '@travetto/base';
+import { Closeable, EnvInit } from '@travetto/base';
 
 type OrProm<T> = T | Promise<T>;
 
@@ -29,7 +29,7 @@ export interface CliCommandShape {
   /**
    * Setup environment before command runs
    */
-  envInit?(): OrProm<GlobalEnvConfig>;
+  envInit?(): OrProm<EnvInit>;
   /**
    * Extra help
    */