@travetto/cli 3.2.3 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cli",
-  "version": "3.2.3",
+  "version": "3.3.0",
   "description": "CLI infrastructure for Travetto framework",
   "keywords": [
     "cli",
@@ -24,8 +24,8 @@
     "directory": "module/cli"
   },
   "dependencies": {
-    "@travetto/schema": "^3.2.2",
-    "@travetto/terminal": "^3.2.0"
+    "@travetto/schema": "^3.3.0",
+    "@travetto/terminal": "^3.3.0"
   },
   "travetto": {
     "displayName": "Command Line Interface"

package/src/decorators.ts

@@ -1,4 +1,4 @@
-import { Class, ClassInstance, ConcreteClass, ConsoleManager, defineGlobalEnv } from '@travetto/base';
+import { Class, ClassInstance, ConcreteClass, ConsoleManager, GlobalEnv, defineGlobalEnv } from '@travetto/base';
 import { RootIndex } from '@travetto/manifest';
 import { SchemaRegistry } from '@travetto/schema';
 
@@ -37,9 +37,13 @@ export function CliCommand(cfg: { fields?: ExtraFields[], runTarget?: boolean, h
       hidden: cfg.hidden,
       runTarget: cfg.runTarget,
       preMain: (cmd: CliCommandShape & { env?: string, profile?: string[], module?: string }) => {
-        if (addEnv) { defineGlobalEnv({ envName: cmd.env }); }
-        if (addProfile) { defineGlobalEnv({ profiles: cmd.profile }); }
-        if (addEnv || addProfile) { ConsoleManager.setDebugFromEnv(); }
+        if (addEnv || addProfile) {
+          defineGlobalEnv({
+            ...addEnv ? { envName: cmd.env } : {},
+            ...addProfile ? { profiles: cmd.profile } : {}
+          });
+          ConsoleManager.setDebug(GlobalEnv.debug, GlobalEnv.devMode);
+        }
         if (addModule && cmd.module && cmd.module !== RootIndex.mainModuleName) { // Mono-repo support
           RootIndex.reinitForModule(cmd.module); // Reinit with specified module
         }

package/src/execute.ts

@@ -2,7 +2,7 @@ import { appendFile, mkdir } from 'fs/promises';
 
 import { GlobalTerminal } from '@travetto/terminal';
 import { path } from '@travetto/manifest';
-import { ConsoleManager, defineGlobalEnv, ShutdownManager } from '@travetto/base';
+import { ConsoleManager, defineGlobalEnv, ShutdownManager, GlobalEnv } from '@travetto/base';
 
 import { HelpUtil } from './help';
 import { CliCommandShape, CliValidationResultError } from './types';
@@ -16,11 +16,8 @@ export class ExecutionManager {
 
   static async #envInit(cmd: CliCommandShape): Promise<void> {
     if (cmd.envInit) {
-      defineGlobalEnv({
-        debug: process.env.DEBUG || false,
-        ...await cmd.envInit(),
-      });
-      ConsoleManager.setDebugFromEnv();
+      defineGlobalEnv(await cmd.envInit());
+      ConsoleManager.setDebug(GlobalEnv.debug, GlobalEnv.devMode);
     }
   }
 

package/src/schema.ts

@@ -1,4 +1,4 @@
-import { Class, ConsoleManager } from '@travetto/base';
+import { Class, ConsoleManager, GlobalEnv } from '@travetto/base';
 import { BindUtil, FieldConfig, SchemaRegistry, SchemaValidator, ValidationResultError } from '@travetto/schema';
 import { CliCommandRegistry } from './registry';
 
@@ -57,7 +57,7 @@ export class CliCommandSchemaUtil {
       }
       SchemaRegistry.onInstall(cls, { type: 'added', curr: cls });
     } finally {
-      ConsoleManager.setDebugFromEnv();
+      ConsoleManager.setDebug(GlobalEnv.debug, GlobalEnv.devMode);
     }
 
     const schema = await SchemaRegistry.getViewSchema(cls);