@travetto/cli 7.1.2 → 7.1.4

package/bin/trv.js

@@ -2,4 +2,4 @@
 // @ts-check
 import '@travetto/compiler/bin/hook.js';
 const { invoke } = await import('@travetto/compiler/support/invoke.ts');
-await invoke('exec', ['@travetto/cli/support/entry.trv.js', ...process.argv.slice(2)]);
+await invoke('exec', ['@travetto/cli/support/entry.trv.ts', ...process.argv.slice(2)]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cli",
-  "version": "7.1.2",
+  "version": "7.1.4",
   "type": "module",
   "description": "CLI infrastructure for Travetto framework",
   "keywords": [
@@ -29,8 +29,8 @@
     "directory": "module/cli"
   },
   "dependencies": {
-    "@travetto/schema": "^7.1.2",
-    "@travetto/terminal": "^7.1.2"
+    "@travetto/schema": "^7.1.4",
+    "@travetto/terminal": "^7.1.4"
   },
   "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 { 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 }}

package/src/scm.ts

@@ -48,7 +48,6 @@ 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) } });

package/src/util.ts

@@ -40,15 +40,17 @@ export class CliUtil {
     ShutdownManager.disableInterrupt();
 
     let child: ChildProcess | undefined;
-    void WatchUtil.watchCompilerEvents('file', () => ShutdownManager.shutdownChild(child!, { signal: 'SIGTERM', reason: 'restart', exit: true }));
-    process.on('SIGINT', () => ShutdownManager.shutdownChild(child!, { signal: 'SIGTERM', reason: 'quit', exit: true }));
+    void WatchUtil.watchCompilerEvents('file', () => ShutdownManager.shutdownChild(child!, { reason: 'restart', mode: 'exit' }));
+    process
+      .on('SIGINT', () => ShutdownManager.shutdownChild(child!, { mode: 'exit' }))
+      .on('message', msg => child?.send?.(msg!));
 
     const env = { ...process.env, ...Env.TRV_RESTART_TARGET.export(true) };
 
     await WatchUtil.runWithRetry(
       async () => {
         child = spawn(process.argv0, process.argv.slice(1), { env, stdio: ['pipe', 1, 2, 'ipc'] });
-        const { code } = await ExecUtil.deferToSubprocess(child);
+        const { code } = await ExecUtil.getResult(child, { catch: true });
         return ShutdownManager.reasonForExitCode(code);
       },
       {
@@ -64,7 +66,7 @@ export class CliUtil {
       }
     );
 
-    await ShutdownManager.shutdown({ reason: 'quit', exit: true });
+    await ShutdownManager.shutdown({ mode: 'exit' });
   }
 
   /**