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

package/dist/index.mjs

@@ -8,8 +8,8 @@ import farver from "farver";
 import mri from "mri";
 import { exec } from "tinyexec";
 import { dedent } from "@luxass/utils";
+import semver, { compare, gt } from "semver";
 import prompts from "prompts";
-import { compare, gt } from "semver";
 
 //#region src/operations/changelog-format.ts
 function formatCommitLine({ commit, owner, repo, authors }) {
@@ -1003,42 +1003,38 @@ function parseChangelog(content) {
 //#endregion
 //#region src/operations/semver.ts
 function isValidSemver(version) {
-	return /^\d+\.\d+\.\d+(?:[-+].+)?$/.test(version);
+	return semver.valid(version) != null;
 }
 function getNextVersion(currentVersion, bump) {
 	if (bump === "none") return currentVersion;
 	if (!isValidSemver(currentVersion)) throw new Error(`Cannot bump version for invalid semver: ${currentVersion}`);
-	const match = currentVersion.match(/^(\d+)\.(\d+)\.(\d+)(.*)$/);
-	if (!match) throw new Error(`Invalid semver version: ${currentVersion}`);
-	const [, major, minor, patch] = match;
-	let newMajor = Number.parseInt(major, 10);
-	let newMinor = Number.parseInt(minor, 10);
-	let newPatch = Number.parseInt(patch, 10);
-	switch (bump) {
-		case "major":
-			newMajor += 1;
-			newMinor = 0;
-			newPatch = 0;
-			break;
-		case "minor":
-			newMinor += 1;
-			newPatch = 0;
-			break;
-		case "patch":
-			newPatch += 1;
-			break;
-	}
-	return `${newMajor}.${newMinor}.${newPatch}`;
+	const next = semver.inc(currentVersion, bump);
+	if (!next) throw new Error(`Failed to bump version ${currentVersion} with bump ${bump}`);
+	return next;
 }
 function calculateBumpType(oldVersion, newVersion) {
 	if (!isValidSemver(oldVersion) || !isValidSemver(newVersion)) throw new Error(`Cannot calculate bump type for invalid semver: ${oldVersion} or ${newVersion}`);
-	const oldParts = oldVersion.split(".").map(Number);
-	const newParts = newVersion.split(".").map(Number);
-	if (newParts[0] > oldParts[0]) return "major";
-	if (newParts[1] > oldParts[1]) return "minor";
-	if (newParts[2] > oldParts[2]) return "patch";
+	const diff = semver.diff(oldVersion, newVersion);
+	if (!diff) return "none";
+	if (diff === "major" || diff === "premajor") return "major";
+	if (diff === "minor" || diff === "preminor") return "minor";
+	if (diff === "patch" || diff === "prepatch" || diff === "prerelease") return "patch";
+	if (semver.gt(newVersion, oldVersion)) return "patch";
 	return "none";
 }
+function getPrereleaseIdentifier(version) {
+	const parsed = semver.parse(version);
+	if (!parsed || parsed.prerelease.length === 0) return;
+	const identifier = parsed.prerelease[0];
+	return typeof identifier === "string" ? identifier : void 0;
+}
+function getNextPrereleaseVersion(currentVersion, mode, identifier) {
+	if (!isValidSemver(currentVersion)) throw new Error(`Cannot bump prerelease for invalid semver: ${currentVersion}`);
+	const releaseType = mode === "next" ? "prerelease" : mode;
+	const next = identifier ? semver.inc(currentVersion, releaseType, identifier) : semver.inc(currentVersion, releaseType);
+	if (!next) throw new Error(`Failed to compute prerelease version for ${currentVersion}`);
+	return next;
+}
 
 //#endregion
 //#region src/core/prompts.ts
@@ -1062,41 +1058,101 @@ async function selectPackagePrompt(packages) {
 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 prereleaseIdentifier = getPrereleaseIdentifier(currentVersion);
+	const nextDefaultPrerelease = getNextPrereleaseVersion(currentVersion, "next", prereleaseIdentifier === "alpha" || prereleaseIdentifier === "beta" ? prereleaseIdentifier : "beta");
+	const nextBeta = getNextPrereleaseVersion(currentVersion, "next", "beta");
+	const nextAlpha = getNextPrereleaseVersion(currentVersion, "next", "alpha");
+	const prePatchBeta = getNextPrereleaseVersion(currentVersion, "prepatch", "beta");
+	const preMinorBeta = getNextPrereleaseVersion(currentVersion, "preminor", "beta");
+	const preMajorBeta = getNextPrereleaseVersion(currentVersion, "premajor", "beta");
+	const prePatchAlpha = getNextPrereleaseVersion(currentVersion, "prepatch", "alpha");
+	const preMinorAlpha = getNextPrereleaseVersion(currentVersion, "preminor", "alpha");
+	const preMajorAlpha = getNextPrereleaseVersion(currentVersion, "premajor", "alpha");
+	const choices = [
+		{
+			value: "skip",
+			title: `skip ${farver.dim("(no change)")}`
+		},
+		{
+			value: "suggested",
+			title: `suggested ${farver.bold(suggestedVersion)}${suggestedSuffix}`
+		},
+		{
+			value: "as-is",
+			title: `as-is ${farver.dim("(keep current version)")}`
+		},
+		{
+			value: "major",
+			title: `major ${farver.bold(getNextVersion(pkg.version, "major"))}`
+		},
+		{
+			value: "minor",
+			title: `minor ${farver.bold(getNextVersion(pkg.version, "minor"))}`
+		},
+		{
+			value: "patch",
+			title: `patch ${farver.bold(getNextVersion(pkg.version, "patch"))}`
+		},
+		{
+			value: "next",
+			title: `next ${farver.bold(nextDefaultPrerelease)}`
+		},
+		{
+			value: "prepatch-beta",
+			title: `pre-patch (beta) ${farver.bold(prePatchBeta)}`
+		},
+		{
+			value: "preminor-beta",
+			title: `pre-minor (beta) ${farver.bold(preMinorBeta)}`
+		},
+		{
+			value: "premajor-beta",
+			title: `pre-major (beta) ${farver.bold(preMajorBeta)}`
+		},
+		{
+			value: "prepatch-alpha",
+			title: `pre-patch (alpha) ${farver.bold(prePatchAlpha)}`
+		},
+		{
+			value: "preminor-alpha",
+			title: `pre-minor (alpha) ${farver.bold(preMinorAlpha)}`
+		},
+		{
+			value: "premajor-alpha",
+			title: `pre-major (alpha) ${farver.bold(preMajorAlpha)}`
+		},
+		{
+			value: "next-beta",
+			title: `next beta ${farver.bold(nextBeta)}`
+		},
+		{
+			value: "next-alpha",
+			title: `next alpha ${farver.bold(nextAlpha)}`
+		},
+		{
+			value: "custom",
+			title: "custom"
+		}
+	];
+	const initialValue = defaultChoice === "auto" ? suggestedVersion === currentVersion ? "skip" : "suggested" : defaultChoice;
+	const initial = Math.max(0, choices.findIndex((choice) => choice.value === initialValue));
+	const prereleaseVersionByChoice = {
+		"next": nextDefaultPrerelease,
+		"next-beta": nextBeta,
+		"next-alpha": nextAlpha,
+		"prepatch-beta": prePatchBeta,
+		"preminor-beta": preMinorBeta,
+		"premajor-beta": preMajorBeta,
+		"prepatch-alpha": prePatchAlpha,
+		"preminor-alpha": preMinorAlpha,
+		"premajor-alpha": preMajorAlpha
+	};
 	const answers = await prompts([{
 		type: "autocomplete",
 		name: "version",
 		message: `${pkg.name}: ${farver.green(pkg.version)}`,
-		choices: [
-			{
-				value: "skip",
-				title: `skip ${farver.dim("(no change)")}`
-			},
-			{
-				value: "major",
-				title: `major ${farver.bold(getNextVersion(pkg.version, "major"))}`
-			},
-			{
-				value: "minor",
-				title: `minor ${farver.bold(getNextVersion(pkg.version, "minor"))}`
-			},
-			{
-				value: "patch",
-				title: `patch ${farver.bold(getNextVersion(pkg.version, "patch"))}`
-			},
-			{
-				value: "suggested",
-				title: `suggested ${farver.bold(suggestedVersion)}${suggestedSuffix}`
-			},
-			{
-				value: "as-is",
-				title: `as-is ${farver.dim("(keep current version)")}`
-			},
-			{
-				value: "custom",
-				title: "custom"
-			}
-		],
+		choices,
+		limit: choices.length,
 		initial
 	}, {
 		type: (prev) => prev === "custom" ? "text" : null,
@@ -1115,7 +1171,9 @@ async function selectVersionPrompt(workspaceRoot, pkg, currentVersion, suggested
 		if (!answers.custom) return null;
 		return answers.custom;
 	} else if (answers.version === "as-is") return currentVersion;
-	else return getNextVersion(pkg.version, answers.version);
+	const prereleaseVersion = prereleaseVersionByChoice[answers.version];
+	if (prereleaseVersion) return prereleaseVersion;
+	return getNextVersion(pkg.version, answers.version);
 }
 
 //#endregion
@@ -2114,11 +2172,12 @@ async function buildPackage(packageName, workspaceRoot, options) {
 * Publish a package to NPM
 * Uses pnpm to handle workspace protocol and catalog: resolution automatically
 * @param packageName - The package name to publish
+* @param version - The package version to publish
 * @param workspaceRoot - Path to the workspace root
 * @param options - Normalized release scripts options
 * @returns Result indicating success or failure
 */
-async function publishPackage(packageName, workspaceRoot, options) {
+async function publishPackage(packageName, version, workspaceRoot, options) {
 	const args = [
 		"--filter",
 		packageName,
@@ -2128,7 +2187,16 @@ async function publishPackage(packageName, workspaceRoot, options) {
 		"--no-git-checks"
 	];
 	if (options.npm.otp) args.push("--otp", options.npm.otp);
-	if (process.env.NPM_CONFIG_TAG) args.push("--tag", process.env.NPM_CONFIG_TAG);
+	const explicitTag = process.env.NPM_CONFIG_TAG;
+	const prereleaseTag = (() => {
+		const prerelease = semver.prerelease(version);
+		if (!prerelease || prerelease.length === 0) return;
+		const identifier = prerelease[0];
+		if (identifier === "alpha" || identifier === "beta") return identifier;
+		return "next";
+	})();
+	const publishTag = explicitTag || prereleaseTag;
+	if (publishTag) args.push("--tag", publishTag);
 	const env = { ...process.env };
 	if (options.npm.provenance) env.NPM_CONFIG_PROVENANCE = "true";
 	try {
@@ -2192,7 +2260,7 @@ async function publishWorkflow(options) {
 			}
 		}
 		logger.step(`Publishing ${farver.cyan(`${packageName}@${version}`)} to NPM...`);
-		const publishResult = await publishPackage(packageName, options.workspaceRoot, options);
+		const publishResult = await publishPackage(packageName, version, options.workspaceRoot, options);
 		if (!publishResult.ok) {
 			logger.error(`Failed to publish: ${publishResult.error.message}`);
 			status.failed.push(packageName);

package/package.json

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