avil13-co 1.1.5 → 2.1.0

package/README.md

@@ -6,8 +6,35 @@
 
 Install:
 
-```bash
+```sh
 npm install -g avil13-co
 ```
 
-Type alias "`co`" for switch branch.
+Type alias "`co`" for switch branch.
+
+# Usage
+
+```sh
+# Shows a list of branches that can be switched to
+co
+```
+
+```sh
+# Shows help message
+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 +1,3 @@
-export declare const ask: (message: string, choices: string[]) => Promise<any>;
+export declare const ask: (message: string, choices: string[]) => Promise<{
+    branch: any;
+}>;

package/dist/ask.js

@@ -1,61 +1,27 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var inquirer = require('inquirer');
-inquirer.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
-var specSymbols = {
+exports.ask = void 0;
+const inquirer_1 = __importDefault(require("inquirer"));
+inquirer_1.default.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
+const specSymbols = {
     _saveCursor: '\x1b7',
     _restoreCursor: '\x1b8',
     _clear: '\x1b[H\x1b[2J',
 };
-exports.ask = function (message, choices) { return __awaiter(void 0, void 0, void 0, function () {
-    var prompt;
-    return __generator(this, function (_a) {
-        prompt = inquirer.prompt({
-            type: 'autocomplete',
-            name: 'branch',
-            message: message,
-            source: function (answersSoFar, input) {
-                if (input === void 0) { input = ''; }
-                var list = choices.filter(function (str) { return str.indexOf(input) > -1; });
-                return Promise.resolve(list);
-            }
-        });
-        return [2 /*return*/, prompt];
+const ask = async (message, choices) => {
+    const prompt = inquirer_1.default.prompt({
+        //@ts-ignore
+        type: 'autocomplete',
+        name: 'branch',
+        message,
+        source(answersSoFar, input = '') {
+            const list = choices.filter(str => str.indexOf(input) > -1);
+            return Promise.resolve(list);
+        }
     });
-}); };
+    return prompt;
+};
+exports.ask = ask;

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

@@ -0,0 +1,9 @@
+export declare enum Commands {
+    Unknown = 0,
+    Help = 1,
+    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

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHelp = exports.getWishOfUser = exports.Commands = void 0;
+const args = process.argv.slice(2);
+var Commands;
+(function (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) => {
+    const arg = firstArg || args[0];
+    switch (true) {
+        case ['help', '-h', '--h', '--help'].includes(arg):
+            return Commands.Help;
+        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;
+    }
+};
+exports.getWishOfUser = getWishOfUser;
+const getHelp = () => {
+    return `
+DESCRIPTION:
+  A console program for quickly switching between branches
+
+OPTIONS:
+  help, -h, --h, --help
+    Showing this message
+
+  m, -m, merged
+    Showing merged branches
+
+  un, -un, --no-merged
+    Showing not merged branches
+
+  -D, rm
+    Delete the selected branch
+`;
+};
+exports.getHelp = getHelp;

package/dist/color.d.ts

@@ -0,0 +1,27 @@
+export declare const clc: {
+    _red: string;
+    _green: string;
+    _yellow: string;
+    _blue: string;
+    _greenBg: string;
+    _redBg: string;
+    _blueBg: string;
+    _cyan: string;
+    _white: string;
+    _gray: string;
+    _right: string;
+    _off: string;
+    color(...args: any[]): string;
+    greenOrRed(isVal: any, ...strList: any[]): string;
+    greenOrRedBg(isVal: any, ...strList: any): string;
+    greenBg(str1: any, str2: any): string;
+    redBg(str1: any, str2: any): string;
+    blueBg(str1: any, str2: any): string;
+    green(...args: any[]): string;
+    red(...args: any[]): string;
+    yellow(...args: any[]): string;
+    blue(...args: any[]): string;
+    cyan(...args: any[]): string;
+    white(...args: any[]): string;
+    gray(...args: any[]): string;
+};

package/dist/color.js

@@ -1,12 +1,7 @@
 "use strict";
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
-};
-module.exports = {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clc = void 0;
+exports.clc = {
     _red: '\x1b[31m',
     _green: '\x1b[32m',
     _yellow: '\x1b[33m',
@@ -19,102 +14,62 @@ module.exports = {
     _gray: '\x1b[0;90m',
     _right: '\x1b[46G',
     _off: '\x1b[0m',
-    color: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var color = args[0];
-        var str = args[1];
-        var left = args.splice(2);
-        return ("" + color + str + this._off + (left.length ? ' ' + left.join(' ') : ''));
+    color(...args) {
+        const color = args[0];
+        const str = args[1];
+        const left = args.splice(2);
+        return (`${color}${str}${this._off}` + (left.length ? ' ' + left.join(' ') : ''));
     },
-    greenOrRed: function (isVal) {
-        var strList = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            strList[_i - 1] = arguments[_i];
-        }
+    greenOrRed(isVal, ...strList) {
         return isVal === true
             ? this.green.apply(this, strList)
             : this.red.apply(this, strList);
     },
-    greenOrRedBg: function (isVal) {
-        var strList = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            strList[_i - 1] = arguments[_i];
-        }
+    greenOrRedBg(isVal, ...strList) {
         return isVal === true
             ? this.greenBg.apply(this, strList)
             : this.redBg.apply(this, strList);
     },
-    greenBg: function (str1, str2) {
-        var str = this.color(this._greenBg, " " + str1 + " ");
+    greenBg(str1, str2) {
+        let str = this.color(this._greenBg, ` ${str1} `);
         if (str2) {
             str += ' ' + this.color(this._green, str2);
         }
         return str;
     },
-    redBg: function (str1, str2) {
-        var str = this.color(this._redBg, " " + str1 + " ");
+    redBg(str1, str2) {
+        let str = this.color(this._redBg, ` ${str1} `);
         if (str2) {
             str += ' ' + this.color(this._red, str2);
         }
         return str;
     },
-    blueBg: function (str1, str2) {
-        var str = this.color(this._blueBg, " " + str1 + " ");
+    blueBg(str1, str2) {
+        let str = this.color(this._blueBg, ` ${str1} `);
         if (str2) {
             str += ' ' + this.color(this._blue, str2);
         }
         return str;
     },
-    green: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        return this.color.apply(this, __spreadArrays([this._green], args));
+    green(...args) {
+        return this.color.apply(this, [this._green, ...args]);
     },
-    red: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        return this.color.apply(this, __spreadArrays([this._red], args));
+    red(...args) {
+        return this.color.apply(this, [this._red, ...args]);
     },
-    yellow: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        return this.color.apply(this, __spreadArrays([this._yellow], args));
+    yellow(...args) {
+        return this.color.apply(this, [this._yellow, ...args]);
     },
-    blue: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        return this.color.apply(this, __spreadArrays([this._blue], args));
+    blue(...args) {
+        return this.color.apply(this, [this._blue, ...args]);
     },
-    cyan: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        return this.color.apply(this, __spreadArrays([this._cyan], args));
+    cyan(...args) {
+        return this.color.apply(this, [this._cyan, ...args]);
     },
-    white: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        return this.color.apply(this, __spreadArrays([this._white], args));
+    white(...args) {
+        return this.color.apply(this, [this._white, ...args]);
     },
-    gray: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        return this.color.apply(this, __spreadArrays([this._gray], args));
+    gray(...args) {
+        return this.color.apply(this, [this._gray, ...args]);
     },
 };

package/dist/commands/checkout-branch.d.ts

@@ -0,0 +1 @@
+export declare function checkoutBranch(branchName: string): Promise<void>;

package/dist/commands/checkout-branch.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkoutBranch = void 0;
+const exec_1 = require("./exec");
+const color_1 = require("../color");
+//
+async function checkoutBranch(branchName) {
+    if (!branchName) {
+        throw new Error('No branch...');
+    }
+    const checkoutCommand = `git checkout ${branchName}`;
+    console.log(' ' + color_1.clc.green('git checkout', branchName) + '\n');
+    const checkoutCommandResult = await (0, exec_1.exec)(checkoutCommand);
+    console.log(checkoutCommandResult);
+}
+exports.checkoutBranch = checkoutBranch;

package/dist/commands/delete-barnch.d.ts

@@ -0,0 +1 @@
+export declare function deleteBranch(branchName: string): Promise<void>;

package/dist/commands/delete-barnch.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteBranch = void 0;
+const inquirer_1 = __importDefault(require("inquirer"));
+const exec_1 = require("./exec");
+const color_1 = require("../color");
+async function deleteBranch(branchName) {
+    if (!branchName) {
+        throw new Error('No branch...');
+    }
+    const res = await inquirer_1.default.prompt({
+        type: 'confirm',
+        name: 'answer',
+        message: color_1.clc.yellow('Are you sure you want to delete the branch "') + color_1.clc.red(branchName) + color_1.clc.yellow('"?'),
+        default: false,
+    });
+    if (res.answer === true) {
+        const command = `git branch -D ${branchName}`;
+        console.log(' ' + color_1.clc.redBg(`git branch -D ${branchName}`, '') + '\n');
+        const checkoutCommandResult = await (0, exec_1.exec)(command);
+        console.log(checkoutCommandResult);
+        console.log(color_1.clc.yellow('Branch'), color_1.clc.red(branchName), color_1.clc.yellow('has been deleted'));
+        return;
+    }
+    console.log(color_1.clc.yellow('The branch was not deleted'));
+}
+exports.deleteBranch = deleteBranch;

package/dist/commands/exec.d.ts

@@ -0,0 +1 @@
+export declare function exec(command: any): Promise<string>;

package/dist/commands/exec.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.exec = void 0;
+const child_process_1 = require("child_process");
+function exec(command) {
+    return new Promise((resolve, reject) => (0, child_process_1.exec)(command, (err, stdout) => err ? reject(err) : resolve(stdout)));
+}
+exports.exec = exec;

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

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

package/dist/commands/get-branches.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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(type) {
+    const command = commandsForGetBranches[type];
+    return (0, exec_1.exec)(command)
+        .then(parseBranches)
+        .then(branches => {
+        if (branches.length) {
+            return branches;
+        }
+        throw new Error('No branches found...');
+    });
+}
+exports.getBranches = getBranches;
+function parseBranches(stdout) {
+    return stdout
+        .split('\n')
+        .filter(s => !/\s->\s/.test(s))
+        .map(cleanBranchName)
+        .filter(Boolean)
+        .filter(onlyUnique);
+}
+function cleanBranchName(name) {
+    return name
+        .replace(/^\*/, '')
+        .replace(/remotes\/origin\//, '')
+        .trim();
+}
+function onlyUnique(value, index, self) {
+    return self.indexOf(value) === index;
+}

package/dist/commands/get-current-branch-name.d.ts

@@ -0,0 +1 @@
+export declare function getCurrentBranchName(): Promise<void>;

package/dist/commands/get-current-branch-name.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCurrentBranchName = void 0;
+const exec_1 = require("./exec");
+async function getCurrentBranchName() {
+    const currentBranchName = `git rev-parse --abbrev-ref HEAD`;
+    const stdout = await (0, exec_1.exec)(currentBranchName);
+    console.log(stdout);
+}
+exports.getCurrentBranchName = getCurrentBranchName;

package/dist/commands/index.d.ts

@@ -0,0 +1,3 @@
+export * from './checkout-branch';
+export * from './get-branches';
+export * from './get-current-branch-name';

package/dist/commands/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./checkout-branch"), exports);
+__exportStar(require("./get-branches"), exports);
+__exportStar(require("./get-current-branch-name"), exports);

package/dist/index.js

@@ -1,69 +1,29 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+Object.defineProperty(exports, "__esModule", { value: true });
+const ask_1 = require("./ask");
+const cli_commands_1 = require("./cli-commands");
+const commands_1 = require("./commands");
+const delete_barnch_1 = require("./commands/delete-barnch");
+const run = async () => {
+    const userWish = (0, cli_commands_1.getWishOfUser)();
+    if (cli_commands_1.Commands.Help === userWish) {
+        console.log((0, cli_commands_1.getHelp)());
+        return;
+    }
+    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);
+        return;
+    }
+    await (0, commands_1.checkoutBranch)(branch);
+    await (0, commands_1.getCurrentBranchName)();
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-var commands_1 = require("./commands");
-var ask_1 = require("./ask");
-var run = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var branches, branch, stdout;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, commands_1.getBranches()];
-            case 1:
-                branches = _a.sent();
-                return [4 /*yield*/, ask_1.ask('Select branch', branches)];
-            case 2:
-                branch = (_a.sent()).branch;
-                stdout = '';
-                return [4 /*yield*/, commands_1.checkoutBranch(branch)];
-            case 3:
-                stdout = _a.sent();
-                console.log(stdout);
-                return [4 /*yield*/, commands_1.getCurrentBranchName()];
-            case 4:
-                stdout = _a.sent();
-                console.log(stdout);
-                return [2 /*return*/];
-        }
-    });
-}); };
-try {
-    run();
-}
-catch (err) {
-    console.log(err);
-}
+run();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avil13-co",
-  "version": "1.1.5",
+  "version": "2.1.0",
   "description": "",
   "main": "dist/index.js",
   "public": true,
@@ -14,13 +14,13 @@
     "assets"
   ],
   "scripts": {
-    "prepublish": "npm run build",
+    "prepublishOnly": "npm run build",
     "start": "npm run build && node dist/index.js",
     "dev": "ts-node --project tsconfig.json src/index.ts",
     "dev:watch": "nodemon",
     "lint:fix": "eslint --fix --ext .js,.ts .",
-    "test": "jest",
-    "test:watch": "jest --watch",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "type-check": "tsc -p . --noEmit",
     "type-check:watch": "npm run type-check -- --watch",
     "build": "rm -rf ./dist && tsc -p ."
@@ -37,12 +37,13 @@
     "url": "git@github.com:avil13/avil13-git-co.git"
   },
   "dependencies": {
-    "inquirer": "^7.0.4",
-    "inquirer-autocomplete-prompt": "^1.0.2"
+    "inquirer": "^8.2.2",
+    "inquirer-autocomplete-prompt": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^13.7.0",
-    "ts-node": "^8.6.2",
-    "typescript": "^3.7.5"
+    "@types/inquirer": "^8.2.1",
+    "@types/node": "^17.0.23",
+    "ts-node": "^10.7.0",
+    "typescript": "^4.6.3"
   }
 }

package/src/ask.ts

@@ -1,4 +1,4 @@
-const inquirer = require('inquirer');
+import inquirer from 'inquirer';
 
 inquirer.registerPrompt(
   'autocomplete',
@@ -13,6 +13,7 @@ const specSymbols = {
 
 export const ask = async (message: string, choices: string[]) => {
   const prompt = inquirer.prompt({
+    //@ts-ignore
     type: 'autocomplete',
     name: 'branch',
     message,

package/src/cli-commands/index.ts

@@ -0,0 +1,53 @@
+import { clc } from '../color';
+
+const args = process.argv.slice(2);
+
+export enum Commands {
+  Unknown,
+  Help,
+  DeleteBranch,
+  ShowMerged,
+  ShowUnMerged,
+};
+
+export const getWishOfUser = (firstArg?: string): Commands => {
+  const arg: string = firstArg || args[0];
+
+  switch (true) {
+    case ['help', '-h', '--h', '--help'].includes(arg):
+      return Commands.Help;
+
+    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;
+  }
+}
+
+
+export const getHelp = (): string => {
+  return `
+DESCRIPTION:
+  A console program for quickly switching between branches
+
+OPTIONS:
+  help, -h, --h, --help
+    Showing this message
+
+  m, -m, merged
+    Showing merged branches
+
+  un, -un, --no-merged
+    Showing not merged branches
+
+  -D, rm
+    Delete the selected branch
+`;
+}

package/src/color.ts

@@ -1,4 +1,4 @@
-module.exports = {
+export const clc = {
   _red: '\x1b[31m',
   _green: '\x1b[32m',
   _yellow: '\x1b[33m',
@@ -27,7 +27,7 @@ module.exports = {
       ? this.green.apply(this, strList)
       : this.red.apply(this, strList);
   },
-  greenOrRedBg(isVal, ...strList) {
+  greenOrRedBg(isVal, ...strList: any) {
     return isVal === true
       ? this.greenBg.apply(this, strList)
       : this.redBg.apply(this, strList);

package/src/commands/checkout-branch.ts

@@ -0,0 +1,16 @@
+import { exec } from './exec';
+import { clc } from '../color';
+
+//
+export async function checkoutBranch(branchName: string) {
+  if (!branchName) {
+    throw new Error('No branch...');
+  }
+
+  const checkoutCommand = `git checkout ${branchName}`;
+
+  console.log(' ' + clc.green('git checkout', branchName) + '\n');
+
+  const checkoutCommandResult = await exec(checkoutCommand);
+  console.log(checkoutCommandResult);
+}

package/src/commands/delete-barnch.ts

@@ -0,0 +1,31 @@
+import inquirer from 'inquirer';
+import { exec } from './exec';
+import { clc } from '../color';
+
+export async function deleteBranch(branchName: string) {
+  if (!branchName) {
+    throw new Error('No branch...');
+  }
+
+  const res = await inquirer.prompt({
+    type: 'confirm',
+    name: 'answer',
+    message: clc.yellow('Are you sure you want to delete the branch "') + clc.red(branchName) + clc.yellow('"?'),
+    default: false,
+  });
+
+  if (res.answer === true) {
+    const command = `git branch -D ${branchName}`;
+
+    console.log(' ' + clc.redBg(`git branch -D ${branchName}`, '') + '\n');
+
+    const checkoutCommandResult = await exec(command);
+
+    console.log(checkoutCommandResult);
+    console.log(clc.yellow('Branch'), clc.red(branchName), clc.yellow('has been deleted'));
+
+    return;
+  }
+
+  console.log(clc.yellow('The branch was not deleted'));
+}

package/src/commands/exec.ts

@@ -0,0 +1,9 @@
+import { exec as exe } from 'child_process';
+
+export function exec(command): Promise<string> {
+  return new Promise((resolve, reject) =>
+    exe(command, (err, stdout) =>
+      err ? reject(err) : resolve(stdout)
+    )
+  );
+}

package/src/commands/get-branches.ts

@@ -0,0 +1,50 @@
+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(type: BranchesType): Promise<string[]> {
+  const command = commandsForGetBranches[type];
+
+  return exec(command)
+    .then(parseBranches)
+    .then(branches => {
+      if (branches.length) {
+        return branches;
+      }
+      throw new Error('No branches found...');
+    });
+}
+
+function parseBranches(stdout) {
+  return stdout
+    .split('\n')
+    .filter(s => !/\s->\s/.test(s))
+    .map(cleanBranchName)
+    .filter(Boolean)
+    .filter(onlyUnique);
+}
+
+function cleanBranchName(name) {
+  return name
+    .replace(/^\*/, '')
+    .replace(/remotes\/origin\//, '')
+    .trim();
+}
+
+function onlyUnique(value, index, self) {
+  return self.indexOf(value) === index;
+}

package/src/commands/get-current-branch-name.ts

@@ -0,0 +1,9 @@
+import { exec } from './exec';
+
+export async function getCurrentBranchName(){
+  const currentBranchName = `git rev-parse --abbrev-ref HEAD`;
+
+  const stdout = await exec(currentBranchName);
+  console.log(stdout);
+}
+

package/src/commands/index.ts

@@ -0,0 +1,3 @@
+export * from './checkout-branch';
+export * from './get-branches';
+export * from './get-current-branch-name';

package/src/index.ts

@@ -1,22 +1,36 @@
-import { getBranches, checkoutBranch, getCurrentBranchName } from './commands';
 import { ask } from './ask';
+import { Commands, getHelp, getWishOfUser } from './cli-commands';
+import { BranchesType, checkoutBranch, getBranches, getCurrentBranchName } from './commands';
+import { deleteBranch } from './commands/delete-barnch';
 
 const run = async () => {
-  const branches = await getBranches();
+  const userWish = getWishOfUser();
+
+  if (Commands.Help === userWish) {
+    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);
 
-  let stdout = '';
+  if (Commands.DeleteBranch === userWish) {
+    deleteBranch(branch);
+    return;
+  }
 
-  stdout = await checkoutBranch(branch);
-  console.log(stdout);
+  await checkoutBranch(branch);
 
-  stdout = await getCurrentBranchName()
-  console.log(stdout);
+  await getCurrentBranchName()
 };
 
-try {
-  run();
-} catch (err) {
-  console.log(err);
-}
+run();

package/dist/commands.d.ts

@@ -1,6 +0,0 @@
-/**
- * get branch list
- */
-export declare function getBranches(): Promise<string[]>;
-export declare function checkoutBranch(branchName: string): Promise<string>;
-export declare function getCurrentBranchName(): Promise<string>;

package/dist/commands.js

@@ -1,114 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var child_process = require('child_process');
-var clc = require('./color');
-function exec(command) {
-    return new Promise(function (resolve, reject) {
-        return child_process.exec(command, function (err, stdout) {
-            return err ? reject(err) : resolve(stdout);
-        });
-    });
-}
-/**
- * get branch list
- */
-function getBranches() {
-    return exec('git branch --all')
-        .then(parseBranches)
-        .then(function (branches) {
-        if (branches.length) {
-            return branches;
-        }
-        throw new Error('No branches found...');
-    });
-}
-exports.getBranches = getBranches;
-function parseBranches(stdout) {
-    return stdout
-        .split('\n')
-        .filter(function (s) { return !/\s->\s/.test(s); })
-        .map(cleanBranchName)
-        .filter(Boolean)
-        .filter(onlyUnique);
-}
-function cleanBranchName(name) {
-    return name
-        .replace(/^\*/, '')
-        .replace(/remotes\/origin\//, '')
-        .trim();
-}
-function onlyUnique(value, index, self) {
-    return self.indexOf(value) === index;
-}
-function checkoutBranch(branchName) {
-    return __awaiter(this, void 0, void 0, function () {
-        var stdoutStrings, checkoutCommand, checkoutCommandResult;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!branchName) {
-                        throw new Error('No branch...');
-                    }
-                    stdoutStrings = [];
-                    checkoutCommand = "git checkout " + branchName;
-                    stdoutStrings.push(' ' + clc.green('git checkout', branchName) + '\n');
-                    return [4 /*yield*/, exec(checkoutCommand)];
-                case 1:
-                    checkoutCommandResult = _a.sent();
-                    stdoutStrings.push(checkoutCommandResult);
-                    return [2 /*return*/, stdoutStrings.join('\n')];
-            }
-        });
-    });
-}
-exports.checkoutBranch = checkoutBranch;
-function getCurrentBranchName() {
-    return __awaiter(this, void 0, void 0, function () {
-        var currentBranchName;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    currentBranchName = "git rev-parse --abbrev-ref HEAD";
-                    return [4 /*yield*/, exec(currentBranchName)];
-                case 1: return [2 /*return*/, _a.sent()];
-            }
-        });
-    });
-}
-exports.getCurrentBranchName = getCurrentBranchName;

package/src/commands.ts

@@ -1,68 +0,0 @@
-const child_process = require('child_process');
-const clc = require('./color');
-
-function exec(command): Promise<string> {
-  return new Promise((resolve, reject) =>
-    child_process.exec(command, (err, stdout) =>
-      err ? reject(err) : resolve(stdout)
-    )
-  );
-}
-
-/**
- * get branch list
- */
-export function getBranches(): Promise<string[]> {
-  return exec('git branch --all')
-    .then(parseBranches)
-    .then(branches => {
-      if (branches.length) {
-        return branches;
-      }
-      throw new Error('No branches found...');
-    });
-}
-
-function parseBranches(stdout) {
-  return stdout
-    .split('\n')
-    .filter(s => !/\s->\s/.test(s))
-    .map(cleanBranchName)
-    .filter(Boolean)
-    .filter(onlyUnique);
-}
-
-function cleanBranchName(name) {
-  return name
-    .replace(/^\*/, '')
-    .replace(/remotes\/origin\//, '')
-    .trim();
-}
-
-function onlyUnique(value, index, self) {
-  return self.indexOf(value) === index;
-}
-
-export async function checkoutBranch(branchName: string): Promise<string> {
-  if (!branchName) {
-    throw new Error('No branch...');
-  }
-
-  const stdoutStrings: string[] = [];
-  const checkoutCommand = `git checkout ${branchName}`;
-
-  stdoutStrings.push(' ' + clc.green('git checkout', branchName) + '\n');
-
-  const checkoutCommandResult = await exec(checkoutCommand);
-  stdoutStrings.push(checkoutCommandResult);
-
-  return stdoutStrings.join('\n');
-}
-
-
-export async function getCurrentBranchName(): Promise<string> {
-  const currentBranchName = `git rev-parse --abbrev-ref HEAD`;
-
-  return await exec(currentBranchName);
-}
-