@whitesev/utils 2.9.10 → 2.9.12

package/dist/index.esm.js

@@ -237,7 +237,7 @@ const clearTimeout$1 = (timerId) => loadOrReturnBroker().clearTimeout(timerId);
 const setInterval = (...args) => loadOrReturnBroker().setInterval(...args);
 const setTimeout$1 = (...args) => loadOrReturnBroker().setTimeout(...args);
 
-const version = "2.9.10";
+const version = "2.9.12";
 
 /* eslint-disable */
 // ==UserScript==
@@ -1471,40 +1471,55 @@ class CommonUtil {
     isNull(...args) {
         let result = true;
         const checkList = [...args];
-        for (const objItem of checkList) {
-            let itemResult = false;
-            if (objItem === null || objItem === undefined) {
-                itemResult = true;
+        for (const obj of checkList) {
+            let flag = false;
+            if (obj === null || obj === undefined) {
+                // null undefined
+                flag = true;
             }
             else {
-                switch (typeof objItem) {
+                switch (typeof obj) {
                     case "object":
-                        if (typeof objItem[Symbol.iterator] === "function") {
-                            /* 可迭代 */
-                            itemResult = objItem.length === 0;
+                        if (typeof obj[Symbol.iterator] === "function") {
+                            // 可迭代
+                            // Map Array NodeList HTMLCollection
+                            if (obj instanceof Map) {
+                                flag = obj.size === 0;
+                            }
+                            else {
+                                const length = obj.length;
+                                if (typeof length === "number") {
+                                    flag = length === 0;
+                                }
+                            }
                         }
                         else {
-                            itemResult = Object.keys(objItem).length === 0;
+                            if (obj?.toString() === "[object Object]") {
+                                // {}
+                                flag = Object.keys(obj).length === 0;
+                            }
                         }
                         break;
                     case "number":
-                        itemResult = objItem === 0;
+                        flag = isNaN(obj) ? true : obj === 0;
                         break;
-                    case "string":
-                        itemResult = objItem.trim() === "" || objItem === "null" || objItem === "undefined";
+                    case "string": {
+                        const trimStr = obj.trim();
+                        flag = trimStr.trim() === "" || trimStr === "null" || trimStr === "undefined";
                         break;
+                    }
                     case "boolean":
-                        itemResult = !objItem;
+                        flag = !obj;
                         break;
                     case "function": {
-                        const funcStr = objItem.toString().replace(/\s/g, "");
+                        const funcStr = obj.toString().replace(/\s/g, "");
                         /* 排除()=>{}、(xxx="")=>{}、function(){}、function(xxx=""){} */
-                        itemResult = Boolean(funcStr.match(/^\(.*?\)=>\{\}$|^function.*?\(.*?\)\{\}$/));
+                        flag = Boolean(funcStr.match(/^\(.*?\)=>\{\}$|^function.*?\(.*?\)\{\}$/));
                         break;
                     }
                 }
             }
-            result = result && itemResult;
+            result = result && flag;
         }
         return result;
     }
@@ -5038,29 +5053,30 @@ class GMMenu {
         },
     };
     /**
-     * @param details 菜单配置
+     * @param constructOptions 菜单配置
      */
-    constructor(details) {
-        this.GM_Api.getValue = details.GM_getValue;
-        this.GM_Api.setValue = details.GM_setValue;
-        this.GM_Api.registerMenuCommand = details.GM_registerMenuCommand;
-        this.GM_Api.unregisterMenuCommand = details.GM_unregisterMenuCommand;
-        this.MenuHandle.$default.autoReload = typeof details.autoReload === "boolean" ? details.autoReload : true;
+    constructor(constructOptions) {
+        this.GM_Api.getValue = constructOptions.GM_getValue;
+        this.GM_Api.setValue = constructOptions.GM_setValue;
+        this.GM_Api.registerMenuCommand = constructOptions.GM_registerMenuCommand;
+        this.GM_Api.unregisterMenuCommand = constructOptions.GM_unregisterMenuCommand;
+        this.MenuHandle.$default.autoReload =
+            typeof constructOptions.autoReload === "boolean" ? constructOptions.autoReload : true;
         for (const keyName of Object.keys(this.GM_Api)) {
             if (typeof this.GM_Api[keyName] !== "function") {
                 throw new Error(`Utils.GM_Menu 请在脚本开头加上 @grant  ${keyName}，且传入该对象`);
             }
         }
-        this.add(details?.data || []);
+        this.add(constructOptions?.data || []);
     }
     /**
      * 新增菜单数据
-     * @param menuOption
+     * @param options
      */
-    __add(menuOption) {
-        if (Array.isArray(menuOption)) {
-            for (let index = 0; index < menuOption.length; index++) {
-                const option = menuOption[index];
+    __add(options) {
+        if (Array.isArray(options)) {
+            for (let index = 0; index < options.length; index++) {
+                const option = options[index];
                 this.MenuHandle.$data.data.push({
                     data: option,
                     id: void 0,
@@ -5069,7 +5085,7 @@ class GMMenu {
         }
         else {
             this.MenuHandle.$data.data.push({
-                data: menuOption,
+                data: options,
                 id: void 0,
             });
         }
@@ -5078,11 +5094,21 @@ class GMMenu {
      * 新增菜单数据
      *
      * 自动调用.update()
-     * @param menuOption
+     * @param options
      */
-    add(menuOption) {
-        this.__add(menuOption);
+    add(options) {
+        this.__add(options);
         this.update();
+        return {
+            destory: () => {
+                if (!Array.isArray(options)) {
+                    options = [options];
+                }
+                options.forEach((option) => {
+                    this.delete(option.key);
+                });
+            },
+        };
     }
     /**
      * 更新菜单数据
@@ -5102,14 +5128,14 @@ class GMMenu {
         else if (options != null) {
             menuOptionList = [...menuOptionList, options];
         }
-        menuOptionList.forEach((menuOption) => {
-            const oldMenuOption = this.MenuHandle.getMenuOption(menuOption.key);
+        menuOptionList.forEach((option) => {
+            const oldMenuOption = this.MenuHandle.getMenuOption(option.key);
             if (oldMenuOption) {
                 // 覆盖
-                Object.assign(oldMenuOption, menuOption);
+                Object.assign(oldMenuOption, option);
             }
             else {
-                this.__add(menuOption);
+                this.__add(option);
             }
         });
         this.MenuHandle.$data.data.forEach((value) => {
@@ -5122,9 +5148,15 @@ class GMMenu {
     }
     /**
      * 卸载菜单
-     * @param menuId 已注册的菜单id
+     * @param menuId 已注册的菜单id或者键名
      */
     delete(menuId) {
+        if (typeof menuId === "string") {
+            const __menuId = this.getMenuId(menuId);
+            if (__menuId != null) {
+                menuId = __menuId;
+            }
+        }
         this.GM_Api.unregisterMenuCommand(menuId);
     }
     /**
@@ -5146,7 +5178,9 @@ class GMMenu {
      * @param menuKey 菜单-键key
      */
     getShowTextValue(menuKey) {
-        return this.MenuHandle.getMenuHandledOption(menuKey).showText(this.getText(menuKey), this.getEnable(menuKey));
+        const text = this.getText(menuKey);
+        const enable = this.getEnable(menuKey);
+        return this.MenuHandle.getMenuHandledOption(menuKey).showText(text, enable);
     }
     /**
      * 获取当前已注册菜单的id
@@ -5155,9 +5189,9 @@ class GMMenu {
     getMenuId(menuKey) {
         let result = null;
         for (let index = 0; index < this.MenuHandle.$data.data.length; index++) {
-            const optionData = this.MenuHandle.$data.data[index];
-            if (optionData.handleData.key === menuKey) {
-                result = optionData.id;
+            const option = this.MenuHandle.$data.data[index];
+            if (option.handleData?.key === menuKey) {
+                result = option.id;
                 break;
             }
         }