@ucdjs/release-scripts 0.1.0-beta.56 → 0.1.0-beta.58

package/dist/index.mjs

@@ -466,7 +466,6 @@ const DEFAULT_CHANGELOG_TEMPLATE = dedent`
   <% } else { -%>
   ## <%= it.version %> (<%= it.date %>)
   <% } %>
-
   <% let hasCommits = false; %>
 
   <% it.groups.forEach((group) => { %>
@@ -483,10 +482,9 @@ const DEFAULT_CHANGELOG_TEMPLATE = dedent`
   <% }); %>
 
   <% if (!hasCommits) { %>
+  *No significant changes*
 
-  ### Notes
-
-  * No significant commits in this release.
+  ##### &nbsp;&nbsp;&nbsp;&nbsp;[View changes on GitHub](<%= it.compareUrl %>)
   <% } %>
 `;
 const DEFAULT_TYPES = {
@@ -1366,6 +1364,23 @@ async function selectVersionPrompt(workspaceRoot, pkg, currentVersion, suggested
 	if (prereleaseVersion) return prereleaseVersion;
 	return getNextVersion(pkg.version, answers.version);
 }
+async function confirmOverridePrompt(pkg, overrideVersion) {
+	const response = await prompts({
+		type: "select",
+		name: "choice",
+		message: `${pkg.name}: use override version ${farver.bold(overrideVersion)}?`,
+		choices: [{
+			title: "use override",
+			value: "use"
+		}, {
+			title: "pick another version",
+			value: "pick"
+		}],
+		initial: 0
+	});
+	if (!response.choice) return null;
+	return response.choice;
+}
 
 //#endregion
 //#region src/core/workspace.ts
@@ -1872,12 +1887,6 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 	const processedPackages = /* @__PURE__ */ new Set();
 	const newOverrides = { ...initialOverrides };
 	const excludedPackages = /* @__PURE__ */ new Set();
-	const bumpRanks = {
-		major: 3,
-		minor: 2,
-		patch: 1,
-		none: 0
-	};
 	logger.verbose(`Starting version inference for ${packageCommits.size} packages with commits`);
 	for (const [pkgName, pkgCommits] of packageCommits) {
 		const pkg = workspacePackages.find((p) => p.name === pkgName);
@@ -1893,35 +1902,50 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 		const effectiveBump = override?.type || determinedBump;
 		const canPrompt = !isCI && showPrompt;
 		if (effectiveBump === "none" && !canPrompt) continue;
-		let newVersion = override?.version || getNextVersion(pkg.version, effectiveBump);
+		const autoVersion = getNextVersion(pkg.version, determinedBump);
+		let newVersion = override?.version || autoVersion;
 		let finalBumpType = effectiveBump;
 		if (canPrompt) {
 			logger.clearScreen();
 			logger.section(`📝 Commits for ${farver.cyan(pkg.name)}`);
 			formatCommitsForDisplay(allCommitsForPackage).split("\n").forEach((line) => logger.item(line));
+			logger.item(farver.dim(`Auto bump: ${determinedBump} → ${autoVersion}`));
 			logger.emptyLine();
+			if (override) {
+				const overrideChoice = await confirmOverridePrompt(pkg, override.version);
+				if (overrideChoice === null) continue;
+				if (overrideChoice === "use") {
+					newOverrides[pkgName] = {
+						type: override.type,
+						version: override.version
+					};
+					if (override.version === pkg.version) excludedPackages.add(pkgName);
+					versionUpdates.push({
+						package: pkg,
+						currentVersion: pkg.version,
+						newVersion: override.version,
+						bumpType: override.type,
+						hasDirectChanges: allCommitsForPackage.length > 0,
+						changeKind: override.version === pkg.version ? "as-is" : "manual"
+					});
+					continue;
+				}
+				newVersion = autoVersion;
+			}
 			const selectedVersion = await selectVersionPrompt(workspaceRoot, pkg, pkg.version, newVersion, {
 				defaultChoice: override ? "suggested" : "auto",
-				suggestedHint: override ? "from override" : void 0
+				suggestedHint: `auto: ${determinedBump} → ${autoVersion}`
 			});
 			if (selectedVersion === null) continue;
 			const userBump = calculateBumpType(pkg.version, selectedVersion);
 			finalBumpType = userBump;
 			if (selectedVersion === pkg.version) {
 				excludedPackages.add(pkgName);
-				if (determinedBump !== "none") {
-					const nextOverride = {
-						type: "none",
-						version: pkg.version
-					};
-					if (!override || override.type !== nextOverride.type || override.version !== nextOverride.version) {
-						newOverrides[pkgName] = nextOverride;
-						logger.info(`Override set for ${pkgName}: suggested as-is (${pkg.version}) from auto ${determinedBump}`);
-					}
-				} else if (newOverrides[pkgName]) {
-					delete newOverrides[pkgName];
-					logger.info(`Override cleared for ${pkgName}.`);
-				}
+				newOverrides[pkgName] = {
+					type: "none",
+					version: pkg.version
+				};
+				logger.info(`Override set for ${pkgName}: manual as-is (${pkg.version})`);
 				versionUpdates.push({
 					package: pkg,
 					currentVersion: pkg.version,
@@ -1932,19 +1956,11 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 				});
 				continue;
 			}
-			if (bumpRanks[userBump] < bumpRanks[determinedBump]) {
-				const nextOverride = {
-					type: userBump,
-					version: selectedVersion
-				};
-				if (!override || override.type !== nextOverride.type || override.version !== nextOverride.version) {
-					newOverrides[pkgName] = nextOverride;
-					logger.info(`Override set for ${pkgName}: suggested ${userBump} (${selectedVersion}) from auto ${determinedBump}`);
-				}
-			} else if (newOverrides[pkgName] && bumpRanks[userBump] >= bumpRanks[determinedBump]) {
-				delete newOverrides[pkgName];
-				logger.info(`Override cleared for ${pkgName}.`);
-			}
+			newOverrides[pkgName] = {
+				type: userBump,
+				version: selectedVersion
+			};
+			logger.info(`Override set for ${pkgName}: manual ${userBump} (${selectedVersion})`);
 			newVersion = selectedVersion;
 		}
 		versionUpdates.push({
@@ -1961,13 +1977,27 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 		logger.clearScreen();
 		logger.section(`📦 Package: ${pkg.name}`);
 		logger.item("No direct commits found");
-		const newVersion = await selectVersionPrompt(workspaceRoot, pkg, pkg.version, pkg.version);
+		logger.item(farver.dim(`Auto bump: none → ${pkg.version}`));
+		const newVersion = await selectVersionPrompt(workspaceRoot, pkg, pkg.version, pkg.version, {
+			defaultChoice: "auto",
+			suggestedHint: `auto: none → ${pkg.version}`
+		});
 		if (newVersion === null) break;
 		if (newVersion === pkg.version) {
 			excludedPackages.add(pkg.name);
+			newOverrides[pkg.name] = {
+				type: "none",
+				version: pkg.version
+			};
+			logger.info(`Override set for ${pkg.name}: manual as-is (${pkg.version})`);
 			continue;
 		}
 		const bumpType = calculateBumpType(pkg.version, newVersion);
+		newOverrides[pkg.name] = {
+			type: bumpType,
+			version: newVersion
+		};
+		logger.info(`Override set for ${pkg.name}: manual ${bumpType} (${newVersion})`);
 		versionUpdates.push({
 			package: pkg,
 			currentVersion: pkg.version,
@@ -2070,10 +2100,12 @@ async function calculateUpdates(options) {
 			overrides
 		}));
 	} catch (error) {
+		const formatted = formatUnknownError(error);
 		return err({
 			type: "git",
 			operation: "calculateUpdates",
-			message: error instanceof Error ? error.message : String(error)
+			message: formatted.message,
+			stderr: formatted.stderr
 		});
 	}
 }
@@ -2429,6 +2461,8 @@ async function getReleaseBodyFromChangelog(workspaceRoot, packageName, packagePa
 			"",
 			`Expected version ${version} in ${changelogPath}.`
 		].join("\n");
+		const lines = entry.content.trim().split("\n");
+		if (lines[0]?.trim().startsWith("## ")) return lines.slice(1).join("\n").trim();
 		return entry.content.trim();
 	} catch {
 		logger.verbose(`Could not read changelog entry for ${version} at ${changelogPath}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucdjs/release-scripts",
-  "version": "0.1.0-beta.56",
+  "version": "0.1.0-beta.58",
   "description": "@ucdjs release scripts",
   "type": "module",
   "license": "MIT",