@etsoo/shared 1.2.11 → 1.2.13

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/__tests__/ExtendUtils.ts

@@ -27,19 +27,15 @@ test('Tests for delayedExecutor', () => {
     // Arrange
     const f = jest.fn();
 
-    jest.useFakeTimers();
-    jest.spyOn(global, 'setTimeout');
-
     const e = ExtendUtils.delayedExecutor(f, 50);
 
     e.call(1, false, 'a');
     expect(e.isRunning()).toBeTruthy();
 
     e.call(2, true, 'b');
-    expect(setTimeout).toHaveBeenCalledTimes(2);
 
-    jest.runOnlyPendingTimers();
-    expect(f).toBeCalledTimes(1);
+    expect(f).toBeCalledTimes(0);
+    e.clear();
     expect(e.isRunning()).toBeFalsy();
 });
 

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/cjs/ExtendUtils.d.ts

@@ -27,4 +27,12 @@ export declare namespace ExtendUtils {
      * @param delay Delay miniseconds
      */
     function sleep(delay?: number): Promise<unknown>;
+    /**
+     * Wait for condition meets and execute callback
+     * requestAnimationFrame to replace setTimeout
+     * @param callback Callback
+     * @param checkReady Check ready, when it's a number, similar to setTimeout
+     * @returns cancel callback
+     */
+    function waitFor(callback: () => void, checkReady: ((spanTime: number) => boolean) | number): () => void;
 }

package/lib/cjs/ExtendUtils.js

@@ -30,7 +30,7 @@ var ExtendUtils;
      * @returns Result
      */
     function delayedExecutor(func, delayMiliseconds) {
-        let seed = 0;
+        let cancel;
         return {
             /**
              * Call the function
@@ -39,18 +39,19 @@ var ExtendUtils;
              */
             call(miliseconds, ...args) {
                 this.clear();
-                seed = window.setTimeout((...args) => {
+                cancel = waitFor(() => {
                     func(...args);
-                    seed = 0;
-                }, miliseconds !== null && miliseconds !== void 0 ? miliseconds : delayMiliseconds, ...args);
+                    cancel = undefined;
+                }, miliseconds !== null && miliseconds !== void 0 ? miliseconds : delayMiliseconds);
             },
             /**
              * Clear
              */
             clear() {
                 if (this.isRunning()) {
-                    window.clearTimeout(seed);
-                    seed = 0;
+                    if (cancel)
+                        cancel();
+                    cancel = undefined;
                 }
             },
             /**
@@ -58,7 +59,7 @@ var ExtendUtils;
              * @returns Result
              */
             isRunning() {
-                return seed > 0;
+                return cancel != null;
             }
         };
     }
@@ -76,8 +77,46 @@ var ExtendUtils;
      */
     function sleep(delay = 0) {
         return new Promise((resolve) => {
-            setTimeout(resolve, delay);
+            waitFor(() => resolve, delay);
         });
     }
     ExtendUtils.sleep = sleep;
+    /**
+     * Wait for condition meets and execute callback
+     * requestAnimationFrame to replace setTimeout
+     * @param callback Callback
+     * @param checkReady Check ready, when it's a number, similar to setTimeout
+     * @returns cancel callback
+     */
+    function waitFor(callback, checkReady) {
+        let startTime;
+        let requestID;
+        function doWait(time) {
+            // Reset request id
+            requestID = undefined;
+            // First time
+            if (startTime == null)
+                startTime = time;
+            // Ignore
+            if (startTime === 0)
+                return;
+            const spanTime = startTime == null || time == null ? 0 : time - startTime;
+            if (time != null &&
+                (typeof checkReady === 'number'
+                    ? spanTime >= checkReady
+                    : checkReady(spanTime))) {
+                callback();
+            }
+            else {
+                requestID = requestAnimationFrame(doWait);
+            }
+        }
+        doWait();
+        return () => {
+            if (requestID)
+                cancelAnimationFrame(requestID);
+            startTime = undefined;
+        };
+    }
+    ExtendUtils.waitFor = waitFor;
 })(ExtendUtils || (exports.ExtendUtils = ExtendUtils = {}));

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/lib/mjs/ExtendUtils.d.ts

@@ -27,4 +27,12 @@ export declare namespace ExtendUtils {
      * @param delay Delay miniseconds
      */
     function sleep(delay?: number): Promise<unknown>;
+    /**
+     * Wait for condition meets and execute callback
+     * requestAnimationFrame to replace setTimeout
+     * @param callback Callback
+     * @param checkReady Check ready, when it's a number, similar to setTimeout
+     * @returns cancel callback
+     */
+    function waitFor(callback: () => void, checkReady: ((spanTime: number) => boolean) | number): () => void;
 }

package/lib/mjs/ExtendUtils.js

@@ -27,7 +27,7 @@ export var ExtendUtils;
      * @returns Result
      */
     function delayedExecutor(func, delayMiliseconds) {
-        let seed = 0;
+        let cancel;
         return {
             /**
              * Call the function
@@ -36,18 +36,19 @@ export var ExtendUtils;
              */
             call(miliseconds, ...args) {
                 this.clear();
-                seed = window.setTimeout((...args) => {
+                cancel = waitFor(() => {
                     func(...args);
-                    seed = 0;
-                }, miliseconds !== null && miliseconds !== void 0 ? miliseconds : delayMiliseconds, ...args);
+                    cancel = undefined;
+                }, miliseconds !== null && miliseconds !== void 0 ? miliseconds : delayMiliseconds);
             },
             /**
              * Clear
              */
             clear() {
                 if (this.isRunning()) {
-                    window.clearTimeout(seed);
-                    seed = 0;
+                    if (cancel)
+                        cancel();
+                    cancel = undefined;
                 }
             },
             /**
@@ -55,7 +56,7 @@ export var ExtendUtils;
              * @returns Result
              */
             isRunning() {
-                return seed > 0;
+                return cancel != null;
             }
         };
     }
@@ -73,8 +74,46 @@ export var ExtendUtils;
      */
     function sleep(delay = 0) {
         return new Promise((resolve) => {
-            setTimeout(resolve, delay);
+            waitFor(() => resolve, delay);
         });
     }
     ExtendUtils.sleep = sleep;
+    /**
+     * Wait for condition meets and execute callback
+     * requestAnimationFrame to replace setTimeout
+     * @param callback Callback
+     * @param checkReady Check ready, when it's a number, similar to setTimeout
+     * @returns cancel callback
+     */
+    function waitFor(callback, checkReady) {
+        let startTime;
+        let requestID;
+        function doWait(time) {
+            // Reset request id
+            requestID = undefined;
+            // First time
+            if (startTime == null)
+                startTime = time;
+            // Ignore
+            if (startTime === 0)
+                return;
+            const spanTime = startTime == null || time == null ? 0 : time - startTime;
+            if (time != null &&
+                (typeof checkReady === 'number'
+                    ? spanTime >= checkReady
+                    : checkReady(spanTime))) {
+                callback();
+            }
+            else {
+                requestID = requestAnimationFrame(doWait);
+            }
+        }
+        doWait();
+        return () => {
+            if (requestID)
+                cancelAnimationFrame(requestID);
+            startTime = undefined;
+        };
+    }
+    ExtendUtils.waitFor = waitFor;
 })(ExtendUtils || (ExtendUtils = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.2.11",
+    "version": "1.2.13",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,10 +54,10 @@
     },
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "devDependencies": {
-        "@types/jest": "^29.5.4",
+        "@types/jest": "^29.5.5",
         "@types/lodash.isequal": "^4.5.6",
-        "jest": "^29.6.4",
-        "jest-environment-jsdom": "^29.6.4",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
         "ts-jest": "^29.1.1",
         "typescript": "^5.2.2"
     },

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;
     });
 };
 

package/src/ExtendUtils.ts

@@ -31,7 +31,7 @@ export namespace ExtendUtils {
         func: (...args: P) => void,
         delayMiliseconds: number
     ): DelayedExecutorType<P> {
-        let seed: number = 0;
+        let cancel: (() => void) | undefined;
         return {
             /**
              * Call the function
@@ -40,14 +40,10 @@ export namespace ExtendUtils {
              */
             call(miliseconds?: number, ...args: P) {
                 this.clear();
-                seed = window.setTimeout(
-                    (...args: P) => {
-                        func(...args);
-                        seed = 0;
-                    },
-                    miliseconds ?? delayMiliseconds,
-                    ...args
-                );
+                cancel = waitFor(() => {
+                    func(...args);
+                    cancel = undefined;
+                }, miliseconds ?? delayMiliseconds);
             },
 
             /**
@@ -55,8 +51,8 @@ export namespace ExtendUtils {
              */
             clear() {
                 if (this.isRunning()) {
-                    window.clearTimeout(seed);
-                    seed = 0;
+                    if (cancel) cancel();
+                    cancel = undefined;
                 }
             },
 
@@ -65,7 +61,7 @@ export namespace ExtendUtils {
              * @returns Result
              */
             isRunning() {
-                return seed > 0;
+                return cancel != null;
             }
         };
     }
@@ -85,7 +81,52 @@ export namespace ExtendUtils {
      */
     export function sleep(delay = 0) {
         return new Promise((resolve) => {
-            setTimeout(resolve, delay);
+            waitFor(() => resolve, delay);
         });
     }
+
+    /**
+     * Wait for condition meets and execute callback
+     * requestAnimationFrame to replace setTimeout
+     * @param callback Callback
+     * @param checkReady Check ready, when it's a number, similar to setTimeout
+     * @returns cancel callback
+     */
+    export function waitFor(
+        callback: () => void,
+        checkReady: ((spanTime: number) => boolean) | number
+    ) {
+        let startTime: number | undefined;
+        let requestID: number | undefined;
+        function doWait(time?: number) {
+            // Reset request id
+            requestID = undefined;
+
+            // First time
+            if (startTime == null) startTime = time;
+
+            // Ignore
+            if (startTime === 0) return;
+
+            const spanTime =
+                startTime == null || time == null ? 0 : time - startTime;
+            if (
+                time != null &&
+                (typeof checkReady === 'number'
+                    ? spanTime >= checkReady
+                    : checkReady(spanTime))
+            ) {
+                callback();
+            } else {
+                requestID = requestAnimationFrame(doWait);
+            }
+        }
+
+        doWait();
+
+        return () => {
+            if (requestID) cancelAnimationFrame(requestID);
+            startTime = undefined;
+        };
+    }
 }