@etsoo/shared 1.1.88 → 1.1.90

package/README.md

@@ -246,6 +246,7 @@ String and other related utilities
 |addBlankItem|Add blank item to collection|
 |arrayDifferences|Array 1 items do not exist in Array 2 or reverse match|
 |charsToNumber|Base64 chars to number|
+|containChinese|Check the input string contains Chinese character or not|
 |correctTypes|Correct object's property value type|
 |equals|Two values equal|
 |exclude|Exclude specific items|
@@ -271,6 +272,8 @@ String and other related utilities
 |replaceNullOrEmpty|Replace null or empty with default value|
 |setLabels|Set source with new labels|
 |snakeNameToWord|Snake name to works, 'snake_name' to 'Snake Name'|
+|sortByFavor|Sort array by favored values|
+|sortByFieldFavor|Sort array by favored field values|
 |trim|Trim chars|
 |trimEnd|Trim end chars|
 |trimStart|Trim start chars|

package/__tests__/Utils.ts

@@ -13,6 +13,14 @@ test('Tests for addBlankItem', () => {
     expect(options.length).toBe(3);
 });
 
+test('Tests for containChinese', () => {
+    expect('123 abC'.containChinese()).toBeFalsy();
+    expect('亿速思维'.containChinese()).toBeTruthy();
+    expect('亿速Etsoo'.containChinese()).toBeTruthy();
+    expect('김 민수'.containKorean()).toBeTruthy();
+    expect('ぁ-ん'.containJapanese()).toBeTruthy();
+});
+
 test('Tests for arrayDifferences', () => {
     const a1 = ['a', 'b', 'c', 'e'];
     const a2 = ['a', 'c', 'd'];
@@ -220,6 +228,29 @@ test('Tests for getResult', () => {
     expect(valueResult).toBe(5);
 });
 
+test('Tests for sortByFavor', () => {
+    const items = [1, 2, 3, 4, 5, 6, 7];
+    expect(Utils.sortByFavor(items, [5, 1, 3])).toStrictEqual([
+        5, 1, 3, 2, 4, 6, 7
+    ]);
+});
+
+test('Tests for sortByFieldFavor', () => {
+    const options = [
+        { id: 'a', name: 'a1' },
+        { id: 'b', name: 'b2' },
+        { id: 'c', name: 'c3' },
+        { id: 'd', name: 'd4' },
+        { id: 'e', name: 'e5' },
+        { id: 'f', name: 'f6' }
+    ];
+    expect(
+        Utils.sortByFieldFavor(options, 'id', ['e', 'a', 'c']).map(
+            (option) => option.name
+        )
+    ).toStrictEqual(['e5', 'a1', 'c3', 'b2', 'd4', 'f6']);
+});
+
 test('Tests for trim', () => {
     expect(Utils.trim('//a/', '/')).toBe('a');
     expect(Utils.trim('/*/a/', ...['/', '*'])).toBe('a');

package/lib/cjs/Utils.d.ts

@@ -1,9 +1,27 @@
 import { DataTypes } from './DataTypes';
 declare global {
     interface String {
+        /**
+         * Check the input string contains Chinese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containChinese(this: string): boolean;
+        /**
+         * Check the input string contains Korean character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containKorean(this: string): boolean;
+        /**
+         * Check the input string contains Japanese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containJapanese(this: string): boolean;
         /**
          * Format string with parameters
-         * @param this Template
+         * @param this Input template
          * @param parameters Parameters to fill the template
          */
         format(this: string, ...parameters: string[]): string;
@@ -236,6 +254,21 @@ export declare namespace Utils {
      * @param firstOnly Only convert the first word to upper case
      */
     const snakeNameToWord: (name: string, firstOnly?: boolean) => string;
+    /**
+     * Sort array by favored values
+     * @param items Items
+     * @param favored Favored values
+     * @returns Sorted array
+     */
+    const sortByFavor: <T>(items: T[], favored: T[]) => T[];
+    /**
+     * Sort array by favored field values
+     * @param items Items
+     * @param field Field to sort
+     * @param favored Favored field values
+     * @returns Sorted array
+     */
+    const sortByFieldFavor: <T, F extends keyof T>(items: T[], field: F, favored: T[F][]) => T[];
     /**
      * Trim chars
      * @param input Input string

package/lib/cjs/Utils.js

@@ -15,6 +15,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
 const DataTypes_1 = require("./DataTypes");
 const lodash_isequal_1 = __importDefault(require("lodash.isequal"));
+String.prototype.containChinese = function () {
+    const regExp = /[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]/g;
+    return regExp.test(this);
+};
+String.prototype.containKorean = function () {
+    const regExp = /[\uac00-\ud7af\u1100-\u11ff\u3130-\u318f\ua960-\ua97f\ud7b0-\ud7ff\u3400-\u4dbf]/g;
+    return regExp.test(this);
+};
+String.prototype.containJapanese = function () {
+    const regExp = /[\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf]/g;
+    return regExp.test(this);
+};
 String.prototype.format = function (...parameters) {
     let template = this;
     parameters.forEach((value, index) => {
@@ -475,6 +487,42 @@ var Utils;
         }
         return items.map((part) => part.formatInitial(true)).join(' ');
     };
+    function getSortValue(n1, n2) {
+        if (n1 === n2)
+            return 0;
+        if (n1 === -1)
+            return 1;
+        if (n2 === -1)
+            return -1;
+        return n1 - n2;
+    }
+    /**
+     * Sort array by favored values
+     * @param items Items
+     * @param favored Favored values
+     * @returns Sorted array
+     */
+    Utils.sortByFavor = (items, favored) => {
+        return items.sort((r1, r2) => {
+            const n1 = favored.indexOf(r1);
+            const n2 = favored.indexOf(r2);
+            return getSortValue(n1, n2);
+        });
+    };
+    /**
+     * Sort array by favored field values
+     * @param items Items
+     * @param field Field to sort
+     * @param favored Favored field values
+     * @returns Sorted array
+     */
+    Utils.sortByFieldFavor = (items, field, favored) => {
+        return items.sort((r1, r2) => {
+            const n1 = favored.indexOf(r1[field]);
+            const n2 = favored.indexOf(r2[field]);
+            return getSortValue(n1, n2);
+        });
+    };
     /**
      * Trim chars
      * @param input Input string

package/lib/mjs/Utils.d.ts

@@ -1,9 +1,27 @@
 import { DataTypes } from './DataTypes';
 declare global {
     interface String {
+        /**
+         * Check the input string contains Chinese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containChinese(this: string): boolean;
+        /**
+         * Check the input string contains Korean character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containKorean(this: string): boolean;
+        /**
+         * Check the input string contains Japanese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containJapanese(this: string): boolean;
         /**
          * Format string with parameters
-         * @param this Template
+         * @param this Input template
          * @param parameters Parameters to fill the template
          */
         format(this: string, ...parameters: string[]): string;
@@ -236,6 +254,21 @@ export declare namespace Utils {
      * @param firstOnly Only convert the first word to upper case
      */
     const snakeNameToWord: (name: string, firstOnly?: boolean) => string;
+    /**
+     * Sort array by favored values
+     * @param items Items
+     * @param favored Favored values
+     * @returns Sorted array
+     */
+    const sortByFavor: <T>(items: T[], favored: T[]) => T[];
+    /**
+     * Sort array by favored field values
+     * @param items Items
+     * @param field Field to sort
+     * @param favored Favored field values
+     * @returns Sorted array
+     */
+    const sortByFieldFavor: <T, F extends keyof T>(items: T[], field: F, favored: T[F][]) => T[];
     /**
      * Trim chars
      * @param input Input string

package/lib/mjs/Utils.js

@@ -9,6 +9,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { DataTypes } from './DataTypes';
 import isEqual from 'lodash.isequal';
+String.prototype.containChinese = function () {
+    const regExp = /[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]/g;
+    return regExp.test(this);
+};
+String.prototype.containKorean = function () {
+    const regExp = /[\uac00-\ud7af\u1100-\u11ff\u3130-\u318f\ua960-\ua97f\ud7b0-\ud7ff\u3400-\u4dbf]/g;
+    return regExp.test(this);
+};
+String.prototype.containJapanese = function () {
+    const regExp = /[\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf]/g;
+    return regExp.test(this);
+};
 String.prototype.format = function (...parameters) {
     let template = this;
     parameters.forEach((value, index) => {
@@ -469,6 +481,42 @@ export var Utils;
         }
         return items.map((part) => part.formatInitial(true)).join(' ');
     };
+    function getSortValue(n1, n2) {
+        if (n1 === n2)
+            return 0;
+        if (n1 === -1)
+            return 1;
+        if (n2 === -1)
+            return -1;
+        return n1 - n2;
+    }
+    /**
+     * Sort array by favored values
+     * @param items Items
+     * @param favored Favored values
+     * @returns Sorted array
+     */
+    Utils.sortByFavor = (items, favored) => {
+        return items.sort((r1, r2) => {
+            const n1 = favored.indexOf(r1);
+            const n2 = favored.indexOf(r2);
+            return getSortValue(n1, n2);
+        });
+    };
+    /**
+     * Sort array by favored field values
+     * @param items Items
+     * @param field Field to sort
+     * @param favored Favored field values
+     * @returns Sorted array
+     */
+    Utils.sortByFieldFavor = (items, field, favored) => {
+        return items.sort((r1, r2) => {
+            const n1 = favored.indexOf(r1[field]);
+            const n2 = favored.indexOf(r2[field]);
+            return getSortValue(n1, n2);
+        });
+    };
     /**
      * Trim chars
      * @param input Input string

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.88",
+    "version": "1.1.90",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,12 +54,12 @@
     },
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "devDependencies": {
-        "@types/jest": "^29.2.5",
+        "@types/jest": "^29.4.0",
         "@types/lodash.isequal": "^4.5.6",
-        "jest": "^29.3.1",
-        "jest-environment-jsdom": "^29.3.1",
-        "ts-jest": "^29.0.4",
-        "typescript": "^4.9.4"
+        "jest": "^29.5.0",
+        "jest-environment-jsdom": "^29.5.0",
+        "ts-jest": "^29.0.5",
+        "typescript": "^4.9.5"
     },
     "dependencies": {
         "lodash.isequal": "^4.5.0"

package/src/Utils.ts

@@ -3,9 +3,30 @@ import isEqual from 'lodash.isequal';
 
 declare global {
     interface String {
+        /**
+         * Check the input string contains Chinese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containChinese(this: string): boolean;
+
+        /**
+         * Check the input string contains Korean character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containKorean(this: string): boolean;
+
+        /**
+         * Check the input string contains Japanese character or not
+         * @param this Input
+         * @param test Test string
+         */
+        containJapanese(this: string): boolean;
+
         /**
          * Format string with parameters
-         * @param this Template
+         * @param this Input template
          * @param parameters Parameters to fill the template
          */
         format(this: string, ...parameters: string[]): string;
@@ -51,6 +72,23 @@ declare global {
     }
 }
 
+String.prototype.containChinese = function (this: string): boolean {
+    const regExp =
+        /[\u3040-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff66-\uff9f]/g;
+    return regExp.test(this);
+};
+
+String.prototype.containKorean = function (this: string): boolean {
+    const regExp =
+        /[\uac00-\ud7af\u1100-\u11ff\u3130-\u318f\ua960-\ua97f\ud7b0-\ud7ff\u3400-\u4dbf]/g;
+    return regExp.test(this);
+};
+
+String.prototype.containJapanese = function (this: string): boolean {
+    const regExp = /[\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf]/g;
+    return regExp.test(this);
+};
+
 String.prototype.format = function (
     this: string,
     ...parameters: string[]
@@ -623,6 +661,46 @@ export namespace Utils {
         return items.map((part) => part.formatInitial(true)).join(' ');
     };
 
+    function getSortValue(n1: number, n2: number) {
+        if (n1 === n2) return 0;
+        if (n1 === -1) return 1;
+        if (n2 === -1) return -1;
+        return n1 - n2;
+    }
+
+    /**
+     * Sort array by favored values
+     * @param items Items
+     * @param favored Favored values
+     * @returns Sorted array
+     */
+    export const sortByFavor = <T>(items: T[], favored: T[]) => {
+        return items.sort((r1, r2) => {
+            const n1 = favored.indexOf(r1);
+            const n2 = favored.indexOf(r2);
+            return getSortValue(n1, n2);
+        });
+    };
+
+    /**
+     * Sort array by favored field values
+     * @param items Items
+     * @param field Field to sort
+     * @param favored Favored field values
+     * @returns Sorted array
+     */
+    export const sortByFieldFavor = <T, F extends keyof T>(
+        items: T[],
+        field: F,
+        favored: T[F][]
+    ) => {
+        return items.sort((r1, r2) => {
+            const n1 = favored.indexOf(r1[field]);
+            const n2 = favored.indexOf(r2[field]);
+            return getSortValue(n1, n2);
+        });
+    };
+
     /**
      * Trim chars
      * @param input Input string