@etsoo/shared 1.2.11 → 1.2.12

package/__tests__/ArrayUtils.ts

@@ -63,7 +63,7 @@ test('Tests for maxItem / minItem', () => {
     expect(emptyItems.maxItem('amount')).toBeUndefined();
 });
 
-test('Tests for sortIds', () => {
+test('Tests for sortIds 1', () => {
     const source = [
         {
             id: 'zh-Hans',
@@ -91,3 +91,33 @@ test('Tests for sortIds', () => {
     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.js

@@ -47,12 +47,9 @@ Array.prototype.sortByProperty = function (property, values) {
         const bi = values.indexOf(b[property]);
         if (ai === bi)
             return 0;
-        if (ai < 0)
-            return bi;
-        else if (bi < 0)
-            return -ai;
-        else
-            return ai - bi;
+        if (ai < 0 || bi < 0)
+            return bi === 0 ? 1 : bi;
+        return ai - bi;
     });
 };
 Array.prototype.sum = function (field) {

package/lib/mjs/ArrayUtils.js

@@ -41,12 +41,9 @@ Array.prototype.sortByProperty = function (property, values) {
         const bi = values.indexOf(b[property]);
         if (ai === bi)
             return 0;
-        if (ai < 0)
-            return bi;
-        else if (bi < 0)
-            return -ai;
-        else
-            return ai - bi;
+        if (ai < 0 || bi < 0)
+            return bi === 0 ? 1 : bi;
+        return ai - bi;
     });
 };
 Array.prototype.sum = function (field) {

package/package.json

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

package/src/ArrayUtils.ts

@@ -151,9 +151,8 @@ Array.prototype.sortByProperty = function <T, P extends keyof T>(
         const bi = values.indexOf(b[property]);
 
         if (ai === bi) return 0;
-        if (ai < 0) return bi;
-        else if (bi < 0) return -ai;
-        else return ai - bi;
+        if (ai < 0 || bi < 0) return bi === 0 ? 1 : bi;
+        return ai - bi;
     });
 };