@travetto/cli 7.1.3 → 8.0.0-alpha.0

package/README.md

@@ -133,9 +133,9 @@ HELLO
 
 The [@CliCommand](https://github.com/travetto/travetto/tree/main/module/cli/src/registry/decorator.ts#L98) supports the following data types for flags:
    *  Boolean values
-   *  Number values. The [@Integer](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L166), [@Float](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L173), [@Precision](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L159), [@Min](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L93) and [@Max](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L104) decorators help provide additional validation.
-   *  String values. [@MinLength](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L93), [@MaxLength](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L104), [@Match](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L84) and [@Enum](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L58) provide additional constraints
-   *  Date values. The [@Min](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L93) and [@Max](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L104) decorators help provide additional validation.
+   *  Number values. The [@Integer](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L172), [@Float](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L179), [@Precision](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L165), [@Min](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L99) and [@Max](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L110) decorators help provide additional validation.
+   *  String values. [@MinLength](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L99), [@MaxLength](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L110), [@Match](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L90) and [@Enum](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L64) provide additional constraints
+   *  Date values. The [@Min](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L99) and [@Max](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/input.ts#L110) decorators help provide additional validation.
    *  String lists. Same as String, but allowing multiple values.
    *  Numeric lists. Same as Number, but allowing multiple values.
 
@@ -554,11 +554,11 @@ Options:
 
 Available Services
 --------------------
- * dynamodb@3.1.0
- * elasticsearch@9.2.3
+ * dynamodb@3.3.0
+ * elasticsearch@9.2.4
  * firestore@latest
  * mongodb@8.2
- * mysql@9.5
+ * mysql@9.6
  * postgresql@18.1
  * redis@8.4
  * s3@4.11.0
@@ -572,11 +572,11 @@ $ trv service status
 
 Service          Version    Status
 -------------------------------------------------
-dynamodb           3.1.0    Running 93af422e793a
-elasticsearch      9.2.3    Running ed76ee063d13
+dynamodb           3.3.0    Running 93af422e793a
+elasticsearch      9.2.4    Running ed76ee063d13
 firestore         latest    Running feec2e5e95b4
 mongodb              8.2    Running 5513eba6734e
-mysql                9.5    Running 307bc66d442a
+mysql                9.6    Running 307bc66d442a
 postgresql          18.1    Running e78291e71040
 redis                8.4    Running 77ba279b4e30
 s3                4.11.0    Running fdacfc55b9e3

package/package.json

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

package/src/error.ts

@@ -1,5 +1,4 @@
-import { AppError, Runtime } from '@travetto/runtime';
-import { PackageUtil } from '@travetto/manifest';
+import { RuntimeError, Runtime } from '@travetto/runtime';
 
 import { cliTpl } from './color.ts';
 import type { CliValidationError, CliCommandShape } from './types.ts';
@@ -24,7 +23,7 @@ export class CliUnknownCommandError extends Error {
     const matchedConfig = COMMAND_PACKAGE.find(([regex]) => regex.test(cmd));
     if (matchedConfig) {
       const [, pkg, production] = matchedConfig;
-      const install = PackageUtil.getInstallCommand(Runtime, `@travetto/${pkg}`, production);
+      const install = Runtime.getInstallCommand(`@travetto/${pkg}`, production);
       return cliTpl`
 ${{ title: 'Missing Package' }}\n${'-'.repeat(20)}\nTo use ${{ input: cmd }} please run:\n
 ${{ identifier: install }}
@@ -49,7 +48,7 @@ ${{ identifier: install }}
 /**
  * Provides a basic error wrapper for cli validation issues
  */
-export class CliValidationResultError extends AppError<{ errors: CliValidationError[] }> {
+export class CliValidationResultError extends RuntimeError<{ errors: CliValidationError[] }> {
   command: CliCommandShape;
 
   constructor(command: CliCommandShape, errors: CliValidationError[]) {

package/src/execute.ts

@@ -16,7 +16,7 @@ export class ExecutionManager {
   static async #onError(error: unknown): Promise<void> {
     process.exitCode ??= 1;
     if (error instanceof CliValidationResultError) {
-      console.error!(await HelpUtil.renderValidationError(error));
+      console.error!(HelpUtil.renderValidationError(error));
       console.error!(await HelpUtil.renderCommandHelp(error.command));
     } else if (error instanceof CliUnknownCommandError) {
       if (error.help) {
@@ -39,7 +39,7 @@ export class ExecutionManager {
     const state = command._parsed = await CliParseUtil.parse(schema, fullArgs);
 
     await command.preBind?.();
-    const boundArgs = await CliCommandSchemaUtil.bindInput(command, state);
+    const boundArgs = CliCommandSchemaUtil.bindInput(command, state);
     return { command, boundArgs };
   }
 

package/src/help.ts

@@ -1,6 +1,6 @@
 import util from 'node:util';
 
-import { castKey, getClass } from '@travetto/runtime';
+import { castKey, getClass, JSONUtil } from '@travetto/runtime';
 import { SchemaRegistryIndex } from '@travetto/schema';
 
 import { cliTpl } from './color.ts';
@@ -70,7 +70,7 @@ export class HelpUtil {
       const desc = [cliTpl`${{ title: field.description }}`];
 
       if (key !== 'help' && defaultValue !== undefined) {
-        desc.push(cliTpl`(default: ${{ input: JSON.stringify(defaultValue) }})`);
+        desc.push(cliTpl`(default: ${{ input: JSONUtil.toUTF8(defaultValue) }})`);
       }
       descriptions.push(desc.join(' '));
     }

package/src/module.ts

@@ -28,7 +28,7 @@ export class CliModuleUtil {
     for (const module of await CliScmUtil.findChangedModules(fromHash, toHash)) {
       out.set(module.name, module);
       if (transitive) {
-        for (const sub of await RuntimeIndex.getDependentModules(module, 'parents')) {
+        for (const sub of RuntimeIndex.getDependentModules(module, 'parents')) {
           out.set(sub.name, sub);
         }
       }

package/src/parse.ts

@@ -10,7 +10,7 @@ type ParsedInput = ParsedState['all'][number];
 
 const RAW_SEPARATOR = '--';
 const VALID_FLAG = /^-{1,2}[a-z]/i;
-const HELP_FLAG = /^-h|--help$/;
+const HELP_FLAG = /^(-h|--help)$/;
 const LONG_FLAG_WITH_EQ = /^--[a-z][^= ]+=\S+/i;
 const CONFIG_PREFIX = '+=';
 const SPACE = new Set([32, 7, 13, 10]);
@@ -134,8 +134,11 @@ export class CliParseUtil {
   static async expandArgs(schema: SchemaClassConfig, args: string[]): Promise<string[]> {
     const separatorIndex = args.includes(RAW_SEPARATOR) ? args.indexOf(RAW_SEPARATOR) : args.length;
     const module = this.getSpecifiedModule(schema, args);
-    return (await Promise.all(args.map((arg, i) =>
-      arg.startsWith(CONFIG_PREFIX) && (i < separatorIndex || separatorIndex < 0) ? this.readFlagFile(arg, module) : arg))).flat();
+    return Promise
+      .all(args.map(async (arg, i) =>
+        await (arg.startsWith(CONFIG_PREFIX) && (i < separatorIndex || separatorIndex < 0) ? this.readFlagFile(arg, module) : arg))
+      )
+      .then(expanded => expanded.flat());
   }
 
   /**

package/src/registry/registry-adapter.ts

@@ -75,12 +75,8 @@ export class CliCommandRegistryAdapter implements RegistryAdapter<CliCommandConf
    * Registers a cli command
    */
   register(...configs: Partial<CliCommandConfig>[]): CliCommandConfig {
-    const meta = describeFunction(this.#cls);
-    this.#config ??= {
-      cls: this.#cls,
-      preMain: undefined,
-      name: getName(meta.import),
-    };
+    const metadata = describeFunction(this.#cls);
+    this.#config ??= { cls: this.#cls, name: getName(metadata.import) };
     Object.assign(this.#config, ...configs);
     return this.#config;
   }

package/src/scm.ts

@@ -2,7 +2,7 @@ import { spawn } from 'node:child_process';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { AppError, ExecUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
+import { RuntimeError, ExecUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
 import type { IndexedModule } from '@travetto/manifest';
 
 export class CliScmUtil {
@@ -48,10 +48,9 @@ export class CliScmUtil {
    */
   static async findChangedFiles(fromHash: string, toHash: string = 'HEAD'): Promise<string[]> {
     const rootPath = Runtime.workspace.path;
-    console.log(`Detecting changes between ${fromHash} and ${toHash}...`);
     const result = await ExecUtil.getResult(spawn('git', ['diff', '--name-only', `${fromHash}..${toHash}`, ':!**/DOC.*', ':!**/README.*'], { cwd: rootPath }), { catch: true });
     if (!result.valid) {
-      throw new AppError('Unable to detect changes between', { category: 'data', details: { fromHash, toHash, output: (result.stderr || result.stdout) } });
+      throw new RuntimeError('Unable to detect changes between', { category: 'data', details: { fromHash, toHash, output: (result.stderr || result.stdout) } });
     }
     const out = new Set<string>();
     for (const line of result.stdout.split(/\n/g)) {

package/src/service.ts

@@ -42,7 +42,7 @@ export class ServiceRunner {
   async #isRunning(full = false): Promise<boolean> {
     const port = ports(this.#descriptor.port!)[0];
     const start = Date.now();
-    const timeoutMs = TimeUtil.asMillis(full ? this.#descriptor.startupTimeout ?? 5000 : 100);
+    const timeoutMs = TimeUtil.duration(full ? this.#descriptor.startupTimeout ?? 5000 : 100, 'ms');
     while ((Date.now() - start) < timeoutMs) {
       try {
         const sock = net.createConnection(port, 'localhost');
@@ -134,7 +134,7 @@ export class ServiceRunner {
       if (operation === 'restart' || operation === 'start') {
         if (!await this.#hasImage()) {
           yield ['message', 'Starting image download'];
-          for await (const line of await this.#pullImage()) {
+          for await (const line of this.#pullImage()) {
             yield ['message', `Downloading: ${line}`];
           }
           yield ['message', 'Image download complete'];

package/src/util.ts

@@ -1,6 +1,6 @@
 import { spawn, type ChildProcess } from 'node:child_process';
 
-import { AppError, Env, ExecUtil, Runtime, ShutdownManager, Util, WatchUtil } from '@travetto/runtime';
+import { RuntimeError, JSONUtil, Env, ExecUtil, Runtime, ShutdownManager, Util, WatchUtil } from '@travetto/runtime';
 
 import type { CliCommandShape, CliCommandShapeFields } from './types.ts';
 
@@ -96,10 +96,10 @@ export class CliUtil {
     console.log('Triggering IPC request', request);
 
     Object.entries(process.env).forEach(([key, value]) => validEnv(key) && (env[key] = value!));
-    const sent = await fetch(Env.TRV_CLI_IPC.value!, { method: 'POST', body: JSON.stringify(request) });
+    const sent = await fetch(Env.TRV_CLI_IPC.value!, { method: 'POST', body: JSONUtil.toUTF8(request) });
 
     if (!sent.ok) {
-      throw new AppError(`IPC Request failed: ${sent.status} ${await sent.text()}`);
+      throw new RuntimeError(`IPC Request failed: ${sent.status} ${await sent.text()}`);
     }
   }
 
@@ -107,7 +107,8 @@ export class CliUtil {
    * Write data to channel and ensure its flushed before continuing
    */
   static async writeAndEnsureComplete(data: unknown, channel: 'stdout' | 'stderr' = 'stdout'): Promise<void> {
-    return await new Promise(resolve => process[channel].write(typeof data === 'string' ? data : JSON.stringify(data, null, 2), () => resolve()));
+    return await new Promise(resolve => process[channel].write(typeof data === 'string' ? data :
+      JSONUtil.toUTF8Pretty(data), () => resolve()));
   }
 
   /**

package/support/cli.main.ts

@@ -1,4 +1,4 @@
-import { Runtime } from '@travetto/runtime';
+import { JSONUtil, Runtime } from '@travetto/runtime';
 import { type CliCommandShape, CliCommand, type CliValidationError, type ParsedState } from '@travetto/cli';
 import { Ignore, IsPrivate } from '@travetto/schema';
 
@@ -32,7 +32,7 @@ export class MainCommand implements CliCommandShape {
 
     if (result !== undefined) {
       if (process.connected) { process.send?.(result); }
-      const payload = typeof result === 'string' ? result : (result instanceof Error ? result.stack : JSON.stringify(result));
+      const payload = typeof result === 'string' ? result : (result instanceof Error ? result.stack : JSONUtil.toUTF8(result));
       process[process.exitCode ? 'stderr' : 'stdout'].write(`${payload}\n`);
     }
   }

package/support/entry.trv.ts

@@ -1,3 +1,4 @@
 // @trv-no-transform
+import '@travetto/runtime/support/polyfill.js';
 import { ExecutionManager } from '@travetto/cli';
 ExecutionManager.run(process.argv);