sibujs 2.0.0 → 2.2.0

package/dist/patterns.cjs

@@ -61,11 +61,88 @@ function devWarn(message) {
 
 // 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, sub, epoch) {
+  const n = nodePool.pop();
+  if (n) {
+    n.sig = sig;
+    n.sub = sub;
+    n.epoch = epoch;
+    return n;
+  }
+  const fresh = createNode();
+  fresh.sig = sig;
+  fresh.sub = sub;
+  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(sub, node) {
+  const oldTail = sub.depsTail ?? null;
+  node.subPrev = oldTail;
+  node.subNext = null;
+  if (oldTail) oldTail.subNext = node;
+  else sub.depsHead = node;
+  sub.depsTail = node;
+}
+function unlinkSub(node) {
+  const sub = node.sub;
+  if (!sub) return;
+  const prev = node.subPrev;
+  const next = node.subNext;
+  if (prev) prev.subNext = next;
+  else sub.depsHead = next;
+  if (next) next.subPrev = prev;
+  else sub.depsTail = prev;
+}
 var currentSubscriber = null;
-var SUBS = "__s";
 var notifyDepth = 0;
 var pendingQueue = [];
 var pendingSet = /* @__PURE__ */ new Set();
@@ -78,92 +155,136 @@ function safeInvoke(sub) {
   }
 }
 var trackingSuspended = false;
+var subscriberEpochCounter = 0;
 function retrack(effectFn, subscriber) {
   const prev = currentSubscriber;
   currentSubscriber = subscriber;
+  const sub = subscriber;
+  const epoch = ++subscriberEpochCounter;
+  sub._epoch = epoch;
+  sub._structDirty = false;
+  for (let n = sub.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 = sub.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);
-  ++stackTop;
-  if (stackTop >= stackCapacity) {
-    stackCapacity *= 2;
-    subscriberStack.length = stackCapacity;
-  }
-  subscriberStack[stackTop] = subscriber;
+  const prev = currentSubscriber;
   currentSubscriber = subscriber;
   try {
     effectFn();
   } finally {
-    stackTop--;
-    currentSubscriber = stackTop >= 0 ? subscriberStack[stackTop] : null;
+    currentSubscriber = prev;
+    const sub2 = subscriber;
+    for (let n = sub2.depsHead ?? null; n !== null; n = n.subNext) {
+      const sig = n.sig;
+      sig.__activeNode = n.prevActive;
+      n.prevActive = null;
+    }
   }
-  return () => cleanup(subscriber);
+  const sub = subscriber;
+  return sub._dispose ?? (sub._dispose = () => cleanup(subscriber));
 }
 function recordDependency(signal2) {
   if (!currentSubscriber) return;
   const sub = currentSubscriber;
-  if (sub._dep === signal2) return;
-  const deps = sub._deps;
-  if (deps) {
-    if (deps.has(signal2)) return;
-    deps.add(signal2);
-  } else if (sub._dep !== void 0) {
-    const set = /* @__PURE__ */ new Set();
-    set.add(sub._dep);
-    set.add(signal2);
-    sub._deps = set;
-    sub._dep = void 0;
-  } else {
-    sub._dep = signal2;
+  const sig = signal2;
+  const epoch = sub._epoch ?? 0;
+  const active = sig.__activeNode ?? null;
+  if (active !== null && active.sub === sub) {
+    active.epoch = epoch;
+    return;
   }
-  let subs = signal2[SUBS];
-  if (!subs) {
-    subs = /* @__PURE__ */ new Set();
-    signal2[SUBS] = subs;
+  const node = allocNode(signal2, sub, epoch);
+  node.prevActive = active;
+  sig.__activeNode = node;
+  linkSub(sub, node);
+  linkSignal(sig, node);
+  sub._structDirty = true;
+}
+function cleanup(subscriber) {
+  const sub = subscriber;
+  let node = sub.depsHead ?? null;
+  sub.depsHead = null;
+  sub.depsTail = null;
+  while (node) {
+    const next = node.subNext;
+    unlinkSignal(node);
+    freeNode(node);
+    node = next;
   }
-  subs.add(currentSubscriber);
-  if (subs.size === 1) {
-    signal2.__f = currentSubscriber;
-  } else if (signal2.__f !== void 0) {
-    signal2.__f = void 0;
+}
+var maxSubscriberRepeats = 50;
+var maxDrainIterations = 1e6;
+var drainEpoch = 0;
+function tickRepeat(sub) {
+  const s = sub;
+  if (s._runEpoch !== drainEpoch) {
+    s._runEpoch = drainEpoch;
+    s._runs = 1;
+    return false;
   }
+  s._runs = (s._runs ?? 0) + 1;
+  return s._runs > maxSubscriberRepeats;
 }
-function queueSignalNotification(signal2) {
-  const subs = signal2[SUBS];
-  if (!subs) return;
-  for (const sub of subs) {
-    if (sub._c) {
-      propagateDirty(sub);
-    } else if (!pendingSet.has(sub)) {
-      pendingSet.add(sub);
-      pendingQueue.push(sub);
+function cycleError(sub) {
+  if (typeof console !== "undefined") {
+    const name = sub.__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 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 i = 0;
+  while (i < pendingQueue.length) {
+    if (i >= maxDrainIterations) {
+      absoluteDrainError();
+      break;
+    }
+    const sub = pendingQueue[i++];
+    if (tickRepeat(sub)) {
+      cycleError(sub);
+      break;
     }
+    pendingSet.delete(sub);
+    safeInvoke(sub);
   }
 }
-var maxDrainIterations = 1e5;
 function drainNotificationQueue() {
   if (notifyDepth > 0) return;
   notifyDepth++;
+  drainEpoch++;
   try {
-    let i = 0;
-    while (i < pendingQueue.length) {
-      if (i >= 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[i]);
-      i++;
-    }
+    drainQueue();
   } finally {
     notifyDepth--;
     if (notifyDepth === 0) {
@@ -181,131 +302,82 @@ function propagateDirty(sub) {
   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 s = node.sub;
+      if (s) {
+        if (s._c) {
+          const nSig = s._sig;
+          if (nSig) {
+            if (!nSig._d) {
+              nSig._d = true;
+              stack.push(nSig);
+            }
+          } else {
+            s();
+          }
+        } else if (!pendingSet.has(s)) {
+          pendingSet.add(s);
+          pendingQueue.push(s);
         }
-      } else if (!pendingSet.has(first)) {
-        pendingSet.add(first);
-        pendingQueue.push(first);
       }
-      continue;
+      node = node.sigNext;
     }
-    const subs = sig[SUBS];
-    if (!subs) continue;
-    for (const s of subs) {
+  }
+}
+function queueSignalNotification(signal2) {
+  const sig = signal2;
+  let node = sig.subsHead ?? null;
+  while (node) {
+    const s = node.sub;
+    if (s) {
       if (s._c) {
-        const nSig = s._sig;
-        if (nSig && !nSig._d) {
-          nSig._d = true;
-          stack.push(nSig);
-        } else if (!nSig) {
-          s();
-        }
+        propagateDirty(s);
       } else if (!pendingSet.has(s)) {
         pendingSet.add(s);
         pendingQueue.push(s);
       }
     }
+    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 i = 0;
-      while (i < pendingQueue.length) {
-        if (i >= 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[i]);
-        i++;
-      }
-    } 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 head = sig.subsHead;
+  if (!head) return;
   if (notifyDepth > 0) {
-    for (const sub of subs) {
-      if (sub._c) {
-        propagateDirty(sub);
-      } else if (!pendingSet.has(sub)) {
-        pendingSet.add(sub);
-        pendingQueue.push(sub);
+    let node = head;
+    while (node) {
+      const s = node.sub;
+      if (s) {
+        if (s._c) {
+          propagateDirty(s);
+        } else if (!pendingSet.has(s)) {
+          pendingSet.add(s);
+          pendingQueue.push(s);
+        }
       }
+      node = node.sigNext;
     }
     return;
   }
   notifyDepth++;
+  drainEpoch++;
   try {
-    let directCount = 0;
-    let hasComputedSub = false;
-    for (const sub of subs) {
-      if (sub._c) hasComputedSub = true;
-      pendingQueue[directCount++] = sub;
-    }
-    if (!hasComputedSub) {
-      for (let i2 = 0; i2 < directCount; i2++) {
-        safeInvoke(pendingQueue[i2]);
-      }
-    } else {
-      for (let i2 = 0; i2 < directCount; i2++) {
-        if (pendingQueue[i2]._c) {
-          propagateDirty(pendingQueue[i2]);
-        }
-      }
-      for (let i2 = 0; i2 < directCount; i2++) {
-        const sub = pendingQueue[i2];
-        if (!sub._c && !pendingSet.has(sub)) {
-          pendingSet.add(sub);
-          safeInvoke(sub);
+    let node = head;
+    while (node) {
+      const s = node.sub;
+      if (s) {
+        if (s._c) {
+          propagateDirty(s);
+        } else if (!pendingSet.has(s)) {
+          pendingSet.add(s);
+          pendingQueue.push(s);
         }
       }
+      node = node.sigNext;
     }
-    let i = directCount;
-    while (i < pendingQueue.length) {
-      if (i - 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.`
-          );
-        }
-        break;
-      }
-      safeInvoke(pendingQueue[i]);
-      i++;
-    }
+    drainQueue();
   } finally {
     notifyDepth--;
     if (notifyDepth === 0) {
@@ -314,37 +386,6 @@ function notifySubscribers(signal2) {
     }
   }
 }
-function cleanup(subscriber) {
-  const sub = subscriber;
-  const singleDep = sub._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;
-      }
-    }
-    sub._dep = void 0;
-    return;
-  }
-  const deps = sub._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/batch.ts
 var batchDepth = 0;
@@ -380,32 +421,64 @@ function flushBatch() {
 var _g = globalThis;
 var _isDev3 = 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 = _isDev3 ? 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 (_isDev3) {
-      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 (_isDev3) {
+        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 (_isDev3) {
+    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 (_isDev3) {
     const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
@@ -503,92 +576,122 @@ function isSSR() {
 
 // src/core/signals/effect.ts
 var _g2 = globalThis;
+var MAX_RERUNS = 100;
+function flushUserCleanups(ctx) {
+  const list = ctx.userCleanups;
+  if (list.length === 0) return;
+  ctx.userCleanups = [];
+  for (let i = list.length - 1; i >= 0; i--) {
+    try {
+      list[i]();
+    } 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 onCleanup = (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 i = list.length - 1; i >= 0; i--) {
-      try {
-        list[i]();
-      } catch (err) {
-        if (typeof console !== "undefined") {
-          console.warn("[SibuJS effect] onCleanup threw:", err);
-        }
-      }
-    }
+  ctx.onCleanup = (fn) => {
+    ctx.userCleanups.push(fn);
   };
-  const invokeBody = () => effectFn(onCleanup);
-  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 sub = (() => {
+    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, sub);
+      if (ctx.rerunPending) drainReruns(ctx);
     } finally {
-      running = false;
+      ctx.running = false;
+      ctx.rerunPending = false;
     }
-  };
-  running = true;
+  });
+  sub.depsHead = null;
+  sub.depsTail = null;
+  sub._epoch = 0;
+  sub._structDirty = false;
+  sub._runEpoch = 0;
+  sub._runs = 0;
+  ctx.subscriber = sub;
+  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/patterns/persist.ts
@@ -821,6 +924,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;
@@ -850,11 +954,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;
@@ -874,6 +981,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;