@travetto/cli 7.0.0-rc.0 → 7.0.0-rc.1

package/package.json

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

package/src/schema.ts

@@ -1,9 +1,19 @@
 import { castKey, castTo, getClass } from '@travetto/runtime';
 import { BindUtil, SchemaRegistryIndex, SchemaValidator, ValidationResultError } from '@travetto/schema';
 
-import { ParsedState, CliCommandShape } from './types.ts';
+import { ParsedState, CliCommandShape, CliValidationError } from './types.ts';
 import { CliValidationResultError } from './error.ts';
 
+const getSource = (source: string | undefined, def: CliValidationError['source']): CliValidationError['source'] => {
+  switch (source) {
+    case 'custom':
+    case 'arg':
+    case 'flag': return source;
+    case undefined: return def;
+    default: return 'custom';
+  }
+};
+
 /**
  * Allows binding describing/binding inputs for commands
  */
@@ -47,7 +57,7 @@ export class CliCommandSchemaUtil {
    */
   static async validate(cmd: CliCommandShape, args: unknown[]): Promise<typeof cmd> {
     const cls = getClass(cmd);
-    const paramNames = SchemaRegistryIndex.getMethodConfig(cls, 'main').parameters.map(x => x.name!);
+    const paramNames = SchemaRegistryIndex.get(cls).getMethod('main').parameters.map(x => x.name!);
 
     const validators = [
       (): Promise<void> => SchemaValidator.validate(cls, cmd).then(() => { }),
@@ -60,13 +70,13 @@ export class CliCommandSchemaUtil {
       },
     ];
 
-    const SOURCES = ['flag', 'arg', 'custom'];
+    const SOURCES = ['flag', 'arg', 'custom'] as const;
 
     const results = validators.map((x, i) => x().catch(err => {
       if (!(err instanceof CliValidationResultError) && !(err instanceof ValidationResultError)) {
         throw err;
       }
-      return err.details.errors.map(v => ({ source: SOURCES[i], ...v }));
+      return err.details.errors.map(v => ({ ...v, source: getSource(v.source, SOURCES[i]) }));
     }));
 
     const errors = (await Promise.all(results)).flatMap(x => (x ?? []));