@etsoo/shared 1.2.10 → 1.2.12

package/__tests__/ArrayUtils.ts

@@ -62,3 +62,62 @@ test('Tests for maxItem / minItem', () => {
     const emptyItems: { id: string; amount: number }[] = [];
     expect(emptyItems.maxItem('amount')).toBeUndefined();
 });
+
+test('Tests for sortIds 1', () => {
+    const source = [
+        {
+            id: 'zh-Hans',
+            label: '中文（简体）, Chinese (Simplified)'
+        },
+        {
+            id: 'en',
+            label: '英语, English'
+        },
+        {
+            id: 'fr',
+            label: '法语, French'
+        },
+        {
+            id: 'de',
+            label: '德语, German'
+        },
+        {
+            id: 'zh-Hant',
+            label: '中文（繁体）, Chinese (Traditional)'
+        }
+    ];
+    source.sortByProperty('id', ['en', 'zh-Hans', 'zh-Hant']);
+
+    const ids = source.map((s) => s.id);
+    expect(ids).toStrictEqual(['en', 'zh-Hans', 'zh-Hant', 'fr', 'de']);
+});
+
+test('Tests for sortIds 2', () => {
+    const source = [
+        { id: 'AUD', label: '澳元' },
+        { id: 'CAD', label: '加元' },
+        { id: 'CNY', label: '人民币' },
+        { id: 'EUR', label: '欧元' },
+        { id: 'GBP', label: '英镑' },
+        { id: 'HKD', label: '港币' },
+        { id: 'JPY', label: '日元' },
+        { id: 'NZD', label: '纽币' },
+        { id: 'SGD', label: '新币' },
+        { id: 'USD', label: '美元' }
+    ];
+    source.sortByProperty('id', ['USD', 'CNY']);
+
+    const ids = source.map((s) => s.id);
+    expect(ids).toStrictEqual([
+        'USD',
+        'CNY',
+        'AUD',
+        'CAD',
+        'EUR',
+        'GBP',
+        'HKD',
+        'JPY',
+        'NZD',
+        'SGD'
+    ]);
+});

package/lib/cjs/ArrayUtils.d.ts

@@ -27,6 +27,12 @@ declare global {
          * @param field Object field to calculate
          */
         minItem(field: T extends object ? DataTypes.Keys<T, number> : never): T | undefined;
+        /**
+         * Sort by property
+         * @param property Property
+         * @param values Property values
+         */
+        sortByProperty<P extends keyof T>(property: P, values: T[P][]): T[];
         /**
          * Sum number items or number item properties
          * @param field Object field to calculate

package/lib/cjs/ArrayUtils.js

@@ -41,6 +41,17 @@ Array.prototype.minItem = function (field) {
         return undefined;
     return this.reduce((prev, curr) => prev[field] < curr[field] ? prev : curr);
 };
+Array.prototype.sortByProperty = function (property, values) {
+    return this.sort((a, b) => {
+        const ai = values.indexOf(a[property]);
+        const bi = values.indexOf(b[property]);
+        if (ai === bi)
+            return 0;
+        if (ai < 0 || bi < 0)
+            return bi === 0 ? 1 : bi;
+        return ai - bi;
+    });
+};
 Array.prototype.sum = function (field) {
     if (field == null) {
         return this.reduce((total, num) => total + num, 0);

package/lib/mjs/ArrayUtils.d.ts

@@ -27,6 +27,12 @@ declare global {
          * @param field Object field to calculate
          */
         minItem(field: T extends object ? DataTypes.Keys<T, number> : never): T | undefined;
+        /**
+         * Sort by property
+         * @param property Property
+         * @param values Property values
+         */
+        sortByProperty<P extends keyof T>(property: P, values: T[P][]): T[];
         /**
          * Sum number items or number item properties
          * @param field Object field to calculate

package/lib/mjs/ArrayUtils.js

@@ -35,6 +35,17 @@ Array.prototype.minItem = function (field) {
         return undefined;
     return this.reduce((prev, curr) => prev[field] < curr[field] ? prev : curr);
 };
+Array.prototype.sortByProperty = function (property, values) {
+    return this.sort((a, b) => {
+        const ai = values.indexOf(a[property]);
+        const bi = values.indexOf(b[property]);
+        if (ai === bi)
+            return 0;
+        if (ai < 0 || bi < 0)
+            return bi === 0 ? 1 : bi;
+        return ai - bi;
+    });
+};
 Array.prototype.sum = function (field) {
     if (field == null) {
         return this.reduce((total, num) => total + num, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.2.10",
+    "version": "1.2.12",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/ArrayUtils.ts

@@ -50,6 +50,13 @@ declare global {
             field: T extends object ? DataTypes.Keys<T, number> : never
         ): T | undefined;
 
+        /**
+         * Sort by property
+         * @param property Property
+         * @param values Property values
+         */
+        sortByProperty<P extends keyof T>(property: P, values: T[P][]): T[];
+
         /**
          * Sum number items or number item properties
          * @param field Object field to calculate
@@ -134,6 +141,21 @@ Array.prototype.minItem = function <T>(
     );
 };
 
+Array.prototype.sortByProperty = function <T, P extends keyof T>(
+    this: Array<T>,
+    property: P,
+    values: T[P][]
+) {
+    return this.sort((a, b) => {
+        const ai = values.indexOf(a[property]);
+        const bi = values.indexOf(b[property]);
+
+        if (ai === bi) return 0;
+        if (ai < 0 || bi < 0) return bi === 0 ? 1 : bi;
+        return ai - bi;
+    });
+};
+
 Array.prototype.sum = function <T>(
     this: Array<T>,
     field: T extends object ? DataTypes.Keys<T, number> : undefined