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

package/dist/node.cjs

@@ -57,7 +57,7 @@ const j = Symbol("refresh");
 const W = new Set();
 const R = new Set();
 let A = 0;
-const L = undefined;
+const I = undefined;
 function emitDiagnostic(e) {
   const t = { sequence: ++A, ...e };
   for (const e of W) e(t);
@@ -150,8 +150,8 @@ function adjustHeight(e, t) {
   let n = e.o;
   for (let t = e.W; t; t = t.R) {
     const e = t.A;
-    const r = e.L || e;
-    if (r.I && r.o >= n) n = r.o + 1;
+    const r = e.I || e;
+    if (r.L && r.o >= n) n = r.o + 1;
   }
   if (e.o !== n) {
     e.o = n;
@@ -160,17 +160,17 @@ function adjustHeight(e, t) {
     }
   }
 }
-const I = new WeakMap();
+const L = new WeakMap();
 const T = new Set();
 function getOrCreateLane(e) {
-  let t = I.get(e);
+  let t = L.get(e);
   if (t) {
     return findLane(t);
   }
   const n = e.T;
   const r = n?.H ? findLane(n.H) : null;
   t = { q: e, F: new Set(), M: [[], []], D: null, V: M, K: r };
-  I.set(e, t);
+  L.set(e, t);
   T.add(t);
   e.B = false;
   return t;
@@ -334,7 +334,7 @@ function cleanupCompletedLanes(e) {
     t.M[0].length = 0;
     t.M[1].length = 0;
     T.delete(t);
-    I.delete(t.q);
+    L.delete(t.q);
   }
 }
 function schedule() {
@@ -440,7 +440,7 @@ class GlobalQueue extends Queue {
             B = new Set();
             for (let t = 0; t < e.J.length; t++) {
               const n = e.J[t];
-              if (n.I || n.ye & d) continue;
+              if (n.L || n.ye & d) continue;
               B.add(n);
               queueStashedOptimisticEffects(n);
             }
@@ -598,7 +598,7 @@ function insertSubs(e, t = false) {
 }
 function commitPendingNode(e) {
   const t = e;
-  if (!t.I) {
+  if (!t.L) {
     if (e.Y !== x) {
       e.ue = e.Y;
       e.Y = x;
@@ -704,7 +704,7 @@ function reporterBlocksSource(e, t) {
   for (let n = e.W; n; n = n.R) {
     let e = n.A;
     while (e) {
-      if (e === t || e.L === t) return true;
+      if (e === t || e.I === t) return true;
       e = e.T;
     }
   }
@@ -789,7 +789,7 @@ function disposeChildren(e, t = false, n) {
   const r = e.m;
   if (r & u) return;
   if (t) e.m = r | u;
-  if (t && e.I) e.ke = null;
+  if (t && e.L) e.ke = null;
   let i = n ? e.Oe : e.Ce;
   while (i) {
     const e = i.Ne;
@@ -912,16 +912,16 @@ function unlinkSubs(e) {
   const t = e.A;
   const n = e.R;
   const r = e.P;
-  const i = e.Le;
-  if (r !== null) r.Le = i;
-  else t.Ie = i;
+  const i = e.Ie;
+  if (r !== null) r.Ie = i;
+  else t.Le = i;
   if (i !== null) i.P = r;
   else {
     t.O = r;
     if (r === null) {
       t.Z?.();
       const e = t;
-      e.I && e.ye & y && !(e.m & o) && unobserved(e);
+      e.L && e.ye & y && !(e.m & o) && unobserved(e);
     }
   }
   return n;
@@ -959,9 +959,9 @@ function link(e, t) {
       return;
     }
   }
-  const o = e.Ie;
+  const o = e.Le;
   if (o !== null && o.C === t && (!s || isValidLink(o, t))) return;
-  const u = (t.Ee = e.Ie = { A: e, C: t, R: i, Le: o, P: null });
+  const u = (t.Ee = e.Le = { A: e, C: t, R: i, Ie: o, P: null });
   if (n !== null) n.R = u;
   else t.W = u;
   if (o !== null) o.P = u;
@@ -1291,7 +1291,8 @@ let te = false;
 let ne = null;
 let re = null;
 let ie = false;
-let se = null;
+let se = false;
+let oe = null;
 function ownerInSnapshotScope(e) {
   while (e) {
     if (e.Me) return true;
@@ -1300,8 +1301,8 @@ function ownerInSnapshotScope(e) {
   return false;
 }
 function setSnapshotCapture(e) {
-  ie = e;
-  if (e && !se) se = new Set();
+  se = e;
+  if (e && !oe) oe = new Set();
 }
 function markSnapshotScope(e) {
   e.Me = true;
@@ -1318,7 +1319,7 @@ function releaseSubtree(e) {
       t = t.Ne;
       continue;
     }
-    if (t.I) {
+    if (t.L) {
       const e = t;
       e.ye &= ~g;
       if (e.m & f) {
@@ -1333,14 +1334,14 @@ function releaseSubtree(e) {
   }
 }
 function clearSnapshots() {
-  if (se) {
-    for (const e of se) {
+  if (oe) {
+    for (const e of oe) {
       delete e._e;
       delete e[N];
     }
-    se = null;
+    oe = null;
   }
-  ie = false;
+  se = false;
 }
 function recompute(t, n = false) {
   const i = t.$;
@@ -1395,11 +1396,11 @@ function recompute(t, n = false) {
   if (y) Y = true;
   try {
     if (!false && t.ye & w) {
-      p = t.I(p);
+      p = t.L(p);
       t.ke = null;
     } else {
       const e = t.ke;
-      const n = t.I(p);
+      const n = t.L(p);
       const r = typeof n === "object" && n !== null;
       const i = t.ke !== e;
       p = i || !r ? n : handleAsync(t, n);
@@ -1472,8 +1473,8 @@ function updateIfNecessary(e) {
   if (e.m & t) {
     for (let t = e.W; t; t = t.R) {
       const r = t.A;
-      const i = r.L || r;
-      if (i.I) {
+      const i = r.I || r;
+      if (i.L) {
         updateIfNecessary(i);
       }
       if (e.m & n) {
@@ -1495,14 +1496,14 @@ function computed(t, n) {
       (n?.ownedWrite ? d : 0) |
       (!ne || n?.lazy ? y : 0) |
       (n?.sync ? w : 0) |
-      (ie && ownerInSnapshotScope(ne) ? g : 0),
+      (se && ownerInSnapshotScope(ne) ? g : 0),
     He: n?.equals != null ? n.equals : isEqual,
     Z: n?.unobserved,
     Re: null,
     te: ne?.te ?? z,
     Ae: ne?.Ae ?? k,
     je: 0,
-    I: t,
+    L: t,
     ue: undefined,
     o: 0,
     N: null,
@@ -1511,7 +1512,7 @@ function computed(t, n) {
     W: null,
     Ee: null,
     O: null,
-    Ie: null,
+    Le: null,
     i: ne,
     Ne: null,
     We: null,
@@ -1536,14 +1537,14 @@ function createEffectNode(e, t, n, r, i, s) {
       (o ? h : 0) |
       (s?.ownedWrite ? d : 0) |
       (s?.sync ? w : 0) |
-      (ie && ownerInSnapshotScope(ne) ? g : 0),
+      (se && ownerInSnapshotScope(ne) ? g : 0),
     He: false,
     Z: s?.unobserved,
     Re: null,
     te: ne?.te ?? z,
     Ae: ne?.Ae ?? k,
     je: 0,
-    I: e,
+    L: e,
     ue: undefined,
     o: 0,
     N: null,
@@ -1552,7 +1553,7 @@ function createEffectNode(e, t, n, r, i, s) {
     W: null,
     Ee: null,
     O: null,
-    Ie: null,
+    Le: null,
     i: ne,
     Ne: null,
     We: null,
@@ -1574,10 +1575,10 @@ function createEffectNode(e, t, n, r, i, s) {
     $: r,
     Fe: i
   };
-  setupComputedNode(u, oe);
+  setupComputedNode(u, ue);
   return u;
 }
-const oe = { lazy: true };
+const ue = { lazy: true };
 function setupComputedNode(e, t) {
   e.p = e;
   const n = ne?.t ? ne.u : ne;
@@ -1594,20 +1595,20 @@ function setupComputedNode(e, t) {
   if (n) e.o = n.o + 1;
   if (J) {
     const t = signal(undefined, { equals: false, ownedWrite: true });
-    const n = J.factory(e.I, () => {
+    const n = J.factory(e.L, () => {
       setSignal(t, undefined);
     });
     cleanup(() => n.dispose());
-    e.I = e => {
+    e.L = e => {
       read(t);
       return n.track(e);
     };
   }
   !t?.lazy && recompute(e, true);
-  if (ie && !t?.lazy) {
+  if (se && !t?.lazy) {
     if (!(e.be & m)) {
       e._e = e.ue === undefined ? C : e.ue;
-      se.add(e);
+      oe.add(e);
     }
   }
 }
@@ -1618,16 +1619,16 @@ function signal(e, t, n = null) {
     Z: t?.unobserved,
     ue: e,
     O: null,
-    Ie: null,
+    Le: null,
     me: F,
-    L: n,
+    I: n,
     k: n?.N || null,
     Y: x
   };
   n && (n.N = r);
-  if (ie && !(r.ye & p) && !((n?.be ?? 0) & m)) {
+  if (se && !(r.ye & p) && !((n?.be ?? 0) & m)) {
     r._e = e === undefined ? C : e;
-    se.add(r);
+    oe.add(r);
   }
   return r;
 }
@@ -1681,9 +1682,17 @@ function read(e) {
     return i;
   }
   if ($) {
-    const t = e.L;
+    const t = e.I;
     const n = $;
     $ = false;
+    const r = t || e;
+    if (ie && r.be & m && r.be & b) {
+      let t = ne;
+      if (t?.t) t = t.u;
+      if (t && X) link(e, t);
+      $ = n;
+      throw r.we;
+    }
     if (t && e.G !== undefined) {
       if (e.G !== x && (t.ke || !!(t.be & m))) {
         ee = true;
@@ -1703,7 +1712,7 @@ function read(e) {
   let t = ne;
   if (t?.t) t = t.u;
   const n = e;
-  if (typeof n.I === "function") {
+  if (typeof n.L === "function") {
     const t = e;
     if (t.m & c) {
       t.m &= ~c;
@@ -1712,15 +1721,15 @@ function read(e) {
       recompute(t, true);
     }
   }
-  const r = e.L || e;
+  const r = e.I || e;
   if (
-    !n.I &&
+    !n.L &&
     r === e &&
     e.G === undefined &&
     e._e === undefined &&
     M === null &&
     re === null &&
-    !ie &&
+    !se &&
     true
   ) {
     if (t && X) link(e, t);
@@ -1728,7 +1737,7 @@ function read(e) {
   }
   if (t && X) {
     link(e, t);
-    if (r.I) {
+    if (r.L) {
       const n = e.m & o;
       if (r.o >= (n ? Q.j : q.j)) {
         markNode(t);
@@ -1761,13 +1770,13 @@ function read(e) {
       throw r.we;
     }
   }
-  if (e.I && e.be & _) {
+  if (e.L && e.be & _) {
     if (e.me < F) {
       recompute(e);
       return read(e);
     } else throw e.we;
   }
-  if (ie && t && t.ye & g) {
+  if (se && t && t.ye & g) {
     const n = e._e;
     if (n !== undefined) {
       const r = n === C ? undefined : n;
@@ -1780,7 +1789,7 @@ function read(e) {
     if (t && Y && shouldReadStashedOptimisticValue(e)) return e.ue;
     return e.G;
   }
-  if (M !== null && re !== null && !te && e.Y !== x && r === e && !e.I && t) {
+  if (M !== null && re !== null && !te && e.Y !== x && r === e && !e.L && t) {
     M.oe.add(t);
     return e.ue;
   }
@@ -1791,7 +1800,7 @@ function read(e) {
     (Y && e.V && M !== e.V)
       ? e.ue
       : e.Y;
-  if (!t && r === e && typeof n.I === "function" && e.ye & y && !(r.be & m) && !e.O) {
+  if (!t && r === e && typeof n.L === "function" && e.ye & y && !(r.be & m) && !e.O) {
     unobserved(e);
   }
   return i;
@@ -1804,7 +1813,7 @@ function setSignal(e, t) {
   if (typeof t === "function") t = t(i);
   const s = !e.He || !e.He(i, t) || !!(e.be & b);
   if (!s) {
-    if (n && r && e.I) {
+    if (n && r && e.L) {
       insertSubs(e, true);
       schedule();
     }
@@ -1868,7 +1877,7 @@ function getPendingSignal(e) {
 }
 function computePendingState(e) {
   const t = e;
-  const n = e.L;
+  const n = e.I;
   if (n && e.Y !== x) {
     return !n.ke && !(n.be & m);
   }
@@ -1899,7 +1908,7 @@ function updatePendingSignal(e) {
           mergeLanes(t, e);
         }
       }
-      I.delete(n);
+      L.delete(n);
       n.H = undefined;
     }
   }
@@ -1938,19 +1947,24 @@ function latest(e) {
     te = t;
   }
 }
-function isPending(e) {
-  const t = $;
-  const n = ee;
+function isPending(e, t) {
+  const n = $;
+  const r = ie;
+  const i = ee;
+  const s = t === true;
   $ = true;
+  ie = s;
   ee = false;
   try {
     e();
     return ee;
-  } catch {
+  } catch (e) {
+    if (s && e instanceof NotReadyError) throw e;
     return ee;
   } finally {
-    $ = t;
-    ee = n;
+    $ = n;
+    ie = r;
+    ee = i;
   }
 }
 function refresh(e) {
@@ -1959,7 +1973,7 @@ function refresh(e) {
   try {
     const t = e?.[j];
     if (false && !t);
-    if (t && typeof t.I === "function" && !(t.m & u)) {
+    if (t && typeof t.L === "function" && !(t.m & u)) {
       recompute(t);
     }
   } finally {
@@ -2211,7 +2225,7 @@ function onSettled(e) {
       });
 }
 function unwrap(e) {
-  return e?.[le]?.[he] ?? e;
+  return e?.[fe]?.[ge] ?? e;
 }
 function getOverrideValue(e, t, n, r) {
   if (r && n in r) return r[n];
@@ -2223,19 +2237,19 @@ function getAllKeys(e, t, n) {
   return Array.from(new Set([...r, ...i]));
 }
 function applyState(e, t, n) {
-  const r = t?.[le];
+  const r = t?.[fe];
   if (!r) return;
-  if (r[de] || r[pe]) {
+  if (r[pe] || r[he]) {
     applyStateSlow(e, r, n);
   } else {
     applyStateFast(e, r, n);
   }
 }
 function applyStateFast(e, t, n) {
-  const r = t[ae];
+  const r = t[de];
   if (e === r) return;
-  (t[we] || be).set(e, t[fe]);
-  t[ae] = e;
+  (t[me] || Oe).set(e, t[ce]);
+  t[de] = e;
   if (Array.isArray(r)) {
     let i = false;
     const s = r.length;
@@ -2260,16 +2274,16 @@ function applyStateFast(e, t, n) {
       if (l > c || l > f) {
         for (u = l; u <= c; u++) {
           i = true;
-          t[he][u] && setSignal(t[he][u], wrap(e[u], t));
+          t[ge][u] && setSignal(t[ge][u], wrap(e[u], t));
         }
         for (; u < e.length; u++) {
           i = true;
           const r = wrap(h[u], t);
-          t[he][u] && setSignal(t[he][u], r);
+          t[ge][u] && setSignal(t[ge][u], r);
           applyState(e[u], r, n);
         }
-        i && t[he][ue] && setSignal(t[he][ue], void 0);
-        s !== e.length && t[he].length && setSignal(t[he].length, e.length);
+        i && t[ge][le] && setSignal(t[ge][le], void 0);
+        s !== e.length && t[ge].length && setSignal(t[ge].length, e.length);
         return;
       }
       d = new Array(c + 1);
@@ -2293,27 +2307,27 @@ function applyStateFast(e, t, n) {
       for (u = l; u < e.length; u++) {
         if (u in h) {
           const r = wrap(h[u], t);
-          t[he][u] && setSignal(t[he][u], r);
+          t[ge][u] && setSignal(t[ge][u], r);
           applyState(e[u], r, n);
-        } else t[he][u] && setSignal(t[he][u], wrap(e[u], t));
+        } else t[ge][u] && setSignal(t[ge][u], wrap(e[u], t));
       }
       if (l < e.length) i = true;
     } else if (e.length) {
       for (let i = 0, s = e.length; i < s; i++) {
         const s = r[i];
-        isWrappable(s) ? applyState(e[i], wrap(s, t), n) : t[he][i] && setSignal(t[he][i], e[i]);
+        isWrappable(s) ? applyState(e[i], wrap(s, t), n) : t[ge][i] && setSignal(t[ge][i], e[i]);
       }
     }
     if (s !== e.length) {
       i = true;
-      t[he].length && setSignal(t[he].length, e.length);
+      t[ge].length && setSignal(t[ge].length, e.length);
     }
-    i && t[he][ue] && setSignal(t[he][ue], void 0);
+    i && t[ge][le] && setSignal(t[ge][le], void 0);
     return;
   }
-  let i = t[he];
+  let i = t[ge];
   if (i) {
-    const s = i[ue];
+    const s = i[le];
     const o = s ? getAllKeys(r, undefined, e) : Object.keys(i);
     for (let u = 0, l = o.length; u < l; u++) {
       const l = o[u];
@@ -2327,7 +2341,7 @@ function applyStateFast(e, t, n) {
       } else applyState(a, wrap(c, t), n);
     }
   }
-  if ((i = t[ge])) {
+  if ((i = t[Se])) {
     const t = Object.keys(i);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -2336,13 +2350,13 @@ function applyStateFast(e, t, n) {
   }
 }
 function applyStateSlow(e, t, n) {
-  const r = t[ae];
-  const i = t[de];
-  const s = t[pe];
-  let o = t[he];
-  (t[we] || be).set(e, t[fe]);
-  t[ae] = e;
-  t[de] = undefined;
+  const r = t[de];
+  const i = t[pe];
+  const s = t[he];
+  let o = t[ge];
+  (t[me] || Oe).set(e, t[ce]);
+  t[de] = e;
+  t[pe] = undefined;
   if (Array.isArray(r)) {
     let o = false;
     const u = getOverrideValue(r, i, "length", s);
@@ -2369,16 +2383,16 @@ function applyStateSlow(e, t, n) {
       if (c > d || c > a) {
         for (f = c; f <= d; f++) {
           o = true;
-          t[he][f] && setSignal(t[he][f], wrap(e[f], t));
+          t[ge][f] && setSignal(t[ge][f], wrap(e[f], t));
         }
         for (; f < e.length; f++) {
           o = true;
           const r = wrap(S[f], t);
-          t[he][f] && setSignal(t[he][f], r);
+          t[ge][f] && setSignal(t[ge][f], r);
           applyState(e[f], r, n);
         }
-        o && t[he][ue] && setSignal(t[he][ue], void 0);
-        u !== e.length && t[he].length && setSignal(t[he].length, e.length);
+        o && t[ge][le] && setSignal(t[ge][le], void 0);
+        u !== e.length && t[ge].length && setSignal(t[ge].length, e.length);
         return;
       }
       h = new Array(d + 1);
@@ -2402,26 +2416,26 @@ function applyStateSlow(e, t, n) {
       for (f = c; f < e.length; f++) {
         if (f in S) {
           const r = wrap(S[f], t);
-          t[he][f] && setSignal(t[he][f], r);
+          t[ge][f] && setSignal(t[ge][f], r);
           applyState(e[f], r, n);
-        } else t[he][f] && setSignal(t[he][f], wrap(e[f], t));
+        } else t[ge][f] && setSignal(t[ge][f], wrap(e[f], t));
       }
       if (c < e.length) o = true;
     } else if (e.length) {
       for (let o = 0, u = e.length; o < u; o++) {
         const u = getOverrideValue(r, i, o, s);
-        isWrappable(u) ? applyState(e[o], wrap(u, t), n) : t[he][o] && setSignal(t[he][o], e[o]);
+        isWrappable(u) ? applyState(e[o], wrap(u, t), n) : t[ge][o] && setSignal(t[ge][o], e[o]);
       }
     }
     if (u !== e.length) {
       o = true;
-      t[he].length && setSignal(t[he].length, e.length);
+      t[ge].length && setSignal(t[ge].length, e.length);
     }
-    o && t[he][ue] && setSignal(t[he][ue], void 0);
+    o && t[ge][le] && setSignal(t[ge][le], void 0);
     return;
   }
   if (o) {
-    const u = o[ue];
+    const u = o[le];
     const l = u ? getAllKeys(r, i, e) : Object.keys(o);
     for (let f = 0, c = l.length; f < c; f++) {
       const c = l[f];
@@ -2435,7 +2449,7 @@ function applyStateSlow(e, t, n) {
       } else applyState(p, wrap(d, t), n);
     }
   }
-  if ((o = t[ge])) {
+  if ((o = t[Se])) {
     const t = Object.keys(o);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -2457,9 +2471,9 @@ function createProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[ye] = wrapProjection;
-    e[we] = i;
-    Object.defineProperty(e, me, {
+    e[we] = wrapProjection;
+    e[me] = i;
+    Object.defineProperty(e, _e, {
       get() {
         return r;
       },
@@ -2468,8 +2482,8 @@ function createProjectionInternal(e, t, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[le]?.[ye] === wrapProjection) return e;
-    const t = createStoreProxy(e, Pe, wrapper);
+    if (e[fe]?.[we] === wrapProjection) return e;
+    const t = createStoreProxy(e, xe, wrapper);
     i.set(e, t);
     return t;
   };
@@ -2557,56 +2571,56 @@ function createWriteTraps(e) {
   };
   return t;
 }
-const ue = Symbol(0),
-  le = Symbol(0),
+const le = Symbol(0),
   fe = Symbol(0),
-  ce = Symbol(0);
-const ae = "v",
-  de = "o",
-  pe = "x",
-  he = "n",
-  ge = "h",
-  Se = "c",
-  ye = "w",
-  we = "l",
-  me = "f",
-  _e = "p";
-function createStoreProxy(e, t = Pe, n) {
+  ce = Symbol(0),
+  ae = Symbol(0);
+const de = "v",
+  pe = "o",
+  he = "x",
+  ge = "n",
+  Se = "h",
+  ye = "c",
+  we = "w",
+  me = "l",
+  _e = "f",
+  be = "p";
+function createStoreProxy(e, t = xe, n) {
   let r;
   if (Array.isArray(e)) {
     r = [];
     r.v = e;
   } else {
     r = { v: e };
-    const t = e?.[le]?.[ae] ?? e;
+    const t = e?.[fe]?.[de] ?? e;
     const n = Object.getPrototypeOf(t);
     if (n !== null && n !== Object.prototype) {
-      r[Se] = true;
+      r[ye] = true;
     }
   }
   n && n(r);
-  return (r[fe] = new Proxy(r, t));
+  return (r[ce] = new Proxy(r, t));
 }
-const be = new WeakMap();
+const Oe = new WeakMap();
 function wrap(e, t) {
-  if (t?.[ye]) return t[ye](e, t);
-  let n = e[fe] || be.get(e);
-  if (!n) be.set(e, (n = createStoreProxy(e)));
+  if (t?.[we]) return t[we](e, t);
+  let n = e[ce] || Oe.get(e);
+  if (!n) Oe.set(e, (n = createStoreProxy(e)));
   return n;
 }
 function isWrappable(e) {
   if (e == null || typeof e !== "object" || Object.isFrozen(e)) return false;
   return typeof Node === "undefined" || !(e instanceof Node);
 }
-let Oe = false;
+let ve = false;
 function setWriteOverride(e) {
-  Oe = e;
+  ve = e;
 }
 function writeOnly(e) {
-  return Oe || !!ve?.has(e);
+  return ve || !!Pe?.has(e);
 }
 function unwrapStoreValue(e) {
-  return e?.[le]?.[ae] ?? e;
+  return e?.[fe]?.[de] ?? e;
 }
 function hasInheritedAccessor(e, t) {
   let n = Object.getPrototypeOf(e);
@@ -2640,12 +2654,12 @@ function getNode(e, t, n, r, i = isEqual, s, o) {
   if (o && t in o) {
     const e = o[t];
     u._e = e === undefined ? C : e;
-    se?.add(u);
+    oe?.add(u);
   }
   return (e[t] = u);
 }
-function trackSelf(e, t = ue) {
-  getObserver() && read(getNode(getNodes(e, he), t, undefined, e[me], false, e[_e]));
+function trackSelf(e, t = le) {
+  getObserver() && read(getNode(getNodes(e, ge), t, undefined, e[_e], false, e[be]));
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -2653,60 +2667,60 @@ function getKeys(e, t, n = true) {
   const i = new Set(r);
   const s = Reflect.ownKeys(t);
   for (const e of s) {
-    if (t[e] !== ce) i.add(e);
+    if (t[e] !== ae) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
 }
 function getPropertyDescriptor(e, t, n) {
   if (t && n in t) {
-    if (t[n] === ce) return void 0;
+    if (t[n] === ae) return void 0;
     const r = Reflect.getOwnPropertyDescriptor(t, n);
     if (r?.get || r?.set || !(n in e)) return r;
   }
   return Reflect.getOwnPropertyDescriptor(e, n);
 }
 function prepareStoreWrite(e, t, n) {
-  if (e[_e]) {
-    const t = e[me];
+  if (e[be]) {
+    const t = e[_e];
     if (t?.V) {
       z.initTransition(t.V);
     }
   }
-  const r = e[ae];
+  const r = e[de];
   const i = r[n];
-  if (ie && typeof n !== "symbol" && !((e[me]?.be ?? 0) & m)) {
+  if (se && typeof n !== "symbol" && !((e[_e]?.be ?? 0) & m)) {
     if (!e[N]) {
       e[N] = Object.create(null);
-      se?.add(e);
+      oe?.add(e);
     }
     if (!(n in e[N])) {
       e[N][n] = i;
     }
   }
-  const s = e[_e] && !K;
-  const o = s ? pe : de;
+  const s = e[be] && !K;
+  const o = s ? he : pe;
   if (s) trackOptimisticStore(t);
   return { base: i, overrideKey: o, state: r };
 }
 function upsertStoreNode(e, t, n, r, i) {
   if (t[n]) return t[n];
   const s = isWrappable(r) ? wrap(r, e) : r;
-  const o = getNode(t, n, s, e[me], isEqual, e[_e], i);
+  const o = getNode(t, n, s, e[_e], isEqual, e[be], i);
   registerTransientStoreNode(o);
   return o;
 }
 function notifyStoreProperty(e, t, n, r, i, s) {
-  const o = K || e[_e];
+  const o = K || e[be];
   const u = n !== "delete";
-  const l = e[ge]?.[t];
+  const l = e[Se]?.[t];
   if (l) {
     setSignal(l, u);
   } else if (!o && n !== "invalidate" && s !== u) {
-    const n = upsertStoreNode(e, getNodes(e, ge), t, s);
+    const n = upsertStoreNode(e, getNodes(e, Se), t, s);
     setSignal(n, u);
   }
-  const f = getNodes(e, he);
+  const f = getNodes(e, ge);
   if (n === "set") {
     if (f[t]) {
       setSignal(f[t], () => (isWrappable(r) ? wrap(r, e) : r));
@@ -2727,43 +2741,43 @@ function notifyStoreProperty(e, t, n, r, i, s) {
       setSignal(n, undefined);
     }
   }
-  f[ue] && setSignal(f[ue], undefined);
+  f[le] && setSignal(f[le], undefined);
 }
-let ve = null;
-const Pe = {
+let Pe = null;
+const xe = {
   get(e, t, n) {
-    if (t === le) return e;
-    if (t === fe) return n;
-    if (t === j) return e[me];
-    if (t === ue) {
+    if (t === fe) return e;
+    if (t === ce) return n;
+    if (t === j) return e[_e];
+    if (t === le) {
       trackSelf(e);
       return n;
     }
-    const r = getNodes(e, he);
+    const r = getNodes(e, ge);
     const i = r[t];
-    const s = e[ae];
+    const s = e[de];
     if (
       !i &&
-      !e[de] &&
       !e[pe] &&
-      !e[Se] &&
-      !e[_e] &&
+      !e[he] &&
+      !e[ye] &&
+      !e[be] &&
       !e[N] &&
-      !s[le] &&
+      !s[fe] &&
       !(t in s) &&
       getObserver() &&
       !writeOnly(n)
     ) {
-      return read(getNode(r, t, undefined, e[me]));
+      return read(getNode(r, t, undefined, e[_e]));
     }
-    const o = e[pe] && t in e[pe];
-    const u = o || (e[de] && t in e[de]);
-    const l = !!e[ae][le];
-    const f = o ? e[pe] : e[de] && t in e[de] ? e[de] : e[ae];
+    const o = e[he] && t in e[he];
+    const u = o || (e[pe] && t in e[pe]);
+    const l = !!e[de][fe];
+    const f = o ? e[he] : e[pe] && t in e[pe] ? e[pe] : e[de];
     if (!i) {
       const r = Object.getOwnPropertyDescriptor(f, t);
       if (r && r.get) return r.get.call(n);
-      if (!r && !u && e[Se]) {
+      if (!r && !u && e[ye]) {
         const e = unwrapStoreValue(f);
         if (hasInheritedAccessor(e, t)) {
           return Reflect.get(f, t, n);
@@ -2773,59 +2787,59 @@ const Pe = {
     if (writeOnly(n)) {
       let n =
         i && (u || !l) ? (i.G !== undefined && i.G !== x ? i.G : i.Y !== x ? i.Y : i.ue) : f[t];
-      n === ce && (n = undefined);
+      n === ae && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
-      ve?.add(r);
+      Pe?.add(r);
       return r;
     }
     let c = i ? (u || !l ? read(r[t]) : (read(r[t]), f[t])) : f[t];
-    c === ce && (c = undefined);
+    c === ae && (c = undefined);
     if (!i) {
       if (!u && typeof c === "function" && !f.hasOwnProperty(t)) {
         let t;
-        return !Array.isArray(e[ae]) && (t = Object.getPrototypeOf(e[ae])) && t !== Object.prototype
+        return !Array.isArray(e[de]) && (t = Object.getPrototypeOf(e[de])) && t !== Object.prototype
           ? c.bind(f)
           : c;
       } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(c) ? wrap(c, e) : c, e[me], isEqual, e[_e], e[N]));
+        return read(getNode(r, t, isWrappable(c) ? wrap(c, e) : c, e[_e], isEqual, e[be], e[N]));
       }
     }
     return isWrappable(c) ? wrap(c, e) : c;
   },
   has(e, t) {
-    if (t === fe || t === ue || t === "__proto__") return true;
+    if (t === ce || t === le || t === "__proto__") return true;
     const n =
-      e[pe] && t in e[pe] ? e[pe][t] !== ce : e[de] && t in e[de] ? e[de][t] !== ce : t in e[ae];
-    if (writeOnly(e[fe])) return n;
-    const r = getNodes(e, ge);
+      e[he] && t in e[he] ? e[he][t] !== ae : e[pe] && t in e[pe] ? e[pe][t] !== ae : t in e[de];
+    if (writeOnly(e[ce])) return n;
+    const r = getNodes(e, Se);
     if (r[t]) return read(r[t]);
     if (getObserver()) {
-      return read(getNode(r, t, n, e[me], isEqual, e[_e]));
+      return read(getNode(r, t, n, e[_e], isEqual, e[be]));
     }
     return n;
   },
   set(e, t, n) {
-    const r = e[fe];
+    const r = e[ce];
     if (writeOnly(r)) {
       untrack(() => {
         const { base: i, overrideKey: s, state: o } = prepareStoreWrite(e, r, t);
-        const u = e[pe] && t in e[pe] ? e[pe][t] : e[de] && t in e[de] ? e[de][t] : i;
+        const u = e[he] && t in e[he] ? e[he][t] : e[pe] && t in e[pe] ? e[pe][t] : i;
         const l =
-          e[pe] && t in e[pe]
-            ? e[pe][t] !== ce
-            : e[de] && t in e[de]
-              ? e[de][t] !== ce
-              : t in e[ae];
+          e[he] && t in e[he]
+            ? e[he][t] !== ae
+            : e[pe] && t in e[pe]
+              ? e[pe][t] !== ae
+              : t in e[de];
         const f = unwrapStoreValue(n);
         const c = Array.isArray(o) && t !== "length";
         const a = c ? parseInt(t) + 1 : 0;
         const d =
           c &&
-          (e[pe] && "length" in e[pe]
-            ? e[pe].length
-            : e[de] && "length" in e[de]
-              ? e[de].length
+          (e[he] && "length" in e[he]
+            ? e[he].length
+            : e[pe] && "length" in e[pe]
+              ? e[pe].length
               : o.length);
         const p = c && a > d ? a : undefined;
         if (u === f && p === undefined) return true;
@@ -2837,10 +2851,10 @@ const Pe = {
         }
         notifyStoreProperty(e, t, "set", f, u, l);
         if (Array.isArray(o) && t !== "length" && p !== undefined) {
-          const t = getNodes(e, he);
+          const t = getNodes(e, ge);
           if (t.length) {
             setSignal(t.length, p);
-          } else if (!K && !e[_e]) {
+          } else if (!K && !e[be]) {
             const n = upsertStoreNode(e, t, "length", d, e[N]);
             setSignal(n, p);
           }
@@ -2851,7 +2865,7 @@ const Pe = {
     return true;
   },
   defineProperty(e, t, n) {
-    const r = e[fe];
+    const r = e[ce];
     if (writeOnly(r)) {
       untrack(() => {
         const { base: i, overrideKey: s } = prepareStoreWrite(e, r, t);
@@ -2864,16 +2878,16 @@ const Pe = {
     return true;
   },
   deleteProperty(e, t) {
-    const n = e[pe]?.[t] === ce;
-    const r = e[de]?.[t] === ce;
-    if (writeOnly(e[fe]) && !n && !r) {
+    const n = e[he]?.[t] === ae;
+    const r = e[pe]?.[t] === ae;
+    if (writeOnly(e[ce]) && !n && !r) {
       untrack(() => {
-        const n = e[_e] && !K;
-        const r = n ? pe : de;
-        if (n) trackOptimisticStore(e[fe]);
-        const i = e[pe] && t in e[pe] ? e[pe][t] : e[de] && t in e[de] ? e[de][t] : e[ae][t];
-        if (t in e[ae] || (e[de] && t in e[de])) {
-          (e[r] || (e[r] = Object.create(null)))[t] = ce;
+        const n = e[be] && !K;
+        const r = n ? he : pe;
+        if (n) trackOptimisticStore(e[ce]);
+        const i = e[he] && t in e[he] ? e[he][t] : e[pe] && t in e[pe] ? e[pe][t] : e[de][t];
+        if (t in e[de] || (e[pe] && t in e[pe])) {
+          (e[r] || (e[r] = Object.create(null)))[t] = ae;
         } else if (e[r] && t in e[r]) {
           delete e[r][t];
         } else return true;
@@ -2884,11 +2898,11 @@ const Pe = {
   },
   ownKeys(e) {
     trackSelf(e);
-    let t = getKeys(e[ae], e[de], false);
-    if (e[pe]) {
+    let t = getKeys(e[de], e[pe], false);
+    if (e[he]) {
       const n = new Set(t);
-      for (const t of Reflect.ownKeys(e[pe])) {
-        if (e[pe][t] !== ce) n.add(t);
+      for (const t of Reflect.ownKeys(e[he])) {
+        if (e[he][t] !== ae) n.add(t);
         else n.delete(t);
       }
       t = Array.from(n);
@@ -2896,27 +2910,27 @@ const Pe = {
     return t;
   },
   getOwnPropertyDescriptor(e, t) {
-    if (t === fe) return { value: e[fe], writable: true, configurable: true };
-    if (e[pe] && t in e[pe]) {
-      if (e[pe][t] === ce) return undefined;
-      const n = Reflect.getOwnPropertyDescriptor(e[pe], t);
-      if (n?.get || n?.set || !(t in e[ae])) return n;
-      const r = getPropertyDescriptor(e[ae], e[de], t);
+    if (t === ce) return { value: e[ce], writable: true, configurable: true };
+    if (e[he] && t in e[he]) {
+      if (e[he][t] === ae) return undefined;
+      const n = Reflect.getOwnPropertyDescriptor(e[he], t);
+      if (n?.get || n?.set || !(t in e[de])) return n;
+      const r = getPropertyDescriptor(e[de], e[pe], t);
       if (r) {
-        return { ...r, value: e[pe][t] };
+        return { ...r, value: e[he][t] };
       }
-      return { value: e[pe][t], writable: true, enumerable: true, configurable: true };
+      return { value: e[he][t], writable: true, enumerable: true, configurable: true };
     }
-    return getPropertyDescriptor(e[ae], e[de], t);
+    return getPropertyDescriptor(e[de], e[pe], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[ae]);
+    return Object.getPrototypeOf(e[de]);
   }
 };
 function storeSetter(e, t) {
-  const n = ve;
-  ve = new Set();
-  ve.add(e);
+  const n = Pe;
+  Pe = new Set();
+  Pe.add(e);
   try {
     const n = t(e);
     if (n !== e && n !== undefined) {
@@ -2932,8 +2946,8 @@ function storeSetter(e, t) {
       }
     }
   } finally {
-    ve.clear();
-    ve = n;
+    Pe.clear();
+    Pe = n;
   }
 }
 function createStore(e, t, n) {
@@ -2953,39 +2967,39 @@ function createOptimisticStore(e, t, n) {
   return [o, e => storeSetter(o, e)];
 }
 function clearOptimisticStore(e) {
-  const t = e[le];
-  if (!t || !t[pe]) return;
-  const n = t[pe];
-  const r = t[he];
+  const t = e[fe];
+  if (!t || !t[he]) return;
+  const n = t[he];
+  const r = t[ge];
   setProjectionWriteActive(true);
   try {
     if (r) {
       for (const e of Reflect.ownKeys(n)) {
         if (r[e]) {
           r[e].H = undefined;
-          const n = t[de] && e in t[de] ? t[de][e] : t[ae][e];
-          const i = n === ce ? undefined : n;
+          const n = t[pe] && e in t[pe] ? t[pe][e] : t[de][e];
+          const i = n === ae ? undefined : n;
           setSignal(r[e], isWrappable(i) ? wrap(i, t) : i);
         }
       }
-      if (r[ue]) {
-        r[ue].H = undefined;
-        setSignal(r[ue], undefined);
+      if (r[le]) {
+        r[le].H = undefined;
+        setSignal(r[le], undefined);
       }
     }
   } finally {
     setProjectionWriteActive(false);
   }
-  delete t[pe];
+  delete t[he];
 }
 function createOptimisticProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[ye] = wrapProjection;
-    e[we] = i;
-    e[_e] = true;
-    Object.defineProperty(e, me, {
+    e[we] = wrapProjection;
+    e[me] = i;
+    e[be] = true;
+    Object.defineProperty(e, _e, {
       get() {
         return r;
       },
@@ -2994,8 +3008,8 @@ function createOptimisticProjectionInternal(e, t, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[le]?.[ye] === wrapProjection) return e;
-    const t = createStoreProxy(e, Pe, wrapper);
+    if (e[fe]?.[we] === wrapProjection) return e;
+    const t = createStoreProxy(e, xe, wrapper);
     i.set(e, t);
     return t;
   };
@@ -3021,7 +3035,7 @@ function createOptimisticProjectionInternal(e, t, n) {
   }
   return { store: s, node: r };
 }
-const xe = Symbol(0);
+const Ce = Symbol(0);
 function isPrototypePollutionKey(e) {
   return e === "__proto__" || e === "constructor" || e === "prototype";
 }
@@ -3069,7 +3083,7 @@ function updatePath(e, t, n = 0) {
     if (s === i) return;
   }
   if (r === undefined && s == undefined) return;
-  if (s === xe) {
+  if (s === Ce) {
     delete e[r];
   } else if (r === undefined || (isWrappable(i) && isWrappable(s) && !Array.isArray(s))) {
     const t = r !== undefined ? e[r] : e;
@@ -3085,26 +3099,26 @@ function updatePath(e, t, n = 0) {
     e[r] = s;
   }
 }
-const Ce = Object.assign(
+const Ne = Object.assign(
   function storePath(...e) {
     return t => {
       updatePath(t, e);
     };
   },
-  { DELETE: xe }
+  { DELETE: Ce }
 );
 function snapshotImpl(e, t, n, r) {
   let i, s, o, u, l, f;
   if (!isWrappable(e)) return e;
   if (n && n.has(e)) return n.get(e);
   if (!n) n = new Map();
-  if ((i = e[le] || r?.get(e)?.[le])) {
-    if (t) trackSelf(i, ue);
-    o = i[de];
-    s = Array.isArray(i[ae]);
-    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[ae]))) : i[ae]);
-    e = i[ae];
-    r = be;
+  if ((i = e[fe] || r?.get(e)?.[fe])) {
+    if (t) trackSelf(i, le);
+    o = i[pe];
+    s = Array.isArray(i[de]);
+    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[de]))) : i[de]);
+    e = i[de];
+    r = Oe;
   } else {
     s = Array.isArray(e);
     n.set(e, e);
@@ -3113,7 +3127,7 @@ function snapshotImpl(e, t, n, r) {
     const s = o?.length || e.length;
     for (let c = 0; c < s; c++) {
       f = o && c in o ? o[c] : e[c];
-      if (f === ce) continue;
+      if (f === ae) continue;
       if (t && isWrappable(f)) wrap(f, i);
       if ((l = snapshotImpl(f, t, n, r)) !== f || u) {
         if (!u) n.set(e, (u = [...e]));
@@ -3148,13 +3162,13 @@ function deep(e) {
 function trueFn() {
   return true;
 }
-const Ne = {
+const Ee = {
   get(e, t, n) {
-    if (t === fe) return n;
+    if (t === ce) return n;
     return e.get(t);
   },
   has(e, t) {
-    if (t === fe) return true;
+    if (t === ce) return true;
     return e.has(t);
   },
   set: trueFn,
@@ -3177,15 +3191,15 @@ const Ne = {
 function resolveSource(e) {
   return !(e = typeof e === "function" ? e() : e) ? {} : e;
 }
-const Ee = Symbol(0);
+const ke = Symbol(0);
 function merge(...e) {
   if (e.length === 1 && typeof e[0] !== "function") return e[0];
   let t = false;
   const n = [];
   for (let r = 0; r < e.length; r++) {
     const i = e[r];
-    t = t || (!!i && fe in i);
-    const s = !!i && i[Ee];
+    t = t || (!!i && ce in i);
+    const s = !!i && i[ke];
     if (s) {
       for (let e = 0; e < s.length; e++) n.push(s[e]);
     } else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
@@ -3194,7 +3208,7 @@ function merge(...e) {
     return new Proxy(
       {
         get(e) {
-          if (e === Ee) return n;
+          if (e === ke) return n;
           for (let t = n.length - 1; t >= 0; t--) {
             const r = resolveSource(n[t]);
             if (e in r) return r[e];
@@ -3215,7 +3229,7 @@ function merge(...e) {
           return [...e];
         }
       },
-      Ne
+      Ee
     );
   }
   const r = Object.create(null);
@@ -3247,11 +3261,11 @@ function merge(...e) {
     if (n.get) Object.defineProperty(o, t, n);
     else o[t] = n.value;
   }
-  o[Ee] = n;
+  o[ke] = n;
   return o;
 }
 function omit(e, ...t) {
-  if (E && fe in e) {
+  if (E && ce in e) {
     return new Proxy(
       {
         get(n) {
@@ -3264,7 +3278,7 @@ function omit(e, ...t) {
           return Object.keys(e).filter(e => !t.includes(e));
         }
       },
-      Ne
+      Ee
     );
   }
   const n = {};
@@ -3294,37 +3308,43 @@ function mapArray(e, t, n) {
     et: [],
     tt: r,
     nt: r || n?.keyed === false ? [] : undefined,
-    rt: i ? [] : undefined,
-    it: n?.fallback
+    rt: i && n?.keyed !== false ? [] : undefined,
+    it: n?.keyed === false,
+    st: n?.fallback
   };
   const u = computed(updateKeyedMap.bind(o));
   o.Ue.u = u;
   u.ye &= ~y;
   return accessor(u);
 }
-const ke = { ownedWrite: true };
+const je = { ownedWrite: true };
 function updateKeyedMap() {
   const e = this.Xe() || [],
     t = e.length;
-  e[ue];
+  e[le];
   runWithOwner(this.Ue, () => {
     let n,
       r,
       i = this.nt
-        ? () => {
-            this.nt[r] = signal(e[r], ke);
-            this.rt && (this.rt[r] = signal(r, ke));
-            return this.Ze(accessor(this.nt[r]), this.rt ? accessor(this.rt[r]) : undefined);
-          }
+        ? this.it
+          ? () => {
+              this.nt[r] = signal(e[r], je);
+              return this.Ze(accessor(this.nt[r]), r);
+            }
+          : () => {
+              this.nt[r] = signal(e[r], je);
+              this.rt && (this.rt[r] = signal(r, je));
+              return this.Ze(accessor(this.nt[r]), this.rt ? accessor(this.rt[r]) : undefined);
+            }
         : this.rt
           ? () => {
               const t = e[r];
-              this.rt[r] = signal(r, ke);
-              return this.Ze(() => t, accessor(this.rt[r]));
+              this.rt[r] = signal(r, je);
+              return this.Ze(t, accessor(this.rt[r]));
             }
           : () => {
               const t = e[r];
-              return this.Ze(() => t);
+              return this.Ze(t);
             };
     if (t === 0) {
       if (this.Je !== 0) {
@@ -3336,8 +3356,8 @@ function updateKeyedMap() {
         this.nt && (this.nt = []);
         this.rt && (this.rt = []);
       }
-      if (this.it && !this.$e[0]) {
-        this.$e[0] = runWithOwner((this.et[0] = createOwner()), this.it);
+      if (this.st && !this.$e[0]) {
+        this.$e[0] = runWithOwner((this.et[0] = createOwner()), this.st);
       }
     } else if (this.Je === 0) {
       if (this.et[0]) this.et[0].dispose();
@@ -3428,21 +3448,21 @@ function repeat(e, t, n) {
     updateRepeat.bind({
       Ue: createOwner(),
       Je: 0,
-      st: 0,
-      ot: e,
+      ot: 0,
+      ut: e,
       Ze: r,
       et: [],
       $e: [],
-      ut: n?.from,
-      it: n?.fallback
+      lt: n?.from,
+      st: n?.fallback
     })
   );
   i.ye &= ~y;
   return accessor(i);
 }
 function updateRepeat() {
-  const e = this.ot();
-  const t = this.ut?.() || 0;
+  const e = this.ut();
+  const t = this.lt?.() || 0;
   runWithOwner(this.Ue, () => {
     if (e === 0) {
       if (this.Je !== 0) {
@@ -3451,23 +3471,23 @@ function updateRepeat() {
         this.$e = [];
         this.Je = 0;
       }
-      if (this.it && !this.$e[0]) {
-        this.$e[0] = runWithOwner((this.et[0] = createOwner()), this.it);
+      if (this.st && !this.$e[0]) {
+        this.$e[0] = runWithOwner((this.et[0] = createOwner()), this.st);
       }
       return;
     }
     const n = t + e;
-    const r = this.st + this.Je;
+    const r = this.ot + this.Je;
     if (this.Je === 0 && this.et[0]) this.et[0].dispose();
-    for (let e = n; e < r; e++) this.et[e - this.st].dispose();
-    if (this.st < t) {
-      let e = this.st;
+    for (let e = n; e < r; e++) this.et[e - this.ot].dispose();
+    if (this.ot < t) {
+      let e = this.ot;
       while (e < t && e < this.Je) this.et[e++].dispose();
-      this.et.splice(0, t - this.st);
-      this.$e.splice(0, t - this.st);
-    } else if (this.st > t) {
-      let n = r - this.st - 1;
-      let i = this.st - t;
+      this.et.splice(0, t - this.ot);
+      this.$e.splice(0, t - this.ot);
+    } else if (this.ot > t) {
+      let n = r - this.ot - 1;
+      let i = this.ot - t;
       this.et.length = this.$e.length = e;
       while (n >= i) {
         this.et[n] = this.et[n - i];
@@ -3482,7 +3502,7 @@ function updateRepeat() {
       this.$e[e - t] = runWithOwner((this.et[e - t] = createOwner()), () => this.Ze(e));
     }
     this.$e = this.$e.slice(0, e);
-    this.st = t;
+    this.ot = t;
     this.Je = e;
   });
   return this.$e;
@@ -3495,10 +3515,10 @@ function boundaryComputed(e, t) {
   n.Fe = (e, t) => {
     const r = e !== undefined ? e : n.be;
     const i = t !== undefined ? t : n.we;
-    n.be &= ~n.lt;
-    n.te.notify(n, n.lt, r, i);
+    n.be &= ~n.ft;
+    n.te.notify(n, n.ft, r, i);
   };
-  n.lt = t;
+  n.ft = t;
   n.ye &= ~y;
   recompute(n, true);
   return n;
@@ -3512,61 +3532,61 @@ function createBoundChildren(e, t, n, r) {
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
   });
 }
-const je = Symbol();
-const We = createContext(null);
-let Re = false;
+const We = Symbol();
+const Re = createContext(null);
+let Ae = false;
 const FALSE_ACCESSOR = () => false;
 const SEQUENTIAL_ACCESSOR = () => "sequential";
 function isRevealController(e) {
   return e instanceof RevealController;
 }
 function isSlotReady(e) {
-  return isRevealController(e) ? e.isReady() : e.ft.size === 0 && !e.ct;
+  return isRevealController(e) ? e.isReady() : e.ct.size === 0 && !e.dt;
 }
 function isSlotMinimallyReady(e) {
   return isRevealController(e) ? e.isMinimallyReady() : isSlotReady(e);
 }
 function setSlotState(e, t, n, r) {
-  setSignal(e.dt, n);
-  setSignal(e.ht, r);
+  setSignal(e.ht, n);
+  setSignal(e.gt, r);
   if (isRevealController(e)) {
-    if (!n && e.gt === t) e.gt = undefined;
+    if (!n && e.St === t) e.St = undefined;
     return e.evaluate(n, r);
   }
-  if (!n && e.St === t && e.yt) e.St = undefined;
+  if (!n && e.yt === t && e.wt) e.yt = undefined;
 }
 class RevealController {
-  wt;
   _t;
-  bt = [];
-  gt;
-  dt = signal(false, { ownedWrite: true, ze: true });
+  bt;
+  Ot = [];
+  St;
   ht = signal(false, { ownedWrite: true, ze: true });
-  Ot = true;
+  gt = signal(false, { ownedWrite: true, ze: true });
   vt = true;
-  Pt = false;
+  Pt = true;
+  xt = false;
   constructor(e, t) {
-    this.wt = e;
-    this._t = t;
+    this._t = e;
+    this.bt = t;
   }
-  xt(e) {
-    for (let t = 0; t < this.bt.length; t++) {
-      const n = this.bt[t];
-      if ((isRevealController(n) ? n.gt : n.St) !== this) continue;
+  Ct(e) {
+    for (let t = 0; t < this.Ot.length; t++) {
+      const n = this.Ot[t];
+      if ((isRevealController(n) ? n.St : n.yt) !== this) continue;
       if (e(n) === false) return false;
     }
     return true;
   }
   isReady() {
-    return this.xt(isSlotReady);
+    return this.Ct(isSlotReady);
   }
   isMinimallyReady() {
-    const e = untrack(this.wt);
+    const e = untrack(this._t);
     if (e === "together") return this.isReady();
     if (e === "natural") {
       let e = false;
       let t = false;
-      this.xt(n => {
+      this.Ct(n => {
         e = true;
         if (isSlotMinimallyReady(n)) {
           t = true;
@@ -3576,58 +3596,58 @@ class RevealController {
       return !e || t;
     }
     let t = true;
-    this.xt(e => {
+    this.Ct(e => {
       t = isSlotMinimallyReady(e);
       return false;
     });
     return t;
   }
   register(e) {
-    if (this.bt.includes(e)) return;
-    this.bt.push(e);
-    const t = untrack(this.wt);
-    (setSignal(e.dt, true), setSignal(e.ht, t === "sequential" ? !!untrack(this._t) : false));
+    if (this.Ot.includes(e)) return;
+    this.Ot.push(e);
+    const t = untrack(this._t);
+    (setSignal(e.ht, true), setSignal(e.gt, t === "sequential" ? !!untrack(this.bt) : false));
     untrack(() => this.evaluate());
   }
   unregister(e) {
-    const t = this.bt.indexOf(e);
-    if (t >= 0) this.bt.splice(t, 1);
+    const t = this.Ot.indexOf(e);
+    if (t >= 0) this.Ot.splice(t, 1);
     untrack(() => this.evaluate());
   }
   evaluate(e, t) {
-    if (this.Pt) return;
-    this.Pt = true;
-    const n = this.Ot;
-    const r = this.vt;
+    if (this.xt) return;
+    this.xt = true;
+    const n = this.vt;
+    const r = this.Pt;
     try {
-      const n = e ?? read(this.dt),
-        r = untrack(this.wt),
-        i = r === "sequential" && !!untrack(this._t),
+      const n = e ?? read(this.ht),
+        r = untrack(this._t),
+        i = r === "sequential" && !!untrack(this.bt),
         s = t ?? i;
       if (n) {
-        this.xt(e => setSlotState(e, this, true, s));
+        this.Ct(e => setSlotState(e, this, true, s));
       } else if (r === "natural") {
-        this.xt(e => {
+        this.Ct(e => {
           if (isRevealController(e)) {
+            setSignal(e.gt, false);
             setSignal(e.ht, false);
-            setSignal(e.dt, false);
             e.evaluate(false, false);
           } else {
             setSlotState(e, this, !isSlotReady(e), false);
           }
         });
       } else if (r === "together") {
-        const e = this.xt(isSlotMinimallyReady);
-        this.xt(t => setSlotState(t, this, !e, false));
+        const e = this.Ct(isSlotMinimallyReady);
+        this.Ct(t => setSlotState(t, this, !e, false));
       } else {
         let e = false;
-        this.xt(t => {
+        this.Ct(t => {
           if (e) return setSlotState(t, this, true, i);
           if (isSlotReady(t)) return setSlotState(t, this, false, false);
           e = true;
           if (isRevealController(t)) {
+            setSignal(t.gt, false);
             setSignal(t.ht, false);
-            setSignal(t.dt, false);
             t.evaluate(false, false);
           } else {
             setSlotState(t, this, true, false);
@@ -3635,92 +3655,97 @@ class RevealController {
         });
       }
     } finally {
-      this.Ot = this.isReady();
-      this.vt = this.isMinimallyReady();
-      this.Pt = false;
+      this.vt = this.isReady();
+      this.Pt = this.isMinimallyReady();
+      this.xt = false;
     }
-    if (this.gt && (n !== this.Ot || r !== this.vt)) this.gt.evaluate();
+    if (this.St && (n !== this.vt || r !== this.Pt)) this.St.evaluate();
   }
 }
 class CollectionQueue extends Queue {
-  Ct;
-  ft = new Set();
   Nt;
-  ct = true;
-  dt = signal(false, { ownedWrite: true, ze: true });
-  ht = signal(false, { ownedWrite: true, ze: true });
-  St;
-  yt = false;
+  ct = new Set();
   Et;
-  kt = je;
+  dt = true;
+  ht = signal(false, { ownedWrite: true, ze: true });
+  we;
+  gt = signal(false, { ownedWrite: true, ze: true });
+  yt;
+  wt = false;
+  kt;
+  jt = We;
   constructor(e) {
     super();
-    this.Ct = e;
+    this.Nt = e;
   }
   run(e) {
-    if (!e || (read(this.dt) && (!Re || read(this.ht)))) return;
+    if (!e || (read(this.ht) && (!Ae || read(this.gt)))) return;
     return super.run(e);
   }
   notify(e, t, n, r) {
-    if (!(t & this.Ct)) return super.notify(e, t, n, r);
-    if (this.yt && this.Et) {
+    if (!(t & this.Nt)) return super.notify(e, t, n, r);
+    if (this.wt && this.kt) {
       const e = untrack(() => {
         try {
-          return this.Et();
+          return this.kt();
         } catch {
-          return je;
+          return We;
         }
       });
-      if (e !== this.kt) {
-        this.kt = e;
-        this.yt = false;
-        this.ft.clear();
+      if (e !== this.jt) {
+        this.jt = e;
+        this.wt = false;
+        this.ct.clear();
       }
     }
-    if (this.Ct & m && this.yt) return super.notify(e, t, n, r);
-    if (this.Ct & m && n & _) {
+    if (this.Nt & m && this.wt) return super.notify(e, t, n, r);
+    if (this.Nt & m && n & _) {
       return super.notify(e, _, n, r);
     }
-    if (n & this.Ct) {
-      this.ct = true;
+    if (n & this.Nt) {
+      this.dt = true;
       const t = r?.source || e.we?.source;
       if (t) {
-        const e = this.ft.size === 0;
-        this.ft.add(t);
-        if (e) setSignal(this.dt, true);
+        const e = this.ct.size === 0;
+        this.ct.add(t);
+        if (e) setSignal(this.ht, true);
+        if (this.Nt & _) {
+          setSignal(this.we, t.we?.cause ?? t.we);
+        }
       }
     }
-    t &= ~this.Ct;
+    t &= ~this.Nt;
     return t ? super.notify(e, t, n, r) : true;
   }
   checkSources() {
-    for (const e of this.ft) {
-      if (e.m & u || (!(e.be & this.Ct) && !(this.Ct & _ && e.be & m))) this.ft.delete(e);
+    for (const e of this.ct) {
+      if (e.m & u || (!(e.be & this.Nt) && !(this.Nt & _ && e.be & m))) this.ct.delete(e);
     }
-    if (!this.ft.size) {
-      if (this.Ct & m && this.ct && !this.yt && this.Nt) {
-        this.ct = !!(this.Nt.be & this.Ct);
+    if (!this.ct.size) {
+      if (this.Nt & m && this.dt && !this.wt && this.Et) {
+        this.dt = !!(this.Et.be & this.Nt);
       } else {
-        this.ct = false;
+        this.dt = false;
       }
-      if (!this.ct) {
-        setSignal(this.dt, false);
-        if (this.Et) {
+      if (!this.dt) {
+        setSignal(this.ht, false);
+        if (this.kt) {
           try {
-            this.kt = untrack(() => this.Et());
+            this.jt = untrack(() => this.kt());
           } catch {}
         }
       }
     }
-    if (Re) this.St?.evaluate();
+    if (Ae) this.yt?.evaluate();
   }
 }
 function createCollectionBoundary(e, t, n, r) {
   const i = createOwner();
-  if (Re) setContext(We, null, i);
+  if (Ae) setContext(Re, null, i);
   const s = new CollectionQueue(e);
-  if (r) s.Et = r;
-  const o = (s.Nt = createBoundChildren(i, t, s, e));
+  if (e === _) s.we = signal(undefined, { ownedWrite: true, ze: true });
+  if (r) s.kt = r;
+  const o = (s.Et = createBoundChildren(i, t, s, e));
   untrack(() => {
     let t = false;
     try {
@@ -3729,21 +3754,21 @@ function createCollectionBoundary(e, t, n, r) {
       if (e instanceof NotReadyError) t = true;
       else throw e;
     }
-    s.ct = t || !!(o.be & e) || o.we instanceof NotReadyError;
+    s.dt = t || !!(o.be & e) || o.we instanceof NotReadyError;
   });
-  const u = Re && e === m ? getContext(We) : null;
+  const u = Ae && e === m ? getContext(Re) : null;
   if (u) {
-    s.St = u;
+    s.yt = u;
     u.register(s);
     cleanup(() => u.unregister(s));
   }
   return accessor(
     computed(() => {
-      if (!read(s.dt)) {
+      if (!read(s.ht)) {
         const e = read(o);
-        if (!untrack(() => read(s.dt))) return ((s.yt = true), e);
+        if (!untrack(() => read(s.ht))) return ((s.wt = true), e);
       }
-      if (Re && read(s.ht)) return undefined;
+      if (Ae && read(s.gt)) return undefined;
       return n(s);
     })
   );
@@ -3752,23 +3777,21 @@ function createLoadingBoundary(e, t, n) {
   return createCollectionBoundary(m, e, () => t(), n?.on);
 }
 function createErrorBoundary(e, t) {
-  return createCollectionBoundary(_, e, e => {
-    let n = e.ft.values().next().value;
-    const r = n.we?.cause ?? n.we;
-    return t(r, () => {
-      for (const t of e.ft) recompute(t);
+  return createCollectionBoundary(_, e, e =>
+    t(accessor(e.we), () => {
+      for (const t of e.ct) recompute(t);
       schedule();
-    });
-  });
+    })
+  );
 }
 function createRevealOrder(e, t) {
-  Re = true;
+  Ae = true;
   const n = createOwner();
-  const r = getContext(We);
+  const r = getContext(Re);
   const i = t?.order || SEQUENTIAL_ACCESSOR,
     s = t?.collapsed || FALSE_ACCESSOR;
   const o = new RevealController(i, s);
-  setContext(We, o, n);
+  setContext(Re, o, n);
   return runWithOwner(n, () => {
     const t = e();
     computed(() => {
@@ -3777,7 +3800,7 @@ function createRevealOrder(e, t) {
       o.evaluate();
     });
     if (r) {
-      o.gt = r;
+      o.St = r;
       r.register(o);
       cleanup(() => r.unregister(o));
     }
@@ -3833,13 +3856,13 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-const Ae = undefined;
-exports.$PROXY = fe;
+const Ie = undefined;
+exports.$PROXY = ce;
 exports.$REFRESH = j;
-exports.$TARGET = le;
-exports.$TRACK = ue;
+exports.$TARGET = fe;
+exports.$TRACK = le;
 exports.ContextNotFoundError = ContextNotFoundError;
-exports.DEV = Ae;
+exports.DEV = Ie;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
 exports.SUPPORTS_PROXY = E;
@@ -3892,5 +3915,5 @@ exports.runWithOwner = runWithOwner;
 exports.setContext = setContext;
 exports.setSnapshotCapture = setSnapshotCapture;
 exports.snapshot = snapshot;
-exports.storePath = Ce;
+exports.storePath = Ne;
 exports.untrack = untrack;