@travetto/cli 3.2.2 → 3.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cli",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "CLI infrastructure for Travetto framework",
   "keywords": [
     "cli",

package/src/module.ts

@@ -20,9 +20,7 @@ export class CliModuleUtil {
    * @returns
    */
   static async findChangedModulesRecursive(hash?: string, transitive = true): Promise<IndexedModule[]> {
-    if (!hash) {
-      hash = await CliScmUtil.findLastRelease();
-    }
+    hash ??= await CliScmUtil.findLastRelease();
 
     if (!hash) {
       return RootIndex.getLocalModules();
@@ -48,9 +46,9 @@ export class CliModuleUtil {
    * @param transitive
    * @returns
    */
-  static async findModules(mode: 'all' | 'changed'): Promise<IndexedModule[]> {
+  static async findModules(mode: 'all' | 'changed', sinceHash?: string): Promise<IndexedModule[]> {
     return (mode === 'changed' ?
-      await this.findChangedModulesRecursive() :
+      await this.findChangedModulesRecursive(sinceHash) :
       [...RootIndex.getModuleList('all')].map(x => RootIndex.getModule(x)!)
     ).filter(x => x.sourcePath !== RootIndex.manifest.workspacePath);
   }

package/src/scm.ts

@@ -1,7 +1,7 @@
 import fs from 'fs/promises';
 
 import { Env, ExecUtil } from '@travetto/base';
-import { IndexedModule, RootIndex, path } from '@travetto/manifest';
+import { IndexedFile, IndexedModule, RootIndex, path } from '@travetto/manifest';
 
 export class CliScmUtil {
   /**
@@ -41,21 +41,38 @@ export class CliScmUtil {
   }
 
   /**
-   * Find all modules that changed since hash
+   * Find all source files that changed since hash
    * @param hash
    * @returns
    */
-  static async findChangedModulesSince(hash: string): Promise<IndexedModule[]> {
+  static async findChangedFilesSince(hash: string): Promise<string[]> {
     const ws = RootIndex.manifest.workspacePath;
     const res = await ExecUtil.spawn('git', ['diff', '--name-only', `HEAD..${hash}`, ':!**/DOC.*', ':!**/README.*'], { cwd: ws }).result;
-    const out = new Set<IndexedModule>();
+    const out = new Set<string>();
     for (const line of res.stdout.split(/\n/g)) {
-      const mod = RootIndex.getFromSource(path.resolve(ws, line));
-      if (mod) {
-        out.add(RootIndex.getModule(mod.module)!);
+      const entry = RootIndex.getEntry(path.resolve(ws, line));
+      if (entry) {
+        out.add(entry.sourceFile);
       }
     }
-    return [...out].sort((a, b) => a.name.localeCompare(b.name));
+    return [...out].sort((a, b) => a.localeCompare(b));
+  }
+
+  /**
+   * Find all modules that changed since hash
+   * @param hash
+   * @returns
+   */
+  static async findChangedModulesSince(hash: string): Promise<IndexedModule[]> {
+    const files = await this.findChangedFilesSince(hash);
+    const mods = files
+      .map(x => RootIndex.getFromSource(x))
+      .filter((x): x is IndexedFile => !!x)
+      .map(x => RootIndex.getModule(x.module))
+      .filter((x): x is IndexedModule => !!x);
+
+    return [...new Set(mods)]
+      .sort((a, b) => a.name.localeCompare(b.name));
   }
 
   /**