@ucdjs/release-scripts 0.1.0-beta.13 → 0.1.0-beta.15

package/dist/index.mjs

@@ -284,21 +284,15 @@ async function isBranchAheadOfRemote(branch, workspaceRoot) {
 		return true;
 	}
 }
-async function hasChangesToCommit(workspaceRoot) {
-	return (await run("git", ["status", "--porcelain"], { nodeOptions: {
-		cwd: workspaceRoot,
-		stdio: "pipe"
-	} })).stdout.trim() !== "";
-}
 async function commitChanges(message, workspaceRoot) {
 	try {
 		await run("git", ["add", "."], { nodeOptions: {
 			cwd: workspaceRoot,
 			stdio: "pipe"
 		} });
-		if (!await hasChangesToCommit(workspaceRoot)) return false;
+		if (await isWorkingDirectoryClean(workspaceRoot)) return false;
 		logger.info(`Committing changes: ${farver.dim(message)}`);
-		await run("git", [
+		await runIfNotDry("git", [
 			"commit",
 			"-m",
 			message
@@ -439,7 +433,7 @@ function generatePullRequestBody(updates, body) {
 
 //#endregion
 //#region src/versioning/commits.ts
-async function getLastPackageTag(packageName, workspaceRoot) {
+async function getMostRecentPackageTag(workspaceRoot, packageName) {
 	try {
 		const { stdout } = await run("git", [
 			"tag",
@@ -449,7 +443,9 @@ async function getLastPackageTag(packageName, workspaceRoot) {
 			cwd: workspaceRoot,
 			stdio: "pipe"
 		} });
-		return stdout.split("\n").map((tag) => tag.trim()).filter(Boolean).reverse()[0];
+		const tags = stdout.split("\n").map((tag) => tag.trim()).filter(Boolean);
+		if (tags.length === 0) return;
+		return tags.reverse()[0];
 	} catch (err) {
 		logger.warn(`Failed to get tags for package ${packageName}: ${err.message}`);
 		return;
@@ -467,40 +463,27 @@ function determineHighestBump(commits) {
 	return highestBump;
 }
 /**
-* Retrieves commits that affect a specific workspace package since its last tag.
+* Get commits grouped by workspace package.
+* For each package, retrieves all commits since its last release tag that affect that package.
 *
-* @param {string} workspaceRoot - The root directory of the workspace.
-* @param {WorkspacePackage} pkg - The workspace package to analyze.
-* @returns {Promise<GitCommit[]>} A promise that resolves to an array of GitCommit objects affecting the package.
+* @param {string} workspaceRoot - The root directory of the workspace
+* @param {WorkspacePackage[]} packages - Array of workspace packages to analyze
+* @returns {Promise<Map<string, GitCommit[]>>} A map of package names to their commits since their last release
 */
-async function getCommitsForWorkspacePackage(workspaceRoot, pkg) {
-	const lastTag = await getLastPackageTag(pkg.name, workspaceRoot);
-	const allCommits = getCommits({
-		from: lastTag,
-		to: "HEAD",
-		cwd: workspaceRoot
-	});
-	logger.verbose("Found commits for package", `${farver.cyan(allCommits.length)} for ${farver.bold(pkg.name)} since ${lastTag || "beginning"}`);
-	const commitsAffectingPackage = getCommits({
-		from: lastTag,
-		to: "HEAD",
-		cwd: workspaceRoot,
-		folder: pkg.path
-	});
-	const affectingCommitShas = /* @__PURE__ */ new Set();
-	for (const commit of commitsAffectingPackage) affectingCommitShas.add(commit.shortHash);
-	const packageCommits = allCommits.filter((commit) => {
-		return affectingCommitShas.has(commit.shortHash);
-	});
-	logger.verbose("Commits affect package", `${farver.cyan(packageCommits.length)} affect ${farver.bold(pkg.name)}`);
-	return packageCommits;
-}
-async function getWorkspacePackageCommits(workspaceRoot, packages) {
+async function getWorkspacePackageGroupedCommits(workspaceRoot, packages) {
 	const changedPackages = /* @__PURE__ */ new Map();
 	const promises = packages.map(async (pkg) => {
+		const lastTag = await getMostRecentPackageTag(workspaceRoot, pkg.name);
+		const allCommits = await getCommits({
+			from: lastTag,
+			to: "HEAD",
+			cwd: workspaceRoot,
+			folder: pkg.path
+		});
+		logger.verbose(`Found ${farver.cyan(allCommits.length)} commits for package ${farver.bold(pkg.name)} since tag ${farver.cyan(lastTag ?? "N/A")}`);
 		return {
 			pkgName: pkg.name,
-			commits: await getCommitsForWorkspacePackage(workspaceRoot, pkg)
+			commits: allCommits
 		};
 	});
 	const results = await Promise.all(promises);
@@ -508,7 +491,7 @@ async function getWorkspacePackageCommits(workspaceRoot, packages) {
 	return changedPackages;
 }
 async function getCommitFileList(workspaceRoot, from, to) {
-	const map = /* @__PURE__ */ new Map();
+	const commits = /* @__PURE__ */ new Map();
 	try {
 		const { stdout } = await run("git", [
 			"log",
@@ -519,22 +502,17 @@ async function getCommitFileList(workspaceRoot, from, to) {
 			cwd: workspaceRoot,
 			stdio: "pipe"
 		} });
-		const lines = stdout.trim().split("\n");
+		const lines = stdout.trim().split("\n").filter((line) => line.trim() !== "");
 		let currentSha = null;
+		const HASH_REGEX = /^[0-9a-f]{40}$/i;
 		for (const line of lines) {
 			const trimmedLine = line.trim();
-			if (trimmedLine === "") {
-				currentSha = null;
-				continue;
-			}
-			if (currentSha === null) {
+			if (HASH_REGEX.test(trimmedLine)) {
 				currentSha = trimmedLine;
-				map.set(currentSha, []);
-				continue;
-			}
-			map.get(currentSha).push(trimmedLine);
+				commits.set(currentSha, []);
+			} else if (currentSha !== null) commits.get(currentSha)?.push(trimmedLine);
 		}
-		return map;
+		return commits;
 	} catch {
 		return null;
 	}
@@ -556,15 +534,43 @@ function fileMatchesPackageFolder(file, packagePaths, workspaceRoot) {
 }
 /**
 * Check if a commit is a "global" commit (doesn't touch any package folder).
+* @param workspaceRoot - The workspace root
 * @param files - Array of files changed in the commit
 * @param packagePaths - Set of normalized package paths
-* @param workspaceRoot - The workspace root
 * @returns true if this is a global commit
 */
-function isGlobalCommit(files, packagePaths, workspaceRoot) {
+function isGlobalCommit(workspaceRoot, files, packagePaths) {
 	if (!files || files.length === 0) return false;
 	return !files.some((file) => fileMatchesPackageFolder(file, packagePaths, workspaceRoot));
 }
+const DEPENDENCY_FILES = [
+	"package.json",
+	"pnpm-lock.yaml",
+	"pnpm-workspace.yaml",
+	"yarn.lock",
+	"package-lock.json"
+];
+/**
+* Find the oldest and newest commits across all packages.
+* @param packageCommits - Map of package commits
+* @returns Object with oldest and newest commit SHAs, or null if no commits
+*/
+function findCommitRange(packageCommits) {
+	let oldestCommit = null;
+	let newestCommit = null;
+	for (const commits of packageCommits.values()) {
+		if (commits.length === 0) continue;
+		const firstCommit = commits[0].shortHash;
+		const lastCommit = commits[commits.length - 1].shortHash;
+		if (!newestCommit) newestCommit = firstCommit;
+		oldestCommit = lastCommit;
+	}
+	if (!oldestCommit || !newestCommit) return null;
+	return {
+		oldest: oldestCommit,
+		newest: newestCommit
+	};
+}
 /**
 * 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.
@@ -587,18 +593,13 @@ async function getGlobalCommitsPerPackage(workspaceRoot, packageCommits, allPack
 		return result;
 	}
 	logger.verbose(`Computing global commits per-package (mode: ${farver.cyan(mode)})`);
-	let oldestCommit = null;
-	let newestCommit = null;
-	for (const commits of packageCommits.values()) if (commits.length > 0) {
-		if (!newestCommit) newestCommit = commits[0].shortHash;
-		oldestCommit = commits[commits.length - 1].shortHash;
-	}
-	if (!oldestCommit || !newestCommit) {
+	const commitRange = findCommitRange(packageCommits);
+	if (!commitRange) {
 		logger.verbose("No commits found across packages");
 		return result;
 	}
-	logger.verbose("Fetching files for commits range", `${farver.cyan(oldestCommit)}..${farver.cyan(newestCommit)}`);
-	const commitFilesMap = await getCommitFileList(workspaceRoot, oldestCommit, newestCommit);
+	logger.verbose("Fetching files for commits range", `${farver.cyan(commitRange.oldest)}..${farver.cyan(commitRange.newest)}`);
+	const commitFilesMap = await getCommitFileList(workspaceRoot, commitRange.oldest, commitRange.newest);
 	if (!commitFilesMap) {
 		logger.warn("Failed to get commit file list, returning empty global commits");
 		return result;
@@ -606,34 +607,29 @@ async function getGlobalCommitsPerPackage(workspaceRoot, packageCommits, allPack
 	logger.verbose("Got file lists for commits", `${farver.cyan(commitFilesMap.size)} commits in ONE git call`);
 	const packagePaths = new Set(allPackages.map((p) => p.path));
 	for (const [pkgName, commits] of packageCommits) {
-		const globalCommitsForPackage = [];
+		const globalCommitsAffectingPackage = [];
 		logger.verbose("Filtering global commits for package", `${farver.bold(pkgName)} from ${farver.cyan(commits.length)} commits`);
-		for (const commit of commits) if (isGlobalCommit(commitFilesMap.get(commit.shortHash), packagePaths, workspaceRoot)) globalCommitsForPackage.push(commit);
-		logger.verbose("Package global commits found", `${farver.bold(pkgName)}: ${farver.cyan(globalCommitsForPackage.length)} global commits`);
-		if (mode === "all") result.set(pkgName, globalCommitsForPackage);
-		else if (mode === "dependencies") {
-			const dependencyCommits = [];
-			const dependencyFiles = [
-				"package.json",
-				"pnpm-lock.yaml",
-				"pnpm-workspace.yaml",
-				"yarn.lock",
-				"package-lock.json"
-			];
-			for (const commit of globalCommitsForPackage) {
-				const files = commitFilesMap.get(commit.shortHash);
-				if (!files) continue;
-				if (files.some((file) => {
-					const normalizedFile = file.startsWith("./") ? file.slice(2) : file;
-					return dependencyFiles.includes(normalizedFile);
-				})) {
-					logger.verbose("Global commit affects dependencies", `${farver.bold(pkgName)}: commit ${farver.cyan(commit.shortHash)} affects dependencies`);
-					dependencyCommits.push(commit);
-				}
+		for (const commit of commits) {
+			const files = commitFilesMap.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.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);
 		}
+		logger.verbose("Global commits affect dependencies", `${farver.bold(pkgName)}: ${farver.cyan(dependencyCommits.length)} global commits affect dependencies`);
+		result.set(pkgName, dependencyCommits);
 	}
 	return result;
 }
@@ -866,7 +862,7 @@ async function calculateVersionUpdates({ workspacePackages, packageCommits, work
 			if (selectedVersion === null) continue;
 			newVersion = selectedVersion;
 		}
-		logger.item(`Version update: ${pkg.version} → ${newVersion}`);
+		logger.verbose(`Version update: ${pkg.version} → ${newVersion}`);
 		versionUpdates.push({
 			package: pkg,
 			currentVersion: pkg.version,
@@ -923,35 +919,24 @@ async function updatePackageJson(pkg, newVersion, dependencyUpdates) {
 	const content = await readFile(packageJsonPath, "utf-8");
 	const packageJson = JSON.parse(content);
 	packageJson.version = newVersion;
-	for (const [depName, depVersion] of dependencyUpdates) {
-		if (packageJson.dependencies?.[depName]) {
-			const oldVersion = packageJson.dependencies[depName];
-			if (oldVersion === "workspace:*") {
-				logger.verbose(`  - Skipping workspace:* dependency: ${depName}`);
-				continue;
-			}
-			packageJson.dependencies[depName] = `^${depVersion}`;
-			logger.verbose(`  - Updated dependency ${depName}: ${oldVersion} → ^${depVersion}`);
-		}
-		if (packageJson.devDependencies?.[depName]) {
-			const oldVersion = packageJson.devDependencies[depName];
-			if (oldVersion === "workspace:*") {
-				logger.verbose(`  - Skipping workspace:* devDependency: ${depName}`);
-				continue;
-			}
-			packageJson.devDependencies[depName] = `^${depVersion}`;
-			logger.verbose(`  - Updated devDependency ${depName}: ${oldVersion} → ^${depVersion}`);
+	function updateDependency(deps, depName, depVersion, isPeerDependency = false) {
+		if (!deps) return;
+		const oldVersion = deps[depName];
+		if (!oldVersion) return;
+		if (oldVersion === "workspace:*") {
+			logger.verbose(`  - Skipping workspace:* dependency: ${depName}`);
+			return;
 		}
-		if (packageJson.peerDependencies?.[depName]) {
-			const oldVersion = packageJson.peerDependencies[depName];
-			if (oldVersion === "workspace:*") {
-				logger.verbose(`  - Skipping workspace:* peerDependency: ${depName}`);
-				continue;
-			}
+		if (isPeerDependency) {
 			const majorVersion = depVersion.split(".")[0];
-			packageJson.peerDependencies[depName] = `>=${depVersion} <${Number(majorVersion) + 1}.0.0`;
-			logger.verbose(`  - Updated peerDependency ${depName}: ${oldVersion} → ^${depVersion}`);
-		}
+			deps[depName] = `>=${depVersion} <${Number(majorVersion) + 1}.0.0`;
+		} else deps[depName] = `^${depVersion}`;
+		logger.verbose(`  - Updated dependency ${depName}: ${oldVersion} → ${deps[depName]}`);
+	}
+	for (const [depName, depVersion] of dependencyUpdates) {
+		updateDependency(packageJson.dependencies, depName, depVersion);
+		updateDependency(packageJson.devDependencies, depName, depVersion);
+		updateDependency(packageJson.peerDependencies, depName, depVersion, true);
 	}
 	await writeFile(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`, "utf-8");
 	logger.verbose(`  - Successfully wrote updated package.json`);
@@ -1140,11 +1125,11 @@ async function release(options) {
 		logger.item(`  ${farver.gray("→")} ${farver.gray(pkg.path)}`);
 	}
 	logger.emptyLine();
-	const packageCommits = await getWorkspacePackageCommits(workspaceRoot, workspacePackages);
-	const globalCommitsPerPackage = await getGlobalCommitsPerPackage(workspaceRoot, packageCommits, workspacePackages, normalizedOptions.globalCommitMode);
+	const groupedPackageCommits = await getWorkspacePackageGroupedCommits(workspaceRoot, workspacePackages);
+	const globalCommitsPerPackage = await getGlobalCommitsPerPackage(workspaceRoot, groupedPackageCommits, workspacePackages, normalizedOptions.globalCommitMode);
 	const { allUpdates, applyUpdates } = await calculateAndPrepareVersionUpdates({
 		workspacePackages,
-		packageCommits,
+		packageCommits: groupedPackageCommits,
 		workspaceRoot,
 		showPrompt: options.prompts?.versions !== false,
 		globalCommitsPerPackage
@@ -1165,19 +1150,21 @@ async function release(options) {
 	});
 	await prOps.prepareBranch();
 	await applyUpdates();
-	if (!await prOps.commitAndPush(true)) if (prOps.doesReleasePRExist && prOps.existingPullRequest) {
+	if (!await prOps.syncChanges(true)) if (prOps.doesReleasePRExist && prOps.existingPullRequest) {
 		logger.item("No updates needed, PR is already up to date");
+		const { pullRequest: pullRequest$1, created: created$1 } = await prOps.syncPullRequest(allUpdates);
+		await prOps.cleanup();
 		return {
 			updates: allUpdates,
-			prUrl: prOps.existingPullRequest.html_url,
-			created: false
+			prUrl: pullRequest$1?.html_url,
+			created: created$1
 		};
 	} else {
 		logger.error("No changes to commit, and no existing PR. Nothing to do.");
 		return null;
 	}
-	const { pullRequest, created } = await prOps.createOrUpdatePullRequest(allUpdates);
-	await prOps.checkoutDefaultBranch();
+	const { pullRequest, created } = await prOps.syncPullRequest(allUpdates);
+	await prOps.cleanup();
 	if (pullRequest?.html_url) {
 		logger.section("🚀 Pull Request");
 		logger.success(`Pull request ${created ? "created" : "updated"}: ${pullRequest.html_url}`);
@@ -1228,7 +1215,7 @@ async function orchestrateReleasePullRequest({ workspaceRoot, owner, repo, githu
 	return {
 		existingPullRequest,
 		doesReleasePRExist,
-		prepareBranch: async () => {
+		async prepareBranch() {
 			if (!branchExists) await createBranch(releaseBranch, defaultBranch, workspaceRoot);
 			logger.step(`Checking out release branch: ${releaseBranch}`);
 			if (!await checkoutBranch(releaseBranch, workspaceRoot)) throw new Error(`Failed to checkout branch: ${releaseBranch}`);
@@ -1239,21 +1226,20 @@ async function orchestrateReleasePullRequest({ workspaceRoot, owner, repo, githu
 			logger.step(`Rebasing onto ${defaultBranch}`);
 			if (!await rebaseBranch(defaultBranch, workspaceRoot)) throw new Error(`Failed to rebase onto ${defaultBranch}. Please resolve conflicts manually.`);
 		},
-		commitAndPush: async (hasChanges) => {
+		async syncChanges(hasChanges) {
 			const hasCommitted = hasChanges ? await commitChanges("chore: update release versions", workspaceRoot) : false;
 			const isBranchAhead = await isBranchAheadOfRemote(releaseBranch, workspaceRoot);
 			if (!hasCommitted && !isBranchAhead) {
 				logger.item("No changes to commit and branch is in sync with remote");
-				await checkoutBranch(defaultBranch, workspaceRoot);
 				return false;
 			}
 			logger.step("Pushing changes to remote");
 			if (!await pushBranch(releaseBranch, workspaceRoot, { forceWithLease: true })) throw new Error(`Failed to push changes to ${releaseBranch}. Remote may have been updated.`);
 			return true;
 		},
-		createOrUpdatePullRequest: async (updates) => {
+		async syncPullRequest(updates) {
 			const prTitle = existingPullRequest?.title || pullRequestTitle || "chore: update package versions";
-			const prBody = pullRequestBody || generatePullRequestBody(updates);
+			const prBody = generatePullRequestBody(updates, pullRequestBody);
 			const pullRequest = await upsertPullRequest({
 				owner,
 				repo,
@@ -1270,7 +1256,7 @@ async function orchestrateReleasePullRequest({ workspaceRoot, owner, repo, githu
 				created: !doesReleasePRExist
 			};
 		},
-		checkoutDefaultBranch: async () => {
+		async cleanup() {
 			await checkoutBranch(defaultBranch, workspaceRoot);
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucdjs/release-scripts",
-  "version": "0.1.0-beta.13",
+  "version": "0.1.0-beta.15",
   "description": "@ucdjs release scripts",
   "type": "module",
   "license": "MIT",
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "@luxass/utils": "2.7.2",
-    "commit-parser": "0.4.5",
+    "commit-parser": "1.0.0",
     "farver": "1.0.0-beta.1",
     "mri": "1.2.0",
     "prompts": "2.4.2",