@solidjs/signals 2.0.0-beta.13 → 2.0.0-beta.14

package/dist/prod.js

@@ -75,39 +75,39 @@ function actualInsertIntoHeap(e, t) {
     e.S = t;
     r.S = e;
   }
-  if (i > t.O) t.O = i;
+  if (i > t._) t._ = i;
 }
 function insertIntoHeap(e, t) {
-  let n = e._;
+  let n = e.O;
   if (n & (REACTIVE_IN_HEAP | REACTIVE_RECOMPUTING_DEPS | REACTIVE_MANUAL_WRITE)) return;
   if (n & REACTIVE_CHECK) {
-    e._ = (n & -4) | REACTIVE_DIRTY | REACTIVE_IN_HEAP;
-  } else e._ = n | REACTIVE_IN_HEAP;
+    e.O = (n & -4) | REACTIVE_DIRTY | REACTIVE_IN_HEAP;
+  } else e.O = n | REACTIVE_IN_HEAP;
   if (!(n & REACTIVE_IN_HEAP_HEIGHT)) actualInsertIntoHeap(e, t);
 }
 function insertIntoHeapHeight(e, t) {
-  let n = e._;
+  let n = e.O;
   if (
     n &
     (REACTIVE_IN_HEAP | REACTIVE_RECOMPUTING_DEPS | REACTIVE_IN_HEAP_HEIGHT | REACTIVE_MANUAL_WRITE)
   )
     return;
-  e._ = n | REACTIVE_IN_HEAP_HEIGHT;
+  e.O = n | REACTIVE_IN_HEAP_HEIGHT;
   actualInsertIntoHeap(e, t);
 }
 function deleteFromHeap(e, t) {
-  const n = e._;
+  const n = e.O;
   if (!(n & (REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT))) return;
-  e._ = n & -25;
+  e.O = n & -25;
   const i = e.o;
   if (e.S === e) t.l[i] = undefined;
   else {
     const n = e.T;
     const r = t.l[i];
-    const s = n ?? r;
+    const o = n ?? r;
     if (e === r) t.l[i] = n;
     else e.S.T = n;
-    s.S = e.S;
+    o.S = e.S;
   }
   e.S = e;
   e.T = undefined;
@@ -115,16 +115,16 @@ function deleteFromHeap(e, t) {
 function markHeap(e) {
   if (e.R) return;
   e.R = true;
-  for (let t = 0; t <= e.O; t++) {
+  for (let t = 0; t <= e._; t++) {
     for (let n = e.l[t]; n !== undefined; n = n.T) {
-      if (n._ & REACTIVE_IN_HEAP) markNode(n);
+      if (n.O & REACTIVE_IN_HEAP) markNode(n);
     }
   }
 }
 function markNode(e, t = REACTIVE_DIRTY) {
-  const n = e._;
+  const n = e.O;
   if ((n & (REACTIVE_CHECK | REACTIVE_DIRTY)) >= t) return;
-  e._ = (n & -4) | t;
+  e.O = (n & -4) | t;
   for (let t = e.I; t !== null; t = t.p) {
     markNode(t.h, REACTIVE_CHECK);
   }
@@ -138,15 +138,15 @@ function markNode(e, t = REACTIVE_DIRTY) {
 }
 function runHeap(e, t) {
   e.R = false;
-  for (e.C = 0; e.C <= e.O; e.C++) {
+  for (e.C = 0; e.C <= e._; e.C++) {
     let n = e.l[e.C];
     while (n !== undefined) {
-      if (n._ & REACTIVE_IN_HEAP) t(n);
+      if (n.O & REACTIVE_IN_HEAP) t(n);
       else adjustHeight(n, e);
       n = e.l[e.C];
     }
   }
-  e.O = 0;
+  e._ = 0;
 }
 function adjustHeight(e, t) {
   deleteFromHeap(e, t);
@@ -228,8 +228,8 @@ function assignOrMergeLane(e, t) {
   e.G = t;
 }
 const transitions = new Set();
-const dirtyQueue = { l: new Array(2e3).fill(undefined), R: false, C: 0, O: 0 };
-const zombieQueue = { l: new Array(2e3).fill(undefined), R: false, C: 0, O: 0 };
+const dirtyQueue = { l: new Array(2e3).fill(undefined), R: false, C: 0, _: 0 };
+const zombieQueue = { l: new Array(2e3).fill(undefined), R: false, C: 0, _: 0 };
 let clock = 0;
 let activeTransition = null;
 let scheduled = false;
@@ -288,7 +288,7 @@ function queueStashedOptimisticEffects(e) {
       }
       continue;
     }
-    const n = e._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    const n = e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
     if (n.C > e.o) n.C = e.o;
     insertIntoHeap(e, n);
   }
@@ -302,12 +302,12 @@ function mergeTransitionState(e, t) {
   for (const n of activeLanes) if (n.M === t) n.M = e;
   e.Z.push(...t.Z);
   for (const n of t.q) e.q.add(n);
-  for (const [n, i] of t.se) {
-    let t = e.se.get(n);
-    if (!t) e.se.set(n, (t = new Set()));
+  for (const [n, i] of t.oe) {
+    let t = e.oe.get(n);
+    if (!t) e.oe.set(n, (t = new Set()));
     for (const e of i) t.add(e);
   }
-  for (const n of t.oe) e.oe.add(n);
+  for (const n of t.se) e.se.add(n);
 }
 function resolveOptimisticNodes(e) {
   for (let t = 0; t < e.length; t++) {
@@ -434,16 +434,16 @@ class GlobalQueue extends Queue {
           this.q = new Set();
           runLaneEffects(EFFECT_RENDER);
           runLaneEffects(EFFECT_USER);
-          this.stashQueues(e.Oe);
+          this.stashQueues(e._e);
           clock++;
-          scheduled = dirtyQueue.O >= dirtyQueue.C;
+          scheduled = dirtyQueue._ >= dirtyQueue.C;
           reassignPendingTransition(e.fe);
           activeTransition = null;
-          if (!e.re.length && !e.se.size && e.Z.length) {
+          if (!e.re.length && !e.oe.size && e.Z.length) {
             stashedOptimisticReads = new Set();
             for (let t = 0; t < e.Z.length; t++) {
               const n = e.Z[t];
-              if (n.L || n._e & CONFIG_OWNED_WRITE) continue;
+              if (n.L || n.Oe & CONFIG_OWNED_WRITE) continue;
               stashedOptimisticReads.add(n);
               queueStashedOptimisticEffects(n);
             }
@@ -456,7 +456,7 @@ class GlobalQueue extends Queue {
           return;
         }
         this.fe !== activeTransition.fe && this.fe.push(...activeTransition.fe);
-        this.restoreQueues(activeTransition.Oe);
+        this.restoreQueues(activeTransition._e);
         transitions.delete(activeTransition);
         const t = activeTransition;
         activeTransition = null;
@@ -465,7 +465,7 @@ class GlobalQueue extends Queue {
       } else {
         if (canUseSimpleSyncFlush(this)) {
           commitPendingNodes();
-          if (dirtyQueue.O >= dirtyQueue.C) {
+          if (dirtyQueue._ >= dirtyQueue.C) {
             runHeap(dirtyQueue, GlobalQueue.Ee);
             commitPendingNodes();
           }
@@ -475,7 +475,7 @@ class GlobalQueue extends Queue {
         }
       }
       clock++;
-      scheduled = dirtyQueue.O >= dirtyQueue.C;
+      scheduled = dirtyQueue._ >= dirtyQueue.C;
       activeLanes.size && runLaneEffects(EFFECT_RENDER);
       this.run(EFFECT_RENDER);
       activeLanes.size && runLaneEffects(EFFECT_USER);
@@ -491,8 +491,8 @@ class GlobalQueue extends Queue {
         const t = i !== undefined ? i : e.Re;
         if (activeTransition && t) {
           const n = t.source;
-          let i = activeTransition.se.get(n);
-          if (!i) activeTransition.se.set(n, (i = new Set()));
+          let i = activeTransition.oe.get(n);
+          if (!i) activeTransition.oe.set(n, (i = new Set()));
           const r = i.size;
           i.add(e);
           if (i.size !== r) schedule();
@@ -510,13 +510,13 @@ class GlobalQueue extends Queue {
       activeTransition = e ?? {
         Ie: clock,
         fe: [],
-        se: new Map(),
+        oe: new Map(),
         Z: [],
         q: new Set(),
         re: [],
-        Oe: { le: [[], []], Y: [] },
+        _e: { le: [[], []], Y: [] },
         ie: false,
-        oe: new Set()
+        se: new Set()
       };
     } else if (e) {
       const t = activeTransition;
@@ -575,15 +575,15 @@ function insertSubs(e, t = false) {
   const n = e.G || currentOptimisticLane;
   const i = e.pe !== undefined;
   for (let r = e.I; r !== null; r = r.p) {
-    if (i && r.h._e & CONFIG_IN_SNAPSHOT_SCOPE) {
-      r.h._ |= REACTIVE_SNAPSHOT_STALE;
+    if (i && r.h.Oe & CONFIG_IN_SNAPSHOT_SCOPE) {
+      r.h.O |= REACTIVE_SNAPSHOT_STALE;
       continue;
     }
     if (t && n) {
-      r.h._ |= REACTIVE_OPTIMISTIC_DIRTY;
+      r.h.O |= REACTIVE_OPTIMISTIC_DIRTY;
       assignOrMergeLane(r.h, n);
     } else if (t) {
-      r.h._ |= REACTIVE_OPTIMISTIC_DIRTY;
+      r.h.O |= REACTIVE_OPTIMISTIC_DIRTY;
       r.h.G = undefined;
     }
     const e = r.h;
@@ -594,9 +594,9 @@ function insertSubs(e, t = false) {
       }
       continue;
     }
-    const s = r.h._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (s.C > r.h.o) s.C = r.h.o;
-    insertIntoHeap(r.h, s);
+    const o = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (o.C > r.h.o) o.C = r.h.o;
+    insertIntoHeap(r.h, o);
   }
 }
 function commitPendingNode(e) {
@@ -613,7 +613,7 @@ function commitPendingNode(e) {
     e.B = NOT_PENDING;
     if (e.J && e.J !== EFFECT_TRACKED) e.ee = true;
   }
-  t._ &= ~REACTIVE_MANUAL_WRITE;
+  t.O &= ~REACTIVE_MANUAL_WRITE;
   if (!(t.he & STATUS_PENDING)) t.he &= ~STATUS_UNINITIALIZED;
   if (t.Ne !== null || t.Ae !== null) GlobalQueue.Se(t, false, true);
 }
@@ -632,14 +632,14 @@ function finalizePureQueue(e = null, t = false) {
   const n = !t;
   if (n) commitPendingNodes();
   if (!t && globalQueue.Y.length) checkBoundaryChildren(globalQueue);
-  const i = dirtyQueue.O >= dirtyQueue.C;
+  const i = dirtyQueue._ >= dirtyQueue.C;
   if (i) runHeap(dirtyQueue, GlobalQueue.Ee);
   if (n) {
     if (i) commitPendingNodes();
     resolveOptimisticNodes(e ? e.Z : globalQueue.Z);
-    if (e && e.oe.size) {
-      for (const t of e.oe) {
-        if (t._ & REACTIVE_DISPOSED) continue;
+    if (e && e.se.size) {
+      for (const t of e.se) {
+        if (t.O & REACTIVE_DISPOSED) continue;
         if (t.J === EFFECT_TRACKED) {
           if (!t.ee) {
             t.ee = true;
@@ -647,11 +647,11 @@ function finalizePureQueue(e = null, t = false) {
           }
           continue;
         }
-        const e = t._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+        const e = t.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
         if (e.C > t.o) e.C = t.o;
         insertIntoHeap(t, e);
       }
-      e.oe.clear();
+      e.se.clear();
     }
     const t = e ? e.q : globalQueue.q;
     if (GlobalQueue.de && t.size) {
@@ -702,7 +702,7 @@ function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function reporterBlocksSource(e, t) {
-  if (e._ & (REACTIVE_ZOMBIE | REACTIVE_DISPOSED)) return false;
+  if (e.O & (REACTIVE_ZOMBIE | REACTIVE_DISPOSED)) return false;
   if (e.Ce === t || e.Pe?.has(t)) return true;
   for (let n = e.P; n; n = n.D) {
     let e = n.m;
@@ -717,7 +717,7 @@ function transitionComplete(e) {
   if (e.ie) return true;
   if (e.re.length) return false;
   let t = true;
-  for (const [n, i] of e.se) {
+  for (const [n, i] of e.oe) {
     let r = false;
     for (const e of i) {
       if (reporterBlocksSource(e, n)) {
@@ -726,7 +726,7 @@ function transitionComplete(e) {
       }
       i.delete(e);
     }
-    if (!r) e.se.delete(n);
+    if (!r) e.oe.delete(n);
     else if (n.he & STATUS_PENDING && n.Re?.source === n) {
       t = false;
       break;
@@ -770,8 +770,8 @@ const PENDING_OWNER = {};
 function markDisposal(e) {
   let t = e.ge;
   while (t) {
-    t._ |= REACTIVE_ZOMBIE;
-    if (t._ & REACTIVE_IN_HEAP) {
+    t.O |= REACTIVE_ZOMBIE;
+    if (t.O & REACTIVE_IN_HEAP) {
       deleteFromHeap(t, dirtyQueue);
       insertIntoHeap(t, zombieQueue);
     }
@@ -789,16 +789,16 @@ function dispose(e) {
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
-  const i = e._;
+  const i = e.O;
   if (i & REACTIVE_DISPOSED) return;
-  if (t) e._ = i | REACTIVE_DISPOSED;
+  if (t) e.O = i | REACTIVE_DISPOSED;
   if (t && e.L) e.ve = null;
   let r = n ? e.Ne : e.ge;
   while (r) {
     const e = r.De;
     if (r.P) {
       const e = r;
-      deleteFromHeap(e, e._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+      deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
       let t = e.P;
       do {
         t = unlinkSubs(t);
@@ -815,7 +815,7 @@ function disposeChildren(e, t = false, n) {
     e.ge = null;
     e.me = 0;
   }
-  if (t && !n && !(i & REACTIVE_ZOMBIE) && e.i !== null && !(e.i._ & REACTIVE_DISPOSED)) {
+  if (t && !n && !(i & REACTIVE_ZOMBIE) && e.i !== null && !(e.i.O & REACTIVE_DISPOSED)) {
     const t = e.we;
     const n = e.De;
     if (t !== null) t.De = n;
@@ -840,7 +840,7 @@ function runDisposal(e, t) {
 }
 function childId(e, t) {
   let n = e;
-  while (n._e & CONFIG_TRANSPARENT && n.i) n = n.i;
+  while (n.Oe & CONFIG_TRANSPARENT && n.i) n = n.i;
   if (n.id != null) return formatId(n.id, t ? n.me++ : n.me);
   throw new Error("Cannot get child id from owner without an id");
 }
@@ -870,7 +870,7 @@ function cleanup(e) {
   return e;
 }
 function isDisposed(e) {
-  return !!(e._ & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE));
+  return !!(e.O & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE));
 }
 function disposeRootSelf(e = true) {
   disposeChildren(this, e);
@@ -880,7 +880,7 @@ function createOwner(e) {
   const n = e?.transparent ?? false;
   const i = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    _e: n ? CONFIG_TRANSPARENT : 0,
+    Oe: n ? CONFIG_TRANSPARENT : 0,
     t: true,
     u: t?.t ? t.u : t,
     ge: null,
@@ -924,7 +924,7 @@ function unlinkSubs(e) {
     if (i === null) {
       t.X?.();
       const e = t;
-      e.L && e._e & CONFIG_AUTO_DISPOSE && !(e._ & REACTIVE_ZOMBIE) && unobserved(e);
+      e.L && e.Oe & CONFIG_AUTO_DISPOSE && !(e.O & REACTIVE_ZOMBIE) && unobserved(e);
     }
   }
   return n;
@@ -941,7 +941,7 @@ function trimStaleDeps(e) {
   }
 }
 function unobserved(e) {
-  deleteFromHeap(e, e._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
   let t = e.P;
   while (t !== null) {
     t = unlinkSubs(t);
@@ -954,7 +954,7 @@ function link(e, t) {
   const n = t.ye;
   if (n !== null && n.m === e) return;
   let i = null;
-  const r = t._ & REACTIVE_RECOMPUTING_DEPS;
+  const r = t.O & REACTIVE_RECOMPUTING_DEPS;
   if (r) {
     i = n !== null ? n.D : t.P;
     if (i !== null && i.m === e) {
@@ -962,13 +962,13 @@ function link(e, t) {
       return;
     }
   }
-  const s = e.Ue;
-  if (s !== null && s.h === t && (!r || isValidLink(s, t))) return;
-  const o = (t.ye = e.Ue = { m: e, h: t, D: i, Le: s, p: null });
-  if (n !== null) n.D = o;
-  else t.P = o;
-  if (s !== null) s.p = o;
-  else e.I = o;
+  const o = e.Ue;
+  if (o !== null && o.h === t && (!r || isValidLink(o, t))) return;
+  const s = (t.ye = e.Ue = { m: e, h: t, D: i, Le: o, p: null });
+  if (n !== null) n.D = s;
+  else t.P = s;
+  if (o !== null) o.p = s;
+  else e.I = s;
 }
 function isValidLink(e, t) {
   const n = t.ye;
@@ -1059,7 +1059,7 @@ function settlePendingSource(e) {
             e.te.enqueue(EFFECT_USER, e.ne);
           }
         } else {
-          const e = i._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+          const e = i.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
           if (e.C > i.o) e.C = i.o;
           insertIntoHeap(i, e);
         }
@@ -1086,7 +1086,7 @@ function handleAsync(e, t, n) {
     return t;
   }
   e.ve = t;
-  let s;
+  let o;
   const handleError = n => {
     if (e.ve !== t) return;
     globalQueue.initTransition(resolveTransition(e));
@@ -1095,13 +1095,13 @@ function handleAsync(e, t, n) {
   };
   const asyncWrite = (i, r) => {
     if (e.ve !== t) return;
-    if (e._ & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
+    if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
     globalQueue.initTransition(resolveTransition(e));
-    const s = !!(e.he & STATUS_UNINITIALIZED);
+    const o = !!(e.he & STATUS_UNINITIALIZED);
     trimStaleDeps(e);
     clearStatus(e);
-    const o = resolveLane(e);
-    if (o) o.F.delete(e);
+    const s = resolveLane(e);
+    if (s) s.F.delete(e);
     if (n) n(i);
     else if (e.K !== undefined) {
       if (e.K !== undefined && e.K !== NOT_PENDING) e.B = i;
@@ -1110,11 +1110,11 @@ function handleAsync(e, t, n) {
         insertSubs(e);
       }
       e.Ie = clock;
-    } else if (o) {
+    } else if (s) {
       const t = e.J;
       const n = e.ue;
       const r = e.ke;
-      if ((!t && s) || !r || !r(i, n)) {
+      if ((!t && o) || !r || !r(i, n)) {
         e.ue = i;
         e.Ie = clock;
         if (e.Fe) {
@@ -1136,7 +1136,7 @@ function handleAsync(e, t, n) {
     t.then(
       e => {
         if (i) {
-          s = e;
+          o = e;
           n = true;
         } else asyncWrite(e);
       },
@@ -1165,13 +1165,13 @@ function handleAsync(e, t, n) {
       } catch {}
     });
     const iterate = () => {
-      let o,
+      let s,
         u = false,
         c = true;
       n.next().then(
         n => {
           if (c) {
-            o = n;
+            s = n;
             u = true;
             if (n.done) r = true;
           } else if (e.ve !== t) {
@@ -1191,20 +1191,20 @@ function handleAsync(e, t, n) {
         }
       );
       c = false;
-      if (u && !o.done) {
-        s = o.value;
+      if (u && !s.done) {
+        o = s.value;
         i = true;
         return iterate();
       }
-      return u && o.done;
+      return u && s.done;
     };
-    const o = iterate();
-    if (!i && !o) {
+    const s = iterate();
+    if (!i && !s) {
       globalQueue.initTransition(resolveTransition(e));
       throw new NotReadyError(context);
     }
   }
-  return s;
+  return o;
 }
 function clearStatus(e, t = false) {
   if (e.Ce || e.Pe) clearPendingSources(e);
@@ -1217,15 +1217,15 @@ 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 s = t === STATUS_PENDING && n instanceof NotReadyError ? n.source : undefined;
-  const o = s === e;
-  const u = t === STATUS_PENDING && e.K !== undefined && !o;
+  const o = t === STATUS_PENDING && n instanceof NotReadyError ? n.source : undefined;
+  const s = o === e;
+  const u = t === STATUS_PENDING && e.K !== undefined && !s;
   const c = u && hasActiveOverride(e);
   if (!i) {
-    if (t === STATUS_PENDING && s) {
-      addPendingSource(e, s);
+    if (t === STATUS_PENDING && o) {
+      addPendingSource(e, o);
       e.he = STATUS_PENDING | (e.he & STATUS_UNINITIALIZED);
-      setPendingError(e, s, n);
+      setPendingError(e, o, n);
     } else {
       clearPendingSources(e);
       e.he = t | (t !== STATUS_ERROR ? e.he & STATUS_UNINITIALIZED : 0);
@@ -1252,7 +1252,7 @@ function notifyStatus(e, t, n, i, r) {
   forEachDependent(e, e => {
     e.Ie = clock;
     if (
-      (t === STATUS_PENDING && s && e.Ce !== s && !e.Pe?.has(s)) ||
+      (t === STATUS_PENDING && o && e.Ce !== o && !e.Pe?.has(o)) ||
       (t !== STATUS_PENDING && (e.Re !== n || e.Ce || e.Pe))
     ) {
       if (!l && !e.M) queuePendingNode(e);
@@ -1268,11 +1268,11 @@ function enableExternalSource(e) {
     externalSourceConfig = {
       factory: (n, i) => {
         const r = e(n, i);
-        const s = t(e => r.track(e), i);
+        const o = t(e => r.track(e), i);
         return {
-          track: e => s.track(e),
+          track: e => o.track(e),
           dispose() {
-            s.dispose();
+            o.dispose();
             r.dispose();
           }
         };
@@ -1293,7 +1293,7 @@ let foundPending = false;
 let latestReadActive = false;
 let context = null;
 let currentOptimisticLane = null;
-let pendingCheckLoadingPath = false;
+let pendingCheckSources = null;
 let snapshotCaptureActive = false;
 let snapshotSources = null;
 function ownerInSnapshotScope(e) {
@@ -1324,10 +1324,10 @@ function releaseSubtree(e) {
     }
     if (t.L) {
       const e = t;
-      e._e &= ~CONFIG_IN_SNAPSHOT_SCOPE;
-      if (e._ & REACTIVE_SNAPSHOT_STALE) {
-        e._ &= ~REACTIVE_SNAPSHOT_STALE;
-        e._ |= REACTIVE_DIRTY;
+      e.Oe &= ~CONFIG_IN_SNAPSHOT_SCOPE;
+      if (e.O & REACTIVE_SNAPSHOT_STALE) {
+        e.O &= ~REACTIVE_SNAPSHOT_STALE;
+        e.O |= REACTIVE_DIRTY;
         if (dirtyQueue.C > e.o) dirtyQueue.C = e.o;
         insertIntoHeap(e, dirtyQueue);
       }
@@ -1351,7 +1351,7 @@ function recompute(e, t = false) {
   if (!t) {
     if (e.M && (!n || activeTransition) && activeTransition !== e.M)
       globalQueue.initTransition(e.M);
-    deleteFromHeap(e, e._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+    deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     e.ve = null;
     if (e.M || n === EFFECT_TRACKED) disposeChildren(e);
     else if (e.ge !== null || e.be !== null) {
@@ -1363,14 +1363,14 @@ function recompute(e, t = false) {
       e.me = 0;
     } else;
   }
-  let i = !!(e._ & REACTIVE_OPTIMISTIC_DIRTY);
+  let i = !!(e.O & REACTIVE_OPTIMISTIC_DIRTY);
   const r = e.K !== undefined && e.K !== NOT_PENDING;
-  const s = !!(e.he & STATUS_PENDING);
-  const o = !!(e.he & STATUS_UNINITIALIZED);
+  const o = !!(e.he & STATUS_PENDING);
+  const s = !!(e.he & STATUS_UNINITIALIZED);
   const u = context;
   context = e;
   e.ye = null;
-  e._ = REACTIVE_RECOMPUTING_DEPS;
+  e.O = REACTIVE_RECOMPUTING_DEPS;
   e.Ie = clock;
   let c = e.B === NOT_PENDING ? e.ue : e.B;
   let l = e.o;
@@ -1383,12 +1383,12 @@ function recompute(e, t = false) {
   } else if (activeTransition && !t && activeTransition.Z.length) {
     for (let t = e.P; t; t = t.D) {
       const n = t.m;
-      if (n._ & REACTIVE_OPTIMISTIC_DIRTY) {
+      if (n.O & REACTIVE_OPTIMISTIC_DIRTY) {
         const t = resolveLane(n);
         if (t) {
           i = true;
           currentOptimisticLane = t;
-          e._ |= REACTIVE_OPTIMISTIC_DIRTY;
+          e.O |= REACTIVE_OPTIMISTIC_DIRTY;
           assignOrMergeLane(e, t);
           break;
         }
@@ -1399,7 +1399,7 @@ function recompute(e, t = false) {
   const S = stale;
   if (E) stale = true;
   try {
-    if (!false && e._e & CONFIG_SYNC) {
+    if (!false && e.Oe & CONFIG_SYNC) {
       c = e.L(c);
       e.ve = null;
     } else {
@@ -1438,19 +1438,19 @@ function recompute(e, t = false) {
   } finally {
     tracking = a;
     if (E) stale = S;
-    e._ = REACTIVE_NONE | (t ? e._ & REACTIVE_SNAPSHOT_STALE : 0);
+    e.O = REACTIVE_NONE | (t ? e.O & REACTIVE_SNAPSHOT_STALE : 0);
     context = u;
   }
   if (!e.Re) {
     trimStaleDeps(e);
     const u = r ? e.K : e.B === NOT_PENDING ? e.ue : e.B;
-    const a = (!n && o) || !e.ke || !e.ke(u, c);
+    const a = (!n && s) || !e.ke || !e.ke(u, c);
     if (n && a) {
       e.ee = !e.Re;
       if (!t) e.te.enqueue(n, GlobalQueue.Te.bind(null, e));
     }
     if (a) {
-      const o = r ? e.K : undefined;
+      const s = r ? e.K : undefined;
       if (t || (n && activeTransition !== e.M) || i) {
         e.ue = c;
         if (r && i) {
@@ -1458,13 +1458,13 @@ function recompute(e, t = false) {
           e.B = c;
         }
       } else e.B = c;
-      if (r && !i && s && !e.$) e.K = c;
-      if (!r || i || e.K !== o) insertSubs(e, i || r);
+      if (r && !i && o && !e.$) e.K = c;
+      if (!r || i || e.K !== s) insertSubs(e, i || r);
     } else if (r) {
       e.B = c;
     } else if (e.o != l) {
       for (let t = e.I; t !== null; t = t.p) {
-        insertIntoHeapHeight(t.h, t.h._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+        insertIntoHeapHeight(t.h, t.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
       }
     }
   }
@@ -1478,28 +1478,28 @@ function recompute(e, t = false) {
   e.M && n && activeTransition !== e.M && runInTransition(e.M, () => recompute(e));
 }
 function updateIfNecessary(e) {
-  if (e._ & REACTIVE_CHECK) {
+  if (e.O & REACTIVE_CHECK) {
     for (let t = e.P; t; t = t.D) {
       const n = t.m;
       const i = n.V || n;
       if (i.L) {
         updateIfNecessary(i);
       }
-      if (e._ & REACTIVE_DIRTY) {
+      if (e.O & REACTIVE_DIRTY) {
         break;
       }
     }
   }
-  if (e._ & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.Re && e.Ie < clock && !e.ve)) {
+  if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.Re && e.Ie < clock && !e.ve)) {
     recompute(e);
   }
-  e._ = e._ & (REACTIVE_SNAPSHOT_STALE | REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT);
+  e.O = e.O & (REACTIVE_SNAPSHOT_STALE | REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT);
 }
 function computed(e, t) {
   const n = t?.transparent ?? false;
   const i = {
     id: t?.id ?? (n ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
-    _e:
+    Oe:
       (n ? CONFIG_TRANSPARENT : 0) |
       (t?.ownedWrite ? CONFIG_OWNED_WRITE : 0) |
       (!context || t?.lazy ? CONFIG_AUTO_DISPOSE : 0) |
@@ -1525,7 +1525,7 @@ function computed(e, t) {
     De: null,
     we: null,
     ge: null,
-    _: t?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
+    O: t?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
     he: STATUS_UNINITIALIZED,
     Ie: clock,
     B: NOT_PENDING,
@@ -1537,17 +1537,17 @@ function computed(e, t) {
   setupComputedNode(i, t);
   return i;
 }
-function createEffectNode(e, t, n, i, r, s) {
-  const o = s?.transparent ?? false;
+function createEffectNode(e, t, n, i, r, o) {
+  const s = o?.transparent ?? false;
   const u = {
-    id: s?.id ?? (o ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
-    _e:
-      (o ? CONFIG_TRANSPARENT : 0) |
-      (s?.ownedWrite ? CONFIG_OWNED_WRITE : 0) |
-      (s?.sync ? CONFIG_SYNC : 0) |
+    id: o?.id ?? (s ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
+    Oe:
+      (s ? CONFIG_TRANSPARENT : 0) |
+      (o?.ownedWrite ? CONFIG_OWNED_WRITE : 0) |
+      (o?.sync ? CONFIG_SYNC : 0) |
       (snapshotCaptureActive && ownerInSnapshotScope(context) ? CONFIG_IN_SNAPSHOT_SCOPE : 0),
     ke: false,
-    X: s?.unobserved,
+    X: o?.unobserved,
     be: null,
     te: context?.te ?? globalQueue,
     Ve: context?.Ve ?? defaultContext,
@@ -1566,7 +1566,7 @@ function createEffectNode(e, t, n, i, r, s) {
     De: null,
     we: null,
     ge: null,
-    _: REACTIVE_LAZY,
+    O: REACTIVE_LAZY,
     he: STATUS_UNINITIALIZED,
     Ie: clock,
     B: NOT_PENDING,
@@ -1623,7 +1623,7 @@ function setupComputedNode(e, t) {
 function signal(e, t, n = null) {
   const i = {
     ke: t?.equals != null ? t.equals : isEqual,
-    _e: (t?.ownedWrite ? CONFIG_OWNED_WRITE : 0) | (t?.Ye ? CONFIG_NO_SNAPSHOT : 0),
+    Oe: (t?.ownedWrite ? CONFIG_OWNED_WRITE : 0) | (t?.Ye ? CONFIG_NO_SNAPSHOT : 0),
     X: t?.unobserved,
     ue: e,
     I: null,
@@ -1634,7 +1634,7 @@ function signal(e, t, n = null) {
     B: NOT_PENDING
   };
   n && (n.N = i);
-  if (snapshotCaptureActive && !(i._e & CONFIG_NO_SNAPSHOT) && !((n?.he ?? 0) & STATUS_PENDING)) {
+  if (snapshotCaptureActive && !(i.Oe & CONFIG_NO_SNAPSHOT) && !((n?.he ?? 0) & STATUS_PENDING)) {
     i.pe = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources.add(i);
   }
@@ -1693,39 +1693,48 @@ function read(e) {
     const t = e.V;
     const n = pendingCheckActive;
     pendingCheckActive = false;
-    const i = t || e;
-    if (pendingCheckLoadingPath && i.he & STATUS_PENDING && i.he & STATUS_UNINITIALIZED) {
-      let t = context;
-      if (t?.t) t = t.u;
-      if (t && tracking) link(e, t);
+    let i = context;
+    if (i?.t) i = i.u;
+    const r = t || e;
+    const o = e;
+    if (typeof o.L === "function") {
+      const t = e;
+      if (t.O & REACTIVE_LAZY) {
+        t.O &= ~REACTIVE_LAZY;
+        recompute(t, true);
+      } else if (t.O & REACTIVE_DISPOSED) {
+        recompute(t, true);
+      } else {
+        updateIfNecessary(t);
+      }
+    }
+    if (i && r.he & STATUS_PENDING && r.he & STATUS_UNINITIALIZED) {
+      if (tracking && e !== i) link(e, i);
       pendingCheckActive = n;
-      throw i.Re;
+      throw r.Re;
     }
     if (t && e.K !== undefined) {
       if (e.K !== NOT_PENDING && (t.ve || !!(t.he & STATUS_PENDING))) {
         foundPending = true;
       }
-      let n = context;
-      if (n?.t) n = n.u;
-      if (n && tracking) link(e, n);
-      read(getPendingSignal(e));
-      read(getPendingSignal(t));
+      collectPendingSources(e);
+      collectPendingSources(t);
+      if (i && tracking) link(e, i);
     } else {
-      if (read(getPendingSignal(e))) foundPending = true;
-      if (t && read(getPendingSignal(t))) foundPending = true;
+      collectPendingSources(e);
+      if (t) collectPendingSources(t);
     }
     pendingCheckActive = n;
-    return e.ue;
   }
   let t = context;
   if (t?.t) t = t.u;
   const n = e;
   if (typeof n.L === "function") {
     const t = e;
-    if (t._ & REACTIVE_LAZY) {
-      t._ &= ~REACTIVE_LAZY;
+    if (t.O & REACTIVE_LAZY) {
+      t.O &= ~REACTIVE_LAZY;
       recompute(t, true);
-    } else if (t._ & REACTIVE_DISPOSED) {
+    } else if (t.O & REACTIVE_DISPOSED) {
       recompute(t, true);
     }
   }
@@ -1746,7 +1755,7 @@ function read(e) {
   if (t && tracking) {
     link(e, t);
     if (i.L) {
-      const n = e._ & REACTIVE_ZOMBIE;
+      const n = e.O & REACTIVE_ZOMBIE;
       if (i.o >= (n ? zombieQueue.C : dirtyQueue.C)) {
         markNode(t);
         markHeap(n ? zombieQueue : dirtyQueue);
@@ -1784,12 +1793,12 @@ function read(e) {
       return read(e);
     } else throw e.Re;
   }
-  if (snapshotCaptureActive && t && t._e & CONFIG_IN_SNAPSHOT_SCOPE) {
+  if (snapshotCaptureActive && t && t.Oe & CONFIG_IN_SNAPSHOT_SCOPE) {
     const n = e.pe;
     if (n !== undefined) {
       const i = n === NO_SNAPSHOT ? undefined : n;
       const r = e.B !== NOT_PENDING ? e.B : e.ue;
-      if (r !== i) t._ |= REACTIVE_SNAPSHOT_STALE;
+      if (r !== i) t.O |= REACTIVE_SNAPSHOT_STALE;
       return i;
     }
   }
@@ -1806,7 +1815,7 @@ function read(e) {
     !e.L &&
     t
   ) {
-    activeTransition.oe.add(t);
+    activeTransition.se.add(t);
     return e.ue;
   }
   const r =
@@ -1821,7 +1830,7 @@ function read(e) {
     !t &&
     i === e &&
     typeof n.L === "function" &&
-    e._e & CONFIG_AUTO_DISPOSE &&
+    e.Oe & CONFIG_AUTO_DISPOSE &&
     !(i.he & STATUS_PENDING) &&
     !e.I
   ) {
@@ -1835,8 +1844,8 @@ function setSignal(e, t) {
   const i = e.K !== undefined && e.K !== NOT_PENDING;
   const r = n ? (i ? e.K : e.ue) : e.B === NOT_PENDING ? e.ue : e.B;
   if (typeof t === "function") t = t(r);
-  const s = !e.ke || !e.ke(r, t) || !!(e.he & STATUS_UNINITIALIZED);
-  if (!s) {
+  const o = !e.ke || !e.ke(r, t) || !!(e.he & STATUS_UNINITIALIZED);
+  if (!o) {
     if (n && i && e.L) {
       insertSubs(e, true);
       schedule();
@@ -1868,9 +1877,9 @@ function setSignal(e, t) {
   return t;
 }
 function suppressComputedRecompute(e) {
-  deleteFromHeap(e, e._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-  if (!(e._ & REACTIVE_MANUAL_WRITE) && e.B === NOT_PENDING) queuePendingNode(e);
-  e._ = (e._ & -4) | REACTIVE_MANUAL_WRITE;
+  deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  if (!(e.O & REACTIVE_MANUAL_WRITE) && e.B === NOT_PENDING) queuePendingNode(e);
+  e.O = (e.O & -4) | REACTIVE_MANUAL_WRITE;
 }
 function setMemo(e, t) {
   const n = setSignal(e, t);
@@ -1899,9 +1908,19 @@ function getPendingSignal(e) {
   }
   return e.We;
 }
+function collectPendingSources(e) {
+  pendingCheckSources?.add(e);
+  const t = e.V || e;
+  if (t !== e) pendingCheckSources?.add(t);
+}
 function computePendingState(e) {
   const t = e;
   const n = e.V;
+  if (e.U) {
+    const n = e.U;
+    if (n.he & STATUS_PENDING && !(n.he & STATUS_UNINITIALIZED)) return true;
+    return e.B !== NOT_PENDING && !(t.he & STATUS_UNINITIALIZED);
+  }
   if (n && e.B !== NOT_PENDING) {
     return !n.ve && !(n.he & STATUS_PENDING);
   }
@@ -1971,24 +1990,38 @@ function latest(e) {
     latestReadActive = t;
   }
 }
-function isPending(e, t) {
-  const n = pendingCheckActive;
-  const i = pendingCheckLoadingPath;
-  const r = foundPending;
-  const s = t === true;
+function isPending(e) {
+  const t = pendingCheckActive;
+  const n = foundPending;
+  const i = pendingCheckSources;
   pendingCheckActive = true;
-  pendingCheckLoadingPath = s;
   foundPending = false;
+  pendingCheckSources = new Set();
+  const collectPending = () => {
+    pendingCheckActive = false;
+    try {
+      pendingCheckSources.forEach(e => {
+        if (read(getPendingSignal(e))) foundPending = true;
+      });
+    } finally {
+      pendingCheckActive = true;
+    }
+  };
   try {
     e();
+    collectPending();
     return foundPending;
   } catch (e) {
-    if (s && e instanceof NotReadyError) throw e;
+    collectPending();
+    if (e instanceof NotReadyError) {
+      if (foundPending && !(e.source?.he & STATUS_UNINITIALIZED)) return true;
+      if (context) throw e;
+    }
     return foundPending;
   } finally {
-    pendingCheckActive = n;
-    pendingCheckLoadingPath = i;
-    foundPending = r;
+    pendingCheckActive = t;
+    foundPending = n;
+    pendingCheckSources = i;
   }
 }
 function refresh(e) {
@@ -1997,7 +2030,7 @@ function refresh(e) {
   try {
     const t = e?.[$REFRESH];
     if (false && !t);
-    if (t && typeof t.L === "function" && !(t._ & REACTIVE_DISPOSED)) {
+    if (t && typeof t.L === "function" && !(t.O & REACTIVE_DISPOSED)) {
       recompute(t);
     }
   } finally {
@@ -2037,12 +2070,12 @@ function isUndefined(e) {
 }
 function effect(e, t, n, i) {
   const r = !!i?.user;
-  const s = createEffectNode(e, t, n, r ? EFFECT_USER : EFFECT_RENDER, notifyEffectStatus, i);
-  recompute(s, true);
+  const o = createEffectNode(e, t, n, r ? EFFECT_USER : EFFECT_RENDER, notifyEffectStatus, i);
+  recompute(o, true);
   !i?.defer &&
-    (s.J === EFFECT_USER || i?.schedule
-      ? s.te.enqueue(s.J, runEffect.bind(null, s))
-      : runEffect(s));
+    (o.J === EFFECT_USER || i?.schedule
+      ? o.te.enqueue(o.J, runEffect.bind(null, o))
+      : runEffect(o));
 }
 function notifyEffectStatus(e, t) {
   const n = e !== undefined ? e : this.he;
@@ -2068,7 +2101,7 @@ function notifyEffectStatus(e, t) {
   }
 }
 function runEffect(e) {
-  if (!e.ee || e._ & REACTIVE_DISPOSED) return;
+  if (!e.ee || e.O & REACTIVE_DISPOSED) return;
   e.$e?.();
   e.$e = undefined;
   try {
@@ -2091,7 +2124,7 @@ function runEffect(e) {
 GlobalQueue.Te = runEffect;
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.ee || n._ & REACTIVE_DISPOSED) return;
+    if (!n.ee || n.O & REACTIVE_DISPOSED) return;
     try {
       n.ee = false;
       recompute(n);
@@ -2108,7 +2141,7 @@ function trackedEffect(e, t) {
     { ...t, lazy: true }
   );
   n.$e = undefined;
-  n._e = (n._e & ~CONFIG_AUTO_DISPOSE) | CONFIG_CHILDREN_FORBIDDEN;
+  n.Oe = (n.Oe & ~CONFIG_AUTO_DISPOSE) | CONFIG_CHILDREN_FORBIDDEN;
   n.ee = true;
   n.J = EFFECT_TRACKED;
   n.xe = (e, t) => {
@@ -2134,13 +2167,13 @@ function action(e) {
     new Promise((n, i) => {
       const r = e(...t);
       globalQueue.initTransition();
-      let s = activeTransition;
-      s.re.push(r);
+      let o = activeTransition;
+      o.re.push(r);
       const done = (e, t) => {
-        s = currentTransition(s);
-        const o = s.re.indexOf(r);
-        if (o >= 0) s.re.splice(o, 1);
-        setActiveTransition(s);
+        o = currentTransition(o);
+        const s = o.re.indexOf(r);
+        if (s >= 0) o.re.splice(s, 1);
+        setActiveTransition(o);
         schedule();
         t ? i(t) : n(e);
       };
@@ -2152,17 +2185,17 @@ function action(e) {
           return done(undefined, e);
         }
         if (n instanceof Promise)
-          return void n.then(run, e => restoreTransition(s, () => step(e, true)));
+          return void n.then(run, e => restoreTransition(o, () => 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(s, () => step(e)),
-            e => restoreTransition(s, () => step(e, true))
+            e => restoreTransition(o, () => step(e)),
+            e => restoreTransition(o, () => step(e, true))
           );
-        restoreTransition(s, () => step(e.value));
+        restoreTransition(o, () => step(e.value));
       };
       step();
     });
@@ -2178,7 +2211,7 @@ function accessor(e) {
 function createSignal(e, t) {
   if (typeof e === "function") {
     const n = computed(e, t);
-    n._e &= ~CONFIG_AUTO_DISPOSE;
+    n.Oe &= ~CONFIG_AUTO_DISPOSE;
     return [accessor(n), setMemo.bind(null, n)];
   }
   const n = signal(e, t);
@@ -2235,7 +2268,7 @@ function resolve(e) {
 function createOptimistic(e, t) {
   if (typeof e === "function") {
     const n = optimisticComputed(e, t);
-    n._e &= ~CONFIG_AUTO_DISPOSE;
+    n.Oe &= ~CONFIG_AUTO_DISPOSE;
     return [accessor(n), setSignal.bind(null, n)];
   }
   const n = optimisticSignal(e, t);
@@ -2243,7 +2276,7 @@ function createOptimistic(e, t) {
 }
 function onSettled(e) {
   const t = getOwner();
-  t && !(t._e & CONFIG_CHILDREN_FORBIDDEN)
+  t && !(t.Oe & CONFIG_CHILDREN_FORBIDDEN)
     ? createTrackedEffect(() => untrack(e), undefined)
     : globalQueue.enqueue(EFFECT_USER, () => {
         const t = e();
@@ -2278,11 +2311,11 @@ function applyStateFast(e, t, n) {
   t[STORE_VALUE] = e;
   if (Array.isArray(i)) {
     let r = false;
-    const s = i.length;
-    if (e.length && s && e[0] && n(e[0]) != null) {
-      let o, u, c, l, a, f, E, S;
+    const o = i.length;
+    if (e.length && o && e[0] && n(e[0]) != null) {
+      let s, u, c, l, a, f, E, S;
       for (
-        c = 0, l = Math.min(s, e.length);
+        c = 0, l = Math.min(o, e.length);
         c < l && ((f = i[c]) === e[c] || (f && e[c] && n(f) === n(e[c])));
         c++
       ) {
@@ -2291,7 +2324,7 @@ function applyStateFast(e, t, n) {
       const T = new Array(e.length),
         d = new Map();
       for (
-        l = s - 1, a = e.length - 1;
+        l = o - 1, a = e.length - 1;
         l >= c && a >= c && ((f = i[l]) === e[a] || (f && e[a] && n(f) === n(e[a])));
         l--, a--
       ) {
@@ -2309,19 +2342,19 @@ function applyStateFast(e, t, n) {
           applyState(e[u], i, n);
         }
         r && t[STORE_NODE][$TRACK] && setSignal(t[STORE_NODE][$TRACK], void 0);
-        s !== e.length && t[STORE_NODE].length && setSignal(t[STORE_NODE].length, e.length);
+        o !== e.length && t[STORE_NODE].length && setSignal(t[STORE_NODE].length, e.length);
         return;
       }
       E = new Array(a + 1);
       for (u = a; u >= c; u--) {
         f = e[u];
         S = f ? n(f) : f;
-        o = d.get(S);
-        E[u] = o === undefined ? -1 : o;
+        s = d.get(S);
+        E[u] = s === undefined ? -1 : s;
         d.set(S, u);
       }
-      for (o = c; o <= l; o++) {
-        f = i[o];
+      for (s = c; s <= l; s++) {
+        f = i[s];
         S = f ? n(f) : f;
         u = d.get(S);
         if (u !== undefined && u !== -1) {
@@ -2339,14 +2372,14 @@ function applyStateFast(e, t, n) {
       }
       if (c < e.length) r = true;
     } else if (e.length) {
-      for (let r = 0, s = e.length; r < s; r++) {
-        const s = i[r];
-        isWrappable(s)
-          ? applyState(e[r], wrap(s, t), n)
+      for (let r = 0, o = e.length; r < o; r++) {
+        const o = i[r];
+        isWrappable(o)
+          ? applyState(e[r], wrap(o, t), n)
           : t[STORE_NODE][r] && setSignal(t[STORE_NODE][r], e[r]);
       }
     }
-    if (s !== e.length) {
+    if (o !== e.length) {
       r = true;
       t[STORE_NODE].length && setSignal(t[STORE_NODE].length, e.length);
     }
@@ -2355,16 +2388,16 @@ function applyStateFast(e, t, n) {
   }
   let r = t[STORE_NODE];
   if (r) {
-    const s = r[$TRACK];
-    const o = s ? getAllKeys(i, undefined, e) : Object.keys(r);
-    for (let u = 0, c = o.length; u < c; u++) {
-      const c = o[u];
+    const o = r[$TRACK];
+    const s = o ? getAllKeys(i, undefined, e) : Object.keys(r);
+    for (let u = 0, c = s.length; u < c; u++) {
+      const c = s[u];
       const l = r[c];
       const a = unwrap(i[c]);
       let f = unwrap(e[c]);
       if (a === f) continue;
       if (!a || !isWrappable(a) || !isWrappable(f) || (n(a) != null && n(a) !== n(f))) {
-        s && setSignal(s, void 0);
+        o && setSignal(o, void 0);
         l && setSignal(l, isWrappable(f) ? wrap(f, t) : f);
       } else applyState(f, wrap(a, t), n);
     }
@@ -2380,46 +2413,46 @@ function applyStateFast(e, t, n) {
 function applyStateSlow(e, t, n) {
   const i = t[STORE_VALUE];
   const r = t[STORE_OVERRIDE];
-  const s = t[STORE_OPTIMISTIC_OVERRIDE];
-  let o = t[STORE_NODE];
+  const o = t[STORE_OPTIMISTIC_OVERRIDE];
+  let s = t[STORE_NODE];
   (t[STORE_LOOKUP] || storeLookup).set(e, t[$PROXY]);
   t[STORE_VALUE] = e;
   t[STORE_OVERRIDE] = undefined;
   if (Array.isArray(i)) {
-    let o = false;
-    const u = getOverrideValue(i, r, "length", s);
+    let s = false;
+    const u = getOverrideValue(i, r, "length", o);
     if (e.length && u && e[0] && n(e[0]) != null) {
       let c, l, a, f, E, S, T, d;
       for (
         a = 0, f = Math.min(u, e.length);
-        a < f && ((S = getOverrideValue(i, r, a, s)) === e[a] || (S && e[a] && n(S) === n(e[a])));
+        a < f && ((S = getOverrideValue(i, r, a, o)) === e[a] || (S && e[a] && n(S) === n(e[a])));
         a++
       ) {
         applyState(e[a], wrap(S, t), n);
       }
-      const O = new Array(e.length),
-        _ = new Map();
+      const _ = new Array(e.length),
+        O = new Map();
       for (
         f = u - 1, E = e.length - 1;
         f >= a &&
         E >= a &&
-        ((S = getOverrideValue(i, r, f, s)) === e[E] || (S && e[E] && n(S) === n(e[E])));
+        ((S = getOverrideValue(i, r, f, o)) === e[E] || (S && e[E] && n(S) === n(e[E])));
         f--, E--
       ) {
-        O[E] = S;
+        _[E] = S;
       }
       if (a > E || a > f) {
         for (l = a; l <= E; l++) {
-          o = true;
+          s = true;
           t[STORE_NODE][l] && setSignal(t[STORE_NODE][l], wrap(e[l], t));
         }
         for (; l < e.length; l++) {
-          o = true;
-          const i = wrap(O[l], t);
+          s = true;
+          const i = wrap(_[l], t);
           t[STORE_NODE][l] && setSignal(t[STORE_NODE][l], i);
           applyState(e[l], i, n);
         }
-        o && t[STORE_NODE][$TRACK] && setSignal(t[STORE_NODE][$TRACK], void 0);
+        s && t[STORE_NODE][$TRACK] && setSignal(t[STORE_NODE][$TRACK], void 0);
         u !== e.length && t[STORE_NODE].length && setSignal(t[STORE_NODE].length, e.length);
         return;
       }
@@ -2427,50 +2460,50 @@ function applyStateSlow(e, t, n) {
       for (l = E; l >= a; l--) {
         S = e[l];
         d = S ? n(S) : S;
-        c = _.get(d);
+        c = O.get(d);
         T[l] = c === undefined ? -1 : c;
-        _.set(d, l);
+        O.set(d, l);
       }
       for (c = a; c <= f; c++) {
-        S = getOverrideValue(i, r, c, s);
+        S = getOverrideValue(i, r, c, o);
         d = S ? n(S) : S;
-        l = _.get(d);
+        l = O.get(d);
         if (l !== undefined && l !== -1) {
-          O[l] = S;
+          _[l] = S;
           l = T[l];
-          _.set(d, l);
+          O.set(d, l);
         }
       }
       for (l = a; l < e.length; l++) {
-        if (l in O) {
-          const i = wrap(O[l], t);
+        if (l in _) {
+          const i = wrap(_[l], t);
           t[STORE_NODE][l] && setSignal(t[STORE_NODE][l], i);
           applyState(e[l], i, n);
         } else t[STORE_NODE][l] && setSignal(t[STORE_NODE][l], wrap(e[l], t));
       }
-      if (a < e.length) o = true;
+      if (a < e.length) s = true;
     } else if (e.length) {
-      for (let o = 0, u = e.length; o < u; o++) {
-        const u = getOverrideValue(i, r, o, s);
+      for (let s = 0, u = e.length; s < u; s++) {
+        const u = getOverrideValue(i, r, s, o);
         isWrappable(u)
-          ? applyState(e[o], wrap(u, t), n)
-          : t[STORE_NODE][o] && setSignal(t[STORE_NODE][o], e[o]);
+          ? applyState(e[s], wrap(u, t), n)
+          : t[STORE_NODE][s] && setSignal(t[STORE_NODE][s], e[s]);
       }
     }
     if (u !== e.length) {
-      o = true;
+      s = true;
       t[STORE_NODE].length && setSignal(t[STORE_NODE].length, e.length);
     }
-    o && t[STORE_NODE][$TRACK] && setSignal(t[STORE_NODE][$TRACK], void 0);
+    s && t[STORE_NODE][$TRACK] && setSignal(t[STORE_NODE][$TRACK], void 0);
     return;
   }
-  if (o) {
-    const u = o[$TRACK];
-    const c = u ? getAllKeys(i, r, e) : Object.keys(o);
+  if (s) {
+    const u = s[$TRACK];
+    const c = u ? getAllKeys(i, r, e) : Object.keys(s);
     for (let l = 0, a = c.length; l < a; l++) {
       const a = c[l];
-      const f = o[a];
-      const E = unwrap(getOverrideValue(i, r, a, s));
+      const f = s[a];
+      const E = unwrap(getOverrideValue(i, r, a, o));
       let S = unwrap(e[a]);
       if (E === S) continue;
       if (!E || !isWrappable(E) || !isWrappable(S) || (n(E) != null && n(E) !== n(S))) {
@@ -2479,11 +2512,11 @@ function applyStateSlow(e, t, n) {
       } else applyState(S, wrap(E, t), n);
     }
   }
-  if ((o = t[STORE_HAS])) {
-    const t = Object.keys(o);
+  if ((s = t[STORE_HAS])) {
+    const t = Object.keys(s);
     for (let n = 0, i = t.length; n < i; n++) {
       const i = t[n];
-      setSignal(o[i], i in e);
+      setSignal(s[i], i in e);
     }
   }
 }
@@ -2517,34 +2550,34 @@ function createProjectionInternal(e, t, n) {
     r.set(e, t);
     return t;
   };
-  const s = wrapProjection(t);
+  const o = wrapProjection(t);
   i = computed(() => {
     if (!i) i = getOwner();
-    runProjectionComputed(s, e, n?.key || "id");
+    runProjectionComputed(o, e, n?.key || "id");
   }, undefined);
-  i._e &= ~CONFIG_AUTO_DISPOSE;
-  return { store: s, node: i };
+  i.Oe &= ~CONFIG_AUTO_DISPOSE;
+  return { store: o, node: i };
 }
 function createProjection(e, t, n) {
   return createProjectionInternal(e, t, n).store;
 }
 function runProjectionComputed(e, t, n, i) {
   const r = getOwner();
-  let s = false;
-  let o;
+  let o = false;
+  let s;
   const u = new Proxy(
     e,
-    createWriteTraps(() => !s || r.ve === o)
+    createWriteTraps(() => !o || r.ve === s)
   );
   storeSetter(u, u => {
-    o = t(u);
-    s = true;
+    s = t(u);
+    o = true;
     const commit = t => {
       if (t === u || t === undefined) return;
       const write = () => storeSetter(e, reconcile(t, n));
       i ? i(write) : write();
     };
-    commit(handleAsync(r, o, commit));
+    commit(handleAsync(r, s, commit));
   });
   return r;
 }
@@ -2652,6 +2685,16 @@ function writeOnly(e) {
 function unwrapStoreValue(e) {
   return e?.[$TARGET]?.[STORE_VALUE] ?? e;
 }
+function isPrototypePollutionKey$1(e) {
+  return e === "__proto__" || e === "constructor" || e === "prototype";
+}
+function hasOwnStoreProperty(e, t) {
+  const n = e[STORE_OPTIMISTIC_OVERRIDE];
+  if (n && Object.prototype.hasOwnProperty.call(n, t) && n[t] !== $DELETED) return true;
+  const i = e[STORE_OVERRIDE];
+  if (i && Object.prototype.hasOwnProperty.call(i, t) && i[t] !== $DELETED) return true;
+  return Object.prototype.hasOwnProperty.call(unwrapStoreValue(e[STORE_VALUE]), t);
+}
 function hasInheritedAccessor(e, t) {
   let n = Object.getPrototypeOf(e);
   while (n && n !== Object.prototype) {
@@ -2666,7 +2709,7 @@ function getNodes(e, t) {
   if (!n) e[t] = n = Object.create(null);
   return n;
 }
-function getNode(e, t, n, i, r = isEqual, s, o) {
+function getNode(e, t, n, i, r = isEqual, o, s) {
   if (e[t]) return e[t];
   const u = signal(
     n,
@@ -2678,11 +2721,11 @@ function getNode(e, t, n, i, r = isEqual, s, o) {
     },
     i
   );
-  if (s) {
+  if (o) {
     u.K = NOT_PENDING;
   }
-  if (o && t in o) {
-    const e = o[t];
+  if (s && t in s) {
+    const e = s[t];
     u.pe = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources?.add(u);
   }
@@ -2698,8 +2741,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 s = Reflect.ownKeys(t);
-  for (const e of s) {
+  const o = Reflect.ownKeys(t);
+  for (const e of o) {
     if (t[e] !== $DELETED) r.add(e);
     else r.delete(e);
   }
@@ -2735,33 +2778,33 @@ function prepareStoreWrite(e, t, n) {
       e[STORE_SNAPSHOT_PROPS][n] = r;
     }
   }
-  const s = e[STORE_OPTIMISTIC] && !projectionWriteActive;
-  const o = s ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
-  if (s) trackOptimisticStore(t);
-  return { base: r, overrideKey: o, state: i };
+  const o = e[STORE_OPTIMISTIC] && !projectionWriteActive;
+  const s = o ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
+  if (o) trackOptimisticStore(t);
+  return { base: r, overrideKey: s, state: i };
 }
 function upsertStoreNode(e, t, n, i, r) {
   if (t[n]) return t[n];
-  const s = isWrappable(i) ? wrap(i, e) : i;
-  const o = getNode(t, n, s, e[STORE_FIREWALL], isEqual, e[STORE_OPTIMISTIC], r);
-  registerTransientStoreNode(o);
-  return o;
+  const o = isWrappable(i) ? wrap(i, e) : i;
+  const s = getNode(t, n, o, e[STORE_FIREWALL], isEqual, e[STORE_OPTIMISTIC], r);
+  registerTransientStoreNode(s);
+  return s;
 }
-function notifyStoreProperty(e, t, n, i, r, s) {
-  const o = projectionWriteActive || e[STORE_OPTIMISTIC];
+function notifyStoreProperty(e, t, n, i, r, o) {
+  const s = projectionWriteActive || e[STORE_OPTIMISTIC];
   const u = n !== "delete";
   const c = e[STORE_HAS]?.[t];
   if (c) {
     setSignal(c, u);
-  } else if (!o && n !== "invalidate" && s !== u) {
-    const n = upsertStoreNode(e, getNodes(e, STORE_HAS), t, s);
+  } else if (!s && n !== "invalidate" && o !== u) {
+    const n = upsertStoreNode(e, getNodes(e, STORE_HAS), t, o);
     setSignal(n, u);
   }
   const l = getNodes(e, STORE_NODE);
   if (n === "set") {
     if (l[t]) {
       setSignal(l[t], () => (isWrappable(i) ? wrap(i, e) : i));
-    } else if (!o) {
+    } else if (!s) {
       const n = upsertStoreNode(e, l, t, r, e[STORE_SNAPSHOT_PROPS]);
       setSignal(n, () => (isWrappable(i) ? wrap(i, e) : i));
     }
@@ -2773,7 +2816,7 @@ function notifyStoreProperty(e, t, n, i, r, s) {
   } else {
     if (l[t]) {
       setSignal(l[t], undefined);
-    } else if (!o) {
+    } else if (!s) {
       const n = upsertStoreNode(e, l, t, r, e[STORE_SNAPSHOT_PROPS]);
       setSignal(n, undefined);
     }
@@ -2792,7 +2835,7 @@ const storeTraps = {
     }
     const i = getNodes(e, STORE_NODE);
     const r = i[t];
-    const s = e[STORE_VALUE];
+    const o = e[STORE_VALUE];
     if (
       !r &&
       !e[STORE_OVERRIDE] &&
@@ -2800,17 +2843,17 @@ const storeTraps = {
       !e[STORE_CUSTOM_PROTO] &&
       !e[STORE_OPTIMISTIC] &&
       !e[STORE_SNAPSHOT_PROPS] &&
-      !s[$TARGET] &&
-      !(t in s) &&
+      !o[$TARGET] &&
+      !(t in o) &&
       getObserver() &&
       !writeOnly(n)
     ) {
       return read(getNode(i, t, undefined, e[STORE_FIREWALL]));
     }
-    const o = e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE];
-    const u = o || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]);
+    const s = e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE];
+    const u = s || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]);
     const c = !!e[STORE_VALUE][$TARGET];
-    const l = o
+    const l = s
       ? e[STORE_OPTIMISTIC_OVERRIDE]
       : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
         ? e[STORE_OVERRIDE]
@@ -2826,6 +2869,7 @@ const storeTraps = {
       }
     }
     if (writeOnly(n)) {
+      if (isPrototypePollutionKey$1(t) && !hasOwnStoreProperty(e, t)) return undefined;
       let n =
         r && (u || !c)
           ? r.K !== undefined && r.K !== NOT_PENDING
@@ -2883,10 +2927,11 @@ const storeTraps = {
     return n;
   },
   set(e, t, n) {
+    if (t === "__proto__") return true;
     const i = e[$PROXY];
     if (writeOnly(i)) {
       untrack(() => {
-        const { base: r, overrideKey: s, state: o } = prepareStoreWrite(e, i, t);
+        const { base: r, overrideKey: o, state: s } = prepareStoreWrite(e, i, t);
         const u =
           e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]
             ? e[STORE_OPTIMISTIC_OVERRIDE][t]
@@ -2900,7 +2945,7 @@ const storeTraps = {
               ? e[STORE_OVERRIDE][t] !== $DELETED
               : t in e[STORE_VALUE];
         const l = unwrapStoreValue(n);
-        const a = Array.isArray(o) && t !== "length";
+        const a = Array.isArray(s) && t !== "length";
         const f = a ? parseInt(t) + 1 : 0;
         const E =
           a &&
@@ -2908,17 +2953,17 @@ const storeTraps = {
             ? e[STORE_OPTIMISTIC_OVERRIDE].length
             : e[STORE_OVERRIDE] && "length" in e[STORE_OVERRIDE]
               ? e[STORE_OVERRIDE].length
-              : o.length);
+              : s.length);
         const S = a && f > E ? f : undefined;
         if (u === l && S === undefined) return true;
-        if (l !== undefined && l === r && S === undefined) delete e[s]?.[t];
+        if (l !== undefined && l === r && S === undefined) delete e[o]?.[t];
         else {
-          const n = e[s] || (e[s] = Object.create(null));
+          const n = e[o] || (e[o] = Object.create(null));
           n[t] = l;
           if (S !== undefined) n.length = S;
         }
         notifyStoreProperty(e, t, "set", l, u, c);
-        if (Array.isArray(o) && t !== "length" && S !== undefined) {
+        if (Array.isArray(s) && t !== "length" && S !== undefined) {
           const t = getNodes(e, STORE_NODE);
           if (t.length) {
             setSignal(t.length, S);
@@ -2933,12 +2978,13 @@ const storeTraps = {
     return true;
   },
   defineProperty(e, t, n) {
+    if (t === "__proto__") return true;
     const i = e[$PROXY];
     if (writeOnly(i)) {
       untrack(() => {
-        const { base: r, overrideKey: s } = prepareStoreWrite(e, i, t);
-        const o = "value" in n ? { ...n, value: unwrapStoreValue(n.value) } : n;
-        Object.defineProperty(e[s] || (e[s] = Object.create(null)), t, o);
+        const { base: r, overrideKey: o } = prepareStoreWrite(e, i, t);
+        const s = "value" in n ? { ...n, value: unwrapStoreValue(n.value) } : n;
+        Object.defineProperty(e[o] || (e[o] = Object.create(null)), t, s);
         notifyStoreProperty(e, t, "invalidate");
         if (false);
       });
@@ -2946,6 +2992,7 @@ const storeTraps = {
     return true;
   },
   deleteProperty(e, t) {
+    if (t === "__proto__") return true;
     const n = e[STORE_OPTIMISTIC_OVERRIDE]?.[t] === $DELETED;
     const i = e[STORE_OVERRIDE]?.[t] === $DELETED;
     if (writeOnly(e[$PROXY]) && !n && !i) {
@@ -3040,9 +3087,9 @@ function createOptimisticStore(e, t, n) {
   GlobalQueue.de ||= clearOptimisticStore;
   const i = typeof e === "function";
   const r = i ? t : e;
-  const s = i ? e : undefined;
-  const { store: o } = createOptimisticProjectionInternal(s, r, n);
-  return [o, e => storeSetter(o, e)];
+  const o = i ? e : undefined;
+  const { store: s } = createOptimisticProjectionInternal(o, r, n);
+  return [s, e => storeSetter(s, e)];
 }
 function clearOptimisticStore(e) {
   const t = e[$TARGET];
@@ -3092,7 +3139,7 @@ function createOptimisticProjectionInternal(e, t, n) {
     r.set(e, t);
     return t;
   };
-  const s = wrapProjection(t);
+  const o = wrapProjection(t);
   if (e) {
     const wrapCommit = e => {
       setProjectionWriteActive(true);
@@ -3105,14 +3152,14 @@ function createOptimisticProjectionInternal(e, t, n) {
     i = computed(() => {
       setProjectionWriteActive(true);
       try {
-        runProjectionComputed(s, e, n?.key || "id", wrapCommit);
+        runProjectionComputed(o, e, n?.key || "id", wrapCommit);
       } finally {
         setProjectionWriteActive(false);
       }
     }, undefined);
-    i._e &= ~CONFIG_AUTO_DISPOSE;
+    i.Oe &= ~CONFIG_AUTO_DISPOSE;
   }
-  return { store: s, node: i };
+  return { store: o, node: i };
 }
 const DELETE = Symbol(0);
 function isPrototypePollutionKey(e) {
@@ -3123,9 +3170,9 @@ function updatePath(e, t, n = 0) {
     r = e;
   if (n < t.length - 1) {
     i = t[n];
-    const s = typeof i;
-    const o = Array.isArray(e);
-    if (s === "string" && isPrototypePollutionKey(i)) return;
+    const o = typeof i;
+    const s = Array.isArray(e);
+    if (o === "string" && isPrototypePollutionKey(i)) return;
     if (Array.isArray(i)) {
       for (let r = 0; r < i.length; r++) {
         t[n] = i[r];
@@ -3133,7 +3180,7 @@ function updatePath(e, t, n = 0) {
       }
       t[n] = i;
       return;
-    } else if (o && s === "function") {
+    } else if (s && o === "function") {
       for (let r = 0; r < e.length; r++) {
         if (i(e[r], r)) {
           t[n] = r;
@@ -3142,9 +3189,9 @@ function updatePath(e, t, n = 0) {
       }
       t[n] = i;
       return;
-    } 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) {
+    } 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) {
         t[n] = i;
         updatePath(e, t, n);
       }
@@ -3156,26 +3203,26 @@ function updatePath(e, t, n = 0) {
     }
     r = e[i];
   }
-  let s = t[t.length - 1];
-  if (typeof s === "function") {
-    s = s(r);
-    if (s === r) return;
+  let o = t[t.length - 1];
+  if (typeof o === "function") {
+    o = o(r);
+    if (o === r) return;
   }
-  if (i === undefined && s == undefined) return;
-  if (s === DELETE) {
+  if (i === undefined && o == undefined) return;
+  if (o === DELETE) {
     delete e[i];
-  } else if (i === undefined || (isWrappable(r) && isWrappable(s) && !Array.isArray(s))) {
+  } else if (i === undefined || (isWrappable(r) && isWrappable(o) && !Array.isArray(o))) {
     const t = i !== undefined ? e[i] : e;
-    const n = Object.keys(s);
+    const n = Object.keys(o);
     for (let e = 0; e < n.length; e++) {
       const i = n[e];
       if (isPrototypePollutionKey(i)) continue;
-      const r = Object.getOwnPropertyDescriptor(s, i);
+      const r = Object.getOwnPropertyDescriptor(o, i);
       if (r.get || r.set) Object.defineProperty(t, i, r);
       else t[i] = r.value;
     }
   } else {
-    e[i] = s;
+    e[i] = o;
   }
 }
 const storePath = Object.assign(
@@ -3187,28 +3234,28 @@ const storePath = Object.assign(
   { DELETE: DELETE }
 );
 function snapshotImpl(e, t, n, i) {
-  let r, s, o, u, c, l;
+  let r, o, s, u, c, l;
   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);
-    o = r[STORE_OVERRIDE];
-    s = Array.isArray(r[STORE_VALUE]);
+    s = r[STORE_OVERRIDE];
+    o = Array.isArray(r[STORE_VALUE]);
     n.set(
       e,
-      o ? (u = s ? [] : Object.create(Object.getPrototypeOf(r[STORE_VALUE]))) : r[STORE_VALUE]
+      s ? (u = o ? [] : Object.create(Object.getPrototypeOf(r[STORE_VALUE]))) : r[STORE_VALUE]
     );
     e = r[STORE_VALUE];
     i = storeLookup;
   } else {
-    s = Array.isArray(e);
+    o = Array.isArray(e);
     n.set(e, e);
   }
-  if (s) {
-    const s = o?.length || e.length;
-    for (let a = 0; a < s; a++) {
-      l = o && a in o ? o[a] : e[a];
+  if (o) {
+    const o = s?.length || e.length;
+    for (let a = 0; a < o; a++) {
+      l = s && a in s ? s[a] : e[a];
       if (l === $DELETED) continue;
       if (t && isWrappable(l)) wrap(l, r);
       if ((c = snapshotImpl(l, t, n, i)) !== l || u) {
@@ -3217,12 +3264,12 @@ function snapshotImpl(e, t, n, i) {
       }
     }
   } else {
-    const s = getKeys(e, o);
-    for (let a = 0, f = s.length; a < f; a++) {
-      let f = s[a];
-      const E = getPropertyDescriptor(e, o, f);
+    const o = getKeys(e, s);
+    for (let a = 0, f = o.length; a < f; a++) {
+      let f = o[a];
+      const E = getPropertyDescriptor(e, s, f);
       if (E.get) continue;
-      l = o && f in o ? o[f] : e[f];
+      l = s && f in s ? s[f] : e[f];
       if (t && isWrappable(l)) wrap(l, r);
       if ((c = snapshotImpl(l, t, n, i)) !== e[f] || u) {
         if (!u) {
@@ -3281,9 +3328,9 @@ function merge(...e) {
   for (let i = 0; i < e.length; i++) {
     const r = e[i];
     t = t || (!!r && $PROXY in r);
-    const s = !!r && r[$SOURCES];
-    if (s) {
-      for (let e = 0; e < s.length; e++) n.push(s[e]);
+    const o = !!r && r[$SOURCES];
+    if (o) {
+      for (let e = 0; e < o.length; e++) n.push(o[e]);
     } else n.push(typeof r === "function" ? ((t = true), createMemo(r)) : r);
   }
   if (SUPPORTS_PROXY && t) {
@@ -3316,35 +3363,35 @@ function merge(...e) {
   }
   const i = Object.create(null);
   let r = false;
-  let s = n.length - 1;
-  for (let e = s; e >= 0; e--) {
+  let o = n.length - 1;
+  for (let e = o; e >= 0; e--) {
     const t = n[e];
     if (!t) {
-      e === s && s--;
+      e === o && o--;
       continue;
     }
-    const o = Object.getOwnPropertyNames(t);
-    for (let n = o.length - 1; n >= 0; n--) {
-      const u = o[n];
+    const s = Object.getOwnPropertyNames(t);
+    for (let n = s.length - 1; n >= 0; n--) {
+      const u = s[n];
       if (u === "__proto__" || u === "constructor") continue;
       if (!i[u]) {
-        r = r || e !== s;
+        r = r || e !== o;
         const n = Object.getOwnPropertyDescriptor(t, u);
         i[u] = n.get ? { enumerable: true, configurable: true, get: n.get.bind(t) } : n;
       }
     }
   }
-  if (!r) return n[s];
-  const o = {};
+  if (!r) return n[o];
+  const s = {};
   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(o, t, n);
-    else o[t] = n.value;
+    if (n.get) Object.defineProperty(s, t, n);
+    else s[t] = n.value;
   }
-  o[$SOURCES] = n;
-  return o;
+  s[$SOURCES] = n;
+  return s;
 }
 function omit(e, ...t) {
   if (SUPPORTS_PROXY && $PROXY in e) {
@@ -3366,12 +3413,12 @@ function omit(e, ...t) {
   const n = {};
   const i = Object.getOwnPropertyNames(e);
   const r = t.length > 4 && i.length > t.length ? new Set(t) : undefined;
-  for (const s of i) {
-    if (r ? !r.has(s) : !t.includes(s)) {
-      const t = Object.getOwnPropertyDescriptor(e, s);
+  for (const o of i) {
+    if (r ? !r.has(o) : !t.includes(o)) {
+      const t = Object.getOwnPropertyDescriptor(e, o);
       !t.get && !t.set && t.enumerable && t.writable && t.configurable
-        ? (n[s] = t.value)
-        : Object.defineProperty(n, s, t);
+        ? (n[o] = t.value)
+        : Object.defineProperty(n, o, t);
     }
   }
   return n;
@@ -3379,24 +3426,24 @@ function omit(e, ...t) {
 function mapArray(e, t, n) {
   const i = typeof n?.keyed === "function" ? n.keyed : undefined;
   const r = t.length > 1;
-  const s = t;
-  const o = {
+  const o = t;
+  const s = {
     Ze: createOwner(),
     qe: 0,
     Be: e,
     ze: [],
-    Xe: s,
+    Xe: o,
     Je: [],
     et: [],
     tt: i,
     nt: i || n?.keyed === false ? [] : undefined,
     it: r && n?.keyed !== false ? [] : undefined,
     rt: n?.keyed === false,
-    st: n?.fallback
+    ot: n?.fallback
   };
-  const u = computed(updateKeyedMap.bind(o));
-  o.Ze.u = u;
-  u._e &= ~CONFIG_AUTO_DISPOSE;
+  const u = computed(updateKeyedMap.bind(s));
+  s.Ze.u = u;
+  u.Oe &= ~CONFIG_AUTO_DISPOSE;
   return accessor(u);
 }
 const pureOptions = { ownedWrite: true };
@@ -3438,8 +3485,8 @@ function updateKeyedMap() {
         this.nt && (this.nt = []);
         this.it && (this.it = []);
       }
-      if (this.st && !this.Je[0]) {
-        this.Je[0] = runWithOwner((this.et[0] = createOwner()), this.st);
+      if (this.ot && !this.Je[0]) {
+        this.Je[0] = runWithOwner((this.et[0] = createOwner()), this.ot);
       }
     } else if (this.qe === 0) {
       if (this.et[0]) this.et[0].dispose();
@@ -3450,8 +3497,8 @@ function updateKeyedMap() {
       }
       this.qe = t;
     } else {
-      let s,
-        o,
+      let o,
+        s,
         u,
         c,
         l,
@@ -3462,34 +3509,34 @@ function updateKeyedMap() {
         T = this.nt ? new Array(t) : undefined,
         d = this.it ? new Array(t) : undefined;
       for (
-        s = 0, o = Math.min(this.qe, t);
-        s < o && (this.ze[s] === e[s] || (this.nt && compare(this.tt, this.ze[s], e[s])));
-        s++
+        o = 0, s = Math.min(this.qe, t);
+        o < s && (this.ze[o] === e[o] || (this.nt && compare(this.tt, this.ze[o], e[o])));
+        o++
       ) {
-        if (this.nt) setSignal(this.nt[s], e[s]);
+        if (this.nt) setSignal(this.nt[o], e[o]);
       }
       for (
-        o = this.qe - 1, u = t - 1;
-        o >= s &&
-        u >= s &&
-        (this.ze[o] === e[u] || (this.nt && compare(this.tt, this.ze[o], e[u])));
-        o--, u--
+        s = this.qe - 1, u = t - 1;
+        s >= o &&
+        u >= o &&
+        (this.ze[s] === e[u] || (this.nt && compare(this.tt, this.ze[s], e[u])));
+        s--, u--
       ) {
-        E[u] = this.Je[o];
-        S[u] = this.et[o];
-        T && (T[u] = this.nt[o]);
-        d && (d[u] = this.it[o]);
+        E[u] = this.Je[s];
+        S[u] = this.et[s];
+        T && (T[u] = this.nt[s]);
+        d && (d[u] = this.it[s]);
       }
       a = new Map();
       f = new Array(u + 1);
-      for (i = u; i >= s; i--) {
+      for (i = u; i >= o; i--) {
         c = e[i];
         l = this.tt ? this.tt(c) : c;
         n = a.get(l);
         f[i] = n === undefined ? -1 : n;
         a.set(l, i);
       }
-      for (n = s; n <= o; n++) {
+      for (n = o; n <= s; n++) {
         c = this.ze[n];
         l = this.tt ? this.tt(c) : c;
         i = a.get(l);
@@ -3502,7 +3549,7 @@ function updateKeyedMap() {
           a.set(l, i);
         } else this.et[n].dispose();
       }
-      for (i = s; i < t; i++) {
+      for (i = o; i < t; i++) {
         if (i in E) {
           this.Je[i] = E[i];
           this.et[i] = S[i];
@@ -3530,16 +3577,16 @@ function repeat(e, t, n) {
     updateRepeat.bind({
       Ze: createOwner(),
       qe: 0,
-      ot: 0,
+      st: 0,
       ut: e,
       Xe: i,
       et: [],
       Je: [],
       ct: n?.from,
-      st: n?.fallback
+      ot: n?.fallback
     })
   );
-  r._e &= ~CONFIG_AUTO_DISPOSE;
+  r.Oe &= ~CONFIG_AUTO_DISPOSE;
   return accessor(r);
 }
 function updateRepeat() {
@@ -3553,23 +3600,23 @@ function updateRepeat() {
         this.Je = [];
         this.qe = 0;
       }
-      if (this.st && !this.Je[0]) {
-        this.Je[0] = runWithOwner((this.et[0] = createOwner()), this.st);
+      if (this.ot && !this.Je[0]) {
+        this.Je[0] = runWithOwner((this.et[0] = createOwner()), this.ot);
       }
       return;
     }
     const n = t + e;
-    const i = this.ot + this.qe;
+    const i = this.st + this.qe;
     if (this.qe === 0 && this.et[0]) this.et[0].dispose();
-    for (let e = n; e < i; e++) this.et[e - this.ot].dispose();
-    if (this.ot < t) {
-      let e = this.ot;
+    for (let e = n; e < i; e++) this.et[e - this.st].dispose();
+    if (this.st < t) {
+      let e = this.st;
       while (e < t && e < this.qe) this.et[e++].dispose();
-      this.et.splice(0, t - this.ot);
-      this.Je.splice(0, t - this.ot);
-    } else if (this.ot > t) {
-      let n = i - this.ot - 1;
-      let r = this.ot - t;
+      this.et.splice(0, t - this.st);
+      this.Je.splice(0, t - this.st);
+    } else if (this.st > t) {
+      let n = i - this.st - 1;
+      let r = this.st - t;
       this.et.length = this.Je.length = e;
       while (n >= r) {
         this.et[n] = this.et[n - r];
@@ -3584,7 +3631,7 @@ function updateRepeat() {
       this.Je[e - t] = runWithOwner((this.et[e - t] = createOwner()), () => this.Xe(e));
     }
     this.Je = this.Je.slice(0, e);
-    this.ot = t;
+    this.st = t;
     this.qe = e;
   });
   return this.Je;
@@ -3601,7 +3648,7 @@ function boundaryComputed(e, t) {
     n.te.notify(n, n.lt, i, r);
   };
   n.lt = t;
-  n._e &= ~CONFIG_AUTO_DISPOSE;
+  n.Oe &= ~CONFIG_AUTO_DISPOSE;
   recompute(n, true);
   return n;
 }
@@ -3611,7 +3658,7 @@ function createBoundChildren(e, t, n, i) {
   cleanup(() => r.removeChild(e.te));
   return runWithOwner(e, () => {
     const e = computed(t);
-    return boundaryComputed(() => staleValues(() => flatten(read(e))), i);
+    return boundaryComputed(() => flatten(read(e)), i);
   });
 }
 const ON_INIT = Symbol();
@@ -3635,7 +3682,7 @@ function setSlotState(e, t, n, i) {
     if (!n && e.dt === t) e.dt = undefined;
     return e.evaluate(n, i);
   }
-  if (!n && e.Ot === t && e._t) e.Ot = undefined;
+  if (!n && e._t === t && e.Ot) e._t = undefined;
 }
 class RevealController {
   Rt;
@@ -3654,7 +3701,7 @@ class RevealController {
   Pt(e) {
     for (let t = 0; t < this.ht.length; t++) {
       const n = this.ht[t];
-      if ((isRevealController(n) ? n.dt : n.Ot) !== this) continue;
+      if ((isRevealController(n) ? n.dt : n._t) !== this) continue;
       if (e(n) === false) return false;
     }
     return true;
@@ -3705,9 +3752,9 @@ class RevealController {
       const n = e ?? read(this.St),
         i = untrack(this.Rt),
         r = i === "sequential" && !!untrack(this.It),
-        s = t ?? r;
+        o = t ?? r;
       if (n) {
-        this.Pt(e => setSlotState(e, this, true, s));
+        this.Pt(e => setSlotState(e, this, true, o));
       } else if (i === "natural") {
         this.Pt(e => {
           if (isRevealController(e)) {
@@ -3752,8 +3799,8 @@ class CollectionQueue extends Queue {
   St = signal(false, { ownedWrite: true, Ye: true });
   Re;
   Tt = signal(false, { ownedWrite: true, Ye: true });
-  Ot;
-  _t = false;
+  _t;
+  Ot = false;
   yt;
   vt = ON_INIT;
   constructor(e) {
@@ -3766,7 +3813,7 @@ class CollectionQueue extends Queue {
   }
   notify(e, t, n, i) {
     if (!(t & this.gt)) return super.notify(e, t, n, i);
-    if (this._t && this.yt) {
+    if (this.Ot && this.yt) {
       const e = untrack(() => {
         try {
           return this.yt();
@@ -3776,11 +3823,11 @@ class CollectionQueue extends Queue {
       });
       if (e !== this.vt) {
         this.vt = e;
-        this._t = false;
+        this.Ot = false;
         this.ft.clear();
       }
     }
-    if (this.gt & STATUS_PENDING && this._t) return super.notify(e, t, n, i);
+    if (this.gt & STATUS_PENDING && this.Ot) return super.notify(e, t, n, i);
     if (this.gt & STATUS_PENDING && n & STATUS_ERROR) {
       return super.notify(e, STATUS_ERROR, n, i);
     }
@@ -3802,13 +3849,13 @@ class CollectionQueue extends Queue {
   checkSources() {
     for (const e of this.ft) {
       if (
-        e._ & REACTIVE_DISPOSED ||
+        e.O & REACTIVE_DISPOSED ||
         (!(e.he & this.gt) && !(this.gt & STATUS_ERROR && e.he & STATUS_PENDING))
       )
         this.ft.delete(e);
     }
     if (!this.ft.size) {
-      if (this.gt & STATUS_PENDING && this.Et && !this._t && this.Dt) {
+      if (this.gt & STATUS_PENDING && this.Et && !this.Ot && this.Dt) {
         this.Et = !!(this.Dt.he & this.gt);
       } else {
         this.Et = false;
@@ -3822,40 +3869,40 @@ class CollectionQueue extends Queue {
         }
       }
     }
-    if (_revealUsed) this.Ot?.evaluate();
+    if (_revealUsed) this._t?.evaluate();
   }
 }
 function createCollectionBoundary(e, t, n, i) {
   const r = createOwner();
   if (_revealUsed) setContext(RevealControllerContext, null, r);
-  const s = new CollectionQueue(e);
-  if (e === STATUS_ERROR) s.Re = signal(undefined, { ownedWrite: true, Ye: true });
-  if (i) s.yt = i;
-  const o = (s.Dt = createBoundChildren(r, t, s, e));
+  const o = new CollectionQueue(e);
+  if (e === STATUS_ERROR) o.Re = signal(undefined, { ownedWrite: true, Ye: true });
+  if (i) o.yt = i;
+  const s = (o.Dt = createBoundChildren(r, t, o, e));
   untrack(() => {
     let t = false;
     try {
-      read(o);
+      read(s);
     } catch (e) {
       if (e instanceof NotReadyError) t = true;
       else throw e;
     }
-    s.Et = t || !!(o.he & e) || o.Re instanceof NotReadyError;
+    o.Et = t || !!(s.he & e) || s.Re instanceof NotReadyError;
   });
   const u = _revealUsed && e === STATUS_PENDING ? getContext(RevealControllerContext) : null;
   if (u) {
-    s.Ot = u;
-    u.register(s);
-    cleanup(() => u.unregister(s));
+    o._t = u;
+    u.register(o);
+    cleanup(() => u.unregister(o));
   }
   return accessor(
     computed(() => {
-      if (!read(s.St)) {
-        const e = read(o);
-        if (!untrack(() => read(s.St))) return ((s._t = true), e);
+      if (!read(o.St)) {
+        const e = read(s);
+        if (!untrack(() => read(o.St))) return ((o.Ot = true), e);
       }
-      if (_revealUsed && read(s.Tt)) return undefined;
-      return n(s);
+      if (_revealUsed && read(o.Tt)) return undefined;
+      return n(o);
     })
   );
 }
@@ -3875,20 +3922,20 @@ function createRevealOrder(e, t) {
   const n = createOwner();
   const i = getContext(RevealControllerContext);
   const r = t?.order || SEQUENTIAL_ACCESSOR,
-    s = t?.collapsed || FALSE_ACCESSOR;
-  const o = new RevealController(r, s);
-  setContext(RevealControllerContext, o, n);
+    o = t?.collapsed || FALSE_ACCESSOR;
+  const s = new RevealController(r, o);
+  setContext(RevealControllerContext, s, n);
   return runWithOwner(n, () => {
     const t = e();
     computed(() => {
       r();
-      s();
-      o.evaluate();
+      o();
+      s.evaluate();
     });
     if (i) {
-      o.dt = i;
-      i.register(o);
-      cleanup(() => i.unregister(o));
+      s.dt = i;
+      i.register(s);
+      cleanup(() => i.unregister(s));
     }
     return t;
   });
@@ -3917,9 +3964,9 @@ function flatten(e, t) {
 function flattenArray(e, t = [], n) {
   let i = null;
   let r = false;
-  for (let s = 0; s < e.length; s++) {
+  for (let o = 0; o < e.length; o++) {
     try {
-      let i = e[s];
+      let i = e[o];
       if (typeof i === "function" && !i.length) {
         if (n?.doNotUnwrap) {
           t.push(i);