@travetto/cli 4.0.1 → 4.0.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cli",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "CLI infrastructure for Travetto framework",
   "keywords": [
     "cli",
@@ -29,7 +29,7 @@
     "directory": "module/cli"
   },
   "dependencies": {
-    "@travetto/schema": "^4.0.1",
+    "@travetto/schema": "^4.0.2",
     "@travetto/terminal": "^4.0.1"
   },
   "travetto": {

package/src/error.ts

@@ -1,3 +1,4 @@
+import { AppError } from '@travetto/base';
 import { PackageUtil, RuntimeContext } from '@travetto/manifest';
 import { cliTpl } from './color';
 import { CliValidationError, CliCommandShape } from './types';
@@ -48,13 +49,11 @@ ${{ identifier: install }}
 /**
  * Provides a basic error wrapper for cli validation issues
  */
-export class CliValidationResultError extends Error {
-  errors: CliValidationError[];
+export class CliValidationResultError extends AppError<{ errors: CliValidationError[] }> {
   command: CliCommandShape;
 
   constructor(command: CliCommandShape, errors: CliValidationError[]) {
-    super('');
+    super('', undefined, { errors });
     this.command = command;
-    this.errors = errors;
   }
 }

package/src/execute.ts

@@ -6,6 +6,7 @@ import { CliCommandSchemaUtil } from './schema';
 import { CliUnknownCommandError, CliValidationResultError } from './error';
 import { CliParseUtil } from './parse';
 import { CliUtil } from './util';
+import { CliCommandShape } from './types';
 
 /**
  * Execution manager
@@ -31,8 +32,8 @@ export class ExecutionManager {
     console.error!();
   }
 
-  /** Run command */
-  static async #runCommand(cmd: string, args: string[]): Promise<void> {
+  /** Bind command  */
+  static async #bindCommand(cmd: string, args: string[]): Promise<{ command: CliCommandShape, boundArgs: unknown[] }> {
     const command = await CliCommandRegistry.getInstance(cmd, true);
     const schema = await CliCommandSchemaUtil.getSchema(command);
     const fullArgs = await CliParseUtil.expandArgs(schema, args);
@@ -40,6 +41,12 @@ export class ExecutionManager {
 
     await command.preBind?.();
     const boundArgs = await CliCommandSchemaUtil.bindInput(command, state);
+    return { command, boundArgs };
+  }
+
+  /** Run command */
+  static async #runCommand(cmd: string, args: string[]): Promise<void> {
+    const { command, boundArgs } = await this.#bindCommand(cmd, args);
 
     await command.preValidate?.();
     await CliCommandSchemaUtil.validate(command, boundArgs);
@@ -62,7 +69,8 @@ export class ExecutionManager {
       if (!cmd) {
         console.info!(await HelpUtil.renderAllHelp());
       } else if (help) {
-        console.log!(await HelpUtil.renderCommandHelp(cmd));
+        const { command } = await this.#bindCommand(cmd, args)
+        console.log!(await HelpUtil.renderCommandHelp(command));
       } else {
         await this.#runCommand(cmd, args);
       }

package/src/help.ts

@@ -134,7 +134,7 @@ export class HelpUtil {
   static renderValidationError(err: CliValidationResultError): string {
     return [
       cliTpl`${{ failure: 'Execution failed' }}:`,
-      ...err.errors.map(e => e.source && e.source !== 'custom' ?
+      ...err.details.errors.map(e => e.source && e.source !== 'custom' ?
         cliTpl` * ${{ identifier: validationSourceMap[e.source] }} ${{ subtitle: e.message }}` :
         cliTpl` * ${{ failure: e.message }}`),
       '',

package/src/schema.ts

@@ -182,7 +182,7 @@ export class CliCommandSchemaUtil {
       if (!(err instanceof CliValidationResultError) && !(err instanceof ValidationResultError)) {
         throw err;
       }
-      return err.errors.map(v => ({ source: SOURCES[i], ...v }));
+      return err.details.errors.map(v => ({ source: SOURCES[i], ...v }));
     }));
 
     const errors = (await Promise.all(results)).flatMap(x => (x ?? []));