@travetto/cli 7.0.4 → 7.0.6

package/README.md

@@ -378,8 +378,8 @@ npx trv call:db +=base --password <custom>
 ```
 
 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.
+   *  `+=<name>` - This translates into `<module>/support/<name>.flags`, which is a convenient shorthand.
+   *  `+=<module>/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.
@@ -463,7 +463,7 @@ If the goal is to run a more complex application, which may include depending on
 ```typescript
 import { Runtime, toConcrete } from '@travetto/runtime';
 import { DependencyRegistryIndex } from '@travetto/di';
-import { CliCommand, CliCommandShape } from '@travetto/cli';
+import { CliCommand, type CliCommandShape } from '@travetto/cli';
 import { NetUtil } from '@travetto/web';
 import { Registry } from '@travetto/registry';
 

package/bin/trv.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 // @ts-check
-import { load } from '@travetto/compiler/bin/entry.common.js';
-load(operations => operations.exec('@travetto/cli/support/entry.trv.js'));
+import '@travetto/compiler/bin/hook.js';
+const { invoke } = await import('@travetto/compiler/support/invoke.ts');
+invoke('exec', ['@travetto/cli/support/entry.trv.js', ...process.argv.slice(2)]);

package/package.json

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

package/src/color.ts

@@ -1,16 +1,18 @@
-import { StyleUtil } from '@travetto/terminal';
+import { StyleUtil, type TermStyledTemplate } from '@travetto/terminal';
 
-export const cliTpl = StyleUtil.getTemplate({
-  input: '#6b8e23', // Olive drab
-  output: '#ffc0cb', // Pink
-  path: '#008080', // Teal
-  success: '#00ff00', // Green
-  failure: '#ff0000', // Red
+const input = {
+  input: ['#6b8e23'], // Olive drab
+  output: ['#ffc0cb'], // Pink
+  path: ['#008080'], // Teal
+  success: ['#00ff00'], // Green
+  failure: ['#ff0000'], // Red
   param: ['#ffff00', '#daa520'], // Yellow / Goldenrod
-  type: '#00ffff', // Teal
+  type: ['#00ffff'], // Teal
   description: ['#e5e5e5', '#808080'], // White / Gray
   title: ['#ffffff', '#000000'], // Bright white / black
-  identifier: '#1e90ff', // Dodger blue
+  identifier: ['#1e90ff'], // Dodger blue
   subtitle: ['#d3d3d3', '#a9a9a9'], // Light gray / Dark Gray
-  subsubtitle: '#a9a9a9' // Dark gray
-});
+  subsubtitle: ['#a9a9a9'] // Dark gray
+} as const;
+
+export const cliTpl: TermStyledTemplate<keyof typeof input> = StyleUtil.getTemplate(input);

package/src/error.ts

@@ -2,7 +2,7 @@ import { AppError, Runtime } from '@travetto/runtime';
 import { PackageUtil } from '@travetto/manifest';
 
 import { cliTpl } from './color.ts';
-import { CliValidationError, CliCommandShape } from './types.ts';
+import type { CliValidationError, CliCommandShape } from './types.ts';
 
 const COMMAND_PACKAGE = [
   [/^test(:watch)?$/, 'test', false],

package/src/execute.ts

@@ -5,7 +5,7 @@ import { CliCommandRegistryIndex } from './registry/registry-index.ts';
 import { CliCommandSchemaUtil } from './schema.ts';
 import { CliUnknownCommandError, CliValidationResultError } from './error.ts';
 import { CliParseUtil } from './parse.ts';
-import { CliCommandShape } from './types.ts';
+import type { CliCommandShape } from './types.ts';
 
 /**
  * Execution manager

package/src/help.ts

@@ -4,9 +4,9 @@ import { castKey, getClass } from '@travetto/runtime';
 import { SchemaRegistryIndex } from '@travetto/schema';
 
 import { cliTpl } from './color.ts';
-import { CliCommandShape } from './types.ts';
+import type { CliCommandShape } from './types.ts';
 import { CliCommandRegistryIndex } from './registry/registry-index.ts';
-import { CliValidationResultError } from './error.ts';
+import type { CliValidationResultError } from './error.ts';
 import { CliSchemaExportUtil } from './schema-export.ts';
 
 const validationSourceMap: Record<string, string> = {

package/src/module.ts

@@ -25,10 +25,10 @@ export class CliModuleUtil {
     }
 
     const out = new Map<string, IndexedModule>();
-    for (const mod of await CliScmUtil.findChangedModules(fromHash, toHash)) {
-      out.set(mod.name, mod);
+    for (const module of await CliScmUtil.findChangedModules(fromHash, toHash)) {
+      out.set(module.name, module);
       if (transitive) {
-        for (const sub of await RuntimeIndex.getDependentModules(mod, 'parents')) {
+        for (const sub of await RuntimeIndex.getDependentModules(module, 'parents')) {
           out.set(sub.name, sub);
         }
       }
@@ -48,7 +48,7 @@ export class CliModuleUtil {
     return (mode === 'changed' ?
       await this.findChangedModulesRecursive(fromHash, toHash, true) :
       [...RuntimeIndex.getModuleList(mode)].map(name => RuntimeIndex.getModule(name)!)
-    ).filter(mod => mod.sourcePath !== Runtime.workspace.path);
+    ).filter(module => module.sourcePath !== Runtime.workspace.path);
   }
 
   /**
@@ -59,12 +59,13 @@ export class CliModuleUtil {
     const get = (name: string): ModuleGraphEntry =>
       childMap.has(name) ? childMap.get(name)! : childMap.set(name, { children: new Set(), name, active: new Set() }).get(name)!;
 
-    for (const mod of modules) {
-      get(mod.name).parents = mod.parents;
-      for (const parentModule of mod.parents) {
+    for (const module of modules) {
+      get(module.name).parents = [...module.parents];
+      get(module.name).children = new Set(module.children);
+      for (const parentModule of module.parents) {
         const parent = get(parentModule);
-        parent.children.add(mod.name); // Store child into parent
-        parent.active.add(mod.name);
+        parent.children.add(module.name); // Store child into parent
+        parent.active.add(module.name);
       }
     }
 
@@ -90,13 +91,13 @@ export class CliModuleUtil {
   /**
    * Determine if module has a given dependency
    */
-  static async moduleHasDependency(modName: string, depModName: string): Promise<boolean> {
-    if (modName === depModName) {
+  static async moduleHasDependency(moduleName: string, dependencyModuleName: string): Promise<boolean> {
+    if (moduleName === dependencyModuleName) {
       return true;
     }
-    const mods = await this.findModules('all');
-    const graph = this.getDependencyGraph(mods);
-    return graph[modName].includes(depModName);
+    const modules = await this.findModules('all');
+    const graph = this.getDependencyGraph(modules);
+    return graph[moduleName].includes(dependencyModuleName);
   }
 
   /**
@@ -114,8 +115,8 @@ export class CliModuleUtil {
         return [];
       }
     } else {
-      const mods = await this.findModules(config.changed ? 'changed' : 'workspace', undefined, 'HEAD');
-      return mods.map(mod => mod.sourcePath);
+      const modules = await this.findModules(config.changed ? 'changed' : 'workspace', undefined, 'HEAD');
+      return modules.map(module => module.sourcePath);
     }
   }
 }

package/src/parse.ts

@@ -2,17 +2,17 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 import { Runtime } from '@travetto/runtime';
-import { SchemaClassConfig, SchemaFieldConfig, SchemaInputConfig } from '@travetto/schema';
+import type { SchemaClassConfig, SchemaFieldConfig, SchemaInputConfig } from '@travetto/schema';
 
-import { ParsedState } from './types.ts';
+import type { ParsedState } from './types.ts';
 
 type ParsedInput = ParsedState['all'][number];
 
-const RAW_SEP = '--';
+const RAW_SEPARATOR = '--';
 const VALID_FLAG = /^-{1,2}[a-z]/i;
 const HELP_FLAG = /^-h|--help$/;
 const LONG_FLAG_WITH_EQ = /^--[a-z][^= ]+=\S+/i;
-const CONFIG_PRE = '+=';
+const CONFIG_PREFIX = '+=';
 const SPACE = new Set([32, 7, 13, 10]);
 
 export const ENV_PREFIX = 'env.';
@@ -68,24 +68,24 @@ export class CliParseUtil {
    * Get a user-specified module if present
    */
   static getSpecifiedModule(schema: SchemaClassConfig, args: string[]): string | undefined {
-    const SEP = args.includes(RAW_SEP) ? args.indexOf(RAW_SEP) : args.length;
+    const separatorIndex = args.includes(RAW_SEPARATOR) ? args.indexOf(RAW_SEPARATOR) : args.length;
     const input = Object.values(schema.fields).find(config => config.specifiers?.includes('module'));
-    const ENV_KEY = input?.aliases?.filter(alias => alias.startsWith(ENV_PREFIX)).map(alias => alias.replace(ENV_PREFIX, ''))[0] ?? '';
+    const envKey = input?.aliases?.filter(alias => alias.startsWith(ENV_PREFIX)).map(alias => alias.replace(ENV_PREFIX, ''))[0] ?? '';
     const flags = new Set(input?.aliases ?? []);
     const check = (key?: string, value?: string): string | undefined => flags.has(key!) ? value : undefined;
     return args.reduce(
       (name, value, i, values) =>
-        (i < SEP ? check(values[i - 1], value) ?? check(...value.split('=')) : undefined) ?? name,
-      process.env[ENV_KEY]
+        (i < separatorIndex ? check(values[i - 1], value) ?? check(...value.split('=')) : undefined) ?? name,
+      process.env[envKey]
     );
   }
 
   /**
    * Read configuration file given flag
    */
-  static async readFlagFile(flag: string, mod?: string): Promise<string[]> {
-    const key = flag.replace(CONFIG_PRE, '');
-    const overrides = { '@': mod ?? Runtime.main.name };
+  static async readFlagFile(flag: string, module?: string): Promise<string[]> {
+    const key = flag.replace(CONFIG_PREFIX, '');
+    const overrides = { '@': module ?? Runtime.main.name };
 
     // We have a file
     const relativePath = (key.includes('/') ? key : `@#support/pack.${key}.flags`)
@@ -119,7 +119,7 @@ export class CliParseUtil {
       offset = 2;
     }
     const out = argv.slice(offset);
-    const max = out.includes(RAW_SEP) ? out.indexOf(RAW_SEP) : out.length;
+    const max = out.includes(RAW_SEPARATOR) ? out.indexOf(RAW_SEPARATOR) : out.length;
     const valid = out.slice(0, max);
     const cmd = valid.length > 0 && !valid[0].startsWith('-') ? valid[0] : undefined;
     const helpIdx = valid.findIndex(flag => HELP_FLAG.test(flag));
@@ -132,10 +132,10 @@ export class CliParseUtil {
    * Expand flag arguments into full argument list
    */
   static async expandArgs(schema: SchemaClassConfig, args: string[]): Promise<string[]> {
-    const SEP = args.includes(RAW_SEP) ? args.indexOf(RAW_SEP) : args.length;
-    const mod = this.getSpecifiedModule(schema, args);
+    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_PRE) && (i < SEP || SEP < 0) ? this.readFlagFile(arg, mod) : arg))).flat();
+      arg.startsWith(CONFIG_PREFIX) && (i < separatorIndex || separatorIndex < 0) ? this.readFlagFile(arg, module) : arg))).flat();
   }
 
   /**
@@ -168,7 +168,7 @@ export class CliParseUtil {
     for (let i = 0; i < inputs.length; i += 1) {
       const input = inputs[i];
 
-      if (input === RAW_SEP) { // Raw separator
+      if (input === RAW_SEPARATOR) { // Raw separator
         out.push(...inputs.slice(i + 1).map((arg, idx) => ({ type: 'unknown', input: arg, index: argIdx + idx }) as const));
         break;
       } else if (LONG_FLAG_WITH_EQ.test(input)) {
@@ -186,7 +186,7 @@ export class CliParseUtil {
         } else {
           const next = inputs[i + 1];
           const base = { type: 'flag', fieldName: field.name, input, array: field.array } as const;
-          if ((next && (VALID_FLAG.test(next) || next === RAW_SEP)) || isBoolFlag(field)) {
+          if ((next && (VALID_FLAG.test(next) || next === RAW_SEPARATOR)) || isBoolFlag(field)) {
             if (isBoolFlag(field)) {
               out.push({ ...base, value: !input.startsWith('--no-') });
             } else {

package/src/registry/decorator.ts

@@ -1,7 +1,7 @@
-import { Class, ClassInstance, Env, Runtime, RuntimeIndex, TypedObject, castTo, describeFunction, getClass } from '@travetto/runtime';
-import { SchemaFieldConfig, SchemaRegistryIndex, ValidationError } from '@travetto/schema';
+import { type Class, type ClassInstance, Env, Runtime, RuntimeIndex, TypedObject, castTo, describeFunction, getClass } from '@travetto/runtime';
+import { type SchemaFieldConfig, SchemaRegistryIndex, type ValidationError } from '@travetto/schema';
 
-import { CliCommandShape } from '../types.ts';
+import type { CliCommandShape } from '../types.ts';
 import { CliCommandRegistryIndex } from './registry-index.ts';
 import { CliModuleUtil } from '../module.ts';
 import { CliParseUtil } from '../parse.ts';
@@ -126,8 +126,8 @@ export function CliCommand(config: CliCommandConfigOptions = {}) {
 
     if (runtimeModule) { // Validate module
       adapter.register({
-        validators: [async ({ module: mod }): Promise<ValidationError | undefined> => {
-          const runModule = (runtimeModule === 'command' ? commandModule : mod) || Runtime.main.name;
+        validators: [async ({ module }): Promise<ValidationError | undefined> => {
+          const runModule = (runtimeModule === 'command' ? commandModule : module) || Runtime.main.name;
 
           // If we need to run as a specific module
           if (runModule !== Runtime.main.name) {

package/src/registry/registry-adapter.ts

@@ -1,8 +1,8 @@
-import { Class, classConstruct, describeFunction } from '@travetto/runtime';
-import { RegistryAdapter } from '@travetto/registry';
+import { type Class, classConstruct, describeFunction } from '@travetto/runtime';
+import type { RegistryAdapter } from '@travetto/registry';
 import { SchemaRegistryIndex } from '@travetto/schema';
 
-import { CliCommandConfig, CliCommandShape } from '../types.ts';
+import type { CliCommandConfig, CliCommandShape } from '../types.ts';
 import { CliParseUtil, ENV_PREFIX } from '../parse.ts';
 
 const CLI_FILE_REGEX = /\/cli[.](?<name>.{0,100}?)([.]tsx?)?$/;

package/src/registry/registry-index.ts

@@ -1,8 +1,8 @@
-import { Class, getClass, getParentClass, isClass, Runtime, RuntimeIndex } from '@travetto/runtime';
-import { RegistryAdapter, RegistryIndex, RegistryIndexStore, Registry } from '@travetto/registry';
-import { SchemaClassConfig, SchemaRegistryIndex } from '@travetto/schema';
+import { type Class, getClass, getParentClass, isClass, Runtime, RuntimeIndex } from '@travetto/runtime';
+import { type RegistryAdapter, type RegistryIndex, RegistryIndexStore, Registry } from '@travetto/registry';
+import { type SchemaClassConfig, SchemaRegistryIndex } from '@travetto/schema';
 
-import { CliCommandConfig, CliCommandShape } from '../types.ts';
+import type { CliCommandConfig, CliCommandShape } from '../types.ts';
 import { CliUnknownCommandError } from '../error.ts';
 import { CliCommandRegistryAdapter } from './registry-adapter.ts';
 
@@ -41,7 +41,7 @@ export class CliCommandRegistryIndex implements RegistryIndex {
     if (!this.#fileMapping) {
       const all = new Map<string, string>();
       for (const entry of RuntimeIndex.find({
-        module: mod => !Runtime.production || mod.prod,
+        module: module => !Runtime.production || module.prod,
         folder: folder => folder === 'support',
         file: file => file.role === 'std' && CLI_FILE_REGEX.test(file.sourceFile)
       })) {

package/src/schema-export.ts

@@ -1,5 +1,5 @@
-import { Class, describeFunction } from '@travetto/runtime';
-import { SchemaInputConfig, SchemaRegistryIndex } from '@travetto/schema';
+import { type Class, describeFunction } from '@travetto/runtime';
+import { type SchemaInputConfig, SchemaRegistryIndex } from '@travetto/schema';
 
 import { CliCommandRegistryIndex } from '../src/registry/registry-index.ts';
 

package/src/schema.ts

@@ -1,7 +1,7 @@
 import { castKey, castTo, getClass } from '@travetto/runtime';
 import { BindUtil, SchemaRegistryIndex, SchemaValidator, ValidationResultError } from '@travetto/schema';
 
-import { ParsedState, CliCommandShape, CliValidationError } from './types.ts';
+import type { ParsedState, CliCommandShape, CliValidationError } from './types.ts';
 import { CliValidationResultError } from './error.ts';
 
 const getSource = (source: string | undefined, def: CliValidationError['source']): CliValidationError['source'] => {

package/src/scm.ts

@@ -48,6 +48,7 @@ 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) } });
@@ -70,13 +71,13 @@ export class CliScmUtil {
    */
   static async findChangedModules(fromHash: string, toHash?: string): Promise<IndexedModule[]> {
     const files = await this.findChangedFiles(fromHash, toHash);
-    const mods = files
+    const modules = files
       .map(file => RuntimeIndex.getFromSource(file))
       .filter(file => !!file)
       .map(file => RuntimeIndex.getModule(file.module))
-      .filter(mod => !!mod);
+      .filter(module => !!module);
 
-    return [...new Set(mods)]
+    return [...new Set(modules)]
       .toSorted((a, b) => a.name.localeCompare(b.name));
   }
 

package/src/types.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/runtime';
+import type { Class } from '@travetto/runtime';
 
 type OrProm<T> = T | Promise<T>;
 type ParsedFlag = { type: 'flag', input: string, array?: boolean, fieldName: string, value?: unknown };

package/src/util.ts

@@ -2,7 +2,7 @@ import { spawn, type ChildProcess } from 'node:child_process';
 
 import { Env, ExecUtil, Runtime, ShutdownManager, Util, WatchUtil } from '@travetto/runtime';
 
-import { CliCommandShape, CliCommandShapeFields } from './types.ts';
+import type { 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', '_']);

package/support/cli.cli_schema.ts

@@ -2,7 +2,7 @@ import { Env } from '@travetto/runtime';
 import { IsPrivate } from '@travetto/schema';
 
 import { CliCommand } from '../src/registry/decorator.ts';
-import { CliCommandShape, CliValidationError } from '../src/types.ts';
+import type { CliCommandShape, CliValidationError } from '../src/types.ts';
 import { CliCommandRegistryIndex } from '../src/registry/registry-index.ts';
 import { CliUtil } from '../src/util.ts';
 import { CliSchemaExportUtil } from '../src/schema-export.ts';

package/support/cli.main.ts

@@ -1,5 +1,5 @@
 import { Runtime } from '@travetto/runtime';
-import { CliCommandShape, CliCommand, CliValidationError, ParsedState } from '@travetto/cli';
+import { type CliCommandShape, CliCommand, type CliValidationError, type ParsedState } from '@travetto/cli';
 import { Ignore, IsPrivate } from '@travetto/schema';
 
 /**
@@ -23,8 +23,8 @@ export class MainCommand implements CliCommandShape {
   async main(fileOrImport: string, args: string[] = []): Promise<void> {
     let result: unknown;
     try {
-      const mod = await Runtime.importFrom<{ main(..._: unknown[]): Promise<unknown> }>(fileOrImport);
-      result = await mod.main(...args, ...this._parsed.unknown);
+      const module = await Runtime.importFrom<{ main(..._: unknown[]): Promise<unknown> }>(fileOrImport);
+      result = await module.main(...args, ...this._parsed.unknown);
     } catch (error) {
       result = error;
       process.exitCode = Math.max(process.exitCode ? +process.exitCode : 1, 1);

package/support/cli.service.ts

@@ -1,8 +1,8 @@
-import { CliCommandShape, CliCommand, cliTpl, CliValidationError } from '@travetto/cli';
+import { type CliCommandShape, CliCommand, cliTpl, type CliValidationError } from '@travetto/cli';
 import { Terminal } from '@travetto/terminal';
 import { AsyncQueue, Runtime, RuntimeIndex, Util } from '@travetto/runtime';
 
-import { ServiceRunner, ServiceDescriptor, ServiceAction } from '../src/service.ts';
+import { ServiceRunner, type ServiceDescriptor, type ServiceAction } from '../src/service.ts';
 
 /**
  * Allows for running services
@@ -13,7 +13,7 @@ export class CliServiceCommand implements CliCommandShape {
   async #getServices(services: string[]): Promise<ServiceDescriptor[]> {
     return (await Promise.all(
       RuntimeIndex.find({
-        module: mod => mod.roles.includes('std'),
+        module: module => module.roles.includes('std'),
         folder: folder => folder === 'support',
         file: file => /support\/service[.]/.test(file.sourceFile)
       })