avil13-co 2.2.5 → 2.4.0

package/src/index.ts

@@ -1,42 +1,54 @@
-import { ask } from './ask';
-import { Commands, getHelp, getWishOfUser } from './cli-commands';
+import { ask, askBranches } from './ask';
+import { Commands, getHelp, parseArgs } from './cli-commands';
 import { BranchesType, checkoutBranch, getBranches, getCurrentBranchName } from './commands';
-import { deleteBranch } from './commands/delete-barnch';
+import { deleteBranches } from './commands/delete-barnch';
 import { mergeBranch } from './commands/merge-branch';
+import { syncBranches } from './commands/sync-branches';
+import { finishTerminal, installInterruptHandler, print, startTerminal } from './terminal';
 
-const run = async () => {
-  const userWish = getWishOfUser();
-
-  if (Commands.Help === userWish) {
+export const run = async () => {
+  const { command, filter } = parseArgs();
+  if (command === Commands.Help) {
     console.log(getHelp());
     return;
   }
 
-  let branchType: BranchesType = BranchesType.All;
-
-  if (Commands.ShowMerged === userWish) {
-    branchType = BranchesType.Merged;
-  } else if (Commands.ShowUnMerged === userWish) {
-    branchType = BranchesType.NotMerged;
-  }
-
-  const branches = await getBranches(branchType);
-
-  const { branch } = await ask('Select branch', branches);
-
-  if (Commands.DeleteBranch === userWish) {
-    deleteBranch(branch);
+  if (command === Commands.Sync) {
+    startTerminal();
+    await syncBranches();
     return;
   }
 
-  if (Commands.MergeBranch === userWish) {
-    mergeBranch(branch);
-    return;
+  const branchType = command === Commands.ShowMerged ? BranchesType.Merged
+    : command === Commands.ShowUnMerged ? BranchesType.NotMerged : BranchesType.All;
+  const deleting = command === Commands.DeleteBranch;
+  let branches = await getBranches(branchType, deleting);
+  if (deleting) {
+    const currentBranch = await getCurrentBranchName();
+    branches = branches.filter(branch => branch !== currentBranch);
+    if (!branches.length) throw new Error('No local branches available for deletion.');
   }
 
-  await checkoutBranch(branch);
-
-  await getCurrentBranchName()
+  startTerminal();
+  if (deleting) {
+    const selected = await askBranches('Select branches to delete (Space to select)', branches, filter);
+    await deleteBranches(selected);
+  } else {
+    const { branch } = await ask('Select branch', branches, filter);
+    if (command === Commands.MergeBranch) await mergeBranch(branch);
+    else {
+      await checkoutBranch(branch);
+      print(await getCurrentBranchName());
+    }
+  }
 };
 
-run();
+const removeInterruptHandler = installInterruptHandler();
+run().catch(error => {
+  finishTerminal();
+  console.error('Error: ' + (error instanceof Error ? error.message : String(error)));
+  process.exitCode = 1;
+}).finally(() => {
+  finishTerminal();
+  removeInterruptHandler();
+});

package/src/prompt.ts

@@ -0,0 +1,18 @@
+import inquirer, { Answers, QuestionCollection } from 'inquirer';
+import { finishTerminal } from './terminal';
+
+export function prompt<T extends Answers = Answers>(questions: QuestionCollection<T>): Promise<T> {
+  const result = inquirer.prompt<T>(questions);
+  // Inquirer 8 re-sends SIGINT asynchronously and may exit before Node handles
+  // it. Handle readline's raw-mode Ctrl+C synchronously instead.
+  const ui = result.ui as any;
+  if (ui) {
+    ui.rl.removeListener('SIGINT', ui.onForceClose);
+    ui.rl.once('SIGINT', () => {
+      ui.close();
+      finishTerminal(true);
+      process.exit(130);
+    });
+  }
+  return result;
+}

package/src/terminal.ts

@@ -0,0 +1,32 @@
+// Keep interactive output isolated from the user's shell history.
+let active = false;
+let messages: string[] = [];
+
+export function startTerminal() {
+  active = Boolean(process.stdout.isTTY && process.stdin.isTTY);
+  messages = [];
+  if (active) process.stdout.write('\x1b[?1049h');
+}
+
+export function print(message: string) {
+  if (!message.trim()) return;
+  if (active) messages.push(message.trimEnd());
+  console.log(message.trimEnd());
+}
+
+export function finishTerminal(cancelled = false) {
+  if (!active) return;
+  active = false;
+  process.stdout.write('\x1b[?1049l\x1b[?25h');
+  if (!cancelled && messages.length) console.log(messages.join('\n'));
+  messages = [];
+}
+
+export function installInterruptHandler() {
+  const onInterrupt = () => {
+    finishTerminal(true);
+    process.exit(130);
+  };
+  process.on('SIGINT', onInterrupt);
+  return () => process.removeListener('SIGINT', onInterrupt);
+}