@solidjs/signals 0.12.0 → 0.13.1

package/dist/prod.js

@@ -82,10 +82,10 @@ function deleteFromHeap(e, t) {
   else {
     const n = e.S;
     const r = t.l[i];
-    const s = n ?? r;
+    const o = n ?? r;
     if (e === r) t.l[i] = n;
     else e.T.S = n;
-    s.T = e.T;
+    o.T = e.T;
   }
   e.T = e;
   e.S = undefined;
@@ -107,7 +107,7 @@ function markNode(e, t = REACTIVE_DIRTY) {
     markNode(t.h, REACTIVE_CHECK);
   }
   if (e.A !== null) {
-    for (let t = e.A; t !== null; t = t.P) {
+    for (let t = e.A; t !== null; t = t.N) {
       for (let e = t.I; e !== null; e = e.p) {
         markNode(e.h, REACTIVE_CHECK);
       }
@@ -116,12 +116,12 @@ function markNode(e, t = REACTIVE_DIRTY) {
 }
 function runHeap(e, t) {
   e._ = false;
-  for (e.N = 0; e.N <= e.R; e.N++) {
-    let n = e.l[e.N];
+  for (e.P = 0; e.P <= e.R; e.P++) {
+    let n = e.l[e.P];
     while (n !== undefined) {
       if (n.O & REACTIVE_IN_HEAP) t(n);
       else adjustHeight(n, e);
-      n = e.l[e.N];
+      n = e.l[e.P];
     }
   }
   e.R = 0;
@@ -130,8 +130,8 @@ function adjustHeight(e, t) {
   deleteFromHeap(e, t);
   let n = e.o;
   for (let t = e.C; t; t = t.D) {
-    const e = t.V;
-    const i = e.m || e;
+    const e = t.m;
+    const i = e.V || e;
     if (i.L && i.o >= n) n = i.o + 1;
   }
   if (e.o !== n) {
@@ -142,13 +142,13 @@ function adjustHeight(e, t) {
   }
 }
 const transitions = new Set();
-const dirtyQueue = { l: new Array(2e3).fill(undefined), _: false, N: 0, R: 0 };
-const zombieQueue = { l: new Array(2e3).fill(undefined), _: false, N: 0, R: 0 };
+const dirtyQueue = { l: new Array(2e3).fill(undefined), _: false, P: 0, R: 0 };
+const zombieQueue = { l: new Array(2e3).fill(undefined), _: false, P: 0, R: 0 };
 let clock = 0;
 let activeTransition = null;
 let scheduled = false;
 let projectionWriteActive = false;
-function setOnUnhandledAsync(e) {}
+function enforceLoadingBoundary(e) {}
 function runLaneEffects(e) {
   for (const t of activeLanes) {
     if (t.k || t.U.size > 0) continue;
@@ -170,16 +170,16 @@ function schedule() {
 class Queue {
   i = null;
   G = [[], []];
-  M = [];
+  F = [];
   created = clock;
   addChild(e) {
-    this.M.push(e);
+    this.F.push(e);
     e.i = this;
   }
   removeChild(e) {
-    const t = this.M.indexOf(e);
+    const t = this.F.indexOf(e);
     if (t >= 0) {
-      this.M.splice(t, 1);
+      this.F.splice(t, 1);
       e.i = null;
     }
   }
@@ -193,7 +193,7 @@ class Queue {
       this.G[e - 1] = [];
       runQueue(t, e);
     }
-    for (let t = 0; t < this.M.length; t++) this.M[t].run?.(e);
+    for (let t = 0; t < this.F.length; t++) this.F[t].run?.(e);
   }
   enqueue(e, t) {
     if (e) {
@@ -210,12 +210,12 @@ class Queue {
     e.G[0].push(...this.G[0]);
     e.G[1].push(...this.G[1]);
     this.G = [[], []];
-    for (let t = 0; t < this.M.length; t++) {
-      let n = this.M[t];
-      let i = e.M[t];
+    for (let t = 0; t < this.F.length; t++) {
+      let n = this.F[t];
+      let i = e.F[t];
       if (!i) {
-        i = { G: [[], []], M: [] };
-        e.M[t] = i;
+        i = { G: [[], []], F: [] };
+        e.F[t] = i;
       }
       n.stashQueues(i);
     }
@@ -223,21 +223,21 @@ class Queue {
   restoreQueues(e) {
     this.G[0].push(...e.G[0]);
     this.G[1].push(...e.G[1]);
-    for (let t = 0; t < e.M.length; t++) {
-      const n = e.M[t];
-      let i = this.M[t];
+    for (let t = 0; t < e.F.length; t++) {
+      const n = e.F[t];
+      let i = this.F[t];
       if (i) i.restoreQueues(n);
     }
   }
 }
 class GlobalQueue extends Queue {
   H = false;
-  F = [];
+  M = [];
   $ = [];
   j = new Set();
   static K;
   static Y;
-  static Z = null;
+  static B = null;
   flush() {
     if (this.H) return;
     this.H = true;
@@ -248,32 +248,32 @@ class GlobalQueue extends Queue {
         if (!e) {
           let e = activeTransition;
           runHeap(zombieQueue, GlobalQueue.K);
-          this.F = [];
+          this.M = [];
           this.$ = [];
           this.j = new Set();
           runLaneEffects(EFFECT_RENDER);
           runLaneEffects(EFFECT_USER);
-          this.stashQueues(activeTransition.B);
+          this.stashQueues(activeTransition.Z);
           clock++;
-          scheduled = dirtyQueue.R >= dirtyQueue.N;
-          reassignPendingTransition(activeTransition.F);
+          scheduled = dirtyQueue.R >= dirtyQueue.P;
+          reassignPendingTransition(activeTransition.M);
           activeTransition = null;
           finalizePureQueue(null, true);
           return;
         }
-        this.F !== activeTransition.F && this.F.push(...activeTransition.F);
-        this.restoreQueues(activeTransition.B);
+        this.M !== activeTransition.M && this.M.push(...activeTransition.M);
+        this.restoreQueues(activeTransition.Z);
         transitions.delete(activeTransition);
         const t = activeTransition;
         activeTransition = null;
-        reassignPendingTransition(this.F);
+        reassignPendingTransition(this.M);
         finalizePureQueue(t);
       } else {
         if (transitions.size) runHeap(zombieQueue, GlobalQueue.K);
         finalizePureQueue();
       }
       clock++;
-      scheduled = dirtyQueue.R >= dirtyQueue.N;
+      scheduled = dirtyQueue.R >= dirtyQueue.P;
       runLaneEffects(EFFECT_RENDER);
       this.run(EFFECT_RENDER);
       runLaneEffects(EFFECT_USER);
@@ -285,9 +285,9 @@ class GlobalQueue extends Queue {
   notify(e, t, n, i) {
     if (t & STATUS_PENDING) {
       if (n & STATUS_PENDING) {
-        const t = i !== undefined ? i : e.X;
-        if (activeTransition && t && !activeTransition.q.includes(t.source)) {
-          activeTransition.q.push(t.source);
+        const t = i !== undefined ? i : e.q;
+        if (activeTransition && t && !activeTransition.X.includes(t.source)) {
+          activeTransition.X.push(t.source);
           schedule();
         }
       }
@@ -302,12 +302,12 @@ class GlobalQueue extends Queue {
     if (!activeTransition) {
       activeTransition = e ?? {
         J: clock,
-        F: [],
-        q: [],
+        M: [],
+        X: [],
         $: [],
         j: new Set(),
         ee: [],
-        B: { G: [[], []], M: [] },
+        Z: { G: [[], []], F: [] },
         te: false
       };
     } else if (e) {
@@ -326,12 +326,12 @@ class GlobalQueue extends Queue {
     }
     transitions.add(activeTransition);
     activeTransition.J = clock;
-    for (let e = 0; e < this.F.length; e++) {
-      const t = this.F[e];
+    for (let e = 0; e < this.M.length; e++) {
+      const t = this.M[e];
       t.ne = activeTransition;
-      activeTransition.F.push(t);
+      activeTransition.M.push(t);
     }
-    this.F = activeTransition.F;
+    this.M = activeTransition.M;
     for (let e = 0; e < this.$.length; e++) {
       const t = this.$[e];
       t.ne = activeTransition;
@@ -349,7 +349,7 @@ function insertSubs(e, t = false) {
   const n = e.ie || currentOptimisticLane;
   const i = e.re !== undefined;
   for (let r = e.I; r !== null; r = r.p) {
-    if (i && r.h.se) {
+    if (i && r.h.oe) {
       r.h.O |= REACTIVE_SNAPSHOT_STALE;
       continue;
     }
@@ -361,54 +361,65 @@ function insertSubs(e, t = false) {
       r.h.ie = undefined;
     }
     const e = r.h;
-    if (e.oe === EFFECT_TRACKED) {
+    if (e.se === EFFECT_TRACKED) {
       if (!e.ue) {
         e.ue = true;
-        e.ce.enqueue(EFFECT_USER, e.le);
+        e.ce.enqueue(EFFECT_USER, e.ae);
       }
       continue;
     }
-    const s = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (s.N > r.h.o) s.N = r.h.o;
-    insertIntoHeap(r.h, s);
+    const o = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (o.P > r.h.o) o.P = r.h.o;
+    insertIntoHeap(r.h, o);
   }
 }
+function commitPendingNodes() {
+  const e = globalQueue.M;
+  for (let t = 0; t < e.length; t++) {
+    const n = e[t];
+    if (n.le !== NOT_PENDING) {
+      n.fe = n.le;
+      n.le = NOT_PENDING;
+      if (n.se && n.se !== EFFECT_TRACKED) n.ue = true;
+    }
+    if (n.Ee & STATUS_PENDING) {
+      const e = n.q?.source;
+      if (e && !(e.Ee & STATUS_PENDING)) {
+        n.Ee &= -6;
+        n.q = null;
+      }
+    } else n.Ee &= ~STATUS_UNINITIALIZED;
+    if (n.L) GlobalQueue.Y(n, false, true);
+  }
+  e.length = 0;
+}
 function finalizePureQueue(e = null, t = false) {
   let n = !t;
+  if (n) commitPendingNodes();
   if (!t) checkBoundaryChildren(globalQueue);
-  if (dirtyQueue.R >= dirtyQueue.N) runHeap(dirtyQueue, GlobalQueue.K);
+  if (dirtyQueue.R >= dirtyQueue.P) runHeap(dirtyQueue, GlobalQueue.K);
   if (n) {
-    const t = globalQueue.F;
+    commitPendingNodes();
+    const t = e ? e.$ : globalQueue.$;
     for (let e = 0; e < t.length; e++) {
       const n = t[e];
-      if (n.ae !== NOT_PENDING) {
-        n.fe = n.ae;
-        n.ae = NOT_PENDING;
-        if (n.oe && n.oe !== EFFECT_TRACKED) n.ue = true;
+      n.ie = undefined;
+      if (n.le !== NOT_PENDING) {
+        n.fe = n.le;
+        n.le = NOT_PENDING;
       }
-      if (!(n.Ee & STATUS_PENDING)) n.Ee &= ~STATUS_UNINITIALIZED;
-      if (n.L) GlobalQueue.Y(n, false, true);
+      const i = n.Te;
+      n.Te = NOT_PENDING;
+      if (i !== NOT_PENDING && n.fe !== i) insertSubs(n, true);
+      n.ne = null;
     }
     t.length = 0;
-    const n = e ? e.$ : globalQueue.$;
-    for (let e = 0; e < n.length; e++) {
-      const t = n[e];
-      const i = t.ae;
-      t.ie = undefined;
-      if (i !== NOT_PENDING && t.fe !== i) {
-        t.fe = i;
-        insertSubs(t, true);
-      }
-      t.ae = NOT_PENDING;
-      t.ne = null;
-    }
-    n.length = 0;
-    const i = e ? e.j : globalQueue.j;
-    if (GlobalQueue.Z && i.size) {
-      for (const e of i) {
-        GlobalQueue.Z(e);
-      }
-      i.clear();
+    const n = e ? e.j : globalQueue.j;
+    if (GlobalQueue.B && n.size) {
+      for (const e of n) {
+        GlobalQueue.B(e);
+      }
+      n.clear();
       schedule();
     }
     for (const t of activeLanes) {
@@ -418,17 +429,17 @@ function finalizePureQueue(e = null, t = false) {
         if (t.W[0].length) runQueue(t.W[0], EFFECT_RENDER);
         if (t.W[1].length) runQueue(t.W[1], EFFECT_USER);
       }
-      if (t.Te.ie === t) t.Te.ie = undefined;
+      if (t.de.ie === t) t.de.ie = undefined;
       t.U.clear();
       t.W[0].length = 0;
       t.W[1].length = 0;
       activeLanes.delete(t);
-      signalLanes.delete(t.Te);
+      signalLanes.delete(t.de);
     }
   }
 }
 function checkBoundaryChildren(e) {
-  for (const t of e.M) {
+  for (const t of e.F) {
     t.checkSources?.();
     checkBoundaryChildren(t);
   }
@@ -455,9 +466,9 @@ function transitionComplete(e) {
   if (e.te) return true;
   if (e.ee.length) return false;
   let t = true;
-  for (let n = 0; n < e.q.length; n++) {
-    const i = e.q[n];
-    if (i.Ee & STATUS_PENDING && i.X?.source === i) {
+  for (let n = 0; n < e.X.length; n++) {
+    const i = e.X[n];
+    if (i.Ee & STATUS_PENDING && i.q?.source === i) {
       t = false;
       break;
     }
@@ -488,12 +499,12 @@ function getOrCreateLane(e) {
   if (t) {
     return findLane(t);
   }
-  const n = e.de;
+  const n = e.Se;
   const i = n?.ie ? findLane(n.ie) : null;
-  t = { Te: e, U: new Set(), W: [[], []], k: null, ne: activeTransition, Se: i };
+  t = { de: e, U: new Set(), W: [[], []], k: null, ne: activeTransition, Re: i };
   signalLanes.set(e, t);
   activeLanes.add(t);
-  e.Re = e.Oe || 0;
+  e.Oe = false;
   return t;
 }
 function findLane(e) {
@@ -519,7 +530,7 @@ function resolveLane(e) {
   return undefined;
 }
 function hasActiveOverride(e) {
-  return !!(e._e && e.ae !== NOT_PENDING);
+  return !!(e.Te !== undefined && e.Te !== NOT_PENDING);
 }
 function assignOrMergeLane(e, t) {
   const n = findLane(t);
@@ -532,9 +543,9 @@ function assignOrMergeLane(e, t) {
     const r = findLane(i);
     if (activeLanes.has(r)) {
       if (r !== n && !hasActiveOverride(e)) {
-        if (n.Se && findLane(n.Se) === r) {
+        if (n.Re && findLane(n.Re) === r) {
           e.ie = t;
-        } else if (r.Se && findLane(r.Se) === n);
+        } else if (r.Re && findLane(r.Re) === n);
         else mergeLanes(n, r);
       }
       return;
@@ -545,43 +556,42 @@ function assignOrMergeLane(e, t) {
 function handleAsync(e, t, n) {
   const i = typeof t === "object" && t !== null;
   const r = i && untrack(() => t[Symbol.asyncIterator]);
-  const s = !r && i && untrack(() => typeof t.then === "function");
-  if (!s && !r) {
-    e.Ie = null;
+  const o = !r && i && untrack(() => typeof t.then === "function");
+  if (!o && !r) {
+    e._e = null;
     return t;
   }
-  e.Ie = t;
-  let o;
+  e._e = t;
+  let s;
   const handleError = n => {
-    if (e.Ie !== t) return;
+    if (e._e !== t) return;
     globalQueue.initTransition(e.ne);
     notifyStatus(e, n instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR, n);
     e.J = clock;
   };
   const asyncWrite = (i, r) => {
-    if (e.Ie !== t) return;
+    if (e._e !== t) return;
     if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
     globalQueue.initTransition(e.ne);
     clearStatus(e);
-    const s = resolveLane(e);
-    if (s) s.U.delete(e);
+    const o = resolveLane(e);
+    if (o) o.U.delete(e);
     if (n) n(i);
-    else if (e._e) {
-      const t = e.ae !== NOT_PENDING;
-      if (e.L) e.ae = i;
-      if (!t) {
+    else if (e.Te !== undefined) {
+      if (e.Te !== undefined && e.Te !== NOT_PENDING) e.le = i;
+      else {
         e.fe = i;
         insertSubs(e);
       }
       e.J = clock;
-    } else if (s) {
+    } else if (o) {
       const t = e.fe;
-      const n = e.pe;
+      const n = e.Ie;
       if (!n || !n(i, t)) {
         e.fe = i;
         e.J = clock;
-        if (e.he) {
-          setSignal(e.he, i);
+        if (e.pe) {
+          setSignal(e.pe, i);
         }
         insertSubs(e, true);
       }
@@ -592,13 +602,13 @@ function handleAsync(e, t, n) {
     flush();
     r?.();
   };
-  if (s) {
+  if (o) {
     let n = false,
       i = true;
     t.then(
       e => {
         if (i) {
-          o = e;
+          s = e;
           n = true;
         } else asyncWrite(e);
       },
@@ -636,7 +646,7 @@ function handleAsync(e, t, n) {
       );
       r = false;
       if (t && !e.done) {
-        o = e.value;
+        s = e.value;
         i = true;
         return iterate();
       }
@@ -648,23 +658,23 @@ function handleAsync(e, t, n) {
       throw new NotReadyError(context);
     }
   }
-  return o;
+  return s;
 }
 function clearStatus(e) {
   e.Ee = e.Ee & STATUS_UNINITIALIZED;
-  e.X = null;
+  e.q = null;
   updatePendingSignal(e);
-  e.Ae?.();
+  e.he?.();
 }
 function notifyStatus(e, t, n, i, r) {
   if (t === STATUS_ERROR && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
-  const s = n instanceof NotReadyError && n.source === e;
-  const o = t === STATUS_PENDING && e._e && !s;
-  const u = o && hasActiveOverride(e);
+  const o = n instanceof NotReadyError && n.source === e;
+  const s = t === STATUS_PENDING && e.Te !== undefined && !o;
+  const u = s && hasActiveOverride(e);
   if (!i) {
     e.Ee = t | (t !== STATUS_ERROR ? e.Ee & STATUS_UNINITIALIZED : 0);
-    e.X = n;
+    e.q = n;
     updatePendingSignal(e);
   }
   if (r && !i) {
@@ -672,50 +682,50 @@ function notifyStatus(e, t, n, i, r) {
   }
   if (u && activeTransition && n instanceof NotReadyError) {
     const e = n.source;
-    if (!activeTransition.q.includes(e)) {
-      activeTransition.q.push(e);
+    if (!activeTransition.X.includes(e)) {
+      activeTransition.X.push(e);
     }
   }
   const c = i || u;
-  const l = i || o ? undefined : r;
-  if (e.Ae) {
+  const a = i || s ? undefined : r;
+  if (e.he) {
     if (c) {
-      e.Ae(t, n);
+      e.he(t, n);
     } else {
-      e.Ae();
+      e.he();
     }
     return;
   }
   for (let i = e.I; i !== null; i = i.p) {
     i.h.J = clock;
-    if (i.h.X !== n) {
-      !i.h.ne && globalQueue.F.push(i.h);
-      notifyStatus(i.h, t, n, c, l);
+    if (i.h.q !== n) {
+      !i.h.ne && globalQueue.M.push(i.h);
+      notifyStatus(i.h, t, n, c, a);
     }
   }
-  for (let i = e.A; i !== null; i = i.P) {
+  for (let i = e.A; i !== null; i = i.N) {
     for (let e = i.I; e !== null; e = e.p) {
       e.h.J = clock;
-      if (e.h.X !== n) {
-        !e.h.ne && globalQueue.F.push(e.h);
-        notifyStatus(e.h, t, n, c, l);
+      if (e.h.q !== n) {
+        !e.h.ne && globalQueue.M.push(e.h);
+        notifyStatus(e.h, t, n, c, a);
       }
     }
   }
 }
 function unlinkSubs(e) {
-  const t = e.V;
+  const t = e.m;
   const n = e.D;
   const i = e.p;
-  const r = e.Pe;
-  if (i !== null) i.Pe = r;
+  const r = e.Ae;
+  if (i !== null) i.Ae = r;
   else t.Ne = r;
   if (r !== null) r.p = i;
   else {
     t.I = i;
     if (i === null) {
       t.ge?.();
-      t.L && !t.Ce && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
+      t.L && !t.Pe && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
     }
   }
   return n;
@@ -730,27 +740,27 @@ function unobserved(e) {
   disposeChildren(e, true);
 }
 function link(e, t) {
-  const n = t.ye;
-  if (n !== null && n.V === e) return;
+  const n = t.Ce;
+  if (n !== null && n.m === e) return;
   let i = null;
   const r = t.O & REACTIVE_RECOMPUTING_DEPS;
   if (r) {
     i = n !== null ? n.D : t.C;
-    if (i !== null && i.V === e) {
-      t.ye = i;
+    if (i !== null && i.m === e) {
+      t.Ce = i;
       return;
     }
   }
-  const s = e.Ne;
-  if (s !== null && s.h === t && (!r || isValidLink(s, t))) return;
-  const o = (t.ye = e.Ne = { V: e, h: t, D: i, Pe: s, p: null });
-  if (n !== null) n.D = o;
-  else t.C = o;
-  if (s !== null) s.p = o;
-  else e.I = o;
+  const o = e.Ne;
+  if (o !== null && o.h === t && (!r || isValidLink(o, t))) return;
+  const s = (t.Ce = e.Ne = { m: e, h: t, D: i, Ae: o, p: null });
+  if (n !== null) n.D = s;
+  else t.C = s;
+  if (o !== null) o.p = s;
+  else e.I = s;
 }
 function isValidLink(e, t) {
-  const n = t.ye;
+  const n = t.Ce;
   if (n !== null) {
     let i = t.C;
     do {
@@ -771,7 +781,7 @@ function markDisposal(e) {
       insertIntoHeap(t, zombieQueue);
     }
     markDisposal(t);
-    t = t.ve;
+    t = t.ye;
   }
 }
 function dispose(e) {
@@ -780,15 +790,15 @@ function dispose(e) {
     t = unlinkSubs(t);
   } while (t !== null);
   e.C = null;
-  e.ye = null;
+  e.Ce = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
   if (e.O & REACTIVE_DISPOSED) return;
   if (t) e.O = REACTIVE_DISPOSED;
-  let i = n ? e.be : e.De;
+  let i = n ? e.ve : e.De;
   while (i) {
-    const e = i.ve;
+    const e = i.ye;
     if (i.C) {
       const e = i;
       deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
@@ -797,22 +807,21 @@ function disposeChildren(e, t = false, n) {
         t = unlinkSubs(t);
       } while (t !== null);
       e.C = null;
-      e.ye = null;
+      e.Ce = null;
     }
     disposeChildren(i, true);
     i = e;
   }
   if (n) {
-    e.be = null;
+    e.ve = null;
   } else {
     e.De = null;
-    e.ve = null;
     e.we = 0;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.Ve : e.me;
+  let n = t ? e.be : e.me;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -822,11 +831,11 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.Ve = null) : (e.me = null);
+  t ? (e.be = null) : (e.me = null);
 }
 function childId(e, t) {
   let n = e;
-  while (n.Le && n.i) n = n.i;
+  while (n.Ve && n.i) n = n.i;
   if (n.id != null) return formatId(n.id, t ? n.we++ : n.we);
   throw new Error("Cannot get child id from owner without an id");
 }
@@ -863,17 +872,17 @@ function createOwner(e) {
   const n = e?.transparent ?? false;
   const i = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    Le: n || undefined,
+    Ve: n || undefined,
     t: true,
     u: t?.t ? t.u : t,
     De: null,
-    ve: null,
+    ye: null,
     me: null,
     ce: t?.ce ?? globalQueue,
-    ke: t?.ke || defaultContext,
+    Le: t?.Le || defaultContext,
     we: 0,
-    Ve: null,
     be: null,
+    ve: null,
     i: t,
     dispose(e = true) {
       disposeChildren(i, e);
@@ -884,7 +893,7 @@ function createOwner(e) {
     if (e === null) {
       t.De = i;
     } else {
-      i.ve = e;
+      i.ye = e;
       t.De = i;
     }
   }
@@ -895,57 +904,59 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(n.dispose));
 }
 function effect(e, t, n, i, r) {
-  let s = false;
-  const o = computed(r?.render ? t => staleValues(() => e(t)) : e, i, {
+  let o = false;
+  const s = computed(r?.render ? t => staleValues(() => e(t)) : e, i, {
     ...r,
     equals: () => {
-      o.ue = !o.X;
-      if (s) o.ce.enqueue(o.oe, runEffect.bind(o));
+      s.ue = !s.q;
+      if (o) s.ce.enqueue(s.se, runEffect.bind(s));
       return false;
     },
     lazy: true
   });
-  o.Ue = i;
-  o.We = t;
-  o.He = n;
-  o.xe = undefined;
-  o.oe = r?.render ? EFFECT_RENDER : EFFECT_USER;
-  o.Ae = (e, t) => {
-    const n = e !== undefined ? e : o.Ee;
-    const i = t !== undefined ? t : o.X;
+  s.ke = i;
+  s.Ue = t;
+  s.xe = n;
+  s.We = undefined;
+  s.se = r?.render ? EFFECT_RENDER : EFFECT_USER;
+  s.he = (e, t) => {
+    const n = e !== undefined ? e : s.Ee;
+    const i = t !== undefined ? t : s.q;
     if (n & STATUS_ERROR) {
       let e = i;
-      o.ce.notify(o, STATUS_PENDING, 0);
-      if (o.oe === EFFECT_USER) {
+      s.ce.notify(s, STATUS_PENDING, 0);
+      if (s.se === EFFECT_USER) {
         try {
-          return o.He
-            ? o.He(e, () => {
-                o.xe?.();
-                o.xe = undefined;
+          return s.xe
+            ? s.xe(e, () => {
+                s.We?.();
+                s.We = undefined;
               })
             : console.error(e);
         } catch (t) {
           e = t;
         }
       }
-      if (!o.ce.notify(o, STATUS_ERROR, STATUS_ERROR)) throw e;
-    } else if (o.oe === EFFECT_RENDER) o.ce.notify(o, STATUS_PENDING | STATUS_ERROR, n, i);
+      if (!s.ce.notify(s, STATUS_ERROR, STATUS_ERROR)) throw e;
+    } else if (s.se === EFFECT_RENDER) {
+      s.ce.notify(s, STATUS_PENDING | STATUS_ERROR, n, i);
+    }
   };
-  recompute(o, true);
-  !r?.defer && (o.oe === EFFECT_USER ? o.ce.enqueue(o.oe, runEffect.bind(o)) : runEffect.call(o));
-  s = true;
-  onCleanup(() => o.xe?.());
+  recompute(s, true);
+  !r?.defer && (s.se === EFFECT_USER ? s.ce.enqueue(s.se, runEffect.bind(s)) : runEffect.call(s));
+  o = true;
+  onCleanup(() => s.We?.());
 }
 function runEffect() {
   if (!this.ue || this.O & REACTIVE_DISPOSED) return;
-  this.xe?.();
-  this.xe = undefined;
+  this.We?.();
+  this.We = undefined;
   try {
-    this.xe = this.We(this.fe, this.Ue);
+    this.We = this.Ue(this.fe, this.ke);
   } catch (e) {
     if (!this.ce.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
   } finally {
-    this.Ue = this.fe;
+    this.ke = this.fe;
     this.ue = false;
   }
 }
@@ -958,21 +969,44 @@ function trackedEffect(e, t) {
   const n = computed(
     () => {
       try {
-        n.xe?.();
-        n.xe = undefined;
-        n.xe = staleValues(e) || undefined;
+        n.We?.();
+        n.We = undefined;
+        n.We = staleValues(e) || undefined;
       } finally {
       }
     },
     undefined,
     { ...t, lazy: true }
   );
-  n.xe = undefined;
+  n.We = undefined;
   n.ue = true;
-  n.oe = EFFECT_TRACKED;
-  n.le = run;
+  n.se = EFFECT_TRACKED;
+  n.ae = run;
   n.ce.enqueue(EFFECT_USER, run);
-  onCleanup(() => n.xe?.());
+  onCleanup(() => n.We?.());
+}
+let externalSourceConfig = null;
+function enableExternalSource(e) {
+  const { factory: t, untrack: n = e => e() } = e;
+  if (externalSourceConfig) {
+    const { factory: e, untrack: i } = externalSourceConfig;
+    externalSourceConfig = {
+      factory: (n, i) => {
+        const r = e(n, i);
+        const o = t(e => r.track(e), i);
+        return {
+          track: e => o.track(e),
+          dispose() {
+            o.dispose();
+            r.dispose();
+          }
+        };
+      },
+      untrack: e => i(() => n(e))
+    };
+  } else {
+    externalSourceConfig = { factory: t, untrack: n };
+  }
 }
 GlobalQueue.K = recompute;
 GlobalQueue.Y = disposeChildren;
@@ -988,7 +1022,7 @@ let snapshotCaptureActive = false;
 let snapshotSources = null;
 function ownerInSnapshotScope(e) {
   while (e) {
-    if (e.Qe) return true;
+    if (e.He) return true;
     e = e.i;
   }
   return false;
@@ -998,32 +1032,32 @@ function setSnapshotCapture(e) {
   if (e && !snapshotSources) snapshotSources = new Set();
 }
 function markSnapshotScope(e) {
-  e.Qe = true;
+  e.He = true;
 }
 function releaseSnapshotScope(e) {
-  e.Qe = false;
+  e.He = false;
   releaseSubtree(e);
   schedule();
 }
 function releaseSubtree(e) {
   let t = e.De;
   while (t) {
-    if (t.Qe) {
-      t = t.ve;
+    if (t.He) {
+      t = t.ye;
       continue;
     }
     if (t.L) {
       const e = t;
-      e.se = false;
+      e.oe = false;
       if (e.O & REACTIVE_SNAPSHOT_STALE) {
         e.O &= ~REACTIVE_SNAPSHOT_STALE;
         e.O |= REACTIVE_DIRTY;
-        if (dirtyQueue.N > e.o) dirtyQueue.N = e.o;
+        if (dirtyQueue.P > e.o) dirtyQueue.P = e.o;
         insertIntoHeap(e, dirtyQueue);
       }
     }
     releaseSubtree(t);
-    t = t.ve;
+    t = t.ye;
   }
 }
 function clearSnapshots() {
@@ -1037,7 +1071,7 @@ function clearSnapshots() {
   snapshotCaptureActive = false;
 }
 function recompute(e, t = false) {
-  const n = e.oe;
+  const n = e.se;
   if (!t) {
     if (e.ne && (!n || activeTransition) && activeTransition !== e.ne)
       globalQueue.initTransition(e.ne);
@@ -1045,25 +1079,25 @@ function recompute(e, t = false) {
     if (e.ne || n === EFFECT_TRACKED) disposeChildren(e);
     else {
       markDisposal(e);
-      e.Ve = e.me;
-      e.be = e.De;
+      e.be = e.me;
+      e.ve = e.De;
       e.me = null;
       e.De = null;
       e.we = 0;
     }
   }
   const i = !!(e.O & REACTIVE_OPTIMISTIC_DIRTY);
-  const r = hasActiveOverride(e);
-  const s = !!(e.Ee & STATUS_PENDING);
-  const o = context;
+  const r = e.Te !== undefined && e.Te !== NOT_PENDING;
+  const o = !!(e.Ee & STATUS_PENDING);
+  const s = context;
   context = e;
-  e.ye = null;
+  e.Ce = null;
   e.O = REACTIVE_RECOMPUTING_DEPS;
   e.J = clock;
-  let u = e.ae === NOT_PENDING ? e.fe : e.ae;
+  let u = e.le === NOT_PENDING ? e.fe : e.le;
   let c = e.o;
-  let l = tracking;
-  let a = currentOptimisticLane;
+  let a = tracking;
+  let l = currentOptimisticLane;
   tracking = true;
   if (i) {
     const t = resolveLane(e);
@@ -1075,15 +1109,15 @@ function recompute(e, t = false) {
     const t = resolveLane(e);
     if (t) {
       t.U.delete(e);
-      updatePendingSignal(t.Te);
+      updatePendingSignal(t.de);
     }
   } catch (t) {
     if (t instanceof NotReadyError && currentOptimisticLane) {
       const t = findLane(currentOptimisticLane);
-      if (t.Te !== e) {
+      if (t.de !== e) {
         t.U.add(e);
         e.ie = t;
-        updatePendingSignal(t.Te);
+        updatePendingSignal(t.de);
       }
     }
     notifyStatus(
@@ -1094,51 +1128,50 @@ function recompute(e, t = false) {
       t instanceof NotReadyError ? e.ie : undefined
     );
   } finally {
-    tracking = l;
+    tracking = a;
     e.O = REACTIVE_NONE | (t ? e.O & REACTIVE_SNAPSHOT_STALE : 0);
-    context = o;
+    context = s;
   }
-  if (!e.X) {
-    const o = e.ye;
-    let l = o !== null ? o.D : e.C;
-    if (l !== null) {
+  if (!e.q) {
+    const s = e.Ce;
+    let a = s !== null ? s.D : e.C;
+    if (a !== null) {
       do {
-        l = unlinkSubs(l);
-      } while (l !== null);
-      if (o !== null) o.D = null;
+        a = unlinkSubs(a);
+      } while (a !== null);
+      if (s !== null) s.D = null;
       else e.C = null;
     }
-    const a = r ? e.fe : e.ae === NOT_PENDING ? e.fe : e.ae;
-    const f = !e.pe || !e.pe(a, u);
+    const l = r ? e.Te : e.le === NOT_PENDING ? e.fe : e.le;
+    const f = !e.Ie || !e.Ie(l, u);
     if (f) {
-      const o = r ? e.fe : undefined;
-      if (t || (n && activeTransition !== e.ne) || i) e.fe = u;
-      else e.ae = u;
-      if (r && !i && s) {
-        const t = e.Oe || 0;
-        const n = e.Re || 0;
-        if (t <= n) e.fe = u;
-      }
-      if (!r || i || e.fe !== o) {
-        insertSubs(e, i || r);
-      }
+      const s = r ? e.Te : undefined;
+      if (t || (n && activeTransition !== e.ne) || i) {
+        e.fe = u;
+        if (r && i) {
+          e.Te = u;
+          e.le = u;
+        }
+      } else e.le = u;
+      if (r && !i && o && !e.Oe) e.Te = u;
+      if (!r || i || e.Te !== s) insertSubs(e, i || r);
     } else if (r) {
-      e.ae = u;
+      e.le = u;
     } else if (e.o != c) {
       for (let t = e.I; t !== null; t = t.p) {
         insertIntoHeapHeight(t.h, t.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
       }
     }
   }
-  currentOptimisticLane = a;
-  (!t || e.Ee & STATUS_PENDING) && !e.ne && !(activeTransition && e._e) && globalQueue.F.push(e);
+  currentOptimisticLane = l;
+  (!t || e.Ee & STATUS_PENDING) && !e.ne && !(activeTransition && r) && globalQueue.M.push(e);
   e.ne && n && activeTransition !== e.ne && runInTransition(e.ne, () => recompute(e));
 }
 function updateIfNecessary(e) {
   if (e.O & REACTIVE_CHECK) {
     for (let t = e.C; t; t = t.D) {
-      const n = t.V;
-      const i = n.m || n;
+      const n = t.m;
+      const i = n.V || n;
       if (i.L) {
         updateIfNecessary(i);
       }
@@ -1147,7 +1180,7 @@ function updateIfNecessary(e) {
       }
     }
   }
-  if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.X && e.J < clock && !e.Ie)) {
+  if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.q && e.J < clock && !e._e)) {
     recompute(e);
   }
   e.O = REACTIVE_NONE | (e.O & REACTIVE_SNAPSHOT_STALE);
@@ -1156,13 +1189,13 @@ function computed(e, t, n) {
   const i = n?.transparent ?? false;
   const r = {
     id: n?.id ?? (i ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
-    Le: i || undefined,
-    pe: n?.equals != null ? n.equals : isEqual,
+    Ve: i || undefined,
+    Ie: n?.equals != null ? n.equals : isEqual,
     Ge: !!n?.pureWrite,
     ge: n?.unobserved,
     me: null,
     ce: context?.ce ?? globalQueue,
-    ke: context?.ke ?? defaultContext,
+    Le: context?.Le ?? defaultContext,
     we: 0,
     L: e,
     fe: t,
@@ -1171,34 +1204,45 @@ function computed(e, t, n) {
     S: undefined,
     T: null,
     C: null,
-    ye: null,
+    Ce: null,
     I: null,
     Ne: null,
     i: context,
-    ve: null,
+    ye: null,
     De: null,
     O: n?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
     Ee: STATUS_UNINITIALIZED,
     J: clock,
-    ae: NOT_PENDING,
-    Ve: null,
+    le: NOT_PENDING,
     be: null,
-    Ie: null,
+    ve: null,
+    _e: null,
     ne: null
   };
   r.T = r;
-  const s = context?.t ? context.u : context;
+  const o = context?.t ? context.u : context;
   if (context) {
     const e = context.De;
     if (e === null) {
       context.De = r;
     } else {
-      r.ve = e;
+      r.ye = e;
       context.De = r;
     }
   }
-  if (s) r.o = s.o + 1;
-  if (snapshotCaptureActive && ownerInSnapshotScope(context)) r.se = true;
+  if (o) r.o = o.o + 1;
+  if (snapshotCaptureActive && ownerInSnapshotScope(context)) r.oe = true;
+  if (externalSourceConfig) {
+    const e = signal(undefined, { equals: false, pureWrite: true });
+    const t = externalSourceConfig.factory(r.L, () => {
+      setSignal(e, undefined);
+    });
+    onCleanup(() => t.dispose());
+    r.L = n => {
+      read(e);
+      return t.track(n);
+    };
+  }
   !n?.lazy && recompute(r, true);
   if (snapshotCaptureActive && !n?.lazy) {
     if (!(r.Ee & STATUS_PENDING)) {
@@ -1210,19 +1254,19 @@ function computed(e, t, n) {
 }
 function signal(e, t, n = null) {
   const i = {
-    pe: t?.equals != null ? t.equals : isEqual,
+    Ie: t?.equals != null ? t.equals : isEqual,
     Ge: !!t?.pureWrite,
     ge: t?.unobserved,
     fe: e,
     I: null,
     Ne: null,
     J: clock,
-    m: n,
-    P: n?.A || null,
-    ae: NOT_PENDING
+    V: n,
+    N: n?.A || null,
+    le: NOT_PENDING
   };
   n && (n.A = i);
-  if (snapshotCaptureActive && !i.Ge) {
+  if (snapshotCaptureActive && !i.Ge && !((n?.Ee ?? 0) & STATUS_PENDING)) {
     i.re = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources.add(i);
   }
@@ -1230,22 +1274,23 @@ function signal(e, t, n = null) {
 }
 function optimisticSignal(e, t) {
   const n = signal(e, t);
-  n._e = true;
+  n.Te = NOT_PENDING;
   return n;
 }
 function optimisticComputed(e, t, n) {
   const i = computed(e, t, n);
-  i._e = true;
+  i.Te = NOT_PENDING;
   return i;
 }
 function isEqual(e, t) {
   return e === t;
 }
 function untrack(e, t) {
-  if (!tracking && true) return e();
+  if (!externalSourceConfig && !tracking && true) return e();
   const n = tracking;
   tracking = false;
   try {
+    if (externalSourceConfig) return externalSourceConfig.untrack(e);
     return e();
   } finally {
     tracking = n;
@@ -1256,27 +1301,28 @@ function read(e) {
     const t = getLatestValueComputed(e);
     const n = latestReadActive;
     latestReadActive = false;
-    let i;
+    const i = e.Te !== undefined && e.Te !== NOT_PENDING ? e.Te : e.fe;
+    let r;
     try {
-      i = read(t);
-    } catch (t) {
-      if (!context && t instanceof NotReadyError) return e.fe;
-      throw t;
+      r = read(t);
+    } catch (e) {
+      if (!context && e instanceof NotReadyError) return i;
+      throw e;
     } finally {
       latestReadActive = n;
     }
-    if (t.Ee & STATUS_PENDING) return e.fe;
+    if (t.Ee & STATUS_PENDING) return i;
     if (stale && currentOptimisticLane && t.ie) {
-      const n = findLane(t.ie);
-      const i = findLane(currentOptimisticLane);
-      if (n !== i && n.U.size > 0) {
-        return e.fe;
+      const e = findLane(t.ie);
+      const n = findLane(currentOptimisticLane);
+      if (e !== n && e.U.size > 0) {
+        return i;
       }
     }
-    return i;
+    return r;
   }
   if (pendingCheckActive) {
-    const t = e.m || e;
+    const t = e.V || e;
     const n = getPendingSignal(t);
     const i = pendingCheckActive;
     pendingCheckActive = false;
@@ -1293,13 +1339,13 @@ function read(e) {
     e.O &= ~REACTIVE_LAZY;
     recompute(e, true);
   }
-  const n = e.m || e;
+  const n = e.V || e;
   if (t && tracking) {
     if (e.L && e.O & REACTIVE_DISPOSED) recompute(e);
     link(e, t);
     if (n.L) {
       const i = e.O & REACTIVE_ZOMBIE;
-      if (n.o >= (i ? zombieQueue.N : dirtyQueue.N)) {
+      if (n.o >= (i ? zombieQueue.P : dirtyQueue.P)) {
         markNode(t);
         markHeap(i ? zombieQueue : dirtyQueue);
         updateIfNecessary(n);
@@ -1311,79 +1357,80 @@ function read(e) {
     }
   }
   if (n.Ee & STATUS_PENDING) {
-    if (t && !(stale && n.ne && activeTransition !== n.ne)) {
+    const i = n.q?.source;
+    if (i && !(i.Ee & STATUS_PENDING)) clearStatus(n);
+    else if (t && !(stale && n.ne && activeTransition !== n.ne)) {
       if (currentOptimisticLane) {
         const i = n.ie;
         const r = findLane(currentOptimisticLane);
         if (i && findLane(i) === r && !hasActiveOverride(n)) {
-          if (!tracking) link(e, t);
-          throw n.X;
+          if (!tracking && e !== t) link(e, t);
+          throw n.q;
         }
       } else {
-        if (!tracking) link(e, t);
-        throw n.X;
+        if (!tracking && e !== t) link(e, t);
+        throw n.q;
       }
     } else if (!t && n.Ee & STATUS_UNINITIALIZED) {
-      throw n.X;
+      throw n.q;
     }
   }
   if (e.L && e.Ee & STATUS_ERROR) {
     if (e.J < clock) {
       recompute(e, true);
       return read(e);
-    } else throw e.X;
+    } else throw e.q;
   }
-  if (snapshotCaptureActive && t && t.se) {
+  if (snapshotCaptureActive && t && t.oe) {
     const n = e.re;
     if (n !== undefined) {
       const i = n === NO_SNAPSHOT ? undefined : n;
-      const r = e.ae !== NOT_PENDING ? e.ae : e.fe;
+      const r = e.le !== NOT_PENDING ? e.le : e.fe;
       if (r !== i) t.O |= REACTIVE_SNAPSHOT_STALE;
       return i;
     }
   }
+  if (e.Te !== undefined && e.Te !== NOT_PENDING) return e.Te;
   return !t ||
-    (currentOptimisticLane !== null && (e._e || e.ie || n === e || !!(n.Ee & STATUS_PENDING))) ||
-    e.ae === NOT_PENDING ||
+    (currentOptimisticLane !== null &&
+      (e.Te !== undefined || e.ie || n === e || !!(n.Ee & STATUS_PENDING))) ||
+    e.le === NOT_PENDING ||
     (stale && e.ne && activeTransition !== e.ne)
     ? e.fe
-    : e.ae;
+    : e.le;
 }
 function setSignal(e, t) {
   if (e.ne && activeTransition !== e.ne) globalQueue.initTransition(e.ne);
-  const n = e._e && !projectionWriteActive;
-  const i = n ? e.fe : e.ae === NOT_PENDING ? e.fe : e.ae;
-  if (typeof t === "function") t = t(i);
-  const r = !e.pe || !e.pe(i, t) || !!(e.Ee & STATUS_UNINITIALIZED);
-  if (!r) {
-    if (n && e.ae !== NOT_PENDING && e.L) {
+  const n = e.Te !== undefined && !projectionWriteActive;
+  const i = e.Te !== undefined && e.Te !== NOT_PENDING;
+  const r = n ? (i ? e.Te : e.fe) : e.le === NOT_PENDING ? e.fe : e.le;
+  if (typeof t === "function") t = t(r);
+  const o = !e.Ie || !e.Ie(r, t) || !!(e.Ee & STATUS_UNINITIALIZED);
+  if (!o) {
+    if (n && i && e.L) {
       insertSubs(e, true);
       schedule();
     }
     return t;
   }
   if (n) {
-    const n = globalQueue.$.includes(e);
-    if (e.ne && n) {
-      globalQueue.initTransition(e.ne);
-    }
-    if (e.ae === NOT_PENDING) {
-      e.ae = e.fe;
-    }
-    if (!n) {
+    const n = e.Te === NOT_PENDING;
+    if (!n && e.ne) globalQueue.initTransition(e.ne);
+    if (n) {
+      e.le = e.fe;
       globalQueue.$.push(e);
     }
-    e.Oe = (e.Oe || 0) + 1;
+    e.Oe = true;
     const i = getOrCreateLane(e);
     e.ie = i;
-    e.fe = t;
+    e.Te = t;
   } else {
-    if (e.ae === NOT_PENDING) globalQueue.F.push(e);
-    e.ae = t;
+    if (e.le === NOT_PENDING) globalQueue.M.push(e);
+    e.le = t;
   }
   updatePendingSignal(e);
-  if (e.he) {
-    setSignal(e.he, t);
+  if (e.pe) {
+    setSignal(e.pe, t);
   }
   e.J = clock;
   insertSubs(e, n);
@@ -1403,32 +1450,32 @@ function runWithOwner(e, t) {
   }
 }
 function getPendingSignal(e) {
-  if (!e.Me) {
-    e.Me = optimisticSignal(false, { pureWrite: true });
-    if (e.de) {
-      e.Me.de = e;
+  if (!e.Qe) {
+    e.Qe = optimisticSignal(false, { pureWrite: true });
+    if (e.Se) {
+      e.Qe.Se = e;
     }
-    if (computePendingState(e)) setSignal(e.Me, true);
+    if (computePendingState(e)) setSignal(e.Qe, true);
   }
-  return e.Me;
+  return e.Qe;
 }
 function computePendingState(e) {
   const t = e;
-  if (e._e && e.ae !== NOT_PENDING) {
+  if (e.Te !== undefined && e.Te !== NOT_PENDING) {
     if (t.Ee & STATUS_PENDING && !(t.Ee & STATUS_UNINITIALIZED)) return true;
-    if (e.de) {
+    if (e.Se) {
       const t = e.ie ? findLane(e.ie) : null;
       return !!(t && t.U.size > 0);
     }
     return true;
   }
-  if (e.ae !== NOT_PENDING && !(t.Ee & STATUS_UNINITIALIZED)) return true;
+  if (e.le !== NOT_PENDING && !(t.Ee & STATUS_UNINITIALIZED)) return true;
   return !!(t.Ee & STATUS_PENDING && !(t.Ee & STATUS_UNINITIALIZED));
 }
 function updatePendingSignal(e) {
-  if (e.Me) {
+  if (e.Qe) {
     const t = computePendingState(e);
-    const n = e.Me;
+    const n = e.Qe;
     setSignal(n, t);
     if (!t && n.ie) {
       const t = resolveLane(e);
@@ -1444,20 +1491,20 @@ function updatePendingSignal(e) {
   }
 }
 function getLatestValueComputed(e) {
-  if (!e.he) {
+  if (!e.pe) {
     const t = latestReadActive;
     latestReadActive = false;
     const n = pendingCheckActive;
     pendingCheckActive = false;
     const i = context;
     context = null;
-    e.he = optimisticComputed(() => read(e));
-    e.he.de = e;
+    e.pe = optimisticComputed(() => read(e));
+    e.pe.Se = e;
     context = i;
     pendingCheckActive = n;
     latestReadActive = t;
   }
-  return e.he;
+  return e.pe;
 }
 function staleValues(e, t = true) {
   const n = stale;
@@ -1518,7 +1565,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.ke[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.Le[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1528,10 +1575,10 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.ke = { ...n.ke, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.Le = { ...n.Le, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.ke[e.id]);
+  return !isUndefined(t?.Le[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
@@ -1547,13 +1594,13 @@ function action(e) {
     new Promise((n, i) => {
       const r = e(...t);
       globalQueue.initTransition();
-      let s = activeTransition;
-      s.ee.push(r);
+      let o = activeTransition;
+      o.ee.push(r);
       const done = (e, t) => {
-        s = currentTransition(s);
-        const o = s.ee.indexOf(r);
-        if (o >= 0) s.ee.splice(o, 1);
-        setActiveTransition(s);
+        o = currentTransition(o);
+        const s = o.ee.indexOf(r);
+        if (s >= 0) o.ee.splice(s, 1);
+        setActiveTransition(o);
         schedule();
         t ? i(t) : n(e);
       };
@@ -1565,32 +1612,37 @@ function action(e) {
           return done(undefined, e);
         }
         if (n instanceof Promise)
-          return void n.then(run, e => restoreTransition(s, () => step(e, true)));
+          return void n.then(run, e => restoreTransition(o, () => step(e, true)));
         run(n);
       };
       const run = e => {
         if (e.done) return done(e.value);
         if (e.value instanceof Promise)
           return void e.value.then(
-            e => restoreTransition(s, () => step(e)),
-            e => restoreTransition(s, () => step(e, true))
+            e => restoreTransition(o, () => step(e)),
+            e => restoreTransition(o, () => step(e, true))
           );
-        restoreTransition(s, () => step(e.value));
+        restoreTransition(o, () => step(e.value));
       };
       step();
     });
 }
+function accessor(e) {
+  const t = read.bind(null, e);
+  t.$r = true;
+  return t;
+}
 function createSignal(e, t, n) {
   if (typeof e === "function") {
     const i = computed(e, t, n);
-    return [read.bind(null, i), setSignal.bind(null, i)];
+    return [accessor(i), setSignal.bind(null, i)];
   }
   const i = signal(e, t);
-  return [read.bind(null, i), setSignal.bind(null, i)];
+  return [accessor(i), setSignal.bind(null, i)];
 }
 function createMemo(e, t, n) {
   let i = computed(e, t, n);
-  return read.bind(null, i);
+  return accessor(i);
 }
 function createEffect(e, t, n, i) {
   effect(e, t.effect || t, t.error, n, i);
@@ -1638,7 +1690,7 @@ function resolve(e) {
 }
 function createOptimistic(e, t, n) {
   const i = typeof e === "function" ? optimisticComputed(e, t, n) : optimisticSignal(e, t);
-  return [read.bind(null, i), setSignal.bind(null, i)];
+  return [accessor(i), setSignal.bind(null, i)];
 }
 function onSettled(e) {
   getOwner()
@@ -1660,128 +1712,128 @@ function getAllKeys(e, t, n) {
   const r = Object.keys(n);
   return Array.from(new Set([...i, ...r]));
 }
-function applyState(e, t, n, i) {
-  const r = t?.[$TARGET];
-  if (!r) return;
-  const s = r[STORE_VALUE];
-  const o = r[STORE_OVERRIDE];
-  const u = r[STORE_OPTIMISTIC_OVERRIDE];
-  let c = r[STORE_NODE];
-  if (e === s && !o && !u) return;
-  (r[STORE_LOOKUP] || storeLookup).set(e, r[$PROXY]);
-  r[STORE_VALUE] = e;
-  r[STORE_OVERRIDE] = undefined;
-  if (Array.isArray(s)) {
+function applyState(e, t, n) {
+  const i = t?.[$TARGET];
+  if (!i) return;
+  const r = i[STORE_VALUE];
+  const o = i[STORE_OVERRIDE];
+  const s = i[STORE_OPTIMISTIC_OVERRIDE];
+  let u = i[STORE_NODE];
+  if (e === r && !o && !s) return;
+  (i[STORE_LOOKUP] || storeLookup).set(e, i[$PROXY]);
+  i[STORE_VALUE] = e;
+  i[STORE_OVERRIDE] = undefined;
+  if (Array.isArray(r)) {
     let t = false;
-    const l = getOverrideValue(s, o, c, "length", u);
-    if (e.length && l && e[0] && n(e[0]) != null) {
-      let a, f, E, T, d, S, R, O;
+    const c = getOverrideValue(r, o, u, "length", s);
+    if (e.length && c && e[0] && n(e[0]) != null) {
+      let a, l, f, E, T, d, S, R;
       for (
-        E = 0, T = Math.min(l, e.length);
-        E < T &&
-        ((S = getOverrideValue(s, o, c, E, u)) === e[E] || (S && e[E] && n(S) === n(e[E])));
-        E++
+        f = 0, E = Math.min(c, e.length);
+        f < E &&
+        ((d = getOverrideValue(r, o, u, f, s)) === e[f] || (d && e[f] && n(d) === n(e[f])));
+        f++
       ) {
-        applyState(e[E], wrap(S, r), n, i);
+        applyState(e[f], wrap(d, i), n);
       }
-      const _ = new Array(e.length),
-        I = new Map();
+      const O = new Array(e.length),
+        _ = new Map();
       for (
-        T = l - 1, d = e.length - 1;
-        T >= E &&
-        d >= E &&
-        ((S = getOverrideValue(s, o, c, T, u)) === e[d] || (S && e[d] && n(S) === n(e[d])));
-        T--, d--
+        E = c - 1, T = e.length - 1;
+        E >= f &&
+        T >= f &&
+        ((d = getOverrideValue(r, o, u, E, s)) === e[T] || (d && e[T] && n(d) === n(e[T])));
+        E--, T--
       ) {
-        _[d] = S;
+        O[T] = d;
       }
-      if (E > d || E > T) {
-        for (f = E; f <= d; f++) {
+      if (f > T || f > E) {
+        for (l = f; l <= T; l++) {
           t = true;
-          r[STORE_NODE][f] && setSignal(r[STORE_NODE][f], wrap(e[f], r));
+          i[STORE_NODE][l] && setSignal(i[STORE_NODE][l], wrap(e[l], i));
         }
-        for (; f < e.length; f++) {
+        for (; l < e.length; l++) {
           t = true;
-          const s = wrap(_[f], r);
-          r[STORE_NODE][f] && setSignal(r[STORE_NODE][f], s);
-          applyState(e[f], s, n, i);
+          const r = wrap(O[l], i);
+          i[STORE_NODE][l] && setSignal(i[STORE_NODE][l], r);
+          applyState(e[l], r, n);
         }
-        t && r[STORE_NODE][$TRACK] && setSignal(r[STORE_NODE][$TRACK], void 0);
-        l !== e.length && r[STORE_NODE].length && setSignal(r[STORE_NODE].length, e.length);
+        t && i[STORE_NODE][$TRACK] && setSignal(i[STORE_NODE][$TRACK], void 0);
+        c !== e.length && i[STORE_NODE].length && setSignal(i[STORE_NODE].length, e.length);
         return;
       }
-      R = new Array(d + 1);
-      for (f = d; f >= E; f--) {
-        S = e[f];
-        O = S ? n(S) : S;
-        a = I.get(O);
-        R[f] = a === undefined ? -1 : a;
-        I.set(O, f);
-      }
-      for (a = E; a <= T; a++) {
-        S = getOverrideValue(s, o, c, a, u);
-        O = S ? n(S) : S;
-        f = I.get(O);
-        if (f !== undefined && f !== -1) {
-          _[f] = S;
-          f = R[f];
-          I.set(O, f);
+      S = new Array(T + 1);
+      for (l = T; l >= f; l--) {
+        d = e[l];
+        R = d ? n(d) : d;
+        a = _.get(R);
+        S[l] = a === undefined ? -1 : a;
+        _.set(R, l);
+      }
+      for (a = f; a <= E; a++) {
+        d = getOverrideValue(r, o, u, a, s);
+        R = d ? n(d) : d;
+        l = _.get(R);
+        if (l !== undefined && l !== -1) {
+          O[l] = d;
+          l = S[l];
+          _.set(R, l);
         }
       }
-      for (f = E; f < e.length; f++) {
-        if (f in _) {
-          const t = wrap(_[f], r);
-          r[STORE_NODE][f] && setSignal(r[STORE_NODE][f], t);
-          applyState(e[f], t, n, i);
-        } else r[STORE_NODE][f] && setSignal(r[STORE_NODE][f], wrap(e[f], r));
+      for (l = f; l < e.length; l++) {
+        if (l in O) {
+          const t = wrap(O[l], i);
+          i[STORE_NODE][l] && setSignal(i[STORE_NODE][l], t);
+          applyState(e[l], t, n);
+        } else i[STORE_NODE][l] && setSignal(i[STORE_NODE][l], wrap(e[l], i));
       }
-      if (E < e.length) t = true;
+      if (f < e.length) t = true;
     } else if (e.length) {
-      for (let t = 0, l = e.length; t < l; t++) {
-        const l = getOverrideValue(s, o, c, t, u);
-        isWrappable(l)
-          ? applyState(e[t], wrap(l, r), n, i)
-          : r[STORE_NODE][t] && setSignal(r[STORE_NODE][t], e[t]);
+      for (let t = 0, c = e.length; t < c; t++) {
+        const c = getOverrideValue(r, o, u, t, s);
+        isWrappable(c)
+          ? applyState(e[t], wrap(c, i), n)
+          : i[STORE_NODE][t] && setSignal(i[STORE_NODE][t], e[t]);
       }
     }
-    if (l !== e.length) {
+    if (c !== e.length) {
       t = true;
-      r[STORE_NODE].length && setSignal(r[STORE_NODE].length, e.length);
+      i[STORE_NODE].length && setSignal(i[STORE_NODE].length, e.length);
     }
-    t && r[STORE_NODE][$TRACK] && setSignal(r[STORE_NODE][$TRACK], void 0);
+    t && i[STORE_NODE][$TRACK] && setSignal(i[STORE_NODE][$TRACK], void 0);
     return;
   }
-  if (c) {
-    const t = c[$TRACK];
-    const l = t || i ? getAllKeys(s, o, e) : Object.keys(c);
-    for (let a = 0, f = l.length; a < f; a++) {
-      const f = l[a];
-      const E = c[f];
-      const T = unwrap(getOverrideValue(s, o, c, f, u));
-      let d = unwrap(e[f]);
-      if (T === d) continue;
-      if (!T || !isWrappable(T) || !isWrappable(d) || (n(T) != null && n(T) !== n(d))) {
+  if (u) {
+    const t = u[$TRACK];
+    const c = t ? getAllKeys(r, o, e) : Object.keys(u);
+    for (let a = 0, l = c.length; a < l; a++) {
+      const l = c[a];
+      const f = u[l];
+      const E = unwrap(getOverrideValue(r, o, u, l, s));
+      let T = unwrap(e[l]);
+      if (E === T) continue;
+      if (!E || !isWrappable(E) || !isWrappable(T) || (n(E) != null && n(E) !== n(T))) {
         t && setSignal(t, void 0);
-        E && setSignal(E, isWrappable(d) ? wrap(d, r) : d);
-      } else applyState(d, wrap(T, r), n, i);
+        f && setSignal(f, isWrappable(T) ? wrap(T, i) : T);
+      } else applyState(T, wrap(E, i), n);
     }
   }
-  if ((c = r[STORE_HAS])) {
-    const t = Object.keys(c);
+  if ((u = i[STORE_HAS])) {
+    const t = Object.keys(u);
     for (let n = 0, i = t.length; n < i; n++) {
       const i = t[n];
-      setSignal(c[i], i in e);
+      setSignal(u[i], i in e);
     }
   }
 }
-function reconcile(e, t, n = false) {
-  return i => {
-    if (i == null) throw new Error("Cannot reconcile null or undefined state");
-    const r = typeof t === "string" ? e => e[t] : t;
-    const s = r(i);
-    if (s !== undefined && r(e) !== r(i))
+function reconcile(e, t) {
+  return n => {
+    if (n == null) throw new Error("Cannot reconcile null or undefined state");
+    const i = typeof t === "string" ? e => e[t] : t;
+    const r = i(n);
+    if (r !== undefined && i(e) !== i(n))
       throw new Error("Cannot reconcile states with different identity");
-    applyState(e, i, r, n);
+    applyState(e, n, i);
   };
 }
 function createProjectionInternal(e, t = {}, n) {
@@ -1804,18 +1856,18 @@ function createProjectionInternal(e, t = {}, n) {
     r.set(e, t);
     return t;
   };
-  const s = wrapProjection(t);
+  const o = wrapProjection(t);
   i = computed(() => {
     const t = getOwner();
-    storeSetter(new Proxy(s, writeTraps), i => {
+    storeSetter(new Proxy(o, writeTraps), i => {
       const r = handleAsync(t, e(i), e => {
-        e !== i && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
+        e !== i && e !== undefined && storeSetter(o, reconcile(e, n?.key || "id"));
       });
-      r !== i && r !== undefined && reconcile(r, n?.key || "id", n?.all)(s);
+      r !== i && r !== undefined && reconcile(r, n?.key || "id")(o);
     });
   });
-  i.Ce = true;
-  return { store: s, node: i };
+  i.Pe = true;
+  return { store: o, node: i };
 }
 function createProjection(e, t = {}, n) {
   return createProjectionInternal(e, t, n).store;
@@ -1857,11 +1909,9 @@ const writeTraps = {
   }
 };
 const $TRACK = Symbol(0),
-  $DEEP = Symbol(0),
   $TARGET = Symbol(0),
   $PROXY = Symbol(0),
   $DELETED = Symbol(0);
-const PARENTS = new WeakMap();
 const STORE_VALUE = "v",
   STORE_OVERRIDE = "o",
   STORE_OPTIMISTIC_OVERRIDE = "x",
@@ -1902,7 +1952,7 @@ function getNodes(e, t) {
   if (!n) e[t] = n = Object.create(null);
   return n;
 }
-function getNode(e, t, n, i, r = isEqual, s, o) {
+function getNode(e, t, n, i, r = isEqual, o, s) {
   if (e[t]) return e[t];
   const u = signal(
     n,
@@ -1914,9 +1964,11 @@ function getNode(e, t, n, i, r = isEqual, s, o) {
     },
     i
   );
-  if (s) u._e = true;
-  if (o && t in o) {
-    const e = o[t];
+  if (o) {
+    u.Te = NOT_PENDING;
+  }
+  if (s && t in s) {
+    const e = s[t];
     u.re = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources?.add(u);
   }
@@ -1932,8 +1984,8 @@ function getKeys(e, t, n = true) {
   const i = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
   if (!t) return i;
   const r = new Set(i);
-  const s = Reflect.ownKeys(t);
-  for (const e of s) {
+  const o = Reflect.ownKeys(t);
+  for (const e of o) {
     if (t[e] !== $DELETED) r.add(e);
     else r.delete(e);
   }
@@ -1953,16 +2005,16 @@ const storeTraps = {
     if (t === $TARGET) return e;
     if (t === $PROXY) return n;
     if (t === $REFRESH) return e[STORE_FIREWALL];
-    if (t === $TRACK || t === $DEEP) {
-      trackSelf(e, t);
+    if (t === $TRACK) {
+      trackSelf(e);
       return n;
     }
     const i = getNodes(e, STORE_NODE);
     const r = i[t];
-    const s = e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE];
-    const o = s || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]);
+    const o = e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE];
+    const s = o || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]);
     const u = !!e[STORE_VALUE][$TARGET];
-    const c = s
+    const c = o
       ? e[STORE_OPTIMISTIC_OVERRIDE]
       : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
         ? e[STORE_OVERRIDE]
@@ -1972,29 +2024,36 @@ const storeTraps = {
       if (e && e.get) return e.get.call(n);
     }
     if (writeOnly(n)) {
-      let n = r && (o || !u) ? (r.ae !== NOT_PENDING ? (r._e ? r.fe : r.ae) : r.fe) : c[t];
+      let n =
+        r && (s || !u)
+          ? r.Te !== undefined && r.Te !== NOT_PENDING
+            ? r.Te
+            : r.le !== NOT_PENDING
+              ? r.le
+              : r.fe
+          : c[t];
       n === $DELETED && (n = undefined);
       if (!isWrappable(n)) return n;
       const i = wrap(n, e);
       Writing?.add(i);
       return i;
     }
-    let l = r ? (o || !u ? read(i[t]) : (read(i[t]), c[t])) : c[t];
-    l === $DELETED && (l = undefined);
+    let a = r ? (s || !u ? read(i[t]) : (read(i[t]), c[t])) : c[t];
+    a === $DELETED && (a = undefined);
     if (!r) {
-      if (!o && typeof l === "function" && !c.hasOwnProperty(t)) {
+      if (!s && typeof a === "function" && !c.hasOwnProperty(t)) {
         let t;
         return !Array.isArray(e[STORE_VALUE]) &&
           (t = Object.getPrototypeOf(e[STORE_VALUE])) &&
           t !== Object.prototype
-          ? l.bind(c)
-          : l;
+          ? a.bind(c)
+          : a;
       } else if (getObserver()) {
         return read(
           getNode(
             i,
             t,
-            isWrappable(l) ? wrap(l, e) : l,
+            isWrappable(a) ? wrap(a, e) : a,
             e[STORE_FIREWALL],
             isEqual,
             e[STORE_OPTIMISTIC],
@@ -2003,7 +2062,7 @@ const storeTraps = {
         );
       }
     }
-    return isWrappable(l) ? wrap(l, e) : l;
+    return isWrappable(a) ? wrap(a, e) : a;
   },
   has(e, t) {
     if (t === $PROXY || t === $TRACK || t === "__proto__") return true;
@@ -2028,45 +2087,44 @@ const storeTraps = {
       }
       untrack(() => {
         const r = e[STORE_VALUE];
-        const s = r[t];
-        if (snapshotCaptureActive && typeof t !== "symbol") {
+        const o = r[t];
+        if (
+          snapshotCaptureActive &&
+          typeof t !== "symbol" &&
+          !((e[STORE_FIREWALL]?.Ee ?? 0) & STATUS_PENDING)
+        ) {
           if (!e[STORE_SNAPSHOT_PROPS]) {
             e[STORE_SNAPSHOT_PROPS] = Object.create(null);
             snapshotSources?.add(e);
           }
           if (!(t in e[STORE_SNAPSHOT_PROPS])) {
-            e[STORE_SNAPSHOT_PROPS][t] = s;
+            e[STORE_SNAPSHOT_PROPS][t] = o;
           }
         }
-        const o = e[STORE_OPTIMISTIC] && !projectionWriteActive;
-        const u = o ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
-        if (o) trackOptimisticStore(i);
+        const s = e[STORE_OPTIMISTIC] && !projectionWriteActive;
+        const u = s ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
+        if (s) trackOptimisticStore(i);
         const c =
           e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]
             ? e[STORE_OPTIMISTIC_OVERRIDE][t]
             : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
               ? e[STORE_OVERRIDE][t]
-              : s;
-        const l = n?.[$TARGET]?.[STORE_VALUE] ?? n;
-        if (c === l) return true;
-        const a = e[STORE_OPTIMISTIC_OVERRIDE]?.length || e[STORE_OVERRIDE]?.length || r.length;
-        if (l !== undefined && l === s) delete e[u][t];
-        else (e[u] || (e[u] = Object.create(null)))[t] = l;
-        const f = isWrappable(l);
-        if (isWrappable(c)) {
-          const e = PARENTS.get(c);
-          e && (e instanceof Set ? e.delete(i) : PARENTS.delete(c));
-        }
-        if (recursivelyNotify(i, storeLookup) && f) recursivelyAddParent(l, i);
+              : o;
+        const a = n?.[$TARGET]?.[STORE_VALUE] ?? n;
+        if (c === a) return true;
+        const l = e[STORE_OPTIMISTIC_OVERRIDE]?.length || e[STORE_OVERRIDE]?.length || r.length;
+        if (a !== undefined && a === o) delete e[u][t];
+        else (e[u] || (e[u] = Object.create(null)))[t] = a;
+        const f = isWrappable(a);
         e[STORE_HAS]?.[t] && setSignal(e[STORE_HAS][t], true);
         const E = getNodes(e, STORE_NODE);
-        E[t] && setSignal(E[t], () => (f ? wrap(l, e) : l));
+        E[t] && setSignal(E[t], () => (f ? wrap(a, e) : a));
         if (Array.isArray(r)) {
           if (t === "length") {
-            E.length && setSignal(E.length, l);
+            E.length && setSignal(E.length, a);
           } else {
             const e = parseInt(t) + 1;
-            if (e > a) E.length && setSignal(E.length, e);
+            if (e > l) E.length && setSignal(E.length, e);
           }
         }
         E[$TRACK] && setSignal(E[$TRACK], undefined);
@@ -2093,14 +2151,10 @@ const storeTraps = {
         } else if (e[i] && t in e[i]) {
           delete e[i][t];
         } else return true;
-        if (isWrappable(r)) {
-          const t = PARENTS.get(r);
-          t && (t instanceof Set ? t.delete(e) : PARENTS.delete(r));
-        }
         if (e[STORE_HAS]?.[t]) setSignal(e[STORE_HAS][t], false);
-        const s = getNodes(e, STORE_NODE);
-        s[t] && setSignal(s[t], undefined);
-        s[$TRACK] && setSignal(s[$TRACK], undefined);
+        const o = getNodes(e, STORE_NODE);
+        o[t] && setSignal(o[t], undefined);
+        o[$TRACK] && setSignal(o[$TRACK], undefined);
       });
     }
     return true;
@@ -2167,66 +2221,13 @@ function createStore(e, t, n) {
     r = i ? createProjectionInternal(e, t, n).store : wrap(e);
   return [r, e => storeSetter(r, e)];
 }
-function recursivelyNotify(e, t) {
-  let n = e[$TARGET] || t?.get(e)?.[$TARGET];
-  let i = false;
-  if (n) {
-    const e = getNodes(n, STORE_NODE)[$DEEP];
-    if (e) {
-      setSignal(e, undefined);
-      i = true;
-    }
-    t = n[STORE_LOOKUP] || t;
-  }
-  const r = PARENTS.get(n?.[STORE_VALUE] || e);
-  if (!r) return i;
-  if (r instanceof Set) {
-    for (let e of r) i = recursivelyNotify(e, t) || i;
-  } else i = recursivelyNotify(r, t) || i;
-  return i;
-}
-function recursivelyAddParent(e, t) {
-  let n;
-  const i = e[$TARGET];
-  if (i) {
-    n = i[STORE_OVERRIDE];
-    e = i[STORE_VALUE];
-  }
-  if (t) {
-    let n = PARENTS.get(e);
-    if (!n) PARENTS.set(e, t);
-    else if (n !== t) {
-      if (!(n instanceof Set)) PARENTS.set(e, (n = new Set([n])));
-      else if (n.has(t)) return;
-      n.add(t);
-    } else return;
-  }
-  if (Array.isArray(e)) {
-    const t = n?.length || e.length;
-    for (let i = 0; i < t; i++) {
-      const t = n && i in n ? n[i] : e[i];
-      isWrappable(t) && recursivelyAddParent(t, e);
-    }
-  } else {
-    const t = getKeys(e, n);
-    for (let i = 0; i < t.length; i++) {
-      const r = t[i];
-      const s = n && r in n ? n[r] : e[r];
-      isWrappable(s) && recursivelyAddParent(s, e);
-    }
-  }
-}
-function deep(e) {
-  recursivelyAddParent(e);
-  return e[$DEEP];
-}
 function createOptimisticStore(e, t, n) {
-  GlobalQueue.Z ||= clearOptimisticStore;
+  GlobalQueue.B ||= clearOptimisticStore;
   const i = typeof e === "function";
   const r = (i ? t : e) ?? {};
-  const s = i ? e : undefined;
-  const { store: o } = createOptimisticProjectionInternal(s, r, n);
-  return [o, e => storeSetter(o, e)];
+  const o = i ? e : undefined;
+  const { store: s } = createOptimisticProjectionInternal(o, r, n);
+  return [s, e => storeSetter(s, e)];
 }
 function clearOptimisticStore(e) {
   const t = e[$TARGET];
@@ -2276,30 +2277,30 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
     r.set(e, t);
     return t;
   };
-  const s = wrapProjection(t);
+  const o = wrapProjection(t);
   if (e) {
     i = computed(() => {
       const t = getOwner();
       setProjectionWriteActive(true);
       try {
-        storeSetter(new Proxy(s, writeTraps), i => {
+        storeSetter(new Proxy(o, writeTraps), i => {
           const r = handleAsync(t, e(i), e => {
             setProjectionWriteActive(true);
             try {
-              e !== i && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
+              e !== i && e !== undefined && storeSetter(o, reconcile(e, n?.key || "id"));
             } finally {
               setProjectionWriteActive(false);
             }
           });
-          r !== i && r !== undefined && reconcile(r, n?.key || "id", n?.all)(s);
+          r !== i && r !== undefined && reconcile(r, n?.key || "id")(o);
         });
       } finally {
         setProjectionWriteActive(false);
       }
     });
-    i.Ce = true;
+    i.Pe = true;
   }
-  return { store: s, node: i };
+  return { store: o, node: i };
 }
 const DELETE = Symbol(0);
 function updatePath(e, t, n = 0) {
@@ -2307,8 +2308,8 @@ function updatePath(e, t, n = 0) {
     r = e;
   if (n < t.length - 1) {
     i = t[n];
-    const s = typeof i;
-    const o = Array.isArray(e);
+    const o = typeof i;
+    const s = Array.isArray(e);
     if (Array.isArray(i)) {
       for (let r = 0; r < i.length; r++) {
         t[n] = i[r];
@@ -2316,7 +2317,7 @@ function updatePath(e, t, n = 0) {
       }
       t[n] = i;
       return;
-    } else if (o && s === "function") {
+    } else if (s && o === "function") {
       for (let r = 0; r < e.length; r++) {
         if (i(e[r], r)) {
           t[n] = r;
@@ -2325,9 +2326,9 @@ function updatePath(e, t, n = 0) {
       }
       t[n] = i;
       return;
-    } else if (o && s === "object") {
-      const { from: r = 0, to: s = e.length - 1, by: o = 1 } = i;
-      for (let i = r; i <= s; i += o) {
+    } else if (s && o === "object") {
+      const { from: r = 0, to: o = e.length - 1, by: s = 1 } = i;
+      for (let i = r; i <= o; i += s) {
         t[n] = i;
         updatePath(e, t, n);
       }
@@ -2339,20 +2340,20 @@ function updatePath(e, t, n = 0) {
     }
     r = e[i];
   }
-  let s = t[t.length - 1];
-  if (typeof s === "function") {
-    s = s(r);
-    if (s === r) return;
+  let o = t[t.length - 1];
+  if (typeof o === "function") {
+    o = o(r);
+    if (o === r) return;
   }
-  if (i === undefined && s == undefined) return;
-  if (s === DELETE) {
+  if (i === undefined && o == undefined) return;
+  if (o === DELETE) {
     delete e[i];
-  } else if (i === undefined || (isWrappable(r) && isWrappable(s) && !Array.isArray(s))) {
+  } else if (i === undefined || (isWrappable(r) && isWrappable(o) && !Array.isArray(o))) {
     const t = i !== undefined ? e[i] : e;
-    const n = Object.keys(s);
-    for (let e = 0; e < n.length; e++) t[n[e]] = s[n[e]];
+    const n = Object.keys(o);
+    for (let e = 0; e < n.length; e++) t[n[e]] = o[n[e]];
   } else {
-    e[i] = s;
+    e[i] = o;
   }
 }
 const storePath = Object.assign(
@@ -2363,51 +2364,60 @@ const storePath = Object.assign(
   },
   { DELETE: DELETE }
 );
-function snapshot(e, t, n) {
-  let i, r, s, o, u, c;
+function snapshotImpl(e, t, n, i) {
+  let r, o, s, u, c, a;
   if (!isWrappable(e)) return e;
-  if (t && t.has(e)) return t.get(e);
-  if (!t) t = new Map();
-  if ((i = e[$TARGET] || n?.get(e)?.[$TARGET])) {
-    s = i[STORE_OVERRIDE];
-    r = Array.isArray(i[STORE_VALUE]);
-    t.set(
+  if (n && n.has(e)) return n.get(e);
+  if (!n) n = new Map();
+  if ((r = e[$TARGET] || i?.get(e)?.[$TARGET])) {
+    if (t) trackSelf(r, $TRACK);
+    s = r[STORE_OVERRIDE];
+    o = Array.isArray(r[STORE_VALUE]);
+    n.set(
       e,
-      s ? (o = r ? [] : Object.create(Object.getPrototypeOf(i[STORE_VALUE]))) : i[STORE_VALUE]
+      s ? (u = o ? [] : Object.create(Object.getPrototypeOf(r[STORE_VALUE]))) : r[STORE_VALUE]
     );
-    e = i[STORE_VALUE];
-    n = storeLookup;
+    e = r[STORE_VALUE];
+    i = storeLookup;
   } else {
-    r = Array.isArray(e);
-    t.set(e, e);
+    o = Array.isArray(e);
+    n.set(e, e);
   }
-  if (r) {
-    const i = s?.length || e.length;
-    for (let r = 0; r < i; r++) {
-      c = s && r in s ? s[r] : e[r];
-      if (c === $DELETED) continue;
-      if ((u = snapshot(c, t, n)) !== c || o) {
-        if (!o) t.set(e, (o = [...e]));
-        o[r] = u;
+  if (o) {
+    const o = s?.length || e.length;
+    for (let l = 0; l < o; l++) {
+      a = s && l in s ? s[l] : e[l];
+      if (a === $DELETED) continue;
+      if (t && isWrappable(a)) wrap(a, r);
+      if ((c = snapshotImpl(a, t, n, i)) !== a || u) {
+        if (!u) n.set(e, (u = [...e]));
+        u[l] = c;
       }
     }
   } else {
-    const i = getKeys(e, s);
-    for (let r = 0, l = i.length; r < l; r++) {
-      let l = i[r];
-      const a = getPropertyDescriptor(e, s, l);
-      if (a.get) continue;
-      c = s && l in s ? s[l] : e[l];
-      if ((u = snapshot(c, t, n)) !== e[l] || o) {
-        if (!o) {
-          o = Object.create(Object.getPrototypeOf(e));
-          Object.assign(o, e);
+    const o = getKeys(e, s);
+    for (let l = 0, f = o.length; l < f; l++) {
+      let f = o[l];
+      const E = getPropertyDescriptor(e, s, f);
+      if (E.get) continue;
+      a = s && f in s ? s[f] : e[f];
+      if (t && isWrappable(a)) wrap(a, r);
+      if ((c = snapshotImpl(a, t, n, i)) !== e[f] || u) {
+        if (!u) {
+          u = Object.create(Object.getPrototypeOf(e));
+          Object.assign(u, e);
         }
-        o[l] = u;
+        u[f] = c;
       }
     }
   }
-  return o || e;
+  return u || e;
+}
+function snapshot(e, t, n) {
+  return snapshotImpl(e, false, t, n);
+}
+function deep(e) {
+  return snapshotImpl(e, true);
 }
 function trueFn() {
   return true;
@@ -2449,8 +2459,8 @@ function merge(...e) {
   for (let i = 0; i < e.length; i++) {
     const r = e[i];
     t = t || (!!r && $PROXY in r);
-    const s = !!r && r[$SOURCES];
-    if (s) n.push(...s);
+    const o = !!r && r[$SOURCES];
+    if (o) n.push(...o);
     else n.push(typeof r === "function" ? ((t = true), createMemo(r)) : r);
   }
   if (SUPPORTS_PROXY && t) {
@@ -2480,35 +2490,35 @@ function merge(...e) {
   }
   const i = Object.create(null);
   let r = false;
-  let s = n.length - 1;
-  for (let e = s; e >= 0; e--) {
+  let o = n.length - 1;
+  for (let e = o; e >= 0; e--) {
     const t = n[e];
     if (!t) {
-      e === s && s--;
+      e === o && o--;
       continue;
     }
-    const o = Object.getOwnPropertyNames(t);
-    for (let n = o.length - 1; n >= 0; n--) {
-      const u = o[n];
+    const s = Object.getOwnPropertyNames(t);
+    for (let n = s.length - 1; n >= 0; n--) {
+      const u = s[n];
       if (u === "__proto__" || u === "constructor") continue;
       if (!i[u]) {
-        r = r || e !== s;
+        r = r || e !== o;
         const n = Object.getOwnPropertyDescriptor(t, u);
         i[u] = n.get ? { enumerable: true, configurable: true, get: n.get.bind(t) } : n;
       }
     }
   }
-  if (!r) return n[s];
-  const o = {};
+  if (!r) return n[o];
+  const s = {};
   const u = Object.keys(i);
   for (let e = u.length - 1; e >= 0; e--) {
     const t = u[e],
       n = i[t];
-    if (n.get) Object.defineProperty(o, t, n);
-    else o[t] = n.value;
+    if (n.get) Object.defineProperty(s, t, n);
+    else s[t] = n.value;
   }
-  o[$SOURCES] = n;
-  return o;
+  s[$SOURCES] = n;
+  return s;
 }
 function omit(e, ...t) {
   const n = new Set(t);
@@ -2542,26 +2552,26 @@ function omit(e, ...t) {
 function mapArray(e, t, n) {
   const i = typeof n?.keyed === "function" ? n.keyed : undefined;
   const r = t.length > 1;
-  const s = t;
+  const o = t;
   return createMemo(
     updateKeyedMap.bind({
       Fe: createOwner(),
-      $e: 0,
-      je: e,
-      Ke: [],
-      Ye: s,
-      Ze: [],
+      Me: 0,
+      $e: e,
+      je: [],
+      Ke: o,
+      Ye: [],
       Be: [],
-      Xe: i,
+      Ze: i,
       qe: i || n?.keyed === false ? [] : undefined,
-      ze: r ? [] : undefined,
-      Je: n?.fallback
+      Xe: r ? [] : undefined,
+      ze: n?.fallback
     })
   );
 }
 const pureOptions = { pureWrite: true };
 function updateKeyedMap() {
-  const e = this.je() || [],
+  const e = this.$e() || [],
     t = e.length;
   e[$TRACK];
   runWithOwner(this.Fe, () => {
@@ -2570,192 +2580,189 @@ function updateKeyedMap() {
       r = this.qe
         ? () => {
             this.qe[i] = signal(e[i], pureOptions);
-            this.ze && (this.ze[i] = signal(i, pureOptions));
-            return this.Ye(
-              read.bind(null, this.qe[i]),
-              this.ze ? read.bind(null, this.ze[i]) : undefined
-            );
+            this.Xe && (this.Xe[i] = signal(i, pureOptions));
+            return this.Ke(accessor(this.qe[i]), this.Xe ? accessor(this.Xe[i]) : undefined);
           }
-        : this.ze
+        : this.Xe
           ? () => {
               const t = e[i];
-              this.ze[i] = signal(i, pureOptions);
-              return this.Ye(() => t, read.bind(null, this.ze[i]));
+              this.Xe[i] = signal(i, pureOptions);
+              return this.Ke(() => t, accessor(this.Xe[i]));
             }
           : () => {
               const t = e[i];
-              return this.Ye(() => t);
+              return this.Ke(() => t);
             };
     if (t === 0) {
-      if (this.$e !== 0) {
+      if (this.Me !== 0) {
         this.Fe.dispose(false);
         this.Be = [];
-        this.Ke = [];
-        this.Ze = [];
-        this.$e = 0;
+        this.je = [];
+        this.Ye = [];
+        this.Me = 0;
         this.qe && (this.qe = []);
-        this.ze && (this.ze = []);
+        this.Xe && (this.Xe = []);
       }
-      if (this.Je && !this.Ze[0]) {
-        this.Ze[0] = runWithOwner((this.Be[0] = createOwner()), this.Je);
+      if (this.ze && !this.Ye[0]) {
+        this.Ye[0] = runWithOwner((this.Be[0] = createOwner()), this.ze);
       }
-    } else if (this.$e === 0) {
+    } else if (this.Me === 0) {
       if (this.Be[0]) this.Be[0].dispose();
-      this.Ze = new Array(t);
+      this.Ye = new Array(t);
       for (i = 0; i < t; i++) {
-        this.Ke[i] = e[i];
-        this.Ze[i] = runWithOwner((this.Be[i] = createOwner()), r);
+        this.je[i] = e[i];
+        this.Ye[i] = runWithOwner((this.Be[i] = createOwner()), r);
       }
-      this.$e = t;
+      this.Me = t;
     } else {
-      let s,
-        o,
+      let o,
+        s,
         u,
         c,
-        l,
         a,
+        l,
         f,
         E = new Array(t),
         T = new Array(t),
         d = this.qe ? new Array(t) : undefined,
-        S = this.ze ? new Array(t) : undefined;
+        S = this.Xe ? new Array(t) : undefined;
       for (
-        s = 0, o = Math.min(this.$e, t);
-        s < o && (this.Ke[s] === e[s] || (this.qe && compare(this.Xe, this.Ke[s], e[s])));
-        s++
+        o = 0, s = Math.min(this.Me, t);
+        o < s && (this.je[o] === e[o] || (this.qe && compare(this.Ze, this.je[o], e[o])));
+        o++
       ) {
-        if (this.qe) setSignal(this.qe[s], e[s]);
+        if (this.qe) setSignal(this.qe[o], e[o]);
       }
       for (
-        o = this.$e - 1, u = t - 1;
-        o >= s &&
-        u >= s &&
-        (this.Ke[o] === e[u] || (this.qe && compare(this.Xe, this.Ke[o], e[u])));
-        o--, u--
+        s = this.Me - 1, u = t - 1;
+        s >= o &&
+        u >= o &&
+        (this.je[s] === e[u] || (this.qe && compare(this.Ze, this.je[s], e[u])));
+        s--, u--
       ) {
-        E[u] = this.Ze[o];
-        T[u] = this.Be[o];
-        d && (d[u] = this.qe[o]);
-        S && (S[u] = this.ze[o]);
+        E[u] = this.Ye[s];
+        T[u] = this.Be[s];
+        d && (d[u] = this.qe[s]);
+        S && (S[u] = this.Xe[s]);
       }
-      a = new Map();
+      l = new Map();
       f = new Array(u + 1);
-      for (i = u; i >= s; i--) {
+      for (i = u; i >= o; i--) {
         c = e[i];
-        l = this.Xe ? this.Xe(c) : c;
-        n = a.get(l);
+        a = this.Ze ? this.Ze(c) : c;
+        n = l.get(a);
         f[i] = n === undefined ? -1 : n;
-        a.set(l, i);
+        l.set(a, i);
       }
-      for (n = s; n <= o; n++) {
-        c = this.Ke[n];
-        l = this.Xe ? this.Xe(c) : c;
-        i = a.get(l);
+      for (n = o; n <= s; n++) {
+        c = this.je[n];
+        a = this.Ze ? this.Ze(c) : c;
+        i = l.get(a);
         if (i !== undefined && i !== -1) {
-          E[i] = this.Ze[n];
+          E[i] = this.Ye[n];
           T[i] = this.Be[n];
           d && (d[i] = this.qe[n]);
-          S && (S[i] = this.ze[n]);
+          S && (S[i] = this.Xe[n]);
           i = f[i];
-          a.set(l, i);
+          l.set(a, i);
         } else this.Be[n].dispose();
       }
-      for (i = s; i < t; i++) {
+      for (i = o; i < t; i++) {
         if (i in E) {
-          this.Ze[i] = E[i];
+          this.Ye[i] = E[i];
           this.Be[i] = T[i];
           if (d) {
             this.qe[i] = d[i];
             setSignal(this.qe[i], e[i]);
           }
           if (S) {
-            this.ze[i] = S[i];
-            setSignal(this.ze[i], i);
+            this.Xe[i] = S[i];
+            setSignal(this.Xe[i], i);
           }
         } else {
-          this.Ze[i] = runWithOwner((this.Be[i] = createOwner()), r);
+          this.Ye[i] = runWithOwner((this.Be[i] = createOwner()), r);
         }
       }
-      this.Ze = this.Ze.slice(0, (this.$e = t));
-      this.Ke = e.slice(0);
+      this.Ye = this.Ye.slice(0, (this.Me = t));
+      this.je = e.slice(0);
     }
   });
-  return this.Ze;
+  return this.Ye;
 }
 function repeat(e, t, n) {
   const i = t;
   return updateRepeat.bind({
     Fe: createOwner(),
-    $e: 0,
-    et: 0,
-    tt: e,
-    Ye: i,
+    Me: 0,
+    Je: 0,
+    et: e,
+    Ke: i,
     Be: [],
-    Ze: [],
-    nt: n?.from,
-    Je: n?.fallback
+    Ye: [],
+    tt: n?.from,
+    ze: n?.fallback
   });
 }
 function updateRepeat() {
-  const e = this.tt();
-  const t = this.nt?.() || 0;
+  const e = this.et();
+  const t = this.tt?.() || 0;
   runWithOwner(this.Fe, () => {
     if (e === 0) {
-      if (this.$e !== 0) {
+      if (this.Me !== 0) {
         this.Fe.dispose(false);
         this.Be = [];
-        this.Ze = [];
-        this.$e = 0;
+        this.Ye = [];
+        this.Me = 0;
       }
-      if (this.Je && !this.Ze[0]) {
-        this.Ze[0] = runWithOwner((this.Be[0] = createOwner()), this.Je);
+      if (this.ze && !this.Ye[0]) {
+        this.Ye[0] = runWithOwner((this.Be[0] = createOwner()), this.ze);
       }
       return;
     }
     const n = t + e;
-    const i = this.et + this.$e;
-    if (this.$e === 0 && this.Be[0]) this.Be[0].dispose();
-    for (let e = n; e < i; e++) this.Be[e - this.et].dispose();
-    if (this.et < t) {
-      let e = this.et;
-      while (e < t && e < this.$e) this.Be[e++].dispose();
-      this.Be.splice(0, t - this.et);
-      this.Ze.splice(0, t - this.et);
-    } else if (this.et > t) {
-      let n = i - this.et - 1;
-      let r = this.et - t;
-      this.Be.length = this.Ze.length = e;
+    const i = this.Je + this.Me;
+    if (this.Me === 0 && this.Be[0]) this.Be[0].dispose();
+    for (let e = n; e < i; e++) this.Be[e - this.Je].dispose();
+    if (this.Je < t) {
+      let e = this.Je;
+      while (e < t && e < this.Me) this.Be[e++].dispose();
+      this.Be.splice(0, t - this.Je);
+      this.Ye.splice(0, t - this.Je);
+    } else if (this.Je > t) {
+      let n = i - this.Je - 1;
+      let r = this.Je - t;
+      this.Be.length = this.Ye.length = e;
       while (n >= r) {
         this.Be[n] = this.Be[n - r];
-        this.Ze[n] = this.Ze[n - r];
+        this.Ye[n] = this.Ye[n - r];
         n--;
       }
       for (let e = 0; e < r; e++) {
-        this.Ze[e] = runWithOwner((this.Be[e] = createOwner()), () => this.Ye(e + t));
+        this.Ye[e] = runWithOwner((this.Be[e] = createOwner()), () => this.Ke(e + t));
       }
     }
     for (let e = i; e < n; e++) {
-      this.Ze[e - t] = runWithOwner((this.Be[e - t] = createOwner()), () => this.Ye(e));
+      this.Ye[e - t] = runWithOwner((this.Be[e - t] = createOwner()), () => this.Ke(e));
     }
-    this.Ze = this.Ze.slice(0, e);
-    this.et = t;
-    this.$e = e;
+    this.Ye = this.Ye.slice(0, e);
+    this.Je = t;
+    this.Me = e;
   });
-  return this.Ze;
+  return this.Ye;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
 }
 function boundaryComputed(e, t) {
   const n = computed(e, undefined, { lazy: true });
-  n.Ae = (e, t) => {
+  n.he = (e, t) => {
     const i = e !== undefined ? e : n.Ee;
-    const r = t !== undefined ? t : n.X;
-    n.Ee &= ~n.it;
-    n.ce.notify(n, n.it, i, r);
+    const r = t !== undefined ? t : n.q;
+    n.Ee &= ~n.nt;
+    n.ce.notify(n, n.nt, i, r);
   };
-  n.it = t;
-  n.Ce = true;
+  n.nt = t;
+  n.Pe = true;
   recompute(n, true);
   return n;
 }
@@ -2768,64 +2775,90 @@ function createBoundChildren(e, t, n, i) {
     return boundaryComputed(() => staleValues(() => flatten(read(e))), i);
   });
 }
+const ON_INIT = Symbol();
 class CollectionQueue extends Queue {
-  rt;
-  st = new Set();
+  it;
+  rt = new Set();
   ot = signal(false, { pureWrite: true });
-  ut = false;
+  st = false;
+  ut;
+  ct = ON_INIT;
   constructor(e) {
     super();
-    this.rt = e;
+    this.it = e;
   }
   run(e) {
     if (!e || read(this.ot)) return;
     return super.run(e);
   }
   notify(e, t, n, i) {
-    if (!(t & this.rt) || (this.rt & STATUS_PENDING && this.ut)) return super.notify(e, t, n, i);
-    if (n & this.rt) {
-      const t = i?.source || e.X?.source;
+    if (!(t & this.it)) return super.notify(e, t, n, i);
+    if (this.st && this.ut) {
+      const e = untrack(() => {
+        try {
+          return this.ut();
+        } catch {
+          return ON_INIT;
+        }
+      });
+      if (e !== this.ct) {
+        this.ct = e;
+        this.st = false;
+        this.rt.clear();
+      }
+    }
+    if (this.it & STATUS_PENDING && this.st) return super.notify(e, t, n, i);
+    if (n & this.it) {
+      const t = i?.source || e.q?.source;
       if (t) {
-        const e = this.st.size === 0;
-        this.st.add(t);
+        const e = this.rt.size === 0;
+        this.rt.add(t);
         if (e) setSignal(this.ot, true);
       }
     }
-    t &= ~this.rt;
+    t &= ~this.it;
     return t ? super.notify(e, t, n, i) : true;
   }
   checkSources() {
-    for (const e of this.st) {
-      if (!(e.Ee & this.rt)) this.st.delete(e);
+    for (const e of this.rt) {
+      if (!(e.Ee & this.it)) this.rt.delete(e);
+    }
+    if (!this.rt.size) {
+      setSignal(this.ot, false);
+      if (this.ut) {
+        try {
+          this.ct = untrack(() => this.ut());
+        } catch {}
+      }
     }
-    if (!this.st.size) setSignal(this.ot, false);
   }
 }
-function createCollectionBoundary(e, t, n) {
-  const i = createOwner();
-  const r = new CollectionQueue(e);
-  const s = createBoundChildren(i, t, r, e);
-  const o = computed(() => {
-    if (!read(r.ot)) {
+function createCollectionBoundary(e, t, n, i) {
+  const r = createOwner();
+  const o = new CollectionQueue(e);
+  if (i) o.ut = i;
+  const s = createBoundChildren(r, t, o, e);
+  const u = computed(() => {
+    if (!read(o.ot)) {
       const e = read(s);
-      if (!untrack(() => read(r.ot))) {
-        r.ut = true;
+      if (!untrack(() => read(o.ot))) {
+        o.st = true;
         return e;
       }
     }
-    return n(r);
+    return n(o);
   });
-  return read.bind(null, o);
+  return accessor(u);
 }
-function createLoadBoundary(e, t) {
-  return createCollectionBoundary(STATUS_PENDING, e, () => t());
+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.st.values().next().value;
-    const i = n.X?.cause ?? n.X;
+    let n = e.rt.values().next().value;
+    const i = n.q?.cause ?? n.q;
     return t(i, () => {
-      for (const t of e.st) recompute(t);
+      for (const t of e.rt) recompute(t);
       schedule();
     });
   });
@@ -2854,9 +2887,9 @@ function flatten(e, t) {
 function flattenArray(e, t = [], n) {
   let i = null;
   let r = false;
-  for (let s = 0; s < e.length; s++) {
+  for (let o = 0; o < e.length; o++) {
     try {
-      let i = e[s];
+      let i = e[o];
       if (typeof i === "function" && !i.length) {
         if (n?.doNotUnwrap) {
           t.push(i);
@@ -2893,7 +2926,7 @@ export {
   createContext,
   createEffect,
   createErrorBoundary,
-  createLoadBoundary,
+  createLoadingBoundary,
   createMemo,
   createOptimistic,
   createOptimisticStore,
@@ -2906,6 +2939,8 @@ export {
   createStore,
   createTrackedEffect,
   deep,
+  enableExternalSource,
+  enforceLoadingBoundary,
   flatten,
   flush,
   getContext,
@@ -2932,7 +2967,6 @@ export {
   resolve,
   runWithOwner,
   setContext,
-  setOnUnhandledAsync,
   setSnapshotCapture,
   snapshot,
   storePath,