qkpr 1.0.2 → 1.0.4

package/dist/index.mjs

@@ -1237,7 +1237,7 @@ inquirer.registerPrompt("search-checkbox", searchCheckbox);
 * 通用的分支选择函数，支持单选和多选
 */
 async function promptBranchSelection(branches, options) {
-	const { title, message, mode, filterPinned = false } = options;
+	const { title, message, mode, filterPinned = false, defaultSelected = [] } = options;
 	console.log(cyan(`\n${title}`));
 	console.log(dim(""));
 	if (branches.length === 0) {
@@ -1252,37 +1252,9 @@ async function promptBranchSelection(branches, options) {
 	pinnedBranches.sort((a, b) => {
 		return pinnedBranchNames.indexOf(a.name) - pinnedBranchNames.indexOf(b.name);
 	});
-	const categorizedBranches = /* @__PURE__ */ new Map();
-	regularBranches.forEach((branch) => {
-		if (!categorizedBranches.has(branch.category)) categorizedBranches.set(branch.category, []);
-		categorizedBranches.get(branch.category).push(branch);
-	});
-	categorizedBranches.forEach((branches$1) => {
-		branches$1.sort((a, b) => b.lastCommitTime - a.lastCommitTime);
-	});
-	const categoryOrder = [
-		"main",
-		"release",
-		"feat",
-		"fix",
-		"merge",
-		"refactor",
-		"hotfix",
-		"chore",
-		"docs",
-		"test",
-		"style"
-	];
-	const sortedCategories = Array.from(categorizedBranches.keys()).sort((a, b) => {
-		const aIndex = categoryOrder.indexOf(a);
-		const bIndex = categoryOrder.indexOf(b);
-		if (aIndex !== -1 && bIndex !== -1) return aIndex - bIndex;
-		if (aIndex !== -1) return -1;
-		if (bIndex !== -1) return 1;
-		if (a === "other") return 1;
-		if (b === "other") return -1;
-		return a.localeCompare(b);
-	});
+	regularBranches.sort((a, b) => a.name.localeCompare(b.name));
+	const MAX_BRANCHES = 100;
+	if (regularBranches.length > MAX_BRANCHES) regularBranches.splice(MAX_BRANCHES);
 	const choices = [];
 	if (pinnedBranches.length > 0) {
 		choices.push(new inquirer.Separator(magenta("━━━━━━━━ 📌 Pinned Branches ━━━━━━━━")));
@@ -1290,30 +1262,24 @@ async function promptBranchSelection(branches, options) {
 			choices.push({
 				name: `📌 ${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
 				value: branch.name,
-				short: branch.name
+				short: branch.name,
+				checked: defaultSelected.includes(branch.name)
 			});
 		});
 		choices.push(new inquirer.Separator(" "));
 	}
-	sortedCategories.forEach((category) => {
-		const branches$1 = categorizedBranches.get(category);
-		if (branches$1.length > 0) {
-			let categoryLabel;
-			if (category === "other") categoryLabel = "Other Branches";
-			else if (category === "main") categoryLabel = "Main Branches";
-			else if (category === "release") categoryLabel = "Release Branches";
-			else categoryLabel = `${category}/*`;
-			choices.push(new inquirer.Separator(cyan(`━━━━━━━━ ${categoryLabel} ━━━━━━━━`)));
-			branches$1.forEach((branch) => {
-				choices.push({
-					name: `   ${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
-					value: branch.name,
-					short: branch.name
-				});
+	if (regularBranches.length > 0) {
+		choices.push(new inquirer.Separator(cyan("━━━━━━━━ 🌿 All Branches (Alphabetical) ━━━━━━━━")));
+		regularBranches.forEach((branch) => {
+			choices.push({
+				name: `   ${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
+				value: branch.name,
+				short: branch.name,
+				checked: defaultSelected.includes(branch.name)
 			});
-			choices.push(new inquirer.Separator(" "));
-		}
-	});
+		});
+		choices.push(new inquirer.Separator(" "));
+	}
 	const searchBranches = async (_answers, input = "") => {
 		const lowerInput = input.toLowerCase();
 		return choices.filter((choice) => {
@@ -1332,20 +1298,11 @@ async function promptBranchSelection(branches, options) {
 		}]);
 		return selectedBranch;
 	} else {
-		const allBranches = [...pinnedBranches, ...regularBranches];
-		allBranches.sort((a, b) => a.name.localeCompare(b.name));
-		const simpleChoices = allBranches.map((branch) => {
-			return {
-				name: `${pinnedBranchNames.includes(branch.name) ? "📌 " : "   "}${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
-				value: branch.name,
-				short: branch.name
-			};
-		});
 		const { selectedBranches } = await inquirer.prompt([{
 			type: "search-checkbox",
 			name: "selectedBranches",
 			message,
-			choices: simpleChoices
+			choices: choices.filter((c) => c.value)
 		}]);
 		return selectedBranches || [];
 	}
@@ -1413,25 +1370,24 @@ async function handlePinCommand(branchName) {
 			return;
 		}
 		const pinnedBranches = getPinnedBranches();
-		const availableBranches = branches.filter((b) => !pinnedBranches.includes(b));
-		if (availableBranches.length === 0) {
-			console.log(yellow("⚠️  All branches are already pinned"));
-			return;
-		}
-		const selectedBranches = await promptBranchSelection(availableBranches, {
-			title: "📌  Pin Branches",
-			message: "Select branches to pin (type to search, Space to select, Enter to confirm):",
+		const selectedBranches = await promptBranchSelection(branches, {
+			title: "📌  Manage Pinned Branches",
+			message: "Select branches to pin (type to search, Space to toggle, Enter to confirm):",
 			mode: "multiple",
-			filterPinned: true
+			defaultSelected: pinnedBranches
 		});
-		if (selectedBranches.length === 0) {
-			console.log(yellow("⚠️  No branches selected"));
-			return;
-		}
-		selectedBranches.forEach((branch) => {
+		const toAdd = selectedBranches.filter((b) => !pinnedBranches.includes(b));
+		const toRemove = pinnedBranches.filter((b) => !selectedBranches.includes(b));
+		toAdd.forEach((branch) => {
 			addPinnedBranch(branch);
 		});
-		console.log(green(`✅  Pinned ${selectedBranches.length} branch(es)`));
+		toRemove.forEach((branch) => {
+			removePinnedBranch(branch);
+		});
+		if (toAdd.length > 0 || toRemove.length > 0) {
+			if (toAdd.length > 0) console.log(green(`✅  Pinned ${toAdd.length} branch(es)`));
+			if (toRemove.length > 0) console.log(green(`✅  Unpinned ${toRemove.length} branch(es)`));
+		} else console.log(dim("No changes made"));
 	}
 	const updatedPinnedBranches = getPinnedBranches();
 	console.log(cyan("\n📌  Current pinned branches:"));
@@ -1784,9 +1740,9 @@ async function showMainMenu() {
 }
 function printPRBanner() {
 	console.log(bold(cyan("\n╔══════════════════════════════════════════════════════════════╗")));
-	console.log(bold(cyan("║                     🔧  Quick PR Creator                  ║")));
+	console.log(bold(cyan("║                     🔧  Quick PR Creator                     ║")));
 	console.log(bold(cyan("║                                                              ║")));
-	console.log(bold(cyan("║              Interactive PR Creation Tool                 ║")));
+	console.log(bold(cyan("║              Interactive PR Creation Tool                    ║")));
 	console.log(bold(cyan("╚══════════════════════════════════════════════════════════════╝")));
 	console.log(`                   Version: ${version}\n`);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qkpr",
   "type": "module",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Create a Pull Request with interactive branch selection",
   "author": "KazooTTT <work@kazoottt.top>",
   "license": "MIT",