relizy 0.2.5-beta.3 → 0.2.5-beta.5

package/dist/cli.mjs

@@ -5,7 +5,7 @@ import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 import { printBanner, logger } from '@maz-ui/node';
 import { Command } from 'commander';
-import { U as isInCI, V as getCIName, b as bump, c as changelog, d as publish, a as providerRelease, r as release } from './shared/relizy.B2IjjUKt.mjs';
+import { U as isInCI, V as getCIName, b as bump, c as changelog, d as publish, a as providerRelease, r as release } from './shared/relizy.Ymqkl0CI.mjs';
 import 'node:child_process';
 import '@maz-ui/utils';
 import 'c12';

package/dist/index.d.mts

@@ -169,6 +169,11 @@ declare function publishPackage({ pkg, config, packageManager, dryRun, }: {
 }): Promise<void>;
 
 declare function readPackageJson(packagePath: string): ReadPackage;
+interface RootPackage extends ReadPackage {
+    fromTag: string;
+    commits: GitCommit[];
+    newVersion?: string;
+}
 declare function getRootPackage({ config, force, from, to, suffix, changelog, }: {
     config: ResolvedRelizyConfig;
     force: boolean;
@@ -176,15 +181,7 @@ declare function getRootPackage({ config, force, from, to, suffix, changelog, }:
     to: string;
     suffix: string | undefined;
     changelog: boolean;
-}): Promise<{
-    path: string;
-    fromTag: string;
-    commits: GitCommit[];
-    newVersion: string;
-    name: string;
-    version: string;
-    private: boolean;
-}>;
+}): Promise<RootPackage>;
 declare function readPackages({ cwd, patterns, ignorePackageNames, }: {
     cwd: string;
     patterns?: string[];
@@ -399,7 +396,7 @@ interface BumpResultTruthy {
     /**
      * Root package
      */
-    rootPackage?: Awaited<ReturnType<typeof getRootPackage>>;
+    rootPackage?: RootPackage;
     /**
      * Bumped packages
      */
@@ -903,4 +900,4 @@ declare function publish(options?: Partial<PublishOptions>): Promise<{
 declare function release(options?: Partial<ReleaseOptions>): Promise<void>;
 
 export { bump, changelog, checkGitStatusIfDirty, confirmBump, createCommitAndTags, createGitlabRelease, defineConfig, detectGitProvider, detectPackageManager, determinePublishTag, determineReleaseType, determineSemverChange, executeBuildCmd, executeFormatCmd, executeHook, expandPackagesToBumpWithDependents, extractVersionFromPackageTag, fetchGitTags, generateChangelog, getBumpedIndependentPackages, getBumpedPackageIndependently, getCIName, getCurrentGitBranch, getCurrentGitRef, getDefaultConfig, getDependentsOf, getFirstCommit, getGitStatus, getIndependentTag, getLastPackageTag, getLastRepoTag, getLastStableTag, getLastTag, getPackageCommits, getPackageDependencies, getPackageNewVersion, getPackages, getPackagesToPublishInIndependentMode, getPackagesToPublishInSelectiveMode, getPreid, getRootPackage, github, gitlab, hasLernaJson, isBumpedPackage, isChangedPreid, isGraduating, isInCI, isPrerelease, isPrereleaseReleaseType, isStableReleaseType, loadRelizyConfig, parseGitRemoteUrl, providerRelease, providerReleaseSafetyCheck, publish, publishPackage, pushCommitAndTags, readPackageJson, readPackages, release, resolveTags, topologicalSort, updateLernaVersion, writeChangelogToFile, writeVersion };
-export type { BumpConfig, BumpOptions, BumpResult, BumpResultFalsy, BumpResultTruthy, ChangelogConfig, ChangelogOptions, ConfigType, GitProvider, GitlabRelease, GitlabReleaseResponse, HookConfig, HookStep, HookType, MonorepoConfig, PackageBase, PackageManager, PostedRelease, ProviderReleaseOptions, PublishConfig, PublishOptions, PublishResponse, ReadPackage, ReleaseConfig, ReleaseOptions, RelizyConfig, RepoConfig, ResolvedConfig, ResolvedRelizyConfig, ResolvedTags, Step, TemplatesConfig, VersionMode };
+export type { BumpConfig, BumpOptions, BumpResult, BumpResultFalsy, BumpResultTruthy, ChangelogConfig, ChangelogOptions, ConfigType, GitProvider, GitlabRelease, GitlabReleaseResponse, HookConfig, HookStep, HookType, MonorepoConfig, PackageBase, PackageManager, PostedRelease, ProviderReleaseOptions, PublishConfig, PublishOptions, PublishResponse, ReadPackage, ReleaseConfig, ReleaseOptions, RelizyConfig, RepoConfig, ResolvedConfig, ResolvedRelizyConfig, ResolvedTags, RootPackage, Step, TemplatesConfig, VersionMode };

package/dist/index.d.ts

@@ -169,6 +169,11 @@ declare function publishPackage({ pkg, config, packageManager, dryRun, }: {
 }): Promise<void>;
 
 declare function readPackageJson(packagePath: string): ReadPackage;
+interface RootPackage extends ReadPackage {
+    fromTag: string;
+    commits: GitCommit[];
+    newVersion?: string;
+}
 declare function getRootPackage({ config, force, from, to, suffix, changelog, }: {
     config: ResolvedRelizyConfig;
     force: boolean;
@@ -176,15 +181,7 @@ declare function getRootPackage({ config, force, from, to, suffix, changelog, }:
     to: string;
     suffix: string | undefined;
     changelog: boolean;
-}): Promise<{
-    path: string;
-    fromTag: string;
-    commits: GitCommit[];
-    newVersion: string;
-    name: string;
-    version: string;
-    private: boolean;
-}>;
+}): Promise<RootPackage>;
 declare function readPackages({ cwd, patterns, ignorePackageNames, }: {
     cwd: string;
     patterns?: string[];
@@ -399,7 +396,7 @@ interface BumpResultTruthy {
     /**
      * Root package
      */
-    rootPackage?: Awaited<ReturnType<typeof getRootPackage>>;
+    rootPackage?: RootPackage;
     /**
      * Bumped packages
      */
@@ -903,4 +900,4 @@ declare function publish(options?: Partial<PublishOptions>): Promise<{
 declare function release(options?: Partial<ReleaseOptions>): Promise<void>;
 
 export { bump, changelog, checkGitStatusIfDirty, confirmBump, createCommitAndTags, createGitlabRelease, defineConfig, detectGitProvider, detectPackageManager, determinePublishTag, determineReleaseType, determineSemverChange, executeBuildCmd, executeFormatCmd, executeHook, expandPackagesToBumpWithDependents, extractVersionFromPackageTag, fetchGitTags, generateChangelog, getBumpedIndependentPackages, getBumpedPackageIndependently, getCIName, getCurrentGitBranch, getCurrentGitRef, getDefaultConfig, getDependentsOf, getFirstCommit, getGitStatus, getIndependentTag, getLastPackageTag, getLastRepoTag, getLastStableTag, getLastTag, getPackageCommits, getPackageDependencies, getPackageNewVersion, getPackages, getPackagesToPublishInIndependentMode, getPackagesToPublishInSelectiveMode, getPreid, getRootPackage, github, gitlab, hasLernaJson, isBumpedPackage, isChangedPreid, isGraduating, isInCI, isPrerelease, isPrereleaseReleaseType, isStableReleaseType, loadRelizyConfig, parseGitRemoteUrl, providerRelease, providerReleaseSafetyCheck, publish, publishPackage, pushCommitAndTags, readPackageJson, readPackages, release, resolveTags, topologicalSort, updateLernaVersion, writeChangelogToFile, writeVersion };
-export type { BumpConfig, BumpOptions, BumpResult, BumpResultFalsy, BumpResultTruthy, ChangelogConfig, ChangelogOptions, ConfigType, GitProvider, GitlabRelease, GitlabReleaseResponse, HookConfig, HookStep, HookType, MonorepoConfig, PackageBase, PackageManager, PostedRelease, ProviderReleaseOptions, PublishConfig, PublishOptions, PublishResponse, ReadPackage, ReleaseConfig, ReleaseOptions, RelizyConfig, RepoConfig, ResolvedConfig, ResolvedRelizyConfig, ResolvedTags, Step, TemplatesConfig, VersionMode };
+export type { BumpConfig, BumpOptions, BumpResult, BumpResultFalsy, BumpResultTruthy, ChangelogConfig, ChangelogOptions, ConfigType, GitProvider, GitlabRelease, GitlabReleaseResponse, HookConfig, HookStep, HookType, MonorepoConfig, PackageBase, PackageManager, PostedRelease, ProviderReleaseOptions, PublishConfig, PublishOptions, PublishResponse, ReadPackage, ReleaseConfig, ReleaseOptions, RelizyConfig, RepoConfig, ResolvedConfig, ResolvedRelizyConfig, ResolvedTags, RootPackage, Step, TemplatesConfig, VersionMode };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { b as bump, c as changelog, m as checkGitStatusIfDirty, aa as confirmBump, s as createCommitAndTags, A as createGitlabRelease, f as defineConfig, o as detectGitProvider, C as detectPackageManager, D as determinePublishTag, _ as determineReleaseType, Z as determineSemverChange, X as executeBuildCmd, W as executeFormatCmd, T as executeHook, j as expandPackagesToBumpWithDependents, a2 as extractVersionFromPackageTag, n as fetchGitTags, g as generateChangelog, ab as getBumpedIndependentPackages, a9 as getBumpedPackageIndependently, V as getCIName, x as getCurrentGitBranch, y as getCurrentGitRef, e as getDefaultConfig, i as getDependentsOf, v as getFirstCommit, k as getGitStatus, N as getIndependentTag, R as getLastPackageTag, Q as getLastRepoTag, O as getLastStableTag, P as getLastTag, L as getPackageCommits, h as getPackageDependencies, a0 as getPackageNewVersion, K as getPackages, F as getPackagesToPublishInIndependentMode, E as getPackagesToPublishInSelectiveMode, a7 as getPreid, I as getRootPackage, z as github, B as gitlab, M as hasLernaJson, Y as isBumpedPackage, a8 as isChangedPreid, a6 as isGraduating, U as isInCI, a3 as isPrerelease, a5 as isPrereleaseReleaseType, a4 as isStableReleaseType, l as loadRelizyConfig, q as parseGitRemoteUrl, a as providerRelease, p as providerReleaseSafetyCheck, d as publish, G as publishPackage, u as pushCommitAndTags, H as readPackageJson, J as readPackages, r as release, S as resolveTags, t as topologicalSort, a1 as updateLernaVersion, w as writeChangelogToFile, $ as writeVersion } from './shared/relizy.B2IjjUKt.mjs';
+export { b as bump, c as changelog, m as checkGitStatusIfDirty, aa as confirmBump, s as createCommitAndTags, A as createGitlabRelease, f as defineConfig, o as detectGitProvider, C as detectPackageManager, D as determinePublishTag, _ as determineReleaseType, Z as determineSemverChange, X as executeBuildCmd, W as executeFormatCmd, T as executeHook, j as expandPackagesToBumpWithDependents, a2 as extractVersionFromPackageTag, n as fetchGitTags, g as generateChangelog, ab as getBumpedIndependentPackages, a9 as getBumpedPackageIndependently, V as getCIName, x as getCurrentGitBranch, y as getCurrentGitRef, e as getDefaultConfig, i as getDependentsOf, v as getFirstCommit, k as getGitStatus, N as getIndependentTag, R as getLastPackageTag, Q as getLastRepoTag, O as getLastStableTag, P as getLastTag, L as getPackageCommits, h as getPackageDependencies, a0 as getPackageNewVersion, K as getPackages, F as getPackagesToPublishInIndependentMode, E as getPackagesToPublishInSelectiveMode, a7 as getPreid, I as getRootPackage, z as github, B as gitlab, M as hasLernaJson, Y as isBumpedPackage, a8 as isChangedPreid, a6 as isGraduating, U as isInCI, a3 as isPrerelease, a5 as isPrereleaseReleaseType, a4 as isStableReleaseType, l as loadRelizyConfig, q as parseGitRemoteUrl, a as providerRelease, p as providerReleaseSafetyCheck, d as publish, G as publishPackage, u as pushCommitAndTags, H as readPackageJson, J as readPackages, r as release, S as resolveTags, t as topologicalSort, a1 as updateLernaVersion, w as writeChangelogToFile, $ as writeVersion } from './shared/relizy.Ymqkl0CI.mjs';
 import '@maz-ui/node';
 import 'node:process';
 import 'node:child_process';

package/dist/shared/{relizy.B2IjjUKt.mjs → relizy.Ymqkl0CI.mjs}

@@ -812,23 +812,33 @@ function topologicalSort(packages) {
   for (const pkg of packages) {
     packageMap.set(pkg.name, pkg);
   }
-  function visit(pkgName) {
-    if (visited.has(pkgName))
-      return;
+  function visit(pkgName, path = []) {
+    logger.debug(`Visiting ${pkgName}, path: ${path.join(" \u2192 ")}, visiting: ${Array.from(visiting).join(", ")}`);
     if (visiting.has(pkgName)) {
-      logger.fail(`Circular dependency detected involving ${pkgName}`);
+      const cycle = [...path, pkgName];
+      logger.warn(`Circular dependency detected: ${cycle.join(" \u2192 ")}`);
+      return;
+    }
+    if (visited.has(pkgName)) {
+      logger.debug(`${pkgName} already visited globally, skipping`);
       return;
     }
     visiting.add(pkgName);
+    logger.debug(`Added ${pkgName} to visiting set`);
     const pkg = packageMap.get(pkgName);
-    if (!pkg)
+    if (!pkg) {
+      logger.debug(`Package ${pkgName} not found in packageMap`);
+      visiting.delete(pkgName);
       return;
+    }
+    logger.debug(`${pkgName} has dependencies: ${pkg.dependencies.join(", ")}`);
     for (const depName of pkg.dependencies) {
-      visit(depName);
+      visit(depName, [...path, pkgName]);
     }
     visiting.delete(pkgName);
     visited.add(pkgName);
     sorted.push(pkg);
+    logger.debug(`Finished visiting ${pkgName}`);
   }
   for (const pkg of packages) {
     visit(pkg.name);
@@ -2147,24 +2157,27 @@ async function getRootPackage({
       config,
       changelog
     });
-    const releaseType = determineReleaseType({
-      currentVersion: packageJson.version,
-      commits,
-      releaseType: config.bump.type,
-      preid: config.bump.preid,
-      types: config.types,
-      force
-    });
-    if (!releaseType) {
-      logger.fail("No commits require a version bump");
-      process.exit(0);
+    let newVersion;
+    if (config.monorepo?.versionMode !== "independent") {
+      const releaseType = determineReleaseType({
+        currentVersion: packageJson.version,
+        commits,
+        releaseType: config.bump.type,
+        preid: config.bump.preid,
+        types: config.types,
+        force
+      });
+      if (!releaseType) {
+        logger.fail("No commits require a version bump");
+        process.exit(1);
+      }
+      newVersion = getPackageNewVersion({
+        currentVersion: packageJson.version,
+        releaseType,
+        preid: config.bump.preid,
+        suffix
+      });
     }
-    const newVersion = getPackageNewVersion({
-      currentVersion: packageJson.version,
-      releaseType,
-      preid: config.bump.preid,
-      suffix
-    });
     return {
       ...packageJson,
       path: config.cwd,
@@ -2436,7 +2449,7 @@ async function bumpUnifiedMode({
   const currentVersion = rootPackage.version;
   const newVersion = rootPackage.newVersion;
   if (!newVersion) {
-    throw new Error(`Could not determine a new version for ${rootPackage.name} (root)`);
+    throw new Error(`Could not determine a new version`);
   }
   logger.debug(`Bump from ${from} to ${to}`);
   logger.debug(`${currentVersion} \u2192 ${newVersion} (${config.monorepo?.versionMode || "standalone"} mode)`);
@@ -2447,7 +2460,7 @@ async function bumpUnifiedMode({
     force
   });
   if (packages.length === 0) {
-    logger.fail("No packages to bump");
+    logger.debug("No packages to bump");
     return { bumped: false };
   }
   if (!config.bump.yes) {
@@ -2514,6 +2527,9 @@ async function bumpSelectiveMode({
   });
   const currentVersion = rootPackage.version;
   const newVersion = rootPackage.newVersion;
+  if (!newVersion) {
+    throw new Error("Could not determine a new version");
+  }
   logger.debug(`Bump from ${currentVersion} to ${newVersion}`);
   logger.debug("Determining packages to bump...");
   const packages = await getPackages({
@@ -2684,7 +2700,7 @@ async function bump(options = {}) {
       logger.success(`${dryRun ? "[dry-run] " : ""}Version bump completed (${resultLog} package${resultLog === 1 || typeof resultLog === "string" ? "" : "s"} bumped)`);
     } else {
       logger.fail("No packages to bump, no relevant commits found");
-      exit(0);
+      exit(1);
     }
     await executeHook("success:bump", config, dryRun);
     return result;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "relizy",
   "type": "module",
-  "version": "0.2.5-beta.3",
+  "version": "0.2.5-beta.5",
   "description": "Changelogen adapter for monorepo management with unified and independent versioning",
   "author": "Louis Mazel <me@loicmazuel.com>",
   "license": "MIT",