@ucdjs/release-scripts 0.1.0-beta.44 → 0.1.0-beta.46

package/dist/index.d.mts

@@ -90,6 +90,10 @@ interface PackageRelease {
    * Whether this package has direct changes (vs being updated due to dependency changes)
    */
   hasDirectChanges: boolean;
+  /**
+   * Why/how this release entry exists.
+   */
+  changeKind: "auto" | "manual" | "as-is" | "dependent";
 }
 //#endregion
 //#region src/types.d.ts

package/dist/index.mjs

@@ -1059,7 +1059,10 @@ async function selectPackagePrompt(packages) {
 	if (!response.selectedPackages || response.selectedPackages.length === 0) return [];
 	return response.selectedPackages;
 }
-async function selectVersionPrompt(workspaceRoot, pkg, currentVersion, suggestedVersion) {
+async function selectVersionPrompt(workspaceRoot, pkg, currentVersion, suggestedVersion, options) {
+	const defaultChoice = options?.defaultChoice ?? "auto";
+	const suggestedSuffix = options?.suggestedHint ? farver.dim(` (${options.suggestedHint})`) : "";
+	const initial = defaultChoice === "skip" ? 0 : defaultChoice === "suggested" ? 4 : defaultChoice === "as-is" ? 5 : suggestedVersion === currentVersion ? 0 : 4;
 	const answers = await prompts([{
 		type: "autocomplete",
 		name: "version",
@@ -1083,7 +1086,7 @@ async function selectVersionPrompt(workspaceRoot, pkg, currentVersion, suggested
 			},
 			{
 				value: "suggested",
-				title: `suggested ${farver.bold(suggestedVersion)}`
+				title: `suggested ${farver.bold(suggestedVersion)}${suggestedSuffix}`
 			},
 			{
 				value: "as-is",
@@ -1094,7 +1097,7 @@ async function selectVersionPrompt(workspaceRoot, pkg, currentVersion, suggested
 				title: "custom"
 			}
 		],
-		initial: suggestedVersion === currentVersion ? 0 : 4
+		initial
 	}, {
 		type: (prev) => prev === "custom" ? "text" : null,
 		name: "custom",
@@ -1415,7 +1418,8 @@ function createVersionUpdate(pkg, bump, hasDirectChanges) {
 		currentVersion: pkg.version,
 		newVersion,
 		bumpType: bump,
-		hasDirectChanges
+		hasDirectChanges,
+		changeKind: "dependent"
 	};
 }
 function determineBumpType(commit) {
@@ -1535,12 +1539,16 @@ function getPackagePublishOrder(graph, packagesToPublish) {
 * @param directUpdates - Packages with direct code changes
 * @returns All updates including dependent packages that need patch bumps
 */
-function createDependentUpdates(graph, workspacePackages, directUpdates) {
+function createDependentUpdates(graph, workspacePackages, directUpdates, excludedPackages = /* @__PURE__ */ new Set()) {
 	const allUpdates = [...directUpdates];
 	const directUpdateMap = new Map(directUpdates.map((u) => [u.package.name, u]));
 	const affectedPackages = getAllAffectedPackages(graph, new Set(directUpdates.map((u) => u.package.name)));
 	for (const pkgName of affectedPackages) {
 		logger.verbose(`Processing affected package: ${pkgName}`);
+		if (excludedPackages.has(pkgName)) {
+			logger.verbose(`Skipping ${pkgName}, explicitly excluded from dependent bumps`);
+			continue;
+		}
 		if (directUpdateMap.has(pkgName)) {
 			logger.verbose(`Skipping ${pkgName}, already has a direct update`);
 			continue;
@@ -1604,6 +1612,7 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 	const versionUpdates = [];
 	const processedPackages = /* @__PURE__ */ new Set();
 	const newOverrides = { ...initialOverrides };
+	const excludedPackages = /* @__PURE__ */ new Set();
 	const bumpRanks = {
 		major: 3,
 		minor: 2,
@@ -1624,10 +1633,6 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 		const override = newOverrides[pkgName];
 		const effectiveBump = override?.type || determinedBump;
 		const canPrompt = !isCI && showPrompt;
-		if (override?.type === "none" && override.version === pkg.version) {
-			delete newOverrides[pkgName];
-			logger.verbose(`Removed stale "none" override for ${pkgName}`);
-		}
 		if (effectiveBump === "none" && !canPrompt) continue;
 		let newVersion = override?.version || getNextVersion(pkg.version, effectiveBump);
 		let finalBumpType = effectiveBump;
@@ -1636,26 +1641,50 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 			logger.section(`📝 Commits for ${farver.cyan(pkg.name)}`);
 			formatCommitsForDisplay(allCommitsForPackage).split("\n").forEach((line) => logger.item(line));
 			logger.emptyLine();
-			const selectedVersion = await selectVersionPrompt(workspaceRoot, pkg, pkg.version, newVersion);
+			const selectedVersion = await selectVersionPrompt(workspaceRoot, pkg, pkg.version, newVersion, {
+				defaultChoice: override ? "suggested" : "auto",
+				suggestedHint: override ? "from override" : void 0
+			});
 			if (selectedVersion === null) continue;
 			const userBump = calculateBumpType(pkg.version, selectedVersion);
 			finalBumpType = userBump;
 			if (selectedVersion === pkg.version) {
-				if (newOverrides[pkgName]) {
+				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(`Version override removed for ${pkgName}.`);
+					logger.info(`Override cleared for ${pkgName}.`);
 				}
+				versionUpdates.push({
+					package: pkg,
+					currentVersion: pkg.version,
+					newVersion: pkg.version,
+					bumpType: "none",
+					hasDirectChanges: allCommitsForPackage.length > 0,
+					changeKind: "as-is"
+				});
 				continue;
 			}
 			if (bumpRanks[userBump] < bumpRanks[determinedBump]) {
-				newOverrides[pkgName] = {
+				const nextOverride = {
 					type: userBump,
 					version: selectedVersion
 				};
-				logger.info(`Version override recorded for ${pkgName}: ${determinedBump} → ${userBump}`);
+				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(`Version override removed for ${pkgName}.`);
+				logger.info(`Override cleared for ${pkgName}.`);
 			}
 			newVersion = selectedVersion;
 		}
@@ -1664,7 +1693,8 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 			currentVersion: pkg.version,
 			newVersion,
 			bumpType: finalBumpType,
-			hasDirectChanges: allCommitsForPackage.length > 0
+			hasDirectChanges: allCommitsForPackage.length > 0,
+			changeKind: canPrompt ? "manual" : "auto"
 		});
 	}
 	if (!isCI && showPrompt) for (const pkg of workspacePackages) {
@@ -1674,20 +1704,24 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 		logger.item("No direct commits found");
 		const newVersion = await selectVersionPrompt(workspaceRoot, pkg, pkg.version, pkg.version);
 		if (newVersion === null) break;
-		if (newVersion !== pkg.version) {
-			const bumpType = calculateBumpType(pkg.version, newVersion);
-			versionUpdates.push({
-				package: pkg,
-				currentVersion: pkg.version,
-				newVersion,
-				bumpType,
-				hasDirectChanges: false
-			});
+		if (newVersion === pkg.version) {
+			excludedPackages.add(pkg.name);
+			continue;
 		}
+		const bumpType = calculateBumpType(pkg.version, newVersion);
+		versionUpdates.push({
+			package: pkg,
+			currentVersion: pkg.version,
+			newVersion,
+			bumpType,
+			hasDirectChanges: false,
+			changeKind: "manual"
+		});
 	}
 	return {
 		updates: versionUpdates,
-		overrides: newOverrides
+		overrides: newOverrides,
+		excludedPackages
 	};
 }
 /**
@@ -1695,7 +1729,7 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 * Returns both the updates and a function to apply them
 */
 async function calculateAndPrepareVersionUpdates({ workspacePackages, packageCommits, workspaceRoot, showPrompt, globalCommitsPerPackage, overrides }) {
-	const { updates: directUpdates, overrides: newOverrides } = await calculateVersionUpdates({
+	const { updates: directUpdates, overrides: newOverrides, excludedPackages: promptExcludedPackages } = await calculateVersionUpdates({
 		workspacePackages,
 		packageCommits,
 		workspaceRoot,
@@ -1703,7 +1737,9 @@ async function calculateAndPrepareVersionUpdates({ workspacePackages, packageCom
 		globalCommitsPerPackage,
 		overrides
 	});
-	const allUpdates = createDependentUpdates(buildPackageDependencyGraph(workspacePackages), workspacePackages, directUpdates);
+	const graph = buildPackageDependencyGraph(workspacePackages);
+	const overrideExcludedPackages = new Set(Object.entries(newOverrides).filter(([, override]) => override.type === "none").map(([pkgName]) => pkgName));
+	const allUpdates = createDependentUpdates(graph, workspacePackages, directUpdates, new Set([...overrideExcludedPackages, ...promptExcludedPackages]));
 	const applyUpdates = async () => {
 		await Promise.all(allUpdates.map(async (update) => {
 			const depUpdates = getDependencyUpdates(update.package, allUpdates);
@@ -1876,8 +1912,9 @@ async function prepareWorkflow(options) {
 	});
 	if (!updatesResult.ok) exitWithError("Failed to calculate package updates.", void 0, updatesResult.error);
 	const { allUpdates, applyUpdates, overrides: newOverrides } = updatesResult.value;
-	if (Object.keys(newOverrides).length > 0) {
-		logger.info("Writing version overrides file...");
+	const hasOverrideChanges = JSON.stringify(existingOverrides) !== JSON.stringify(newOverrides);
+	if (Object.keys(newOverrides).length > 0 && hasOverrideChanges) {
+		logger.step("Writing version overrides file...");
 		try {
 			await mkdir(join(options.workspaceRoot, ".github"), { recursive: true });
 			await writeFile(overridesPath, JSON.stringify(newOverrides, null, 2), "utf-8");
@@ -1885,7 +1922,7 @@ async function prepareWorkflow(options) {
 		} catch (e) {
 			logger.error("Failed to write version overrides file:", e);
 		}
-	}
+	} else if (Object.keys(newOverrides).length > 0) logger.step("Version overrides unchanged. Skipping write.");
 	if (Object.keys(newOverrides).length === 0 && Object.keys(existingOverrides).length > 0) {
 		let shouldRemoveOverrides = false;
 		for (const update of allUpdates) {
@@ -1910,7 +1947,10 @@ async function prepareWorkflow(options) {
 	if (allUpdates.filter((u) => u.hasDirectChanges).length === 0) logger.warn("No packages have changes requiring a release");
 	logger.section("🔄 Version Updates");
 	logger.item(`Updating ${allUpdates.length} packages (including dependents)`);
-	for (const update of allUpdates) logger.item(`${update.package.name}: ${update.currentVersion} → ${update.newVersion}`);
+	for (const update of allUpdates) {
+		const suffix = update.changeKind === "as-is" ? farver.dim(" (as-is)") : "";
+		logger.item(`${update.package.name}: ${update.currentVersion} → ${update.newVersion}${suffix}`);
+	}
 	await applyUpdates();
 	if (options.changelog?.enabled) {
 		logger.step("Updating changelogs");
@@ -1960,6 +2000,8 @@ async function prepareWorkflow(options) {
 		if (!prResult.ok) exitWithError("Failed to sync release pull request.", void 0, prResult.error);
 		if (prResult.value.pullRequest) {
 			logger.item("No updates needed, PR is already up to date");
+			const checkoutResult = await checkoutBranch(options.branch.default, options.workspaceRoot);
+			if (!checkoutResult.ok) exitWithError(`Failed to checkout branch: ${options.branch.default}`, void 0, checkoutResult.error);
 			return {
 				updates: allUpdates,
 				prUrl: prResult.value.pullRequest.html_url,

package/package.json

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