relacher 0.0.7-rc.0 → 0.0.7-rc.2

package/lib-types/builder/cargo.d.ts

@@ -1,4 +1,5 @@
 import { type PackageList } from './shared';
 export interface CargoBuilderOptions {
+    includePrivate?: boolean;
 }
-export declare function loadCargoDeps(cwd: string, _options?: CargoBuilderOptions): PackageList;
+export declare function loadCargoDeps(cwd: string, options?: CargoBuilderOptions): PackageList;

package/lib-types/orchestrator.d.ts

@@ -1,44 +1,29 @@
 import { type PackageList } from './builder';
 import type { PreparedUpdate } from './types';
 import { type VcsProvider } from './vcs';
-import { type CascadeRules, type SizePatterns } from './versioning';
+import { type CascadeRules, type SizePatterns, type BumpSize } from './versioning';
 export interface RelacherConfig {
-    /** Project root directory. Defaults to `process.cwd()` */
     cwd?: string;
-    /** Discovered packages list */
     packages: PackageList;
-    /** VCS Provider: 'git', 'jj', or custom VcsProvider. Defaults to auto-detection */
     vcs?: 'git' | 'jj' | VcsProvider;
-    /** Custom RC identifier (default: 'rc') */
     rcIdentifier?: string;
-    /** Custom Conventional Commit patterns */
     sizes?: SizePatterns;
-    /** Dependency bump cascade rules */
     cascade?: CascadeRules;
-    /** Exclude nested watch paths from parent bumps (default: true) */
     excludeNestedWatches?: boolean;
-    /** Custom commit title callback */
+    /** Force a bump size across all packages (e.g. true for patch, or 'minor' / 'major') */
+    force?: boolean | BumpSize;
+    /** Selectively force bump sizes for specific packages */
+    forcePackages?: Record<string, BumpSize>;
     commitTitle?: (bumps: Record<string, string>, defaultTitle: string) => string;
 }
 export declare function createRelacher(config: RelacherConfig): {
     vcs: VcsProvider;
-    /**
-     * Initializes `.relacher.lock` and creates the baseline commit.
-     */
     init(): Promise<void>;
-    /**
-     * Previews and calculates pending version bumps without writing changes.
-     */
     prepare(options?: {
         mode?: "release" | "pre-release";
+        force?: boolean | BumpSize;
+        forcePackages?: Record<string, BumpSize>;
     }): Promise<PreparedUpdate>;
-    /**
-     * Writes planned updates to disk and commits via VCS.
-     */
     run(prepared: PreparedUpdate): Promise<void>;
-    /**
-     * Full interactive CLI entry point.
-     * Handles arguments, preflight logs, confirmation prompts, dry-runs, and execution.
-     */
     cli(argv?: string[]): Promise<void>;
 };

package/lib-types/prepare.d.ts

@@ -6,7 +6,7 @@ import type { BumpSize } from './versioning/types';
 export declare function isBumpSizeMatch(actual: BumpSize, pattern: BumpSize): boolean;
 export declare function isUpdateActive(bump: BumpSize, onlyOn?: BumpSize[]): boolean;
 export declare function topologicalSort(items: IntermediateReport[]): IntermediateReport[];
-export declare function initReportItems(packages: PackageConfig[], cwd: string, excludeNestedWatches?: boolean): Effect.Effect<IntermediateReport[], Error, VersionManager>;
+export declare function initReportItems(packages: PackageConfig[], cwd: string, options?: PrepareOptions): Effect.Effect<IntermediateReport[], Error, VersionManager>;
 export declare function prepare(packages: PackageConfig[] & {
     errors?: Array<{
         name: string;

package/lib-types/types.d.ts

@@ -27,6 +27,14 @@ export interface PackageConfig {
     coupled?: string[];
     group?: string;
 }
+export interface PrepareOptions {
+    cwd?: string;
+    excludeNestedWatches?: boolean;
+    /** Force a bump size across all packages (e.g. true for patch, or 'minor' / 'major') */
+    force?: boolean | BumpSize;
+    /** Selectively force bump sizes for specific packages */
+    forcePackages?: Record<string, BumpSize>;
+}
 export interface PrepareOptions {
     cwd?: string;
     excludeNestedWatches?: boolean;

package/lib-types/versioning/bump.d.ts

@@ -0,0 +1,13 @@
+import type { BumpSize, PreRelease } from './types';
+/**
+ * Type guard for pre-release bump objects.
+ */
+export declare function isPreRelease(val: unknown): val is PreRelease;
+/**
+ * Numeric priority for bump sizes: major (4) > minor (3) > patch (2) > pre (1) > skip (0).
+ */
+export declare function getBumpPriority(bump: BumpSize): number;
+export declare function isBumpGreater(a: BumpSize, b: BumpSize): boolean;
+export declare function maxBump(a: BumpSize, b: BumpSize): BumpSize;
+export declare function isBumpEqual(a: BumpSize, b: BumpSize): boolean;
+export declare function getBumpByPriority(priority: number, fallbackPre?: PreRelease): BumpSize;

package/lib-types/versioning/index.d.ts

@@ -1,4 +1,6 @@
 export * from './types';
+export * from './bump';
+export * from './semver';
 export * from './utils';
 export * from './default-data';
 export * from './vcs-version-manager';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relacher",
-  "version": "0.0.7-rc.0",
+  "version": "0.0.7-rc.2",
   "description": "Scriptable release orchestration library for monorepos",
   "type": "module",
   "private": false,

package/src/builder/cargo.ts

@@ -9,7 +9,9 @@ import { isPathTrackedSync } from '../vcs/common';
 
 import { createPackageList, type PackageList } from './shared';
 
-export interface CargoBuilderOptions {}
+export interface CargoBuilderOptions {
+  includePrivate?: boolean;
+}
 
 interface PathDep {
   name: string;
@@ -250,7 +252,7 @@ function buildCrateConfig(
   };
 }
 
-export function loadCargoDeps(cwd: string, _options?: CargoBuilderOptions): PackageList {
+export function loadCargoDeps(cwd: string, options?: CargoBuilderOptions): PackageList {
   const workspaceRoot = findCargoWorkspaceRoot(cwd);
   const rootCargo = path.join(workspaceRoot, 'Cargo.toml');
   if (!fs.existsSync(rootCargo)) return createPackageList([]);
@@ -265,9 +267,12 @@ export function loadCargoDeps(cwd: string, _options?: CargoBuilderOptions): Pack
     const hasLock = fs.existsSync(path.join(workspaceRoot, 'Cargo.lock'));
 
     const publishableTracked = scanner.crateInfos.filter((info) => {
-      const publishVal = info.doc?.package?.publish;
-      if (publishVal === false) return false;
-      if (Array.isArray(publishVal) && publishVal.length === 0) return false;
+      // Respect includePrivate flag (defaults to false)
+      if (!options?.includePrivate) {
+        const publishVal = info.doc?.package?.publish;
+        if (publishVal === false) return false;
+        if (Array.isArray(publishVal) && publishVal.length === 0) return false;
+      }
 
       const cargoPath = path.join(info.memberPath, 'Cargo.toml');
       return isPathTrackedSync(cargoPath, workspaceRoot);

package/src/display/print.ts

@@ -82,6 +82,7 @@ export function prettyPrint(prepared: PreparedUpdate): void {
     );
     console.log(`   ${files.join('  ')}`);
 
+    // 1. Show commits
     for (const commit of report.commits) {
       const commitBump = matchBumpSize(commit.message, defaultSizes);
       const marker = commitBump !== 'skip' ? `${c.green('✦')}` : `${c.gray('○')}`;
@@ -90,6 +91,7 @@ export function prettyPrint(prepared: PreparedUpdate): void {
       );
     }
 
+    // 2. Show Cascades
     const changedDeps = prepared.deps.filter(
       (r) => report.depends?.includes(r.name) && r.currentVersion !== r.newVersion,
     );
@@ -107,6 +109,11 @@ export function prettyPrint(prepared: PreparedUpdate): void {
       );
     }
 
+    // 3. Fallback for forced releases with no commits and no cascades
+    if (report.commits.length === 0 && changedDeps.length === 0) {
+      console.log(`     ${c.gray('○ (forced release - no new commits)')}`);
+    }
+
     console.log('');
   }
 }

package/src/orchestrator.ts

@@ -13,35 +13,31 @@ import { makeGitVcsProvider, makeJjVcsProvider, VcsProviderService, type VcsProv
 import { isInsideJjWorkTree } from './vcs/common';
 import {
   makeRCVersionManager,
-  makeVcsVersionManager,
   VersionManagerService,
   type CascadeRules,
   type SizePatterns,
+  type BumpSize,
 } from './versioning';
 
+// Replace lines 20-35 in src/orchestrator.ts:
 export interface RelacherConfig {
-  /** Project root directory. Defaults to `process.cwd()` */
   cwd?: string;
-  /** Discovered packages list */
   packages: PackageList;
-  /** VCS Provider: 'git', 'jj', or custom VcsProvider. Defaults to auto-detection */
   vcs?: 'git' | 'jj' | VcsProvider;
-  /** Custom RC identifier (default: 'rc') */
   rcIdentifier?: string;
-  /** Custom Conventional Commit patterns */
   sizes?: SizePatterns;
-  /** Dependency bump cascade rules */
   cascade?: CascadeRules;
-  /** Exclude nested watch paths from parent bumps (default: true) */
   excludeNestedWatches?: boolean;
-  /** Custom commit title callback */
+  /** Force a bump size across all packages (e.g. true for patch, or 'minor' / 'major') */
+  force?: boolean | BumpSize;
+  /** Selectively force bump sizes for specific packages */
+  forcePackages?: Record<string, BumpSize>;
   commitTitle?: (bumps: Record<string, string>, defaultTitle: string) => string;
 }
 
 export function createRelacher(config: RelacherConfig) {
   const cwd = config.cwd || process.cwd();
 
-  // 1. Resolve VCS Provider
   let vcs: VcsProvider;
   if (config.vcs && typeof config.vcs === 'object') {
     vcs = config.vcs;
@@ -50,11 +46,9 @@ export function createRelacher(config: RelacherConfig) {
   } else if (config.vcs === 'jj') {
     vcs = makeJjVcsProvider(cwd);
   } else {
-    // Auto-detect JJ or fallback to Git
     vcs = isInsideJjWorkTree(cwd) ? makeJjVcsProvider(cwd) : makeGitVcsProvider(cwd);
   }
 
-  // 2. Factory for Version Manager
   const createVM = (mode: 'release' | 'pre-release') => {
     return makeRCVersionManager(vcs, {
       upgradeReady: mode === 'release',
@@ -67,9 +61,6 @@ export function createRelacher(config: RelacherConfig) {
   return {
     vcs,
 
-    /**
-     * Initializes `.relacher.lock` and creates the baseline commit.
-     */
     async init(): Promise<void> {
       const program = init(config.packages, { cwd }).pipe(
         Effect.provideService(VcsProviderService, vcs),
@@ -77,16 +68,22 @@ export function createRelacher(config: RelacherConfig) {
       return Effect.runPromise(program);
     },
 
-    /**
-     * Previews and calculates pending version bumps without writing changes.
-     */
-    async prepare(options: { mode?: 'release' | 'pre-release' } = {}): Promise<PreparedUpdate> {
+
+    async prepare(
+      options: {
+        mode?: 'release' | 'pre-release';
+        force?: boolean | BumpSize;
+        forcePackages?: Record<string, BumpSize>;
+      } = {},
+    ): Promise<PreparedUpdate> {
       const mode = options.mode || 'release';
       const vm = createVM(mode);
 
       const program = prepare(config.packages, {
         cwd,
         excludeNestedWatches: config.excludeNestedWatches ?? true,
+        force: options.force ?? config.force,
+        forcePackages: options.forcePackages ?? config.forcePackages,
       }).pipe(
         Effect.provideService(VersionManagerService, vm),
         Effect.provideService(VcsProviderService, vcs),
@@ -94,10 +91,6 @@ export function createRelacher(config: RelacherConfig) {
 
       return Effect.runPromise(program);
     },
-
-    /**
-     * Writes planned updates to disk and commits via VCS.
-     */
     async run(prepared: PreparedUpdate): Promise<void> {
       const program = run(prepared, {
         cwd,
@@ -108,14 +101,22 @@ export function createRelacher(config: RelacherConfig) {
       return Effect.runPromise(program);
     },
 
-    /**
-     * Full interactive CLI entry point.
-     * Handles arguments, preflight logs, confirmation prompts, dry-runs, and execution.
-     */
     async cli(argv: string[] = process.argv.slice(2)): Promise<void> {
       const dryRun = argv.includes('--dry-run');
       const yes = argv.includes('-y') || argv.includes('--yes');
-      const positional = argv.filter((a) => !a.startsWith('-'));
+
+      // Parse force / empty flags
+      const forceFlagIdx = argv.findIndex((a) => a === '--force');
+      const hasEmptyFlag = argv.includes('--empty');
+      let forceOption: boolean | BumpSize | undefined = undefined;
+
+      if (forceFlagIdx !== -1 && argv[forceFlagIdx + 1] && !argv[forceFlagIdx + 1]?.startsWith('-')) {
+        forceOption = argv[forceFlagIdx + 1] as BumpSize;
+      } else if (forceFlagIdx !== -1 || hasEmptyFlag) {
+        forceOption = true;
+      }
+
+      const positional = argv.filter((a) => !a.startsWith('-') && a !== forceOption);
       const command = positional[0] as 'init' | 'pre-release' | 'release' | undefined;
 
       if (!command || !['init', 'pre-release', 'release'].includes(command)) {
@@ -124,8 +125,8 @@ export function createRelacher(config: RelacherConfig) {
             'Invalid or missing release command.',
             '',
             'Usage:',
-            '  relacher pre-release [--dry-run] [-y]',
-            '  relacher release     [--dry-run] [-y]',
+            '  relacher pre-release [--force] [--dry-run] [-y]',
+            '  relacher release     [--force [patch|minor|major]] [--dry-run] [-y]',
             '  relacher init',
           ].join('\n'),
         );
@@ -143,11 +144,14 @@ export function createRelacher(config: RelacherConfig) {
           return;
         }
 
-        const updates = await this.prepare({ mode: command });
+        const updates = await this.prepare({ mode: command, force: forceOption });
         log.step('Proposed Updates');
         prettyPrint(updates);
 
-        if (updates.isEmpty) return;
+        if (updates.isEmpty) {
+          log.ok('Everything is up to date.');
+          return;
+        }
 
         if (dryRun) {
           log.step('Dry run active');

package/src/prepare.ts

@@ -16,6 +16,7 @@ import type {
 import type { UpdateAction, UpdateActionResolved } from './updater';
 import { VcsProviderService, type VcsProvider } from './vcs';
 import { VersionManagerService, type VersionManager } from './versioning';
+import { isBumpEqual, isPreRelease } from './versioning/bump';
 import type { BumpSize } from './versioning/types';
 import { getNestedExcludedPaths } from './workspace/paths';
 
@@ -23,16 +24,9 @@ export function isBumpSizeMatch(actual: BumpSize, pattern: BumpSize): boolean {
   if (typeof actual === 'string' && typeof pattern === 'string') {
     return actual === pattern;
   }
-  if (
-    typeof actual === 'object' &&
-    actual !== null &&
-    typeof pattern === 'object' &&
-    pattern !== null
-  ) {
-    if (actual.kind === 'pre' && pattern.kind === 'pre') {
-      if (pattern.size === undefined || pattern.size === null) return true;
-      return actual.size === pattern.size;
-    }
+  if (isPreRelease(actual) && isPreRelease(pattern)) {
+    if (pattern.size === undefined || pattern.size === null) return true;
+    return actual.size === pattern.size;
   }
   return false;
 }
@@ -67,10 +61,31 @@ export function topologicalSort(items: IntermediateReport[]): IntermediateReport
   return sorted;
 }
 
+function resolvePackageBump(
+  name: string,
+  evaluatedBump: BumpSize,
+  options: PrepareOptions,
+): BumpSize {
+  // 1. Check specific package overrides
+  if (options.forcePackages && name in options.forcePackages) {
+    return options.forcePackages[name]!;
+  }
+
+  // 2. Check global force flag
+  if (options.force) {
+    if (typeof options.force === 'boolean') {
+      return evaluatedBump === 'skip' ? 'patch' : evaluatedBump;
+    }
+    return options.force;
+  }
+
+  return evaluatedBump;
+}
+
 export function initReportItems(
   packages: PackageConfig[],
   cwd: string,
-  excludeNestedWatches = false,
+  options: PrepareOptions = {},
 ): Effect.Effect<IntermediateReport[], Error, VersionManager> {
   return Effect.gen(function* () {
     const versionManager = yield* VersionManagerService;
@@ -87,7 +102,7 @@ export function initReportItems(
       const isMissingVersion = currentVersion === null;
       const actualVersion = currentVersion || '0.0.0';
 
-      const exclude = excludeNestedWatches ? getNestedExcludedPaths(dep, packages) : [];
+      const exclude = options.excludeNestedWatches ? getNestedExcludedPaths(dep, packages) : [];
       const allCommits = yield* versionManager.getCommits(dep, cachedLockfile, exclude, cwd);
       let commitsSincePreRelease = [...allCommits];
 
@@ -100,7 +115,8 @@ export function initReportItems(
         }
       }
 
-      const selfBump = versionManager.evaluateCommitsBump(commitsSincePreRelease);
+      let selfBump = versionManager.evaluateCommitsBump(commitsSincePreRelease);
+      selfBump = resolvePackageBump(dep.name, selfBump, options);
 
       let isErroneous = isMissingVersion;
       for (const u of dep.updates || []) {
@@ -187,7 +203,7 @@ export function prepare(
       }
     }
 
-    const items = yield* initReportItems(trackedPackages, cwd, options.excludeNestedWatches);
+    const items = yield* initReportItems(trackedPackages, cwd, options);
     const sorted = topologicalSort(items);
     versionManager.propagateBumps(sorted);
     versionManager.propagateCoupledBumps(sorted);

package/src/run.ts

@@ -33,10 +33,12 @@ export function generateCommitMessage(
     const firstReleaseBadge = report.isFirstRelease ? ' (first release)' : '';
     commitMessage += `${report.name} (${report.currentVersion} -> ${report.newVersion}) [${report.bump}]${firstReleaseBadge}\n`;
 
+    // 1. Commits list
     for (const commit of report.commits) {
       commitMessage += `  - ${commit.shortHash} ${commit.message} (<${commit.author}> ${commit.date})\n`;
     }
 
+    // 2. Cascades from local dependencies
     const changedDeps = reports.filter(
       (r) => report.depends?.includes(r.name) && r.currentVersion !== r.newVersion,
     );
@@ -46,6 +48,11 @@ export function generateCommitMessage(
       commitMessage += `  - Cascaded from deps: ${depsStr}\n`;
     }
 
+    // 3. Fallback note for forced releases with no commits and no cascades
+    if (report.commits.length === 0 && changedDeps.length === 0) {
+      commitMessage += `  - forced release bump (no new commits)\n`;
+    }
+
     commitMessage += '\n';
   }
 

package/src/types.ts

@@ -31,6 +31,16 @@ export interface PackageConfig {
   group?: string;
 }
 
+// In src/types.ts:
+export interface PrepareOptions {
+  cwd?: string;
+  excludeNestedWatches?: boolean;
+  /** Force a bump size across all packages (e.g. true for patch, or 'minor' / 'major') */
+  force?: boolean | BumpSize;
+  /** Selectively force bump sizes for specific packages */
+  forcePackages?: Record<string, BumpSize>;
+}
+
 export interface PrepareOptions {
   cwd?: string;
   excludeNestedWatches?: boolean;

package/src/versioning/bump.ts

@@ -0,0 +1,41 @@
+import type { BumpSize, PreRelease } from './types';
+
+/**
+ * Type guard for pre-release bump objects.
+ */
+export function isPreRelease(val: unknown): val is PreRelease {
+  return typeof val === 'object' && val !== null && 'kind' in val && (val as PreRelease).kind === 'pre';
+}
+
+/**
+ * Numeric priority for bump sizes: major (4) > minor (3) > patch (2) > pre (1) > skip (0).
+ */
+export function getBumpPriority(bump: BumpSize): number {
+  if (bump === 'major') return 4;
+  if (bump === 'minor') return 3;
+  if (bump === 'patch') return 2;
+  if (isPreRelease(bump)) return 1;
+  return 0;
+}
+
+export function isBumpGreater(a: BumpSize, b: BumpSize): boolean {
+  return getBumpPriority(a) > getBumpPriority(b);
+}
+
+export function maxBump(a: BumpSize, b: BumpSize): BumpSize {
+  return getBumpPriority(a) >= getBumpPriority(b) ? a : b;
+}
+
+export function isBumpEqual(a: BumpSize, b: BumpSize): boolean {
+  if (typeof a === 'string' && typeof b === 'string') return a === b;
+  if (isPreRelease(a) && isPreRelease(b)) return a.size === b.size;
+  return false;
+}
+
+export function getBumpByPriority(priority: number, fallbackPre?: PreRelease): BumpSize {
+  if (priority === 4) return 'major';
+  if (priority === 3) return 'minor';
+  if (priority === 2) return 'patch';
+  if (priority === 1) return fallbackPre ?? { kind: 'pre' };
+  return 'skip';
+}

package/src/versioning/index.ts

@@ -1,4 +1,6 @@
 export * from './types';
+export * from './bump';
+export * from './semver';
 export * from './utils';
 export * from './default-data';
 export * from './vcs-version-manager';

package/src/versioning/vcs-version-manager.ts

@@ -4,6 +4,13 @@ import { findLastReleaseCommit, type LockfileData } from '../lockfile';
 import type { Commit, IntermediateReport, PackageConfig } from '../types';
 import { VcsProviderService, type VcsProvider } from '../vcs';
 
+import {
+  getBumpByPriority,
+  getBumpPriority,
+  isBumpEqual,
+  isBumpGreater,
+  isPreRelease,
+} from './bump';
 import { defaultCascadeRules, defaultSizes } from './default-data';
 import type { BumpSize, CascadeRules, SizePatterns } from './types';
 import { defaultBumpVersion, isVersionGreater, matchBumpSize } from './utils';
@@ -31,38 +38,6 @@ export interface VersionManager {
 
 export const VersionManagerService = Context.Service<VersionManager>('VersionManager');
 
-const getBumpPriority = (bump: BumpSize): number => {
-  if (typeof bump === 'string') {
-    if (bump === 'major') return 4;
-    if (bump === 'minor') return 3;
-    if (bump === 'patch') return 2;
-    return 0;
-  }
-  if (bump && bump.kind === 'pre') return 1;
-  return 0;
-};
-
-const isBumpSizeEqual = (a: BumpSize, b: BumpSize): boolean => {
-  if (typeof a === 'string' && typeof b === 'string') return a === b;
-  if (typeof a === 'object' && a !== null && typeof b === 'object' && b !== null) {
-    if (a.kind === 'pre' && b.kind === 'pre') return a.size === b.size;
-  }
-  return false;
-};
-
-const getBumpSizeByPriority = (priorityValue: number, originalBump: BumpSize): BumpSize => {
-  if (priorityValue === 4) return 'major';
-  if (priorityValue === 3) return 'minor';
-  if (priorityValue === 2) return 'patch';
-  if (priorityValue === 1) {
-    if (typeof originalBump === 'object' && originalBump !== null && originalBump.kind === 'pre') {
-      return originalBump;
-    }
-    return { kind: 'pre' };
-  }
-  return 'skip';
-};
-
 export const makeVcsVersionManager = (
   vcs: VcsProvider,
   options?: {
@@ -142,14 +117,14 @@ export const makeVcsVersionManager = (
     },
 
     evaluateCommitsBump: (commits) => {
-      let maxBump: BumpSize = 'skip';
+      let max: BumpSize = 'skip';
       for (const commit of commits) {
         const commitBump = matchBumpSize(commit.message, sizes);
-        if (getBumpPriority(commitBump) > getBumpPriority(maxBump)) {
-          maxBump = commitBump;
+        if (isBumpGreater(commitBump, max)) {
+          max = commitBump;
         }
       }
-      return maxBump;
+      return max;
     },
 
     propagateBumps: (sorted) => {
@@ -180,23 +155,20 @@ export const makeVcsVersionManager = (
             const depBumpKey =
               typeof depItem.bump === 'string'
                 ? depItem.bump
-                : depItem.bump.kind === 'pre'
+                : isPreRelease(depItem.bump)
                   ? depItem.bump.size
                     ? `pre-${depItem.bump.size}`
                     : 'pre'
                   : 'patch';
 
             const cascadedResult = activeRules[depBumpKey];
-            if (
-              cascadedResult &&
-              getBumpPriority(cascadedResult) > getBumpPriority(maxCascadedBump)
-            ) {
+            if (cascadedResult && isBumpGreater(cascadedResult, maxCascadedBump)) {
               maxCascadedBump = cascadedResult;
             }
           }
         }
 
-        if (getBumpPriority(maxCascadedBump) > getBumpPriority(item.bump)) {
+        if (isBumpGreater(maxCascadedBump, item.bump)) {
           item.bump = maxCascadedBump;
         }
 
@@ -226,14 +198,17 @@ export const makeVcsVersionManager = (
               } else if (maxPriority === otherPri) {
                 targetBump = other.bump;
               } else {
-                targetBump = getBumpSizeByPriority(maxPriority, item.bump);
+                targetBump = getBumpByPriority(
+                  maxPriority,
+                  isPreRelease(item.bump) ? item.bump : undefined,
+                );
               }
 
-              if (!isBumpSizeEqual(item.bump, targetBump)) {
+              if (!isBumpEqual(item.bump, targetBump)) {
                 item.bump = targetBump;
                 changed = true;
               }
-              if (!isBumpSizeEqual(other.bump, targetBump)) {
+              if (!isBumpEqual(other.bump, targetBump)) {
                 other.bump = targetBump;
                 changed = true;
               }