@solidjs/signals 0.13.4 → 0.13.6

package/dist/prod.js

@@ -82,10 +82,10 @@ function deleteFromHeap(e, t) {
   else {
     const n = e.S;
     const r = t.l[i];
-    const o = n ?? r;
+    const s = n ?? r;
     if (e === r) t.l[i] = n;
     else e.T.S = n;
-    o.T = e.T;
+    s.T = e.T;
   }
   e.T = e;
   e.S = undefined;
@@ -166,10 +166,10 @@ function runLaneEffects(e) {
 function queueStashedOptimisticEffects(e) {
   for (let t = e.I; t !== null; t = t.p) {
     const e = t.h;
-    if (!e.H) continue;
-    if (e.H === EFFECT_TRACKED) {
-      if (!e.W) {
-        e.W = true;
+    if (!e.W) continue;
+    if (e.W === EFFECT_TRACKED) {
+      if (!e.H) {
+        e.H = true;
         e.F.enqueue(EFFECT_USER, e.M);
       }
       continue;
@@ -189,9 +189,9 @@ function mergeTransitionState(e, t) {
     if (n.K === t) n.K = e;
   }
   e.Y.push(...t.Y);
-  for (const n of t.B) e.B.add(n);
-  for (const n of t.Z) {
-    if (!e.Z.includes(n)) e.Z.push(n);
+  for (const n of t.Z) e.Z.add(n);
+  for (const n of t.B) {
+    if (!e.B.includes(n)) e.B.push(n);
   }
 }
 function resolveOptimisticNodes(e) {
@@ -230,20 +230,6 @@ function schedule() {
   scheduled = true;
   if (!globalQueue.ne && !projectionWriteActive) queueMicrotask(flush);
 }
-function addTransitionBlocker(e) {
-  if (activeTransition && !activeTransition.Z.includes(e)) {
-    activeTransition.Z.push(e);
-  }
-}
-function removeTransitionBlocker(e) {
-  const remove = t => {
-    if (!t) return;
-    const n = t.indexOf(e);
-    if (n >= 0) t.splice(n, 1);
-  };
-  remove(e.K?.Z);
-  remove(activeTransition?.Z);
-}
 class Queue {
   i = null;
   ie = [[], []];
@@ -309,31 +295,31 @@ class Queue {
 }
 class GlobalQueue extends Queue {
   ne = false;
-  oe = [];
+  se = [];
   Y = [];
-  B = new Set();
-  static se;
+  Z = new Set();
+  static oe;
   static ue;
   static ce = null;
   flush() {
     if (this.ne) return;
     this.ne = true;
     try {
-      runHeap(dirtyQueue, GlobalQueue.se);
+      runHeap(dirtyQueue, GlobalQueue.oe);
       if (activeTransition) {
         const e = transitionComplete(activeTransition);
         if (!e) {
           const e = activeTransition;
-          runHeap(zombieQueue, GlobalQueue.se);
-          this.oe = [];
+          runHeap(zombieQueue, GlobalQueue.oe);
+          this.se = [];
           this.Y = [];
-          this.B = new Set();
+          this.Z = new Set();
           runLaneEffects(EFFECT_RENDER);
           runLaneEffects(EFFECT_USER);
           this.stashQueues(e.ae);
           clock++;
           scheduled = dirtyQueue.R >= dirtyQueue.P;
-          reassignPendingTransition(e.oe);
+          reassignPendingTransition(e.se);
           activeTransition = null;
           if (!e.j.length && e.Y.length) {
             stashedOptimisticReads = new Set();
@@ -351,15 +337,15 @@ class GlobalQueue extends Queue {
           }
           return;
         }
-        this.oe !== activeTransition.oe && this.oe.push(...activeTransition.oe);
+        this.se !== activeTransition.se && this.se.push(...activeTransition.se);
         this.restoreQueues(activeTransition.ae);
         transitions.delete(activeTransition);
         const t = activeTransition;
         activeTransition = null;
-        reassignPendingTransition(this.oe);
+        reassignPendingTransition(this.se);
         finalizePureQueue(t);
       } else {
-        if (transitions.size) runHeap(zombieQueue, GlobalQueue.se);
+        if (transitions.size) runHeap(zombieQueue, GlobalQueue.oe);
         finalizePureQueue();
       }
       clock++;
@@ -378,8 +364,8 @@ class GlobalQueue extends Queue {
         const t = i !== undefined ? i : e.le;
         if (activeTransition && t) {
           const e = t.source;
-          if (!activeTransition.Z.includes(e)) {
-            activeTransition.Z.push(e);
+          if (!activeTransition.B.includes(e)) {
+            activeTransition.B.push(e);
             schedule();
           }
         }
@@ -395,10 +381,10 @@ class GlobalQueue extends Queue {
     if (!activeTransition) {
       activeTransition = e ?? {
         Ee: clock,
-        oe: [],
-        Z: [],
+        se: [],
+        B: [],
         Y: [],
-        B: new Set(),
+        Z: new Set(),
         j: [],
         ae: { ie: [[], []], re: [] },
         $: false
@@ -411,13 +397,13 @@ class GlobalQueue extends Queue {
     }
     transitions.add(activeTransition);
     activeTransition.Ee = clock;
-    if (this.oe !== activeTransition.oe) {
-      for (let e = 0; e < this.oe.length; e++) {
-        const t = this.oe[e];
+    if (this.se !== activeTransition.se) {
+      for (let e = 0; e < this.se.length; e++) {
+        const t = this.se[e];
         t.K = activeTransition;
-        activeTransition.oe.push(t);
+        activeTransition.se.push(t);
       }
-      this.oe = activeTransition.oe;
+      this.se = activeTransition.se;
     }
     if (this.Y !== activeTransition.Y) {
       for (let e = 0; e < this.Y.length; e++) {
@@ -430,9 +416,9 @@ class GlobalQueue extends Queue {
     for (const e of activeLanes) {
       if (!e.K) e.K = activeTransition;
     }
-    if (this.B !== activeTransition.B) {
-      for (const e of this.B) activeTransition.B.add(e);
-      this.B = activeTransition.B;
+    if (this.Z !== activeTransition.Z) {
+      for (const e of this.Z) activeTransition.Z.add(e);
+      this.Z = activeTransition.Z;
     }
   }
 }
@@ -452,26 +438,26 @@ function insertSubs(e, t = false) {
       r.h.q = undefined;
     }
     const e = r.h;
-    if (e.H === EFFECT_TRACKED) {
-      if (!e.W) {
-        e.W = true;
+    if (e.W === EFFECT_TRACKED) {
+      if (!e.H) {
+        e.H = true;
         e.F.enqueue(EFFECT_USER, e.M);
       }
       continue;
     }
-    const o = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (o.P > r.h.o) o.P = r.h.o;
-    insertIntoHeap(r.h, o);
+    const s = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (s.P > r.h.o) s.P = r.h.o;
+    insertIntoHeap(r.h, s);
   }
 }
 function commitPendingNodes() {
-  const e = globalQueue.oe;
+  const e = globalQueue.se;
   for (let t = 0; t < e.length; t++) {
     const n = e[t];
     if (n.X !== NOT_PENDING) {
       n.J = n.X;
       n.X = NOT_PENDING;
-      if (n.H && n.H !== EFFECT_TRACKED) n.W = true;
+      if (n.W && n.W !== EFFECT_TRACKED) n.H = true;
     }
     if (!(n.Se & STATUS_PENDING)) n.Se &= ~STATUS_UNINITIALIZED;
     if (n.L) GlobalQueue.ue(n, false, true);
@@ -482,11 +468,11 @@ function finalizePureQueue(e = null, t = false) {
   const n = !t;
   if (n) commitPendingNodes();
   if (!t) checkBoundaryChildren(globalQueue);
-  if (dirtyQueue.R >= dirtyQueue.P) runHeap(dirtyQueue, GlobalQueue.se);
+  if (dirtyQueue.R >= dirtyQueue.P) runHeap(dirtyQueue, GlobalQueue.oe);
   if (n) {
     commitPendingNodes();
     resolveOptimisticNodes(e ? e.Y : globalQueue.Y);
-    const t = e ? e.B : globalQueue.B;
+    const t = e ? e.Z : globalQueue.Z;
     if (GlobalQueue.ce && t.size) {
       for (const e of t) {
         GlobalQueue.ce(e);
@@ -504,7 +490,7 @@ function checkBoundaryChildren(e) {
   }
 }
 function trackOptimisticStore(e) {
-  globalQueue.B.add(e);
+  globalQueue.Z.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
@@ -514,6 +500,9 @@ function reassignPendingTransition(e) {
 }
 const globalQueue = new GlobalQueue();
 function flush() {
+  if (globalQueue.ne) {
+    return;
+  }
   while (scheduled || activeTransition) {
     globalQueue.flush();
   }
@@ -525,13 +514,28 @@ function transitionComplete(e) {
   if (e.$) return true;
   if (e.j.length) return false;
   let t = true;
-  for (let n = 0; n < e.Z.length; n++) {
-    const i = e.Z[n];
+  for (let n = 0; n < e.B.length; n++) {
+    const i = e.B[n];
     if (i.Se & STATUS_PENDING && i.le?.source === i) {
       t = false;
       break;
     }
   }
+  if (t) {
+    for (let n = 0; n < e.Y.length; n++) {
+      const i = e.Y[n];
+      if (
+        hasActiveOverride(i) &&
+        "Se" in i &&
+        i.Se & STATUS_PENDING &&
+        i.le instanceof NotReadyError &&
+        i.le.source !== i
+      ) {
+        t = false;
+        break;
+      }
+    }
+  }
   t && (e.$ = true);
   return t;
 }
@@ -685,10 +689,10 @@ function settlePendingSource(e) {
       setPendingError(i);
       updatePendingSignal(i);
       if (i.he) {
-        if (i.H === EFFECT_TRACKED) {
+        if (i.W === EFFECT_TRACKED) {
           const e = i;
-          if (!e.W) {
-            e.W = true;
+          if (!e.H) {
+            e.H = true;
             e.F.enqueue(EFFECT_USER, e.M);
           }
         } else {
@@ -708,13 +712,13 @@ function settlePendingSource(e) {
 function handleAsync(e, t, n) {
   const i = typeof t === "object" && t !== null;
   const r = i && untrack(() => t[Symbol.asyncIterator]);
-  const o = !r && i && untrack(() => typeof t.then === "function");
-  if (!o && !r) {
+  const s = !r && i && untrack(() => typeof t.then === "function");
+  if (!s && !r) {
     e.Ae = null;
     return t;
   }
   e.Ae = t;
-  let s;
+  let o;
   const handleError = n => {
     if (e.Ae !== t) return;
     globalQueue.initTransition(resolveTransition(e));
@@ -726,8 +730,8 @@ function handleAsync(e, t, n) {
     if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
     globalQueue.initTransition(resolveTransition(e));
     clearStatus(e);
-    const o = resolveLane(e);
-    if (o) o.k.delete(e);
+    const s = resolveLane(e);
+    if (s) s.k.delete(e);
     if (n) n(i);
     else if (e.ee !== undefined) {
       if (e.ee !== undefined && e.ee !== NOT_PENDING) e.X = i;
@@ -736,7 +740,7 @@ function handleAsync(e, t, n) {
         insertSubs(e);
       }
       e.Ee = clock;
-    } else if (o) {
+    } else if (s) {
       const t = e.J;
       const n = e.Ne;
       if (!n || !n(i, t)) {
@@ -755,13 +759,13 @@ function handleAsync(e, t, n) {
     flush();
     r?.();
   };
-  if (o) {
+  if (s) {
     let n = false,
       i = true;
     t.then(
       e => {
         if (i) {
-          s = e;
+          o = e;
           n = true;
         } else asyncWrite(e);
       },
@@ -799,7 +803,7 @@ function handleAsync(e, t, n) {
       );
       r = false;
       if (t && !e.done) {
-        s = e.value;
+        o = e.value;
         i = true;
         return iterate();
       }
@@ -811,11 +815,10 @@ function handleAsync(e, t, n) {
       throw new NotReadyError(context);
     }
   }
-  return s;
+  return o;
 }
 function clearStatus(e, t = false) {
   clearPendingSources(e);
-  removeTransitionBlocker(e);
   e.he = false;
   e.Se = t ? 0 : e.Se & STATUS_UNINITIALIZED;
   setPendingError(e);
@@ -825,19 +828,17 @@ function clearStatus(e, t = false) {
 function notifyStatus(e, t, n, i, r) {
   if (t === STATUS_ERROR && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
-  const o = t === STATUS_PENDING && n instanceof NotReadyError ? n.source : undefined;
-  const s = o === e;
-  const u = t === STATUS_PENDING && e.ee !== undefined && !s;
+  const s = t === STATUS_PENDING && n instanceof NotReadyError ? n.source : undefined;
+  const o = s === e;
+  const u = t === STATUS_PENDING && e.ee !== undefined && !o;
   const c = u && hasActiveOverride(e);
   if (!i) {
-    if (t === STATUS_PENDING && o) {
-      addPendingSource(e, o);
+    if (t === STATUS_PENDING && s) {
+      addPendingSource(e, s);
       e.Se = STATUS_PENDING | (e.Se & STATUS_UNINITIALIZED);
-      setPendingError(e, e.Ie ?? e.pe?.values().next().value, n);
-      if (o === e) addTransitionBlocker(e);
+      setPendingError(e, s, n);
     } else {
       clearPendingSources(e);
-      removeTransitionBlocker(e);
       e.Se = t | (t !== STATUS_ERROR ? e.Se & STATUS_UNINITIALIZED : 0);
       e.le = n;
     }
@@ -849,6 +850,9 @@ function notifyStatus(e, t, n, i, r) {
   const a = i || c;
   const f = i || u ? undefined : r;
   if (e.ge) {
+    if (i && t === STATUS_PENDING) {
+      return;
+    }
     if (a) {
       e.ge(t, n);
     } else {
@@ -859,10 +863,10 @@ function notifyStatus(e, t, n, i, r) {
   forEachDependent(e, e => {
     e.Ee = clock;
     if (
-      (t === STATUS_PENDING && o && e.Ie !== o && !e.pe?.has(o)) ||
+      (t === STATUS_PENDING && s && e.Ie !== s && !e.pe?.has(s)) ||
       (t !== STATUS_PENDING && (e.le !== n || e.Ie || e.pe))
     ) {
-      !e.K && globalQueue.oe.push(e);
+      if (!a && !e.K) globalQueue.se.push(e);
       notifyStatus(e, t, n, a, f);
     }
   });
@@ -875,11 +879,11 @@ function enableExternalSource(e) {
     externalSourceConfig = {
       factory: (n, i) => {
         const r = e(n, i);
-        const o = t(e => r.track(e), i);
+        const s = t(e => r.track(e), i);
         return {
-          track: e => o.track(e),
+          track: e => s.track(e),
           dispose() {
-            o.dispose();
+            s.dispose();
             r.dispose();
           }
         };
@@ -976,10 +980,8 @@ function getObserver() {
 function getOwner() {
   return context;
 }
-function onCleanup(e) {
-  if (!context) {
-    return e;
-  }
+function cleanup(e) {
+  if (!context) return e;
   if (!context.be) context.be = e;
   else if (Array.isArray(context.be)) context.be.push(e);
   else context.be = [context.be, e];
@@ -1035,8 +1037,8 @@ function unlinkSubs(e) {
   else {
     t.I = i;
     if (i === null) {
-      t.xe?.();
-      t.L && !t.Ge && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
+      t.Ge?.();
+      t.L && !t.xe && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
     }
   }
   return n;
@@ -1062,13 +1064,13 @@ function link(e, t) {
       return;
     }
   }
-  const o = e.ke;
-  if (o !== null && o.h === t && (!r || isValidLink(o, t))) return;
-  const s = (t.ye = e.ke = { m: e, h: t, D: i, Ue: o, p: null });
-  if (n !== null) n.D = s;
-  else t.C = s;
-  if (o !== null) o.p = s;
-  else e.I = s;
+  const s = e.ke;
+  if (s !== null && s.h === t && (!r || isValidLink(s, t))) return;
+  const o = (t.ye = e.ke = { m: e, h: t, D: i, Ue: s, p: null });
+  if (n !== null) n.D = o;
+  else t.C = o;
+  if (s !== null) s.p = o;
+  else e.I = o;
 }
 function isValidLink(e, t) {
   const n = t.ye;
@@ -1082,7 +1084,7 @@ function isValidLink(e, t) {
   }
   return false;
 }
-GlobalQueue.se = recompute;
+GlobalQueue.oe = recompute;
 GlobalQueue.ue = disposeChildren;
 let tracking = false;
 let stale = false;
@@ -1096,7 +1098,7 @@ let snapshotCaptureActive = false;
 let snapshotSources = null;
 function ownerInSnapshotScope(e) {
   while (e) {
-    if (e.He) return true;
+    if (e.We) return true;
     e = e.i;
   }
   return false;
@@ -1106,17 +1108,17 @@ function setSnapshotCapture(e) {
   if (e && !snapshotSources) snapshotSources = new Set();
 }
 function markSnapshotScope(e) {
-  e.He = true;
+  e.We = true;
 }
 function releaseSnapshotScope(e) {
-  e.He = false;
+  e.We = false;
   releaseSubtree(e);
   schedule();
 }
 function releaseSubtree(e) {
   let t = e.Ce;
   while (t) {
-    if (t.He) {
+    if (t.We) {
       t = t.De;
       continue;
     }
@@ -1145,7 +1147,7 @@ function clearSnapshots() {
   snapshotCaptureActive = false;
 }
 function recompute(e, t = false) {
-  const n = e.H;
+  const n = e.W;
   if (!t) {
     if (e.K && (!n || activeTransition) && activeTransition !== e.K)
       globalQueue.initTransition(e.K);
@@ -1162,8 +1164,8 @@ function recompute(e, t = false) {
   }
   const i = !!(e.O & REACTIVE_OPTIMISTIC_DIRTY);
   const r = e.ee !== undefined && e.ee !== NOT_PENDING;
-  const o = !!(e.Se & STATUS_PENDING);
-  const s = context;
+  const s = !!(e.Se & STATUS_PENDING);
+  const o = context;
   context = e;
   e.ye = null;
   e.O = REACTIVE_RECOMPUTING_DEPS;
@@ -1205,22 +1207,22 @@ function recompute(e, t = false) {
   } finally {
     tracking = a;
     e.O = REACTIVE_NONE | (t ? e.O & REACTIVE_SNAPSHOT_STALE : 0);
-    context = s;
+    context = o;
   }
   if (!e.le) {
-    const s = e.ye;
-    let a = s !== null ? s.D : e.C;
+    const o = e.ye;
+    let a = o !== null ? o.D : e.C;
     if (a !== null) {
       do {
         a = unlinkSubs(a);
       } while (a !== null);
-      if (s !== null) s.D = null;
+      if (o !== null) o.D = null;
       else e.C = null;
     }
     const f = r ? e.ee : e.X === NOT_PENDING ? e.J : e.X;
     const l = !e.Ne || !e.Ne(f, u);
     if (l) {
-      const s = r ? e.ee : undefined;
+      const o = r ? e.ee : undefined;
       if (t || (n && activeTransition !== e.K) || i) {
         e.J = u;
         if (r && i) {
@@ -1228,8 +1230,8 @@ function recompute(e, t = false) {
           e.X = u;
         }
       } else e.X = u;
-      if (r && !i && o && !e._e) e.ee = u;
-      if (!r || i || e.ee !== s) insertSubs(e, i || r);
+      if (r && !i && s && !e._e) e.ee = u;
+      if (!r || i || e.ee !== o) insertSubs(e, i || r);
     } else if (r) {
       e.X = u;
     } else if (e.o != c) {
@@ -1239,7 +1241,7 @@ function recompute(e, t = false) {
     }
   }
   currentOptimisticLane = f;
-  (!t || e.Se & STATUS_PENDING) && !e.K && !(activeTransition && r) && globalQueue.oe.push(e);
+  (!t || e.Se & STATUS_PENDING) && !e.K && !(activeTransition && r) && globalQueue.se.push(e);
   e.K && n && activeTransition !== e.K && runInTransition(e.K, () => recompute(e));
 }
 function updateIfNecessary(e) {
@@ -1267,7 +1269,7 @@ function computed(e, t, n) {
     Ve: i || undefined,
     Ne: n?.equals != null ? n.equals : isEqual,
     fe: !!n?.pureWrite,
-    xe: n?.unobserved,
+    Ge: n?.unobserved,
     be: null,
     F: context?.F ?? globalQueue,
     Le: context?.Le ?? defaultContext,
@@ -1295,7 +1297,7 @@ function computed(e, t, n) {
     K: null
   };
   r.T = r;
-  const o = context?.t ? context.u : context;
+  const s = context?.t ? context.u : context;
   if (context) {
     const e = context.Ce;
     if (e === null) {
@@ -1305,14 +1307,14 @@ function computed(e, t, n) {
       context.Ce = r;
     }
   }
-  if (o) r.o = o.o + 1;
+  if (s) r.o = s.o + 1;
   if (snapshotCaptureActive && ownerInSnapshotScope(context)) r.de = true;
   if (externalSourceConfig) {
     const e = signal(undefined, { equals: false, pureWrite: true });
     const t = externalSourceConfig.factory(r.L, () => {
       setSignal(e, undefined);
     });
-    onCleanup(() => t.dispose());
+    cleanup(() => t.dispose());
     r.L = n => {
       read(e);
       return t.track(n);
@@ -1331,8 +1333,8 @@ function signal(e, t, n = null) {
   const i = {
     Ne: t?.equals != null ? t.equals : isEqual,
     fe: !!t?.pureWrite,
-    We: !!t?.We,
-    xe: t?.unobserved,
+    He: !!t?.He,
+    Ge: t?.unobserved,
     J: e,
     I: null,
     ke: null,
@@ -1342,7 +1344,7 @@ function signal(e, t, n = null) {
     X: NOT_PENDING
   };
   n && (n.A = i);
-  if (snapshotCaptureActive && !i.We && !((n?.Se ?? 0) & STATUS_PENDING)) {
+  if (snapshotCaptureActive && !i.He && !((n?.Se ?? 0) & STATUS_PENDING)) {
     i.Te = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources.add(i);
   }
@@ -1401,8 +1403,14 @@ function read(e) {
     const t = e.V;
     const n = pendingCheckActive;
     pendingCheckActive = false;
-    if (read(getPendingSignal(e))) foundPending = true;
-    if (t && read(getPendingSignal(t))) foundPending = true;
+    if (t && e.ee !== undefined) {
+      if (e.ee !== NOT_PENDING && (t.Ae || !!(t.Se & STATUS_PENDING))) {
+        foundPending = true;
+      }
+    } else {
+      if (read(getPendingSignal(e))) foundPending = true;
+      if (t && read(getPendingSignal(t))) foundPending = true;
+    }
     pendingCheckActive = n;
     return e.J;
   }
@@ -1443,6 +1451,9 @@ function read(e) {
         if (!tracking && e !== t) link(e, t);
         throw n.le;
       }
+    } else if (t && n !== e && n.Se & STATUS_UNINITIALIZED) {
+      if (!tracking && e !== t) link(e, t);
+      throw n.le;
     } else if (!t && n.Se & STATUS_UNINITIALIZED) {
       throw n.le;
     }
@@ -1480,8 +1491,8 @@ function setSignal(e, t) {
   const i = e.ee !== undefined && e.ee !== NOT_PENDING;
   const r = n ? (i ? e.ee : e.J) : e.X === NOT_PENDING ? e.J : e.X;
   if (typeof t === "function") t = t(r);
-  const o = !e.Ne || !e.Ne(r, t) || !!(e.Se & STATUS_UNINITIALIZED);
-  if (!o) {
+  const s = !e.Ne || !e.Ne(r, t) || !!(e.Se & STATUS_UNINITIALIZED);
+  if (!s) {
     if (n && i && e.L) {
       insertSubs(e, true);
       schedule();
@@ -1500,7 +1511,7 @@ function setSignal(e, t) {
     e.q = i;
     e.ee = t;
   } else {
-    if (e.X === NOT_PENDING) globalQueue.oe.push(e);
+    if (e.X === NOT_PENDING) globalQueue.se.push(e);
     e.X = t;
   }
   updatePendingSignal(e);
@@ -1548,6 +1559,9 @@ function computePendingState(e) {
     }
     return true;
   }
+  if (e.ee !== undefined && e.ee === NOT_PENDING && !e.Re) {
+    return false;
+  }
   if (e.X !== NOT_PENDING && !(t.Se & STATUS_UNINITIALIZED)) return true;
   return !!(t.Se & STATUS_PENDING && !(t.Se & STATUS_UNINITIALIZED));
 }
@@ -1663,51 +1677,51 @@ function isUndefined(e) {
   return typeof e === "undefined";
 }
 function effect(e, t, n, i, r) {
-  let o = false;
-  const s = computed(r?.render ? t => staleValues(() => e(t)) : e, i, {
+  let s = false;
+  const o = computed(r?.render ? t => staleValues(() => e(t)) : e, i, {
     ...r,
     equals: () => {
-      s.W = !s.le;
-      if (o) s.F.enqueue(s.H, runEffect.bind(s));
+      o.H = !o.le;
+      if (s) o.F.enqueue(o.W, runEffect.bind(o));
       return false;
     },
     lazy: true
   });
-  s.Fe = i;
-  s.Me = t;
-  s.$e = n;
-  s.je = undefined;
-  s.H = r?.render ? EFFECT_RENDER : EFFECT_USER;
-  s.ge = (e, t) => {
-    const n = e !== undefined ? e : s.Se;
-    const i = t !== undefined ? t : s.le;
+  o.Fe = i;
+  o.Me = t;
+  o.$e = n;
+  o.je = undefined;
+  o.W = r?.render ? EFFECT_RENDER : EFFECT_USER;
+  o.ge = (e, t) => {
+    const n = e !== undefined ? e : o.Se;
+    const i = t !== undefined ? t : o.le;
     if (n & STATUS_ERROR) {
       let e = i;
-      s.F.notify(s, STATUS_PENDING, 0);
-      if (s.H === EFFECT_USER) {
+      o.F.notify(o, STATUS_PENDING, 0);
+      if (o.W === EFFECT_USER) {
         try {
-          return s.$e
-            ? s.$e(e, () => {
-                s.je?.();
-                s.je = undefined;
+          return o.$e
+            ? o.$e(e, () => {
+                o.je?.();
+                o.je = undefined;
               })
             : console.error(e);
         } catch (t) {
           e = t;
         }
       }
-      if (!s.F.notify(s, STATUS_ERROR, STATUS_ERROR)) throw e;
-    } else if (s.H === EFFECT_RENDER) {
-      s.F.notify(s, STATUS_PENDING | STATUS_ERROR, n, i);
+      if (!o.F.notify(o, STATUS_ERROR, STATUS_ERROR)) throw e;
+    } else if (o.W === EFFECT_RENDER) {
+      o.F.notify(o, STATUS_PENDING | STATUS_ERROR, n, i);
     }
   };
-  recompute(s, true);
-  !r?.defer && (s.H === EFFECT_USER ? s.F.enqueue(s.H, runEffect.bind(s)) : runEffect.call(s));
-  o = true;
-  onCleanup(() => s.je?.());
+  recompute(o, true);
+  !r?.defer && (o.W === EFFECT_USER ? o.F.enqueue(o.W, runEffect.bind(o)) : runEffect.call(o));
+  s = true;
+  cleanup(() => o.je?.());
 }
 function runEffect() {
-  if (!this.W || this.O & REACTIVE_DISPOSED) return;
+  if (!this.H || this.O & REACTIVE_DISPOSED) return;
   this.je?.();
   this.je = undefined;
   try {
@@ -1718,14 +1732,17 @@ function runEffect() {
     if (!this.F.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
   } finally {
     this.Fe = this.J;
-    this.W = false;
+    this.H = false;
   }
 }
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.W || n.O & REACTIVE_DISPOSED) return;
-    n.W = false;
-    recompute(n);
+    if (!n.H || n.O & REACTIVE_DISPOSED) return;
+    try {
+      n.H = false;
+      recompute(n);
+    } finally {
+    }
   };
   const n = computed(
     () => {
@@ -1738,8 +1755,8 @@ function trackedEffect(e, t) {
   );
   n.je = undefined;
   n.Ke = true;
-  n.W = true;
-  n.H = EFFECT_TRACKED;
+  n.H = true;
+  n.W = EFFECT_TRACKED;
   n.ge = (e, t) => {
     const i = e !== undefined ? e : n.Se;
     if (i & STATUS_ERROR) {
@@ -1750,7 +1767,7 @@ function trackedEffect(e, t) {
   };
   n.M = run;
   n.F.enqueue(EFFECT_USER, run);
-  onCleanup(() => n.je?.());
+  cleanup(() => n.je?.());
 }
 function restoreTransition(e, t) {
   globalQueue.initTransition(e);
@@ -1763,13 +1780,13 @@ function action(e) {
     new Promise((n, i) => {
       const r = e(...t);
       globalQueue.initTransition();
-      let o = activeTransition;
-      o.j.push(r);
+      let s = activeTransition;
+      s.j.push(r);
       const done = (e, t) => {
-        o = currentTransition(o);
-        const s = o.j.indexOf(r);
-        if (s >= 0) o.j.splice(s, 1);
-        setActiveTransition(o);
+        s = currentTransition(s);
+        const o = s.j.indexOf(r);
+        if (o >= 0) s.j.splice(o, 1);
+        setActiveTransition(s);
         schedule();
         t ? i(t) : n(e);
       };
@@ -1781,21 +1798,24 @@ function action(e) {
           return done(undefined, e);
         }
         if (n instanceof Promise)
-          return void n.then(run, e => restoreTransition(o, () => step(e, true)));
+          return void n.then(run, e => restoreTransition(s, () => step(e, true)));
         run(n);
       };
       const run = e => {
         if (e.done) return done(e.value);
         if (e.value instanceof Promise)
           return void e.value.then(
-            e => restoreTransition(o, () => step(e)),
-            e => restoreTransition(o, () => step(e, true))
+            e => restoreTransition(s, () => step(e)),
+            e => restoreTransition(s, () => step(e, true))
           );
-        restoreTransition(o, () => step(e.value));
+        restoreTransition(s, () => step(e.value));
       };
       step();
     });
 }
+function onCleanup(e) {
+  return cleanup(e);
+}
 function accessor(e) {
   const t = read.bind(null, e);
   t.$r = true;
@@ -1824,7 +1844,7 @@ function createTrackedEffect(e, t) {
 }
 function createReaction(e, t) {
   let n = undefined;
-  onCleanup(() => n?.());
+  cleanup(() => n?.());
   const i = getOwner();
   return r => {
     runWithOwner(i, () => {
@@ -1886,22 +1906,22 @@ function applyState(e, t, n) {
   const i = t?.[$TARGET];
   if (!i) return;
   const r = i[STORE_VALUE];
-  const o = i[STORE_OVERRIDE];
-  const s = i[STORE_OPTIMISTIC_OVERRIDE];
+  const s = i[STORE_OVERRIDE];
+  const o = i[STORE_OPTIMISTIC_OVERRIDE];
   let u = i[STORE_NODE];
-  if (e === r && !o && !s) return;
+  if (e === r && !s && !o) return;
   (i[STORE_LOOKUP] || storeLookup).set(e, i[$PROXY]);
   i[STORE_VALUE] = e;
   i[STORE_OVERRIDE] = undefined;
   if (Array.isArray(r)) {
     let t = false;
-    const c = getOverrideValue(r, o, u, "length", s);
+    const c = getOverrideValue(r, s, u, "length", o);
     if (e.length && c && e[0] && n(e[0]) != null) {
       let a, f, l, E, T, d, S, R;
       for (
         l = 0, E = Math.min(c, e.length);
         l < E &&
-        ((d = getOverrideValue(r, o, u, l, s)) === e[l] || (d && e[l] && n(d) === n(e[l])));
+        ((d = getOverrideValue(r, s, u, l, o)) === e[l] || (d && e[l] && n(d) === n(e[l])));
         l++
       ) {
         applyState(e[l], wrap(d, i), n);
@@ -1912,7 +1932,7 @@ function applyState(e, t, n) {
         E = c - 1, T = e.length - 1;
         E >= l &&
         T >= l &&
-        ((d = getOverrideValue(r, o, u, E, s)) === e[T] || (d && e[T] && n(d) === n(e[T])));
+        ((d = getOverrideValue(r, s, u, E, o)) === e[T] || (d && e[T] && n(d) === n(e[T])));
         E--, T--
       ) {
         O[T] = d;
@@ -1941,7 +1961,7 @@ function applyState(e, t, n) {
         _.set(R, f);
       }
       for (a = l; a <= E; a++) {
-        d = getOverrideValue(r, o, u, a, s);
+        d = getOverrideValue(r, s, u, a, o);
         R = d ? n(d) : d;
         f = _.get(R);
         if (f !== undefined && f !== -1) {
@@ -1960,7 +1980,7 @@ function applyState(e, t, n) {
       if (l < e.length) t = true;
     } else if (e.length) {
       for (let t = 0, c = e.length; t < c; t++) {
-        const c = getOverrideValue(r, o, u, t, s);
+        const c = getOverrideValue(r, s, u, t, o);
         isWrappable(c)
           ? applyState(e[t], wrap(c, i), n)
           : i[STORE_NODE][t] && setSignal(i[STORE_NODE][t], e[t]);
@@ -1975,11 +1995,11 @@ function applyState(e, t, n) {
   }
   if (u) {
     const t = u[$TRACK];
-    const c = t ? getAllKeys(r, o, e) : Object.keys(u);
+    const c = t ? getAllKeys(r, s, e) : Object.keys(u);
     for (let a = 0, f = c.length; a < f; a++) {
       const f = c[a];
       const l = u[f];
-      const E = unwrap(getOverrideValue(r, o, u, f, s));
+      const E = unwrap(getOverrideValue(r, s, u, f, o));
       let T = unwrap(e[f]);
       if (E === T) continue;
       if (!E || !isWrappable(E) || !isWrappable(T) || (n(E) != null && n(E) !== n(T))) {
@@ -2026,58 +2046,71 @@ function createProjectionInternal(e, t = {}, n) {
     r.set(e, t);
     return t;
   };
-  const o = wrapProjection(t);
+  const s = wrapProjection(t);
   i = computed(() => {
     const t = getOwner();
-    storeSetter(new Proxy(o, writeTraps), i => {
-      const r = handleAsync(t, e(i), e => {
-        e !== i && e !== undefined && storeSetter(o, reconcile(e, n?.key || "id"));
+    let i = false;
+    let r;
+    const o = new Proxy(
+      s,
+      createWriteTraps(() => !i || t.Ae === r)
+    );
+    storeSetter(o, o => {
+      r = e(o);
+      i = true;
+      const u = handleAsync(t, r, e => {
+        e !== o && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
       });
-      r !== i && r !== undefined && reconcile(r, n?.key || "id")(o);
+      u !== o && u !== undefined && reconcile(u, n?.key || "id")(s);
     });
   });
-  i.Ge = true;
-  return { store: o, node: i };
+  i.xe = true;
+  return { store: s, node: i };
 }
 function createProjection(e, t = {}, n) {
   return createProjectionInternal(e, t, n).store;
 }
-const writeTraps = {
-  get(e, t) {
-    let n;
-    setWriteOverride(true);
-    setProjectionWriteActive(true);
-    try {
-      n = e[t];
-    } finally {
-      setWriteOverride(false);
-      setProjectionWriteActive(false);
-    }
-    return typeof n === "object" && n !== null ? new Proxy(n, writeTraps) : n;
-  },
-  set(e, t, n) {
-    setWriteOverride(true);
-    setProjectionWriteActive(true);
-    try {
-      e[t] = n;
-    } finally {
-      setWriteOverride(false);
-      setProjectionWriteActive(false);
-    }
-    return true;
-  },
-  deleteProperty(e, t) {
-    setWriteOverride(true);
-    setProjectionWriteActive(true);
-    try {
-      delete e[t];
-    } finally {
-      setWriteOverride(false);
-      setProjectionWriteActive(false);
+function createWriteTraps(e) {
+  const t = {
+    get(e, n) {
+      let i;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        i = e[n];
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return typeof i === "object" && i !== null ? new Proxy(i, t) : i;
+    },
+    set(t, n, i) {
+      if (e && !e()) return true;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        t[n] = i;
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return true;
+    },
+    deleteProperty(t, n) {
+      if (e && !e()) return true;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        delete t[n];
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return true;
     }
-    return true;
-  }
-};
+  };
+  return t;
+}
 const $TRACK = Symbol(0),
   $TARGET = Symbol(0),
   $PROXY = Symbol(0),
@@ -2122,7 +2155,7 @@ function getNodes(e, t) {
   if (!n) e[t] = n = Object.create(null);
   return n;
 }
-function getNode(e, t, n, i, r = isEqual, o, s) {
+function getNode(e, t, n, i, r = isEqual, s, o) {
   if (e[t]) return e[t];
   const u = signal(
     n,
@@ -2134,11 +2167,11 @@ function getNode(e, t, n, i, r = isEqual, o, s) {
     },
     i
   );
-  if (o) {
+  if (s) {
     u.ee = NOT_PENDING;
   }
-  if (s && t in s) {
-    const e = s[t];
+  if (o && t in o) {
+    const e = o[t];
     u.Te = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources?.add(u);
   }
@@ -2154,8 +2187,8 @@ function getKeys(e, t, n = true) {
   const i = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
   if (!t) return i;
   const r = new Set(i);
-  const o = Reflect.ownKeys(t);
-  for (const e of o) {
+  const s = Reflect.ownKeys(t);
+  for (const e of s) {
     if (t[e] !== $DELETED) r.add(e);
     else r.delete(e);
   }
@@ -2181,10 +2214,10 @@ const storeTraps = {
     }
     const i = getNodes(e, STORE_NODE);
     const r = i[t];
-    const o = e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE];
-    const s = o || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]);
+    const s = e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE];
+    const o = s || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]);
     const u = !!e[STORE_VALUE][$TARGET];
-    const c = o
+    const c = s
       ? e[STORE_OPTIMISTIC_OVERRIDE]
       : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
         ? e[STORE_OVERRIDE]
@@ -2195,7 +2228,7 @@ const storeTraps = {
     }
     if (writeOnly(n)) {
       let n =
-        r && (s || !u)
+        r && (o || !u)
           ? r.ee !== undefined && r.ee !== NOT_PENDING
             ? r.ee
             : r.X !== NOT_PENDING
@@ -2208,10 +2241,10 @@ const storeTraps = {
       Writing?.add(i);
       return i;
     }
-    let a = r ? (s || !u ? read(i[t]) : (read(i[t]), c[t])) : c[t];
+    let a = r ? (o || !u ? read(i[t]) : (read(i[t]), c[t])) : c[t];
     a === $DELETED && (a = undefined);
     if (!r) {
-      if (!s && typeof a === "function" && !c.hasOwnProperty(t)) {
+      if (!o && typeof a === "function" && !c.hasOwnProperty(t)) {
         let t;
         return !Array.isArray(e[STORE_VALUE]) &&
           (t = Object.getPrototypeOf(e[STORE_VALUE])) &&
@@ -2257,7 +2290,7 @@ const storeTraps = {
       }
       untrack(() => {
         const r = e[STORE_VALUE];
-        const o = r[t];
+        const s = r[t];
         if (
           snapshotCaptureActive &&
           typeof t !== "symbol" &&
@@ -2268,22 +2301,22 @@ const storeTraps = {
             snapshotSources?.add(e);
           }
           if (!(t in e[STORE_SNAPSHOT_PROPS])) {
-            e[STORE_SNAPSHOT_PROPS][t] = o;
+            e[STORE_SNAPSHOT_PROPS][t] = s;
           }
         }
-        const s = e[STORE_OPTIMISTIC] && !projectionWriteActive;
-        const u = s ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
-        if (s) trackOptimisticStore(i);
+        const o = e[STORE_OPTIMISTIC] && !projectionWriteActive;
+        const u = o ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
+        if (o) trackOptimisticStore(i);
         const c =
           e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]
             ? e[STORE_OPTIMISTIC_OVERRIDE][t]
             : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
               ? e[STORE_OVERRIDE][t]
-              : o;
+              : s;
         const a = n?.[$TARGET]?.[STORE_VALUE] ?? n;
         if (c === a) return true;
         const f = e[STORE_OPTIMISTIC_OVERRIDE]?.length || e[STORE_OVERRIDE]?.length || r.length;
-        if (a !== undefined && a === o) delete e[u][t];
+        if (a !== undefined && a === s) delete e[u][t];
         else (e[u] || (e[u] = Object.create(null)))[t] = a;
         const l = isWrappable(a);
         e[STORE_HAS]?.[t] && setSignal(e[STORE_HAS][t], true);
@@ -2322,9 +2355,9 @@ const storeTraps = {
           delete e[i][t];
         } else return true;
         if (e[STORE_HAS]?.[t]) setSignal(e[STORE_HAS][t], false);
-        const o = getNodes(e, STORE_NODE);
-        o[t] && setSignal(o[t], undefined);
-        o[$TRACK] && setSignal(o[$TRACK], undefined);
+        const s = getNodes(e, STORE_NODE);
+        s[t] && setSignal(s[t], undefined);
+        s[$TRACK] && setSignal(s[$TRACK], undefined);
       });
     }
     return true;
@@ -2395,9 +2428,9 @@ function createOptimisticStore(e, t, n) {
   GlobalQueue.ce ||= clearOptimisticStore;
   const i = typeof e === "function";
   const r = (i ? t : e) ?? {};
-  const o = i ? e : undefined;
-  const { store: s } = createOptimisticProjectionInternal(o, r, n);
-  return [s, e => storeSetter(s, e)];
+  const s = i ? e : undefined;
+  const { store: o } = createOptimisticProjectionInternal(s, r, n);
+  return [o, e => storeSetter(o, e)];
 }
 function clearOptimisticStore(e) {
   const t = e[$TARGET];
@@ -2447,30 +2480,38 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
     r.set(e, t);
     return t;
   };
-  const o = wrapProjection(t);
+  const s = wrapProjection(t);
   if (e) {
     i = computed(() => {
       const t = getOwner();
+      let i = false;
+      let r;
+      const o = new Proxy(
+        s,
+        createWriteTraps(() => !i || t.Ae === r)
+      );
       setProjectionWriteActive(true);
       try {
-        storeSetter(new Proxy(o, writeTraps), i => {
-          const r = handleAsync(t, e(i), e => {
+        storeSetter(o, o => {
+          r = e(o);
+          i = true;
+          const u = handleAsync(t, r, e => {
             setProjectionWriteActive(true);
             try {
-              e !== i && e !== undefined && storeSetter(o, reconcile(e, n?.key || "id"));
+              e !== o && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
             } finally {
               setProjectionWriteActive(false);
             }
           });
-          r !== i && r !== undefined && reconcile(r, n?.key || "id")(o);
+          u !== o && u !== undefined && reconcile(u, n?.key || "id")(s);
         });
       } finally {
         setProjectionWriteActive(false);
       }
     });
-    i.Ge = true;
+    i.xe = true;
   }
-  return { store: o, node: i };
+  return { store: s, node: i };
 }
 const DELETE = Symbol(0);
 function updatePath(e, t, n = 0) {
@@ -2478,8 +2519,8 @@ function updatePath(e, t, n = 0) {
     r = e;
   if (n < t.length - 1) {
     i = t[n];
-    const o = typeof i;
-    const s = Array.isArray(e);
+    const s = typeof i;
+    const o = Array.isArray(e);
     if (Array.isArray(i)) {
       for (let r = 0; r < i.length; r++) {
         t[n] = i[r];
@@ -2487,7 +2528,7 @@ function updatePath(e, t, n = 0) {
       }
       t[n] = i;
       return;
-    } else if (s && o === "function") {
+    } else if (o && s === "function") {
       for (let r = 0; r < e.length; r++) {
         if (i(e[r], r)) {
           t[n] = r;
@@ -2496,9 +2537,9 @@ function updatePath(e, t, n = 0) {
       }
       t[n] = i;
       return;
-    } else if (s && o === "object") {
-      const { from: r = 0, to: o = e.length - 1, by: s = 1 } = i;
-      for (let i = r; i <= o; i += s) {
+    } else if (o && s === "object") {
+      const { from: r = 0, to: s = e.length - 1, by: o = 1 } = i;
+      for (let i = r; i <= s; i += o) {
         t[n] = i;
         updatePath(e, t, n);
       }
@@ -2510,20 +2551,20 @@ function updatePath(e, t, n = 0) {
     }
     r = e[i];
   }
-  let o = t[t.length - 1];
-  if (typeof o === "function") {
-    o = o(r);
-    if (o === r) return;
+  let s = t[t.length - 1];
+  if (typeof s === "function") {
+    s = s(r);
+    if (s === r) return;
   }
-  if (i === undefined && o == undefined) return;
-  if (o === DELETE) {
+  if (i === undefined && s == undefined) return;
+  if (s === DELETE) {
     delete e[i];
-  } else if (i === undefined || (isWrappable(r) && isWrappable(o) && !Array.isArray(o))) {
+  } else if (i === undefined || (isWrappable(r) && isWrappable(s) && !Array.isArray(s))) {
     const t = i !== undefined ? e[i] : e;
-    const n = Object.keys(o);
-    for (let e = 0; e < n.length; e++) t[n[e]] = o[n[e]];
+    const n = Object.keys(s);
+    for (let e = 0; e < n.length; e++) t[n[e]] = s[n[e]];
   } else {
-    e[i] = o;
+    e[i] = s;
   }
 }
 const storePath = Object.assign(
@@ -2535,28 +2576,28 @@ const storePath = Object.assign(
   { DELETE: DELETE }
 );
 function snapshotImpl(e, t, n, i) {
-  let r, o, s, u, c, a;
+  let r, s, o, u, c, a;
   if (!isWrappable(e)) return e;
   if (n && n.has(e)) return n.get(e);
   if (!n) n = new Map();
   if ((r = e[$TARGET] || i?.get(e)?.[$TARGET])) {
     if (t) trackSelf(r, $TRACK);
-    s = r[STORE_OVERRIDE];
-    o = Array.isArray(r[STORE_VALUE]);
+    o = r[STORE_OVERRIDE];
+    s = Array.isArray(r[STORE_VALUE]);
     n.set(
       e,
-      s ? (u = o ? [] : Object.create(Object.getPrototypeOf(r[STORE_VALUE]))) : r[STORE_VALUE]
+      o ? (u = s ? [] : Object.create(Object.getPrototypeOf(r[STORE_VALUE]))) : r[STORE_VALUE]
     );
     e = r[STORE_VALUE];
     i = storeLookup;
   } else {
-    o = Array.isArray(e);
+    s = Array.isArray(e);
     n.set(e, e);
   }
-  if (o) {
-    const o = s?.length || e.length;
-    for (let f = 0; f < o; f++) {
-      a = s && f in s ? s[f] : e[f];
+  if (s) {
+    const s = o?.length || e.length;
+    for (let f = 0; f < s; f++) {
+      a = o && f in o ? o[f] : e[f];
       if (a === $DELETED) continue;
       if (t && isWrappable(a)) wrap(a, r);
       if ((c = snapshotImpl(a, t, n, i)) !== a || u) {
@@ -2565,12 +2606,12 @@ function snapshotImpl(e, t, n, i) {
       }
     }
   } else {
-    const o = getKeys(e, s);
-    for (let f = 0, l = o.length; f < l; f++) {
-      let l = o[f];
-      const E = getPropertyDescriptor(e, s, l);
+    const s = getKeys(e, o);
+    for (let f = 0, l = s.length; f < l; f++) {
+      let l = s[f];
+      const E = getPropertyDescriptor(e, o, l);
       if (E.get) continue;
-      a = s && l in s ? s[l] : e[l];
+      a = o && l in o ? o[l] : e[l];
       if (t && isWrappable(a)) wrap(a, r);
       if ((c = snapshotImpl(a, t, n, i)) !== e[l] || u) {
         if (!u) {
@@ -2629,8 +2670,8 @@ function merge(...e) {
   for (let i = 0; i < e.length; i++) {
     const r = e[i];
     t = t || (!!r && $PROXY in r);
-    const o = !!r && r[$SOURCES];
-    if (o) n.push(...o);
+    const s = !!r && r[$SOURCES];
+    if (s) n.push(...s);
     else n.push(typeof r === "function" ? ((t = true), createMemo(r)) : r);
   }
   if (SUPPORTS_PROXY && t) {
@@ -2660,35 +2701,35 @@ function merge(...e) {
   }
   const i = Object.create(null);
   let r = false;
-  let o = n.length - 1;
-  for (let e = o; e >= 0; e--) {
+  let s = n.length - 1;
+  for (let e = s; e >= 0; e--) {
     const t = n[e];
     if (!t) {
-      e === o && o--;
+      e === s && s--;
       continue;
     }
-    const s = Object.getOwnPropertyNames(t);
-    for (let n = s.length - 1; n >= 0; n--) {
-      const u = s[n];
+    const o = Object.getOwnPropertyNames(t);
+    for (let n = o.length - 1; n >= 0; n--) {
+      const u = o[n];
       if (u === "__proto__" || u === "constructor") continue;
       if (!i[u]) {
-        r = r || e !== o;
+        r = r || e !== s;
         const n = Object.getOwnPropertyDescriptor(t, u);
         i[u] = n.get ? { enumerable: true, configurable: true, get: n.get.bind(t) } : n;
       }
     }
   }
-  if (!r) return n[o];
-  const s = {};
+  if (!r) return n[s];
+  const o = {};
   const u = Object.keys(i);
   for (let e = u.length - 1; e >= 0; e--) {
     const t = u[e],
       n = i[t];
-    if (n.get) Object.defineProperty(s, t, n);
-    else s[t] = n.value;
+    if (n.get) Object.defineProperty(o, t, n);
+    else o[t] = n.value;
   }
-  s[$SOURCES] = n;
-  return s;
+  o[$SOURCES] = n;
+  return o;
 }
 function omit(e, ...t) {
   const n = new Set(t);
@@ -2722,14 +2763,14 @@ function omit(e, ...t) {
 function mapArray(e, t, n) {
   const i = typeof n?.keyed === "function" ? n.keyed : undefined;
   const r = t.length > 1;
-  const o = t;
+  const s = t;
   return createMemo(
     updateKeyedMap.bind({
       Ye: createOwner(),
-      Be: 0,
-      Ze: e,
+      Ze: 0,
+      Be: e,
       qe: [],
-      ze: o,
+      ze: s,
       Xe: [],
       Je: [],
       et: i,
@@ -2741,7 +2782,7 @@ function mapArray(e, t, n) {
 }
 const pureOptions = { pureWrite: true };
 function updateKeyedMap() {
-  const e = this.Ze() || [],
+  const e = this.Be() || [],
     t = e.length;
   e[$TRACK];
   runWithOwner(this.Ye, () => {
@@ -2764,29 +2805,29 @@ function updateKeyedMap() {
               return this.ze(() => t);
             };
     if (t === 0) {
-      if (this.Be !== 0) {
+      if (this.Ze !== 0) {
         this.Ye.dispose(false);
         this.Je = [];
         this.qe = [];
         this.Xe = [];
-        this.Be = 0;
+        this.Ze = 0;
         this.tt && (this.tt = []);
         this.nt && (this.nt = []);
       }
       if (this.it && !this.Xe[0]) {
         this.Xe[0] = runWithOwner((this.Je[0] = createOwner()), this.it);
       }
-    } else if (this.Be === 0) {
+    } else if (this.Ze === 0) {
       if (this.Je[0]) this.Je[0].dispose();
       this.Xe = new Array(t);
       for (i = 0; i < t; i++) {
         this.qe[i] = e[i];
         this.Xe[i] = runWithOwner((this.Je[i] = createOwner()), r);
       }
-      this.Be = t;
+      this.Ze = t;
     } else {
-      let o,
-        s,
+      let s,
+        o,
         u,
         c,
         a,
@@ -2797,34 +2838,34 @@ function updateKeyedMap() {
         d = this.tt ? new Array(t) : undefined,
         S = this.nt ? new Array(t) : undefined;
       for (
-        o = 0, s = Math.min(this.Be, t);
-        o < s && (this.qe[o] === e[o] || (this.tt && compare(this.et, this.qe[o], e[o])));
-        o++
+        s = 0, o = Math.min(this.Ze, t);
+        s < o && (this.qe[s] === e[s] || (this.tt && compare(this.et, this.qe[s], e[s])));
+        s++
       ) {
-        if (this.tt) setSignal(this.tt[o], e[o]);
+        if (this.tt) setSignal(this.tt[s], e[s]);
       }
       for (
-        s = this.Be - 1, u = t - 1;
-        s >= o &&
-        u >= o &&
-        (this.qe[s] === e[u] || (this.tt && compare(this.et, this.qe[s], e[u])));
-        s--, u--
+        o = this.Ze - 1, u = t - 1;
+        o >= s &&
+        u >= s &&
+        (this.qe[o] === e[u] || (this.tt && compare(this.et, this.qe[o], e[u])));
+        o--, u--
       ) {
-        E[u] = this.Xe[s];
-        T[u] = this.Je[s];
-        d && (d[u] = this.tt[s]);
-        S && (S[u] = this.nt[s]);
+        E[u] = this.Xe[o];
+        T[u] = this.Je[o];
+        d && (d[u] = this.tt[o]);
+        S && (S[u] = this.nt[o]);
       }
       f = new Map();
       l = new Array(u + 1);
-      for (i = u; i >= o; i--) {
+      for (i = u; i >= s; i--) {
         c = e[i];
         a = this.et ? this.et(c) : c;
         n = f.get(a);
         l[i] = n === undefined ? -1 : n;
         f.set(a, i);
       }
-      for (n = o; n <= s; n++) {
+      for (n = s; n <= o; n++) {
         c = this.qe[n];
         a = this.et ? this.et(c) : c;
         i = f.get(a);
@@ -2837,7 +2878,7 @@ function updateKeyedMap() {
           f.set(a, i);
         } else this.Je[n].dispose();
       }
-      for (i = o; i < t; i++) {
+      for (i = s; i < t; i++) {
         if (i in E) {
           this.Xe[i] = E[i];
           this.Je[i] = T[i];
@@ -2853,7 +2894,7 @@ function updateKeyedMap() {
           this.Xe[i] = runWithOwner((this.Je[i] = createOwner()), r);
         }
       }
-      this.Xe = this.Xe.slice(0, (this.Be = t));
+      this.Xe = this.Xe.slice(0, (this.Ze = t));
       this.qe = e.slice(0);
     }
   });
@@ -2863,26 +2904,26 @@ function repeat(e, t, n) {
   const i = t;
   return updateRepeat.bind({
     Ye: createOwner(),
-    Be: 0,
+    Ze: 0,
     rt: 0,
-    ot: e,
+    st: e,
     ze: i,
     Je: [],
     Xe: [],
-    st: n?.from,
+    ot: n?.from,
     it: n?.fallback
   });
 }
 function updateRepeat() {
-  const e = this.ot();
-  const t = this.st?.() || 0;
+  const e = this.st();
+  const t = this.ot?.() || 0;
   runWithOwner(this.Ye, () => {
     if (e === 0) {
-      if (this.Be !== 0) {
+      if (this.Ze !== 0) {
         this.Ye.dispose(false);
         this.Je = [];
         this.Xe = [];
-        this.Be = 0;
+        this.Ze = 0;
       }
       if (this.it && !this.Xe[0]) {
         this.Xe[0] = runWithOwner((this.Je[0] = createOwner()), this.it);
@@ -2890,12 +2931,12 @@ function updateRepeat() {
       return;
     }
     const n = t + e;
-    const i = this.rt + this.Be;
-    if (this.Be === 0 && this.Je[0]) this.Je[0].dispose();
+    const i = this.rt + this.Ze;
+    if (this.Ze === 0 && this.Je[0]) this.Je[0].dispose();
     for (let e = n; e < i; e++) this.Je[e - this.rt].dispose();
     if (this.rt < t) {
       let e = this.rt;
-      while (e < t && e < this.Be) this.Je[e++].dispose();
+      while (e < t && e < this.Ze) this.Je[e++].dispose();
       this.Je.splice(0, t - this.rt);
       this.Xe.splice(0, t - this.rt);
     } else if (this.rt > t) {
@@ -2916,7 +2957,7 @@ function updateRepeat() {
     }
     this.Xe = this.Xe.slice(0, e);
     this.rt = t;
-    this.Be = e;
+    this.Ze = e;
   });
   return this.Xe;
 }
@@ -2932,14 +2973,14 @@ function boundaryComputed(e, t) {
     n.F.notify(n, n.ut, i, r);
   };
   n.ut = t;
-  n.Ge = true;
+  n.xe = true;
   recompute(n, true);
   return n;
 }
 function createBoundChildren(e, t, n, i) {
   const r = e.F;
   r.addChild((e.F = n));
-  onCleanup(() => r.removeChild(e.F));
+  cleanup(() => r.removeChild(e.F));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), i);
@@ -2949,7 +2990,7 @@ const ON_INIT = Symbol();
 class CollectionQueue extends Queue {
   ct;
   ft = new Set();
-  lt = signal(false, { pureWrite: true, We: true });
+  lt = signal(false, { pureWrite: true, He: true });
   Et = false;
   Tt;
   dt = ON_INIT;
@@ -3009,18 +3050,18 @@ class CollectionQueue extends Queue {
 }
 function createCollectionBoundary(e, t, n, i) {
   const r = createOwner();
-  const o = new CollectionQueue(e);
-  if (i) o.Tt = i;
-  const s = createBoundChildren(r, t, o, e);
+  const s = new CollectionQueue(e);
+  if (i) s.Tt = i;
+  const o = createBoundChildren(r, t, s, e);
   const u = computed(() => {
-    if (!read(o.lt)) {
-      const e = read(s);
-      if (!untrack(() => read(o.lt))) {
-        o.Et = true;
+    if (!read(s.lt)) {
+      const e = read(o);
+      if (!untrack(() => read(s.lt))) {
+        s.Et = true;
         return e;
       }
     }
-    return n(o);
+    return n(s);
   });
   return accessor(u);
 }
@@ -3061,9 +3102,9 @@ function flatten(e, t) {
 function flattenArray(e, t = [], n) {
   let i = null;
   let r = false;
-  for (let o = 0; o < e.length; o++) {
+  for (let s = 0; s < e.length; s++) {
     try {
-      let i = e[o];
+      let i = e[s];
       if (typeof i === "function" && !i.length) {
         if (n?.doNotUnwrap) {
           t.push(i);