@travetto/cli 4.1.0 → 4.1.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 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/package.json

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

package/src/help.ts

@@ -1,5 +1,6 @@
+import util from 'node:util';
+
 import { Primitive } from '@travetto/base';
-import { StyleUtil } from '@travetto/terminal';
 
 import { cliTpl } from './color';
 import { CliCommandShape } from './types';
@@ -70,8 +71,8 @@ export class HelpUtil {
       descs.push(desc.join(' '));
     }
 
-    const paramWidths = params.map(x => StyleUtil.cleanText(x).length);
-    const descWidths = descs.map(x => StyleUtil.cleanText(x).length);
+    const paramWidths = params.map(x => util.stripVTControlCharacters(x).length);
+    const descWidths = descs.map(x => util.stripVTControlCharacters(x).length);
 
     const paramWidth = Math.max(...paramWidths);
     const descWidth = Math.max(...descWidths);
@@ -99,7 +100,7 @@ export class HelpUtil {
   static async renderAllHelp(title?: string): Promise<string> {
     const rows: string[] = [];
     const keys = [...CliCommandRegistry.getCommandMapping().keys()].sort((a, b) => a.localeCompare(b));
-    const maxWidth = keys.reduce((a, b) => Math.max(a, StyleUtil.cleanText(b).length), 0);
+    const maxWidth = keys.reduce((a, b) => Math.max(a, util.stripVTControlCharacters(b).length), 0);
 
     for (const cmd of keys) {
       try {

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

@@ -210,7 +210,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

@@ -2,7 +2,7 @@ import { spawn } from 'node:child_process';
 import fs from 'node:fs/promises';
 
 import { ExecUtil } from '@travetto/base';
-import { IndexedFile, IndexedModule, RuntimeIndex, RuntimeContext, path } from '@travetto/manifest';
+import { IndexedModule, RuntimeIndex, RuntimeContext, path } from '@travetto/manifest';
 
 export class CliScmUtil {
   /**
@@ -45,9 +45,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 +72,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/support/cli.cli_schema.ts

@@ -17,12 +17,14 @@ export class CliSchemaCommand implements CliCommandShape {
     return CliCommandSchemaUtil.getSchema(inst!);
   }
 
-  async validate(name?: string): Promise<CliValidationError | undefined> {
-    if (name && !CliCommandRegistry.getCommandMapping().has(name)) {
-      return {
-        source: 'arg',
-        message: `name: ${name} is not a valid cli command`
-      };
+  async validate(names: string[]): Promise<CliValidationError | undefined> {
+    for (const name of names ?? []) {
+      if (name && !CliCommandRegistry.getCommandMapping().has(name)) {
+        return {
+          source: 'arg',
+          message: `name: ${name} is not a valid cli command`
+        };
+      }
     }
   }
 
@@ -30,15 +32,11 @@ export class CliSchemaCommand implements CliCommandShape {
     Env.DEBUG.set(false);
   }
 
-  async main(name?: string): Promise<void> {
-    let output: unknown = undefined;
-    if (name) {
-      output = await this.#getSchema(name);
-    } else {
-      const names = [...CliCommandRegistry.getCommandMapping().keys()];
-      const schemas = await Promise.all(names.map(x => this.#getSchema(x)));
-      output = schemas;
+  async main(names?: string[]): Promise<void> {
+    if (!names?.length) {
+      names = [...CliCommandRegistry.getCommandMapping().keys()];
     }
-    await CliUtil.writeAndEnsureComplete(output);
+    const resolved = await Promise.all(names.map(x => this.#getSchema(x)));
+    await CliUtil.writeAndEnsureComplete(resolved);
   }
 }