@travetto/cli 3.4.0-rc.0 → 3.4.0-rc.2

package/README.md

@@ -428,7 +428,7 @@ import { ServerHandle } from '../src/types';
 /**
  * Run a rest server as an application
  */
-@CliCommand({ runTarget: true, fields: ['module', 'env', 'profile'] })
+@CliCommand({ runTarget: true, fields: ['module', 'env'] })
 export class RunRestCommand {
 
   /** IPC debug is enabled */
@@ -455,7 +455,7 @@ export class RunRestCommand {
 }
 ```
 
-As noted in the example above, `fields` is specified in this execution, with support for `module`, `env`, and `profile`. These env and profile flags are directly tied to the GlobalEnv flags defined in the [Base](https://github.com/travetto/travetto/tree/main/module/base#readme "Environment config and common utilities 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 [GlobalEnv](https://github.com/travetto/travetto/tree/main/module/base/src/global-env.ts#L17) flags defined in the [Base](https://github.com/travetto/travetto/tree/main/module/base#readme "Environment config and common utilities 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.
 

package/__index__.ts

@@ -1,6 +1,7 @@
 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';

package/bin/trv.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
 // @ts-check
-import { withContext } from '@travetto/compiler/bin/common.js';
+import { getEntry } from '@travetto/compiler/bin/common.js';
 
-withContext((ctx, compile) => compile(ctx, 'run')).then(load => load?.('@travetto/cli/support/entry.trv.js'));
+getEntry().then(ops => ops.compile('run')).then(load => load('@travetto/cli/support/entry.trv.js'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cli",
-  "version": "3.4.0-rc.0",
+  "version": "3.4.0-rc.2",
   "description": "CLI infrastructure for Travetto framework",
   "keywords": [
     "cli",
@@ -29,7 +29,7 @@
     "directory": "module/cli"
   },
   "dependencies": {
-    "@travetto/schema": "^3.4.0-rc.0",
+    "@travetto/schema": "^3.4.0-rc.1",
     "@travetto/terminal": "^3.4.0-rc.0"
   },
   "travetto": {

package/src/decorators.ts

@@ -7,7 +7,7 @@ import { CliCommandRegistry, CliCommandConfigOptions } from './registry';
 import { CliModuleUtil } from './module';
 import { CliUtil } from './util';
 
-type ExtraFields = 'module' | 'profile' | 'env';
+type ExtraFields = 'module' | 'env';
 
 const getName = (source: string): string => (source.match(/cli[.](.*)[.]tsx?$/)?.[1] ?? source).replaceAll('_', ':');
 const getMod = (cls: Class): string => RootIndex.getModuleFromSource(RootIndex.getFunctionMetadata(cls)!.source)!.name;
@@ -26,7 +26,6 @@ export function CliCommand({ fields, ...cfg }: { fields?: ExtraFields[] } & CliC
 
     const name = getName(meta.source);
     const addEnv = fields?.includes('env');
-    const addProfile = fields?.includes('profile');
     const addModule = fields?.includes('module');
 
     CliCommandRegistry.registerClass({
@@ -35,12 +34,9 @@ export function CliCommand({ fields, ...cfg }: { fields?: ExtraFields[] } & CliC
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       cls: target as ConcreteClass<T>,
       ...cfg,
-      preMain: (cmd: CliCommandShape & { env?: string, profile?: string[], module?: string }) => {
-        if (addEnv || addProfile) {
-          defineGlobalEnv({
-            ...addEnv ? { envName: cmd.env } : {},
-            ...addProfile ? { profiles: cmd.profile } : {}
-          });
+      preMain: (cmd: CliCommandShape & { env?: string, module?: string }) => {
+        if (addEnv) {
+          defineGlobalEnv({ envName: cmd.env });
           ConsoleManager.setDebug(GlobalEnv.debug, GlobalEnv.devMode);
         }
         if (addModule && cmd.module && cmd.module !== RootIndex.mainModuleName) { // Mono-repo support
@@ -59,14 +55,6 @@ export function CliCommand({ fields, ...cfg }: { fields?: ExtraFields[] } & CliC
       });
     }
 
-    if (addProfile) {
-      SchemaRegistry.registerPendingFieldConfig(target, 'profile', [String], {
-        aliases: ['p'],
-        description: 'Additional application profiles',
-        required: { active: false }
-      });
-    }
-
     if (addModule) {
       SchemaRegistry.registerPendingFieldConfig(target, 'module', String, {
         aliases: ['m', 'env.TRV_MODULE'],

package/src/registry.ts

@@ -1,4 +1,4 @@
-import { Class, ConcreteClass } from '@travetto/base';
+import { Class, ConcreteClass, GlobalEnv } from '@travetto/base';
 import { RootIndex } from '@travetto/manifest';
 
 import { CliCommandShape } from './types';
@@ -37,8 +37,12 @@ class $CliCommandRegistry {
   getCommandMapping(): Map<string, string> {
     if (!this.#fileMapping) {
       const all = new Map<string, string>();
-      for (const { outputFile: output, import: imp } of RootIndex.findSupport({ filter: CLI_REGEX, checkProfile: false })) {
-        all.set(output.match(CLI_REGEX)![1].replace(/_/g, ':'), imp);
+      for (const e of RootIndex.find({
+        module: m => GlobalEnv.devMode || m.prod,
+        folder: f => f === 'support',
+        file: f => f.role === 'std' && CLI_REGEX.test(f.sourceFile)
+      })) {
+        all.set(e.outputFile.match(CLI_REGEX)![1].replace(/_/g, ':'), e.import);
       }
       this.#fileMapping = all;
     }

package/src/schema.ts

@@ -5,6 +5,15 @@ import { CliCommandRegistry } from './registry';
 import { CliCommandInput, CliCommandSchema, CliCommandShape } from './types';
 import { CliValidationResultError } from './error';
 
+function split(args: string[]): [core: string[], extra: string[]] {
+  const restIdx = args.indexOf('--');
+  if (restIdx >= 0) {
+    return [args.slice(0, restIdx), args.slice(restIdx + 1)];
+  } else {
+    return [args, []];
+  }
+}
+
 function fieldToInput(x: FieldConfig): CliCommandInput {
   const type = x.type === Date ? 'date' :
     x.type === Boolean ? 'boolean' :
@@ -119,10 +128,7 @@ export class CliCommandSchemaUtil {
   static async bindArgs(cmd: CliCommandShape, args: string[]): Promise<[known: unknown[], unknown: string[]]> {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const cls = cmd.constructor as Class<CliCommandShape>;
-
-    const restIdx = args.indexOf('--');
-    const copy = [...args.slice(0, restIdx < 0 ? args.length : restIdx)];
-    const extra = restIdx < 0 ? [] : args.slice(restIdx);
+    const [copy, extra] = split(args);
     const schema = await this.getSchema(cmd);
     const out: unknown[] = [];
     const found: boolean[] = copy.map(x => false);
@@ -166,10 +172,8 @@ export class CliCommandSchemaUtil {
   static async bindFlags<T extends CliCommandShape>(cmd: T, args: string[]): Promise<string[]> {
     const schema = await this.getSchema(cmd);
 
-    const restIdx = args.indexOf('--');
-    const copy = [...args.slice(0, restIdx < 0 ? args.length : restIdx)]
-      .flatMap(k => (k.startsWith('--') && k.includes('=')) ? k.split('=') : [k]);
-    const extra = restIdx < 0 ? [] : args.slice(restIdx);
+    const [base, extra] = split(args);
+    const copy = base.flatMap(k => (k.startsWith('--') && k.includes('=')) ? k.split('=') : [k]);
 
     const template: Partial<T> = {};
 
@@ -223,7 +227,7 @@ export class CliCommandSchemaUtil {
     const cls = cmd.constructor as Class<CliCommandShape>;
     BindUtil.bindSchemaToObject(cls, cmd, template);
 
-    return [...out, ...extra];
+    return [...out, '--', ...extra];
   }
 
   /**

package/src/util.ts

@@ -26,7 +26,7 @@ export class CliUtil {
    * Run a command as restartable, linking into self
    */
   static runWithRestart<T extends CliCommandShape & { canRestart?: boolean }>(cmd: T): Promise<unknown> | undefined {
-    if (cmd.canRestart !== false && Env.isFalse('TRV_CAN_RESTART')) {
+    if (cmd.canRestart === false || Env.isFalse('TRV_CAN_RESTART')) {
       delete process.env.TRV_CAN_RESTART;
       return;
     }