@whitesev/utils 2.5.6 → 2.5.7

package/dist/index.esm.js

@@ -4139,7 +4139,7 @@ class Utils {
         this.windowApi = new WindowApi(option);
     }
     /** 版本号 */
-    version = "2024.12.25";
+    version = "2025.1.1";
     addStyle(cssText) {
         if (typeof cssText !== "string") {
             throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -6753,6 +6753,39 @@ class Utils {
             await UtilsContext.tryCatch(index, item).run(handleFunc);
         }));
     }
+    wait(checkFn, timeout, parent) {
+        const UtilsContext = this;
+        let __timeout__ = typeof timeout === "number" ? timeout : 0;
+        return new Promise((resolve) => {
+            let observer = UtilsContext.mutationObserver(parent || UtilsContext.windowApi.document, {
+                config: {
+                    subtree: true,
+                    childList: true,
+                    attributes: true,
+                },
+                immediate: true,
+                callback(mutations, __observer__) {
+                    let result = checkFn();
+                    if (result.success) {
+                        // 取消观察器
+                        if (typeof __observer__?.disconnect === "function") {
+                            __observer__.disconnect();
+                        }
+                        resolve(result.data);
+                    }
+                },
+            });
+            if (__timeout__ > 0) {
+                setTimeout(() => {
+                    // 取消观察器
+                    if (typeof observer?.disconnect === "function") {
+                        observer.disconnect();
+                    }
+                    resolve(null);
+                }, __timeout__);
+            }
+        });
+    }
     waitNode(...args) {
         // 过滤掉undefined
         args = args.filter((arg) => arg !== void 0);
@@ -6763,8 +6796,10 @@ class Utils {
         let parent = UtilsContext.windowApi.document;
         // 超时时间
         let timeout = 0;
-        if (typeof args[0] !== "string" && !Array.isArray(args[0])) {
-            throw new TypeError("Utils.waitNode 第一个参数必须是string|string[]");
+        if (typeof args[0] !== "string" &&
+            !Array.isArray(args[0]) &&
+            typeof args[0] !== "function") {
+            throw new TypeError("Utils.waitNode 第一个参数必须是string|string[]|Function");
         }
         if (args.length === 1) ;
         else if (args.length === 2) {
@@ -6804,53 +6839,41 @@ class Utils {
         else {
             throw new TypeError("Utils.waitNode 参数个数错误");
         }
-        return new Promise((resolve) => {
-            function getNode() {
-                if (Array.isArray(selector)) {
-                    let result = [];
-                    for (let index = 0; index < selector.length; index++) {
-                        let node = parent.querySelector(selector[index]);
-                        if (node) {
-                            result.push(node);
-                        }
-                    }
-                    if (result.length === selector.length) {
-                        return result;
+        function getNode() {
+            if (Array.isArray(selector)) {
+                let result = [];
+                for (let index = 0; index < selector.length; index++) {
+                    let node = parent.querySelector(selector[index]);
+                    if (node) {
+                        result.push(node);
                     }
                 }
-                else {
-                    return parent.querySelector(selector);
+                if (result.length === selector.length) {
+                    return result;
                 }
             }
-            var observer = UtilsContext.mutationObserver(parent, {
-                config: {
-                    subtree: true,
-                    childList: true,
-                    attributes: true,
-                },
-                callback() {
-                    let node = getNode();
-                    if (node) {
-                        // 取消观察器
-                        if (typeof observer?.disconnect === "function") {
-                            observer.disconnect();
-                        }
-                        resolve(node);
-                        return;
-                    }
-                },
-                immediate: true,
-            });
-            if (timeout > 0) {
-                setTimeout(() => {
-                    // 取消观察器
-                    if (typeof observer?.disconnect === "function") {
-                        observer.disconnect();
-                    }
-                    resolve(null);
-                }, timeout);
+            else if (typeof selector === "function") {
+                return selector();
             }
-        });
+            else {
+                return parent.querySelector(selector);
+            }
+        }
+        return UtilsContext.wait(() => {
+            let node = getNode();
+            if (node) {
+                return {
+                    success: true,
+                    data: node,
+                };
+            }
+            else {
+                return {
+                    success: false,
+                    data: node,
+                };
+            }
+        }, timeout, parent);
     }
     waitAnyNode(...args) {
         // 过滤掉undefined
@@ -6959,57 +6982,41 @@ class Utils {
         else {
             throw new TypeError("Utils.waitNodeList 参数个数错误");
         }
-        return new Promise((resolve) => {
-            function getNodeList() {
-                if (Array.isArray(selector)) {
-                    let result = [];
-                    for (let index = 0; index < selector.length; index++) {
-                        let nodeList = parent.querySelectorAll(selector[index]);
-                        if (nodeList.length) {
-                            result.push(nodeList);
-                        }
-                    }
-                    if (result.length === selector.length) {
-                        return result;
-                    }
-                }
-                else {
-                    let nodeList = parent.querySelectorAll(selector);
+        function getNodeList() {
+            if (Array.isArray(selector)) {
+                let result = [];
+                for (let index = 0; index < selector.length; index++) {
+                    let nodeList = parent.querySelectorAll(selector[index]);
                     if (nodeList.length) {
-                        return nodeList;
+                        result.push(nodeList);
                     }
                 }
+                if (result.length === selector.length) {
+                    return result;
+                }
             }
-            var observer = UtilsContext.mutationObserver(parent, {
-                config: {
-                    subtree: true,
-                    childList: true,
-                    attributes: true,
-                },
-                callback() {
-                    let node = getNodeList();
-                    if (node) {
-                        // 取消观察器
-                        try {
-                            observer.disconnect();
-                        }
-                        catch (error) { }
-                        resolve(node);
-                        return;
-                    }
-                },
-                immediate: true,
-            });
-            if (timeout > 0) {
-                setTimeout(() => {
-                    // 取消观察器
-                    if (typeof observer?.disconnect === "function") {
-                        observer.disconnect();
-                    }
-                    resolve(null);
-                }, timeout);
+            else {
+                let nodeList = parent.querySelectorAll(selector);
+                if (nodeList.length) {
+                    return nodeList;
+                }
             }
-        });
+        }
+        return UtilsContext.wait(() => {
+            let node = getNodeList();
+            if (node) {
+                return {
+                    success: true,
+                    data: node,
+                };
+            }
+            else {
+                return {
+                    success: false,
+                    data: node,
+                };
+            }
+        }, timeout, parent);
     }
     waitAnyNodeList(...args) {
         // 过滤掉undefined