@lytjs/reactivity 6.0.0 → 6.4.0

package/dist/index.cjs

@@ -224,7 +224,7 @@ function notifySubscribers(subscribers, store, signalKey, newValue) {
     next = it.next();
   }
   if (store && signalKey !== void 0) {
-    trigger(store, TriggerOpTypes.SET, signalKey);
+    trigger(store, TriggerOpTypes.SET, signalKey, newValue);
   }
 }
 function flushPendingNotifications() {
@@ -280,6 +280,71 @@ function readonlySignal(sig) {
   Object.defineProperty(readonlyFn, SignalSymbol, { value: true });
   return readonlyFn;
 }
+var activeEffectScope;
+function getActiveEffectScope() {
+  return activeEffectScope;
+}
+function effectScope(options) {
+  const detached = typeof options === "boolean" ? options : options?.detached;
+  const scope = {
+    active: true,
+    effects: [],
+    cleanups: [],
+    parent: activeEffectScope,
+    detached: !!detached,
+    run(fn) {
+      if (!this.active) {
+        return;
+      }
+      const prevScope = activeEffectScope;
+      activeEffectScope = this;
+      try {
+        return fn();
+      } finally {
+        activeEffectScope = prevScope;
+      }
+    },
+    stop() {
+      if (!this.active) return;
+      this.active = false;
+      for (const effect2 of this.effects) {
+        try {
+          effect2.stop();
+        } catch (e) {
+          commonError.error(`Error stopping effect in scope: ${String(e)}`);
+        }
+      }
+      for (const cleanup of this.cleanups) {
+        try {
+          cleanup();
+        } catch (e) {
+          commonError.error(`Error running cleanup in scope: ${String(e)}`);
+        }
+      }
+      if (this.parent) {
+        const idx = this.parent.effects.indexOf(commonAssertions.unsafeCast(this));
+        if (idx !== -1) {
+          this.parent.effects.splice(idx, 1);
+        }
+      }
+      this.effects.length = 0;
+      this.cleanups.length = 0;
+      this.parent = void 0;
+    }
+  };
+  if (!scope.detached && activeEffectScope) {
+    activeEffectScope.effects.push(commonAssertions.unsafeCast(scope));
+  }
+  return scope;
+}
+function getCurrentScope() {
+  return activeEffectScope;
+}
+function onScopeDispose(fn) {
+  if (activeEffectScope) {
+    activeEffectScope.cleanups.push(fn);
+  }
+}
 var activeEffect;
 var _trackDepth = 0;
 var targetMap = /* @__PURE__ */ new WeakMap();
@@ -340,7 +405,7 @@ function trackEffect(dep) {
     activeEffect.deps.push(dep);
   }
 }
-function trigger(target, type, key, _newValue, _oldValue) {
+function trigger(target, type, key, newValue, oldValue) {
   const depsMap = targetMap.get(target);
   if (!depsMap) return;
   const deps = [];
@@ -374,9 +439,9 @@ function trigger(target, type, key, _newValue, _oldValue) {
       }
     }
   }
-  triggerEffects([...new Set(effects)]);
+  triggerEffects([...new Set(effects)], target, type, key, newValue, oldValue);
 }
-function triggerEffects(effects) {
+function triggerEffects(effects, target, type, key, newValue, oldValue) {
   if (triggerDepth > commonConstants.REACTIVITY_MAX_TRIGGER_DEPTH) {
     return;
   }
@@ -384,19 +449,19 @@ function triggerEffects(effects) {
   try {
     for (const effect2 of effects) {
       if (effect2.computed) {
-        triggerEffect(effect2);
+        triggerEffect(effect2, target, type, key, newValue, oldValue);
       }
     }
     for (const effect2 of effects) {
       if (!effect2.computed) {
-        triggerEffect(effect2);
+        triggerEffect(effect2, target, type, key, newValue, oldValue);
       }
     }
   } finally {
     triggerDepth--;
   }
 }
-function triggerEffect(effect2) {
+function triggerEffect(effect2, target, type, key, newValue, oldValue) {
   if (effect2 !== activeEffect || effect2.allowRecurse) {
     if (effect2.scheduler) {
       effect2.scheduler();
@@ -414,6 +479,10 @@ var ReactiveEffect = class {
     this.parent = void 0;
     // 运行前清理（onEffectCleanup 注册的）
     this._cleanups = [];
+    const scope = getActiveEffectScope();
+    if (scope && scope.active) {
+      scope.effects.push(this);
+    }
   }
   run() {
     if (!this.active) {
@@ -709,9 +778,9 @@ function createMutableHandler(isReadonly2, isShallow) {
       const result = Reflect.set(target, key, value, receiver);
       if (target === toRaw(receiver)) {
         if (!hadKey) {
-          trigger(target, TriggerOpTypes.ADD, key);
+          trigger(target, TriggerOpTypes.ADD, key, value);
         } else if (commonIs.hasChanged(value, oldValue)) {
-          trigger(target, TriggerOpTypes.SET, key);
+          trigger(target, TriggerOpTypes.SET, key, value, oldValue);
         }
       }
       return result;
@@ -721,10 +790,10 @@ function createMutableHandler(isReadonly2, isShallow) {
         return true;
       }
       const hadKey = commonIs.hasOwn(target, key);
-      Reflect.get(target, key);
+      const oldValue = Reflect.get(target, key);
       const result = Reflect.deleteProperty(target, key);
       if (result && hadKey) {
-        trigger(target, TriggerOpTypes.DELETE, key);
+        trigger(target, TriggerOpTypes.DELETE, key, void 0, oldValue);
       }
       return result;
     },
@@ -786,7 +855,7 @@ function createCollectionHandler(isReadonly2, isShallow) {
                 if (!hadKey || !Object.is(toRaw(oldValue), toRaw(args[1]))) {
                   const triggerKey = toTriggerKey(args[0]);
                   if (triggerKey !== void 0) {
-                    trigger(target, TriggerOpTypes.SET, triggerKey, args[1]);
+                    trigger(target, TriggerOpTypes.SET, triggerKey, args[1], oldValue);
                   }
                 }
                 return result2;
@@ -807,7 +876,7 @@ function createCollectionHandler(isReadonly2, isShallow) {
                 if (hadKey) {
                   const triggerKey = toTriggerKey(args[0]);
                   if (triggerKey !== void 0) {
-                    trigger(target, TriggerOpTypes.DELETE, triggerKey);
+                    trigger(target, TriggerOpTypes.DELETE, triggerKey, void 0, void 0);
                   }
                   trigger(target, TriggerOpTypes.DELETE, ITERATE_KEY);
                 }
@@ -816,7 +885,7 @@ function createCollectionHandler(isReadonly2, isShallow) {
                 const hadItems = rawTarget.size > 0;
                 const result2 = res.apply(target, args);
                 if (hadItems) {
-                  trigger(target, TriggerOpTypes.CLEAR, void 0);
+                  trigger(target, TriggerOpTypes.CLEAR, void 0, void 0, void 0);
                 }
                 return result2;
               }
@@ -934,10 +1003,10 @@ var RefImpl = class {
     const useDirectValue = this.__v_isShallow;
     newVal = useDirectValue ? newVal : toRaw(newVal);
     if (commonIs.hasChanged(newVal, this._rawValue)) {
-      this._rawValue;
+      const oldVal = this._rawValue;
       this._rawValue = newVal;
       this._value = useDirectValue ? newVal : toReactive(newVal);
-      triggerRefValue(this);
+      triggerRefValue(this, newVal, oldVal);
     }
   }
 };
@@ -956,10 +1025,10 @@ var ShallowRefImpl = class {
   }
   set value(newVal) {
     if (commonIs.hasChanged(newVal, this._rawValue)) {
-      this._rawValue;
+      const oldVal = this._rawValue;
       this._rawValue = newVal;
       this._value = newVal;
-      triggerRefValue(this);
+      triggerRefValue(this, newVal, oldVal);
     }
   }
 };
@@ -969,7 +1038,7 @@ function trackRefValue(ref2) {
   }
 }
 function triggerRefValue(ref2, newVal, oldVal) {
-  trigger(ref2, TriggerOpTypes.SET, "value");
+  trigger(ref2, TriggerOpTypes.SET, "value", newVal, oldVal);
 }
 function ref(value) {
   if (isRef(value)) {
@@ -1556,10 +1625,12 @@ exports.computed = computed2;
 exports.computedSignal = computedSignal;
 exports.customRef = customRef;
 exports.effect = effect;
+exports.effectScope = effectScope;
 exports.enableTracking = enableTracking;
 exports.flushBatchScopes = flushBatchScopes;
 exports.getBatchScopeDepth = getBatchScopeDepth;
 exports.getCurrentBatchScopeStack = getCurrentBatchScopeStack;
+exports.getCurrentScope = getCurrentScope;
 exports.getSkippedTrackingCount = getSkippedTrackingCount;
 exports.isComputedRef = isComputedRef;
 exports.isInBatchScope = isInBatchScope;
@@ -1570,6 +1641,7 @@ exports.isRef = isRef;
 exports.isShallowRef = isShallowRef;
 exports.markRaw = markRaw;
 exports.onEffectCleanup = onEffectCleanup;
+exports.onScopeDispose = onScopeDispose;
 exports.pauseTracking = pauseTracking;
 exports.reactive = reactive;
 exports.readonly = readonly;