@travetto/repo 7.0.0-rc.1 → 7.0.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/repo",
-  "version": "7.0.0-rc.1",
+  "version": "7.0.0-rc.3",
   "description": "Monorepo utilities",
   "keywords": [
     "travetto",
@@ -22,8 +22,8 @@
     "directory": "module/repo"
   },
   "dependencies": {
-    "@travetto/cli": "^7.0.0-rc.1",
-    "@travetto/worker": "^7.0.0-rc.1"
+    "@travetto/cli": "^7.0.0-rc.3",
+    "@travetto/worker": "^7.0.0-rc.3"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/exec.ts

@@ -11,7 +11,7 @@ const COLORS = ([...[
   '#afffd7', '#afffff', '#d787ff', '#d7afaf', '#d7afd7', '#d7afff', '#d7d7af', '#d7d7d7', '#d7d7ff', '#d7ff87', '#d7ffaf', '#d7ffd7', '#d7ffff', '#ff8787', '#ff87af',
   '#ff87d7', '#ff87ff', '#ffaf87', '#ffafaf', '#ffafd7', '#ffafff', '#ffd787', '#ffd7af', '#ffd7d7', '#ffd7ff', '#ffff87', '#ffffaf', '#ffffd7', '#ffffff', '#bcbcbc',
   '#c6c6c6', '#d0d0d0', '#dadada', '#e4e4e4', '#eeeeee'
-] as const]).toSorted(() => Math.random() < .5 ? -1 : 1).map(x => StyleUtil.getStyle(x));
+] as const]).toSorted(() => Math.random() < .5 ? -1 : 1).map(color => StyleUtil.getStyle(color));
 
 type ModuleRunConfig<T = ExecutionResult<string>> = {
   progressMessage?: (mod: IndexedModule | undefined) => string;
@@ -24,7 +24,7 @@ type ModuleRunConfig<T = ExecutionResult<string>> = {
   stableOutput?: boolean;
 };
 
-const colorize = (val: string, idx: number): string => COLORS[idx % COLORS.length](val);
+const colorize = (value: string, idx: number): string => COLORS[idx % COLORS.length](value);
 
 /**
  * Tools for running commands across all modules of the monorepo
@@ -37,9 +37,9 @@ export class RepoExecUtil {
    * @returns
    */
   static #buildPrefixes(mods: IndexedModule[]): Record<string, string> {
-    const folders = mods.map(x => x.sourceFolder);
-    const maxWidth = Math.max(...folders.map(x => x.length));
-    return Object.fromEntries(folders.map((x, i) => [x, colorize(x.padStart(maxWidth, ' ').padEnd(maxWidth + 1), i)]));
+    const folders = mods.map(mod => mod.sourceFolder);
+    const maxWidth = Math.max(...folders.map(folder => folder.length));
+    return Object.fromEntries(folders.map((folder, i) => [folder, colorize(folder.padStart(maxWidth, ' ').padEnd(maxWidth + 1), i)]));
   }
 
   /**
@@ -69,21 +69,21 @@ export class RepoExecUtil {
       try {
         if (!(await config.filter?.(mod) === false)) {
           const prefix = prefixes[mod.sourceFolder] ?? '';
-          const proc = operation(mod);
-          processes.set(mod, proc);
+          const subProcess = operation(mod);
+          processes.set(mod, subProcess);
 
-          if (config.showStdout && proc.stdout) {
-            ExecUtil.readLines(proc.stdout, line =>
+          if (config.showStdout && subProcess.stdout) {
+            ExecUtil.readLines(subProcess.stdout, line =>
               stdoutTerm.writer.writeLine(`${prefix}${line.trimEnd()}`).commit()
             );
           }
-          if (config.showStderr && proc.stderr) {
-            ExecUtil.readLines(proc.stderr, line =>
+          if (config.showStderr && subProcess.stderr) {
+            ExecUtil.readLines(subProcess.stderr, line =>
               stderrTerm.writer.writeLine(`${prefix}${line.trimEnd()}`).commit()
             );
           }
 
-          const result = await ExecUtil.getResult(proc, { catch: true });
+          const result = await ExecUtil.getResult(subProcess, { catch: true });
           const output = transform(mod, result);
           results.set(mod, output);
         }
@@ -94,7 +94,7 @@ export class RepoExecUtil {
     }, mods, mods.length, { max: workerCount, min: workerCount });
 
     if (config.progressMessage && stdoutTerm.interactive) {
-      await stdoutTerm.streamToBottom(Util.mapAsyncItr(work, TerminalUtil.progressBarUpdater(stdoutTerm, { withWaiting: true })));
+      await stdoutTerm.streamToBottom(Util.mapAsyncIterable(work, TerminalUtil.progressBarUpdater(stdoutTerm, { withWaiting: true })));
     } else {
       for await (const _ of work) {
         // Ensure its all consumed

package/support/bin/package-manager.ts

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { spawn, ChildProcess } from 'node:child_process';
 import fs from 'node:fs/promises';
 
-import { ExecUtil, ExecutionResult } from '@travetto/runtime';
+import { ExecUtil, ExecutionResult, JSONUtil } from '@travetto/runtime';
 import { type IndexedModule, type ManifestContext, type Package, PackageUtil } from '@travetto/manifest';
 import { CliModuleUtil } from '@travetto/cli';
 
@@ -40,12 +40,12 @@ export class PackageManager {
         if (!result.valid && !result.stderr.includes('E404')) {
           throw new Error(result.stderr);
         }
-        const item: (string[] | string) = result.stdout ? JSON.parse(result.stdout) : [];
+        const item: (string[] | string) = result.stdout ? JSONUtil.parseSafe(result.stdout) : [];
         const found = Array.isArray(item) ? item.pop() : item;
         return !!found && found === mod.version;
       }
       case 'yarn': {
-        const parsed = JSON.parse(result.stdout);
+        const parsed = JSONUtil.parseSafe<{ data?: unknown }>(result.stdout);
         return parsed.data !== undefined;
       }
     }
@@ -55,7 +55,7 @@ export class PackageManager {
    * Setting the version
    */
   static async version(ctx: Ctx, modules: IndexedModule[], level: SemverLevel, preid?: string): Promise<void> {
-    const mods = modules.flatMap(m => ['-w', m.sourceFolder]);
+    const mods = modules.flatMap(mod => ['-w', mod.sourceFolder]);
     let args: string[];
     switch (ctx.workspace.manager) {
       case 'npm':
@@ -116,7 +116,7 @@ export class PackageManager {
    */
   static async synchronizeVersions(): Promise<Record<string, string>> {
     const versions: Record<string, string> = {};
-    const folders = (await CliModuleUtil.findModules('workspace')).map(x => x.sourcePath);
+    const folders = (await CliModuleUtil.findModules('workspace')).map(mod => mod.sourcePath);
     const packages = folders.map(folder => {
       const pkg = PackageUtil.readPackage(folder, true);
       versions[pkg.name] = `^${pkg.version}`;

package/support/cli.repo_list.ts

@@ -1,7 +1,7 @@
 import { CliCommandShape, CliCommand, CliModuleUtil } from '@travetto/cli';
 import { Runtime, RuntimeIndex } from '@travetto/runtime';
 
-const write = (line: string): Promise<void> => new Promise(r => process.stdout.write(`${line}\n`, () => r()));
+const write = (line: string): Promise<void> => new Promise(resolve => process.stdout.write(`${line}\n`, () => resolve()));
 
 /**
  * Allows for listing of modules
@@ -32,8 +32,8 @@ export class ListModuleCommand implements CliCommandShape {
     const mods = await CliModuleUtil.findModules(this.changed ? 'changed' : 'workspace', this.fromHash, this.toHash);
     switch (this.format) {
       case 'list': {
-        for (const mod of mods.map(x => x.sourceFolder).toSorted()) {
-          await write(mod);
+        for (const folder of mods.map(mod => mod.sourceFolder).toSorted()) {
+          await write(folder);
         }
         break;
       }
@@ -45,10 +45,10 @@ export class ListModuleCommand implements CliCommandShape {
       }
       case 'graph': {
         await write('digraph g {');
-        for (const el of mods) {
-          for (const dep of el.parents) {
-            if (dep !== Runtime.main.name) {
-              await write(`  "${dep}" -> "${el.name}";`);
+        for (const mod of mods) {
+          for (const parent of mod.parents) {
+            if (parent !== Runtime.main.name) {
+              await write(`  "${parent}" -> "${mod.name}";`);
             }
           }
         }

package/support/cli.repo_publish.ts

@@ -18,11 +18,11 @@ export class RepoPublishCommand implements CliCommandShape {
       filter: mod => !!mod.workspace && !mod.internal,
       progressMessage: (mod) => `Checking published [%idx/%total] -- ${mod?.name}`,
       showStderr: false,
-      transformResult: (mod, res) => PackageManager.validatePublishedResult(Runtime, mod, res),
+      transformResult: (mod, result) => PackageManager.validatePublishedResult(Runtime, mod, result),
     });
 
     if (this.dryRun) {
-      console.log('Unpublished modules', [...published.entries()].filter(x => !x[1]).map(([mod]) => mod.sourceFolder));
+      console.log('Unpublished modules', [...published.entries()].filter(entry => !entry[1]).map(([mod]) => mod.sourceFolder));
     }
 
     await RepoExecUtil.execOnModules(

package/support/cli.repo_version.ts

@@ -39,7 +39,7 @@ export class RepoVersionCommand implements CliCommandShape {
 
     const allModules = await CliModuleUtil.findModules(mode);
 
-    const modules = allModules.filter(x => !x.internal && (this.mode !== 'direct' || this.modules?.includes(x.name)));
+    const modules = allModules.filter(mod => !mod.internal && (this.mode !== 'direct' || this.modules?.includes(mod.name)));
 
     // Do we have valid changes?
     if (!modules.length) {
@@ -50,7 +50,7 @@ export class RepoVersionCommand implements CliCommandShape {
 
     const versions = await PackageManager.synchronizeVersions();
     if (this.commit) {
-      const commitMessage = `Publish ${modules.map(x => `${x.name}#${versions[x.name]?.replace('^', '') ?? x.version}`).join(',')}`;
+      const commitMessage = `Publish ${modules.map(mod => `${mod.name}#${versions[mod.name]?.replace('^', '') ?? mod.version}`).join(',')}`;
       console.log!(await CliScmUtil.createCommit(commitMessage));
       if (this.tag) {
         await CliScmUtil.createTag(versions['@travetto/manifest']);