sibujs 4.6.0 → 4.7.0

package/dist/{chunk-D33YTSX5.js → chunk-FQRUXCEE.js}

@@ -1,9 +1,10 @@
 import {
   drainNotificationQueue,
+  emitDevtools,
   notifySubscribers,
   queueSignalNotification,
   recordDependency
-} from "./chunk-5Q4R7HCL.js";
+} from "./chunk-JWKYU5GV.js";
 import {
   DEV
 } from "./chunk-NYNYSPK7.js";
@@ -91,7 +92,7 @@ function signal(initial, options) {
       state.__v++;
       if (DEV) {
         const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-        if (hook) hook.emit("signal:update", { signal: state, name: debugName, oldValue: prev, newValue });
+        if (hook) emitDevtools(hook, "signal:update", { signal: state, name: debugName, oldValue: prev, newValue });
       }
       if (!enqueueBatchedSignal(state)) {
         notifySubscribers(state);
@@ -105,7 +106,7 @@ function signal(initial, options) {
       state.value = newValue;
       state.__v++;
       const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-      if (hook) hook.emit("signal:update", { signal: state, name: debugName, oldValue: prev, newValue });
+      if (hook) emitDevtools(hook, "signal:update", { signal: state, name: debugName, oldValue: prev, newValue });
       if (!enqueueBatchedSignal(state)) {
         notifySubscribers(state);
       }
@@ -124,7 +125,7 @@ function signal(initial, options) {
   }
   if (DEV) {
     const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-    if (hook) hook.emit("signal:create", { signal: state, name: debugName, getter: get, initial });
+    if (hook) emitDevtools(hook, "signal:create", { signal: state, name: debugName, getter: get, initial });
   }
   return [get, set];
 }

package/dist/{chunk-5Q4R7HCL.js → chunk-JWKYU5GV.js}

@@ -498,7 +498,7 @@ function forEachSubscriber(signal, visit) {
 }
 
 // src/reactivity/track.ts
-var _runtimeVersion = true ? "4.6.0" : "dev";
+var _runtimeVersion = true ? "4.7.0" : "dev";
 var REGISTRY_KEY = /* @__PURE__ */ Symbol.for("sibujs.reactive.v1");
 function resolveReactiveApi() {
   const g = globalThis;
@@ -554,6 +554,14 @@ var getSubscriberCount2 = API.getSubscriberCount;
 var getSubscriberDeps2 = API.getSubscriberDeps;
 var forEachSubscriber2 = API.forEachSubscriber;
 
+// src/core/devtoolsHook.ts
+function emitDevtools(hook, event, payload) {
+  try {
+    hook.emit(event, payload);
+  } catch {
+  }
+}
+
 export {
   suspendTracking2 as suspendTracking,
   resumeTracking2 as resumeTracking,
@@ -570,5 +578,6 @@ export {
   notifySubscribers2 as notifySubscribers,
   getSubscriberCount2 as getSubscriberCount,
   getSubscriberDeps2 as getSubscriberDeps,
-  forEachSubscriber2 as forEachSubscriber
+  forEachSubscriber2 as forEachSubscriber,
+  emitDevtools
 };

package/dist/{chunk-QE4TTDU3.js → chunk-RUSSKG6G.js}

@@ -1,10 +1,11 @@
 import {
   cleanup,
+  emitDevtools,
   isTrackingSuspended,
   recordDependency,
   retrack,
   track
-} from "./chunk-5Q4R7HCL.js";
+} from "./chunk-JWKYU5GV.js";
 import {
   devAssert
 } from "./chunk-NYNYSPK7.js";
@@ -35,17 +36,17 @@ function derived(getter, options) {
     cs._d = false;
     cs._init = true;
   };
-  track(() => {
-    let threw = true;
-    try {
+  try {
+    track(() => {
       cs._v = getter();
       cs._d = false;
       cs._init = true;
-      threw = false;
-    } finally {
-      if (threw) cs._d = true;
-    }
-  }, markDirty);
+    }, markDirty);
+  } catch (err) {
+    disposed = true;
+    cleanup(markDirty);
+    throw err;
+  }
   const hook = globalThis.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
   const validate = () => {
     if (!cs._d || disposed || pendingError !== void 0) return;
@@ -64,7 +65,7 @@ function derived(getter, options) {
       if (disposed) cleanup(markDirty);
     }
     if (hook && !disposed && !Object.is(oldValue, cs._v)) {
-      hook.emit("computed:update", { signal: cs, oldValue, newValue: cs._v });
+      emitDevtools(hook, "computed:update", { signal: cs, oldValue, newValue: cs._v });
     }
   };
   cs._validate = validate;
@@ -115,7 +116,7 @@ function derived(getter, options) {
       }
     }
   };
-  if (hook) hook.emit("computed:create", { signal: cs, name: debugName, getter: computedGetter });
+  if (hook) emitDevtools(hook, "computed:create", { signal: cs, name: debugName, getter: computedGetter });
   return computedGetter;
 }
 

package/dist/{chunk-UZQ6ALFS.js → chunk-SLM3IA34.js}

@@ -5,7 +5,7 @@ import {
   resumeTracking,
   suspendTracking,
   track
-} from "./chunk-5Q4R7HCL.js";
+} from "./chunk-JWKYU5GV.js";
 import {
   devAssert
 } from "./chunk-NYNYSPK7.js";

package/dist/{chunk-XRRZKZYX.js → chunk-UNWRJRKC.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-5HZXGZ6T.js";
 import {
   signal
-} from "./chunk-D33YTSX5.js";
+} from "./chunk-FQRUXCEE.js";
 import {
   registerDisposer,
   reportError

package/dist/{chunk-VVWPJ543.js → chunk-UOL2ECCS.js}

@@ -1,7 +1,7 @@
 import {
   bindAttribute,
   setSafeAttribute
-} from "./chunk-47M47FOM.js";
+} from "./chunk-FNJXNGYZ.js";
 import {
   isEventHandlerAttr,
   sanitizeCSSValue,
@@ -9,7 +9,7 @@ import {
 } from "./chunk-2INLLLMZ.js";
 import {
   reactiveBinding
-} from "./chunk-5Q4R7HCL.js";
+} from "./chunk-JWKYU5GV.js";
 import {
   DEV,
   devWarn,
@@ -219,8 +219,34 @@ function toKebab(prop) {
 }
 function applyStyle(el, style) {
   if (typeof style === "function") {
+    const getter = style;
+    let written = [];
+    let wroteString = false;
     const teardown = reactiveBinding(() => {
-      el.setAttribute("style", sanitizeStyleAttribute(String(style()), { element: el }));
+      const value = getter();
+      if (value === null || typeof value !== "object") {
+        written = [];
+        wroteString = true;
+        el.setAttribute("style", sanitizeStyleAttribute(String(value), { element: el }));
+        return;
+      }
+      const decl = el.style;
+      if (wroteString) {
+        el.removeAttribute("style");
+        wroteString = false;
+      }
+      const next = [];
+      for (const prop in value) {
+        const val = value[prop];
+        if (val == null) continue;
+        const name = toKebab(prop);
+        next.push(name);
+        decl.setProperty(name, sanitizeCSSValue(String(val), { property: name, element: el }));
+      }
+      for (let i = 0; i < written.length; i++) {
+        if (next.indexOf(written[i]) === -1) decl.removeProperty(written[i]);
+      }
+      written = next;
     }, el);
     registerDisposer(el, teardown);
     return;
@@ -246,7 +272,7 @@ function applyStyle(el, style) {
 }
 function resolveClassValue(cls) {
   if (typeof cls === "string") return cls;
-  if (typeof cls === "function") return cls();
+  if (typeof cls === "function") return cls() || "";
   if (!cls) return "";
   let out = "";
   for (const name in cls) {
@@ -263,7 +289,9 @@ function applyClass(el, cls) {
   }
   if (typeof cls === "function") {
     const teardown = reactiveBinding(() => {
-      el.setAttribute("class", cls());
+      const value = cls();
+      if (value == null || value === false) el.removeAttribute("class");
+      else el.setAttribute("class", value);
     }, el);
     registerDisposer(el, teardown);
     return;
@@ -345,7 +373,7 @@ function appendChildren(el, nodes) {
     }
   }
 }
-var tagFactory = (tag, ns) => {
+function tagFactory(tag, ns) {
   const blocked = isBlockedTag(tag);
   return (first, second) => {
     if (blocked) {
@@ -394,7 +422,9 @@ var tagFactory = (tag, ns) => {
     const pClass = props.class;
     if (pClass != null) applyClass(el, pClass);
     const pId = props.id;
-    if (pId != null) {
+    if (typeof pId === "function") {
+      registerDisposer(el, bindAttribute(el, "id", pId));
+    } else if (pId != null) {
       if (DEV && typeof pId === "string" && CLOBBER_RISKY_IDS.has(pId.toLowerCase())) {
         devWarn(
           `tagFactory: element id="${pId}" matches a common global and may cause DOM clobbering. Avoid setting ids from untrusted input.`
@@ -444,12 +474,10 @@ var tagFactory = (tag, ns) => {
         }
       }
     }
-    if (props.onElement && typeof props.onElement === "function") {
-      props.onElement(el);
-    }
+    if (typeof props.onElement === "function") props.onElement(el);
     return el;
   };
-};
+}
 
 export {
   captureFocusWithin,
@@ -457,5 +485,6 @@ export {
   bindChildNode,
   SVG_NS,
   resolveClassValue,
+  appendChildren,
   tagFactory
 };

package/dist/{chunk-ORMZXBKQ.js → chunk-VZSG24LS.js}

@@ -6,7 +6,7 @@ import {
 import {
   div,
   span
-} from "./chunk-JSXPZCET.js";
+} from "./chunk-7LUJQAOJ.js";
 import {
   STATIC_VALUE_RESOLVER,
   planHeadElementEntry,
@@ -20,11 +20,11 @@ import {
 } from "./chunk-7ZHH77QA.js";
 import {
   effect
-} from "./chunk-XC4MEKGA.js";
+} from "./chunk-WEQ3DMVL.js";
 import {
   batch,
   signal
-} from "./chunk-D33YTSX5.js";
+} from "./chunk-FQRUXCEE.js";
 import {
   registerDisposer,
   replaceChildrenSafely,

package/dist/{chunk-XC4MEKGA.js → chunk-WEQ3DMVL.js}

@@ -3,9 +3,10 @@ import {
 } from "./chunk-7XHATCIH.js";
 import {
   cleanup,
+  emitDevtools,
   retrack,
   untracked
-} from "./chunk-5Q4R7HCL.js";
+} from "./chunk-JWKYU5GV.js";
 import {
   devAssert,
   reportError
@@ -142,12 +143,17 @@ function effect(effectFn, options) {
   try {
     retrack(ctx.bodyFn, ctx.subscriber);
     if (ctx.rerunPending) drainReruns(ctx);
+  } catch (err) {
+    ctx.disposed = true;
+    if (ctx.userCleanups.length > 0) flushUserCleanups(ctx);
+    cleanup(ctx.subscriber);
+    throw err;
   } finally {
     ctx.running = false;
     ctx.rerunPending = false;
   }
   const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook) hook.emit("effect:create", { effectFn });
+  if (hook) emitDevtools(hook, "effect:create", { effectFn });
   return () => disposeEffect(ctx);
 }
 

package/dist/{chunk-PK6FK2G2.js → chunk-WOLJZUFQ.js}

@@ -1,6 +1,6 @@
 import {
   derived
-} from "./chunk-QE4TTDU3.js";
+} from "./chunk-RUSSKG6G.js";
 import {
   sanitizeUrl
 } from "./chunk-2INLLLMZ.js";
@@ -9,14 +9,17 @@ import {
 } from "./chunk-7ZHH77QA.js";
 import {
   effect
-} from "./chunk-XC4MEKGA.js";
+} from "./chunk-WEQ3DMVL.js";
 import {
   getRequestScopedCache
 } from "./chunk-7XHATCIH.js";
 import {
   batch,
   signal
-} from "./chunk-D33YTSX5.js";
+} from "./chunk-FQRUXCEE.js";
+import {
+  untracked
+} from "./chunk-JWKYU5GV.js";
 import {
   reportError
 } from "./chunk-NYNYSPK7.js";
@@ -132,7 +135,83 @@ function waitForRetryDelay(delay, signal2) {
   });
 }
 
+// src/data/structuralSharing.ts
+function isPlainObject(value) {
+  if (value === null || typeof value !== "object") return false;
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null;
+}
+function isPlainArray(value) {
+  return Array.isArray(value) && Object.getPrototypeOf(value) === Array.prototype;
+}
+function reconcile(prev, next, depth, walk, newRoot) {
+  if (Object.is(prev, next)) return prev;
+  const arrays = isPlainArray(prev) && isPlainArray(next);
+  if (!arrays && !(isPlainObject(prev) && isPlainObject(next))) return next;
+  if (Object.getPrototypeOf(prev) !== Object.getPrototypeOf(next)) return next;
+  const nextObject = next;
+  const seenAt = walk.path.get(nextObject);
+  if (seenAt !== void 0) {
+    walk.cycleTo = Math.min(walk.cycleTo, seenAt);
+    return next;
+  }
+  const prevRecord = prev;
+  const nextRecord = next;
+  const nextKeys = arrays ? Array.from({ length: next.length }, (_, i) => i) : Object.keys(nextRecord);
+  const prevSize = arrays ? prev.length : Object.keys(prevRecord).length;
+  const copy = arrays ? new Array(nextKeys.length) : Object.create(Object.getPrototypeOf(next));
+  let allFromPrev = prevSize === nextKeys.length;
+  let allFromNext = true;
+  const outerCycleTo = walk.cycleTo;
+  walk.cycleTo = Number.POSITIVE_INFINITY;
+  walk.path.set(nextObject, depth);
+  for (const key of nextKeys) {
+    if (arrays && !Object.hasOwn(nextRecord, key)) {
+      if (Object.hasOwn(prevRecord, key)) allFromPrev = false;
+      continue;
+    }
+    const nextChild = nextRecord[key];
+    const hasPrev = Object.hasOwn(prevRecord, key);
+    const shared = hasPrev ? reconcile(prevRecord[key], nextChild, depth + 1, walk, false) : nextChild;
+    copy[key] = shared;
+    if (!hasPrev || !Object.is(shared, prevRecord[key])) allFromPrev = false;
+    if (!Object.is(shared, nextChild)) allFromNext = false;
+  }
+  walk.path.delete(nextObject);
+  const reached = walk.cycleTo;
+  walk.cycleTo = Math.min(outerCycleTo, reached < depth ? reached : Number.POSITIVE_INFINITY);
+  if (reached <= depth) return next;
+  if (allFromPrev && !newRoot) return prev;
+  if (allFromNext) return next;
+  return copy;
+}
+function applyStructuralSharing(option, prev, next, explicit = false) {
+  if (option === false || prev === void 0) return next;
+  const forceNew = explicit && !Object.is(prev, next);
+  if (typeof option === "function") {
+    const shared = option(prev, next);
+    return forceNew && Object.is(shared, prev) ? next : shared;
+  }
+  return reconcile(prev, next, 0, { path: /* @__PURE__ */ new Map(), cycleTo: Number.POSITIVE_INFINITY }, forceNew);
+}
+
 // src/data/query.ts
+function shareSafely(option, prev, next, explicit) {
+  const shared = untracked(
+    () => runSelect("query structuralSharing", () => applyStructuralSharing(option, prev, next, explicit))
+  );
+  return shared.ok ? shared.value : next;
+}
+function sharedView(entry) {
+  const raw = entry.data;
+  if (raw === void 0) return void 0;
+  if (entry.hasShared && Object.is(entry.sharedFrom, raw)) return entry.shared;
+  const value = shareSafely(true, entry.hasShared ? entry.shared : void 0, raw, entry.explicit);
+  entry.shared = value;
+  entry.sharedFrom = raw;
+  entry.hasShared = true;
+  return value;
+}
 var globalQueryCache = globalSingleton(/* @__PURE__ */ Symbol.for("sibujs.query.cache.v1"), () => /* @__PURE__ */ new Map());
 function getActiveQueryCache() {
   return getRequestScopedCache("query") ?? globalQueryCache;
@@ -158,7 +237,11 @@ function getOrCreateEntry(cache, key, initialData) {
       listeners: /* @__PURE__ */ new Set(),
       refetchers: /* @__PURE__ */ new Set(),
       controller: null,
-      generation: 0
+      generation: 0,
+      explicit: false,
+      shared: void 0,
+      sharedFrom: void 0,
+      hasShared: false
     };
     cache.set(key, entry);
   }
@@ -177,13 +260,24 @@ function query(key, fetcher, options = {}) {
     onSuccess,
     onError,
     onSettled,
-    select
+    select,
+    structuralSharing = true
   } = options;
   const resolveKey = typeof key === "function" ? key : () => key;
   const cache = getActiveQueryCache();
   const [data, setData] = signal(initialData);
   const [isFetching, setIsFetching] = signal(false);
   const [error, setError] = signal(void 0);
+  const [updatedAt, setUpdatedAt] = signal(0);
+  const [base, setBase] = signal(void 0);
+  let baseEntry = null;
+  let baseValue;
+  let baseExplicit = false;
+  let customEntry = null;
+  let customFrom;
+  let customValue;
+  let selectedEntry = null;
+  let selectedValue;
   let disposed = false;
   let currentKey = null;
   let attachedEntry = null;
@@ -192,11 +286,57 @@ function query(key, fetcher, options = {}) {
   const loading = derived(() => isFetching() && data() === void 0);
   const isStale = derived(() => {
     data();
+    updatedAt();
     if (!currentKey) return true;
     const entry = cache.get(currentKey);
     if (!entry || entry.dataUpdatedAt === 0) return true;
     return Date.now() - entry.dataUpdatedAt >= staleTime;
   });
+  function viewOf(entry) {
+    const raw = entry.data;
+    if (raw === void 0) return void 0;
+    if (structuralSharing === false) return raw;
+    if (typeof structuralSharing !== "function") return sharedView(entry);
+    const sameEntry = customEntry === entry;
+    if (sameEntry && Object.is(customFrom, raw)) return customValue;
+    const value = shareSafely(structuralSharing, sameEntry ? customValue : void 0, raw, entry.explicit);
+    customEntry = entry;
+    customFrom = raw;
+    customValue = value;
+    return value;
+  }
+  function commitBase(entry, value) {
+    const changed = !Object.is(value, baseValue);
+    baseEntry = entry;
+    baseValue = value;
+    if (!select) {
+      setData(value);
+      return;
+    }
+    if (!changed) return;
+    baseExplicit = entry?.explicit === true;
+    setBase(value);
+  }
+  const stopSelect = select ? effect(() => {
+    const raw = base();
+    const entry = baseEntry;
+    const explicit = baseExplicit;
+    baseExplicit = false;
+    if (entry === null && selectedEntry === null) return;
+    if (raw === void 0) {
+      selectedEntry = entry;
+      selectedValue = void 0;
+      setData(void 0);
+      return;
+    }
+    const selected = runSelect("query select", () => select(raw));
+    if (!selected.ok) return;
+    const prev = selectedEntry === entry ? selectedValue : void 0;
+    const value = shareSafely(structuralSharing, prev, selected.value, explicit);
+    selectedEntry = entry;
+    selectedValue = value;
+    setData(value);
+  }) : null;
   function detachFromEntry() {
     const entry = attachedEntry;
     const key2 = attachedKey;
@@ -255,7 +395,7 @@ function query(key, fetcher, options = {}) {
             const settledError = entry.error;
             runCallback("query onError", () => onError?.(settledError));
           } else if (entry.data !== void 0) {
-            const settledData = entry.data;
+            const settledData = viewOf(entry);
             runCallback("query onSuccess", () => onSuccess?.(settledData));
           }
           runCallback("query onSettled", () => onSettled?.());
@@ -286,17 +426,14 @@ function query(key, fetcher, options = {}) {
       entry.promise = null;
       entry.controller = null;
       entry.data = result;
+      entry.explicit = false;
       entry.dataUpdatedAt = Date.now();
       entry.error = void 0;
       notifyListeners(entry.listeners, "query cache listener");
       if (disposed || currentKey !== key2) return;
-      const selected = runSelect("query select", () => select ? select(result) : result);
-      batch(() => {
-        if (selected.ok) setData(selected.value);
-        setIsFetching(false);
-        setError(void 0);
-      });
-      runCallback("query onSuccess", () => onSuccess?.(result));
+      if (!entry.listeners.has(onCacheUpdate)) onCacheUpdate();
+      const committedResult = viewOf(entry);
+      runCallback("query onSuccess", () => onSuccess?.(committedResult));
     } catch (err) {
       if (entry.generation !== generation) return;
       entry.promise = null;
@@ -326,18 +463,19 @@ function query(key, fetcher, options = {}) {
     const entry = cache.get(currentKey);
     if (!entry) {
       batch(() => {
-        setData(void 0);
+        commitBase(null, void 0);
         setError(void 0);
         setIsFetching(false);
+        setUpdatedAt(0);
       });
       return;
     }
-    const raw = entry.data;
-    const selected = raw !== void 0 && select ? runSelect("query select", () => select(raw)) : { ok: true, value: raw };
+    const view = viewOf(entry);
     batch(() => {
-      if (selected.ok) setData(selected.value);
+      commitBase(entry, view);
       setError(entry.error);
       if (!entry.promise) setIsFetching(false);
+      setUpdatedAt(entry.dataUpdatedAt);
     });
   }
   const effectCleanup = effect(() => {
@@ -347,11 +485,11 @@ function query(key, fetcher, options = {}) {
     const entry = getOrCreateEntry(cache, key2, initialData);
     attachToEntry(entry, key2);
     if (entry.data !== void 0) {
-      const raw = entry.data;
-      const selected = runSelect("query select", () => select ? select(raw) : raw);
+      const view = viewOf(entry);
       batch(() => {
-        if (selected.ok) setData(selected.value);
+        commitBase(entry, view);
         setError(entry.error);
+        setUpdatedAt(entry.dataUpdatedAt);
       });
     }
     if (!keyChanged && currentKey === key2 && entry.data !== void 0) {
@@ -389,6 +527,7 @@ function query(key, fetcher, options = {}) {
     if (disposed) return;
     disposed = true;
     effectCleanup();
+    stopSelect?.();
     loading.dispose();
     isStale.dispose();
     if (intervalTimer) clearInterval(intervalTimer);
@@ -420,13 +559,15 @@ function invalidateQueries(keyOrPredicate) {
   }
 }
 function getQueryData(key) {
-  return getActiveQueryCache().get(key)?.data;
+  const entry = getActiveQueryCache().get(key);
+  return entry ? sharedView(entry) : void 0;
 }
 function setQueryData(key, data) {
   const entry = getActiveQueryCache().get(key);
   if (!entry) return;
-  const newData = typeof data === "function" ? data(entry.data) : data;
+  const newData = typeof data === "function" ? data(sharedView(entry)) : data;
   entry.data = newData;
+  entry.explicit = true;
   entry.dataUpdatedAt = Date.now();
   notifyListeners(entry.listeners, "query cache listener");
 }
@@ -810,6 +951,15 @@ function resource(sourceOrFetcher, fetcherOrOptions, maybeOptions) {
   const [loading, setLoading] = signal(false);
   const [error, setError] = signal(void 0);
   let currentData = options.initialValue;
+  function commitData(next, explicit) {
+    const sharing = options.structuralSharing ?? true;
+    const shared = untracked(
+      () => runSelect("resource structuralSharing", () => applyStructuralSharing(sharing, currentData, next, explicit))
+    );
+    currentData = shared.ok ? shared.value : next;
+    setData(currentData);
+    return currentData;
+  }
   let abortController = null;
   let disposed = false;
   let effectCleanup = null;
@@ -829,12 +979,12 @@ function resource(sourceOrFetcher, fetcherOrOptions, maybeOptions) {
     try {
       const result = await withRetry(() => fetcher(sourceValue, { signal: signal2, prev }), options.retry, void 0, signal2);
       if (version !== fetchVersion || disposed) return;
-      currentData = result;
+      let committed = result;
       batch(() => {
-        setData(result);
+        committed = commitData(result, false);
         setLoading(false);
       });
-      runCallback("resource onSuccess", () => options.onSuccess?.(result));
+      runCallback("resource onSuccess", () => options.onSuccess?.(committed));
     } catch (err) {
       if (version !== fetchVersion || disposed) return;
       if (isAbortError(err)) {
@@ -868,8 +1018,7 @@ function resource(sourceOrFetcher, fetcherOrOptions, maybeOptions) {
     refetch: () => doFetch(source ? source() : void 0),
     mutate: (value) => {
       const newValue = typeof value === "function" ? value(currentData) : value;
-      currentData = newValue;
-      setData(newValue);
+      commitData(newValue, true);
     },
     abort: () => abortController?.abort(),
     dispose: () => {