@travetto/cli 4.1.1 → 5.0.0-rc.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 ArcSine Technologies
+Copyright (c) 2023 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -508,7 +508,7 @@ export class RunRestCommand implements CliCommandShape {
 }
 ```
 
-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/base/src/env.ts#L105) `name` 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 [Runtime](https://github.com/travetto/travetto/tree/main/module/base/src/env.ts#L116) `name` 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/package.json

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

package/src/help.ts

@@ -1,6 +1,6 @@
 import util from 'node:util';
 
-import { Primitive } from '@travetto/base';
+import { Primitive } from '@travetto/schema';
 
 import { cliTpl } from './color';
 import { CliCommandShape } from './types';

package/src/module.ts

@@ -43,9 +43,9 @@ export class CliModuleUtil {
    * @param transitive
    * @returns
    */
-  static async findModules(mode: 'all' | 'changed', fromHash?: string, toHash?: string): Promise<IndexedModule[]> {
+  static async findModules(mode: 'all' | 'changed', fromHash?: string, toHash?: string, emptyOnFail = false): Promise<IndexedModule[]> {
     return (mode === 'changed' ?
-      await this.findChangedModulesRecursive(fromHash, toHash) :
+      await this.findChangedModulesRecursive(fromHash, toHash, emptyOnFail) :
       [...RuntimeIndex.getModuleList('all')].map(x => RuntimeIndex.getModule(x)!)
     ).filter(x => x.sourcePath !== RuntimeContext.workspace.path);
   }

package/src/parse.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs/promises';
+import path from 'node:path';
 
-import { RuntimeIndex, RuntimeContext, path } from '@travetto/manifest';
+import { RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 import { CliCommandInput, CliCommandSchema, ParsedState } from './types';
 
 type ParsedInput = ParsedState['all'][number];
@@ -210,7 +211,7 @@ export class CliParseUtil {
       inputs,
       all: out,
       unknown: out.filter(x => x.type === 'unknown').map(x => x.input),
-      flags: out.filter((x): x is ParsedInput & { type: 'flag' } => x.type === 'flag')
+      flags: out.filter(x => x.type === 'flag')
     };
   }
 }

package/src/scm.ts

@@ -1,8 +1,9 @@
 import { spawn } from 'node:child_process';
 import fs from 'node:fs/promises';
+import path from 'node:path';
 
 import { ExecUtil } from '@travetto/base';
-import { IndexedFile, IndexedModule, RuntimeIndex, RuntimeContext, path } from '@travetto/manifest';
+import { IndexedModule, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 
 export class CliScmUtil {
   /**
@@ -45,9 +46,13 @@ export class CliScmUtil {
    * @param fromHash
    * @returns
    */
-  static async findChangedFiles(fromHash: string, toHash: string = 'HEAD'): Promise<string[]> {
+  static async findChangedFiles(fromHash: string, toHash: string = 'HEAD', emptyOnFail = false): Promise<string[]> {
     const ws = RuntimeContext.workspace.path;
-    const res = await ExecUtil.getResult(spawn('git', ['diff', '--name-only', `${fromHash}..${toHash}`, ':!**/DOC.*', ':!**/README.*'], { cwd: ws }));
+    const res = await ExecUtil.getResult(spawn('git', ['diff', '--name-only', `${fromHash}..${toHash}`, ':!**/DOC.*', ':!**/README.*'], { cwd: ws }), { catch: true });
+    if (!res.valid && emptyOnFail) {
+      console.warn('Unable to detect changes between', fromHash, toHash, 'with', (res.stderr || res.stdout));
+      return [];
+    }
     const out = new Set<string>();
     for (const line of res.stdout.split(/\n/g)) {
       const entry = RuntimeIndex.getEntry(path.resolve(ws, line));
@@ -68,9 +73,9 @@ export class CliScmUtil {
     const files = await this.findChangedFiles(fromHash, toHash);
     const mods = files
       .map(x => RuntimeIndex.getFromSource(x))
-      .filter((x): x is IndexedFile => !!x)
+      .filter(x => !!x)
       .map(x => RuntimeIndex.getModule(x.module))
-      .filter((x): x is IndexedModule => !!x);
+      .filter(x => !!x);
 
     return [...new Set(mods)]
       .sort((a, b) => a.name.localeCompare(b.name));

package/src/util.ts

@@ -30,7 +30,7 @@ export class CliUtil {
    */
   static runWithRestart<T extends CliCommandShapeFields & CliCommandShape>(cmd: T, ipc?: boolean): Promise<unknown> | undefined {
     if (ipc && process.connected) {
-      ExecUtil.exitOnDisconnect();
+      process.once('disconnect', () => process.exit());
     }
     if (Env.TRV_CAN_RESTART.isFalse || !(cmd.canRestart ?? !Env.production)) {
       Env.TRV_CAN_RESTART.clear();

package/support/cli.main.ts

@@ -1,7 +1,8 @@
 import fs from 'node:fs/promises';
+import path from 'node:path';
 
 import { CliCommandShape, CliCommand, CliValidationError, ParsedState } from '@travetto/cli';
-import { path, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
+import { RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 import { Ignore } from '@travetto/schema';
 
 /**
@@ -38,7 +39,7 @@ export class MainCommand implements CliCommandShape {
       res = await mod.main(...args, ...this._parsed.unknown);
     } catch (err) {
       res = err;
-      process.exitCode = Math.max(process.exitCode ?? 1, 1);
+      process.exitCode = Math.max(process.exitCode ? +process.exitCode : 1, 1);
     }
 
     if (res !== undefined) {