@nemo-cli/git 0.1.4 → 0.1.5

package/dist/index.js

@@ -1,5 +1,5 @@
 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, renderHistViewer, renderStashList, renderStatusViewer } from "@nemo-cli/ui";
+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("*"));
@@ -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
@@ -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,49 +1777,6 @@ 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) => {
@@ -1953,6 +1927,19 @@ function pullCommand(command) {
 	});
 }
 
+//#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 = {
@@ -2194,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);
@@ -2205,6 +2191,7 @@ const init = () => {
 	commitCommand(command);
 	statusCommand(command);
 	histCommand(command);
+	showCommand(command);
 	configCommand(command);
 	return command;
 };