sibujs 2.0.0 → 2.2.0

package/dist/build.cjs

@@ -1204,6 +1204,7 @@ __export(index_exports, {
   registerComponent: () => registerComponent,
   registerDisposer: () => registerDisposer,
   resolveComponent: () => resolveComponent,
+  retrack: () => retrack,
   rp: () => rp,
   rt: () => rt,
   ruby: () => ruby,
@@ -1214,6 +1215,7 @@ __export(index_exports, {
   section: () => section,
   select: () => select,
   setGlobalErrorHandler: () => setGlobalErrorHandler,
+  setMaxDrainIterations: () => setMaxDrainIterations,
   show: () => show,
   signal: () => signal,
   slot: () => slot,
@@ -1350,11 +1352,89 @@ function isUrlAttribute(attr) {
 
 // src/reactivity/track.ts
 var _isDev2 = isDev();
-var subscriberStack = new Array(32);
-var stackCapacity = 32;
-var stackTop = -1;
+var POOL_MAX = 4096;
+var nodePool = [];
+function createNode() {
+  return {
+    sig: null,
+    sub: null,
+    epoch: 0,
+    sigPrev: null,
+    sigNext: null,
+    subPrev: null,
+    subNext: null,
+    prevActive: null
+  };
+}
+function allocNode(sig, sub2, epoch) {
+  const n = nodePool.pop();
+  if (n) {
+    n.sig = sig;
+    n.sub = sub2;
+    n.epoch = epoch;
+    return n;
+  }
+  const fresh = createNode();
+  fresh.sig = sig;
+  fresh.sub = sub2;
+  fresh.epoch = epoch;
+  return fresh;
+}
+function freeNode(node) {
+  node.sig = null;
+  node.sub = null;
+  node.sigPrev = null;
+  node.sigNext = null;
+  node.subPrev = null;
+  node.subNext = null;
+  node.prevActive = null;
+  if (nodePool.length < POOL_MAX) nodePool.push(node);
+}
+function linkSignal(sig, node) {
+  const oldHead = sig.subsHead ?? null;
+  node.sigPrev = null;
+  node.sigNext = oldHead;
+  if (oldHead) oldHead.sigPrev = node;
+  else sig.subsTail = node;
+  sig.subsHead = node;
+  sig.__sc = (sig.__sc ?? 0) + 1;
+}
+function unlinkSignal(node) {
+  const sig = node.sig;
+  if (!sig) return;
+  const prev = node.sigPrev;
+  const next = node.sigNext;
+  if (prev) prev.sigNext = next;
+  else sig.subsHead = next;
+  if (next) next.sigPrev = prev;
+  else sig.subsTail = prev;
+  sig.__sc = (sig.__sc ?? 1) - 1;
+  if (sig.__activeNode === node) sig.__activeNode = node.prevActive;
+  if (sig.__sc === 0) {
+    sig.subsHead = null;
+    sig.subsTail = null;
+  }
+}
+function linkSub(sub2, node) {
+  const oldTail = sub2.depsTail ?? null;
+  node.subPrev = oldTail;
+  node.subNext = null;
+  if (oldTail) oldTail.subNext = node;
+  else sub2.depsHead = node;
+  sub2.depsTail = node;
+}
+function unlinkSub(node) {
+  const sub2 = node.sub;
+  if (!sub2) return;
+  const prev = node.subPrev;
+  const next = node.subNext;
+  if (prev) prev.subNext = next;
+  else sub2.depsHead = next;
+  if (next) next.subPrev = prev;
+  else sub2.depsTail = prev;
+}
 var currentSubscriber = null;
-var SUBS = "__s";
+var suspendSavedSub = null;
 var notifyDepth = 0;
 var pendingQueue = [];
 var pendingSet = /* @__PURE__ */ new Set();
@@ -1368,41 +1448,9 @@ function safeInvoke(sub2) {
 }
 var suspendDepth = 0;
 var trackingSuspended = false;
-function retrack(effectFn, subscriber) {
-  const prev = currentSubscriber;
-  currentSubscriber = subscriber;
-  try {
-    effectFn();
-  } finally {
-    currentSubscriber = prev;
-  }
-}
-function track(effectFn, subscriber) {
-  if (!subscriber) subscriber = effectFn;
-  cleanup(subscriber);
-  ++stackTop;
-  if (stackTop >= stackCapacity) {
-    stackCapacity *= 2;
-    subscriberStack.length = stackCapacity;
-  }
-  subscriberStack[stackTop] = subscriber;
-  currentSubscriber = subscriber;
-  try {
-    effectFn();
-  } finally {
-    stackTop--;
-    currentSubscriber = stackTop >= 0 ? subscriberStack[stackTop] : null;
-  }
-  return () => cleanup(subscriber);
-}
 function suspendTracking() {
   if (suspendDepth === 0) {
-    ++stackTop;
-    if (stackTop >= stackCapacity) {
-      stackCapacity *= 2;
-      subscriberStack.length = stackCapacity;
-    }
-    subscriberStack[stackTop] = null;
+    suspendSavedSub = currentSubscriber;
     currentSubscriber = null;
     trackingSuspended = true;
   }
@@ -1411,8 +1459,8 @@ function suspendTracking() {
 function resumeTracking() {
   suspendDepth--;
   if (suspendDepth === 0) {
-    stackTop--;
-    currentSubscriber = stackTop >= 0 ? subscriberStack[stackTop] : null;
+    currentSubscriber = suspendSavedSub;
+    suspendSavedSub = null;
     trackingSuspended = false;
   }
 }
@@ -1424,65 +1472,141 @@ function untracked(fn) {
     resumeTracking();
   }
 }
+var subscriberEpochCounter = 0;
+function retrack(effectFn, subscriber) {
+  const prev = currentSubscriber;
+  currentSubscriber = subscriber;
+  const sub2 = subscriber;
+  const epoch = ++subscriberEpochCounter;
+  sub2._epoch = epoch;
+  sub2._structDirty = false;
+  for (let n = sub2.depsHead ?? null; n !== null; n = n.subNext) {
+    const sig = n.sig;
+    n.prevActive = sig.__activeNode ?? null;
+    sig.__activeNode = n;
+  }
+  try {
+    effectFn();
+  } finally {
+    currentSubscriber = prev;
+    let node = sub2.depsHead ?? null;
+    while (node !== null) {
+      const next = node.subNext;
+      const sig = node.sig;
+      sig.__activeNode = node.prevActive;
+      node.prevActive = null;
+      if (node.epoch !== epoch) {
+        unlinkSub(node);
+        unlinkSignal(node);
+        freeNode(node);
+      }
+      node = next;
+    }
+  }
+}
+function track(effectFn, subscriber) {
+  if (!subscriber) subscriber = effectFn;
+  cleanup(subscriber);
+  const prev = currentSubscriber;
+  currentSubscriber = subscriber;
+  try {
+    effectFn();
+  } finally {
+    currentSubscriber = prev;
+    const sub3 = subscriber;
+    for (let n = sub3.depsHead ?? null; n !== null; n = n.subNext) {
+      const sig = n.sig;
+      sig.__activeNode = n.prevActive;
+      n.prevActive = null;
+    }
+  }
+  const sub2 = subscriber;
+  return sub2._dispose ?? (sub2._dispose = () => cleanup(subscriber));
+}
 function recordDependency(signal2) {
   if (!currentSubscriber) return;
   const sub2 = currentSubscriber;
-  if (sub2._dep === signal2) return;
-  const deps = sub2._deps;
-  if (deps) {
-    if (deps.has(signal2)) return;
-    deps.add(signal2);
-  } else if (sub2._dep !== void 0) {
-    const set = /* @__PURE__ */ new Set();
-    set.add(sub2._dep);
-    set.add(signal2);
-    sub2._deps = set;
-    sub2._dep = void 0;
-  } else {
-    sub2._dep = signal2;
+  const sig = signal2;
+  const epoch = sub2._epoch ?? 0;
+  const active = sig.__activeNode ?? null;
+  if (active !== null && active.sub === sub2) {
+    active.epoch = epoch;
+    return;
   }
-  let subs = signal2[SUBS];
-  if (!subs) {
-    subs = /* @__PURE__ */ new Set();
-    signal2[SUBS] = subs;
+  const node = allocNode(signal2, sub2, epoch);
+  node.prevActive = active;
+  sig.__activeNode = node;
+  linkSub(sub2, node);
+  linkSignal(sig, node);
+  sub2._structDirty = true;
+}
+function cleanup(subscriber) {
+  const sub2 = subscriber;
+  let node = sub2.depsHead ?? null;
+  sub2.depsHead = null;
+  sub2.depsTail = null;
+  while (node) {
+    const next = node.subNext;
+    unlinkSignal(node);
+    freeNode(node);
+    node = next;
+  }
+}
+var maxSubscriberRepeats = 50;
+var maxDrainIterations = 1e6;
+var drainEpoch = 0;
+function setMaxDrainIterations(n) {
+  const prev = maxDrainIterations;
+  if (Number.isFinite(n) && n > 0) maxDrainIterations = Math.floor(n);
+  return prev;
+}
+function tickRepeat(sub2) {
+  const s2 = sub2;
+  if (s2._runEpoch !== drainEpoch) {
+    s2._runEpoch = drainEpoch;
+    s2._runs = 1;
+    return false;
   }
-  subs.add(currentSubscriber);
-  if (subs.size === 1) {
-    signal2.__f = currentSubscriber;
-  } else if (signal2.__f !== void 0) {
-    signal2.__f = void 0;
+  s2._runs = (s2._runs ?? 0) + 1;
+  return s2._runs > maxSubscriberRepeats;
+}
+function cycleError(sub2) {
+  if (typeof console !== "undefined") {
+    const name = sub2.__name ?? "<unnamed>";
+    console.error(
+      `[SibuJS] subscriber "${name}" fired more than ${maxSubscriberRepeats} times \u2014 likely a write-reads-self cycle between effects/signals. Breaking to prevent infinite loop.`
+    );
   }
 }
-function queueSignalNotification(signal2) {
-  const subs = signal2[SUBS];
-  if (!subs) return;
-  for (const sub2 of subs) {
-    if (sub2._c) {
-      propagateDirty(sub2);
-    } else if (!pendingSet.has(sub2)) {
-      pendingSet.add(sub2);
-      pendingQueue.push(sub2);
+function absoluteDrainError() {
+  if (typeof console !== "undefined") {
+    console.error(
+      `[SibuJS] Notification drain exceeded ${maxDrainIterations} iterations \u2014 absolute safety net tripped. Breaking to prevent infinite loop.`
+    );
+  }
+}
+function drainQueue() {
+  let i2 = 0;
+  while (i2 < pendingQueue.length) {
+    if (i2 >= maxDrainIterations) {
+      absoluteDrainError();
+      break;
+    }
+    const sub2 = pendingQueue[i2++];
+    if (tickRepeat(sub2)) {
+      cycleError(sub2);
+      break;
     }
+    pendingSet.delete(sub2);
+    safeInvoke(sub2);
   }
 }
-var maxDrainIterations = 1e5;
 function drainNotificationQueue() {
   if (notifyDepth > 0) return;
   notifyDepth++;
+  drainEpoch++;
   try {
-    let i2 = 0;
-    while (i2 < pendingQueue.length) {
-      if (i2 >= maxDrainIterations) {
-        if (typeof console !== "undefined") {
-          console.error(
-            `[SibuJS] Notification queue exceeded ${maxDrainIterations} iterations \u2014 likely an effect that writes to a signal it reads. Breaking to prevent infinite loop.`
-          );
-        }
-        break;
-      }
-      safeInvoke(pendingQueue[i2]);
-      i2++;
-    }
+    drainQueue();
   } finally {
     notifyDepth--;
     if (notifyDepth === 0) {
@@ -1500,131 +1624,82 @@ function propagateDirty(sub2) {
   stack.push(rootSig);
   while (stack.length > baseLen) {
     const sig = stack.pop();
-    const first = sig.__f;
-    if (first) {
-      if (first._c) {
-        const nSig = first._sig;
-        if (!nSig._d) {
-          nSig._d = true;
-          stack.push(nSig);
+    let node = sig.subsHead ?? null;
+    while (node) {
+      const s2 = node.sub;
+      if (s2) {
+        if (s2._c) {
+          const nSig = s2._sig;
+          if (nSig) {
+            if (!nSig._d) {
+              nSig._d = true;
+              stack.push(nSig);
+            }
+          } else {
+            s2();
+          }
+        } else if (!pendingSet.has(s2)) {
+          pendingSet.add(s2);
+          pendingQueue.push(s2);
         }
-      } else if (!pendingSet.has(first)) {
-        pendingSet.add(first);
-        pendingQueue.push(first);
       }
-      continue;
+      node = node.sigNext;
     }
-    const subs = sig[SUBS];
-    if (!subs) continue;
-    for (const s2 of subs) {
+  }
+}
+function queueSignalNotification(signal2) {
+  const sig = signal2;
+  let node = sig.subsHead ?? null;
+  while (node) {
+    const s2 = node.sub;
+    if (s2) {
       if (s2._c) {
-        const nSig = s2._sig;
-        if (nSig && !nSig._d) {
-          nSig._d = true;
-          stack.push(nSig);
-        } else if (!nSig) {
-          s2();
-        }
+        propagateDirty(s2);
       } else if (!pendingSet.has(s2)) {
         pendingSet.add(s2);
         pendingQueue.push(s2);
       }
     }
+    node = node.sigNext;
   }
 }
 function notifySubscribers(signal2) {
-  const first = signal2.__f;
-  if (first) {
-    if (notifyDepth > 0) {
-      if (first._c) {
-        propagateDirty(first);
-      } else if (!pendingSet.has(first)) {
-        pendingSet.add(first);
-        pendingQueue.push(first);
-      }
-      return;
-    }
-    notifyDepth++;
-    try {
-      if (first._c) {
-        propagateDirty(first);
-      } else {
-        safeInvoke(first);
-      }
-      let i2 = 0;
-      while (i2 < pendingQueue.length) {
-        if (i2 >= maxDrainIterations) {
-          if (typeof console !== "undefined") {
-            console.error(
-              `[SibuJS] Notification queue exceeded ${maxDrainIterations} iterations \u2014 likely an effect that writes to a signal it reads. Breaking to prevent infinite loop.`
-            );
-          }
-          break;
-        }
-        safeInvoke(pendingQueue[i2]);
-        i2++;
-      }
-    } finally {
-      notifyDepth--;
-      if (notifyDepth === 0) {
-        pendingQueue.length = 0;
-        pendingSet.clear();
-      }
-    }
-    return;
-  }
-  const subs = signal2[SUBS];
-  if (!subs || subs.size === 0) return;
+  const sig = signal2;
+  const head2 = sig.subsHead;
+  if (!head2) return;
   if (notifyDepth > 0) {
-    for (const sub2 of subs) {
-      if (sub2._c) {
-        propagateDirty(sub2);
-      } else if (!pendingSet.has(sub2)) {
-        pendingSet.add(sub2);
-        pendingQueue.push(sub2);
+    let node = head2;
+    while (node) {
+      const s2 = node.sub;
+      if (s2) {
+        if (s2._c) {
+          propagateDirty(s2);
+        } else if (!pendingSet.has(s2)) {
+          pendingSet.add(s2);
+          pendingQueue.push(s2);
+        }
       }
+      node = node.sigNext;
     }
     return;
   }
   notifyDepth++;
+  drainEpoch++;
   try {
-    let directCount = 0;
-    let hasComputedSub = false;
-    for (const sub2 of subs) {
-      if (sub2._c) hasComputedSub = true;
-      pendingQueue[directCount++] = sub2;
-    }
-    if (!hasComputedSub) {
-      for (let i3 = 0; i3 < directCount; i3++) {
-        safeInvoke(pendingQueue[i3]);
-      }
-    } else {
-      for (let i3 = 0; i3 < directCount; i3++) {
-        if (pendingQueue[i3]._c) {
-          propagateDirty(pendingQueue[i3]);
-        }
-      }
-      for (let i3 = 0; i3 < directCount; i3++) {
-        const sub2 = pendingQueue[i3];
-        if (!sub2._c && !pendingSet.has(sub2)) {
-          pendingSet.add(sub2);
-          safeInvoke(sub2);
-        }
-      }
-    }
-    let i2 = directCount;
-    while (i2 < pendingQueue.length) {
-      if (i2 - directCount >= maxDrainIterations) {
-        if (typeof console !== "undefined") {
-          console.error(
-            `[SibuJS] Notification queue exceeded ${maxDrainIterations} iterations \u2014 likely an effect that writes to a signal it reads. Breaking to prevent infinite loop.`
-          );
+    let node = head2;
+    while (node) {
+      const s2 = node.sub;
+      if (s2) {
+        if (s2._c) {
+          propagateDirty(s2);
+        } else if (!pendingSet.has(s2)) {
+          pendingSet.add(s2);
+          pendingQueue.push(s2);
         }
-        break;
       }
-      safeInvoke(pendingQueue[i2]);
-      i2++;
+      node = node.sigNext;
     }
+    drainQueue();
   } finally {
     notifyDepth--;
     if (notifyDepth === 0) {
@@ -1633,37 +1708,6 @@ function notifySubscribers(signal2) {
     }
   }
 }
-function cleanup(subscriber) {
-  const sub2 = subscriber;
-  const singleDep = sub2._dep;
-  if (singleDep !== void 0) {
-    const subs = singleDep[SUBS];
-    if (subs) {
-      subs.delete(subscriber);
-      if (singleDep.__f === subscriber) {
-        singleDep.__f = subs.size === 1 ? subs.values().next().value : void 0;
-      } else if (subs.size === 1 && singleDep.__f === void 0) {
-        singleDep.__f = subs.values().next().value;
-      }
-    }
-    sub2._dep = void 0;
-    return;
-  }
-  const deps = sub2._deps;
-  if (!deps || deps.size === 0) return;
-  for (const signal2 of deps) {
-    const subs = signal2[SUBS];
-    if (subs) {
-      subs.delete(subscriber);
-      if (signal2.__f === subscriber) {
-        signal2.__f = subs.size === 1 ? subs.values().next().value : void 0;
-      } else if (subs.size === 1 && signal2.__f === void 0) {
-        signal2.__f = subs.values().next().value;
-      }
-    }
-  }
-  deps.clear();
-}
 
 // src/reactivity/bindAttribute.ts
 var _isDev3 = isDev();
@@ -3303,32 +3347,64 @@ function flushBatch() {
 var _g = globalThis;
 var _isDev9 = isDev();
 function signal(initial, options) {
-  const state = { value: initial };
+  const state = {
+    value: initial,
+    __v: 0,
+    __sc: 0,
+    subsHead: null,
+    subsTail: null,
+    __activeNode: null,
+    __name: void 0
+  };
   const debugName = _isDev9 ? options?.name : void 0;
   const equalsFn = options?.equals;
-  if (debugName) {
-    state.__name = debugName;
-  }
+  if (debugName) state.__name = debugName;
   function get() {
     recordDependency(state);
     return state.value;
   }
   get.__signal = state;
   if (debugName) get.__name = debugName;
-  function set(next) {
-    const newValue = typeof next === "function" ? next(state.value) : next;
-    if (equalsFn ? equalsFn(state.value, newValue) : Object.is(newValue, state.value)) return;
-    if (_isDev9) {
-      const oldValue = state.value;
+  let set;
+  if (equalsFn) {
+    set = (next) => {
+      const prev = state.value;
+      const newValue = typeof next === "function" ? next(prev) : next;
+      if (equalsFn(prev, newValue)) return;
+      state.value = newValue;
+      state.__v++;
+      if (_isDev9) {
+        const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
+        if (hook) hook.emit("signal:update", { signal: state, name: debugName, oldValue: prev, newValue });
+      }
+      if (!enqueueBatchedSignal(state)) {
+        notifySubscribers(state);
+      }
+    };
+  } else if (_isDev9) {
+    set = (next) => {
+      const prev = state.value;
+      const newValue = typeof next === "function" ? next(prev) : next;
+      if (Object.is(newValue, prev)) return;
       state.value = newValue;
+      state.__v++;
       const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-      if (hook) hook.emit("signal:update", { signal: state, name: debugName, oldValue, newValue });
-    } else {
+      if (hook) hook.emit("signal:update", { signal: state, name: debugName, oldValue: prev, newValue });
+      if (!enqueueBatchedSignal(state)) {
+        notifySubscribers(state);
+      }
+    };
+  } else {
+    set = (next) => {
+      const prev = state.value;
+      const newValue = typeof next === "function" ? next(prev) : next;
+      if (Object.is(newValue, prev)) return;
       state.value = newValue;
-    }
-    if (!enqueueBatchedSignal(state)) {
-      notifySubscribers(state);
-    }
+      state.__v++;
+      if (!enqueueBatchedSignal(state)) {
+        notifySubscribers(state);
+      }
+    };
   }
   if (_isDev9) {
     const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
@@ -3412,92 +3488,122 @@ function on(deps, handler) {
     }
   };
 }
+var MAX_RERUNS = 100;
+function flushUserCleanups(ctx) {
+  const list = ctx.userCleanups;
+  if (list.length === 0) return;
+  ctx.userCleanups = [];
+  for (let i2 = list.length - 1; i2 >= 0; i2--) {
+    try {
+      list[i2]();
+    } catch (err) {
+      if (typeof console !== "undefined") console.warn("[SibuJS effect] onCleanup threw:", err);
+    }
+  }
+}
+function drainReruns(ctx) {
+  let reruns = 1;
+  do {
+    ctx.rerunPending = false;
+    if (ctx.userCleanups.length > 0) flushUserCleanups(ctx);
+    retrack(ctx.bodyFn, ctx.subscriber);
+  } while (ctx.rerunPending && ++reruns <= MAX_RERUNS);
+  if (ctx.rerunPending) {
+    ctx.rerunPending = false;
+    if (_g2.__SIBU_DEV_WARN__ !== false && typeof console !== "undefined") {
+      console.error(
+        `[SibuJS] effect re-requested itself ${MAX_RERUNS}+ times \u2014 likely a write-reads-self cycle. Breaking to prevent infinite loop.`
+      );
+    }
+  }
+}
+function disposeEffect(ctx) {
+  if (ctx.disposed) return;
+  ctx.disposed = true;
+  const h = _g2.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
+  if (h) {
+    try {
+      h.emit("effect:destroy", { effectFn: ctx.fn });
+    } catch {
+    }
+  }
+  try {
+    if (ctx.userCleanups.length > 0) flushUserCleanups(ctx);
+  } catch (err) {
+    if (typeof console !== "undefined") {
+      console.warn("[SibuJS effect] onCleanup threw during dispose:", err);
+    }
+  }
+  try {
+    cleanup(ctx.subscriber);
+  } catch (err) {
+    if (typeof console !== "undefined") {
+      console.warn("[SibuJS effect] dispose threw:", err);
+    }
+  }
+}
 function effect(effectFn, options) {
   devAssert(typeof effectFn === "function", "effect: argument must be a function.");
   if (isSSR()) return () => {
   };
-  const onError = options?.onError;
-  let userCleanups = [];
-  const onCleanup2 = (fn) => {
-    userCleanups.push(fn);
+  const ctx = {
+    fn: effectFn,
+    onError: options?.onError,
+    userCleanups: [],
+    running: false,
+    rerunPending: false,
+    disposed: false,
+    onCleanup: null,
+    subscriber: null,
+    bodyFn: null
   };
-  const runUserCleanups = () => {
-    if (userCleanups.length === 0) return;
-    const list = userCleanups;
-    userCleanups = [];
-    for (let i2 = list.length - 1; i2 >= 0; i2--) {
-      try {
-        list[i2]();
-      } catch (err) {
-        if (typeof console !== "undefined") {
-          console.warn("[SibuJS effect] onCleanup threw:", err);
-        }
-      }
-    }
+  ctx.onCleanup = (fn) => {
+    ctx.userCleanups.push(fn);
   };
-  const invokeBody = () => effectFn(onCleanup2);
-  const wrappedFn = onError ? () => {
+  const onErrorCaptured = ctx.onError;
+  ctx.bodyFn = onErrorCaptured ? () => {
     try {
-      invokeBody();
+      ctx.fn(ctx.onCleanup);
     } catch (err) {
-      onError(err);
+      onErrorCaptured(err);
     }
-  } : invokeBody;
-  let cleanupHandle = () => {
+  } : () => {
+    ctx.fn(ctx.onCleanup);
   };
-  let running = false;
-  const subscriber = () => {
-    if (running) {
-      if (_g2.__SIBU_DEV_WARN__ !== false && typeof console !== "undefined") {
-        console.warn(
-          "[SibuJS] effect re-entered itself while running \u2014 the triggering update will be ignored. Wrap mutual writes in `batch()` or split the effect to avoid this."
-        );
-      }
+  const sub2 = (() => {
+    if (ctx.running) {
+      ctx.rerunPending = true;
       return;
     }
-    running = true;
+    ctx.running = true;
     try {
-      runUserCleanups();
-      cleanupHandle();
-      cleanupHandle = track(wrappedFn, subscriber);
+      ctx.rerunPending = false;
+      if (ctx.userCleanups.length > 0) flushUserCleanups(ctx);
+      retrack(ctx.bodyFn, sub2);
+      if (ctx.rerunPending) drainReruns(ctx);
     } finally {
-      running = false;
+      ctx.running = false;
+      ctx.rerunPending = false;
     }
-  };
-  running = true;
+  });
+  sub2.depsHead = null;
+  sub2.depsTail = null;
+  sub2._epoch = 0;
+  sub2._structDirty = false;
+  sub2._runEpoch = 0;
+  sub2._runs = 0;
+  ctx.subscriber = sub2;
+  ctx.running = true;
   try {
-    cleanupHandle = track(wrappedFn, subscriber);
+    retrack(ctx.bodyFn, ctx.subscriber);
+    if (ctx.rerunPending) drainReruns(ctx);
   } finally {
-    running = false;
+    ctx.running = false;
+    ctx.rerunPending = false;
   }
   const hook = _g2.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
   if (hook) hook.emit("effect:create", { effectFn });
-  let disposed = false;
-  return () => {
-    if (disposed) return;
-    disposed = true;
-    const h = _g2.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-    if (h) {
-      try {
-        h.emit("effect:destroy", { effectFn });
-      } catch {
-      }
-    }
-    try {
-      runUserCleanups();
-    } catch (err) {
-      if (typeof console !== "undefined") {
-        console.warn("[SibuJS effect] onCleanup threw during dispose:", err);
-      }
-    }
-    try {
-      cleanupHandle();
-    } catch (err) {
-      if (typeof console !== "undefined") {
-        console.warn("[SibuJS effect] dispose threw:", err);
-      }
-    }
-  };
+  return () => disposeEffect(ctx);
 }
 
 // src/core/signals/derived.ts
@@ -3508,6 +3614,7 @@ function derived(getter, options) {
   const cs = {};
   cs._d = false;
   cs._g = getter;
+  cs.__v = 0;
   const markDirty = () => {
     if (cs._d) return;
     cs._d = true;
@@ -3537,11 +3644,14 @@ function derived(getter, options) {
         evaluating = true;
         let threw = true;
         try {
+          const prev = cs._v;
           retrack(() => {
-            cs._v = getter();
+            const next = getter();
+            cs._v = equals && cs._v !== void 0 ? equals(cs._v, next) ? cs._v : next : next;
             cs._d = false;
             threw = false;
           }, markDirty);
+          if (!Object.is(prev, cs._v)) cs.__v++;
         } finally {
           evaluating = false;
           if (threw) cs._d = true;
@@ -3561,6 +3671,7 @@ function derived(getter, options) {
           cs._d = false;
           threw = false;
         }, markDirty);
+        if (!Object.is(oldValue, cs._v)) cs.__v++;
       } finally {
         evaluating = false;
         if (threw) cs._d = true;