avil13-co 2.2.0 → 2.2.2

package/dist/package.json

@@ -0,0 +1,50 @@
+{
+    "name": "avil13-co",
+    "version": "2.2.2",
+    "description": "",
+    "main": "dist/index.js",
+    "public": true,
+    "bin": {
+        "co": "./bin/co"
+    },
+    "files": [
+        "dist",
+        "bin",
+        "src",
+        "assets"
+    ],
+    "scripts": {
+        "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": "vitest run",
+        "test:watch": "vitest",
+        "type-check": "tsc -p . --noEmit",
+        "type-check:watch": "npm run type-check -- --watch",
+        "build": "rm -rf ./dist && tsc -p ."
+    },
+    "keywords": [
+        "git",
+        "git checkout",
+        "cli"
+    ],
+    "author": "Aleksey Pivkin",
+    "license": "ISC",
+    "repository": {
+        "type": "git",
+        "url": "git@github.com:avil13/avil13-git-co.git"
+    },
+    "dependencies": {
+        "inquirer": "^8.2.2",
+        "inquirer-autocomplete-prompt": "^2.0.0"
+    },
+    "devDependencies": {
+        "@types/inquirer": "^8.2.1",
+        "@types/node": "^17.0.23",
+        "ts-node": "^10.7.0",
+        "typescript": "^4.6.3",
+        "vitest": "^0.10.0"
+    }
+}

package/dist/{cli-commands → src/cli-commands}/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHelp = exports.getWishOfUser = exports.Commands = void 0;
+const package_json_1 = require("../../package.json");
 const args = process.argv.slice(2);
 var Commands;
 (function (Commands) {
@@ -34,6 +35,7 @@ const getHelp = () => {
     return `
 DESCRIPTION:
   A console program for quickly switching between branches
+VERSION: ${package_json_1.version}
 
 OPTIONS:
   help, -h, --h, --help

package/dist/{index.js → src/index.js}

@@ -4,6 +4,7 @@ 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 merge_branch_1 = require("./commands/merge-branch");
 const run = async () => {
     const userWish = (0, cli_commands_1.getWishOfUser)();
     if (cli_commands_1.Commands.Help === userWish) {
@@ -23,6 +24,10 @@ const run = async () => {
         (0, delete_barnch_1.deleteBranch)(branch);
         return;
     }
+    if (cli_commands_1.Commands.MergeBranch === userWish) {
+        (0, merge_branch_1.mergeBranch)(branch);
+        return;
+    }
     await (0, commands_1.checkoutBranch)(branch);
     await (0, commands_1.getCurrentBranchName)();
 };

package/package.json

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

package/src/cli-commands/index.ts

@@ -1,4 +1,5 @@
 import { clc } from '../color';
+import { version } from '../../package.json';
 
 const args = process.argv.slice(2);
 
@@ -40,6 +41,7 @@ export const getHelp = (): string => {
   return `
 DESCRIPTION:
   A console program for quickly switching between branches
+VERSION: ${version}
 
 OPTIONS:
   help, -h, --h, --help

package/src/index.ts

@@ -2,6 +2,7 @@ import { ask } from './ask';
 import { Commands, getHelp, getWishOfUser } from './cli-commands';
 import { BranchesType, checkoutBranch, getBranches, getCurrentBranchName } from './commands';
 import { deleteBranch } from './commands/delete-barnch';
+import { mergeBranch } from './commands/merge-branch';
 
 const run = async () => {
   const userWish = getWishOfUser();
@@ -28,6 +29,11 @@ const run = async () => {
     return;
   }
 
+  if (Commands.MergeBranch === userWish) {
+    mergeBranch(branch);
+    return;
+  }
+
   await checkoutBranch(branch);
 
   await getCurrentBranchName()