qkpr 1.0.5 → 1.0.6

package/README.md

@@ -48,6 +48,8 @@ You can directly access the PR creation feature:
 
 ```bash
 qkpr pr
+# or specify the target branch directly
+qkpr pr main
 ```
 
 The CLI will interactively guide you through creating a pull request:
@@ -189,7 +191,11 @@ Shows an interactive menu to choose from all available features
 qkpr pr
 ```
 
-Directly create a pull request with interactive branch selection
+Directly create a pull request with interactive branch selection. You can also specify the target branch directly:
+
+```bash
+qkpr pr [branch]
+```
 
 ### Generate Commit Message
 

package/dist/index.mjs

@@ -133,9 +133,10 @@ function getBranchCategory(branchName) {
 	return "other";
 }
 /**
-* 获取分支详细信息（包含时间和分类）
+* 获取分支详细信息（包含时间和分类）- 优化版本
 */
 function getBranchesWithInfo(branches) {
+	if (branches.length > 50) return getBranchesWithInfoBatch(branches);
 	return branches.map((branchName) => {
 		const { timestamp, formatted } = getBranchLastCommitTime(branchName);
 		return {
@@ -147,6 +148,75 @@ function getBranchesWithInfo(branches) {
 	});
 }
 /**
+* 批量获取分支信息，性能优化版本
+*/
+function getBranchesWithInfoBatch(branches) {
+	try {
+		const timestamps = execSync(branches.map((branch) => {
+			return `git log -1 --format=%ct origin/${branch} 2>/dev/null || echo "0"`;
+		}).join("; echo \"---\";"), {
+			encoding: "utf-8",
+			stdio: [
+				"pipe",
+				"pipe",
+				"ignore"
+			]
+		}).split("---").map((line) => {
+			const timestamp = Number.parseInt(line.trim(), 10);
+			return Number.isNaN(timestamp) ? 0 : timestamp;
+		});
+		return branches.map((branchName, index) => {
+			const timestamp = timestamps[index] || 0;
+			const { formatted } = formatTimestamp(timestamp);
+			return {
+				name: branchName,
+				lastCommitTime: timestamp,
+				lastCommitTimeFormatted: formatted,
+				category: getBranchCategory(branchName)
+			};
+		});
+	} catch (error) {
+		console.warn("Batch fetch failed, falling back to individual fetch:", error);
+		return branches.map((branchName) => {
+			const { timestamp, formatted } = getBranchLastCommitTime(branchName);
+			return {
+				name: branchName,
+				lastCommitTime: timestamp,
+				lastCommitTimeFormatted: formatted,
+				category: getBranchCategory(branchName)
+			};
+		});
+	}
+}
+/**
+* 格式化时间戳 - 提取为独立函数供批量版本使用
+*/
+function formatTimestamp(timestamp) {
+	if (timestamp === 0) return {
+		timestamp: 0,
+		formatted: "unknown"
+	};
+	const date = /* @__PURE__ */ new Date(timestamp * 1e3);
+	const diffMs = (/* @__PURE__ */ new Date()).getTime() - date.getTime();
+	const diffDays = Math.floor(diffMs / (1e3 * 60 * 60 * 24));
+	let formatted;
+	if (diffDays === 0) {
+		const diffHours = Math.floor(diffMs / (1e3 * 60 * 60));
+		if (diffHours === 0) {
+			const diffMinutes = Math.floor(diffMs / (1e3 * 60));
+			formatted = diffMinutes <= 1 ? "just now" : `${diffMinutes}m ago`;
+		} else formatted = `${diffHours}h ago`;
+	} else if (diffDays === 1) formatted = "yesterday";
+	else if (diffDays < 7) formatted = `${diffDays}d ago`;
+	else if (diffDays < 30) formatted = `${Math.floor(diffDays / 7)}w ago`;
+	else if (diffDays < 365) formatted = `${Math.floor(diffDays / 30)}mo ago`;
+	else formatted = `${Math.floor(diffDays / 365)}y ago`;
+	return {
+		timestamp,
+		formatted
+	};
+}
+/**
 * 解析 Git remote URL
 */
 function parseRemoteUrl(remote) {
@@ -1506,10 +1576,7 @@ var AutocompletePinPrompt = class extends Base {
 			this.selected = this.selected > 0 ? this.selected - 1 : len - 1;
 			this.ensureSelectedInRange();
 			this.render();
-		} else {
-			this.render();
-			if (this.lastSearchTerm !== this.rl.line) this.search(this.rl.line);
-		}
+		} else if (this.lastSearchTerm !== this.rl.line) this.search(this.rl.line);
 	}
 };
 /**
@@ -1567,6 +1634,21 @@ async function promptBranchSelection(branches, options) {
 		const sortingPinnedBranches = getPinnedBranches();
 		const searchBranches = async (_answers, input = "") => {
 			const currentPinnedBranches = getPinnedBranches();
+			const addCancelOption = (list) => {
+				list.push(new inquirer.Separator(" "));
+				list.push({
+					name: dim("  [Cancel PR creation]"),
+					value: "__CANCEL__",
+					short: "Cancel"
+				});
+			};
+			const createBranchChoice = (branch) => {
+				return {
+					name: `${currentPinnedBranches.includes(branch.name) ? "📌" : "  "} ${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
+					value: branch.name,
+					short: branch.name
+				};
+			};
 			const topGroupBranches = branchInfos.filter((b) => sortingPinnedBranches.includes(b.name));
 			const bottomGroupBranches = branchInfos.filter((b) => !sortingPinnedBranches.includes(b.name));
 			const effectiveTopGroup = filterPinned ? [] : topGroupBranches;
@@ -1577,22 +1659,15 @@ async function promptBranchSelection(branches, options) {
 			const displayBottomGroup = bottomGroupBranches.slice(0, 100);
 			const choices = [];
 			[...effectiveTopGroup, ...displayBottomGroup].forEach((branch) => {
-				const isPinnedNow = currentPinnedBranches.includes(branch.name);
-				choices.push({
-					name: `${isPinnedNow ? "📌" : "  "} ${branch.name.padEnd(45)} ${dim(`(${branch.lastCommitTimeFormatted})`)}`,
-					value: branch.name,
-					short: branch.name
-				});
+				choices.push(createBranchChoice(branch));
 			});
-			if (!filterPinned) {
-				choices.push(new inquirer.Separator(" "));
-				choices.push({
-					name: dim("  [Cancel PR creation]"),
-					value: "__CANCEL__",
-					short: "Cancel"
-				});
-			}
+			if (!filterPinned) addCancelOption(choices);
 			const lowerInput = input.toLowerCase();
+			if (lowerInput.trim()) {
+				const searchChoices = branchInfos.filter((branch) => branch.name.toLowerCase().includes(lowerInput)).map(createBranchChoice);
+				addCancelOption(searchChoices);
+				return searchChoices;
+			}
 			return choices.filter((choice) => {
 				if (!choice.value || choice.value === "__CANCEL__") return true;
 				return choice.value.toLowerCase().includes(lowerInput);
@@ -1736,7 +1811,7 @@ async function handlePinCommand(branchName) {
 		addPinnedBranch(branchName);
 		console.log(green(`✅  Branch '${branchName}' has been pinned`));
 	} else {
-		const { getAllBranches: getAllBranches$1 } = await import("./pr-C2AR97YR.mjs");
+		const { getAllBranches: getAllBranches$1 } = await import("./pr-Cv5LeZ_A.mjs");
 		const branches = getAllBranches$1();
 		if (branches.length === 0) {
 			console.log(yellow("⚠️  No branches found"));
@@ -1895,7 +1970,7 @@ async function promptForUpdate(packageName$1, result) {
 		type: "confirm",
 		name: "shouldUpdate",
 		message: "Would you like to update now?",
-		default: false
+		default: true
 	}, {
 		type: "list",
 		name: "packageManager",
@@ -2134,7 +2209,7 @@ async function promptPushBranch(branchName) {
 /**
 * 处理 PR 命令
 */
-async function handlePRCommand() {
+async function handlePRCommand(targetBranchArg) {
 	printPRBanner();
 	const gitInfo = getGitInfo();
 	if (!gitInfo.isGitRepo) {
@@ -2163,7 +2238,12 @@ async function handlePRCommand() {
 		console.log(yellow("⚠️  No branches found."));
 		return;
 	}
-	const targetBranch = await promptTargetBranch(branches, gitInfo.currentBranch);
+	let targetBranch = null;
+	if (targetBranchArg) if (branches.includes(targetBranchArg)) {
+		targetBranch = targetBranchArg;
+		console.log(green(`✅  Using specified target branch: ${targetBranch}\n`));
+	} else console.log(yellow(`⚠️  Branch '${targetBranchArg}' not found. Falling back to interactive selection.`));
+	if (!targetBranch) targetBranch = await promptTargetBranch(branches, gitInfo.currentBranch);
 	if (!targetBranch) return;
 	const prInfo = createPullRequest(gitInfo.currentBranch, targetBranch, gitInfo.remoteUrl);
 	if (!prInfo) {
@@ -2207,8 +2287,13 @@ async function handlePRCommand() {
 }
 yargs(hideBin(process.argv)).scriptName("qkpr").usage("Usage: $0 <command> [options]").command("$0", "Show interactive menu to choose features", () => {}, async () => {
 	await showMainMenu();
-}).command("pr", "🔧  Create a Pull Request with interactive branch selection", () => {}, async () => {
-	await handlePRCommand();
+}).command("pr [branch]", "🔧  Create a Pull Request with interactive branch selection", (yargs$1) => {
+	return yargs$1.positional("branch", {
+		describe: "Target branch name",
+		type: "string"
+	});
+}, async (argv) => {
+	await handlePRCommand(argv.branch);
 	await checkAndNotifyUpdate(packageName, version);
 }).command("commit", "🤖  Generate commit message using AI", () => {}, async () => {
 	await handleCommitCommand();
@@ -2250,4 +2335,4 @@ yargs(hideBin(process.argv)).scriptName("qkpr").usage("Usage: $0 <command> [opti
 }).version(version).alias("v", "version").help("h").alias("h", "help").epilog("For more information, visit https://github.com/KazooTTT/qkpr").argv;
 
 //#endregion
-export { generatePRMessage as a, getBranchCategory as c, getCommitsBetweenBranches as d, getGitInfo as f, generateMergeBranchName as i, getBranchLastCommitTime as l, parseRemoteUrl as m, createMergeBranch as n, generatePRUrl as o, mergeSourceToMergeBranch as p, createPullRequest as r, getAllBranches as s, copyToClipboard as t, getBranchesWithInfo as u };
+export { generateMergeBranchName as a, getAllBranches as c, getBranchesWithInfo as d, getBranchesWithInfoBatch as f, parseRemoteUrl as g, mergeSourceToMergeBranch as h, formatTimestamp as i, getBranchCategory as l, getGitInfo as m, createMergeBranch as n, generatePRMessage as o, getCommitsBetweenBranches as p, createPullRequest as r, generatePRUrl as s, copyToClipboard as t, getBranchLastCommitTime as u };

package/dist/pr-Cv5LeZ_A.mjs

@@ -0,0 +1,3 @@
+import { a as generateMergeBranchName, c as getAllBranches, d as getBranchesWithInfo, f as getBranchesWithInfoBatch, g as parseRemoteUrl, h as mergeSourceToMergeBranch, i as formatTimestamp, l as getBranchCategory, m as getGitInfo, n as createMergeBranch, o as generatePRMessage, p as getCommitsBetweenBranches, r as createPullRequest, s as generatePRUrl, t as copyToClipboard, u as getBranchLastCommitTime } from "./index.mjs";
+
+export { copyToClipboard, createMergeBranch, createPullRequest, formatTimestamp, generateMergeBranchName, generatePRMessage, generatePRUrl, getAllBranches, getBranchCategory, getBranchLastCommitTime, getBranchesWithInfo, getBranchesWithInfoBatch, getCommitsBetweenBranches, getGitInfo, mergeSourceToMergeBranch, parseRemoteUrl };

package/package.json

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

package/dist/pr-C2AR97YR.mjs

@@ -1,3 +0,0 @@
-import { a as generatePRMessage, c as getBranchCategory, d as getCommitsBetweenBranches, f as getGitInfo, i as generateMergeBranchName, l as getBranchLastCommitTime, m as parseRemoteUrl, n as createMergeBranch, o as generatePRUrl, p as mergeSourceToMergeBranch, r as createPullRequest, s as getAllBranches, t as copyToClipboard, u as getBranchesWithInfo } from "./index.mjs";
-
-export { copyToClipboard, createMergeBranch, createPullRequest, generateMergeBranchName, generatePRMessage, generatePRUrl, getAllBranches, getBranchCategory, getBranchLastCommitTime, getBranchesWithInfo, getCommitsBetweenBranches, getGitInfo, mergeSourceToMergeBranch, parseRemoteUrl };