@nemo-cli/git 0.1.3 → 0.1.5

package/dist/index.js

@@ -1,5 +1,5 @@
-import { addFiles, colors, createCheckbox, createCommand, createConfirm, createHelpExample, createInput, createNote, createOptions, createSearch, createSelect, createSpinner, exit, getCurrentBranch, getGitStatus, intro, isEmpty, isString, loadConfig, log, outro, readPackage, x, xASync } from "@nemo-cli/shared";
-import { BigText, ErrorMessage, Message, renderHistViewer, renderStashList, renderStatusViewer } from "@nemo-cli/ui";
+import { addFiles, colors, createCheckbox, createCommand, createConfirm, createHelpExample, createInput, createNote, createOptions, createSelect, createSpinner, exit, getCurrentBranch, getGitStatus, intro, isEmpty, isString, loadConfig, log, outro, readPackage, safeAwait, x, xASync } from "@nemo-cli/shared";
+import { BigText, ErrorMessage, Message, renderBranchViewer, renderCommitDetail, renderCommitViewer, renderDiffViewer, renderHistViewer, renderStashList, renderStatusViewer } from "@nemo-cli/ui";
 import path, { dirname, join } from "node:path";
 import readline from "node:readline";
 import { spawn } from "node:child_process";
@@ -220,7 +220,8 @@ const HELP_MESSAGE$1 = {
 	main: createHelpExample("ng --version", "ng --help", "ng <command> [option]"),
 	branch: createHelpExample("ng branch --version", "ng branch --help", "ng branch <command> [option]"),
 	branchDelete: createHelpExample("ng branch delete --version", "ng branch delete --help", "ng branch delete <command> [option]"),
-	branchClean: createHelpExample("ng branch clean --version", "ng branch clean --help")
+	branchClean: createHelpExample("ng branch clean --version", "ng branch clean --help"),
+	branchList: createHelpExample("ng branch list --version", "ng branch list --help", "ng branch list [option]")
 };
 
 //#endregion
@@ -367,7 +368,7 @@ const getRemoteBranches = async () => {
 	])).stdout.split("\n").filter((line) => line.trim() && !line.includes("->")).map((line) => line.trim().replace(remotePrefix, "")) };
 };
 const currentBranchPrefix = /^\* /;
-const formatBranch$1 = (branch) => branch?.trim().replace(currentBranchPrefix, "");
+const formatBranch$1 = (branch) => branch.trim().replace(currentBranchPrefix, "");
 const getLocalBranches = async () => {
 	const list = (await x("git", ["branch", "--sort=-committerdate"])).stdout.split("\n");
 	const currentBranch = list.find((line) => line.includes("*"));
@@ -376,7 +377,7 @@ const getLocalBranches = async () => {
 		currentBranch: formatBranch$1(currentBranch)
 	};
 };
-const getRemoteOptions = async () => {
+const getRemoteBranchOptions = async () => {
 	const { branches } = await getRemoteBranches();
 	const currentBranch = await getCurrentBranch();
 	return {
@@ -388,7 +389,7 @@ const getRemoteOptions = async () => {
 		currentBranch
 	};
 };
-const getLocalOptions = async () => {
+const getLocalBranchOptions = async () => {
 	const { branches, currentBranch } = await getLocalBranches();
 	return {
 		options: branches.map((branch) => ({
@@ -399,7 +400,7 @@ const getLocalOptions = async () => {
 		currentBranch
 	};
 };
-const getRemoteOptionsForRemotes = async () => {
+const getRemoteRepositoryOptions = async () => {
 	const { remotes } = await getRemotes();
 	const validRemotes = remotes.filter((remote) => remote.trim().length > 0);
 	const uniqueRemotes = Array.from(new Set(validRemotes));
@@ -494,18 +495,18 @@ const handleMergeCommit = async () => {
 	}
 };
 const handleGitPull = async (branch, options = {}) => {
-	const { rebase = false } = options;
+	const { rebase = false, remote = "origin" } = options;
 	const modeText = rebase ? "rebase" : "merge";
 	log.show(`Pulling from remote (${modeText} mode)...`, { type: "step" });
 	try {
 		const [error, result] = await xASync("git", rebase ? [
 			"pull",
 			"--rebase",
-			"origin",
+			remote,
 			branch
 		] : [
 			"pull",
-			"origin",
+			remote,
 			branch
 		], { nodeOptions: { stdio: "inherit" } });
 		if (error) {
@@ -549,7 +550,7 @@ const handleGitStash = async (message, options) => {
 	const { branch = void 0, operation = "manual" } = options || {};
 	const now = /* @__PURE__ */ new Date();
 	let stashName;
-	if (message && message.trim()) stashName = message.trim();
+	if (message?.trim()) stashName = message.trim();
 	else stashName = `${operation}:${currentBranch}@${now.toISOString().replace(/[:.]/g, "-").slice(0, 19)}`;
 	const internalId = `${Date.now()}_${operation}_${currentBranch.replace(/[/]/g, "_")}`;
 	const [error, result] = await xASync("git", [
@@ -799,6 +800,29 @@ function branchCommand(command) {
 		}, { isRemote: options.remote ?? false })));
 		Message({ text: "Successfully deleted branches" });
 	});
+	subCommand.command("list").alias("ls").description("List git branches").addHelpText("after", HELP_MESSAGE$1.branchList).option("-l, --local", "List local branches").option("-r, --remote", "List remote branches").option("-a, --all", "List all branches", true).option("-n, --number <count>", "Limit number of branches to show").action(async (options) => {
+		if (options.all || !options.local && !options.remote) {
+			await renderBranchViewer(options.number ? Number.parseInt(options.number, 10) : void 0);
+			return;
+		}
+		if (options.local) {
+			const { branches } = await getLocalBranches();
+			if (!branches || branches.length === 0) {
+				log.error("No local branches found. Please check your git repository.");
+				return;
+			}
+			log.info(`Found ${branches.length} local branches:`);
+			for (const branch of branches) log.info(branch);
+		} else {
+			const { branches } = await getRemoteBranches();
+			if (!branches || branches.length === 0) {
+				log.error("No remote branches found. Please check your git repository.");
+				return;
+			}
+			log.info(`Found ${branches.length} remote branches:`);
+			for (const branch of branches) log.info(branch);
+		}
+	});
 }
 
 //#endregion
@@ -881,13 +905,13 @@ function checkoutCommand(command) {
 			initialValue: true
 		});
 		if (isLocal) {
-			const { options } = await getLocalOptions();
+			const { options } = await getLocalBranchOptions();
 			handleCheckout(await createSelect({
 				message: `Select the ${colors.bgGreen(" local ")} branch to checkout`,
 				options
 			}));
 		} else {
-			const { options } = await getRemoteOptions();
+			const { options } = await getRemoteBranchOptions();
 			const selectedBranch = await createSelect({
 				message: `Select the ${colors.bgYellow(" remote ")} branch to checkout`,
 				options
@@ -1089,50 +1113,50 @@ const pushInteractive = async () => {
 		log.error("No branch selected. Aborting push operation.");
 		return;
 	}
-	let remotes;
+	let repositories;
 	try {
-		remotes = (await getRemoteOptionsForRemotes()).remotes;
+		repositories = (await getRemoteRepositoryOptions()).remotes;
 	} catch (error) {
 		log.error(`Failed to get remote repositories: ${error instanceof Error ? error.message : String(error)}`);
 		log.show("Hint: Make sure you're in a git repository and have configured remotes.", { type: "info" });
 		return;
 	}
-	if (remotes.length === 0) {
+	if (repositories.length === 0) {
 		log.error("No remote repositories found. Aborting push operation.");
 		log.show("Hint: Run `git remote add <name> <url>` to add a remote repository.", { type: "info" });
 		return;
 	}
-	let selectedRemote = remotes[0];
-	if (remotes.length > 1) selectedRemote = await createSelect({
+	let selectedRepository = repositories[0];
+	if (repositories.length > 1) selectedRepository = await createSelect({
 		message: "Select remote repository",
-		options: remotes.map((remote) => ({
-			label: remote,
-			value: remote
+		options: repositories.map((repo) => ({
+			label: repo,
+			value: repo
 		})),
-		initialValue: remotes[0]
+		initialValue: repositories[0]
 	});
-	if (await createConfirm({ message: `Do you want to push ${colors.bgGreen(currentBranch)} to ${selectedRemote}?` })) {
-		await handlePush(currentBranch, selectedRemote);
+	if (await createConfirm({ message: `Do you want to push ${colors.bgGreen(currentBranch)} to ${selectedRepository}?` })) {
+		await handlePush(currentBranch, selectedRepository);
 		return;
 	}
-	const { options } = await getRemoteOptions();
+	const { options } = await getRemoteBranchOptions();
 	const selectedBranch = await createSelect({
 		message: "Select the branch to push",
 		options,
 		initialValue: "main"
 	});
-	let pushRemote = selectedRemote;
-	if (remotes.length > 1) {
-		if (!await createConfirm({ message: `Push ${colors.bgGreen(selectedBranch)} to ${selectedRemote}?` })) pushRemote = await createSelect({
+	selectedRepository = repositories[0];
+	if (repositories.length > 1) {
+		if (!await createConfirm({ message: `Push ${colors.bgGreen(selectedBranch)} to ${selectedRepository}?` })) selectedRepository = await createSelect({
 			message: "Select remote repository",
-			options: remotes.map((remote) => ({
-				label: remote,
-				value: remote
+			options: repositories.map((repo) => ({
+				label: repo,
+				value: repo
 			})),
-			initialValue: selectedRemote
+			initialValue: selectedRepository
 		});
 	}
-	await handlePush(selectedBranch, pushRemote);
+	await handlePush(selectedBranch, selectedRepository);
 };
 
 //#endregion
@@ -1712,25 +1736,18 @@ const configCommand = (command) => {
 //#endregion
 //#region src/commands/diff.ts
 const handleDiff = async (branch, { isLocal }) => {
-	console.log("🚀 : handleDiff : branch:", branch, isLocal);
 	const currentBranch = await getCurrentBranch();
 	if (!currentBranch) {
 		log.error("Could not determine current branch");
 		return;
 	}
-	const diffArgs = branch === currentBranch ? ["diff"] : ["diff", `${branch}...${currentBranch}`];
+	const targetBranch = branch === currentBranch ? void 0 : branch;
 	log.show(`Showing diff between ${branch === currentBranch ? "working directory and HEAD" : `${branch} and ${currentBranch}`}`);
-	const process = x("git", diffArgs);
-	let hasOutput = false;
-	for await (const line of process) {
-		hasOutput = true;
-		log.show(line);
+	try {
+		await renderDiffViewer(targetBranch);
+	} catch (error) {
+		log.error(`Failed to display diff viewer: ${error instanceof Error ? error.message : "Unknown error"}${targetBranch ? ` (branch: ${targetBranch})` : ""}`);
 	}
-	const { exitCode, stderr } = await process;
-	if (exitCode) {
-		log.error(`Failed to diff. Command exited with code ${exitCode}.`);
-		if (stderr) log.error(stderr);
-	} else if (!hasOutput) log.show("No differences found.", { type: "info" });
 };
 function diffCommand(command) {
 	command.command("diff").alias("di").description("Show differences between branches or working directory").option("-l, --local", "Diff local branch", true).option("-r, --remote", "Diff remote branch").action(async (options) => {
@@ -1760,71 +1777,47 @@ const histCommand = (command) => {
 	return command;
 };
 
-//#endregion
-//#region src/commands/list.ts
-function listCommand(command) {
-	command.command("list").alias("ls").description("List git branches").option("-l, --local", "List local branches").option("-r, --remote", "List remote branches").option("-a, --all", "List all branches", true).action(async (options) => {
-		if (options.all) {
-			const { branches: localBranches, currentBranch } = await getLocalBranches();
-			const { branches: remoteBranches } = await getRemoteBranches();
-			if (!localBranches.length && !remoteBranches.length) {
-				log.error("No branches found. Please check your git repository.");
-				return;
-			}
-			log.show(`Local ${localBranches.length} branches`, {
-				symbol: "🔖",
-				colors: colors.bgGreen
-			});
-			for (const branch of localBranches) if (branch === currentBranch) log.show(`${branch}  (current)`, { type: "info" });
-			else log.show(branch, { type: "step" });
-			log.show(`Remote ${remoteBranches.length} branches`, {
-				symbol: "🔖",
-				colors: colors.bgYellow
-			});
-			for (const branch of remoteBranches) if (branch === currentBranch) log.show(`${branch}  (current)`, { type: "info" });
-			else log.show(branch, { type: "step" });
-		} else if (options.local) {
-			const { branches } = await getLocalBranches();
-			if (!branches || branches.length === 0) {
-				log.error("No local branches found. Please check your git repository.");
-				return;
-			}
-			log.info(`Found ${branches.length} local branches:`);
-			for (const branch of branches) log.info(branch);
-		} else {
-			const { branches } = await getRemoteBranches();
-			if (!branches || branches.length === 0) {
-				log.error("No remote branches found. Please check your git repository.");
-				return;
-			}
-			log.info(`Found ${branches.length} remote branches:`);
-			for (const branch of branches) log.info(branch);
-		}
-	});
-}
-
 //#endregion
 //#region src/commands/merge.ts
 const handleMerge = async (branch) => {
 	const spinner = createSpinner(`Merging branch ${branch}...`);
-	const args = ["merge", branch];
+	const args = [
+		"merge",
+		"--no-edit",
+		branch
+	];
 	const stashResult = await handleGitStash(void 0, {
 		branch,
 		operation: "merge"
 	});
+	if (!stashResult) {
+		spinner.stop("Cannot proceed with merge: failed to stash changes.");
+		return;
+	}
 	try {
-		const [error] = await xASync("git", args, { nodeOptions: { stdio: "inherit" } });
-		if (error) log.show(`Failed to merge branch ${branch}.`, { type: "error" });
-		else spinner.stop(`Successfully merged branch ${branch}.`);
+		const [error, result] = await xASync("git", args, { nodeOptions: { stdio: "inherit" } });
+		if (error) {
+			spinner.stop();
+			const errorMessage = error instanceof Error ? error.message : String(error);
+			throw new Error(`Failed to merge branch ${branch}: ${errorMessage}`);
+		}
+		spinner.stop();
+		if (result.stdout.includes("Merge branch") || result.stdout.includes("Merge made by")) await handleMergeCommit();
+		log.show(colors.green(`Successfully merged branch ${colors.bgGreen(branch)}.`), { type: "success" });
+	} catch (error) {
+		spinner.stop();
+		log.show(`Failed to merge branch ${branch}.`, { type: "error" });
+		log.error(error);
+		throw error;
 	} finally {
-		stashResult && handleGitPop(stashResult);
+		if (stashResult) await handleGitPop(stashResult);
 	}
 };
 function mergeCommand(command) {
 	command.command("merge").alias("mg").argument("[branch]", "The branch to merge").option("-l, --local", "Merge a local branch").option("-r, --remote", "Merge a remote branch").option("-b, --branch <branch>", "Create and merge a new branch").description("Merge a branch").action(async (branch, params) => {
 		let isLocal = params.local;
 		if (branch) {
-			handleMerge(branch);
+			await handleMerge(branch);
 			return;
 		}
 		if (isEmpty(params)) isLocal = await createSelect({
@@ -1839,18 +1832,20 @@ function mergeCommand(command) {
 			initialValue: false
 		});
 		if (isLocal) {
-			const { options } = await getLocalOptions();
-			handleMerge(await createSearch({
+			const { options, currentBranch } = await getLocalBranchOptions();
+			await handleMerge(await createSelect({
 				message: "Select the branch to merge",
-				options
+				options,
+				initialValue: currentBranch
 			}));
 		} else {
-			const { options } = await getRemoteOptions();
-			const selectedBranch = await createSearch({
+			const { options, currentBranch } = await getRemoteBranchOptions();
+			const selectedBranch = await createSelect({
 				message: "Select the branch to merge",
-				options
+				options,
+				initialValue: currentBranch
 			});
-			if (await createConfirm({ message: `Do you want to merge ${colors.bgRed(selectedBranch)}?` })) handleMerge(selectedBranch);
+			if (await createConfirm({ message: `Do you want to merge ${colors.bgRed(selectedBranch)}?` })) await handleMerge(selectedBranch);
 		}
 	});
 }
@@ -1859,7 +1854,40 @@ function mergeCommand(command) {
 //#region src/commands/pull.ts
 function pullCommand(command) {
 	command.command("pull").alias("pl").description("Pull git branch").option("-r, --rebase", "Use rebase mode instead of merge").option("-m, --merge", "Use merge mode (default)").action(async (options) => {
-		const { options: branchOptions, currentBranch } = await getRemoteOptions();
+		const [error, result] = await safeAwait(getRemoteRepositoryOptions());
+		if (error) {
+			log.error(`Failed to get remote repositories: ${error.message}`);
+			return;
+		}
+		const repositories = result.remotes;
+		if (repositories.length === 0) {
+			log.error("No remote repositories found. Aborting pull operation.");
+			log.show("Hint: Use \"git remote add <name> <url>\" to add a remote repository.", { type: "info" });
+			return;
+		}
+		const selectedRepository = repositories.length > 1 ? (await safeAwait(createSelect({
+			message: "Select remote repository",
+			options: result.options,
+			initialValue: repositories[0]
+		})))[1] : repositories[0];
+		if (!selectedRepository) {
+			log.error("No remote selected. Aborting pull operation.");
+			return;
+		}
+		const spinner = createSpinner("Fetching latest remote branches...");
+		const [fetchError] = await xASync("git", [
+			"fetch",
+			selectedRepository,
+			"--prune"
+		], { timeout: 3e4 });
+		if (fetchError) {
+			spinner.stop("Failed to fetch latest remote branches");
+			log.error(`Failed to fetch from ${selectedRepository}: ${fetchError.message}`);
+			log.show("Please check your network connection and try again.", { type: "info" });
+			return;
+		}
+		spinner.stop("Successfully fetched latest remote branches");
+		const { options: branchOptions, currentBranch } = await getRemoteBranchOptions();
 		if (!branchOptions.length) {
 			log.error("No branches found. Please check your git repository.");
 			return;
@@ -1879,11 +1907,11 @@ function pullCommand(command) {
 			options: [{
 				label: "Merge (default)",
 				value: "merge",
-				hint: "git pull origin <branch>"
+				hint: `git pull ${selectedRepository} ${selectedBranch}`
 			}, {
 				label: "Rebase",
 				value: "rebase",
-				hint: "git pull --rebase origin <branch>"
+				hint: `git pull --rebase ${selectedRepository} ${selectedBranch}`
 			}],
 			initialValue: "merge"
 		}) === "rebase";
@@ -1891,11 +1919,27 @@ function pullCommand(command) {
 			branch: selectedBranch,
 			operation: "pull"
 		});
-		await handleGitPull(selectedBranch, { rebase: useRebase });
+		await handleGitPull(selectedBranch, {
+			remote: selectedRepository,
+			rebase: useRebase
+		});
 		stashResult && handleGitPop(stashResult);
 	});
 }
 
+//#endregion
+//#region src/commands/show.ts
+const showCommand = (command) => {
+	command.command("show [hash]").description("Show commit details (interactive viewer)").option("-n, --number <count>", "Limit number of commits to show in selector").action(async (hash, options) => {
+		if (hash) await renderCommitDetail(hash);
+		else {
+			const selectedHash = await renderCommitViewer(options.number ? Number.parseInt(options.number, 10) : void 0);
+			if (selectedHash) await renderCommitDetail(selectedHash);
+		}
+	});
+	return command;
+};
+
 //#endregion
 //#region src/constants/stash.ts
 const HELP_MESSAGE = {
@@ -2137,7 +2181,6 @@ const pkg = readPackage(import.meta, "..");
 const init = () => {
 	const command = createCommand("ng").version(pkg.version).description(`${pkg.name} CLI helper for git`).addHelpText("after", HELP_MESSAGE$1.main);
 	pullCommand(command);
-	listCommand(command);
 	pushCommand(command);
 	checkoutCommand(command);
 	branchCommand(command);
@@ -2148,6 +2191,7 @@ const init = () => {
 	commitCommand(command);
 	statusCommand(command);
 	histCommand(command);
+	showCommand(command);
 	configCommand(command);
 	return command;
 };