fix(output): update output texts

Author: VChet

README.md

@@ -46,8 +46,8 @@ $ git-merged-branches --delete
 fix/crash-on-start
 feature/add-new-feature
 
-Deleting branches locally...
-Deleting branches remotely...
+Deleting branches locally…
+Deleting branches remotely…
 Branches deleted successfully.
 ```
 

src/output.ts

@@ -1,5 +1,5 @@
-import { logError, pluralize } from "./helpers.js";
-import { deleteLocalBranches, deleteRemoteBranches, fetchRemoteBranches } from "./repo.js";
+import { pluralize } from "./helpers.js";
+import { deleteBranches, fetchRemoteBranches } from "./repo.js";
 import { isValidURL } from "./validate.js";
 import type { GitMergedConfig, GitMergedOptions } from "./types.js";
 
@@ -40,30 +40,26 @@ export function outputMergedBranches(
   config: GitMergedConfig,
   options: GitMergedOptions = {}
 ): void {
-  if (!branches.length) {
-    return console.info(`No branches merged into '${targetBranch}'.`);
-  }
+  if (!branches.length) { return console.info(`No branches merged into '${targetBranch}'.`); }
+
+  const pluralized = pluralize(branches.length, ["branch", "branches"]);
 
-  console.info(`${pluralize(branches.length, ["branch", "branches"])} merged into '${targetBranch}':`);
+  console.info(`${pluralized} merged into '${targetBranch}':`);
   console.info(formatTaskBranches(branches, config).join("\n"));
 
   const remoteBranches = fetchRemoteBranches("origin");
   const remoteMerged = branches.filter(branch => remoteBranches.includes(branch));
-  if (!options.deleteBranches) {
-    console.info("\nRun the following to delete branches, or use the --delete option to delete them automatically:");
-    console.info(`locally:\n  git branch --delete ${branches.join(" ")}`);
-    if (remoteMerged.length) { console.info(`remotely:\n  git push origin --delete ${remoteMerged.join(" ")}`); }
-  } else {
-    try {
-      console.info("\nDeleting branches locally...");
-      deleteLocalBranches(branches);
-      if (remoteMerged.length) {
-        console.info("\nDeleting branches remotely...");
-        deleteRemoteBranches(remoteMerged);
-      }
-      console.info("Branches deleted successfully.");
-    } catch (error) {
-      logError("Failed to delete branches", error);
-    }
+  if (options.deleteBranches) {
+    deleteBranches(branches, remoteMerged);
+    console.info("Branches deleted successfully.");
+    return;
+  }
+
+  console.info(`\nUse --delete to delete ${pluralized} automatically.`);
+  console.info("\nDelete locally:");
+  console.info(`  git branch --delete ${branches.join(" ")}`);
+  if (remoteMerged.length) {
+    console.info("\nDelete remotely:");
+    console.info(`  git push origin --delete ${remoteMerged.join(" ")}`);
   }
 }

src/repo.ts

@@ -1,4 +1,5 @@
 import { execSync } from "node:child_process";
+import { cwd } from "node:process";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import { logError } from "./helpers";
@@ -67,7 +68,7 @@ export function fetchRemoteBranches(remote = "origin"): string[] {
 
 export function getConfig(): GitMergedConfig {
   try {
-    const pkgPath = join(process.cwd(), "package.json");
+    const pkgPath = join(cwd(), "package.json");
     const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
     return pkg["git-merged-branches"] || {};
   } catch (error) {
@@ -76,10 +77,21 @@ export function getConfig(): GitMergedConfig {
   }
 }
 
-export function deleteLocalBranches(branches: string[]): void {
+function deleteLocalBranches(branches: string[]): void {
   execSync(`git branch --delete ${branches.join(" ")}`, { stdio: "inherit" });
 }
-
-export function deleteRemoteBranches(branches: string[]): void {
+function deleteRemoteBranches(branches: string[]): void {
   execSync(`git push origin --delete ${branches.join(" ")}`, { stdio: "inherit" });
 }
+export function deleteBranches(localBranches: string[], remoteBranches: string[]): void {
+  try {
+    console.info("\nDeleting branches locally…");
+    deleteLocalBranches(localBranches);
+    if (remoteBranches.length) {
+      console.info("\nDeleting branches remotely…");
+      deleteRemoteBranches(remoteBranches);
+    }
+  } catch (error) {
+    logError("Failed to delete branches", error);
+  }
+}

src/tests/output.test.ts

@@ -85,9 +85,10 @@ describe("outputMergedBranches", () => {
     expect(infoSpy).toHaveBeenNthCalledWith(2, branchOutput.join("\n"));
 
     const localDelete = `git branch --delete ${branches.join(" ")}`;
-    expect(infoSpy).toHaveBeenNthCalledWith(3, "\nRun the following to delete branches, or use the --delete option to delete them automatically:");
-    expect(infoSpy).toHaveBeenNthCalledWith(4, `locally:\n  ${localDelete}`);
-    expect(infoSpy).toHaveBeenCalledTimes(4);
+    expect(infoSpy).toHaveBeenNthCalledWith(3, "\nUse --delete to delete 2 branches automatically.");
+    expect(infoSpy).toHaveBeenNthCalledWith(4, "\nDelete locally:");
+    expect(infoSpy).toHaveBeenNthCalledWith(5, `  ${localDelete}`);
+    expect(infoSpy).toHaveBeenCalledTimes(5);
     expect(warnSpy).not.toHaveBeenCalled();
   });
 
@@ -105,10 +106,12 @@ describe("outputMergedBranches", () => {
 
     const localDelete = `git branch --delete ${branches.join(" ")}`;
     const remoteDelete = `git push origin --delete ${branches.join(" ")}`;
-    expect(infoSpy).toHaveBeenNthCalledWith(3, "\nRun the following to delete branches, or use the --delete option to delete them automatically:");
-    expect(infoSpy).toHaveBeenNthCalledWith(4, `locally:\n  ${localDelete}`);
-    expect(infoSpy).toHaveBeenNthCalledWith(5, `remotely:\n  ${remoteDelete}`);
-    expect(infoSpy).toHaveBeenCalledTimes(5);
+    expect(infoSpy).toHaveBeenNthCalledWith(3, "\nUse --delete to delete 2 branches automatically.");
+    expect(infoSpy).toHaveBeenNthCalledWith(4, "\nDelete locally:");
+    expect(infoSpy).toHaveBeenNthCalledWith(5, `  ${localDelete}`);
+    expect(infoSpy).toHaveBeenNthCalledWith(6, "\nDelete remotely:");
+    expect(infoSpy).toHaveBeenNthCalledWith(7, `  ${remoteDelete}`);
+    expect(infoSpy).toHaveBeenCalledTimes(7);
     expect(warnSpy).not.toHaveBeenCalled();
 
     fetchRemoteMock.mockRestore();
@@ -122,9 +125,10 @@ describe("outputMergedBranches", () => {
     expect(infoSpy).toHaveBeenNthCalledWith(2, "feat/TOKEN-800_new-feature <https://test-instance.org/browse/TOKEN-800>");
 
     const localDelete = `git branch --delete ${branches.join(" ")}`;
-    expect(infoSpy).toHaveBeenNthCalledWith(3, "\nRun the following to delete branches, or use the --delete option to delete them automatically:");
-    expect(infoSpy).toHaveBeenNthCalledWith(4, `locally:\n  ${localDelete}`);
-    expect(infoSpy).toHaveBeenCalledTimes(4);
+    expect(infoSpy).toHaveBeenNthCalledWith(3, "\nUse --delete to delete 1 branch automatically.");
+    expect(infoSpy).toHaveBeenNthCalledWith(4, "\nDelete locally:");
+    expect(infoSpy).toHaveBeenNthCalledWith(5, `  ${localDelete}`);
+    expect(infoSpy).toHaveBeenCalledTimes(5);
     expect(warnSpy).not.toHaveBeenCalled();
   });
 
@@ -140,28 +144,23 @@ describe("outputMergedBranches", () => {
     const config = { ...DEFAULT_CONFIG, issueUrlFormat: "invalid-url" };
 
     outputMergedBranches(branches, "master", config);
-    expect(infoSpy).toHaveBeenCalledTimes(4);
+    expect(infoSpy).toHaveBeenCalledTimes(5);
     expect(warnSpy).toHaveBeenCalledWith("'invalid-url' is not a valid URL. Skipped formatting.");
     expect(warnSpy).toHaveBeenCalledTimes(1);
   });
 
   it("should delete branches when --delete option is passed", () => {
-    const deleteLocalMock = vi.spyOn(repoMethods, "deleteLocalBranches").mockImplementation(() => {});
-    const deleteRemoteMock = vi.spyOn(repoMethods, "deleteRemoteBranches").mockImplementation(() => {});
+    const deleteMock = vi.spyOn(repoMethods, "deleteBranches").mockImplementation(() => {});
 
     const branches = ["feat/TOKEN-800_new-feature", "fix/TOKEN-123_some-fix"];
     const fetchRemoteMock = vi.spyOn(repoMethods, "fetchRemoteBranches").mockReturnValue(branches);
 
     outputMergedBranches(branches, "master", DEFAULT_CONFIG, { deleteBranches: true });
 
-    expect(deleteLocalMock).toHaveBeenCalledWith(branches);
-    expect(deleteRemoteMock).toHaveBeenCalledWith(branches);
-    expect(infoSpy).toHaveBeenCalledWith("\nDeleting branches locally...");
-    expect(infoSpy).toHaveBeenCalledWith("\nDeleting branches remotely...");
+    expect(deleteMock).toHaveBeenCalledWith(branches, branches);
     expect(infoSpy).toHaveBeenCalledWith("Branches deleted successfully.");
 
-    deleteLocalMock.mockRestore();
-    deleteRemoteMock.mockRestore();
+    deleteMock.mockRestore();
     fetchRemoteMock.mockRestore();
   });
 });