@solidjs/signals 2.0.0-beta.16 → 2.0.0-beta.17

package/dist/prod.js

@@ -12,6 +12,9 @@ class StatusError extends Error {
     this.source = e;
   }
 }
+function unwrapStatusError(e) {
+  return e instanceof StatusError ? e.cause : e;
+}
 class NoOwnerError extends Error {
   constructor() {
     super("");
@@ -76,20 +79,20 @@ function getOrCreateLane(e) {
   }
   const n = e.t;
   const i = n?.i ? findLane(n.i) : null;
-  t = { o: e, u: new Set(), l: [[], []], S: null, T: activeTransition, _: i };
+  t = { o: e, u: new Set(), l: [[], []], T: null, S: activeTransition, _: i };
   signalLanes.set(e, t);
   activeLanes.add(t);
   return t;
 }
 function findLane(e) {
-  while (e.S) e = e.S;
+  while (e.T) e = e.T;
   return e;
 }
 function mergeLanes(e, t) {
   e = findLane(e);
   t = findLane(t);
   if (e === t) return e;
-  t.S = e;
+  t.T = e;
   for (const n of t.u) e.u.add(n);
   t.u.clear();
   e.l[0].push(...t.l[0]);
@@ -107,7 +110,7 @@ function resolveLane(e) {
   return undefined;
 }
 function resolveTransition(e) {
-  return resolveLane(e)?.T ?? e.T;
+  return resolveLane(e)?.S ?? e.S;
 }
 function hasActiveOverride(e) {
   return !!(e.O !== undefined && e.O !== NOT_PENDING);
@@ -116,7 +119,7 @@ function assignOrMergeLane(e, t) {
   const n = findLane(t);
   const i = e.i;
   if (i) {
-    if (i.S) {
+    if (i.T) {
       e.i = t;
       return;
     }
@@ -134,8 +137,8 @@ function assignOrMergeLane(e, t) {
   e.i = t;
 }
 const transitions = new Set();
-const dirtyQueue = { p: new Array(2e3).fill(undefined), R: false, I: 0, h: 0 };
-const zombieQueue = { p: new Array(2e3).fill(undefined), R: false, I: 0, h: 0 };
+const dirtyQueue = { R: new Array(2e3).fill(undefined), p: false, I: 0, h: 0 };
+const zombieQueue = { R: new Array(2e3).fill(undefined), p: false, I: 0, h: 0 };
 let clock = 0;
 let activeTransition = null;
 let scheduled = false;
@@ -177,7 +180,7 @@ function shouldReadStashedOptimisticValue(e) {
 }
 function runLaneEffects(e) {
   for (const t of activeLanes) {
-    if (t.S || t.u.size > 0) continue;
+    if (t.T || t.u.size > 0) continue;
     const n = t.l[e - 1];
     if (n.length) {
       t.l[e - 1] = [];
@@ -207,7 +210,7 @@ function setProjectionWriteActive(e) {
 function mergeTransitionState(e, t) {
   t.M = e;
   e.j.push(...t.j);
-  for (const n of activeLanes) if (n.T === t) n.T = e;
+  for (const n of activeLanes) if (n.S === t) n.S = e;
   e.N.push(...t.N);
   for (const n of t.C) e.C.add(n);
   for (const [n, i] of t.$) {
@@ -226,7 +229,7 @@ function resolveOptimisticNodes(e) {
     const i = t.O;
     t.O = NOT_PENDING;
     if (i !== NOT_PENDING && t.Z !== i) insertSubs(t, true);
-    t.T = null;
+    t.S = null;
   }
   for (let n = 0; n < t; n++) {
     const t = e[n];
@@ -238,9 +241,9 @@ function resolveOptimisticNodes(e) {
 }
 function cleanupCompletedLanes(e) {
   for (const t of activeLanes) {
-    const n = e ? t.T === e : !t.T;
+    const n = e ? t.S === e : !t.S;
     if (!n) continue;
-    if (!t.S) {
+    if (!t.T) {
       if (t.l[0].length) runQueue(t.l[0], EFFECT_RENDER);
       if (t.l[1].length) runQueue(t.l[1], EFFECT_USER);
     }
@@ -467,14 +470,14 @@ class GlobalQueue extends Queue {
     transitions.add(activeTransition);
     activeTransition.fe = clock;
     if (this.te !== null) {
-      this.te.T = activeTransition;
+      this.te.S = activeTransition;
       activeTransition.ne.push(this.te);
       this.te = null;
     }
     if (this.ne !== activeTransition.ne) {
       for (let e = 0; e < this.ne.length; e++) {
         const t = this.ne[e];
-        t.T = activeTransition;
+        t.S = activeTransition;
         activeTransition.ne.push(t);
       }
       this.ne = activeTransition.ne;
@@ -482,13 +485,13 @@ class GlobalQueue extends Queue {
     if (this.N !== activeTransition.N) {
       for (let e = 0; e < this.N.length; e++) {
         const t = this.N[e];
-        t.T = activeTransition;
+        t.S = activeTransition;
         activeTransition.N.push(t);
       }
       this.N = activeTransition.N;
     }
     for (const e of activeLanes) {
-      if (!e.T) e.T = activeTransition;
+      if (!e.S) e.S = activeTransition;
     }
     if (this.C !== activeTransition.C) {
       for (const e of this.C) activeTransition.C.add(e);
@@ -556,7 +559,7 @@ function commitPendingNode(e) {
   }
   t.W &= ~REACTIVE_MANUAL_WRITE;
   if (!(t.Y & STATUS_PENDING)) t.Y &= ~STATUS_UNINITIALIZED;
-  if (t.de !== null || t.Se !== null) GlobalQueue.re(t, false, true);
+  if (t.de !== null || t.Te !== null) GlobalQueue.re(t, false, true);
   if (e.B || e.q) snapCompanionsToState(e);
 }
 function commitPendingNodes() {
@@ -619,7 +622,7 @@ function trackOptimisticStore(e) {
 }
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
-    e[t].T = activeTransition;
+    e[t].S = activeTransition;
   }
 }
 const globalQueue = new GlobalQueue();
@@ -649,9 +652,9 @@ function runQueue(e, t) {
 }
 function reporterBlocksSource(e, t) {
   if (e.W & (REACTIVE_ZOMBIE | REACTIVE_DISPOSED)) return false;
-  if (e.Te === t || e._e?.has(t)) return true;
-  for (let n = e.Oe; n; n = n.pe) {
-    let e = n.Re;
+  if (e.Se === t || e._e?.has(t)) return true;
+  for (let n = e.Oe; n; n = n.Re) {
+    let e = n.pe;
     while (e) {
       if (e === t || e.Ie === t) return true;
       e = e.t;
@@ -715,8 +718,8 @@ function actualInsertIntoHeap(e, t) {
   const n = (e.J?.he ? e.J.Ae?.H : e.J?.H) ?? -1;
   if (n >= e.H) e.H = n + 1;
   const i = e.H;
-  const r = t.p[i];
-  if (r === undefined) t.p[i] = e;
+  const r = t.R[i];
+  if (r === undefined) t.R[i] = e;
   else {
     const t = r.Ne;
     t.Ce = e;
@@ -748,12 +751,12 @@ function deleteFromHeap(e, t) {
   if (!(n & (REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT))) return;
   e.W = n & -25;
   const i = e.H;
-  if (e.Ne === e) t.p[i] = undefined;
+  if (e.Ne === e) t.R[i] = undefined;
   else {
     const n = e.Ce;
-    const r = t.p[i];
+    const r = t.R[i];
     const o = n ?? r;
-    if (e === r) t.p[i] = n;
+    if (e === r) t.R[i] = n;
     else e.Ne.Ce = n;
     o.Ne = e.Ne;
   }
@@ -761,10 +764,10 @@ function deleteFromHeap(e, t) {
   e.Ce = undefined;
 }
 function markHeap(e) {
-  if (e.R) return;
-  e.R = true;
+  if (e.p) return;
+  e.p = true;
   for (let t = 0; t <= e.h; t++) {
-    for (let n = e.p[t]; n !== undefined; n = n.Ce) {
+    for (let n = e.R[t]; n !== undefined; n = n.Ce) {
       if (n.W & REACTIVE_IN_HEAP) markNode(n);
     }
   }
@@ -785,13 +788,13 @@ function markNode(e, t = REACTIVE_DIRTY) {
   }
 }
 function runHeap(e, t) {
-  e.R = false;
+  e.p = false;
   for (e.I = 0; e.I <= e.h; e.I++) {
-    let n = e.p[e.I];
+    let n = e.R[e.I];
     while (n !== undefined) {
       if (n.W & REACTIVE_IN_HEAP) t(n);
       else adjustHeight(n, e);
-      n = e.p[e.I];
+      n = e.R[e.I];
     }
   }
   e.h = 0;
@@ -799,8 +802,8 @@ function runHeap(e, t) {
 function adjustHeight(e, t) {
   deleteFromHeap(e, t);
   let n = e.H;
-  for (let t = e.Oe; t; t = t.pe) {
-    const e = t.Re;
+  for (let t = e.Oe; t; t = t.Re) {
+    const e = t.pe;
     const i = e.Ie || e;
     if (i.ce && i.H >= n) n = i.H + 1;
   }
@@ -882,7 +885,7 @@ function disposeChildren(e, t = false, n) {
   }
 }
 function runDisposal(e, t) {
-  let n = t ? e.Se : e.Ue;
+  let n = t ? e.Te : e.Ue;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -892,7 +895,7 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.Se = null) : (e.Ue = null);
+  t ? (e.Te = null) : (e.Ue = null);
 }
 function childId(e, t) {
   let n = e;
@@ -946,7 +949,7 @@ function createOwner(e) {
     F: t?.F ?? globalQueue,
     Ve: t?.Ve || defaultContext,
     ve: 0,
-    Se: null,
+    Te: null,
     de: null,
     J: t,
     dispose: disposeRootSelf
@@ -968,8 +971,8 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(() => n.dispose()));
 }
 function unlinkSubs(e) {
-  const t = e.Re;
-  const n = e.pe;
+  const t = e.pe;
+  const n = e.Re;
   const i = e.L;
   const r = e.Ge;
   if (i !== null) i.Ge = r;
@@ -987,12 +990,12 @@ function unlinkSubs(e) {
 }
 function trimStaleDeps(e) {
   const t = e.me;
-  let n = t !== null ? t.pe : e.Oe;
+  let n = t !== null ? t.Re : e.Oe;
   if (n !== null) {
     do {
       n = unlinkSubs(n);
     } while (n !== null);
-    if (t !== null) t.pe = null;
+    if (t !== null) t.Re = null;
     else e.Oe = null;
   }
 }
@@ -1008,15 +1011,15 @@ function unobserved(e) {
 }
 function link(e, t, n = false) {
   const i = t.me;
-  if (i !== null && i.Re === e) {
+  if (i !== null && i.pe === e) {
     i.ke = n;
     return;
   }
   let r = null;
   const o = t.W & REACTIVE_RECOMPUTING_DEPS;
   if (o) {
-    r = i !== null ? i.pe : t.Oe;
-    if (r !== null && r.Re === e) {
+    r = i !== null ? i.Re : t.Oe;
+    if (r !== null && r.pe === e) {
       r.We = t.He;
       t.me = r;
       r.ke = n;
@@ -1028,35 +1031,35 @@ function link(e, t, n = false) {
     s.ke = n;
     return;
   }
-  const u = (t.me = e.Fe = { Re: e, U: t, pe: r, Ge: s, L: null, We: t.He, ke: n });
-  if (i !== null) i.pe = u;
+  const u = (t.me = e.Fe = { pe: e, U: t, Re: r, Ge: s, L: null, We: t.He, ke: n });
+  if (i !== null) i.Re = u;
   else t.Oe = u;
   if (s !== null) s.L = u;
   else e.P = u;
 }
 function addPendingSource(e, t) {
-  if (e.Te === t || e._e?.has(t)) return false;
-  if (!e.Te) {
-    e.Te = t;
+  if (e.Se === t || e._e?.has(t)) return false;
+  if (!e.Se) {
+    e.Se = t;
     return true;
   }
   if (!e._e) {
-    e._e = new Set([e.Te, t]);
+    e._e = new Set([e.Se, t]);
   } else {
     e._e.add(t);
   }
-  e.Te = undefined;
+  e.Se = undefined;
   return true;
 }
 function removePendingSource(e, t) {
-  if (e.Te) {
-    if (e.Te !== t) return false;
-    e.Te = undefined;
+  if (e.Se) {
+    if (e.Se !== t) return false;
+    e.Se = undefined;
     return true;
   }
   if (!e._e?.delete(t)) return false;
   if (e._e.size === 1) {
-    e.Te = e._e.values().next().value;
+    e.Se = e._e.values().next().value;
     e._e = undefined;
   } else if (e._e.size === 0) {
     e._e = undefined;
@@ -1064,7 +1067,7 @@ function removePendingSource(e, t) {
   return true;
 }
 function clearPendingSources(e) {
-  e.Te = undefined;
+  e.Se = undefined;
   e._e?.clear();
   e._e = undefined;
 }
@@ -1108,7 +1111,7 @@ function settlePendingSource(e) {
     if (n.has(i) || !removePendingSource(i, e)) return;
     n.add(i);
     i.fe = clock;
-    const r = i.Te ?? i._e?.values().next().value;
+    const r = i.Se ?? i._e?.values().next().value;
     if (r) {
       setPendingError(i, r);
       updatePendingSignal(i);
@@ -1227,6 +1230,7 @@ function handleAsync(e, t, n) {
     const n = t[Symbol.asyncIterator]();
     let i = false;
     let r = false;
+    let s = true;
     cleanup(() => {
       if (r) return;
       r = true;
@@ -1236,41 +1240,59 @@ function handleAsync(e, t, n) {
       } catch {}
     });
     const iterate = () => {
-      let s,
-        u = false,
-        c = true;
+      let u,
+        c,
+        l = false,
+        a = false,
+        f = true;
       n.next().then(
         n => {
-          if (c) {
-            s = n;
-            u = true;
+          if (f) {
+            u = n;
+            l = true;
             if (n.done) r = true;
           } else if (e.be !== t) {
             return;
-          } else if (!n.done) asyncWrite(n.value, iterate);
-          else {
+          } else if (!n.done) {
+            i = true;
+            asyncWrite(n.value, iterate);
+          } else {
             r = true;
-            schedule();
-            flush();
+            if (i) {
+              schedule();
+              flush();
+            } else {
+              asyncWrite(undefined);
+            }
           }
         },
         n => {
-          if (!c && e.be === t) {
+          if (f) {
+            c = n;
+            a = true;
+          } else if (e.be === t) {
             r = true;
             handleError(n);
           }
         }
       );
-      c = false;
-      if (u && !s.done) {
-        o = s.value;
+      f = false;
+      if (a) {
+        r = true;
+        handleError(c);
+        if (s) throw c;
+        return true;
+      }
+      if (l && !u.done) {
+        o = u.value;
         i = true;
         return iterate();
       }
-      return u && s.done;
+      return l && u.done;
     };
-    const s = iterate();
-    if (!i && !s) {
+    const u = iterate();
+    s = false;
+    if (!i && !u) {
       globalQueue.initTransition(resolveTransition(e));
       throw new NotReadyError(context);
     }
@@ -1278,7 +1300,7 @@ function handleAsync(e, t, n) {
   return o;
 }
 function clearStatus(e, t = false) {
-  if (e.Te || e._e) clearPendingSources(e);
+  if (e.Se || e._e) clearPendingSources(e);
   if (e.Me) e.Me = false;
   e.Y = t ? 0 : e.Y & STATUS_UNINITIALIZED;
   if (e.ae) setPendingError(e);
@@ -1325,15 +1347,15 @@ function notifyStatus(e, t, n, i, r) {
   forEachDependent(e, (e, i) => {
     e.fe = clock;
     if (
-      (t === STATUS_PENDING && o && e.Te !== o && !e._e?.has(o)) ||
-      (t !== STATUS_PENDING && (e.ae !== n || e.Te || e._e))
+      (t === STATUS_PENDING && o && e.Se !== o && !e._e?.has(o)) ||
+      (t !== STATUS_PENDING && (e.ae !== n || e.Se || e._e))
     ) {
       if (i.ke && t !== STATUS_PENDING && !(n instanceof NotReadyError)) {
         enqueueForRerun(e);
         schedule();
         return;
       }
-      if (!l && !e.T) queuePendingNode(e);
+      if (!l && !e.S) queuePendingNode(e);
       notifyStatus(e, t, n, l, a);
     }
   });
@@ -1425,14 +1447,14 @@ function clearSnapshots() {
 function recompute(e, t = false) {
   const n = e.V;
   if (!t) {
-    if (e.T && (!n || activeTransition) && activeTransition !== e.T)
-      globalQueue.initTransition(e.T);
+    if (e.S && (!n || activeTransition) && activeTransition !== e.S)
+      globalQueue.initTransition(e.S);
     deleteFromHeap(e, e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     e.be = null;
-    if (e.T || n === EFFECT_TRACKED) disposeChildren(e);
+    if (e.S || n === EFFECT_TRACKED) disposeChildren(e);
     else if (e.ge !== null || e.Ue !== null) {
       markDisposal(e);
-      e.Se = e.Ue;
+      e.Te = e.Ue;
       e.de = e.ge;
       e.Ue = null;
       e.ge = null;
@@ -1458,8 +1480,8 @@ function recompute(e, t = false) {
     const t = resolveLane(e);
     if (t) currentOptimisticLane = t;
   } else if (activeTransition && !t && activeTransition.N.length) {
-    for (let t = e.Oe; t; t = t.pe) {
-      const n = t.Re;
+    for (let t = e.Oe; t; t = t.Re) {
+      const n = t.pe;
       if (n.W & REACTIVE_OPTIMISTIC_DIRTY) {
         const t = resolveLane(n);
         if (t) {
@@ -1534,7 +1556,7 @@ function recompute(e, t = false) {
     if (e.ae);
     else if (l) {
       const o = r ? e.O : undefined;
-      if (t || (n && activeTransition !== e.T) || i) {
+      if (t || (n && activeTransition !== e.S) || i) {
         e.Z = u;
         if (r && i) {
           e.O = u;
@@ -1542,7 +1564,7 @@ function recompute(e, t = false) {
         }
       } else {
         e.D = u;
-        if (activeTransition || e.T) syncCompanions(e, u);
+        if (activeTransition || e.S) syncCompanions(e, u);
       }
       if (!r || i || e.O !== o) insertSubs(e, i || r);
     } else if (r) {
@@ -1558,15 +1580,15 @@ function recompute(e, t = false) {
   const d =
     e.D !== NOT_PENDING ||
     e.de !== null ||
-    e.Se !== null ||
+    e.Te !== null ||
     !!(e.Y & (STATUS_PENDING | STATUS_UNINITIALIZED));
-  d && (!t || e.Y & STATUS_PENDING) && (!e.T || r) && queuePendingNode(e);
-  e.T && n && activeTransition !== e.T && runInTransition(e.T, () => recompute(e));
+  d && (!t || e.Y & STATUS_PENDING) && (!e.S || r) && queuePendingNode(e);
+  e.S && n && activeTransition !== e.S && runInTransition(e.S, () => recompute(e));
 }
 function updateIfNecessary(e) {
   if (e.W & REACTIVE_CHECK) {
-    for (let t = e.Oe; t; t = t.pe) {
-      const n = t.Re;
+    for (let t = e.Oe; t; t = t.Re) {
+      const n = t.pe;
       const i = n.Ie || n;
       if (i.ce) {
         updateIfNecessary(i);
@@ -1617,10 +1639,10 @@ function computed(e, t) {
     Y: STATUS_UNINITIALIZED,
     fe: clock,
     D: NOT_PENDING,
-    Se: null,
+    Te: null,
     de: null,
     be: null,
-    T: null
+    S: null
   };
   setupComputedNode(i, t);
   return i;
@@ -1659,10 +1681,10 @@ function createEffectNode(e, t, n, i, r, o) {
     Y: STATUS_UNINITIALIZED,
     fe: clock,
     D: NOT_PENDING,
-    Se: null,
+    Te: null,
     de: null,
     be: null,
-    T: null,
+    S: null,
     G: false,
     Ye: undefined,
     Ze: t,
@@ -1835,7 +1857,7 @@ function read(e) {
     }
   }
   if (r.Y & STATUS_PENDING) {
-    if (t && !(stale && r.T && activeTransition !== r.T)) {
+    if (t && !(stale && r.S && activeTransition !== r.S)) {
       if (currentOptimisticLane) {
         const n = r.i;
         const i = findLane(currentOptimisticLane);
@@ -1890,7 +1912,7 @@ function read(e) {
     (currentOptimisticLane !== null &&
       (e.O !== undefined || e.i || (r === e && stale && t.t !== e) || !!(r.Y & STATUS_PENDING))) ||
     e.D === NOT_PENDING ||
-    (stale && e.T && activeTransition !== e.T)
+    (stale && e.S && activeTransition !== e.S)
       ? e.Z
       : e.D;
   if (pendingCheckActive && pendingProbe !== null && e.D !== NOT_PENDING && o === e.D)
@@ -1908,7 +1930,7 @@ function read(e) {
   return o;
 }
 function setSignal(e, t) {
-  if (e.T && activeTransition !== e.T) globalQueue.initTransition(e.T);
+  if (e.S && activeTransition !== e.S) globalQueue.initTransition(e.S);
   const n = e.O !== undefined && !projectionWriteActive;
   const i = e.O !== undefined && e.O !== NOT_PENDING;
   const r = n ? (i ? e.O : e.Z) : e.D === NOT_PENDING ? e.Z : e.D;
@@ -2170,7 +2192,7 @@ function notifyEffectStatus(e, t) {
 function runEffect(e) {
   if (!e.G || e.W & REACTIVE_DISPOSED) return;
   if (e.Y & STATUS_ERROR && e.V === EFFECT_USER) {
-    const t = e.ae instanceof StatusError ? (e.ae.cause ?? e.ae) : e.ae;
+    const t = unwrapStatusError(e.ae);
     e.Ye = e.Z;
     e.G = false;
     try {
@@ -2259,22 +2281,22 @@ function action(e) {
       globalQueue.initTransition();
       let o = activeTransition;
       o.j.push(r);
-      const done = (e, t) => {
+      const done = (e, t, s = false) => {
         o = currentTransition(o);
-        const s = o.j.indexOf(r);
-        if (s >= 0) o.j.splice(s, 1);
+        const u = o.j.indexOf(r);
+        if (u >= 0) o.j.splice(u, 1);
         setActiveTransition(o);
         schedule();
-        t ? i(t) : n(e);
+        s ? i(t) : n(e);
       };
       const step = (e, t) => {
         let n;
         try {
           n = t ? r.throw(e) : r.next(e);
         } catch (e) {
-          return done(undefined, e);
+          return done(undefined, e, true);
         }
-        if (isThenable(n)) return void n.then(run, e => done(undefined, e));
+        if (isThenable(n)) return void n.then(run, e => done(undefined, e, true));
         run(n);
       };
       const run = e => {
@@ -2322,11 +2344,17 @@ function createReaction(e, t) {
   let n = undefined;
   cleanup(() => n?.());
   const i = getOwner();
-  return r => {
+  let r;
+  return o => {
+    if (r) {
+      dispose(r);
+      r = undefined;
+    }
     runWithOwner(i, () => {
       effect(
-        () => (r(), getOwner()),
+        () => (o(), (r = getOwner())),
         t => {
+          r = undefined;
           n?.();
           const i = (e.effect || e)?.();
           if (false && i !== undefined && typeof i !== "function");
@@ -2483,18 +2511,18 @@ function applyStateFast(e, t, n) {
     let o = false;
     const s = i.length;
     if (e.length && s && isWrappable(e[0]) && n(e[0]) != null) {
-      let u, c, l, a, f, E, d, S;
+      let u, c, l, a, f, E, d, T;
       for (l = 0, a = Math.min(s, e.length); l < a && keyedMatch((E = i[l]), e[l], n); l++) {
         isWrappable(E) && isWrappable(e[l]) && applyState(e[l], wrap(E, t), n);
       }
-      const T = new Array(e.length),
+      const S = new Array(e.length),
         _ = new Map();
       for (
         a = s - 1, f = e.length - 1;
         a >= l && f >= l && keyedMatch((E = i[a]), e[f], n);
         a--, f--
       ) {
-        T[f] = E;
+        S[f] = E;
       }
       if (l > f || l > a) {
         for (c = l; c <= f; c++) {
@@ -2503,7 +2531,7 @@ function applyStateFast(e, t, n) {
         }
         for (; c < e.length; c++) {
           o = true;
-          applyArrayItem(e[c], T[c], t, r?.[c], n);
+          applyArrayItem(e[c], S[c], t, r?.[c], n);
         }
         syncArrayNodeMembership(t, e);
         (o || s !== e.length) && notifySelf(t);
@@ -2513,24 +2541,24 @@ function applyStateFast(e, t, n) {
       d = new Array(f + 1);
       for (c = f; c >= l; c--) {
         E = e[c];
-        S = itemKey(E, n);
-        u = _.get(S);
+        T = itemKey(E, n);
+        u = _.get(T);
         d[c] = u === undefined ? -1 : u;
-        _.set(S, c);
+        _.set(T, c);
       }
       for (u = l; u <= a; u++) {
         E = i[u];
-        S = itemKey(E, n);
-        c = _.get(S);
+        T = itemKey(E, n);
+        c = _.get(T);
         if (c !== undefined && c !== -1) {
-          T[c] = E;
+          S[c] = E;
           c = d[c];
-          _.set(S, c);
+          _.set(T, c);
         }
       }
       for (c = l; c < e.length; c++) {
-        if (c in T) {
-          applyArrayItem(e[c], T[c], t, r?.[c], n);
+        if (c in S) {
+          applyArrayItem(e[c], S[c], t, r?.[c], n);
         } else r?.[c] && setSignal(r[c], wrapValue(e[c], t));
       }
       if (l < e.length) o = true;
@@ -2594,22 +2622,22 @@ function applyStateSlow(e, t, n) {
     let u = false;
     const c = getOverrideValue(i, r, "length", o);
     if (e.length && c && isWrappable(e[0]) && n(e[0]) != null) {
-      let l, a, f, E, d, S, T, _;
+      let l, a, f, E, d, T, S, _;
       for (
         f = 0, E = Math.min(c, e.length);
-        f < E && keyedMatch((S = getOverrideValue(i, r, f, o)), e[f], n);
+        f < E && keyedMatch((T = getOverrideValue(i, r, f, o)), e[f], n);
         f++
       ) {
-        isWrappable(S) && isWrappable(e[f]) && applyState(e[f], wrap(S, t), n);
+        isWrappable(T) && isWrappable(e[f]) && applyState(e[f], wrap(T, t), n);
       }
       const O = new Array(e.length),
-        p = new Map();
+        R = new Map();
       for (
         E = c - 1, d = e.length - 1;
-        E >= f && d >= f && keyedMatch((S = getOverrideValue(i, r, E, o)), e[d], n);
+        E >= f && d >= f && keyedMatch((T = getOverrideValue(i, r, E, o)), e[d], n);
         E--, d--
       ) {
-        O[d] = S;
+        O[d] = T;
       }
       if (f > d || f > E) {
         for (a = f; a <= d; a++) {
@@ -2626,22 +2654,22 @@ function applyStateSlow(e, t, n) {
         c !== i && s?.length && setSignal(s.length, i);
         return;
       }
-      T = new Array(d + 1);
+      S = new Array(d + 1);
       for (a = d; a >= f; a--) {
-        S = e[a];
-        _ = itemKey(S, n);
-        l = p.get(_);
-        T[a] = l === undefined ? -1 : l;
-        p.set(_, a);
+        T = e[a];
+        _ = itemKey(T, n);
+        l = R.get(_);
+        S[a] = l === undefined ? -1 : l;
+        R.set(_, a);
       }
       for (l = f; l <= E; l++) {
-        S = getOverrideValue(i, r, l, o);
-        _ = itemKey(S, n);
-        a = p.get(_);
+        T = getOverrideValue(i, r, l, o);
+        _ = itemKey(T, n);
+        a = R.get(_);
         if (a !== undefined && a !== -1) {
-          O[a] = S;
-          a = T[a];
-          p.set(_, a);
+          O[a] = T;
+          a = S[a];
+          R.set(_, a);
         }
       }
       for (a = f; a < e.length; a++) {
@@ -2958,10 +2986,17 @@ function getNode(e, t, n, i, r = isEqual, o, s) {
   return (e[t] = u);
 }
 function trackSelf(e, t = $TRACK) {
-  getObserver() &&
-    read(
-      getNode(getNodes(e, STORE_NODE), t, undefined, e[STORE_FIREWALL], false, e[STORE_OPTIMISTIC])
-    );
+  if (!getObserver()) return;
+  read(
+    getNode(getNodes(e, STORE_NODE), t, undefined, e[STORE_FIREWALL], false, e[STORE_OPTIMISTIC])
+  );
+  if (
+    t === $TRACK &&
+    !e[STORE_OVERRIDE] &&
+    !e[STORE_OPTIMISTIC_OVERRIDE] &&
+    e[STORE_VALUE][$TARGET]
+  )
+    e[STORE_VALUE][$TRACK];
 }
 function notifySelf(e) {
   const t = e[STORE_NODE]?.[$TRACK];
@@ -3009,8 +3044,8 @@ function maskStoreTarget(e, t) {
 function prepareStoreWrite(e, t, n) {
   if (e[STORE_OPTIMISTIC]) {
     const t = e[STORE_FIREWALL];
-    if (t?.T) {
-      globalQueue.initTransition(t.T);
+    if (t?.S) {
+      globalQueue.initTransition(t.S);
     }
   }
   const i = e[STORE_VALUE];
@@ -3178,10 +3213,12 @@ const storeTraps = {
         const c = u ? u[t] : r;
         const l = u ? u[t] !== $DELETED : t in e[STORE_VALUE];
         const a = unwrapStoreValue(n);
-        const f = Array.isArray(s) && t !== "length" && typeof t !== "symbol";
-        const E = f ? parseInt(t) + 1 : 0;
-        const d = f && (getOverlayLayer(e, "length") ?? s).length;
-        const S = f && E > d ? E : undefined;
+        const f = typeof t === "string" ? Number(t) : -1;
+        const E =
+          Array.isArray(s) && Number.isInteger(f) && f >= 0 && f < 4294967295 && String(f) === t;
+        const d = E ? f + 1 : 0;
+        const T = E && (getOverlayLayer(e, "length") ?? s).length;
+        const S = E && d > T ? d : undefined;
         if (c === a && S === undefined) return true;
         armOptimisticStoreWrite(e, i);
         if (a !== undefined && a === r && S === undefined) delete e[o]?.[t];
@@ -3212,7 +3249,7 @@ const storeTraps = {
           if (t.length) {
             setSignal(t.length, S);
           } else if (!projectionWriteActive && !e[STORE_OPTIMISTIC]) {
-            const n = upsertStoreNode(e, t, "length", d, e[STORE_SNAPSHOT_PROPS]);
+            const n = upsertStoreNode(e, t, "length", T, e[STORE_SNAPSHOT_PROPS]);
             setSignal(n, S);
           }
         }
@@ -3805,8 +3842,8 @@ function updateKeyedMap() {
         f,
         E = new Array(t),
         d = new Array(t),
-        S = this.ot ? new Array(t) : undefined,
-        T = this.st ? new Array(t) : undefined;
+        T = this.ot ? new Array(t) : undefined,
+        S = this.st ? new Array(t) : undefined;
       for (
         o = 0, s = Math.min(this.Xe, t);
         o < s && (this.et[o] === e[o] || (this.ot && compare(this.rt, this.et[o], e[o])));
@@ -3823,8 +3860,8 @@ function updateKeyedMap() {
       ) {
         E[u] = this.nt[s];
         d[u] = this.it[s];
-        S && (S[u] = this.ot[s]);
-        T && (T[u] = this.st[s]);
+        T && (T[u] = this.ot[s]);
+        S && (S[u] = this.st[s]);
       }
       a = new Map();
       f = new Array(u + 1);
@@ -3842,8 +3879,8 @@ function updateKeyedMap() {
         if (i !== undefined && i !== -1) {
           E[i] = this.nt[n];
           d[i] = this.it[n];
-          S && (S[i] = this.ot[n]);
-          T && (T[i] = this.st[n]);
+          T && (T[i] = this.ot[n]);
+          S && (S[i] = this.st[n]);
           i = f[i];
           a.set(l, i);
         } else this.it[n].dispose();
@@ -3852,12 +3889,12 @@ function updateKeyedMap() {
         if (i in E) {
           this.nt[i] = E[i];
           this.it[i] = d[i];
-          if (S) {
-            this.ot[i] = S[i];
+          if (T) {
+            this.ot[i] = T[i];
             setSignal(this.ot[i], e[i]);
           }
-          if (T) {
-            this.st[i] = T[i];
+          if (S) {
+            this.st[i] = S[i];
             setSignal(this.st[i], i);
           }
         } else {
@@ -3985,7 +4022,7 @@ function isRevealController(e) {
   return e instanceof RevealController;
 }
 function isSlotReady(e) {
-  return isRevealController(e) ? e.isReady() : e.St.size === 0 && !e.Tt;
+  return isRevealController(e) ? e.isReady() : e.Tt.size === 0 && !e.St;
 }
 function isSlotMinimallyReady(e) {
   return isRevealController(e) ? e.isMinimallyReady() : isSlotReady(e);
@@ -4108,9 +4145,9 @@ class RevealController {
 }
 class CollectionQueue extends Queue {
   bt;
-  St = new Set();
+  Tt = new Set();
   vt;
-  Tt = true;
+  St = true;
   _t = signal(false, { ownedWrite: true, Ke: true });
   ae;
   Ot = signal(false, { ownedWrite: true, Ke: true });
@@ -4139,22 +4176,19 @@ class CollectionQueue extends Queue {
       if (e !== this.Lt) {
         this.Lt = e;
         this.ht = false;
-        this.St.clear();
+        this.Tt.clear();
       }
     }
-    if (this.bt & STATUS_PENDING && n & STATUS_ERROR) {
-      return super.notify(e, STATUS_ERROR, n, i);
-    }
     if (this.bt & STATUS_PENDING && this.ht) return super.notify(e, t, n, i);
     if (n & this.bt) {
-      this.Tt = true;
+      this.St = true;
       const t = i?.source || e.ae?.source;
       if (t) {
-        const e = this.St.size === 0;
-        this.St.add(t);
+        const e = this.Tt.size === 0;
+        this.Tt.add(t);
         if (e) setSignal(this._t, true);
         if (this.bt & STATUS_ERROR) {
-          setSignal(this.ae, t.ae?.cause ?? t.ae);
+          setSignal(this.ae, unwrapStatusError(t.ae));
         }
       }
     }
@@ -4162,20 +4196,20 @@ class CollectionQueue extends Queue {
     return t ? super.notify(e, t, n, i) : true;
   }
   checkSources() {
-    for (const e of this.St) {
+    for (const e of this.Tt) {
       if (
         e.W & REACTIVE_DISPOSED ||
         (!(e.Y & this.bt) && !(this.bt & STATUS_ERROR && e.Y & STATUS_PENDING))
       )
-        this.St.delete(e);
+        this.Tt.delete(e);
     }
-    if (!this.St.size) {
-      if (this.bt & STATUS_PENDING && this.Tt && !this.ht && this.vt) {
-        this.Tt = !!(this.vt.Y & this.bt);
+    if (!this.Tt.size) {
+      if (this.bt & STATUS_PENDING && this.St && !this.ht && this.vt) {
+        this.St = !!(this.vt.Y & this.bt);
       } else {
-        this.Tt = false;
+        this.St = false;
       }
-      if (!this.Tt) {
+      if (!this.St) {
         setSignal(this._t, false);
         if (this.wt) {
           try {
@@ -4202,7 +4236,7 @@ function createCollectionBoundary(e, t, n, i) {
       if (e instanceof NotReadyError) t = true;
       else throw e;
     }
-    o.Tt = t || !!(s.Y & e) || s.ae instanceof NotReadyError;
+    o.St = t || !!(s.Y & e) || s.ae instanceof NotReadyError;
   });
   const u = _revealUsed && e === STATUS_PENDING ? getContext(RevealControllerContext) : null;
   if (u) {
@@ -4230,7 +4264,7 @@ function createLoadingBoundary(e, t, n) {
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(STATUS_ERROR, e, e =>
     t(accessor(e.ae), () => {
-      for (const t of e.St) recompute(t);
+      for (const t of e.Tt) recompute(t);
       schedule();
     })
   );