@ucdjs/release-scripts 0.1.0-beta.47 → 0.1.0-beta.49

package/dist/index.mjs

@@ -1068,105 +1068,131 @@ async function selectVersionPrompt(workspaceRoot, pkg, currentVersion, suggested
 	const prePatchAlpha = getNextPrereleaseVersion(currentVersion, "prepatch", "alpha");
 	const preMinorAlpha = getNextPrereleaseVersion(currentVersion, "preminor", "alpha");
 	const preMajorAlpha = getNextPrereleaseVersion(currentVersion, "premajor", "alpha");
-	const initial = defaultChoice === "skip" ? 0 : defaultChoice === "suggested" ? 4 : defaultChoice === "as-is" ? 5 : suggestedVersion === currentVersion ? 0 : 4;
-	const answers = await prompts([{
+	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: "patch",
+			title: `patch ${farver.bold(getNextVersion(pkg.version, "patch"))}`
+		},
+		{
+			value: "minor",
+			title: `minor ${farver.bold(getNextVersion(pkg.version, "minor"))}`
+		},
+		{
+			value: "major",
+			title: `major ${farver.bold(getNextVersion(pkg.version, "major"))}`
+		},
+		{
+			value: "prerelease",
+			title: `prerelease ${farver.dim("(choose strategy)")}`
+		},
+		{
+			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"))}`
-			},
+		choices,
+		limit: choices.length,
+		initial
+	});
+	if (!answers.version) return null;
+	if (answers.version === "skip") return null;
+	else if (answers.version === "suggested") return suggestedVersion;
+	else if (answers.version === "custom") {
+		const customAnswer = await prompts({
+			type: "text",
+			name: "custom",
+			message: "Enter the new version number:",
+			initial: suggestedVersion,
+			validate: (custom) => {
+				if (isValidSemver(custom)) return true;
+				return "That's not a valid version number";
+			}
+		});
+		if (!customAnswer.custom) return null;
+		return customAnswer.custom;
+	} else if (answers.version === "as-is") return currentVersion;
+	else if (answers.version === "prerelease") {
+		const prereleaseChoices = [
 			{
 				value: "next",
 				title: `next ${farver.bold(nextDefaultPrerelease)}`
 			},
 			{
-				value: "prepatch-beta",
-				title: `pre-patch (beta) ${farver.bold(prePatchBeta)}`
+				value: "next-beta",
+				title: `next beta ${farver.bold(nextBeta)}`
 			},
 			{
-				value: "preminor-beta",
-				title: `pre-minor (beta) ${farver.bold(preMinorBeta)}`
+				value: "next-alpha",
+				title: `next alpha ${farver.bold(nextAlpha)}`
 			},
 			{
-				value: "premajor-beta",
-				title: `pre-major (beta) ${farver.bold(preMajorBeta)}`
+				value: "prepatch-beta",
+				title: `pre-patch (beta) ${farver.bold(prePatchBeta)}`
 			},
 			{
 				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: "preminor-beta",
+				title: `pre-minor (beta) ${farver.bold(preMinorBeta)}`
 			},
 			{
-				value: "suggested",
-				title: `suggested ${farver.bold(suggestedVersion)}${suggestedSuffix}`
+				value: "preminor-alpha",
+				title: `pre-minor (alpha) ${farver.bold(preMinorAlpha)}`
 			},
 			{
-				value: "as-is",
-				title: `as-is ${farver.dim("(keep current version)")}`
+				value: "premajor-beta",
+				title: `pre-major (beta) ${farver.bold(preMajorBeta)}`
 			},
 			{
-				value: "custom",
-				title: "custom"
+				value: "premajor-alpha",
+				title: `pre-major (alpha) ${farver.bold(preMajorAlpha)}`
 			}
-		],
-		initial
-	}, {
-		type: (prev) => prev === "custom" ? "text" : null,
-		name: "custom",
-		message: "Enter the new version number:",
-		initial: suggestedVersion,
-		validate: (custom) => {
-			if (isValidSemver(custom)) return true;
-			return "That's not a valid version number";
-		}
-	}]);
-	if (!answers.version) return null;
-	if (answers.version === "skip") return null;
-	else if (answers.version === "suggested") return suggestedVersion;
-	else if (answers.version === "custom") {
-		if (!answers.custom) return null;
-		return answers.custom;
-	} else if (answers.version === "as-is") return currentVersion;
-	else if (answers.version === "next") return nextDefaultPrerelease;
-	else if (answers.version === "next-beta") return nextBeta;
-	else if (answers.version === "next-alpha") return nextAlpha;
-	else if (answers.version === "prepatch-beta") return prePatchBeta;
-	else if (answers.version === "preminor-beta") return preMinorBeta;
-	else if (answers.version === "premajor-beta") return preMajorBeta;
-	else if (answers.version === "prepatch-alpha") return prePatchAlpha;
-	else if (answers.version === "preminor-alpha") return preMinorAlpha;
-	else if (answers.version === "premajor-alpha") return preMajorAlpha;
-	else return getNextVersion(pkg.version, answers.version);
+		];
+		const prereleaseAnswer = await prompts({
+			type: "autocomplete",
+			name: "prerelease",
+			message: `${pkg.name}: select prerelease strategy`,
+			choices: prereleaseChoices,
+			limit: prereleaseChoices.length,
+			initial: 0
+		});
+		if (!prereleaseAnswer.prerelease) return null;
+		return prereleaseVersionByChoice[prereleaseAnswer.prerelease];
+	}
+	const prereleaseVersion = prereleaseVersionByChoice[answers.version];
+	if (prereleaseVersion) return prereleaseVersion;
+	return getNextVersion(pkg.version, answers.version);
 }
 
 //#endregion

package/package.json

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