avil13-co 2.2.2 → 2.2.4

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

@@ -1,7 +1,6 @@
 "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) {
@@ -35,7 +34,6 @@ const getHelp = () => {
     return `
 DESCRIPTION:
   A console program for quickly switching between branches
-VERSION: ${package_json_1.version}
 
 OPTIONS:
   help, -h, --h, --help

package/dist/commands/merge-branch.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeBranch = void 0;
+const exec_1 = require("./exec");
+const color_1 = require("../color");
+const inquirer_1 = __importDefault(require("inquirer"));
+//
+async function mergeBranch(branchName) {
+    if (!branchName) {
+        throw new Error('No branch...');
+    }
+    const currentBranch = await (0, exec_1.exec)('git rev-parse --abbrev-ref HEAD');
+    const message = [
+        color_1.clc._blue,
+        'Do you want to merge branch ',
+        color_1.clc._green,
+        branchName,
+        color_1.clc._blue,
+        ' into ',
+        color_1.clc._green,
+        currentBranch,
+        color_1.clc._blue,
+        '?',
+        color_1.clc._off,
+    ].join('');
+    const res = await inquirer_1.default.prompt({
+        type: 'confirm',
+        name: 'answer',
+        message,
+        default: false,
+    });
+    if (res.answer === true) {
+        const checkoutCommand = `git merge ${branchName}`;
+        console.log(' ' + color_1.clc.green('git merge', branchName) + '\n');
+        const checkoutCommandResult = await (0, exec_1.exec)(checkoutCommand);
+        console.log(checkoutCommandResult);
+        return;
+    }
+    console.log(color_1.clc.yellow('The branch was not merged'));
+}
+exports.mergeBranch = mergeBranch;

package/package.json

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

package/src/cli-commands/index.ts

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

package/src/commands/merge-branch.ts

@@ -1,5 +1,6 @@
 import { exec } from './exec';
 import { clc } from '../color';
+import inquirer from 'inquirer';
 
 //
 export async function mergeBranch(branchName: string) {
@@ -7,10 +8,39 @@ export async function mergeBranch(branchName: string) {
     throw new Error('No branch...');
   }
 
-  const checkoutCommand = `git merge ${branchName}`;
+  const currentBranch = await exec('git rev-parse --abbrev-ref HEAD');
 
-  console.log(' ' + clc.green('git merge', branchName) + '\n');
+  const message = [
+    clc._blue,
+    'Do you want to merge branch ',
+    clc._green,
+    branchName, // branch
+    clc._blue,
+    ' into ',
+    clc._green,
+    currentBranch, // branch
+    clc._blue,
+    '?',
+    clc._off,
+  ].join('');
 
-  const checkoutCommandResult = await exec(checkoutCommand);
-  console.log(checkoutCommandResult);
+  const res = await inquirer.prompt({
+    type: 'confirm',
+    name: 'answer',
+    message,
+    default: false,
+  });
+
+  if (res.answer === true) {
+    const checkoutCommand = `git merge ${branchName}`;
+
+    console.log(' ' + clc.green('git merge', branchName) + '\n');
+
+    const checkoutCommandResult = await exec(checkoutCommand);
+    console.log(checkoutCommandResult);
+
+    return;
+  }
+
+  console.log(clc.yellow('The branch was not merged'));
 }

package/dist/package.json

@@ -1,50 +0,0 @@
-{
-    "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/src/commands/merge-branch.js

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