avil13-co 2.0.0 → 2.1.2

package/README.md

@@ -24,8 +24,17 @@ co
 co -h
 ```
 
+```sh
+# Showing merged branches
+co m
+```
+
+```sh
+# Showing not merged branches
+co un
+```
+
 ```sh
 # Choosing a branch to delete
 co -D
 ```
-

package/dist/ask.d.ts

@@ -1,3 +1,4 @@
 export declare const ask: (message: string, choices: string[]) => Promise<{
     branch: any;
 }>;
+export declare function checkItem(item: string, filterString: string): boolean;

package/dist/ask.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ask = void 0;
+exports.checkItem = exports.ask = void 0;
 const inquirer_1 = __importDefault(require("inquirer"));
 inquirer_1.default.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
 const specSymbols = {
@@ -18,10 +18,28 @@ const ask = async (message, choices) => {
         name: 'branch',
         message,
         source(answersSoFar, input = '') {
-            const list = choices.filter(str => str.indexOf(input) > -1);
+            let list = choices.filter(choiceItem => checkItem(choiceItem, input));
+            list = list.sort((a, b) => {
+                return sortOrder(input, a, b);
+            });
             return Promise.resolve(list);
         }
     });
     return prompt;
 };
 exports.ask = ask;
+//
+function checkItem(item, filterString) {
+    const reg = getRegExp(filterString);
+    return reg.test(item);
+}
+exports.checkItem = checkItem;
+function sortOrder(searchString, name1, name2) {
+    if (name2.includes(searchString)) {
+        return 0;
+    }
+    return 1;
+}
+function getRegExp(filterString) {
+    return new RegExp(filterString.split('').map(s => s.trim()).filter(Boolean).join('.*').replace('.*.*', '.*'), 'gi');
+}

package/dist/cli-commands/index.d.ts

@@ -1,7 +1,9 @@
 export declare enum Commands {
     Unknown = 0,
     Help = 1,
-    DeleteBranch = 2
+    DeleteBranch = 2,
+    ShowMerged = 3,
+    ShowUnMerged = 4
 }
 export declare const getWishOfUser: (firstArg?: string | undefined) => Commands;
 export declare const getHelp: () => string;

package/dist/cli-commands/index.js

@@ -7,6 +7,8 @@ var Commands;
     Commands[Commands["Unknown"] = 0] = "Unknown";
     Commands[Commands["Help"] = 1] = "Help";
     Commands[Commands["DeleteBranch"] = 2] = "DeleteBranch";
+    Commands[Commands["ShowMerged"] = 3] = "ShowMerged";
+    Commands[Commands["ShowUnMerged"] = 4] = "ShowUnMerged";
 })(Commands = exports.Commands || (exports.Commands = {}));
 ;
 const getWishOfUser = (firstArg) => {
@@ -14,8 +16,12 @@ const getWishOfUser = (firstArg) => {
     switch (true) {
         case ['help', '-h', '--h', '--help'].includes(arg):
             return Commands.Help;
-        case ['D', '-D', 'rm'].includes(arg):
+        case ['-D', 'rm'].includes(arg):
             return Commands.DeleteBranch;
+        case ['m', '-m', 'merged'].includes(arg):
+            return Commands.ShowMerged;
+        case ['un', '--no-merged'].includes(arg):
+            return Commands.ShowUnMerged;
         default:
             return Commands.Unknown;
     }
@@ -30,7 +36,13 @@ OPTIONS:
   help, -h, --h, --help
     Showing this message
 
-  D, D', 'rm
+  m, -m, merged
+    Showing merged branches
+
+  un, -un, --no-merged
+    Showing not merged branches
+
+  -D, rm
     Delete the selected branch
 `;
 };

package/dist/commands/get-branches.d.ts

@@ -1,4 +1,9 @@
+export declare enum BranchesType {
+    All = 0,
+    Merged = 1,
+    NotMerged = 2
+}
 /**
  * get branch list
  */
-export declare function getBranches(): Promise<string[]>;
+export declare function getBranches(type: BranchesType): Promise<string[]>;

package/dist/commands/get-branches.js

@@ -1,12 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBranches = void 0;
+exports.getBranches = exports.BranchesType = void 0;
 const exec_1 = require("./exec");
+var BranchesType;
+(function (BranchesType) {
+    BranchesType[BranchesType["All"] = 0] = "All";
+    BranchesType[BranchesType["Merged"] = 1] = "Merged";
+    BranchesType[BranchesType["NotMerged"] = 2] = "NotMerged";
+})(BranchesType = exports.BranchesType || (exports.BranchesType = {}));
+const commandsForGetBranches = {
+    [BranchesType.All]: 'git branch --all',
+    [BranchesType.Merged]: 'git branch --all --merged',
+    [BranchesType.NotMerged]: 'git branch --all --no-merged',
+};
 /**
  * get branch list
  */
-function getBranches() {
-    return (0, exec_1.exec)('git branch --all')
+function getBranches(type) {
+    const command = commandsForGetBranches[type];
+    return (0, exec_1.exec)(command)
         .then(parseBranches)
         .then(branches => {
         if (branches.length) {

package/dist/index.js

@@ -10,7 +10,14 @@ const run = async () => {
         console.log((0, cli_commands_1.getHelp)());
         return;
     }
-    const branches = await (0, commands_1.getBranches)();
+    let branchType = commands_1.BranchesType.All;
+    if (cli_commands_1.Commands.ShowMerged === userWish) {
+        branchType = commands_1.BranchesType.Merged;
+    }
+    else if (cli_commands_1.Commands.ShowUnMerged === userWish) {
+        branchType = commands_1.BranchesType.NotMerged;
+    }
+    const branches = await (0, commands_1.getBranches)(branchType);
     const { branch } = await (0, ask_1.ask)('Select branch', branches);
     if (cli_commands_1.Commands.DeleteBranch === userWish) {
         (0, delete_barnch_1.deleteBranch)(branch);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avil13-co",
-  "version": "2.0.0",
+  "version": "2.1.2",
   "description": "",
   "main": "dist/index.js",
   "public": true,

package/src/ask.ts

@@ -18,7 +18,11 @@ export const ask = async (message: string, choices: string[]) => {
     name: 'branch',
     message,
     source(answersSoFar, input = '') {
-      const list = choices.filter(str => str.indexOf(input) > -1);
+      let list = choices.filter(choiceItem => checkItem(choiceItem, input));
+
+      list = list.sort((a, b) => {
+        return sortOrder(input, a, b);
+      });
 
       return Promise.resolve(list);
     }
@@ -26,3 +30,26 @@ export const ask = async (message: string, choices: string[]) => {
 
   return prompt;
 };
+
+//
+export function checkItem(item: string, filterString: string): boolean {
+  const reg = getRegExp(filterString);
+
+  return reg.test(item);
+}
+
+function sortOrder(searchString: string, name1: string, name2: string): number {
+  if (name2.includes(searchString)) {
+    return 0;
+  }
+
+  return 1;
+}
+
+
+function getRegExp(filterString: string) {
+  return new RegExp(
+    filterString.split('').map(s => s.trim()).filter(Boolean).join('.*').replace('.*.*', '.*'),
+    'gi',
+  );
+}

package/src/cli-commands/index.ts

@@ -1,4 +1,4 @@
-
+import { clc } from '../color';
 
 const args = process.argv.slice(2);
 
@@ -6,6 +6,8 @@ export enum Commands {
   Unknown,
   Help,
   DeleteBranch,
+  ShowMerged,
+  ShowUnMerged,
 };
 
 export const getWishOfUser = (firstArg?: string): Commands => {
@@ -15,9 +17,15 @@ export const getWishOfUser = (firstArg?: string): Commands => {
     case ['help', '-h', '--h', '--help'].includes(arg):
       return Commands.Help;
 
-      case ['D', '-D', 'rm'].includes(arg):
+    case ['-D', 'rm'].includes(arg):
       return Commands.DeleteBranch;
 
+    case ['m', '-m', 'merged'].includes(arg):
+      return Commands.ShowMerged;
+
+    case ['un', '--no-merged'].includes(arg):
+      return Commands.ShowUnMerged;
+
     default:
       return Commands.Unknown;
   }
@@ -33,7 +41,13 @@ OPTIONS:
   help, -h, --h, --help
     Showing this message
 
-  D, D', 'rm
+  m, -m, merged
+    Showing merged branches
+
+  un, -un, --no-merged
+    Showing not merged branches
+
+  -D, rm
     Delete the selected branch
 `;
 }

package/src/commands/get-branches.ts

@@ -1,10 +1,25 @@
 import { exec } from './exec';
 
+
+export enum BranchesType {
+  All,
+  Merged,
+  NotMerged,
+}
+
+const commandsForGetBranches = {
+  [BranchesType.All]: 'git branch --all',
+  [BranchesType.Merged]: 'git branch --all --merged',
+  [BranchesType.NotMerged]: 'git branch --all --no-merged',
+} as const;
+
 /**
  * get branch list
  */
-export function getBranches(): Promise<string[]> {
-  return exec('git branch --all')
+export function getBranches(type: BranchesType): Promise<string[]> {
+  const command = commandsForGetBranches[type];
+
+  return exec(command)
     .then(parseBranches)
     .then(branches => {
       if (branches.length) {

package/src/index.ts

@@ -1,6 +1,6 @@
 import { ask } from './ask';
 import { Commands, getHelp, getWishOfUser } from './cli-commands';
-import { checkoutBranch, getBranches, getCurrentBranchName } from './commands';
+import { BranchesType, checkoutBranch, getBranches, getCurrentBranchName } from './commands';
 import { deleteBranch } from './commands/delete-barnch';
 
 const run = async () => {
@@ -11,7 +11,15 @@ const run = async () => {
     return;
   }
 
-  const branches = await getBranches();
+  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);