@whitesev/utils 2.10.0 → 2.11.1

package/dist/index.cjs.js

@@ -239,7 +239,7 @@ const clearTimeout$1 = (timerId) => loadOrReturnBroker().clearTimeout(timerId);
 const setInterval$1 = (...args) => loadOrReturnBroker().setInterval(...args);
 const setTimeout$1 = (...args) => loadOrReturnBroker().setTimeout(...args);
 
-const version = "2.10.0";
+const version = "2.11.1";
 
 /* eslint-disable */
 // ==UserScript==
@@ -5336,7 +5336,6 @@ class GMMenu {
     }
 }
 
-// @ts-nocheck
 const VueUtils = {
     /** 标签 */
     ReactiveFlags: {
@@ -5376,9 +5375,11 @@ class ReactiveEffect {
     active = true;
     fn;
     scheduler;
-    constructor(fn, scheduler) {
+    options;
+    constructor(fn, scheduler, options) {
         this.fn = fn;
         this.scheduler = scheduler;
+        this.options = options; // 默认值为'same'
     }
     run(cb) {
         if (!this.active) {
@@ -5396,6 +5397,18 @@ class ReactiveEffect {
             }
         }
     }
+    stop() {
+        if (this.active) {
+            // 清除依赖关系
+            if (this.deps && this.deps.length) {
+                this.deps.forEach((dep) => {
+                    dep.delete(this);
+                });
+                this.deps.length = 0;
+            }
+            this.active = false;
+        }
+    }
 }
 class RefImpl {
     _value;
@@ -5465,9 +5478,7 @@ class Vue {
             set(target, key, value, receiver) {
                 const oldValue = target[key];
                 const result = Reflect.set(target, key, value, receiver);
-                if (oldValue !== value) {
-                    that.trigger(target, "set", key, oldValue, value);
-                }
+                that.trigger(target, "set", key, oldValue, value);
                 return result;
             },
         });
@@ -5478,8 +5489,9 @@ class Vue {
      * 观察被reactive的对象值改变
      * @param source 被观察的对象，这里采用函数返回对象
      * @param changeCallBack 值改变的回调
+     * @param options 配置项
      */
-    watch(source, changeCallBack) {
+    watch(source, changeCallBack, options) {
         let getter;
         if (VueUtils.isReactive(source)) {
             getter = () => this.traversal(source);
@@ -5491,17 +5503,35 @@ class Vue {
             return;
         }
         let oldValue;
+        const unwatch = () => {
+            effect.stop();
+        };
         const job = () => {
             const newValue = effect.run((activeEffect) => {
                 this.activeEffect = activeEffect;
             });
             changeCallBack(newValue, oldValue);
+            if (options?.once) {
+                // 仅触发一次
+                unwatch();
+            }
             oldValue = newValue;
         };
-        const effect = new ReactiveEffect(getter, job);
+        const effect = new ReactiveEffect(getter, job, {
+            triggerMethod: "not-same",
+            ...(options ?? {}),
+        });
         oldValue = effect.run((activeEffect) => {
             this.activeEffect = activeEffect;
         });
+        if (options) {
+            if (options.immediate) {
+                job();
+            }
+        }
+        return {
+            unwatch,
+        };
     }
     toReactive(value) {
         return VueUtils.isObject(value) ? this.reactive(value) : value;
@@ -5519,28 +5549,40 @@ class Vue {
         }
         return result;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     trigger(target, type, key, oldValue, value) {
         const depsMap = this.targetMap.get(target);
         if (!depsMap)
             return;
         const effects = depsMap.get(key);
-        this.triggerEffect(effects, "effects");
+        this.triggerEffect(effects, type, "effects", oldValue, value);
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    triggerEffect(effects, name) {
+    triggerEffect(effects, _type, _name, oldValue, value) {
         if (effects) {
+            const isSame = oldValue === value;
             effects.forEach((effect) => {
-                if (effect.scheduler) {
-                    effect.scheduler();
+                if (effect.options.triggerMethod === "not-same") {
+                    if (isSame) {
+                        return;
+                    }
+                    if (effect.scheduler) {
+                        effect.scheduler();
+                    }
+                    else {
+                        effect.run();
+                    }
                 }
-                else {
-                    effect.run();
+                else if (effect.options.triggerMethod === "set") {
+                    if (effect.scheduler) {
+                        effect.scheduler();
+                    }
+                    else {
+                        effect.run();
+                    }
                 }
             });
         }
     }
-    track(target, type, key) {
+    track(target, _type, key) {
         if (!this.activeEffect)
             return;
         let depsMap = this.targetMap.get(target);
@@ -8222,14 +8264,39 @@ class Utils {
     /**
      * 自定义的动态响应对象
      * @example
-     * let vue = new Utils.Vue();
-     * let reactive = new vue.reactive({});
-     * vue.watch(()=>reactive["name"], (newValue, oldValue)=>{
+     * const vue = new Utils.Vue();
+     * const reactive = vue.reactive({
+     *   name: "",
+     * });
+     * vue.watch(()=>reactive.name, (newValue, oldValue)=>{
      *     console.log("newValue ==> " + newValue);
      *     console.log("oldValue ==> " + oldValue);
      * })
-     * vue["name"] = "测试";
-     * > "测试"
+     * reactive.name = "测试";
+     * > newValue ==> 测试
+     * > oldValue ==>
+     * reactive.name = "null";
+     * > newValue ==> null
+     * > oldValue ==> 测试
+     * reactive.name = "null";
+     * @example
+     * const vue = new Utils.Vue();
+     * const reactive = vue.reactive({
+     *   name: "",
+     * });
+     * vue.watch(()=>reactive.name, (newValue, oldValue)=>{
+     *     console.log("newValue ==> " + newValue);
+     *     console.log("oldValue ==> " + oldValue);
+     * },{
+     *   triggerMethod: "set",
+     * })
+     * reactive.name = "测试";
+     * > newValue ==> 测试
+     * > oldValue ==>
+     * reactive.name = "测试";
+     * > newValue ==> 测试
+     * > oldValue ==> 测试
+     *
      */
     Vue = Vue;
     ModuleRaid = ModuleRaid;
@@ -8306,10 +8373,13 @@ class Utils {
     }
     /**
      * 判断页面中是否存在`worker-src`的CSP规则
+     * @param timeout 超时时间，默认为`1500ms`
      */
-    hasWorkerCSP() {
+    hasWorkerCSP(timeout = 1500) {
         return new Promise((resolve) => {
             let flag = true;
+            let timeId = void 0;
+            let worker = void 0;
             let workerBlobUrl = void 0;
             const workerJs = /*js*/ `
 (() => {
@@ -8325,11 +8395,26 @@ class Utils {
     }
     );
 })();`;
+            /**
+             * 返回结果
+             */
+            const finishCallBack = () => {
+                clearTimeout(timeId);
+                if (worker != null) {
+                    worker.terminate();
+                }
+                // 释放
+                if (typeof workerBlobUrl === "string") {
+                    globalThis.URL.revokeObjectURL(workerBlobUrl);
+                    workerBlobUrl = void 0;
+                }
+                resolve(flag);
+            };
             try {
                 const workerScript = new Blob([workerJs], {
                     type: "application/javascript",
                 });
-                workerBlobUrl = window.URL.createObjectURL(workerScript);
+                workerBlobUrl = globalThis.URL.createObjectURL(workerScript);
                 // @ts-expect-error
                 if (globalThis.trustedTypes && typeof globalThis.trustedTypes.createPolicy === "function") {
                     // 使用这个后虽然不报错，但是仍会有blob错误
@@ -8341,25 +8426,27 @@ class Utils {
                     });
                     workerBlobUrl = workerPolicy.createScriptURL(workerBlobUrl);
                 }
-                const worker = new Worker(workerBlobUrl);
+                worker = new Worker(workerBlobUrl);
                 worker.onmessage = (data) => {
                     if (data.data.success) {
                         flag = false;
+                        finishCallBack();
                     }
                 };
-                setTimeout(() => {
-                    worker.terminate();
-                    resolve(flag);
-                }, 500);
+                timeId = setTimeout(() => {
+                    finishCallBack();
+                }, timeout);
                 worker.postMessage("test");
             }
             catch {
                 flag = true;
+                finishCallBack();
             }
             finally {
                 // 释放
                 if (typeof workerBlobUrl === "string") {
                     globalThis.URL.revokeObjectURL(workerBlobUrl);
+                    workerBlobUrl = void 0;
                 }
             }
         });