sibujs 3.4.0 → 4.0.0

package/dist/patterns.cjs

@@ -65,8 +65,95 @@ function devWarn(message) {
   }
 }
 
+// src/core/errors.ts
+var ERROR_STATE_KEY = /* @__PURE__ */ Symbol.for("sibujs.runtime-errors.v1");
+function state() {
+  const g = globalThis;
+  const existing = g[ERROR_STATE_KEY];
+  if (existing) return existing;
+  const created = { handler: null, handlerDepth: 0 };
+  g[ERROR_STATE_KEY] = created;
+  return created;
+}
+function normalizeError(value) {
+  if (value instanceof Error) return value;
+  const message = typeof value === "string" ? value : `Non-Error value thrown: ${safeStringify(value)}`;
+  return new Error(message, { cause: value });
+}
+function safeStringify(value) {
+  if (typeof value === "symbol") return value.toString();
+  try {
+    return typeof value === "object" && value !== null ? JSON.stringify(value) : String(value);
+  } catch {
+    return Object.prototype.toString.call(value);
+  }
+}
+function describe(context) {
+  return context.name ? `${context.phase} "${context.name}"` : context.phase;
+}
+var REACTIVE_REGISTRY_KEY = /* @__PURE__ */ Symbol.for("sibujs.reactive.v1");
+function untrackedRun(fn) {
+  const api = globalThis[REACTIVE_REGISTRY_KEY];
+  return api?.untracked ? api.untracked(fn) : fn();
+}
+var PROPAGATE_EVENT = "sibu:error-propagate";
+function claimedByBoundary(error, context) {
+  const raw = context.node;
+  if (!raw || typeof CustomEvent === "undefined") return false;
+  const target = resolveEventTarget(raw);
+  if (!target) return false;
+  try {
+    const event = new CustomEvent(PROPAGATE_EVENT, {
+      bubbles: true,
+      cancelable: true,
+      detail: { error, context }
+    });
+    return target.dispatchEvent(event) === false;
+  } catch {
+    return false;
+  }
+}
+function resolveEventTarget(node) {
+  const ELEMENT_NODE = 1;
+  let current = node;
+  while (current) {
+    if (current.nodeType === ELEMENT_NODE && typeof current.dispatchEvent === "function") {
+      return current;
+    }
+    current = current.parentNode;
+  }
+  const self = node;
+  return typeof self.dispatchEvent === "function" ? self : null;
+}
+function defaultReport(error, context) {
+  if (typeof console === "undefined") return;
+  console.error(`[SibuJS] Uncaught error during ${describe(context)}: ${error.message}`, error);
+}
+function reportError(error, context) {
+  const err = normalizeError(error);
+  untrackedRun(() => {
+    if (claimedByBoundary(err, context)) return;
+    const s = state();
+    const handler = s.handler;
+    if (handler && s.handlerDepth === 0) {
+      s.handlerDepth++;
+      try {
+        handler(error instanceof Error ? error : err, context);
+        return;
+      } catch (handlerError) {
+        if (typeof console !== "undefined") {
+          const detail = handlerError instanceof Error ? handlerError.message : String(handlerError);
+          console.error(`[SibuJS] runtime error handler itself threw: ${detail}`, handlerError);
+        }
+      } finally {
+        s.handlerDepth--;
+      }
+    }
+    defaultReport(err, context);
+  });
+}
+
 // src/reactivity/track-core.ts
-var _isDev2 = isDev();
 var POOL_MAX = 4096;
 var nodePool = [];
 function createNode() {
@@ -74,6 +161,7 @@ function createNode() {
     sig: null,
     sub: null,
     epoch: 0,
+    depVersion: 0,
     sigPrev: null,
     sigNext: null,
     subPrev: null,
@@ -158,8 +246,27 @@ function safeInvoke(sub) {
   try {
     sub();
   } catch (err) {
-    if (_isDev2) devWarn(`Subscriber threw during notification: ${err instanceof Error ? err.message : String(err)}`);
+    const s = sub;
+    reportError(err, { phase: s._errorPhase ?? "effect", name: s.__name, node: s._errorNode });
+  }
+}
+function depsChanged(sub) {
+  let node = sub.depsHead ?? null;
+  if (node === null) return true;
+  while (node !== null) {
+    const sig = node.sig;
+    if (sig === null) return true;
+    if (sig._d === true && sig._validate !== void 0) {
+      try {
+        sig._validate();
+      } catch {
+        return true;
+      }
+    }
+    if (node.depVersion !== sig.__v) return true;
+    node = node.subNext;
   }
+  return false;
 }
 var suspendDepth = 0;
 var trackingSuspended = false;
@@ -241,7 +348,7 @@ function track(effectFn, subscriber) {
   const sub = subscriber;
   return sub._dispose ?? (sub._dispose = () => cleanup(subscriber));
 }
-function reactiveBinding(commit) {
+function reactiveBinding(commit, ownerNode) {
   const run = () => {
     const s = subscriber;
     if (s._disposed || s._reentrant) return;
@@ -257,13 +364,17 @@ function reactiveBinding(commit) {
   subscriber.depsTail = null;
   subscriber._epoch = 0;
   subscriber._structDirty = false;
+  subscriber._hasComputedDep = false;
   subscriber._runEpoch = 0;
   subscriber._runs = 0;
   subscriber._reentrant = false;
   subscriber._disposed = false;
+  subscriber._errorPhase = "binding";
+  subscriber._errorNode = ownerNode;
   run();
   return subscriber._dispose ?? (subscriber._dispose = () => {
     subscriber._disposed = true;
+    subscriber._errorNode = void 0;
     cleanup(subscriber);
   });
 }
@@ -275,9 +386,12 @@ function recordDependency(signal2) {
   const active = sig.__activeNode ?? null;
   if (active !== null && active.sub === sub) {
     active.epoch = epoch;
+    active.depVersion = sig.__v ?? Number.NaN;
     return;
   }
+  if (sig._validate !== void 0) sub._hasComputedDep = true;
   const node = allocNode(signal2, sub, epoch);
+  node.depVersion = sig.__v ?? Number.NaN;
   node.prevActive = active;
   sig.__activeNode = node;
   linkSub(sub, node);
@@ -296,9 +410,10 @@ function cleanup(subscriber) {
     node = next;
   }
 }
-var maxSubscriberRepeats = 50;
+var maxSubscriberRepeats = 1e3;
 var maxDrainIterations = 1e6;
 var drainEpoch = 0;
+var quarantined = /* @__PURE__ */ new Set();
 function setMaxSubscriberRepeats(n) {
   const prev = maxSubscriberRepeats;
   if (Number.isFinite(n) && n > 0) maxSubscriberRepeats = Math.floor(n);
@@ -320,19 +435,21 @@ function tickRepeat(sub) {
   return s._runs > maxSubscriberRepeats;
 }
 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.`
-    );
-  }
+  const name = sub.__name ?? "<unnamed>";
+  reportError(
+    new Error(
+      `subscriber "${name}" fired more than ${maxSubscriberRepeats} times \u2014 likely a write-reads-self cycle between effects/signals. This subscriber is quarantined for the rest of this update; other pending work still runs.`
+    ),
+    { phase: "scheduler", name }
+  );
 }
 function absoluteDrainError() {
-  if (typeof console !== "undefined") {
-    console.error(
-      `[SibuJS] Notification drain exceeded ${maxDrainIterations} iterations \u2014 absolute safety net tripped. Breaking to prevent infinite loop.`
-    );
-  }
+  reportError(
+    new Error(
+      `Notification drain exceeded ${maxDrainIterations} iterations \u2014 absolute safety net tripped. Breaking to prevent infinite loop.`
+    ),
+    { phase: "scheduler" }
+  );
 }
 function drainQueue() {
   let i = 0;
@@ -342,11 +459,14 @@ function drainQueue() {
       break;
     }
     const sub = pendingQueue[i++];
+    pendingSet.delete(sub);
+    if (quarantined.size > 0 && quarantined.has(sub)) continue;
+    if (sub._hasComputedDep === true && !depsChanged(sub)) continue;
     if (tickRepeat(sub)) {
       cycleError(sub);
-      break;
+      quarantined.add(sub);
+      continue;
     }
-    pendingSet.delete(sub);
     safeInvoke(sub);
   }
 }
@@ -361,6 +481,7 @@ function drainNotificationQueue() {
     if (notifyDepth === 0) {
       pendingQueue.length = 0;
       pendingSet.clear();
+      if (quarantined.size > 0) quarantined.clear();
     }
   }
 }
@@ -454,6 +575,7 @@ function notifySubscribers(signal2) {
     if (notifyDepth === 0) {
       pendingQueue.length = 0;
       pendingSet.clear();
+      if (quarantined.size > 0) quarantined.clear();
     }
   }
 }
@@ -480,14 +602,14 @@ function forEachSubscriber(signal2, visit) {
 }
 
 // src/reactivity/track.ts
-var _isDev3 = isDev();
-var _runtimeVersion = true ? "3.4.0" : "dev";
+var _isDev2 = isDev();
+var _runtimeVersion = true ? "4.0.0" : "dev";
 var REGISTRY_KEY = /* @__PURE__ */ Symbol.for("sibujs.reactive.v1");
 function resolveReactiveApi() {
   const g = globalThis;
   const existing = g[REGISTRY_KEY];
   if (existing) {
-    if (_isDev3 && !existing.__dupWarned) {
+    if (_isDev2 && !existing.__dupWarned) {
       existing.__dupWarned = true;
       devWarn(
         `Multiple instances of the reactive runtime detected on this page (active: ${existing.version}, duplicate: ${_runtimeVersion}). Reactivity still works \u2014 all copies share the first one \u2014 but de-duplicate sibujs in your bundler (e.g. Vite optimizeDeps.exclude: ['sibujs'] or resolve.dedupe: ['sibujs']).`
@@ -589,70 +711,72 @@ var isBatching = API2.isBatching;
 
 // src/core/signals/signal.ts
 var _g = globalThis;
-var _isDev4 = isDev();
+var _isDev3 = isDev();
 function signal(initial, options) {
-  const state = {
+  const state2 = {
     value: initial,
     __v: 0,
     __sc: 0,
     subsHead: null,
     subsTail: null,
     __activeNode: null,
-    __name: void 0
+    __name: void 0,
+    _d: false,
+    _validate: void 0
   };
-  const debugName = _isDev4 ? options?.name : void 0;
+  const debugName = _isDev3 ? options?.name : void 0;
   const equalsFn = options?.equals;
-  if (debugName) state.__name = debugName;
+  if (debugName) state2.__name = debugName;
   function get() {
-    recordDependency2(state);
-    return state.value;
+    recordDependency2(state2);
+    return state2.value;
   }
-  get.__signal = state;
+  get.__signal = state2;
   if (debugName) get.__name = debugName;
   let set;
   if (equalsFn) {
     set = (next) => {
-      const prev = state.value;
+      const prev = state2.value;
       const newValue = typeof next === "function" ? next(prev) : next;
       if (equalsFn(prev, newValue)) return;
-      state.value = newValue;
-      state.__v++;
-      if (_isDev4) {
+      state2.value = newValue;
+      state2.__v++;
+      if (_isDev3) {
         const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-        if (hook) hook.emit("signal:update", { signal: state, name: debugName, oldValue: prev, newValue });
+        if (hook) hook.emit("signal:update", { signal: state2, name: debugName, oldValue: prev, newValue });
       }
-      if (!enqueueBatchedSignal(state)) {
-        notifySubscribers2(state);
+      if (!enqueueBatchedSignal(state2)) {
+        notifySubscribers2(state2);
       }
     };
-  } else if (_isDev4) {
+  } else if (_isDev3) {
     set = (next) => {
-      const prev = state.value;
+      const prev = state2.value;
       const newValue = typeof next === "function" ? next(prev) : next;
       if (Object.is(newValue, prev)) return;
-      state.value = newValue;
-      state.__v++;
+      state2.value = newValue;
+      state2.__v++;
       const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-      if (hook) hook.emit("signal:update", { signal: state, name: debugName, oldValue: prev, newValue });
-      if (!enqueueBatchedSignal(state)) {
-        notifySubscribers2(state);
+      if (hook) hook.emit("signal:update", { signal: state2, name: debugName, oldValue: prev, newValue });
+      if (!enqueueBatchedSignal(state2)) {
+        notifySubscribers2(state2);
       }
     };
   } else {
     set = (next) => {
-      const prev = state.value;
+      const prev = state2.value;
       const newValue = typeof next === "function" ? next(prev) : next;
       if (Object.is(newValue, prev)) return;
-      state.value = newValue;
-      state.__v++;
-      if (!enqueueBatchedSignal(state)) {
-        notifySubscribers2(state);
+      state2.value = newValue;
+      state2.__v++;
+      if (!enqueueBatchedSignal(state2)) {
+        notifySubscribers2(state2);
       }
     };
   }
-  if (_isDev4) {
+  if (_isDev3) {
     const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-    if (hook) hook.emit("signal:create", { signal: state, name: debugName, getter: get, initial });
+    if (hook) hook.emit("signal:create", { signal: state2, name: debugName, getter: get, initial });
   }
   return [get, set];
 }
@@ -672,14 +796,14 @@ function stripUnsafeKeys(obj) {
 
 // src/patterns/machine.ts
 function machine(config) {
-  const [state, setState] = signal(config.initial);
+  const [state2, setState] = signal(config.initial);
   const [context, setContext] = signal(config.context || {});
   const initialDef = config.states[config.initial];
   if (initialDef?.entry) {
     initialDef.entry(context());
   }
   function send(event) {
-    const currentState = state();
+    const currentState = state2();
     const stateDef = config.states[currentState];
     if (!stateDef?.on) return;
     const transition = stateDef.on[event];
@@ -711,10 +835,10 @@ function machine(config) {
     }
   }
   function matches(s) {
-    return state() === s;
+    return state2() === s;
   }
   function can(event) {
-    const currentState = state();
+    const currentState = state2();
     const stateDef = config.states[currentState];
     if (!stateDef?.on) return false;
     const transition = stateDef.on[event];
@@ -725,7 +849,7 @@ function machine(config) {
     }
     return true;
   }
-  return { state, context, send, matches, can };
+  return { state: state2, context, send, matches, can };
 }
 
 // src/core/ssr-context.ts
@@ -738,20 +862,24 @@ function detectSSRShared() {
       const getBuiltin = process.getBuiltinModule;
       if (typeof getBuiltin === "function") {
         mod = getBuiltin("node:async_hooks");
-      } else {
-        const req = Function("return typeof require==='function'?require:null")();
-        if (req) mod = req("node:async_hooks");
+      } else if (typeof require === "function") {
+        mod = require("async_hooks");
       }
       if (mod) detected = new mod.AsyncLocalStorage();
     }
   } catch {
     detected = null;
   }
-  return { als: detected, fallbackStore: { ssr: false, suspenseIdCounter: 0 } };
+  return {
+    als: detected,
+    fallbackStore: { ssr: false, suspenseIdCounter: 0, locale: void 0 },
+    fallbackDepth: 0
+  };
 }
 var _shared = globalThis[SSR_KEY] ?? (globalThis[SSR_KEY] = detectSSRShared());
 var als = _shared.als;
 var fallbackStore = _shared.fallbackStore;
+_shared.fallbackDepth ?? (_shared.fallbackDepth = 0);
 function getSSRStore() {
   if (als) {
     const s = als.getStore();
@@ -774,7 +902,7 @@ function flushUserCleanups(ctx) {
     try {
       list[i]();
     } catch (err) {
-      if (typeof console !== "undefined") console.warn("[SibuJS effect] onCleanup threw:", err);
+      reportError(err, { phase: "cleanup" });
     }
   }
 }
@@ -787,11 +915,12 @@ function drainReruns(ctx) {
   } 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.`
-      );
-    }
+    reportError(
+      new Error(
+        `effect re-requested itself ${MAX_RERUNS}+ times \u2014 likely a write-reads-self cycle. Breaking to prevent infinite loop.`
+      ),
+      { phase: "effect" }
+    );
   }
 }
 function disposeEffect(ctx) {
@@ -868,6 +997,8 @@ function effect(effectFn, options) {
   sub.depsTail = null;
   sub._epoch = 0;
   sub._structDirty = false;
+  sub._hasComputedDep = false;
+  sub._errorPhase = "effect";
   sub._runEpoch = 0;
   sub._runs = 0;
   ctx.subscriber = sub;
@@ -990,116 +1121,258 @@ function optimistic(initialValue) {
       }
     } finally {
       inflightCount--;
-      if (inflightCount === 0) setPending(false);
+      if (inflightCount <= 0) {
+        inflightCount = 0;
+        setPending(false);
+      }
     }
   }
   return { value, pending, update };
 }
 function optimisticList(initialValue) {
-  const [items, setItems] = signal([...initialValue]);
+  let nextRowId = 0;
+  let nextKey = 0;
+  let nextOpId = 0;
+  const records = /* @__PURE__ */ new Map();
+  let order = [];
+  for (const value of initialValue) {
+    const row = { id: nextRowId++, key: nextKey++, base: value, claims: [], visible: true, refs: 0 };
+    records.set(row.id, row);
+    order.push(row.id);
+  }
+  function effectiveValue(row) {
+    const claims = row.claims;
+    return claims.length > 0 ? claims[claims.length - 1].value : row.base;
+  }
+  function valueBelow(row, opId) {
+    const claims = row.claims;
+    for (let i = claims.length - 1; i >= 0; i--) {
+      if (claims[i].opId < opId) return claims[i].value;
+    }
+    return row.base;
+  }
+  function stake(row, opId, value) {
+    const claim = { opId, value, settled: false };
+    const claims = row.claims;
+    let at = claims.length;
+    while (at > 0 && claims[at - 1].opId > opId) at--;
+    claims.splice(at, 0, claim);
+    return claim;
+  }
+  function dropClaim(row, claim) {
+    const at = row.claims.indexOf(claim);
+    if (at !== -1) row.claims.splice(at, 1);
+  }
+  function collapse(row) {
+    const claims = row.claims;
+    let i = 0;
+    while (i < claims.length && claims[i].settled) {
+      row.base = claims[i].value;
+      i++;
+    }
+    if (i > 0) claims.splice(0, i);
+  }
+  const [items, setItems] = signal(order.map((id) => effectiveValue(records.get(id))));
   const [pending, setPending] = signal(false);
-  let inflightCount = 0;
-  let version = 0;
-  let tempIdCounter = 0;
-  const itemIds = /* @__PURE__ */ new WeakMap();
-  const idToItem = /* @__PURE__ */ new Map();
-  function tagItem(item) {
-    const id = ++tempIdCounter;
-    if (item !== null && typeof item === "object") {
-      itemIds.set(item, id);
-    }
-    idToItem.set(id, item);
-    return id;
-  }
-  function findIndexById(list, id) {
-    for (let i = 0; i < list.length; i++) {
-      const it = list[i];
-      if (it !== null && typeof it === "object" && itemIds.get(it) === id) {
-        return i;
+  let inflight = 0;
+  const retiredRowIds = /* @__PURE__ */ new Set();
+  function project() {
+    const out = new Array(order.length);
+    for (let i = 0; i < order.length; i++) out[i] = effectiveValue(records.get(order[i]));
+    return out;
+  }
+  function commit(mutate) {
+    batch(() => {
+      let visibleChanged = false;
+      try {
+        visibleChanged = mutate();
+      } finally {
+        setPending(inflight > 0);
+        if (visibleChanged) setItems(project());
       }
-      if (Object.is(it, idToItem.get(id))) return i;
+    });
+  }
+  function hide(id) {
+    const row = records.get(id);
+    if (!row || !row.visible) return false;
+    row.visible = false;
+    order = order.filter((x) => x !== id);
+    return true;
+  }
+  function restore(ids) {
+    const restorable = [];
+    for (const id of ids) {
+      const row = records.get(id);
+      if (!row || row.visible || retiredRowIds.has(id)) continue;
+      restorable.push(id);
+    }
+    if (restorable.length === 0) return false;
+    const merged = new Array(order.length + restorable.length);
+    let i = 0;
+    let j = 0;
+    let w = 0;
+    while (i < order.length && j < restorable.length) {
+      const a = records.get(order[i]).key;
+      const b = records.get(restorable[j]).key;
+      merged[w++] = a <= b ? order[i++] : restorable[j++];
     }
-    return -1;
+    while (i < order.length) merged[w++] = order[i++];
+    while (j < restorable.length) merged[w++] = restorable[j++];
+    for (const id of restorable) records.get(id).visible = true;
+    order = merged;
+    return true;
   }
-  function begin() {
-    const v = ++version;
-    inflightCount++;
-    setPending(true);
-    return v;
+  function retain(ids) {
+    for (const id of ids) {
+      const row = records.get(id);
+      if (row) row.refs++;
+    }
   }
-  function end(myVersion, revertFn) {
-    if (revertFn && version === myVersion) {
-      revertFn();
+  function release(ids) {
+    for (const id of ids) {
+      const row = records.get(id);
+      if (!row) continue;
+      row.refs--;
+      if (row.refs <= 0 && !row.visible) {
+        records.delete(id);
+        retiredRowIds.delete(id);
+      }
+    }
+  }
+  function settle(heldIds) {
+    release(heldIds);
+    inflight--;
+    if (inflight <= 0) {
+      inflight = 0;
+      retiredRowIds.clear();
+      if (records.size !== order.length) {
+        for (const [id, row] of records) {
+          if (!row.visible) records.delete(id);
+        }
+      }
     }
-    inflightCount--;
-    if (inflightCount === 0) setPending(false);
   }
   async function add(item, asyncAction) {
-    const prev = items();
-    const id = tagItem(item);
-    setItems([...prev, item]);
-    const myVersion = begin();
+    const opId = ++nextOpId;
+    const row = { id: nextRowId++, key: nextKey++, base: item, claims: [], visible: false, refs: 1 };
+    const claim = stake(row, opId, item);
+    commit(() => {
+      records.set(row.id, row);
+      row.visible = true;
+      order = [...order, row.id];
+      inflight++;
+      return true;
+    });
+    let result;
+    let failed = false;
     try {
-      const result = await asyncAction();
-      setItems((current) => {
-        const idx = findIndexById(current, id);
-        if (idx >= 0) {
-          const next = [...current];
-          next[idx] = result;
-          return next;
-        }
-        return [...current, result];
-      });
-      idToItem.delete(id);
-      end(myVersion);
+      result = await asyncAction();
     } catch {
-      idToItem.delete(id);
-      end(myVersion, () => setItems(prev));
+      failed = true;
     }
+    commit(() => {
+      try {
+        if (failed) {
+          retiredRowIds.add(row.id);
+          dropClaim(row, claim);
+          return hide(row.id);
+        }
+        const before = effectiveValue(row);
+        claim.value = result;
+        claim.settled = true;
+        collapse(row);
+        return row.visible && !Object.is(before, effectiveValue(row));
+      } finally {
+        settle([row.id]);
+      }
+    });
   }
   async function remove(predicate, asyncAction) {
-    const prev = items();
-    setItems(prev.filter((item) => !predicate(item)));
-    const myVersion = begin();
+    const opId = ++nextOpId;
+    const matchedIds = [];
+    for (const id of order) {
+      if (predicate(valueBelow(records.get(id), opId))) matchedIds.push(id);
+    }
+    commit(() => {
+      retain(matchedIds);
+      inflight++;
+      if (matchedIds.length === 0) return false;
+      const removing = new Set(matchedIds);
+      for (const id of matchedIds) {
+        const row = records.get(id);
+        if (row) row.visible = false;
+      }
+      order = order.filter((id) => !removing.has(id));
+      return true;
+    });
+    let failed = false;
     try {
       await asyncAction();
-      end(myVersion);
     } catch {
-      end(myVersion, () => setItems(prev));
+      failed = true;
     }
+    commit(() => {
+      try {
+        if (!failed) {
+          for (const id of matchedIds) retiredRowIds.add(id);
+          return false;
+        }
+        return restore(matchedIds);
+      } finally {
+        settle(matchedIds);
+      }
+    });
   }
   async function updateItem(predicate, patch, asyncAction) {
-    const prev = items();
-    const patchedIds = [];
-    setItems(
-      prev.map((item) => {
-        if (predicate(item)) {
-          const patched = { ...item, ...patch };
-          const id = tagItem(patched);
-          patchedIds.push(id);
-          return patched;
-        }
-        return item;
-      })
-    );
-    const myVersion = begin();
+    const opId = ++nextOpId;
+    const prepared = [];
+    for (const id of order) {
+      const row = records.get(id);
+      const seen = valueBelow(row, opId);
+      if (!predicate(seen)) continue;
+      prepared.push({ row, nextValue: { ...seen, ...patch } });
+    }
+    const preparedIds = prepared.map((p) => p.row.id);
+    const claims = [];
+    commit(() => {
+      retain(preparedIds);
+      inflight++;
+      let visibleChanged = false;
+      for (const p of prepared) {
+        const before = effectiveValue(p.row);
+        claims.push(stake(p.row, opId, p.nextValue));
+        if (p.row.visible && !Object.is(before, effectiveValue(p.row))) visibleChanged = true;
+      }
+      return visibleChanged;
+    });
+    let result;
+    let failed = false;
     try {
-      const result = await asyncAction();
-      setItems(
-        (current) => current.map((item) => {
-          if (item !== null && typeof item === "object") {
-            const existingId = itemIds.get(item);
-            if (existingId !== void 0 && patchedIds.includes(existingId)) return result;
-          }
-          return item;
-        })
-      );
-      for (const id of patchedIds) idToItem.delete(id);
-      end(myVersion);
+      result = await asyncAction();
     } catch {
-      for (const id of patchedIds) idToItem.delete(id);
-      end(myVersion, () => setItems(prev));
+      failed = true;
     }
+    commit(() => {
+      try {
+        let visibleChanged = false;
+        for (let i = 0; i < claims.length; i++) {
+          const row = prepared[i].row;
+          const claim = claims[i];
+          const before = effectiveValue(row);
+          if (failed) {
+            dropClaim(row, claim);
+          } else {
+            claim.value = result;
+            claim.settled = true;
+          }
+          collapse(row);
+          if (row.visible && !Object.is(before, effectiveValue(row))) visibleChanged = true;
+        }
+        return visibleChanged;
+      } finally {
+        settle(preparedIds);
+      }
+    });
   }
   return {
     items,
@@ -1145,6 +1418,21 @@ function derived(getter, options) {
   }, markDirty);
   const hook = globalThis.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
   let evaluating = false;
+  const validate = () => {
+    if (!cs._d) return;
+    const oldValue = cs._v;
+    evaluating = true;
+    try {
+      retrack2(recompute, markDirty);
+      if (!Object.is(oldValue, cs._v)) cs.__v++;
+    } finally {
+      evaluating = false;
+    }
+    if (hook && !Object.is(oldValue, cs._v)) {
+      hook.emit("computed:update", { signal: cs, oldValue, newValue: cs._v });
+    }
+  };
+  cs._validate = validate;
   function computedGetter() {
     if (evaluating) {
       throw new Error(
@@ -1152,32 +1440,11 @@ function derived(getter, options) {
       );
     }
     if (isTrackingSuspended2()) {
-      if (cs._d) {
-        const prev = cs._v;
-        evaluating = true;
-        try {
-          retrack2(recompute, markDirty);
-          if (!Object.is(prev, cs._v)) cs.__v++;
-        } finally {
-          evaluating = false;
-        }
-      }
+      if (cs._d) validate();
       return cs._v;
     }
+    if (cs._d) validate();
     recordDependency2(cs);
-    if (cs._d) {
-      const oldValue = cs._v;
-      evaluating = true;
-      try {
-        retrack2(recompute, markDirty);
-        if (!Object.is(oldValue, cs._v)) cs.__v++;
-      } finally {
-        evaluating = false;
-      }
-      if (hook && oldValue !== cs._v) {
-        hook.emit("computed:update", { signal: cs, oldValue, newValue: cs._v });
-      }
-    }
     return cs._v;
   }
   if (debugName) {