@travetto/repo 3.4.10 → 4.0.0-rc.0

package/package.json

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

package/support/bin/exec.ts

@@ -1,35 +1,38 @@
-import { ExecutionResult, ExecutionOptions, ExecutionState, Env, TypedObject } from '@travetto/base';
+import { ExecutionResult, ExecutionOptions, ExecutionState, Env, Util } from '@travetto/base';
 import { CliModuleUtil } from '@travetto/cli';
 import { IndexedModule } from '@travetto/manifest';
-import { ColorDefineUtil, GlobalTerminal, NAMED_COLORS, TermLinePosition, Terminal } from '@travetto/terminal';
-import { WorkPool, Worker, IterableWorkSet } from '@travetto/worker';
+import { StyleUtil, Terminal, TerminalUtil } from '@travetto/terminal';
+import { WorkPool } from '@travetto/worker';
+
+const COLORS = ([
+  '#8787ff', '#87afff', '#87d7ff', '#87ff87', '#87ffaf', '#87ffd7', '#87ffff', '#af87ff', '#afafd7', '#afafff', '#afd7af', '#afd7d7', '#afd7ff', '#afff87', '#afffaf',
+  '#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'
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+]).sort((a, b) => Math.random() < .5 ? -1 : 1).map(x => StyleUtil.getStyle(x as `#${string}`));
 
 type ModuleRunConfig<T = ExecutionResult> = {
   progressMessage?: (mod: IndexedModule | undefined) => string;
   filter?: (mod: IndexedModule) => boolean | Promise<boolean>;
   transformResult?: (mod: IndexedModule, result: ExecutionResult) => T;
   workerCount?: number;
-  progressPosition?: TermLinePosition;
   prefixOutput?: boolean;
   showStdout?: boolean;
   showStderr?: boolean;
 };
 
-const COLORS = TypedObject.keys(NAMED_COLORS)
-  .map(k => [k, ColorDefineUtil.defineColor(k).hsl] as const)
-  .filter(([, [, s, l]]) => l > .5 && l < .8 && s > .8)
-  .map(([k]) => GlobalTerminal.colorer(k));
-
 const colorize = (val: string, idx: number): string => COLORS[idx % COLORS.length](val);
 
 /**
  * Tools for running commands across all modules of the monorepo
  */
 export class RepoExecUtil {
+
   /**
    * Generate execution options for running on modules
    */
-  static #buildExecutionOptions<T = ExecutionState>(
+  static #buildExecutionOptions <T = ExecutionState>(
     mod: IndexedModule,
     config: ModuleRunConfig<T>,
     prefixes: Record<string, string>,
@@ -42,14 +45,17 @@ export class RepoExecUtil {
       outputMode: 'text',
       catchAsResult: true,
       cwd: folder,
-      env: { TRV_MANIFEST: '', TRV_MODULE: mod.name },
+      env: {
+        ...Env.TRV_MANIFEST.export(''),
+        ...Env.TRV_MODULE.export(mod.name)
+      },
     };
 
     if (config.showStdout) {
-      opts.onStdOutLine = (line: string): unknown => stdoutTerm.writeLines(`${prefixes[folder] ?? ''}${line}`);
+      opts.onStdOutLine = (line: string): unknown => stdoutTerm.writer.write(`${prefixes[folder] ?? ''}${line}`).commit();
     }
     if (config.showStderr) {
-      opts.onStdErrorLine = (line: string): unknown => stderrTerm.writeLines(`${prefixes[folder] ?? ''}${line}`);
+      opts.onStdErrorLine = (line: string): unknown => stderrTerm.writer.write(`${prefixes[folder] ?? ''}${line}`).commit();
     }
     return opts;
   }
@@ -74,7 +80,7 @@ export class RepoExecUtil {
     config: ModuleRunConfig<T> = {}
   ): Promise<Map<IndexedModule, T>> {
 
-    config.showStdout = config.showStdout ?? (Env.isSet('DEBUG') && !Env.isFalse('DEBUG'));
+    config.showStdout = config.showStdout ?? (Env.DEBUG.isSet && !Env.DEBUG.isFalse);
     config.showStderr = config.showStderr ?? true;
 
     const workerCount = config.workerCount ?? WorkPool.DEFAULT_SIZE;
@@ -84,49 +90,28 @@ export class RepoExecUtil {
     const processes = new Map<IndexedModule, ExecutionState>();
 
     const prefixes = config.prefixOutput !== false ? this.#buildPrefixes(mods) : {};
-    const stdoutTerm = await Terminal.for({ output: process.stdout });
-    const stderrTerm = await Terminal.for({ output: process.stderr });
-
-    let id = 1;
-    const pool = new WorkPool(async () => {
-      const worker: Worker<IndexedModule> & { mod?: IndexedModule } = {
-        id: id += 1,
-        mod: undefined,
-        active: false,
-        async destroy() {
-          this.active = false;
-          processes.get(this.mod!)?.process.kill('SIGKILL');
-        },
-        async execute(mod: IndexedModule) {
-          try {
-            this.mod = mod;
-            this.active = true;
-
-            if (await config.filter?.(mod) === false) {
-              this.active = false;
-            } else {
-              const opts = RepoExecUtil.#buildExecutionOptions(mod, config, prefixes, stdoutTerm, stderrTerm);
-
-              const result = await operation(mod, opts).result;
-
-              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-              const output = (config.transformResult ? config.transformResult(mod, result) : result) as T;
-              results.set(mod, output);
-            }
-          } finally {
-            this.active = false;
-            delete this.mod;
-          }
-        },
-      };
-      return worker;
-    }, { max: workerCount, min: workerCount });
-
-    const work = pool.iterateProcess(new IterableWorkSet(mods));
-
-    if (config.progressMessage) {
-      const cfg = { position: config.progressPosition ?? 'bottom' } as const;
-      await stdoutTerm.trackProgress(work, ev => ({ ...ev, text: config.progressMessage!(ev.value) }), cfg);
+    const stdoutTerm = new Terminal(process.stdout);
+    const stderrTerm = new Terminal(process.stderr);
+
+    const work = WorkPool.runStreamProgress(async (mod) => {
+      try {
+        if (!(await config.filter?.(mod) === false)) {
+          const opts = RepoExecUtil.#buildExecutionOptions(mod, config, prefixes, stdoutTerm, stderrTerm);
+
+          const result = await operation(mod, opts).result;
+
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          const output = (config.transformResult ? config.transformResult(mod, result) : result) as T;
+          results.set(mod, output);
+        }
+        return config.progressMessage?.(mod) ?? mod.name;
+      } finally {
+        processes.get(mod!)?.process.kill('SIGKILL');
+      }
+    }, mods, mods.length, { max: workerCount, min: workerCount });
+
+    if (config.progressMessage && stdoutTerm.interactive) {
+      await stdoutTerm.streamToBottom(Util.mapAsyncItr(work, TerminalUtil.progressBarUpdater(stdoutTerm, { withWaiting: true })));
     } else {
       for await (const _ of work) {
         // Ensure its all consumed

package/support/bin/package-manager.ts

@@ -1,5 +1,5 @@
-import path from 'path';
-import fs from 'fs/promises';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 
 import { ExecUtil, ExecutionOptions, ExecutionState, ExecutionResult } from '@travetto/base';
 import { IndexedModule, ManifestContext, Package, PackageUtil } from '@travetto/manifest';
@@ -17,7 +17,7 @@ export class PackageManager {
    */
   static isPublished(ctx: ManifestContext, mod: IndexedModule, opts: ExecutionOptions): ExecutionState {
     let args: string[];
-    switch (ctx.packageManager) {
+    switch (ctx.workspace.manager) {
       case 'npm':
         args = ['show', `${mod.name}@${mod.version}`, 'version', '--json'];
         break;
@@ -25,14 +25,14 @@ export class PackageManager {
         args = ['info', `${mod.name}@${mod.version}`, 'dist.integrity', '--json'];
         break;
     }
-    return ExecUtil.spawn(ctx.packageManager, args, opts);
+    return ExecUtil.spawn(ctx.workspace.manager, args, opts);
   }
 
   /**
    * Validate published result
    */
   static validatePublishedResult(ctx: ManifestContext, mod: IndexedModule, result: ExecutionResult): boolean {
-    switch (ctx.packageManager) {
+    switch (ctx.workspace.manager) {
       case 'npm': {
         if (!result.valid && !result.stderr.includes('E404')) {
           throw new Error(result.stderr);
@@ -54,13 +54,13 @@ export class PackageManager {
   static async version(ctx: ManifestContext, modules: IndexedModule[], level: SemverLevel, preid?: string): Promise<void> {
     const mods = modules.flatMap(m => ['-w', m.sourceFolder]);
     let args: string[];
-    switch (ctx.packageManager) {
+    switch (ctx.workspace.manager) {
       case 'npm':
       case 'yarn':
         args = ['version', '--no-workspaces-update', level, ...(preid ? ['--preid', preid] : []), ...mods];
         break;
     }
-    await ExecUtil.spawn(ctx.packageManager, args, { stdio: 'inherit' }).result;
+    await ExecUtil.spawn(ctx.workspace.manager, args, { stdio: 'inherit' }).result;
   }
 
   /**
@@ -68,13 +68,13 @@ export class PackageManager {
    */
   static dryRunPackaging(ctx: ManifestContext, opts: ExecutionOptions): ExecutionState {
     let args: string[];
-    switch (ctx.packageManager) {
+    switch (ctx.workspace.manager) {
       case 'npm':
       case 'yarn':
         args = ['pack', '--dry-run'];
         break;
     }
-    return ExecUtil.spawn(ctx.packageManager, args, opts);
+    return ExecUtil.spawn(ctx.workspace.manager, args, opts);
   }
 
   /**
@@ -87,13 +87,13 @@ export class PackageManager {
 
     const versionTag = mod.version.match(/^.*-(rc|alpha|beta|next)[.]\d+/)?.[1] ?? 'latest';
     let args: string[];
-    switch (ctx.packageManager) {
+    switch (ctx.workspace.manager) {
       case 'npm':
       case 'yarn':
         args = ['publish', '--tag', versionTag, '--access', 'public'];
         break;
     }
-    return ExecUtil.spawn(ctx.packageManager, args, opts);
+    return ExecUtil.spawn(ctx.workspace.manager, args, opts);
   }
 
   /**

package/support/cli.repo_exec.ts

@@ -1,6 +1,6 @@
 import { CliCommand, CliCommandShape, ParsedState } from '@travetto/cli';
 import { WorkPool } from '@travetto/worker';
-import { ExecUtil, defineEnv } from '@travetto/base';
+import { Env, ExecUtil } from '@travetto/base';
 import { Ignore, Max, Min } from '@travetto/schema';
 
 import { RepoExecUtil } from './bin/exec';
@@ -28,7 +28,7 @@ export class RepoExecCommand implements CliCommandShape {
   showStdout = true;
 
   preMain(): void {
-    defineEnv({ debug: false });
+    Env.DEBUG.set(false);
   }
 
   async main(cmd: string, args: string[] = []): Promise<void> {

package/support/cli.repo_list.ts

@@ -1,5 +1,5 @@
 import { CliCommandShape, CliCommand, CliModuleUtil } from '@travetto/cli';
-import { RootIndex } from '@travetto/manifest';
+import { RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 
 const write = (line: string): Promise<void> => new Promise(r => process.stdout.write(`${line}\n`, () => r()));
 
@@ -39,14 +39,14 @@ export class ListModuleCommand implements CliCommandShape {
       }
       case 'json': {
         const outputMap = CliModuleUtil.getDependencyGraph(mods);
-        await write(JSON.stringify(Object.entries(outputMap).map(([name, children]) => ({ name, children, local: RootIndex.getModule(name)?.local })), null, 2));
+        await write(JSON.stringify(Object.entries(outputMap).map(([name, children]) => ({ name, children, local: RuntimeIndex.getModule(name)?.local })), null, 2));
         break;
       }
       case 'graph': {
         await write('digraph g {');
         for (const el of mods) {
           for (const dep of el.parents) {
-            if (dep !== RootIndex.mainModuleName) {
+            if (dep !== RuntimeContext.main.name) {
               await write(`  "${dep}" -> "${el.name}";`);
             }
           }

package/support/cli.repo_publish.ts

@@ -1,5 +1,5 @@
 import { CliCommandShape, CliCommand } from '@travetto/cli';
-import { RootIndex } from '@travetto/manifest';
+import { RuntimeContext } from '@travetto/manifest';
 
 import { PackageManager } from './bin/package-manager';
 import { RepoExecUtil } from './bin/exec';
@@ -14,11 +14,11 @@ export class RepoPublishCommand implements CliCommandShape {
   dryRun = true;
 
   async main(): Promise<void> {
-    const published = await RepoExecUtil.execOnModules('all', (mod, opts) => PackageManager.isPublished(RootIndex.manifest, mod, opts), {
+    const published = await RepoExecUtil.execOnModules('all', (mod, opts) => PackageManager.isPublished(RuntimeContext, mod, opts), {
       filter: mod => !!mod.local && !mod.internal,
       progressMessage: (mod) => `Checking published [%idx/%total] -- ${mod?.name}`,
       showStderr: false,
-      transformResult: (mod, res) => PackageManager.validatePublishedResult(RootIndex.manifest, mod, res),
+      transformResult: (mod, res) => PackageManager.validatePublishedResult(RuntimeContext, mod, res),
     });
 
     if (this.dryRun) {
@@ -26,7 +26,7 @@ export class RepoPublishCommand implements CliCommandShape {
     }
 
     await RepoExecUtil.execOnModules(
-      'all', (mod, opts) => PackageManager.publish(RootIndex.manifest, mod, this.dryRun, opts),
+      'all', (mod, opts) => PackageManager.publish(RuntimeContext, mod, this.dryRun, opts),
       {
         progressMessage: (mod) => `Published [%idx/%total] -- ${mod?.name}`,
         showStdout: false,

package/support/cli.repo_version.ts

@@ -1,8 +1,7 @@
-import fs from 'fs/promises';
+import fs from 'node:fs/promises';
 
-import { CliCommandShape, CliCommand, CliScmUtil, CliValidationError } from '@travetto/cli';
-import { CliModuleUtil } from '@travetto/cli/src/module';
-import { RootIndex, path } from '@travetto/manifest';
+import { CliModuleUtil, CliCommandShape, CliCommand, CliScmUtil, CliValidationError } from '@travetto/cli';
+import { RuntimeContext } from '@travetto/manifest';
 
 import { PackageManager, SemverLevel } from './bin/package-manager';
 
@@ -43,14 +42,14 @@ export class RepoVersionCommand implements CliCommandShape {
       throw new Error('No modules available for versioning');
     }
 
-    await PackageManager.version(RootIndex.manifest, modules, level, prefix);
+    await PackageManager.version(RuntimeContext, modules, level, prefix);
 
     const versions = await PackageManager.synchronizeVersions();
     if (this.commit) {
       const commitMessage = `Publish ${modules.map(x => `${x.name}#${versions[x.name]?.replace('^', '') ?? x.version}`).join(',')}`;
       console.log!(await CliScmUtil.createCommit(commitMessage));
       // Touch package when done to trigger restart of compiler
-      await fs.utimes(path.resolve(RootIndex.manifest.workspacePath, 'package.json'), Date.now(), Date.now());
+      await fs.utimes(RuntimeContext.workspaceRelative('package.json'), Date.now(), Date.now());
     }
   }
 }