avil13-co 2.1.5 → 2.2.0

package/dist/ask.d.ts

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

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.checkItem = exports.ask = void 0;
+exports.sortOrder = exports.checkItem = exports.ask = void 0;
 const inquirer_1 = __importDefault(require("inquirer"));
 inquirer_1.default.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
 const specSymbols = {
@@ -35,11 +35,18 @@ function checkItem(item, filterString) {
 }
 exports.checkItem = checkItem;
 function sortOrder(searchString, name1, name2) {
-    if (name2.indexOf(searchString) < name1.indexOf(searchString)) {
+    if (!name1.includes(searchString)) {
+        return 1;
+    }
+    if (!name2.includes(searchString)) {
         return -1;
     }
-    return 1;
+    if ((name2.indexOf(searchString) < name1.indexOf(searchString))) {
+        return 1;
+    }
+    return -1;
 }
+exports.sortOrder = sortOrder;
 function getRegExp(filterString) {
     return new RegExp(filterString.split('').map(s => s.trim()).filter(Boolean).join('.*').replace('.*.*', '.*'), 'gi');
 }

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

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

package/dist/cli-commands/index.js

@@ -7,8 +7,9 @@ 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[Commands["MergeBranch"] = 4] = "MergeBranch";
+    Commands[Commands["ShowMerged"] = 8] = "ShowMerged";
+    Commands[Commands["ShowUnMerged"] = 16] = "ShowUnMerged";
 })(Commands = exports.Commands || (exports.Commands = {}));
 ;
 const getWishOfUser = (firstArg) => {
@@ -16,11 +17,13 @@ const getWishOfUser = (firstArg) => {
     switch (true) {
         case ['help', '-h', '--h', '--help'].includes(arg):
             return Commands.Help;
+        case ['-M', 'merge'].includes(arg):
+            return Commands.MergeBranch;
         case ['-D', 'rm'].includes(arg):
             return Commands.DeleteBranch;
-        case ['m', '-m', 'merged'].includes(arg):
+        case ['-sm', '--show-merged'].includes(arg):
             return Commands.ShowMerged;
-        case ['un', '--no-merged'].includes(arg):
+        case ['-un', '--no-merged'].includes(arg):
             return Commands.ShowUnMerged;
         default:
             return Commands.Unknown;
@@ -36,10 +39,13 @@ OPTIONS:
   help, -h, --h, --help
     Showing this message
 
-  m, -m, merged
+  -M, merge
+    Merge branch
+
+  -sm, --show-merged
     Showing merged branches
 
-  un, -un, --no-merged
+  -un, --no-merged
     Showing not merged branches
 
   -D, rm

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

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

package/dist/commands/merge-branch.js

@@ -0,0 +1,16 @@
+"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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avil13-co",
-  "version": "2.1.5",
+  "version": "2.2.0",
   "description": "",
   "main": "dist/index.js",
   "public": true,
@@ -44,6 +44,7 @@
     "@types/inquirer": "^8.2.1",
     "@types/node": "^17.0.23",
     "ts-node": "^10.7.0",
-    "typescript": "^4.6.3"
+    "typescript": "^4.6.3",
+    "vitest": "^0.10.0"
   }
 }

package/src/__tests__/ask.spec.ts

@@ -0,0 +1,30 @@
+import { expect, it } from 'vitest';
+import { sortOrder } from '../ask';
+
+it('should ', () => {
+  const list = [
+    'chore/EDODEV-10449-act-master',
+    'chore/release-to-master',
+    'master',
+    'feature/EDODEV-8692-migration-to-edox-vue-components',
+    'feature/EDODEV-9416-sms-paste',
+    'hotfix/EDO-14065-logout-in-main-site',
+    'chore/EDODEV-remove-e-card-style',
+  ];
+  const etalon = [
+    'master',
+    'chore/release-to-master',
+    'chore/EDODEV-10449-act-master',
+    'feature/EDODEV-8692-migration-to-edox-vue-components',
+    'feature/EDODEV-9416-sms-paste',
+    'hotfix/EDO-14065-logout-in-main-site',
+    'chore/EDODEV-remove-e-card-style',
+  ];
+
+  const sortString = 'maste';
+
+  const sortedList = list.sort((a, b) => sortOrder(sortString, a, b));
+
+  expect(sortedList).toEqual(etalon);
+});
+

package/src/ask.ts

@@ -38,12 +38,19 @@ export function checkItem(item: string, filterString: string): boolean {
   return reg.test(item);
 }
 
-function sortOrder(searchString: string, name1: string, name2: string): -1 | 1 {
-  if (name2.indexOf(searchString) < name1.indexOf(searchString)) {
+export function sortOrder(searchString: string, name1: string, name2: string): -1 | 1 {
+  if (!name1.includes(searchString)) {
+    return 1;
+  }
+  if (!name2.includes(searchString)) {
     return -1;
   }
 
-  return 1;
+  if ((name2.indexOf(searchString) < name1.indexOf(searchString))) {
+    return 1;
+  }
+
+  return -1;
 }
 
 

package/src/cli-commands/index.ts

@@ -3,11 +3,12 @@ import { clc } from '../color';
 const args = process.argv.slice(2);
 
 export enum Commands {
-  Unknown,
-  Help,
-  DeleteBranch,
-  ShowMerged,
-  ShowUnMerged,
+  Unknown = 0,
+  Help = 1,
+  DeleteBranch = 2,
+  MergeBranch = 4,
+  ShowMerged = 8,
+  ShowUnMerged = 16,
 };
 
 export const getWishOfUser = (firstArg?: string): Commands => {
@@ -17,13 +18,16 @@ export const getWishOfUser = (firstArg?: string): Commands => {
     case ['help', '-h', '--h', '--help'].includes(arg):
       return Commands.Help;
 
+    case ['-M', 'merge'].includes(arg):
+      return Commands.MergeBranch;
+
     case ['-D', 'rm'].includes(arg):
       return Commands.DeleteBranch;
 
-    case ['m', '-m', 'merged'].includes(arg):
+    case ['-sm', '--show-merged'].includes(arg):
       return Commands.ShowMerged;
 
-    case ['un', '--no-merged'].includes(arg):
+    case ['-un', '--no-merged'].includes(arg):
       return Commands.ShowUnMerged;
 
     default:
@@ -41,10 +45,13 @@ OPTIONS:
   help, -h, --h, --help
     Showing this message
 
-  m, -m, merged
+  -M, merge
+    Merge branch
+
+  -sm, --show-merged
     Showing merged branches
 
-  un, -un, --no-merged
+  -un, --no-merged
     Showing not merged branches
 
   -D, rm

package/src/commands/merge-branch.ts

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