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

package/dist/prod.js

@@ -172,7 +172,7 @@ function getOrCreateLane(e) {
   }
   const n = e.U;
   const i = n?.G ? findLane(n.G) : null;
-  t = { F: e, k: new Set(), W: [[], []], H: null, M: activeTransition, j: i };
+  t = { k: e, F: new Set(), W: [[], []], H: null, M: activeTransition, j: i };
   signalLanes.set(e, t);
   activeLanes.add(t);
   e.$ = false;
@@ -187,7 +187,7 @@ function mergeLanes(e, t) {
   t = findLane(t);
   if (e === t) return e;
   t.H = e;
-  for (const n of t.k) e.k.add(n);
+  for (const n of t.F) e.F.add(n);
   e.W[0].push(...t.W[0]);
   e.W[1].push(...t.W[1]);
   return e;
@@ -269,7 +269,7 @@ function shouldReadStashedOptimisticValue(e) {
 }
 function runLaneEffects(e) {
   for (const t of activeLanes) {
-    if (t.H || t.k.size > 0) continue;
+    if (t.H || t.F.size > 0) continue;
     const n = t.W[e - 1];
     if (n.length) {
       t.W[e - 1] = [];
@@ -332,22 +332,22 @@ function cleanupCompletedLanes(e) {
       if (t.W[0].length) runQueue(t.W[0], EFFECT_RENDER);
       if (t.W[1].length) runQueue(t.W[1], EFFECT_USER);
     }
-    if (t.F.G === t) t.F.G = undefined;
-    t.k.clear();
+    if (t.k.G === t) t.k.G = undefined;
+    t.F.clear();
     t.W[0].length = 0;
     t.W[1].length = 0;
     activeLanes.delete(t);
-    signalLanes.delete(t.F);
+    signalLanes.delete(t.k);
   }
 }
 function schedule() {
   if (scheduled) return;
   scheduled = true;
-  if (!syncDepth && !globalQueue.le && !projectionWriteActive) queueMicrotask(flush);
+  if (!syncDepth && !globalQueue.ce && !projectionWriteActive) queueMicrotask(flush);
 }
 class Queue {
   i = null;
-  ce = [[], []];
+  le = [[], []];
   Y = [];
   created = clock;
   addChild(e) {
@@ -366,9 +366,9 @@ class Queue {
     return false;
   }
   run(e) {
-    if (this.ce[e - 1].length) {
-      const t = this.ce[e - 1];
-      this.ce[e - 1] = [];
+    if (this.le[e - 1].length) {
+      const t = this.le[e - 1];
+      this.le[e - 1] = [];
       runQueue(t, e);
     }
     for (let t = 0; t < this.Y.length; t++) this.Y[t].run?.(e);
@@ -379,28 +379,28 @@ class Queue {
         const n = findLane(currentOptimisticLane);
         n.W[e - 1].push(t);
       } else {
-        this.ce[e - 1].push(t);
+        this.le[e - 1].push(t);
       }
     }
     schedule();
   }
   stashQueues(e) {
-    e.ce[0].push(...this.ce[0]);
-    e.ce[1].push(...this.ce[1]);
-    this.ce = [[], []];
+    e.le[0].push(...this.le[0]);
+    e.le[1].push(...this.le[1]);
+    this.le = [[], []];
     for (let t = 0; t < this.Y.length; t++) {
       let n = this.Y[t];
       let i = e.Y[t];
       if (!i) {
-        i = { ce: [[], []], Y: [] };
+        i = { le: [[], []], Y: [] };
         e.Y[t] = i;
       }
       n.stashQueues(i);
     }
   }
   restoreQueues(e) {
-    this.ce[0].push(...e.ce[0]);
-    this.ce[1].push(...e.ce[1]);
+    this.le[0].push(...e.le[0]);
+    this.le[1].push(...e.le[1]);
     for (let t = 0; t < e.Y.length; t++) {
       const n = e.Y[t];
       let i = this.Y[t];
@@ -409,7 +409,7 @@ class Queue {
   }
 }
 class GlobalQueue extends Queue {
-  le = false;
+  ce = false;
   ae = null;
   fe = [];
   Z = [];
@@ -419,8 +419,8 @@ class GlobalQueue extends Queue {
   static Te;
   static de = null;
   flush() {
-    if (this.le) return;
-    this.le = true;
+    if (this.ce) return;
+    this.ce = true;
     try {
       runHeap(dirtyQueue, GlobalQueue.Ee);
       if (activeTransition) {
@@ -482,7 +482,7 @@ class GlobalQueue extends Queue {
       this.run(EFFECT_USER);
       if (false);
     } finally {
-      this.le = false;
+      this.ce = false;
     }
   }
   notify(e, t, n, i) {
@@ -514,7 +514,7 @@ class GlobalQueue extends Queue {
         Z: [],
         q: new Set(),
         re: [],
-        Oe: { ce: [[], []], Y: [] },
+        Oe: { le: [[], []], Y: [] },
         ie: false,
         oe: new Set()
       };
@@ -691,7 +691,7 @@ function flush(e) {
       syncDepth--;
     }
   }
-  if (globalQueue.le) {
+  if (globalQueue.ce) {
     return;
   }
   while (scheduled || activeTransition) {
@@ -816,17 +816,17 @@ function disposeChildren(e, t = false, n) {
     e.me = 0;
   }
   if (t && !n && !(i & REACTIVE_ZOMBIE) && e.i !== null && !(e.i._ & REACTIVE_DISPOSED)) {
-    const t = e.be;
+    const t = e.we;
     const n = e.De;
     if (t !== null) t.De = n;
     else e.i.ge = n;
-    if (n !== null) n.be = t;
-    e.be = null;
+    if (n !== null) n.we = t;
+    e.we = null;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.Ae : e.we;
+  let n = t ? e.Ae : e.be;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -836,7 +836,7 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.Ae = null) : (e.we = null);
+  t ? (e.Ae = null) : (e.be = null);
 }
 function childId(e, t) {
   let n = e;
@@ -864,9 +864,9 @@ function getOwner() {
 }
 function cleanup(e) {
   if (!context) return e;
-  if (!context.we) context.we = e;
-  else if (Array.isArray(context.we)) context.we.push(e);
-  else context.we = [context.we, e];
+  if (!context.be) context.be = e;
+  else if (Array.isArray(context.be)) context.be.push(e);
+  else context.be = [context.be, e];
   return e;
 }
 function isDisposed(e) {
@@ -885,8 +885,8 @@ function createOwner(e) {
     u: t?.t ? t.u : t,
     ge: null,
     De: null,
-    be: null,
     we: null,
+    be: null,
     te: t?.te ?? globalQueue,
     Ve: t?.Ve || defaultContext,
     me: 0,
@@ -901,7 +901,7 @@ function createOwner(e) {
       t.ge = i;
     } else {
       i.De = e;
-      e.be = i;
+      e.we = i;
       t.ge = i;
     }
   }
@@ -1101,7 +1101,7 @@ function handleAsync(e, t, n) {
     trimStaleDeps(e);
     clearStatus(e);
     const o = resolveLane(e);
-    if (o) o.k.delete(e);
+    if (o) o.F.delete(e);
     if (n) n(i);
     else if (e.K !== undefined) {
       if (e.K !== undefined && e.K !== NOT_PENDING) e.B = i;
@@ -1113,12 +1113,12 @@ function handleAsync(e, t, n) {
     } else if (o) {
       const t = e.J;
       const n = e.ue;
-      const r = e.Fe;
+      const r = e.ke;
       if ((!t && s) || !r || !r(i, n)) {
         e.ue = i;
         e.Ie = clock;
-        if (e.ke) {
-          setSignal(e.ke, i);
+        if (e.Fe) {
+          setSignal(e.Fe, i);
         }
         insertSubs(e, true);
       }
@@ -1167,10 +1167,10 @@ function handleAsync(e, t, n) {
     const iterate = () => {
       let o,
         u = false,
-        l = true;
+        c = true;
       n.next().then(
         n => {
-          if (l) {
+          if (c) {
             o = n;
             u = true;
             if (n.done) r = true;
@@ -1184,13 +1184,13 @@ function handleAsync(e, t, n) {
           }
         },
         n => {
-          if (!l && e.ve === t) {
+          if (!c && e.ve === t) {
             r = true;
             handleError(n);
           }
         }
       );
-      l = false;
+      c = false;
       if (u && !o.done) {
         s = o.value;
         i = true;
@@ -1220,7 +1220,7 @@ function notifyStatus(e, t, n, i, r) {
   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 l = u && hasActiveOverride(e);
+  const c = u && hasActiveOverride(e);
   if (!i) {
     if (t === STATUS_PENDING && s) {
       addPendingSource(e, s);
@@ -1236,13 +1236,13 @@ function notifyStatus(e, t, n, i, r) {
   if (r && !i) {
     assignOrMergeLane(e, r);
   }
-  const c = i || l;
+  const l = i || c;
   const a = i || u ? undefined : r;
   if (e.xe) {
     if (i && t === STATUS_PENDING) {
       return;
     }
-    if (c) {
+    if (l) {
       e.xe(t, n);
     } else {
       e.xe();
@@ -1255,8 +1255,8 @@ function notifyStatus(e, t, n, i, r) {
       (t === STATUS_PENDING && s && e.Ce !== s && !e.Pe?.has(s)) ||
       (t !== STATUS_PENDING && (e.Re !== n || e.Ce || e.Pe))
     ) {
-      if (!c && !e.M) queuePendingNode(e);
-      notifyStatus(e, t, n, c, a);
+      if (!l && !e.M) queuePendingNode(e);
+      notifyStatus(e, t, n, l, a);
     }
   });
 }
@@ -1293,6 +1293,7 @@ let foundPending = false;
 let latestReadActive = false;
 let context = null;
 let currentOptimisticLane = null;
+let pendingCheckLoadingPath = false;
 let snapshotCaptureActive = false;
 let snapshotSources = null;
 function ownerInSnapshotScope(e) {
@@ -1353,11 +1354,11 @@ function recompute(e, t = false) {
     deleteFromHeap(e, e._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     e.ve = null;
     if (e.M || n === EFFECT_TRACKED) disposeChildren(e);
-    else if (e.ge !== null || e.we !== null) {
+    else if (e.ge !== null || e.be !== null) {
       markDisposal(e);
-      e.Ae = e.we;
+      e.Ae = e.be;
       e.Ne = e.ge;
-      e.we = null;
+      e.be = null;
       e.ge = null;
       e.me = 0;
     } else;
@@ -1371,8 +1372,8 @@ function recompute(e, t = false) {
   e.ye = null;
   e._ = REACTIVE_RECOMPUTING_DEPS;
   e.Ie = clock;
-  let l = e.B === NOT_PENDING ? e.ue : e.B;
-  let c = e.o;
+  let c = e.B === NOT_PENDING ? e.ue : e.B;
+  let l = e.o;
   let a = tracking;
   let f = currentOptimisticLane;
   tracking = true;
@@ -1399,31 +1400,31 @@ function recompute(e, t = false) {
   if (E) stale = true;
   try {
     if (!false && e._e & CONFIG_SYNC) {
-      l = e.L(l);
+      c = e.L(c);
       e.ve = null;
     } else {
       const t = e.ve;
-      const n = e.L(l);
+      const n = e.L(c);
       const i = typeof n === "object" && n !== null;
       const r = e.ve !== t;
-      l = r || !i ? n : handleAsync(e, n);
+      c = r || !i ? n : handleAsync(e, n);
       if (!r && !i) e.ve = null;
     }
     clearStatus(e, t);
     if (e.G) {
       const t = resolveLane(e);
       if (t) {
-        t.k.delete(e);
-        updatePendingSignal(t.F);
+        t.F.delete(e);
+        updatePendingSignal(t.k);
       }
     }
   } catch (t) {
     if (t instanceof NotReadyError && currentOptimisticLane) {
       const t = findLane(currentOptimisticLane);
-      if (t.F !== e) {
-        t.k.add(e);
+      if (t.k !== e) {
+        t.F.add(e);
         e.G = t;
-        updatePendingSignal(t.F);
+        updatePendingSignal(t.k);
       }
     }
     if (t instanceof NotReadyError) e.Ge = true;
@@ -1443,7 +1444,7 @@ function recompute(e, t = false) {
   if (!e.Re) {
     trimStaleDeps(e);
     const u = r ? e.K : e.B === NOT_PENDING ? e.ue : e.B;
-    const a = (!n && o) || !e.Fe || !e.Fe(u, l);
+    const a = (!n && o) || !e.ke || !e.ke(u, c);
     if (n && a) {
       e.ee = !e.Re;
       if (!t) e.te.enqueue(n, GlobalQueue.Te.bind(null, e));
@@ -1451,17 +1452,17 @@ function recompute(e, t = false) {
     if (a) {
       const o = r ? e.K : undefined;
       if (t || (n && activeTransition !== e.M) || i) {
-        e.ue = l;
+        e.ue = c;
         if (r && i) {
-          e.K = l;
-          e.B = l;
+          e.K = c;
+          e.B = c;
         }
-      } else e.B = l;
-      if (r && !i && s && !e.$) e.K = l;
+      } else e.B = c;
+      if (r && !i && s && !e.$) e.K = c;
       if (!r || i || e.K !== o) insertSubs(e, i || r);
     } else if (r) {
-      e.B = l;
-    } else if (e.o != c) {
+      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);
       }
@@ -1504,9 +1505,9 @@ function computed(e, t) {
       (!context || t?.lazy ? CONFIG_AUTO_DISPOSE : 0) |
       (t?.sync ? CONFIG_SYNC : 0) |
       (snapshotCaptureActive && ownerInSnapshotScope(context) ? CONFIG_IN_SNAPSHOT_SCOPE : 0),
-    Fe: t?.equals != null ? t.equals : isEqual,
+    ke: t?.equals != null ? t.equals : isEqual,
     X: t?.unobserved,
-    we: null,
+    be: null,
     te: context?.te ?? globalQueue,
     Ve: context?.Ve ?? defaultContext,
     me: 0,
@@ -1522,7 +1523,7 @@ function computed(e, t) {
     Ue: null,
     i: context,
     De: null,
-    be: null,
+    we: null,
     ge: null,
     _: t?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
     he: STATUS_UNINITIALIZED,
@@ -1545,9 +1546,9 @@ function createEffectNode(e, t, n, i, r, s) {
       (s?.ownedWrite ? CONFIG_OWNED_WRITE : 0) |
       (s?.sync ? CONFIG_SYNC : 0) |
       (snapshotCaptureActive && ownerInSnapshotScope(context) ? CONFIG_IN_SNAPSHOT_SCOPE : 0),
-    Fe: false,
+    ke: false,
     X: s?.unobserved,
-    we: null,
+    be: null,
     te: context?.te ?? globalQueue,
     Ve: context?.Ve ?? defaultContext,
     me: 0,
@@ -1563,7 +1564,7 @@ function createEffectNode(e, t, n, i, r, s) {
     Ue: null,
     i: context,
     De: null,
-    be: null,
+    we: null,
     ge: null,
     _: REACTIVE_LAZY,
     he: STATUS_UNINITIALIZED,
@@ -1595,7 +1596,7 @@ function setupComputedNode(e, t) {
       context.ge = e;
     } else {
       e.De = t;
-      t.be = e;
+      t.we = e;
       context.ge = e;
     }
   }
@@ -1621,7 +1622,7 @@ function setupComputedNode(e, t) {
 }
 function signal(e, t, n = null) {
   const i = {
-    Fe: t?.equals != null ? t.equals : isEqual,
+    ke: t?.equals != null ? t.equals : isEqual,
     _e: (t?.ownedWrite ? CONFIG_OWNED_WRITE : 0) | (t?.Ye ? CONFIG_NO_SNAPSHOT : 0),
     X: t?.unobserved,
     ue: e,
@@ -1682,7 +1683,7 @@ function read(e) {
     if (stale && currentOptimisticLane && t.G) {
       const e = findLane(t.G);
       const n = findLane(currentOptimisticLane);
-      if (e !== n && e.k.size > 0) {
+      if (e !== n && e.F.size > 0) {
         return i;
       }
     }
@@ -1692,6 +1693,14 @@ 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);
+      pendingCheckActive = n;
+      throw i.Re;
+    }
     if (t && e.K !== undefined) {
       if (e.K !== NOT_PENDING && (t.ve || !!(t.he & STATUS_PENDING))) {
         foundPending = true;
@@ -1826,7 +1835,7 @@ 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.Fe || !e.Fe(r, t) || !!(e.he & STATUS_UNINITIALIZED);
+  const s = !e.ke || !e.ke(r, t) || !!(e.he & STATUS_UNINITIALIZED);
   if (!s) {
     if (n && i && e.L) {
       insertSubs(e, true);
@@ -1850,8 +1859,8 @@ function setSignal(e, t) {
     e.B = t;
   }
   if (e.We) updatePendingSignal(e);
-  if (e.ke) {
-    setSignal(e.ke, t);
+  if (e.Fe) {
+    setSignal(e.Fe, t);
   }
   e.Ie = clock;
   insertSubs(e, n);
@@ -1900,7 +1909,7 @@ function computePendingState(e) {
     if (t.he & STATUS_PENDING && !(t.he & STATUS_UNINITIALIZED)) return true;
     if (e.U) {
       const t = e.G ? findLane(e.G) : null;
-      return !!(t && t.k.size > 0);
+      return !!(t && t.F.size > 0);
     }
     return true;
   }
@@ -1917,7 +1926,7 @@ function updatePendingSignal(e) {
     setSignal(n, t);
     if (!t && n.G) {
       const t = resolveLane(e);
-      if (t && t.k.size > 0) {
+      if (t && t.F.size > 0) {
         const e = findLane(n.G);
         if (e !== t) {
           mergeLanes(t, e);
@@ -1929,20 +1938,20 @@ function updatePendingSignal(e) {
   }
 }
 function getLatestValueComputed(e) {
-  if (!e.ke) {
+  if (!e.Fe) {
     const t = latestReadActive;
     latestReadActive = false;
     const n = pendingCheckActive;
     pendingCheckActive = false;
     const i = context;
     context = null;
-    e.ke = optimisticComputed(() => read(e));
-    e.ke.U = e;
+    e.Fe = optimisticComputed(() => read(e));
+    e.Fe.U = e;
     context = i;
     pendingCheckActive = n;
     latestReadActive = t;
   }
-  return e.ke;
+  return e.Fe;
 }
 function staleValues(e, t = true) {
   const n = stale;
@@ -1962,19 +1971,24 @@ function latest(e) {
     latestReadActive = t;
   }
 }
-function isPending(e) {
-  const t = pendingCheckActive;
-  const n = foundPending;
+function isPending(e, t) {
+  const n = pendingCheckActive;
+  const i = pendingCheckLoadingPath;
+  const r = foundPending;
+  const s = t === true;
   pendingCheckActive = true;
+  pendingCheckLoadingPath = s;
   foundPending = false;
   try {
     e();
     return foundPending;
-  } catch {
+  } catch (e) {
+    if (s && e instanceof NotReadyError) throw e;
     return foundPending;
   } finally {
-    pendingCheckActive = t;
-    foundPending = n;
+    pendingCheckActive = n;
+    pendingCheckLoadingPath = i;
+    foundPending = r;
   }
 }
 function refresh(e) {
@@ -2266,25 +2280,25 @@ function applyStateFast(e, t, n) {
     let r = false;
     const s = i.length;
     if (e.length && s && e[0] && n(e[0]) != null) {
-      let o, u, l, c, a, f, E, S;
+      let o, u, c, l, a, f, E, S;
       for (
-        l = 0, c = Math.min(s, e.length);
-        l < c && ((f = i[l]) === e[l] || (f && e[l] && n(f) === n(e[l])));
-        l++
+        c = 0, l = Math.min(s, e.length);
+        c < l && ((f = i[c]) === e[c] || (f && e[c] && n(f) === n(e[c])));
+        c++
       ) {
-        applyState(e[l], wrap(f, t), n);
+        applyState(e[c], wrap(f, t), n);
       }
       const T = new Array(e.length),
         d = new Map();
       for (
-        c = s - 1, a = e.length - 1;
-        c >= l && a >= l && ((f = i[c]) === e[a] || (f && e[a] && n(f) === n(e[a])));
-        c--, a--
+        l = s - 1, a = e.length - 1;
+        l >= c && a >= c && ((f = i[l]) === e[a] || (f && e[a] && n(f) === n(e[a])));
+        l--, a--
       ) {
         T[a] = f;
       }
-      if (l > a || l > c) {
-        for (u = l; u <= a; u++) {
+      if (c > a || c > l) {
+        for (u = c; u <= a; u++) {
           r = true;
           t[STORE_NODE][u] && setSignal(t[STORE_NODE][u], wrap(e[u], t));
         }
@@ -2299,14 +2313,14 @@ function applyStateFast(e, t, n) {
         return;
       }
       E = new Array(a + 1);
-      for (u = a; u >= l; u--) {
+      for (u = a; u >= c; u--) {
         f = e[u];
         S = f ? n(f) : f;
         o = d.get(S);
         E[u] = o === undefined ? -1 : o;
         d.set(S, u);
       }
-      for (o = l; o <= c; o++) {
+      for (o = c; o <= l; o++) {
         f = i[o];
         S = f ? n(f) : f;
         u = d.get(S);
@@ -2316,14 +2330,14 @@ function applyStateFast(e, t, n) {
           d.set(S, u);
         }
       }
-      for (u = l; u < e.length; u++) {
+      for (u = c; u < e.length; u++) {
         if (u in T) {
           const i = wrap(T[u], t);
           t[STORE_NODE][u] && setSignal(t[STORE_NODE][u], i);
           applyState(e[u], i, n);
         } else t[STORE_NODE][u] && setSignal(t[STORE_NODE][u], wrap(e[u], t));
       }
-      if (l < e.length) r = true;
+      if (c < e.length) r = true;
     } else if (e.length) {
       for (let r = 0, s = e.length; r < s; r++) {
         const s = i[r];
@@ -2343,15 +2357,15 @@ function applyStateFast(e, t, n) {
   if (r) {
     const s = r[$TRACK];
     const o = s ? getAllKeys(i, undefined, e) : Object.keys(r);
-    for (let u = 0, l = o.length; u < l; u++) {
-      const l = o[u];
-      const c = r[l];
-      const a = unwrap(i[l]);
-      let f = unwrap(e[l]);
+    for (let u = 0, c = o.length; u < c; u++) {
+      const c = o[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);
-        c && setSignal(c, isWrappable(f) ? wrap(f, t) : f);
+        l && setSignal(l, isWrappable(f) ? wrap(f, t) : f);
       } else applyState(f, wrap(a, t), n);
     }
   }
@@ -2375,7 +2389,7 @@ function applyStateSlow(e, t, n) {
     let o = false;
     const u = getOverrideValue(i, r, "length", s);
     if (e.length && u && e[0] && n(e[0]) != null) {
-      let l, c, a, f, E, S, T, d;
+      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])));
@@ -2395,44 +2409,44 @@ function applyStateSlow(e, t, n) {
         O[E] = S;
       }
       if (a > E || a > f) {
-        for (c = a; c <= E; c++) {
+        for (l = a; l <= E; l++) {
           o = true;
-          t[STORE_NODE][c] && setSignal(t[STORE_NODE][c], wrap(e[c], t));
+          t[STORE_NODE][l] && setSignal(t[STORE_NODE][l], wrap(e[l], t));
         }
-        for (; c < e.length; c++) {
+        for (; l < e.length; l++) {
           o = true;
-          const i = wrap(O[c], t);
-          t[STORE_NODE][c] && setSignal(t[STORE_NODE][c], i);
-          applyState(e[c], i, n);
+          const i = wrap(O[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);
         u !== e.length && t[STORE_NODE].length && setSignal(t[STORE_NODE].length, e.length);
         return;
       }
       T = new Array(E + 1);
-      for (c = E; c >= a; c--) {
-        S = e[c];
+      for (l = E; l >= a; l--) {
+        S = e[l];
         d = S ? n(S) : S;
-        l = _.get(d);
-        T[c] = l === undefined ? -1 : l;
-        _.set(d, c);
+        c = _.get(d);
+        T[l] = c === undefined ? -1 : c;
+        _.set(d, l);
       }
-      for (l = a; l <= f; l++) {
-        S = getOverrideValue(i, r, l, s);
+      for (c = a; c <= f; c++) {
+        S = getOverrideValue(i, r, c, s);
         d = S ? n(S) : S;
-        c = _.get(d);
-        if (c !== undefined && c !== -1) {
-          O[c] = S;
-          c = T[c];
-          _.set(d, c);
+        l = _.get(d);
+        if (l !== undefined && l !== -1) {
+          O[l] = S;
+          l = T[l];
+          _.set(d, l);
         }
       }
-      for (c = a; c < e.length; c++) {
-        if (c in O) {
-          const i = wrap(O[c], t);
-          t[STORE_NODE][c] && setSignal(t[STORE_NODE][c], i);
-          applyState(e[c], i, n);
-        } else t[STORE_NODE][c] && setSignal(t[STORE_NODE][c], wrap(e[c], t));
+      for (l = a; l < e.length; l++) {
+        if (l in O) {
+          const i = wrap(O[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;
     } else if (e.length) {
@@ -2452,9 +2466,9 @@ function applyStateSlow(e, t, n) {
   }
   if (o) {
     const u = o[$TRACK];
-    const l = u ? getAllKeys(i, r, e) : Object.keys(o);
-    for (let c = 0, a = l.length; c < a; c++) {
-      const a = l[c];
+    const c = u ? getAllKeys(i, r, e) : Object.keys(o);
+    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));
       let S = unwrap(e[a]);
@@ -2736,35 +2750,35 @@ function upsertStoreNode(e, t, n, i, r) {
 function notifyStoreProperty(e, t, n, i, r, s) {
   const o = projectionWriteActive || e[STORE_OPTIMISTIC];
   const u = n !== "delete";
-  const l = e[STORE_HAS]?.[t];
-  if (l) {
-    setSignal(l, u);
+  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);
     setSignal(n, u);
   }
-  const c = getNodes(e, STORE_NODE);
+  const l = getNodes(e, STORE_NODE);
   if (n === "set") {
-    if (c[t]) {
-      setSignal(c[t], () => (isWrappable(i) ? wrap(i, e) : i));
+    if (l[t]) {
+      setSignal(l[t], () => (isWrappable(i) ? wrap(i, e) : i));
     } else if (!o) {
-      const n = upsertStoreNode(e, c, t, r, e[STORE_SNAPSHOT_PROPS]);
+      const n = upsertStoreNode(e, l, t, r, e[STORE_SNAPSHOT_PROPS]);
       setSignal(n, () => (isWrappable(i) ? wrap(i, e) : i));
     }
   } else if (n === "invalidate") {
-    if (c[t]) {
-      setSignal(c[t], {});
-      delete c[t];
+    if (l[t]) {
+      setSignal(l[t], {});
+      delete l[t];
     }
   } else {
-    if (c[t]) {
-      setSignal(c[t], undefined);
+    if (l[t]) {
+      setSignal(l[t], undefined);
     } else if (!o) {
-      const n = upsertStoreNode(e, c, t, r, e[STORE_SNAPSHOT_PROPS]);
+      const n = upsertStoreNode(e, l, t, r, e[STORE_SNAPSHOT_PROPS]);
       setSignal(n, undefined);
     }
   }
-  c[$TRACK] && setSignal(c[$TRACK], undefined);
+  l[$TRACK] && setSignal(l[$TRACK], undefined);
 }
 let Writing = null;
 const storeTraps = {
@@ -2795,46 +2809,46 @@ const storeTraps = {
     }
     const o = e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE];
     const u = o || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]);
-    const l = !!e[STORE_VALUE][$TARGET];
-    const c = o
+    const c = !!e[STORE_VALUE][$TARGET];
+    const l = o
       ? e[STORE_OPTIMISTIC_OVERRIDE]
       : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
         ? e[STORE_OVERRIDE]
         : e[STORE_VALUE];
     if (!r) {
-      const i = Object.getOwnPropertyDescriptor(c, t);
+      const i = Object.getOwnPropertyDescriptor(l, t);
       if (i && i.get) return i.get.call(n);
       if (!i && !u && e[STORE_CUSTOM_PROTO]) {
-        const e = unwrapStoreValue(c);
+        const e = unwrapStoreValue(l);
         if (hasInheritedAccessor(e, t)) {
-          return Reflect.get(c, t, n);
+          return Reflect.get(l, t, n);
         }
       }
     }
     if (writeOnly(n)) {
       let n =
-        r && (u || !l)
+        r && (u || !c)
           ? r.K !== undefined && r.K !== NOT_PENDING
             ? r.K
             : r.B !== NOT_PENDING
               ? r.B
               : r.ue
-          : c[t];
+          : l[t];
       n === $DELETED && (n = undefined);
       if (!isWrappable(n)) return n;
       const i = wrap(n, e);
       Writing?.add(i);
       return i;
     }
-    let a = r ? (u || !l ? read(i[t]) : (read(i[t]), c[t])) : c[t];
+    let a = r ? (u || !c ? read(i[t]) : (read(i[t]), l[t])) : l[t];
     a === $DELETED && (a = undefined);
     if (!r) {
-      if (!u && typeof a === "function" && !c.hasOwnProperty(t)) {
+      if (!u && typeof a === "function" && !l.hasOwnProperty(t)) {
         let t;
         return !Array.isArray(e[STORE_VALUE]) &&
           (t = Object.getPrototypeOf(e[STORE_VALUE])) &&
           t !== Object.prototype
-          ? a.bind(c)
+          ? a.bind(l)
           : a;
       } else if (getObserver()) {
         return read(
@@ -2879,13 +2893,13 @@ const storeTraps = {
             : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
               ? e[STORE_OVERRIDE][t]
               : r;
-        const l =
+        const c =
           e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]
             ? e[STORE_OPTIMISTIC_OVERRIDE][t] !== $DELETED
             : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
               ? e[STORE_OVERRIDE][t] !== $DELETED
               : t in e[STORE_VALUE];
-        const c = unwrapStoreValue(n);
+        const l = unwrapStoreValue(n);
         const a = Array.isArray(o) && t !== "length";
         const f = a ? parseInt(t) + 1 : 0;
         const E =
@@ -2896,14 +2910,14 @@ const storeTraps = {
               ? e[STORE_OVERRIDE].length
               : o.length);
         const S = a && f > E ? f : undefined;
-        if (u === c && S === undefined) return true;
-        if (c !== undefined && c === r && S === undefined) delete e[s]?.[t];
+        if (u === l && S === undefined) return true;
+        if (l !== undefined && l === r && S === undefined) delete e[s]?.[t];
         else {
           const n = e[s] || (e[s] = Object.create(null));
-          n[t] = c;
+          n[t] = l;
           if (S !== undefined) n.length = S;
         }
-        notifyStoreProperty(e, t, "set", c, u, l);
+        notifyStoreProperty(e, t, "set", l, u, c);
         if (Array.isArray(o) && t !== "length" && S !== undefined) {
           const t = getNodes(e, STORE_NODE);
           if (t.length) {
@@ -3173,7 +3187,7 @@ const storePath = Object.assign(
   { DELETE: DELETE }
 );
 function snapshotImpl(e, t, n, i) {
-  let r, s, o, u, l, c;
+  let r, s, o, u, c, l;
   if (!isWrappable(e)) return e;
   if (n && n.has(e)) return n.get(e);
   if (!n) n = new Map();
@@ -3194,12 +3208,12 @@ function snapshotImpl(e, t, n, i) {
   if (s) {
     const s = o?.length || e.length;
     for (let a = 0; a < s; a++) {
-      c = o && a in o ? o[a] : e[a];
-      if (c === $DELETED) continue;
-      if (t && isWrappable(c)) wrap(c, r);
-      if ((l = snapshotImpl(c, t, n, i)) !== c || u) {
+      l = o && a in o ? o[a] : e[a];
+      if (l === $DELETED) continue;
+      if (t && isWrappable(l)) wrap(l, r);
+      if ((c = snapshotImpl(l, t, n, i)) !== l || u) {
         if (!u) n.set(e, (u = [...e]));
-        u[a] = l;
+        u[a] = c;
       }
     }
   } else {
@@ -3208,14 +3222,14 @@ function snapshotImpl(e, t, n, i) {
       let f = s[a];
       const E = getPropertyDescriptor(e, o, f);
       if (E.get) continue;
-      c = o && f in o ? o[f] : e[f];
-      if (t && isWrappable(c)) wrap(c, r);
-      if ((l = snapshotImpl(c, t, n, i)) !== e[f] || u) {
+      l = o && f in o ? o[f] : e[f];
+      if (t && isWrappable(l)) wrap(l, r);
+      if ((c = snapshotImpl(l, t, n, i)) !== e[f] || u) {
         if (!u) {
           u = Object.create(Object.getPrototypeOf(e));
           Object.assign(u, e);
         }
-        u[f] = l;
+        u[f] = c;
       }
     }
   }
@@ -3439,8 +3453,8 @@ function updateKeyedMap() {
       let s,
         o,
         u,
-        l,
         c,
+        l,
         a,
         f,
         E = new Array(t),
@@ -3469,23 +3483,23 @@ function updateKeyedMap() {
       a = new Map();
       f = new Array(u + 1);
       for (i = u; i >= s; i--) {
-        l = e[i];
-        c = this.tt ? this.tt(l) : l;
-        n = a.get(c);
+        c = e[i];
+        l = this.tt ? this.tt(c) : c;
+        n = a.get(l);
         f[i] = n === undefined ? -1 : n;
-        a.set(c, i);
+        a.set(l, i);
       }
       for (n = s; n <= o; n++) {
-        l = this.ze[n];
-        c = this.tt ? this.tt(l) : l;
-        i = a.get(c);
+        c = this.ze[n];
+        l = this.tt ? this.tt(c) : c;
+        i = a.get(l);
         if (i !== undefined && i !== -1) {
           E[i] = this.Je[n];
           S[i] = this.et[n];
           T && (T[i] = this.nt[n]);
           d && (d[i] = this.it[n]);
           i = f[i];
-          a.set(c, i);
+          a.set(l, i);
         } else this.et[n].dispose();
       }
       for (i = s; i < t; i++) {
@@ -3521,7 +3535,7 @@ function repeat(e, t, n) {
       Xe: i,
       et: [],
       Je: [],
-      lt: n?.from,
+      ct: n?.from,
       st: n?.fallback
     })
   );
@@ -3530,7 +3544,7 @@ function repeat(e, t, n) {
 }
 function updateRepeat() {
   const e = this.ut();
-  const t = this.lt?.() || 0;
+  const t = this.ct?.() || 0;
   runWithOwner(this.Ze, () => {
     if (e === 0) {
       if (this.qe !== 0) {
@@ -3583,10 +3597,10 @@ function boundaryComputed(e, t) {
   n.xe = (e, t) => {
     const i = e !== undefined ? e : n.he;
     const r = t !== undefined ? t : n.Re;
-    n.he &= ~n.ct;
-    n.te.notify(n, n.ct, i, r);
+    n.he &= ~n.lt;
+    n.te.notify(n, n.lt, i, r);
   };
-  n.ct = t;
+  n.lt = t;
   n._e &= ~CONFIG_AUTO_DISPOSE;
   recompute(n, true);
   return n;
@@ -3736,6 +3750,7 @@ class CollectionQueue extends Queue {
   Dt;
   Et = true;
   St = signal(false, { ownedWrite: true, Ye: true });
+  Re;
   Tt = signal(false, { ownedWrite: true, Ye: true });
   Ot;
   _t = false;
@@ -3776,6 +3791,9 @@ class CollectionQueue extends Queue {
         const e = this.ft.size === 0;
         this.ft.add(t);
         if (e) setSignal(this.St, true);
+        if (this.gt & STATUS_ERROR) {
+          setSignal(this.Re, t.Re?.cause ?? t.Re);
+        }
       }
     }
     t &= ~this.gt;
@@ -3811,6 +3829,7 @@ 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));
   untrack(() => {
@@ -3844,14 +3863,12 @@ function createLoadingBoundary(e, t, n) {
   return createCollectionBoundary(STATUS_PENDING, e, () => t(), n?.on);
 }
 function createErrorBoundary(e, t) {
-  return createCollectionBoundary(STATUS_ERROR, e, e => {
-    let n = e.ft.values().next().value;
-    const i = n.Re?.cause ?? n.Re;
-    return t(i, () => {
+  return createCollectionBoundary(STATUS_ERROR, e, e =>
+    t(accessor(e.Re), () => {
       for (const t of e.ft) recompute(t);
       schedule();
-    });
-  });
+    })
+  );
 }
 function createRevealOrder(e, t) {
   _revealUsed = true;