avil13-co 2.1.5 → 2.1.6

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avil13-co",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "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;
 }