@travetto/cli 6.0.0-rc.1 → 6.0.0-rc.3

package/README.md

@@ -43,14 +43,13 @@ Commands:
   repo:publish      Publish all pending modules
   repo:version      Version all changed dependencies
   repo:version-sync Enforces all packages to write out their versions and dependencies
-  rest:client       Run client rest operation
-  rest:rpc          Run client rest operation
   run:double        Doubles a number
-  run:rest          Run a rest server as an application
   scaffold          Command to run scaffolding
   service           Allows for running services
   test              Launch test framework and execute tests
   test:watch        Invoke the test watcher
+  web:http          Run a web server
+  web:rpc-client    Generate the web-rpc client
 ```
 
 This listing is from the [Travetto](https://travetto.dev) monorepo, and represents the majority of tools that can be invoked from the command line. 
@@ -91,10 +90,11 @@ Examples of mappings:
    *  `cli.test.ts` maps to `test`
    *  `cli.pack_docker.ts` maps to `pack:docker`
    *  `cli.email_template.ts` maps to `email:template`
+
 The pattern is that underscores(_) translate to colons (:), and the `cli.` prefix, and `.ts` suffix are dropped.
 
 ## Binding Flags
-[@CliCommand](https://github.com/travetto/travetto/tree/main/module/cli/src/decorators.ts#L84) is a wrapper for [@Schema](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/schema.ts#L14), and so every class that uses the [@CliCommand](https://github.com/travetto/travetto/tree/main/module/cli/src/decorators.ts#L84) decorator is now a full [@Schema](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/schema.ts#L14) class. The fields of the class represent the flags that are available to the command.
+[@CliCommand](https://github.com/travetto/travetto/tree/main/module/cli/src/decorators.ts#L84) is a wrapper for [@Schema](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/schema.ts#L13), and so every class that uses the [@CliCommand](https://github.com/travetto/travetto/tree/main/module/cli/src/decorators.ts#L84) decorator is now a full [@Schema](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/schema.ts#L13) class. The fields of the class represent the flags that are available to the command.
 
 **Code: Basic Command with Flag**
 ```typescript
@@ -133,9 +133,9 @@ HELLO
 
 The [@CliCommand](https://github.com/travetto/travetto/tree/main/module/cli/src/decorators.ts#L84) supports the following data types for flags:
    *  Boolean values
-   *  Number values. The [@Integer](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L166), [@Float](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L172), [@Precision](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L160), [@Min](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L101) and [@Max](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L111) decorators help provide additional validation.
-   *  String values. [@MinLength](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L101), [@MaxLength](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L111), [@Match](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L93) and [@Enum](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L72) provide additional constraints
-   *  Date values. The [@Min](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L101) and [@Max](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L111) decorators help provide additional validation.
+   *  Number values. The [@Integer](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L164), [@Float](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L170), [@Precision](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L158), [@Min](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L99) and [@Max](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L109) decorators help provide additional validation.
+   *  String values. [@MinLength](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L99), [@MaxLength](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L109), [@Match](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L91) and [@Enum](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L70) provide additional constraints
+   *  Date values. The [@Min](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L99) and [@Max](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L109) decorators help provide additional validation.
    *  String lists. Same as String, but allowing multiple values.
    *  Numeric lists. Same as Number, but allowing multiple values.
 
@@ -206,7 +206,7 @@ export class BasicCommand {
   reverse?: boolean;
 
   main(@Min(1) @Max(10) volumes: number[]) {
-    console.log(volumes.sort((a, b) => (a - b) * (this.reverse ? -1 : 1)).join(' '));
+    console.log(volumes.toSorted((a, b) => (a - b) * (this.reverse ? -1 : 1)).join(' '));
   }
 }
 ```
@@ -251,7 +251,7 @@ $ trv basic:arglist -r 10 5 3 9 8 1
 ```
 
 ## Customization
-By default, all fields are treated as flags and all parameters of `main()` are treated as arguments within the validation process.  Like the standard [@Schema](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/schema.ts#L14) behavior, we can leverage the metadata of the fields/parameters to help provide additional customization/context for the users of the commands.
+By default, all fields are treated as flags and all parameters of `main()` are treated as arguments within the validation process.  Like the standard [@Schema](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/schema.ts#L13) behavior, we can leverage the metadata of the fields/parameters to help provide additional customization/context for the users of the commands.
 
 **Code: Custom Command with Metadata**
 ```typescript
@@ -381,6 +381,7 @@ The flag files can be included in one of a few ways:
    *  `+=<name>` - This translates into `<mod>/support/<name>.flags`, which is a convenient shorthand.
    *  `+=<mod>/path/file.flags` - This is a path-related file that will be resolved from the module's location.
    *  `+=/path/file.flags` - This is an absolute path that will be read from the root of the file system.
+
 Ultimately, after resolution, the content of these files will be injected inline within the location.
 
 **Code: Final arguments after Flag File resolution**
@@ -389,7 +390,7 @@ npx trv call:db --host localhost --port 3306 --username app --password <custom>
 ```
 
 ## VSCode Integration
-By default, cli commands do not expose themselves to the VSCode extension, as the majority of them are not intended for that sort of operation.  [RESTful API](https://github.com/travetto/travetto/tree/main/module/rest#readme "Declarative api for RESTful APIs with support for the dependency injection module.") does expose a cli target `run:rest` that will show up, to help run/debug a rest application.  Any command can mark itself as being a run target, and will be eligible for running from within the [VSCode plugin](https://marketplace.visualstudio.com/items?itemName=arcsine.travetto-plugin). This is achieved by setting the `runTarget` field on the [@CliCommand](https://github.com/travetto/travetto/tree/main/module/cli/src/decorators.ts#L84) decorator.  This means the target will be visible within the editor tooling.
+By default, cli commands do not expose themselves to the VSCode extension, as the majority of them are not intended for that sort of operation.  [Web API](https://github.com/travetto/travetto/tree/main/module/web#readme "Declarative api for Web Applications with support for the dependency injection.") does expose a cli target `web:http` that will show up, to help run/debug a web application.  Any command can mark itself as being a run target, and will be eligible for running from within the [VSCode plugin](https://marketplace.visualstudio.com/items?itemName=arcsine.travetto-plugin). This is achieved by setting the `runTarget` field on the [@CliCommand](https://github.com/travetto/travetto/tree/main/module/cli/src/decorators.ts#L84) decorator.  This means the target will be visible within the editor tooling.
 
 **Code: Simple Run Target**
 ```typescript
@@ -424,7 +425,7 @@ export interface CliCommandShape<T extends unknown[] = unknown[]> {
   /**
    * Action target of the command
    */
-  main(...args: T): OrProm<RunResponse>;
+  main(...args: T): OrProm<undefined | void>;
   /**
    * Run before main runs
    */
@@ -457,22 +458,23 @@ export interface CliCommandShape<T extends unknown[] = unknown[]> {
 ```
 
 ### Dependency Injection
-If the goal is to run a more complex application, which may include depending on [Dependency Injection](https://github.com/travetto/travetto/tree/main/module/di#readme "Dependency registration/management and injection support."), we can take a look at [RESTful API](https://github.com/travetto/travetto/tree/main/module/rest#readme "Declarative api for RESTful APIs with support for the dependency injection module.")'s target:
+If the goal is to run a more complex application, which may include depending on [Dependency Injection](https://github.com/travetto/travetto/tree/main/module/di#readme "Dependency registration/management and injection support."), we can take a look at [Web API](https://github.com/travetto/travetto/tree/main/module/web#readme "Declarative api for Web Applications with support for the dependency injection.")'s target:
 
 **Code: Simple Run Target**
 ```typescript
-import { Runtime } from '@travetto/runtime';
+import { Runtime, ShutdownManager, toConcrete } from '@travetto/runtime';
 import { DependencyRegistry } from '@travetto/di';
 import { CliCommand, CliCommandShape } from '@travetto/cli';
+import { NetUtil } from '@travetto/web';
+import { RootRegistry } from '@travetto/registry';
 
-import { ServerHandle } from '../src/types';
-import { RestNetUtil } from '../src/util/net';
+import type { WebHttpServer } from '../src/types.ts';
 
 /**
- * Run a rest server as an application
+ * Run a web server
  */
 @CliCommand({ runTarget: true, with: { debugIpc: true, canRestart: true, module: true, env: true } })
-export class RunRestCommand implements CliCommandShape {
+export class WebHttpCommand implements CliCommandShape {
 
   /** Port to run on */
   port?: number;
@@ -482,35 +484,40 @@ export class RunRestCommand implements CliCommandShape {
 
   preMain(): void {
     if (this.port) {
-      process.env.REST_PORT = `${this.port}`;
+      process.env.WEB_HTTP_PORT = `${this.port}`;
     }
   }
 
-  async main(): Promise<ServerHandle | void> {
-    const { RestApplication } = await import('../src/application/rest');
+  async main(): Promise<void> {
+    await RootRegistry.init();
+    const instance = await DependencyRegistry.getInstance(toConcrete<WebHttpServer>());
+
+    let res;
     try {
-      return await DependencyRegistry.runInstance(RestApplication);
+      res = await instance.serve();
     } catch (err) {
-      if (RestNetUtil.isInuseError(err) && !Runtime.production && this.killConflict) {
-        await RestNetUtil.freePort(err.port);
-        return await DependencyRegistry.runInstance(RestApplication);
+      if (NetUtil.isPortUsedError(err) && !Runtime.production && this.killConflict) {
+        await NetUtil.freePort(err.port);
+        res = await instance.serve();
       }
       throw err;
     }
+    ShutdownManager.onGracefulShutdown(res.kill, this);
+    return res.wait;
   }
 }
 ```
 
-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 [Runtime](https://github.com/travetto/travetto/tree/main/module/runtime/src/env.ts#L114) `name` defined in the [Runtime](https://github.com/travetto/travetto/tree/main/module/runtime#readme "Runtime 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 [Runtime](https://github.com/travetto/travetto/tree/main/module/runtime/src/context.ts#L12) `name` defined in the [Runtime](https://github.com/travetto/travetto/tree/main/module/runtime#readme "Runtime 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.
 
 ### Custom Validation
-In addition to dependency injection, the command contract also allows for a custom validation function, which will have access to bound command (flags, and args) as well as the unknown arguments. When a command implements this method, any [CliValidationError](https://github.com/travetto/travetto/tree/main/module/cli/src/types.ts#L37) errors that are returned will be shared with the user, and fail to invoke the `main` method.
+In addition to dependency injection, the command contract also allows for a custom validation function, which will have access to bound command (flags, and args) as well as the unknown arguments. When a command implements this method, any [CliValidationError](https://github.com/travetto/travetto/tree/main/module/cli/src/types.ts#L32) errors that are returned will be shared with the user, and fail to invoke the `main` method.
 
 **Code: CliValidationError**
 ```typescript
-export type CliValidationError = {
+export interface CliValidationError {
   /**
    * The error message
    */

package/__index__.ts

@@ -1,14 +1,14 @@
-import type { } from './src/trv';
-export * from './src/types';
-export * from './src/decorators';
-export * from './src/execute';
-export * from './src/error';
-export * from './src/schema';
-export * from './src/registry';
-export * from './src/help';
-export * from './src/color';
-export * from './src/module';
-export * from './src/scm';
-export * from './src/parse';
-export * from './src/service';
-export * from './src/util';
+import type { } from './src/trv.d.ts';
+export * from './src/types.ts';
+export * from './src/decorators.ts';
+export * from './src/execute.ts';
+export * from './src/error.ts';
+export * from './src/schema.ts';
+export * from './src/registry.ts';
+export * from './src/help.ts';
+export * from './src/color.ts';
+export * from './src/module.ts';
+export * from './src/scm.ts';
+export * from './src/parse.ts';
+export * from './src/service.ts';
+export * from './src/util.ts';

package/package.json

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

package/src/decorators.ts

@@ -1,11 +1,11 @@
 import { Class, ClassInstance, Env, Runtime, RuntimeIndex, describeFunction } from '@travetto/runtime';
 import { FieldConfig, SchemaRegistry } from '@travetto/schema';
 
-import { CliCommandShape, CliCommandShapeFields } from './types';
-import { CliCommandRegistry } from './registry';
-import { CliModuleUtil } from './module';
-import { CliParseUtil } from './parse';
-import { CliUtil } from './util';
+import { CliCommandShape, CliCommandShapeFields } from './types.ts';
+import { CliCommandRegistry } from './registry.ts';
+import { CliModuleUtil } from './module.ts';
+import { CliParseUtil } from './parse.ts';
+import { CliUtil } from './util.ts';
 
 type Cmd = CliCommandShape & { env?: string };
 

package/src/error.ts

@@ -1,8 +1,8 @@
 import { AppError, Runtime } from '@travetto/runtime';
 import { PackageUtil } from '@travetto/manifest';
 
-import { cliTpl } from './color';
-import { CliValidationError, CliCommandShape } from './types';
+import { cliTpl } from './color.ts';
+import { CliValidationError, CliCommandShape } from './types.ts';
 
 const COMMAND_PACKAGE = [
   [/^test(:watch)?$/, 'test', false],
@@ -12,7 +12,8 @@ const COMMAND_PACKAGE = [
   [/^openapi:(spec|client)$/, 'openapi', true],
   [/^email:(compile|editor)$/, 'email-compiler', false],
   [/^pack(:zip|:docker)?$/, 'pack', false],
-  [/^run:rest$/, 'rest', false],
+  [/^web:http$/, 'web-http-server', false],
+  [/^web:rpc-client$/, 'web-rpc', false],
 ] as const;
 
 /**

package/src/execute.ts

@@ -1,12 +1,11 @@
 import { ConsoleManager, Runtime, ShutdownManager } from '@travetto/runtime';
 
-import { HelpUtil } from './help';
-import { CliCommandRegistry } from './registry';
-import { CliCommandSchemaUtil } from './schema';
-import { CliUnknownCommandError, CliValidationResultError } from './error';
-import { CliParseUtil } from './parse';
-import { CliUtil } from './util';
-import { CliCommandShape } from './types';
+import { HelpUtil } from './help.ts';
+import { CliCommandRegistry } from './registry.ts';
+import { CliCommandSchemaUtil } from './schema.ts';
+import { CliUnknownCommandError, CliValidationResultError } from './error.ts';
+import { CliParseUtil } from './parse.ts';
+import { CliCommandShape } from './types.ts';
 
 /**
  * Execution manager
@@ -55,8 +54,7 @@ export class ExecutionManager {
     await command.preMain?.();
 
     ConsoleManager.debug(Runtime.debug);
-    const result = await command.main(...boundArgs);
-    await CliUtil.listenForResponse(result);
+    await command.main(...boundArgs);
   }
 
   /**

package/src/help.ts

@@ -2,12 +2,12 @@ import util from 'node:util';
 
 import { castKey, castTo, Primitive } from '@travetto/runtime';
 
-import { cliTpl } from './color';
-import { CliCommandShape } from './types';
-import { CliCommandRegistry } from './registry';
-import { CliCommandSchemaUtil } from './schema';
-import { CliValidationResultError } from './error';
-import { isBoolFlag } from './parse';
+import { cliTpl } from './color.ts';
+import { CliCommandShape } from './types.ts';
+import { CliCommandRegistry } from './registry.ts';
+import { CliCommandSchemaUtil } from './schema.ts';
+import { CliValidationResultError } from './error.ts';
+import { isBoolFlag } from './parse.ts';
 
 const validationSourceMap = {
   custom: '',
@@ -97,7 +97,7 @@ export class HelpUtil {
    */
   static async renderAllHelp(title?: string): Promise<string> {
     const rows: string[] = [];
-    const keys = [...CliCommandRegistry.getCommandMapping().keys()].sort((a, b) => a.localeCompare(b));
+    const keys = [...CliCommandRegistry.getCommandMapping().keys()].toSorted((a, b) => a.localeCompare(b));
     const maxWidth = keys.reduce((a, b) => Math.max(a, util.stripVTControlCharacters(b).length), 0);
 
     for (const cmd of keys) {

package/src/module.ts

@@ -1,7 +1,7 @@
 import { Runtime, RuntimeIndex } from '@travetto/runtime';
 import type { IndexedModule } from '@travetto/manifest';
 
-import { CliScmUtil } from './scm';
+import { CliScmUtil } from './scm.ts';
 
 type ModuleGraphEntry = { children: Set<string>, name: string, active: Set<string>, parents?: string[] };
 
@@ -35,7 +35,7 @@ export class CliModuleUtil {
     }
 
     return [...out.values()]
-      .sort((a, b) => a.name.localeCompare(b.name));
+      .toSorted((a, b) => a.name.localeCompare(b.name));
   }
 
   /**

package/src/parse.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 import { Runtime } from '@travetto/runtime';
-import { CliCommandInput, CliCommandSchema, ParsedState } from './types';
+import { CliCommandInput, CliCommandSchema, ParsedState } from './types.ts';
 
 type ParsedInput = ParsedState['all'][number];
 
@@ -77,15 +77,32 @@ export class CliParseUtil {
     return { next: i, value: collected.length ? String.fromCharCode(...collected) : undefined };
   }
 
+  /**
+   * Get a user-specified module if present
+   */
+  static getSpecifiedModule(schema: CliCommandSchema, args: string[]): string | undefined {
+    const SEP = args.includes(RAW_SEP) ? args.indexOf(RAW_SEP) : args.length;
+    const input = schema.flags.find(x => x.type === 'module');
+    const ENV_KEY = input?.flagNames?.filter(x => x.startsWith(ENV_PRE)).map(x => x.replace(ENV_PRE, ''))[0] ?? '';
+    const flags = new Set(input?.flagNames ?? []);
+    const check = (k?: string, v?: string): string | undefined => flags.has(k!) ? v : undefined;
+    return args.reduce(
+      (m, x, i, arr) =>
+        (i < SEP ? check(arr[i - 1], x) ?? check(...x.split('=')) : undefined) ?? m,
+      process.env[ENV_KEY]
+    );
+  }
+
   /**
    * Read configuration file given flag
    */
-  static async readFlagFile(flag: string, mod: string): Promise<string[]> {
+  static async readFlagFile(flag: string, mod?: string): Promise<string[]> {
     const key = flag.replace(CONFIG_PRE, '');
+    const overrides = { '@': mod ?? Runtime.main.name };
 
     // We have a file
     const rel = (key.includes('/') ? key : `@#support/pack.${key}.flags`)
-      .replace(/^(@[^#]*)#(.*)$/, (_, imp, rest) => `${Runtime.modulePath(imp)}/${rest}`);
+      .replace(/^(@[^#]*)#(.*)$/, (_, imp, rest) => `${Runtime.modulePath(imp, overrides)}/${rest}`);
 
     const file = path.resolve(rel);
 
@@ -129,15 +146,7 @@ export class CliParseUtil {
    */
   static async expandArgs(schema: CliCommandSchema, args: string[]): Promise<string[]> {
     const SEP = args.includes(RAW_SEP) ? args.indexOf(RAW_SEP) : args.length;
-    const input = schema.flags.find(x => x.type === 'module');
-    const ENV_KEY = input?.flagNames?.filter(x => x.startsWith(ENV_PRE)).map(x => x.replace(ENV_PRE, ''))[0] ?? '';
-    const flags = new Set(input?.flagNames ?? []);
-    const check = (k?: string, v?: string): string | undefined => flags.has(k!) ? v : undefined;
-    const mod = args.reduce(
-      (m, x, i, arr) =>
-        (i < SEP ? check(arr[i - 1], x) ?? check(...x.split('=')) : undefined) ?? m,
-      process.env[ENV_KEY] || Runtime.main.name
-    );
+    const mod = this.getSpecifiedModule(schema, args);
     return (await Promise.all(args.map((x, i) =>
       x.startsWith(CONFIG_PRE) && (i < SEP || SEP < 0) ? this.readFlagFile(x, mod) : x))).flat();
   }

package/src/registry.ts

@@ -1,7 +1,7 @@
 import { asConstructable, Class, classConstruct, describeFunction, Runtime, RuntimeIndex } from '@travetto/runtime';
 
-import { CliCommandConfig, CliCommandShape } from './types';
-import { CliUnknownCommandError } from './error';
+import { CliCommandConfig, CliCommandShape } from './types.ts';
+import { CliUnknownCommandError } from './error.ts';
 
 const CLI_FILE_REGEX = /\/cli[.](?<name>.{0,100}?)([.]tsx?)?$/;
 const getName = (s: string): string => (s.match(CLI_FILE_REGEX)?.groups?.name ?? s).replaceAll('_', ':');

package/src/schema.ts

@@ -1,9 +1,9 @@
 import { castKey, castTo, Class } from '@travetto/runtime';
 import { BindUtil, FieldConfig, SchemaRegistry, SchemaValidator, ValidationResultError } from '@travetto/schema';
 
-import { CliCommandRegistry } from './registry';
-import { ParsedState, CliCommandInput, CliCommandSchema, CliCommandShape } from './types';
-import { CliValidationResultError } from './error';
+import { CliCommandRegistry } from './registry.ts';
+import { ParsedState, CliCommandInput, CliCommandSchema, CliCommandShape } from './types.ts';
+import { CliValidationResultError } from './error.ts';
 
 const LONG_FLAG = /^--[a-z][^= ]+/i;
 const SHORT_FLAG = /^-[a-z]/i;

package/src/scm.ts

@@ -48,18 +48,18 @@ export class CliScmUtil {
    */
   static async findChangedFiles(fromHash: string, toHash: string = 'HEAD'): Promise<string[]> {
     const ws = Runtime.workspace.path;
-    const res = await ExecUtil.getResult(spawn('git', ['diff', '--name-only', `${fromHash}..${toHash}`, ':!**/DOC.*', ':!**/README.*'], { cwd: ws }), { catch: true });
-    if (!res.valid) {
-      throw new AppError('Unable to detect changes between', { category: 'data', details: { fromHash, toHash, output: (res.stderr || res.stdout) } });
+    const result = await ExecUtil.getResult(spawn('git', ['diff', '--name-only', `${fromHash}..${toHash}`, ':!**/DOC.*', ':!**/README.*'], { cwd: ws }), { catch: true });
+    if (!result.valid) {
+      throw new AppError('Unable to detect changes between', { category: 'data', details: { fromHash, toHash, output: (result.stderr || result.stdout) } });
     }
     const out = new Set<string>();
-    for (const line of res.stdout.split(/\n/g)) {
+    for (const line of result.stdout.split(/\n/g)) {
       const entry = RuntimeIndex.getEntry(path.resolve(ws, line));
       if (entry) {
         out.add(entry.sourceFile);
       }
     }
-    return [...out].sort((a, b) => a.localeCompare(b));
+    return [...out].toSorted((a, b) => a.localeCompare(b));
   }
 
   /**
@@ -77,7 +77,7 @@ export class CliScmUtil {
       .filter(x => !!x);
 
     return [...new Set(mods)]
-      .sort((a, b) => a.name.localeCompare(b.name));
+      .toSorted((a, b) => a.name.localeCompare(b.name));
   }
 
   /**

package/src/service.ts

@@ -53,9 +53,9 @@ export class ServiceRunner {
         if (!this.svc.ready?.url || !full) {
           return true;
         } else {
-          const req = await fetch(this.svc.ready.url, { method: 'GET' });
-          const text = await req.text();
-          if (req.ok && (this.svc.ready.test?.(text) ?? true)) {
+          const response = await fetch(this.svc.ready.url, { method: 'GET' });
+          const text = await response.text();
+          if (response.ok && (this.svc.ready.test?.(text) ?? true)) {
             return true;
           }
         }

package/src/types.ts

@@ -1,12 +1,6 @@
 import { Class } from '@travetto/runtime';
 
 type OrProm<T> = T | Promise<T>;
-
-export type RunResponse =
-  { wait(): Promise<unknown> } |
-  { on(event: 'close', cb: Function): unknown } |
-  { close: () => (void | Promise<void>) } | void | undefined;
-
 type ParsedFlag = { type: 'flag', input: string, array?: boolean, fieldName: string, value?: unknown };
 type ParsedArg = { type: 'arg', input: string, array?: boolean, index: number };
 type ParsedUnknown = { type: 'unknown', input: string };
@@ -33,8 +27,9 @@ export type ParsedState = {
 
 /**
  * Constrained version of Schema's Validation Error
+ * @concrete
  */
-export type CliValidationError = {
+export interface CliValidationError {
   /**
    * The error message
    */
@@ -47,6 +42,7 @@ export type CliValidationError = {
 
 /**
  * CLI Command Contract
+ * @concrete
  */
 export interface CliCommandShape<T extends unknown[] = unknown[]> {
 
@@ -61,7 +57,7 @@ export interface CliCommandShape<T extends unknown[] = unknown[]> {
   /**
    * Action target of the command
    */
-  main(...args: T): OrProm<RunResponse>;
+  main(...args: T): OrProm<undefined | void>;
   /**
    * Run before main runs
    */

package/src/util.ts

@@ -1,8 +1,8 @@
 import { spawn } from 'node:child_process';
 
-import { Env, ExecUtil, ShutdownManager, Runtime } from '@travetto/runtime';
+import { Env, ExecUtil, Runtime } from '@travetto/runtime';
 
-import { CliCommandShape, CliCommandShapeFields, RunResponse } from './types';
+import { CliCommandShape, CliCommandShapeFields } from './types.ts';
 
 const IPC_ALLOWED_ENV = new Set(['NODE_OPTIONS']);
 const IPC_INVALID_ENV = new Set(['PS1', 'INIT_CWD', 'COLOR', 'LANGUAGE', 'PROFILEHOME', '_']);
@@ -11,7 +11,6 @@ const validEnv = (k: string): boolean => IPC_ALLOWED_ENV.has(k) || (!IPC_INVALID
 export class CliUtil {
   /**
    * Get a simplified version of a module name
-   * @returns
    */
   static getSimpleModuleName(placeholder: string, module?: string): string {
     const simple = (module ?? Runtime.main.name).replace(/[\/]/, '_').replace(/@/, '');
@@ -88,21 +87,4 @@ export class CliUtil {
   static async writeAndEnsureComplete(data: unknown, channel: 'stdout' | 'stderr' = 'stdout'): Promise<void> {
     return await new Promise(r => process[channel].write(typeof data === 'string' ? data : JSON.stringify(data, null, 2), () => r()));
   }
-
-  /**
-   * Listen for a run response to finish
-   */
-  static async listenForResponse(result: RunResponse): Promise<void> {
-    // Listen to result if non-empty
-    if (result !== undefined && result !== null) {
-      if ('close' in result) {
-        ShutdownManager.onGracefulShutdown(async () => result.close()); // Tie shutdown into app close
-      }
-      if ('wait' in result) {
-        await result.wait(); // Wait for close signal
-      } else if ('on' in result) {
-        await new Promise<void>(res => result.on('close', res)); // Wait for callback
-      }
-    }
-  }
 }

package/support/cli.cli_schema.ts

@@ -1,10 +1,10 @@
 import { Env } from '@travetto/runtime';
 
-import { CliCommand } from '../src/decorators';
-import { CliCommandSchema, CliCommandShape, CliValidationError } from '../src/types';
-import { CliCommandRegistry } from '../src/registry';
-import { CliCommandSchemaUtil } from '../src/schema';
-import { CliUtil } from '../src/util';
+import { CliCommand } from '../src/decorators.ts';
+import { CliCommandSchema, CliCommandShape, CliValidationError } from '../src/types.ts';
+import { CliCommandRegistry } from '../src/registry.ts';
+import { CliCommandSchemaUtil } from '../src/schema.ts';
+import { CliUtil } from '../src/util.ts';
 
 /**
  * Generates the schema for all CLI operations

package/support/cli.main.ts

@@ -20,18 +20,18 @@ export class MainCommand implements CliCommandShape {
   }
 
   async main(fileOrImport: string, args: string[] = []): Promise<void> {
-    let res: unknown;
+    let result: unknown;
     try {
       const mod = await Runtime.importFrom<{ main(..._: unknown[]): Promise<unknown> }>(fileOrImport);
-      res = await mod.main(...args, ...this._parsed.unknown);
+      result = await mod.main(...args, ...this._parsed.unknown);
     } catch (err) {
-      res = err;
+      result = err;
       process.exitCode = Math.max(process.exitCode ? +process.exitCode : 1, 1);
     }
 
-    if (res !== undefined) {
-      if (process.connected) { process.send?.(res); }
-      const payload = typeof res === 'string' ? res : (res instanceof Error ? res.stack : JSON.stringify(res));
+    if (result !== undefined) {
+      if (process.connected) { process.send?.(result); }
+      const payload = typeof result === 'string' ? result : (result instanceof Error ? result.stack : JSON.stringify(result));
       process[process.exitCode ? 'stderr' : 'stdout'].write(`${payload}\n`);
     }
   }

package/support/cli.service.ts

@@ -2,7 +2,7 @@ import { CliCommandShape, CliCommand, cliTpl, CliValidationError } from '@travet
 import { Terminal } from '@travetto/terminal';
 import { AsyncQueue, Runtime, RuntimeIndex, Util } from '@travetto/runtime';
 
-import { ServiceRunner, ServiceDescriptor, ServiceAction } from '../src/service';
+import { ServiceRunner, ServiceDescriptor, ServiceAction } from '../src/service.ts';
 
 /**
  * Allows for running services
@@ -21,7 +21,7 @@ export class CliServiceCommand implements CliCommandShape {
     ))
       .filter(x => !!x)
       .filter(x => services?.length ? services.includes(x.name) : true)
-      .sort((a, b) => a.name.localeCompare(b.name));
+      .toSorted((a, b) => a.name.localeCompare(b.name));
   }
 
   async validate(action: ServiceAction, services: string[]): Promise<CliValidationError | undefined> {

package/support/transformer.cli.ts

@@ -1,7 +1,7 @@
 import ts from 'typescript';
 
 import { TransformerState, DecoratorMeta, AfterClass } from '@travetto/transformer';
-import { SchemaTransformUtil } from '@travetto/schema/support/transformer/util';
+import { SchemaTransformUtil } from '@travetto/schema/support/transformer/util.ts';
 
 /**
  * Converts classes with `@CliCommand` to `@Schema` and maps the main method