@travetto/repo 7.1.3 → 7.1.4

package/README.md

@@ -13,14 +13,14 @@ npm install @travetto/repo
 yarn add @travetto/repo
 ```
 
-The repo module aims to provide concise monorepo based tools.  The monorepo support within the [Travetto](https://travetto.dev) framework, is based on [Npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)/[Yarn](https://yarnpg.com) workspaces.  This module is not a requirement for monorepo support, but provides some quality of life improvements for:
+The repo module aims to provide concise monorepo based tools.  The monorepo support within the [Travetto](https://travetto.dev) framework, is backed by the built in functionality of [Npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)/[Yarn](https://yarnpkg.com).  This module is not a requirement for monorepo support, but provides some quality of life improvements for:
    *  Versioning releases
    *  Publishing releases
    *  Listing local modules
    *  Running commands on all workspace modules
 
 ## CLI - Version
-The versioning operation will find all the changed modules (and the modules that depend on the changed), and will update the versions in accordance with the user preferences.  The versioning logic is backed by [Npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)'s and [Yarn](https://yarnpg.com)'s versioning functionality and so it is identical to using the tool manually. The determination of what has or hasn't changed is relative to the last versioning commit.
+The versioning operation will find all the changed modules (and the modules that depend on the changed), and will update the versions in accordance with the user preferences.  The versioning logic is backed by [Npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)/[Yarn](https://yarnpkg.com)'s versioning functionality and so it is identical to using the tool manually. The determination of what has or hasn't changed is relative to the last versioning commit.
 
 **Terminal: Version execution**
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/repo",
-  "version": "7.1.3",
+  "version": "7.1.4",
   "type": "module",
   "description": "Monorepo utilities",
   "keywords": [
@@ -23,10 +23,10 @@
     "directory": "module/repo"
   },
   "dependencies": {
-    "@travetto/worker": "^7.1.3"
+    "@travetto/worker": "^7.1.4"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.1.3"
+    "@travetto/cli": "^7.1.4"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/package-manager.ts

@@ -2,14 +2,12 @@ import path from 'node:path';
 import { spawn, type ChildProcess } from 'node:child_process';
 import fs from 'node:fs/promises';
 
-import { ExecUtil, type ExecutionResult, JSONUtil } from '@travetto/runtime';
-import { type IndexedModule, type ManifestContext, type Package, PackageUtil } from '@travetto/manifest';
+import { type ExecutionResult, JSONUtil, Runtime } from '@travetto/runtime';
+import { type IndexedModule, type Package, PackageUtil } from '@travetto/manifest';
 import { CliModuleUtil } from '@travetto/cli';
 
 export type SemverLevel = 'minor' | 'patch' | 'major' | 'prerelease' | 'premajor' | 'preminor' | 'prepatch';
 
-type Ctx = Omit<ManifestContext, 'build'>;
-
 /**
  * Utilities for working with package managers
  */
@@ -18,85 +16,71 @@ export class PackageManager {
   /**
    * Is a module already published
    */
-  static isPublished(ctx: Ctx, module: IndexedModule): ChildProcess {
+  static isPublished(module: IndexedModule): ChildProcess {
     let args: string[];
-    switch (ctx.workspace.manager) {
+    switch (Runtime.workspace.manager) {
       case 'npm':
-        args = ['show', `${module.name}@${module.version}`, 'version', '--json'];
-        break;
       case 'yarn':
-        args = ['info', `${module.name}@${module.version}`, 'dist.integrity', '--json'];
-        break;
+      case 'pnpm': args = ['info', `${module.name}@${module.version}`, '--json']; break;
     }
-    return spawn(ctx.workspace.manager, args, { cwd: module.sourceFolder });
+    return spawn(Runtime.workspace.manager, args, { cwd: module.sourceFolder });
   }
 
   /**
    * Validate published result
    */
-  static validatePublishedResult(ctx: Ctx, module: IndexedModule, result: ExecutionResult<string>): boolean {
-    switch (ctx.workspace.manager) {
-      case 'npm': {
-        if (!result.valid && !result.stderr.includes('E404')) {
-          throw new Error(result.stderr);
-        }
-        const item: (string[] | string) = result.stdout ? JSONUtil.parseSafe(result.stdout) : [];
-        const found = Array.isArray(item) ? item.pop() : item;
-        return !!found && found === module.version;
-      }
-      case 'yarn': {
-        const parsed = JSONUtil.parseSafe<{ data?: unknown }>(result.stdout);
-        return parsed.data !== undefined;
-      }
+  static validatePublishedResult(result: ExecutionResult<string>): boolean {
+    if (!result.valid && !result.stderr.includes('E404')) {
+      throw new Error(result.stderr);
     }
+
+    const parsed = JSONUtil.parseSafe<{ data: { dist?: { integrity?: string } } }>(result.stdout || '{}');
+    return parsed.data?.dist?.integrity !== undefined;
   }
 
   /**
    * Setting the version
    */
-  static async version(ctx: Ctx, modules: IndexedModule[], level: SemverLevel, preid?: string): Promise<void> {
+  static version(modules: IndexedModule[], level: SemverLevel, preid?: string): ChildProcess {
     const moduleArgs = modules.flatMap(module => ['-w', module.sourceFolder]);
     let args: string[];
-    switch (ctx.workspace.manager) {
+    switch (Runtime.workspace.manager) {
       case 'npm':
       case 'yarn':
-        args = ['version', '--no-workspaces-update', level, ...(preid ? ['--preid', preid] : []), ...moduleArgs];
-        break;
+      case 'pnpm': args = ['version', '--no-workspaces-update', level, ...(preid ? ['--preid', preid] : [])]; break;
     }
-    await ExecUtil.getResult(spawn(ctx.workspace.manager, args, { cwd: ctx.workspace.path, stdio: 'inherit' }));
+    return spawn(Runtime.workspace.manager, [...args, ...moduleArgs], { cwd: Runtime.workspace.path, stdio: 'inherit' });
   }
 
   /**
    * Dry-run packaging
    */
-  static dryRunPackaging(ctx: Ctx, module: IndexedModule): ChildProcess {
+  static dryRunPackaging(module: IndexedModule): ChildProcess {
     let args: string[];
-    switch (ctx.workspace.manager) {
+    switch (Runtime.workspace.manager) {
       case 'npm':
       case 'yarn':
-        args = ['pack', '--dry-run'];
-        break;
+      case 'pnpm': args = ['pack', '--dry-run']; break;
     }
-    return spawn(ctx.workspace.manager, args, { cwd: module.sourcePath });
+    return spawn(Runtime.workspace.manager, args, { cwd: module.sourcePath });
   }
 
   /**
    * Publish a module
    */
-  static publish(ctx: Ctx, module: IndexedModule, dryRun: boolean | undefined): ChildProcess {
+  static publish(module: IndexedModule, dryRun: boolean | undefined): ChildProcess {
     if (dryRun) {
-      return this.dryRunPackaging(ctx, module);
+      return this.dryRunPackaging(module);
     }
 
     const versionTag = module.version.match(/^.*-(rc|alpha|beta|next)[.]\d+/)?.[1] ?? 'latest';
     let args: string[];
-    switch (ctx.workspace.manager) {
+    switch (Runtime.workspace.manager) {
       case 'npm':
       case 'yarn':
-        args = ['publish', '--tag', versionTag, '--access', 'public'];
-        break;
+      case 'pnpm': args = ['publish', '--tag', versionTag, '--access', 'public']; break;
     }
-    return spawn(ctx.workspace.manager, args, { cwd: module.sourcePath });
+    return spawn(Runtime.workspace.manager, args, { cwd: module.sourcePath });
   }
 
   /**

package/support/cli.repo_publish.ts

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

package/support/cli.repo_version.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 
 import { CliModuleUtil, type CliCommandShape, CliCommand, CliScmUtil, type CliValidationError } from '@travetto/cli';
-import { Runtime } from '@travetto/runtime';
+import { ExecUtil, Runtime } from '@travetto/runtime';
 
 import { PackageManager, type SemverLevel } from './bin/package-manager.ts';
 
@@ -46,7 +46,7 @@ export class RepoVersionCommand implements CliCommandShape {
       throw new Error('No modules available for versioning');
     }
 
-    await PackageManager.version(Runtime, modules, level, prefix);
+    await ExecUtil.getResult(PackageManager.version(modules, level, prefix));
 
     const versions = await PackageManager.synchronizeVersions();
     if (this.commit) {