@ucdjs/release-scripts 0.1.0-beta.59 → 0.1.0-beta.60

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { t as Eta } from "./eta-DAZlmVBQ.mjs";
 import process from "node:process";
 import readline from "node:readline";
+import { parseArgs } from "node:util";
 import farver from "farver";
-import mri from "mri";
 import { exec } from "tinyexec";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { join, relative } from "node:path";
@@ -12,12 +12,45 @@ import semver, { gt } from "semver";
 import prompts from "prompts";
 
 //#region src/shared/utils.ts
-const args = mri(process.argv.slice(2));
-const isDryRun = !!args.dry;
-const isVerbose$1 = !!args.verbose;
-const isForce = !!args.force;
 const ucdjsReleaseOverridesPath = ".github/ucdjs-release.overrides.json";
-const isCI = typeof process.env.CI === "string" && process.env.CI !== "" && process.env.CI.toLowerCase() !== "false";
+function parseCLIFlags() {
+	const { values } = parseArgs({
+		args: process.argv.slice(2),
+		options: {
+			dry: {
+				type: "boolean",
+				short: "d",
+				default: false
+			},
+			verbose: {
+				type: "boolean",
+				short: "v",
+				default: false
+			},
+			force: {
+				type: "boolean",
+				short: "f",
+				default: false
+			}
+		},
+		strict: false
+	});
+	return {
+		dry: !!values.dry,
+		verbose: !!values.verbose,
+		force: !!values.force
+	};
+}
+function getIsDryRun() {
+	return parseCLIFlags().dry;
+}
+function getIsVerbose() {
+	return parseCLIFlags().verbose;
+}
+function getIsCI() {
+	const ci = process.env.CI;
+	return typeof ci === "string" && ci !== "" && ci.toLowerCase() !== "false";
+}
 const logger = {
 	info: (...args) => {
 		console.info(...args);
@@ -29,7 +62,7 @@ const logger = {
 		console.error(`  ${farver.red("✖")}`, ...args);
 	},
 	verbose: (...args) => {
-		if (!isVerbose$1) return;
+		if (!getIsVerbose()) return;
 		if (args.length === 0) {
 			console.log();
 			return;
@@ -78,64 +111,12 @@ async function run(bin, args, opts = {}) {
 async function dryRun(bin, args, opts) {
 	return logger.verbose(farver.blue(`[dryrun] ${bin} ${args.join(" ")}`), opts || "");
 }
-const runIfNotDry = isDryRun ? dryRun : run;
-if (isDryRun || isVerbose$1 || isForce) {
-	logger.verbose(farver.inverse(farver.yellow(" Running with special flags ")));
-	logger.verbose({
-		isDryRun,
-		isVerbose: isVerbose$1,
-		isForce
-	});
-	logger.verbose();
-}
-
-//#endregion
-//#region src/operations/changelog-format.ts
-function formatCommitLine({ commit, owner, repo, authors }) {
-	const commitUrl = `https://github.com/${owner}/${repo}/commit/${commit.hash}`;
-	let line = `${commit.description}`;
-	const references = commit.references ?? [];
-	for (const ref of references) {
-		if (!ref.value) continue;
-		const number = Number.parseInt(ref.value.replace(/^#/, ""), 10);
-		if (Number.isNaN(number)) continue;
-		if (ref.type === "issue") {
-			line += ` ([Issue ${ref.value}](https://github.com/${owner}/${repo}/issues/${number}))`;
-			continue;
-		}
-		line += ` ([PR ${ref.value}](https://github.com/${owner}/${repo}/pull/${number}))`;
-	}
-	line += ` ([${commit.shortHash}](${commitUrl}))`;
-	if (authors.length > 0) {
-		const authorList = authors.map((author) => author.login ? `[@${author.login}](https://github.com/${author.login})` : author.name).join(", ");
-		line += ` (by ${authorList})`;
-	}
-	return line;
-}
-function buildTemplateGroups(options) {
-	const { commits, owner, repo, types, commitAuthors } = options;
-	const grouped = groupByType(commits, {
-		includeNonConventional: false,
-		mergeKeys: Object.fromEntries(Object.entries(types).map(([key, value]) => [key, value.types ?? [key]]))
-	});
-	return Object.entries(types).map(([key, value]) => {
-		const formattedCommits = (grouped.get(key) ?? []).map((commit) => ({ line: formatCommitLine({
-			commit,
-			owner,
-			repo,
-			authors: commitAuthors.get(commit.hash) ?? []
-		}) }));
-		return {
-			name: key,
-			title: value.title,
-			commits: formattedCommits
-		};
-	});
+async function runIfNotDry(bin, args, opts) {
+	return getIsDryRun() ? dryRun(bin, args, opts) : run(bin, args, opts);
 }
 
 //#endregion
 //#region src/shared/errors.ts
-const isVerbose = !!mri(process.argv.slice(2)).verbose;
 function isRecord(value) {
 	return typeof value === "object" && value !== null;
 }
@@ -208,24 +189,79 @@ function formatUnknownError(error) {
 	}
 	return { message: String(error) };
 }
-function exitWithError(message, hint, cause) {
-	console.error(`  ${farver.red("✖")} ${farver.bold(message)}`);
-	if (cause !== void 0) {
-		const formatted = formatUnknownError(cause);
-		if (formatted.message && formatted.message !== message) console.error(farver.gray(`  Cause: ${formatted.message}`));
+var ReleaseError = class extends Error {
+	hint;
+	constructor(message, hint, cause) {
+		super(message);
+		this.name = "ReleaseError";
+		this.hint = hint;
+		this.cause = cause;
+	}
+};
+function printReleaseError(error) {
+	console.error(`  ${farver.red("✖")} ${farver.bold(error.message)}`);
+	if (error.cause !== void 0) {
+		const formatted = formatUnknownError(error.cause);
+		if (formatted.message && formatted.message !== error.message) console.error(farver.gray(`  Cause: ${formatted.message}`));
 		if (formatted.code) console.error(farver.gray(`  Code: ${formatted.code}`));
 		if (typeof formatted.status === "number") console.error(farver.gray(`  Status: ${formatted.status}`));
 		if (formatted.stderr) {
 			console.error(farver.gray("  Stderr:"));
 			console.error(farver.gray(`  ${formatted.stderr}`));
 		}
-		if (isVerbose && formatted.stack) {
+		if (getIsVerbose() && formatted.stack) {
 			console.error(farver.gray("  Stack:"));
 			console.error(farver.gray(`  ${formatted.stack}`));
 		}
 	}
-	if (hint) console.error(farver.gray(`  ${hint}`));
-	process.exit(1);
+	if (error.hint) console.error(farver.gray(`  ${error.hint}`));
+}
+function exitWithError(message, hint, cause) {
+	throw new ReleaseError(message, hint, cause);
+}
+
+//#endregion
+//#region src/operations/changelog-format.ts
+function formatCommitLine({ commit, owner, repo, authors }) {
+	const commitUrl = `https://github.com/${owner}/${repo}/commit/${commit.hash}`;
+	let line = `${commit.description}`;
+	const references = commit.references ?? [];
+	for (const ref of references) {
+		if (!ref.value) continue;
+		const number = Number.parseInt(ref.value.replace(/^#/, ""), 10);
+		if (Number.isNaN(number)) continue;
+		if (ref.type === "issue") {
+			line += ` ([Issue ${ref.value}](https://github.com/${owner}/${repo}/issues/${number}))`;
+			continue;
+		}
+		line += ` ([PR ${ref.value}](https://github.com/${owner}/${repo}/pull/${number}))`;
+	}
+	line += ` ([${commit.shortHash}](${commitUrl}))`;
+	if (authors.length > 0) {
+		const authorList = authors.map((author) => author.login ? `[@${author.login}](https://github.com/${author.login})` : author.name).join(", ");
+		line += ` (by ${authorList})`;
+	}
+	return line;
+}
+function buildTemplateGroups(options) {
+	const { commits, owner, repo, types, commitAuthors } = options;
+	const grouped = groupByType(commits, {
+		includeNonConventional: false,
+		mergeKeys: Object.fromEntries(Object.entries(types).map(([key, value]) => [key, value.types ?? [key]]))
+	});
+	return Object.entries(types).map(([key, value]) => {
+		const formattedCommits = (grouped.get(key) ?? []).map((commit) => ({ line: formatCommitLine({
+			commit,
+			owner,
+			repo,
+			authors: commitAuthors.get(commit.hash) ?? []
+		}) }));
+		return {
+			name: key,
+			title: value.title,
+			commits: formattedCommits
+		};
+	});
 }
 
 //#endregion
@@ -720,7 +756,7 @@ async function checkoutBranch(branch, workspaceRoot) {
 			logger.info(`Successfully switched to branch: ${farver.green(branch)}`);
 			return ok(true);
 		}
-		console.warn(`Unexpected git checkout output: ${output}`);
+		logger.warn(`Unexpected git checkout output: ${output}`);
 		return ok(false);
 	} catch (error) {
 		const gitError = toGitError("checkoutBranch", error);
@@ -1414,18 +1450,18 @@ async function discoverWorkspacePackages(workspaceRoot, options) {
 	if (explicitPackages) {
 		const foundNames = new Set(workspacePackages.map((p) => p.name));
 		const missing = explicitPackages.filter((p) => !foundNames.has(p));
-		if (missing.length > 0) exitWithError(`Package${missing.length > 1 ? "s" : ""} not found in workspace: ${missing.join(", ")}`, "Check your package names or run 'pnpm ls' to see available packages");
+		if (missing.length > 0) return err(toWorkspaceError("discoverWorkspacePackages", `Package${missing.length > 1 ? "s" : ""} not found in workspace: ${missing.join(", ")}. Check your package names or run 'pnpm ls' to see available packages`));
 	}
 	const isPackagePromptEnabled = options.prompts?.packages !== false;
 	logger.verbose("Package prompt gating", {
-		isCI,
+		isCI: getIsCI(),
 		isPackagePromptEnabled,
 		hasExplicitPackages: Boolean(explicitPackages),
 		include: workspaceOptions.include ?? [],
 		exclude: workspaceOptions.exclude ?? [],
 		excludePrivate: workspaceOptions.excludePrivate ?? false
 	});
-	if (!isCI && isPackagePromptEnabled && !explicitPackages) {
+	if (!getIsCI() && isPackagePromptEnabled && !explicitPackages) {
 		const selectedNames = await selectPackagePrompt(workspacePackages);
 		workspacePackages = workspacePackages.filter((pkg) => selectedNames.includes(pkg.name));
 	}
@@ -1618,6 +1654,22 @@ function findCommitRange(packageCommits) {
 	};
 }
 /**
+* Filters commits to find global commits (those not touching any package folder),
+* optionally further filtered to only dependency-related files.
+*/
+function filterGlobalCommits(commits, commitFilesMap, packagePaths, workspaceRoot, mode) {
+	const globalCommits = commits.filter((commit) => {
+		const files = commitFilesMap.get(commit.shortHash);
+		return files ? isGlobalCommit(workspaceRoot, files, packagePaths) : false;
+	});
+	if (mode === "all") return globalCommits;
+	return globalCommits.filter((commit) => {
+		const files = commitFilesMap.get(commit.shortHash);
+		if (!files) return false;
+		return files.some((file) => DEPENDENCY_FILES.includes(file.startsWith("./") ? file.slice(2) : file));
+	});
+}
+/**
 * Get global commits for each package based on their individual commit timelines.
 * This solves the problem where packages with different release histories need different global commits.
 *
@@ -1653,29 +1705,10 @@ async function getGlobalCommitsPerPackage(workspaceRoot, packageCommits, allPack
 	logger.verbose("Got file lists for commits", `${farver.cyan(commitFilesMap.value.size)} commits in ONE git call`);
 	const packagePaths = new Set(allPackages.map((p) => p.path));
 	for (const [pkgName, commits] of packageCommits) {
-		const globalCommitsAffectingPackage = [];
 		logger.verbose("Filtering global commits for package", `${farver.bold(pkgName)} from ${farver.cyan(commits.length)} commits`);
-		for (const commit of commits) {
-			const files = commitFilesMap.value.get(commit.shortHash);
-			if (!files) continue;
-			if (isGlobalCommit(workspaceRoot, files, packagePaths)) globalCommitsAffectingPackage.push(commit);
-		}
-		logger.verbose("Package global commits found", `${farver.bold(pkgName)}: ${farver.cyan(globalCommitsAffectingPackage.length)} global commits`);
-		if (mode === "all") {
-			result.set(pkgName, globalCommitsAffectingPackage);
-			continue;
-		}
-		const dependencyCommits = [];
-		for (const commit of globalCommitsAffectingPackage) {
-			const files = commitFilesMap.value.get(commit.shortHash);
-			if (!files) continue;
-			if (files.some((file) => DEPENDENCY_FILES.includes(file.startsWith("./") ? file.slice(2) : file))) {
-				logger.verbose("Global commit affects dependencies", `${farver.bold(pkgName)}: commit ${farver.cyan(commit.shortHash)} affects dependencies`);
-				dependencyCommits.push(commit);
-			}
-		}
-		logger.verbose("Global commits affect dependencies", `${farver.bold(pkgName)}: ${farver.cyan(dependencyCommits.length)} global commits affect dependencies`);
-		result.set(pkgName, dependencyCommits);
+		const filtered = filterGlobalCommits(commits, commitFilesMap.value, packagePaths, workspaceRoot, mode);
+		logger.verbose("Package global commits found", `${farver.bold(pkgName)}: ${farver.cyan(filtered.length)} global commits`);
+		result.set(pkgName, filtered);
 	}
 	return result;
 }
@@ -1890,6 +1923,33 @@ function formatCommitsForDisplay(commits) {
 	if (hasMore) return `${formattedCommits}\n  ${farver.dim(`... and ${commits.length - maxCommitsToShow} more commits`)}`;
 	return formattedCommits;
 }
+/**
+* Pure function that resolves version bump from commits and overrides.
+* No IO, no prompts - fully testable in isolation.
+*/
+function resolveAutoVersion(pkg, packageCommits, globalCommits, override) {
+	const determinedBump = determineHighestBump([...packageCommits, ...globalCommits]);
+	const effectiveBump = override?.type || determinedBump;
+	const autoVersion = getNextVersion(pkg.version, determinedBump);
+	return {
+		determinedBump,
+		effectiveBump,
+		autoVersion,
+		resolvedVersion: override?.version || autoVersion
+	};
+}
+/**
+* Pure function that computes the new dependency range.
+* Returns null if the dependency should not be updated (e.g. workspace:*).
+*/
+function computeDependencyRange(currentRange, newVersion, isPeerDependency) {
+	if (currentRange === "workspace:*") return null;
+	if (isPeerDependency) {
+		const majorVersion = newVersion.split(".")[0];
+		return `>=${newVersion} <${Number(majorVersion) + 1}.0.0`;
+	}
+	return `^${newVersion}`;
+}
 async function calculateVersionUpdates({ workspacePackages, packageCommits, workspaceRoot, showPrompt, globalCommitsPerPackage, overrides: initialOverrides = {} }) {
 	const versionUpdates = [];
 	const processedPackages = /* @__PURE__ */ new Set();
@@ -1905,13 +1965,11 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 		processedPackages.add(pkgName);
 		const globalCommits = globalCommitsPerPackage.get(pkgName) || [];
 		const allCommitsForPackage = [...pkgCommits, ...globalCommits];
-		const determinedBump = determineHighestBump(allCommitsForPackage);
 		const override = newOverrides[pkgName];
-		const effectiveBump = override?.type || determinedBump;
-		const canPrompt = !isCI && showPrompt;
+		const { determinedBump, effectiveBump, autoVersion, resolvedVersion } = resolveAutoVersion(pkg, pkgCommits, globalCommits, override);
+		const canPrompt = !getIsCI() && showPrompt;
 		if (effectiveBump === "none" && !canPrompt) continue;
-		const autoVersion = getNextVersion(pkg.version, determinedBump);
-		let newVersion = override?.version || autoVersion;
+		let newVersion = resolvedVersion;
 		let finalBumpType = effectiveBump;
 		if (canPrompt) {
 			logger.clearScreen();
@@ -1980,7 +2038,7 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 			changeKind: canPrompt ? "manual" : "auto"
 		});
 	}
-	if (!isCI && showPrompt) for (const pkg of workspacePackages) {
+	if (!getIsCI() && showPrompt) for (const pkg of workspacePackages) {
 		if (processedPackages.has(pkg.name)) continue;
 		logger.clearScreen();
 		logger.section(`📦 Package: ${pkg.name}`);
@@ -2058,15 +2116,13 @@ async function updatePackageJson(pkg, newVersion, dependencyUpdates) {
 		if (!deps) return;
 		const oldVersion = deps[depName];
 		if (!oldVersion) return;
-		if (oldVersion === "workspace:*") {
+		const newRange = computeDependencyRange(oldVersion, depVersion, isPeerDependency);
+		if (newRange === null) {
 			logger.verbose(`  - Skipping workspace:* dependency: ${depName}`);
 			return;
 		}
-		if (isPeerDependency) {
-			const majorVersion = depVersion.split(".")[0];
-			deps[depName] = `>=${depVersion} <${Number(majorVersion) + 1}.0.0`;
-		} else deps[depName] = `^${depVersion}`;
-		logger.verbose(`  - Updated dependency ${depName}: ${oldVersion} → ${deps[depName]}`);
+		deps[depName] = newRange;
+		logger.verbose(`  - Updated dependency ${depName}: ${oldVersion} → ${newRange}`);
 	}
 	for (const [depName, depVersion] of dependencyUpdates) {
 		updateDependency(packageJson.dependencies, depName, depVersion);
@@ -2720,6 +2776,15 @@ async function verifyWorkflow(options) {
 
 //#endregion
 //#region src/index.ts
+function withErrorBoundary(fn) {
+	return fn().catch((e) => {
+		if (e instanceof ReleaseError) {
+			printReleaseError(e);
+			process.exit(1);
+		}
+		throw e;
+	});
+}
 async function createReleaseScripts(options) {
 	const normalizedOptions = normalizeReleaseScriptsOptions(options);
 	logger.verbose("Release scripts config", {
@@ -2740,24 +2805,28 @@ async function createReleaseScripts(options) {
 	});
 	return {
 		async verify() {
-			return verifyWorkflow(normalizedOptions);
+			return withErrorBoundary(() => verifyWorkflow(normalizedOptions));
 		},
 		async prepare() {
-			return prepareWorkflow(normalizedOptions);
+			return withErrorBoundary(() => prepareWorkflow(normalizedOptions));
 		},
 		async publish() {
-			return publishWorkflow(normalizedOptions);
+			return withErrorBoundary(() => publishWorkflow(normalizedOptions));
 		},
 		packages: {
 			async list() {
-				const result = await discoverWorkspacePackages(normalizedOptions.workspaceRoot, normalizedOptions);
-				if (!result.ok) throw new Error(result.error.message);
-				return result.value;
+				return withErrorBoundary(async () => {
+					const result = await discoverWorkspacePackages(normalizedOptions.workspaceRoot, normalizedOptions);
+					if (!result.ok) throw new Error(result.error.message);
+					return result.value;
+				});
 			},
 			async get(packageName) {
-				const result = await discoverWorkspacePackages(normalizedOptions.workspaceRoot, normalizedOptions);
-				if (!result.ok) throw new Error(result.error.message);
-				return result.value.find((p) => p.name === packageName);
+				return withErrorBoundary(async () => {
+					const result = await discoverWorkspacePackages(normalizedOptions.workspaceRoot, normalizedOptions);
+					if (!result.ok) throw new Error(result.error.message);
+					return result.value.find((p) => p.name === packageName);
+				});
 			}
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucdjs/release-scripts",
-  "version": "0.1.0-beta.59",
+  "version": "0.1.0-beta.60",
   "description": "@ucdjs release scripts",
   "type": "module",
   "license": "MIT",
@@ -28,7 +28,6 @@
     "@luxass/utils": "2.7.3",
     "commit-parser": "1.3.0",
     "farver": "1.0.0-beta.1",
-    "mri": "1.2.0",
     "prompts": "2.4.2",
     "semver": "7.7.4",
     "tinyexec": "1.0.2"