qkpr 1.0.1 → 1.0.3

package/dist/index.mjs

@@ -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 ━━━━━━━━")));
@@ -1295,25 +1267,17 @@ async function promptBranchSelection(branches, options) {
 		});
 		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
 			});
-			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 +1296,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
 		}]);
 		return selectedBranches || [];
 	}
@@ -1514,14 +1469,22 @@ async function checkForUpdates(packageName$1, currentVersion) {
 				"pipe",
 				"ignore"
 			],
-			timeout: 3e3
+			timeout: 5e3
 		}).trim();
+		const hasUpdate = compareVersions(currentVersion, latestVersion) < 0;
+		if (process.env.DEBUG_QKPR_UPDATE) {
+			console.log(`[DEBUG] Package: ${packageName$1}`);
+			console.log(`[DEBUG] Current: ${currentVersion}`);
+			console.log(`[DEBUG] Latest: ${latestVersion}`);
+			console.log(`[DEBUG] Has update: ${hasUpdate}`);
+		}
 		return {
-			hasUpdate: compareVersions(currentVersion, latestVersion) < 0,
+			hasUpdate,
 			currentVersion,
 			latestVersion
 		};
-	} catch {
+	} catch (error) {
+		if (process.env.DEBUG_QKPR_UPDATE) console.log(`[DEBUG] Update check failed: ${error instanceof Error ? error.message : "Unknown error"}`);
 		return {
 			hasUpdate: false,
 			currentVersion,
@@ -1700,6 +1663,7 @@ async function showSettingsMenu() {
 	}
 }
 async function showMainMenu() {
+	await checkAndNotifyUpdate(packageName, version);
 	console.log(bold(cyan("\n╔══════════════════════════════════════════════════════════════╗")));
 	console.log(bold(cyan("║                     🚀  Quick PR Tool                        ║")));
 	console.log(bold(cyan("║                                                              ║")));
@@ -1750,17 +1714,14 @@ async function showMainMenu() {
 	switch (feature) {
 		case "pr":
 			await handlePRCommand();
-			await checkAndNotifyUpdate(packageName, version);
 			await showMainMenu();
 			break;
 		case "commit":
 			await handleCommitCommand();
-			await checkAndNotifyUpdate(packageName, version);
 			await showMainMenu();
 			break;
 		case "branch":
 			await handleBranchCommand();
-			await checkAndNotifyUpdate(packageName, version);
 			await showMainMenu();
 			break;
 		case "pinned":
@@ -1778,9 +1739,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,8 +1,7 @@
 {
   "name": "qkpr",
   "type": "module",
-  "version": "1.0.1",
-  "packageManager": "pnpm@10.20.0",
+  "version": "1.0.3",
   "description": "Create a Pull Request with interactive branch selection",
   "author": "KazooTTT <work@kazoottt.top>",
   "license": "MIT",
@@ -33,11 +32,48 @@
   "files": [
     "dist"
   ],
+  "dependencies": {
+    "@google/generative-ai": "^0.24.1",
+    "inquirer": "^9.2.20",
+    "inquirer-autocomplete-prompt": "^3.0.1",
+    "inquirer-search-checkbox": "^1.0.0",
+    "is-ip": "^5.0.1",
+    "kolorist": "^1.8.0",
+    "open": "^8.4.2",
+    "ora": "^9.0.0",
+    "yargs": "^17.7.2"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "^6.2.0",
+    "@antfu/ni": "^27.0.1",
+    "@antfu/utils": "^9.3.0",
+    "@types/inquirer": "^9.0.7",
+    "@types/inquirer-autocomplete-prompt": "^3.0.3",
+    "@types/node": "^24.10.0",
+    "@types/yargs": "^17.0.32",
+    "bumpp": "^10.3.1",
+    "eslint": "^9.39.1",
+    "lint-staged": "^16.2.6",
+    "simple-git-hooks": "^2.13.1",
+    "tinyexec": "^1.0.2",
+    "tsdown": "^0.16.0",
+    "tsx": "^4.20.6",
+    "typescript": "^5.9.3",
+    "vite": "^7.2.1",
+    "vitest": "^4.0.7",
+    "vitest-package-exports": "^0.1.1",
+    "yaml": "^2.8.1"
+  },
+  "simple-git-hooks": {
+    "pre-commit": "pnpm i --frozen-lockfile --ignore-scripts --offline && npx lint-staged"
+  },
+  "lint-staged": {
+    "*": "eslint --fix"
+  },
   "scripts": {
     "build": "tsdown",
     "dev": "tsdown --watch",
     "lint": "eslint",
-    "prepublishOnly": "nr build",
     "release": "bumpp",
     "release:next": "bumpp next --yes",
     "release:patch": "bumpp patch --yes",
@@ -45,45 +81,6 @@
     "release:major": "bumpp major --yes",
     "start": "tsx src/index.ts",
     "test": "vitest",
-    "typecheck": "tsc",
-    "prepare": "simple-git-hooks"
-  },
-  "dependencies": {
-    "@google/generative-ai": "catalog:prod",
-    "inquirer": "catalog:prod",
-    "inquirer-autocomplete-prompt": "catalog:prod",
-    "inquirer-search-checkbox": "catalog:prod",
-    "is-ip": "catalog:prod",
-    "kolorist": "catalog:prod",
-    "open": "catalog:prod",
-    "ora": "catalog:prod",
-    "yargs": "catalog:prod"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "catalog:lint",
-    "@antfu/ni": "catalog:script",
-    "@antfu/utils": "catalog:inlined",
-    "@types/inquirer": "catalog:types",
-    "@types/inquirer-autocomplete-prompt": "catalog:types",
-    "@types/node": "catalog:types",
-    "@types/yargs": "catalog:types",
-    "bumpp": "catalog:script",
-    "eslint": "catalog:lint",
-    "lint-staged": "catalog:script",
-    "simple-git-hooks": "catalog:script",
-    "tinyexec": "catalog:script",
-    "tsdown": "catalog:build",
-    "tsx": "catalog:script",
-    "typescript": "catalog:build",
-    "vite": "catalog:build",
-    "vitest": "catalog:test",
-    "vitest-package-exports": "catalog:test",
-    "yaml": "catalog:test"
-  },
-  "simple-git-hooks": {
-    "pre-commit": "pnpm i --frozen-lockfile --ignore-scripts --offline && npx lint-staged"
-  },
-  "lint-staged": {
-    "*": "eslint --fix"
+    "typecheck": "tsc"
   }
-}
+}