relizy 1.2.2-beta.2 → 1.3.0-beta.0

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 { ag as isInCI, ah as getCIName, b as bump, c as changelog, g as publish, e as providerRelease, h as social, p as prComment, r as release } from './shared/relizy.CiHvixG7.mjs';
+import { ag as isInCI, ah as getCIName, b as bump, c as changelog, g as publish, e as providerRelease, h as social, p as prComment, r as release } from './shared/relizy.B5flwwGK.mjs';
 import '@maz-ui/utils';
 import 'c12';
 import 'changelogen';

package/dist/index.d.mts

@@ -435,7 +435,8 @@ declare function getPackagesOrBumpedPackages({ config, bumpResult, suffix, force
 }): Promise<PackageBase[]>;
 
 declare function isGraduatingToStableBetweenVersion(version: string, newVersion: string): boolean;
-declare function determineSemverChange(commits: GitCommit[], types: NonNullable<RelizyConfig['types']>): 'major' | 'minor' | 'patch' | undefined;
+type SemverChangeType = 'major' | 'minor' | 'patch' | undefined;
+declare function determineSemverChange(commits: GitCommit[], types: NonNullable<RelizyConfig['types']>): SemverChangeType;
 declare function determineReleaseType({ currentVersion, commits, releaseType, preid, types, force, }: {
     currentVersion: string;
     commits?: GitCommit[];

package/dist/index.d.ts

@@ -435,7 +435,8 @@ declare function getPackagesOrBumpedPackages({ config, bumpResult, suffix, force
 }): Promise<PackageBase[]>;
 
 declare function isGraduatingToStableBetweenVersion(version: string, newVersion: string): boolean;
-declare function determineSemverChange(commits: GitCommit[], types: NonNullable<RelizyConfig['types']>): 'major' | 'minor' | 'patch' | undefined;
+type SemverChangeType = 'major' | 'minor' | 'patch' | undefined;
+declare function determineSemverChange(commits: GitCommit[], types: NonNullable<RelizyConfig['types']>): SemverChangeType;
 declare function determineReleaseType({ currentVersion, commits, releaseType, preid, types, force, }: {
     currentVersion: string;
     commits?: GitCommit[];

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { aa as NEW_PACKAGE_MARKER, T as PR_COMMENT_MARKER, a as buildCommentBody, b as bump, c as changelog, u as checkGitStatusIfDirty, aB as confirmBump, A as createCommitAndTags, I as createGitlabRelease, k as defineConfig, x as detectGitProvider, K as detectPackageManager, S as detectPullRequest, L as determinePublishTag, ap as determineReleaseType, ao as determineSemverChange, aj as executeBuildCmd, ai as executeFormatCmd, af as executeHook, o as expandPackagesToBumpWithDependents, a3 as extractChangelogSummary, at as extractVersionFromPackageTag, aE as extractVersionFromTag, v as fetchGitTags, al as filterOutPrivatePackages, Q as findGitHubPR, R as findGitLabMR, a0 as formatChangelogForSlack, a1 as formatSlackMessage, ad as formatTweetMessage, i as generateChangelog, O as getAuthCommand, aC as getBumpedIndependentPackages, aA as getBumpedPackageIndependently, ah as getCIName, aF as getCanaryVersion, E as getCurrentGitBranch, F as getCurrentGitRef, j as getDefaultConfig, n as getDependentsOf, D as getFirstCommit, q as getGitStatus, a5 as getIndependentTag, a9 as getLastPackageTag, a8 as getLastRepoTag, a6 as getLastStableTag, a7 as getLastTag, z as getModifiedReleaseFilePatterns, Z as getPackageCommits, m as getPackageDependencies, ar as getPackageNewVersion, Y as getPackages, am as getPackagesOrBumpedPackages, N as getPackagesToPublishInIndependentMode, M as getPackagesToPublishInSelectiveMode, ay as getPreid, a4 as getReleaseUrl, W as getRootPackage, G as getShortCommitSha, $ as getSlackToken, ac as getTwitterCredentials, H as github, J as gitlab, _ as hasLernaJson, ak as isBumpedPackage, az as isChangedPreid, ax as isGraduating, an as isGraduatingToStableBetweenVersion, ag as isInCI, au as isPrerelease, aw as isPrereleaseReleaseType, av as isStableReleaseType, aG as isTagVersionCompatibleWithCurrent, l as loadRelizyConfig, y as parseGitRemoteUrl, U as postPrComment, a2 as postReleaseToSlack, ae as postReleaseToTwitter, p as prComment, e as providerRelease, d as providerReleaseSafetyCheck, g as publish, P as publishPackage, f as publishSafetyCheck, B as pushCommitAndTags, V as readPackageJson, X as readPackages, r as release, ab as resolveTags, C as rollbackModifiedFiles, aD as shouldFilterPrereleaseTags, h as social, s as socialSafetyCheck, t as topologicalSort, as as updateLernaVersion, w as writeChangelogToFile, aq as writeVersion } from './shared/relizy.CiHvixG7.mjs';
+export { aa as NEW_PACKAGE_MARKER, T as PR_COMMENT_MARKER, a as buildCommentBody, b as bump, c as changelog, u as checkGitStatusIfDirty, aB as confirmBump, A as createCommitAndTags, I as createGitlabRelease, k as defineConfig, x as detectGitProvider, K as detectPackageManager, S as detectPullRequest, L as determinePublishTag, ap as determineReleaseType, ao as determineSemverChange, aj as executeBuildCmd, ai as executeFormatCmd, af as executeHook, o as expandPackagesToBumpWithDependents, a3 as extractChangelogSummary, at as extractVersionFromPackageTag, aE as extractVersionFromTag, v as fetchGitTags, al as filterOutPrivatePackages, Q as findGitHubPR, R as findGitLabMR, a0 as formatChangelogForSlack, a1 as formatSlackMessage, ad as formatTweetMessage, i as generateChangelog, O as getAuthCommand, aC as getBumpedIndependentPackages, aA as getBumpedPackageIndependently, ah as getCIName, aF as getCanaryVersion, E as getCurrentGitBranch, F as getCurrentGitRef, j as getDefaultConfig, n as getDependentsOf, D as getFirstCommit, q as getGitStatus, a5 as getIndependentTag, a9 as getLastPackageTag, a8 as getLastRepoTag, a6 as getLastStableTag, a7 as getLastTag, z as getModifiedReleaseFilePatterns, Z as getPackageCommits, m as getPackageDependencies, ar as getPackageNewVersion, Y as getPackages, am as getPackagesOrBumpedPackages, N as getPackagesToPublishInIndependentMode, M as getPackagesToPublishInSelectiveMode, ay as getPreid, a4 as getReleaseUrl, W as getRootPackage, G as getShortCommitSha, $ as getSlackToken, ac as getTwitterCredentials, H as github, J as gitlab, _ as hasLernaJson, ak as isBumpedPackage, az as isChangedPreid, ax as isGraduating, an as isGraduatingToStableBetweenVersion, ag as isInCI, au as isPrerelease, aw as isPrereleaseReleaseType, av as isStableReleaseType, aG as isTagVersionCompatibleWithCurrent, l as loadRelizyConfig, y as parseGitRemoteUrl, U as postPrComment, a2 as postReleaseToSlack, ae as postReleaseToTwitter, p as prComment, e as providerRelease, d as providerReleaseSafetyCheck, g as publish, P as publishPackage, f as publishSafetyCheck, B as pushCommitAndTags, V as readPackageJson, X as readPackages, r as release, ab as resolveTags, C as rollbackModifiedFiles, aD as shouldFilterPrereleaseTags, h as social, s as socialSafetyCheck, t as topologicalSort, as as updateLernaVersion, w as writeChangelogToFile, aq as writeVersion } from './shared/relizy.B5flwwGK.mjs';
 import '@maz-ui/node';
 import 'node:process';
 import '@maz-ui/utils';

package/dist/shared/{relizy.CiHvixG7.mjs → relizy.B5flwwGK.mjs}

@@ -564,7 +564,28 @@ function handlePrereleaseVersionToStable(currentVersion) {
   logger.debug(`Graduating from prerelease ${currentVersion} to stable release`);
   return "release";
 }
-function handlePrereleaseVersionWithPrereleaseType({ currentVersion, preid, commits, force }) {
+function getSemverRank(type) {
+  switch (type) {
+    case "major":
+      return 3;
+    case "minor":
+      return 2;
+    case "patch":
+      return 1;
+    default:
+      return 0;
+  }
+}
+function getImpliedBumpFromPrerelease(version) {
+  const patch = semver.patch(version);
+  const minor = semver.minor(version);
+  if (patch > 0)
+    return "patch";
+  if (minor > 0)
+    return "minor";
+  return "major";
+}
+function handlePrereleaseVersionWithPrereleaseType({ currentVersion, preid, commits, force, types }) {
   const currentPreid = getPreid(currentVersion);
   const hasChangedPreid = preid && currentPreid && currentPreid !== preid;
   if (hasChangedPreid) {
@@ -582,6 +603,17 @@ function handlePrereleaseVersionWithPrereleaseType({ currentVersion, preid, comm
     logger.debug("No commits found for prerelease version, skipping bump");
     return void 0;
   }
+  if (commits?.length) {
+    const detectedType = detectReleaseTypeFromCommits(commits, types);
+    const impliedBump = getImpliedBumpFromPrerelease(currentVersion);
+    const detectedRank = getSemverRank(detectedType);
+    const impliedRank = getSemverRank(impliedBump);
+    if (detectedRank > impliedRank) {
+      const prereleaseType = `pre${detectedType}`;
+      logger.debug(`Commits imply ${detectedType} bump, upgrading prerelease base from ${impliedBump}-level to ${prereleaseType}`);
+      return prereleaseType;
+    }
+  }
   logger.debug(`Incrementing prerelease version: ${currentVersion}`);
   return "prerelease";
 }
@@ -628,7 +660,7 @@ function determineReleaseType({
     return handlePrereleaseVersionToStable(currentVersion);
   }
   if (releaseType === "prerelease") {
-    return handlePrereleaseVersionWithPrereleaseType({ currentVersion, preid, commits, force });
+    return handlePrereleaseVersionWithPrereleaseType({ currentVersion, preid, commits, force, types });
   }
   return handleExplicitReleaseType({ releaseType, currentVersion });
 }
@@ -2160,30 +2192,38 @@ async function rollbackModifiedFiles({
   logger.debug(`Rolling back ${modifiedFiles.length} modified file(s)...`);
   logger.debug(`Files to rollback: ${modifiedFiles.join(", ")}`);
   try {
-    const fileList = modifiedFiles.join(" ");
-    logger.debug(`Restoring specific files from HEAD: ${fileList}`);
-    await execPromise(`git checkout HEAD -- ${fileList}`, {
-      cwd: config.cwd,
-      logLevel: config.logLevel,
-      noStderr: true
-    });
-    logger.debug("Checking for untracked release files to remove...");
+    const trackedFiles = [];
+    const untrackedFiles = [];
     for (const file of modifiedFiles) {
       const filePath = join(config.cwd, file);
-      if (existsSync(filePath)) {
-        try {
-          execSync(`git ls-files --error-unmatch "${file}"`, {
-            cwd: config.cwd,
-            encoding: "utf8",
-            stdio: "pipe"
-          });
-        } catch {
-          logger.debug(`Removing untracked file: ${file}`);
-          execSync(`rm "${filePath}"`, { cwd: config.cwd });
-        }
+      if (!existsSync(filePath)) {
+        continue;
+      }
+      try {
+        execSync(`git ls-files --error-unmatch "${file}"`, {
+          cwd: config.cwd,
+          encoding: "utf8",
+          stdio: "pipe"
+        });
+        trackedFiles.push(file);
+      } catch {
+        untrackedFiles.push(file);
       }
     }
-    logger.success(`Successfully rolled back ${modifiedFiles.length} release file(s)`);
+    if (trackedFiles.length > 0) {
+      const fileList = trackedFiles.join(" ");
+      logger.debug(`Restoring tracked files from HEAD: ${fileList}`);
+      await execPromise(`git checkout HEAD -- ${fileList}`, {
+        cwd: config.cwd,
+        logLevel: config.logLevel,
+        noStderr: true
+      });
+    }
+    for (const file of untrackedFiles) {
+      logger.debug(`Removing untracked file: ${file}`);
+      execSync(`rm "${join(config.cwd, file)}"`, { cwd: config.cwd });
+    }
+    logger.success(`Successfully rolled back ${trackedFiles.length + untrackedFiles.length} release file(s)`);
   } catch (error) {
     logger.error("Failed to rollback modified files automatically");
     logger.warn(`Please manually restore these files: ${modifiedFiles.join(", ")}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "relizy",
   "type": "module",
-  "version": "1.2.2-beta.2",
+  "version": "1.3.0-beta.0",
   "description": "Changelogen adapter for monorepo management with unified and independent versioning",
   "author": "Louis Mazel <me@loicmazuel.com>",
   "license": "MIT",
@@ -67,14 +67,14 @@
     }
   },
   "dependencies": {
-    "@inquirer/prompts": "^8.3.2",
+    "@inquirer/prompts": "^8.4.1",
     "@maz-ui/node": "4.6.1",
     "@maz-ui/utils": "^4.7.6",
     "c12": "^3.3.3",
     "changelogen": "^0.6.2",
     "commander": "^14.0.3",
     "convert-gitmoji": "^0.1.5",
-    "defu": "6.1.4",
+    "defu": "6.1.7",
     "fast-glob": "^3.3.2",
     "node-fetch-native": "^1.6.7",
     "semver": "^7.7.4"
@@ -82,15 +82,15 @@
   "devDependencies": {
     "@commitlint/cli": "^20.5.0",
     "@commitlint/config-conventional": "20.5.0",
-    "@commitlint/cz-commitlint": "^20.5.0",
+    "@commitlint/cz-commitlint": "^20.5.1",
     "@commitlint/types": "^20.5.0",
     "@maz-ui/eslint-config": "^4.8.0",
     "@slack/web-api": "7.15.0",
-    "@types/node": "^25.5.0",
+    "@types/node": "^25.6.0",
     "@types/semver": "^7.7.1",
-    "@vitest/coverage-v8": "^4.1.1",
+    "@vitest/coverage-v8": "^4.1.4",
     "cross-env": "10.1.0",
-    "eslint": "^10.1.0",
+    "eslint": "^10.2.0",
     "husky": "9.1.7",
     "jiti": "2.6.1",
     "lint-staged": "^16.4.0",
@@ -99,7 +99,7 @@
     "twitter-api-v2": "^1.29.0",
     "typescript": "^5.9.3",
     "unbuild": "^3.6.1",
-    "vitest": "^4.1.1"
+    "vitest": "^4.1.4"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx,mjs,mts,cjs,md,yml,json}": [
@@ -121,6 +121,7 @@
     "test:unit": "vitest run",
     "test:unit:watch": "vitest watch",
     "test:unit:coverage": "vitest run --coverage",
+    "health": "pnpm typecheck && pnpm lint && pnpm test:unit:coverage",
     "pre-commit": "lint-staged"
   }
 }