@solidjs/signals 0.13.4 → 0.13.6

package/dist/node.cjs

@@ -108,7 +108,7 @@ function markNode(e, r = n) {
     markNode(n.k, t);
   }
   if (e.C !== null) {
-    for (let n = e.C; n !== null; n = n.j) {
+    for (let n = e.C; n !== null; n = n.W) {
       for (let e = n.O; e !== null; e = e.P) {
         markNode(e.k, t);
       }
@@ -117,12 +117,12 @@ function markNode(e, r = n) {
 }
 function runHeap(e, t) {
   e._ = false;
-  for (e.A = 0; e.A <= e.S; e.A++) {
-    let n = e.l[e.A];
+  for (e.j = 0; e.j <= e.S; e.j++) {
+    let n = e.l[e.j];
     while (n !== undefined) {
       if (n.m & i) t(n);
       else adjustHeight(n, e);
-      n = e.l[e.A];
+      n = e.l[e.j];
     }
   }
   e.S = 0;
@@ -130,10 +130,10 @@ function runHeap(e, t) {
 function adjustHeight(e, t) {
   deleteFromHeap(e, t);
   let n = e.o;
-  for (let t = e.N; t; t = t.W) {
+  for (let t = e.A; t; t = t.N) {
     const e = t.L;
     const r = e.I || e;
-    if (r.T && r.o >= n) n = r.o + 1;
+    if (r.R && r.o >= n) n = r.o + 1;
   }
   if (e.o !== n) {
     e.o = n;
@@ -143,20 +143,20 @@ function adjustHeight(e, t) {
   }
 }
 const x = new Set();
-const P = { l: new Array(2e3).fill(undefined), _: false, A: 0, S: 0 };
-const v = { l: new Array(2e3).fill(undefined), _: false, A: 0, S: 0 };
+const P = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
+const v = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
 let E = 0;
 let k = null;
 let C = false;
-let j = false;
-let A = null;
+let W = false;
+let j = null;
 function enforceLoadingBoundary(e) {}
 function shouldReadStashedOptimisticValue(e) {
-  return !!A?.has(e);
+  return !!j?.has(e);
 }
 function runLaneEffects(e) {
   for (const t of L) {
-    if (t.R || t.H.size > 0) continue;
+    if (t.T || t.H.size > 0) continue;
     const n = t.q[e - 1];
     if (n.length) {
       t.q[e - 1] = [];
@@ -169,22 +169,22 @@ function queueStashedOptimisticEffects(e) {
     const e = t.k;
     if (!e.D) continue;
     if (e.D === y) {
-      if (!e.V) {
-        e.V = true;
-        e.B.enqueue(g, e.F);
+      if (!e.F) {
+        e.F = true;
+        e.V.enqueue(g, e.M);
       }
       continue;
     }
     const n = e.m & o ? v : P;
-    if (n.A > e.o) n.A = e.o;
+    if (n.j > e.o) n.j = e.o;
     insertIntoHeap(e, n);
   }
 }
 function setProjectionWriteActive(e) {
-  j = e;
+  W = e;
 }
 function mergeTransitionState(e, t) {
-  t.M = e;
+  t.B = e;
   e.G.push(...t.G);
   for (const n of L) {
     if (n.K === t) n.K = e;
@@ -214,7 +214,7 @@ function cleanupCompletedLanes(e) {
   for (const t of L) {
     const n = e ? t.K === e : !t.K;
     if (!n) continue;
-    if (!t.R) {
+    if (!t.T) {
       if (t.q[0].length) runQueue(t.q[0], h);
       if (t.q[1].length) runQueue(t.q[1], g);
     }
@@ -223,27 +223,13 @@ function cleanupCompletedLanes(e) {
     t.q[0].length = 0;
     t.q[1].length = 0;
     L.delete(t);
-    W.delete(t.te);
+    N.delete(t.te);
   }
 }
 function schedule() {
   if (C) return;
   C = true;
-  if (!N.ne && !j) queueMicrotask(flush);
-}
-function addTransitionBlocker(e) {
-  if (k && !k.X.includes(e)) {
-    k.X.push(e);
-  }
-}
-function removeTransitionBlocker(e) {
-  const remove = t => {
-    if (!t) return;
-    const n = t.indexOf(e);
-    if (n >= 0) t.splice(n, 1);
-  };
-  remove(e.K?.X);
-  remove(k?.X);
+  if (!A.ne && !W) queueMicrotask(flush);
 }
 class Queue {
   i = null;
@@ -275,8 +261,8 @@ class Queue {
   }
   enqueue(e, t) {
     if (e) {
-      if (F) {
-        const n = findLane(F);
+      if (M) {
+        const n = findLane(M);
         n.q[e - 1].push(t);
       } else {
         this.re[e - 1].push(t);
@@ -333,22 +319,22 @@ class GlobalQueue extends Queue {
           runLaneEffects(g);
           this.stashQueues(e.ce);
           E++;
-          C = P.S >= P.A;
+          C = P.S >= P.j;
           reassignPendingTransition(e.se);
           k = null;
           if (!e.G.length && e.U.length) {
-            A = new Set();
+            j = new Set();
             for (let t = 0; t < e.U.length; t++) {
               const n = e.U[t];
-              if (n.T || n.le) continue;
-              A.add(n);
+              if (n.R || n.le) continue;
+              j.add(n);
               queueStashedOptimisticEffects(n);
             }
           }
           try {
             finalizePureQueue(null, true);
           } finally {
-            A = null;
+            j = null;
           }
           return;
         }
@@ -364,7 +350,7 @@ class GlobalQueue extends Queue {
         finalizePureQueue();
       }
       E++;
-      C = P.S >= P.A;
+      C = P.S >= P.j;
       runLaneEffects(h);
       this.run(h);
       runLaneEffects(g);
@@ -402,7 +388,7 @@ class GlobalQueue extends Queue {
         J: new Set(),
         G: [],
         ce: { re: [[], []], ie: [] },
-        M: false
+        B: false
       };
     } else if (e) {
       const t = k;
@@ -438,7 +424,7 @@ class GlobalQueue extends Queue {
   }
 }
 function insertSubs(e, t = false) {
-  const n = e.Y || F;
+  const n = e.Y || M;
   const r = e.pe !== undefined;
   for (let i = e.O; i !== null; i = i.P) {
     if (r && i.k.he) {
@@ -454,40 +440,40 @@ function insertSubs(e, t = false) {
     }
     const e = i.k;
     if (e.D === y) {
-      if (!e.V) {
-        e.V = true;
-        e.B.enqueue(g, e.F);
+      if (!e.F) {
+        e.F = true;
+        e.V.enqueue(g, e.M);
       }
       continue;
     }
     const s = i.k.m & o ? v : P;
-    if (s.A > i.k.o) s.A = i.k.o;
+    if (s.j > i.k.o) s.j = i.k.o;
     insertIntoHeap(i.k, s);
   }
 }
 function commitPendingNodes() {
-  const e = N.se;
+  const e = A.se;
   for (let t = 0; t < e.length; t++) {
     const n = e[t];
     if (n.Z !== S) {
       n.$ = n.Z;
       n.Z = S;
-      if (n.D && n.D !== y) n.V = true;
+      if (n.D && n.D !== y) n.F = true;
     }
     if (!(n.ge & a)) n.ge &= ~p;
-    if (n.T) GlobalQueue.ue(n, false, true);
+    if (n.R) GlobalQueue.ue(n, false, true);
   }
   e.length = 0;
 }
 function finalizePureQueue(e = null, t = false) {
   const n = !t;
   if (n) commitPendingNodes();
-  if (!t) checkBoundaryChildren(N);
-  if (P.S >= P.A) runHeap(P, GlobalQueue.oe);
+  if (!t) checkBoundaryChildren(A);
+  if (P.S >= P.j) runHeap(P, GlobalQueue.oe);
   if (n) {
     commitPendingNodes();
-    resolveOptimisticNodes(e ? e.U : N.U);
-    const t = e ? e.J : N.J;
+    resolveOptimisticNodes(e ? e.U : A.U);
+    const t = e ? e.J : A.J;
     if (GlobalQueue.fe && t.size) {
       for (const e of t) {
         GlobalQueue.fe(e);
@@ -505,7 +491,7 @@ function checkBoundaryChildren(e) {
   }
 }
 function trackOptimisticStore(e) {
-  N.J.add(e);
+  A.J.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
@@ -513,17 +499,20 @@ function reassignPendingTransition(e) {
     e[t].K = k;
   }
 }
-const N = new GlobalQueue();
+const A = new GlobalQueue();
 function flush() {
+  if (A.ne) {
+    return;
+  }
   while (C || k) {
-    N.flush();
+    A.flush();
   }
 }
 function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function transitionComplete(e) {
-  if (e.M) return true;
+  if (e.B) return true;
   if (e.G.length) return false;
   let t = true;
   for (let n = 0; n < e.X.length; n++) {
@@ -533,11 +522,26 @@ function transitionComplete(e) {
       break;
     }
   }
-  t && (e.M = true);
+  if (t) {
+    for (let n = 0; n < e.U.length; n++) {
+      const r = e.U[n];
+      if (
+        hasActiveOverride(r) &&
+        "ge" in r &&
+        r.ge & a &&
+        r.ae instanceof NotReadyError &&
+        r.ae.source !== r
+      ) {
+        t = false;
+        break;
+      }
+    }
+  }
+  t && (e.B = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.M && typeof e.M === "object") e = e.M;
+  while (e.B && typeof e.B === "object") e = e.B;
   return e;
 }
 function setActiveTransition(e) {
@@ -552,30 +556,30 @@ function runInTransition(e, t) {
     k = n;
   }
 }
-const W = new WeakMap();
+const N = new WeakMap();
 const L = new Set();
 function getOrCreateLane(e) {
-  let t = W.get(e);
+  let t = N.get(e);
   if (t) {
     return findLane(t);
   }
   const n = e.ye;
   const r = n?.Y ? findLane(n.Y) : null;
-  t = { te: e, H: new Set(), q: [[], []], R: null, K: k, Se: r };
-  W.set(e, t);
+  t = { te: e, H: new Set(), q: [[], []], T: null, K: k, Se: r };
+  N.set(e, t);
   L.add(t);
   e.we = false;
   return t;
 }
 function findLane(e) {
-  while (e.R) e = e.R;
+  while (e.T) e = e.T;
   return e;
 }
 function mergeLanes(e, t) {
   e = findLane(e);
   t = findLane(t);
   if (e === t) return e;
-  t.R = e;
+  t.T = e;
   for (const n of t.H) e.H.add(n);
   e.q[0].push(...t.q[0]);
   e.q[1].push(...t.q[1]);
@@ -599,7 +603,7 @@ function assignOrMergeLane(e, t) {
   const n = findLane(t);
   const r = e.Y;
   if (r) {
-    if (r.R) {
+    if (r.T) {
       e.Y = t;
       return;
     }
@@ -666,7 +670,7 @@ function setPendingError(e, t, n) {
 }
 function forEachDependent(e, t) {
   for (let n = e.O; n !== null; n = n.P) t(n.k);
-  for (let n = e.C; n !== null; n = n.j) {
+  for (let n = e.C; n !== null; n = n.W) {
     for (let e = n.O; e !== null; e = e.P) t(e.k);
   }
 }
@@ -688,13 +692,13 @@ function settlePendingSource(e) {
       if (r._e) {
         if (r.D === y) {
           const e = r;
-          if (!e.V) {
-            e.V = true;
-            e.B.enqueue(g, e.F);
+          if (!e.F) {
+            e.F = true;
+            e.V.enqueue(g, e.M);
           }
         } else {
           const e = r.m & o ? v : P;
-          if (e.A > r.o) e.A = r.o;
+          if (e.j > r.o) e.j = r.o;
           insertIntoHeap(r, e);
         }
         t = true;
@@ -718,14 +722,14 @@ function handleAsync(e, t, r) {
   let u;
   const handleError = n => {
     if (e.Oe !== t) return;
-    N.initTransition(resolveTransition(e));
+    A.initTransition(resolveTransition(e));
     notifyStatus(e, n instanceof NotReadyError ? a : d, n);
     e.de = E;
   };
   const asyncWrite = (i, s) => {
     if (e.Oe !== t) return;
     if (e.m & (n | f)) return;
-    N.initTransition(resolveTransition(e));
+    A.initTransition(resolveTransition(e));
     clearStatus(e);
     const o = resolveLane(e);
     if (o) o.H.delete(e);
@@ -772,8 +776,8 @@ function handleAsync(e, t, r) {
     );
     r = false;
     if (!n) {
-      N.initTransition(resolveTransition(e));
-      throw new NotReadyError(B);
+      A.initTransition(resolveTransition(e));
+      throw new NotReadyError(V);
     }
   }
   if (s) {
@@ -808,15 +812,14 @@ function handleAsync(e, t, r) {
     };
     const i = iterate();
     if (!r && !i) {
-      N.initTransition(resolveTransition(e));
-      throw new NotReadyError(B);
+      A.initTransition(resolveTransition(e));
+      throw new NotReadyError(V);
     }
   }
   return u;
 }
 function clearStatus(e, t = false) {
   clearPendingSources(e);
-  removeTransitionBlocker(e);
   e._e = false;
   e.ge = t ? 0 : e.ge & p;
   setPendingError(e);
@@ -834,11 +837,9 @@ function notifyStatus(e, t, n, r, i) {
     if (t === a && s) {
       addPendingSource(e, s);
       e.ge = a | (e.ge & p);
-      setPendingError(e, e.me ?? e.be?.values().next().value, n);
-      if (s === e) addTransitionBlocker(e);
+      setPendingError(e, s, n);
     } else {
       clearPendingSources(e);
-      removeTransitionBlocker(e);
       e.ge = t | (t !== d ? e.ge & p : 0);
       e.ae = n;
     }
@@ -850,6 +851,9 @@ function notifyStatus(e, t, n, r, i) {
   const c = r || f;
   const l = r || u ? undefined : i;
   if (e.ve) {
+    if (r && t === a) {
+      return;
+    }
     if (c) {
       e.ve(t, n);
     } else {
@@ -863,7 +867,7 @@ function notifyStatus(e, t, n, r, i) {
       (t === a && s && e.me !== s && !e.be?.has(s)) ||
       (t !== a && (e.ae !== n || e.me || e.be))
     ) {
-      !e.K && N.se.push(e);
+      if (!c && !e.K) A.se.push(e);
       notifyStatus(e, t, n, c, l);
     }
   });
@@ -891,7 +895,7 @@ function enableExternalSource(e) {
     I = { factory: t, untrack: n };
   }
 }
-const T = {};
+const R = {};
 function markDisposal(e) {
   let t = e.Ee;
   while (t) {
@@ -905,43 +909,43 @@ function markDisposal(e) {
   }
 }
 function dispose(e) {
-  let t = e.N || null;
+  let t = e.A || null;
   do {
     t = unlinkSubs(t);
   } while (t !== null);
-  e.N = null;
+  e.A = null;
   e.Ce = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
   if (e.m & u) return;
   if (t) e.m = u;
-  let r = n ? e.je : e.Ee;
+  let r = n ? e.We : e.Ee;
   while (r) {
     const e = r.ke;
-    if (r.N) {
+    if (r.A) {
       const e = r;
       deleteFromHeap(e, e.m & o ? v : P);
-      let t = e.N;
+      let t = e.A;
       do {
         t = unlinkSubs(t);
       } while (t !== null);
-      e.N = null;
+      e.A = null;
       e.Ce = null;
     }
     disposeChildren(r, true);
     r = e;
   }
   if (n) {
-    e.je = null;
+    e.We = null;
   } else {
     e.Ee = null;
-    e.Ae = 0;
+    e.je = 0;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.Ne : e.We;
+  let n = t ? e.Ae : e.Ne;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -951,12 +955,12 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.Ne = null) : (e.We = null);
+  t ? (e.Ae = null) : (e.Ne = null);
 }
 function childId(e, t) {
   let n = e;
   while (n.Le && n.i) n = n.i;
-  if (n.id != null) return formatId(n.id, t ? n.Ae++ : n.Ae);
+  if (n.id != null) return formatId(n.id, t ? n.je++ : n.je);
   throw new Error("Cannot get child id from owner without an id");
 }
 function getNextChildId(e) {
@@ -971,26 +975,24 @@ function formatId(e, t) {
   return e + (r ? String.fromCharCode(64 + r) : "") + n;
 }
 function getObserver() {
-  if (q || V) return T;
-  return R ? B : null;
+  if (q || F) return R;
+  return T ? V : null;
 }
 function getOwner() {
-  return B;
+  return V;
 }
-function onCleanup(e) {
-  if (!B) {
-    return e;
-  }
-  if (!B.We) B.We = e;
-  else if (Array.isArray(B.We)) B.We.push(e);
-  else B.We = [B.We, e];
+function cleanup(e) {
+  if (!V) return e;
+  if (!V.Ne) V.Ne = e;
+  else if (Array.isArray(V.Ne)) V.Ne.push(e);
+  else V.Ne = [V.Ne, e];
   return e;
 }
 function isDisposed(e) {
   return !!(e.m & (u | o));
 }
 function createOwner(e) {
-  const t = B;
+  const t = V;
   const n = e?.transparent ?? false;
   const r = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
@@ -999,12 +1001,12 @@ function createOwner(e) {
     u: t?.t ? t.u : t,
     Ee: null,
     ke: null,
-    We: null,
-    B: t?.B ?? N,
-    Ie: t?.Ie || _,
-    Ae: 0,
     Ne: null,
-    je: null,
+    V: t?.V ?? A,
+    Ie: t?.Ie || _,
+    je: 0,
+    Ae: null,
+    We: null,
     i: t,
     dispose(e = true) {
       disposeChildren(r, e);
@@ -1027,28 +1029,28 @@ function createRoot(e, t) {
 }
 function unlinkSubs(e) {
   const t = e.L;
-  const n = e.W;
+  const n = e.N;
   const r = e.P;
-  const i = e.Te;
-  if (r !== null) r.Te = i;
-  else t.Re = i;
+  const i = e.Re;
+  if (r !== null) r.Re = i;
+  else t.Te = i;
   if (i !== null) i.P = r;
   else {
     t.O = r;
     if (r === null) {
       t.He?.();
-      t.T && !t.Qe && !(t.m & o) && unobserved(t);
+      t.R && !t.Qe && !(t.m & o) && unobserved(t);
     }
   }
   return n;
 }
 function unobserved(e) {
   deleteFromHeap(e, e.m & o ? v : P);
-  let t = e.N;
+  let t = e.A;
   while (t !== null) {
     t = unlinkSubs(t);
   }
-  e.N = null;
+  e.A = null;
   disposeChildren(e, true);
 }
 function link(e, t) {
@@ -1057,43 +1059,43 @@ function link(e, t) {
   let i = null;
   const s = t.m & r;
   if (s) {
-    i = n !== null ? n.W : t.N;
+    i = n !== null ? n.N : t.A;
     if (i !== null && i.L === e) {
       t.Ce = i;
       return;
     }
   }
-  const o = e.Re;
+  const o = e.Te;
   if (o !== null && o.k === t && (!s || isValidLink(o, t))) return;
-  const u = (t.Ce = e.Re = { L: e, k: t, W: i, Te: o, P: null });
-  if (n !== null) n.W = u;
-  else t.N = u;
+  const u = (t.Ce = e.Te = { L: e, k: t, N: i, Re: o, P: null });
+  if (n !== null) n.N = u;
+  else t.A = u;
   if (o !== null) o.P = u;
   else e.O = u;
 }
 function isValidLink(e, t) {
   const n = t.Ce;
   if (n !== null) {
-    let r = t.N;
+    let r = t.A;
     do {
       if (r === e) return true;
       if (r === n) break;
-      r = r.W;
+      r = r.N;
     } while (r !== null);
   }
   return false;
 }
 GlobalQueue.oe = recompute;
 GlobalQueue.ue = disposeChildren;
-let R = false;
+let T = false;
 let H = false;
 let Q = false;
 let q = false;
 let D = false;
-let V = false;
-let B = null;
-let F = null;
-let M = false;
+let F = false;
+let V = null;
+let M = null;
+let B = false;
 let G = null;
 function ownerInSnapshotScope(e) {
   while (e) {
@@ -1103,7 +1105,7 @@ function ownerInSnapshotScope(e) {
   return false;
 }
 function setSnapshotCapture(e) {
-  M = e;
+  B = e;
   if (e && !G) G = new Set();
 }
 function markSnapshotScope(e) {
@@ -1121,13 +1123,13 @@ function releaseSubtree(e) {
       t = t.ke;
       continue;
     }
-    if (t.T) {
+    if (t.R) {
       const e = t;
       e.he = false;
       if (e.m & c) {
         e.m &= ~c;
         e.m |= n;
-        if (P.A > e.o) P.A = e.o;
+        if (P.j > e.o) P.j = e.o;
         insertIntoHeap(e, P);
       }
     }
@@ -1143,42 +1145,42 @@ function clearSnapshots() {
     }
     G = null;
   }
-  M = false;
+  B = false;
 }
 function recompute(t, n = false) {
   const i = t.D;
   if (!n) {
-    if (t.K && (!i || k) && k !== t.K) N.initTransition(t.K);
+    if (t.K && (!i || k) && k !== t.K) A.initTransition(t.K);
     deleteFromHeap(t, t.m & o ? v : P);
     if (t.K || i === y) disposeChildren(t);
     else {
       markDisposal(t);
-      t.Ne = t.We;
-      t.je = t.Ee;
-      t.We = null;
+      t.Ae = t.Ne;
+      t.We = t.Ee;
+      t.Ne = null;
       t.Ee = null;
-      t.Ae = 0;
+      t.je = 0;
     }
   }
   const s = !!(t.m & f);
   const u = t.ee !== undefined && t.ee !== S;
   const l = !!(t.ge & a);
-  const p = B;
-  B = t;
+  const p = V;
+  V = t;
   t.Ce = null;
   t.m = r;
   t.de = E;
   let h = t.Z === S ? t.$ : t.Z;
   let g = t.o;
-  let w = R;
-  let m = F;
-  R = true;
+  let w = T;
+  let m = M;
+  T = true;
   if (s) {
     const e = resolveLane(t);
-    if (e) F = e;
+    if (e) M = e;
   }
   try {
-    h = handleAsync(t, t.T(h));
+    h = handleAsync(t, t.R(h));
     clearStatus(t, n);
     const e = resolveLane(t);
     if (e) {
@@ -1186,8 +1188,8 @@ function recompute(t, n = false) {
       updatePendingSignal(e.te);
     }
   } catch (e) {
-    if (e instanceof NotReadyError && F) {
-      const e = findLane(F);
+    if (e instanceof NotReadyError && M) {
+      const e = findLane(M);
       if (e.te !== t) {
         e.H.add(t);
         t.Y = e;
@@ -1203,19 +1205,19 @@ function recompute(t, n = false) {
       e instanceof NotReadyError ? t.Y : undefined
     );
   } finally {
-    R = w;
+    T = w;
     t.m = e | (n ? t.m & c : 0);
-    B = p;
+    V = p;
   }
   if (!t.ae) {
     const e = t.Ce;
-    let r = e !== null ? e.W : t.N;
+    let r = e !== null ? e.N : t.A;
     if (r !== null) {
       do {
         r = unlinkSubs(r);
       } while (r !== null);
-      if (e !== null) e.W = null;
-      else t.N = null;
+      if (e !== null) e.N = null;
+      else t.A = null;
     }
     const f = u ? t.ee : t.Z === S ? t.$ : t.Z;
     const c = !t.xe || !t.xe(f, h);
@@ -1238,16 +1240,16 @@ function recompute(t, n = false) {
       }
     }
   }
-  F = m;
-  (!n || t.ge & a) && !t.K && !(k && u) && N.se.push(t);
+  M = m;
+  (!n || t.ge & a) && !t.K && !(k && u) && A.se.push(t);
   t.K && i && k !== t.K && runInTransition(t.K, () => recompute(t));
 }
 function updateIfNecessary(r) {
   if (r.m & t) {
-    for (let e = r.N; e; e = e.W) {
+    for (let e = r.A; e; e = e.N) {
       const t = e.L;
       const i = t.I || t;
-      if (i.T) {
+      if (i.R) {
         updateIfNecessary(i);
       }
       if (r.m & n) {
@@ -1263,63 +1265,63 @@ function updateIfNecessary(r) {
 function computed(t, n, r) {
   const i = r?.transparent ?? false;
   const s = {
-    id: r?.id ?? (i ? B?.id : B?.id != null ? getNextChildId(B) : undefined),
+    id: r?.id ?? (i ? V?.id : V?.id != null ? getNextChildId(V) : undefined),
     Le: i || undefined,
     xe: r?.equals != null ? r.equals : isEqual,
     le: !!r?.pureWrite,
     He: r?.unobserved,
-    We: null,
-    B: B?.B ?? N,
-    Ie: B?.Ie ?? _,
-    Ae: 0,
-    T: t,
+    Ne: null,
+    V: V?.V ?? A,
+    Ie: V?.Ie ?? _,
+    je: 0,
+    R: t,
     $: n,
     o: 0,
     C: null,
     h: undefined,
     p: null,
-    N: null,
+    A: null,
     Ce: null,
     O: null,
-    Re: null,
-    i: B,
+    Te: null,
+    i: V,
     ke: null,
     Ee: null,
     m: r?.lazy ? l : e,
     ge: p,
     de: E,
     Z: S,
-    Ne: null,
-    je: null,
+    Ae: null,
+    We: null,
     Oe: null,
     K: null
   };
   s.p = s;
-  const o = B?.t ? B.u : B;
-  if (B) {
-    const e = B.Ee;
+  const o = V?.t ? V.u : V;
+  if (V) {
+    const e = V.Ee;
     if (e === null) {
-      B.Ee = s;
+      V.Ee = s;
     } else {
       s.ke = e;
-      B.Ee = s;
+      V.Ee = s;
     }
   }
   if (o) s.o = o.o + 1;
-  if (M && ownerInSnapshotScope(B)) s.he = true;
+  if (B && ownerInSnapshotScope(V)) s.he = true;
   if (I) {
     const e = signal(undefined, { equals: false, pureWrite: true });
-    const t = I.factory(s.T, () => {
+    const t = I.factory(s.R, () => {
       setSignal(e, undefined);
     });
-    onCleanup(() => t.dispose());
-    s.T = n => {
+    cleanup(() => t.dispose());
+    s.R = n => {
       read(e);
       return t.track(n);
     };
   }
   !r?.lazy && recompute(s, true);
-  if (M && !r?.lazy) {
+  if (B && !r?.lazy) {
     if (!(s.ge & a)) {
       s.pe = s.$ === undefined ? w : s.$;
       G.add(s);
@@ -1335,14 +1337,14 @@ function signal(e, t, n = null) {
     He: t?.unobserved,
     $: e,
     O: null,
-    Re: null,
+    Te: null,
     de: E,
     I: n,
-    j: n?.C || null,
+    W: n?.C || null,
     Z: S
   };
   n && (n.C = r);
-  if (M && !r.De && !((n?.ge ?? 0) & a)) {
+  if (B && !r.De && !((n?.ge ?? 0) & a)) {
     r.pe = e === undefined ? w : e;
     G.add(r);
   }
@@ -1362,35 +1364,35 @@ function isEqual(e, t) {
   return e === t;
 }
 function untrack(e, t) {
-  if (!I && !R && true) return e();
-  const n = R;
-  R = false;
+  if (!I && !T && true) return e();
+  const n = T;
+  T = false;
   try {
     if (I) return I.untrack(e);
     return e();
   } finally {
-    R = n;
+    T = n;
   }
 }
 function read(e) {
-  if (V) {
+  if (F) {
     const t = getLatestValueComputed(e);
-    const n = V;
-    V = false;
+    const n = F;
+    F = false;
     const r = e.ee !== undefined && e.ee !== S ? e.ee : e.$;
     let i;
     try {
       i = read(t);
     } catch (e) {
-      if (!B && e instanceof NotReadyError) return r;
+      if (!V && e instanceof NotReadyError) return r;
       throw e;
     } finally {
-      V = n;
+      F = n;
     }
     if (t.ge & a) return r;
-    if (H && F && t.Y) {
+    if (H && M && t.Y) {
       const e = findLane(t.Y);
-      const n = findLane(F);
+      const n = findLane(M);
       if (e !== n && e.H.size > 0) {
         return r;
       }
@@ -1401,25 +1403,31 @@ function read(e) {
     const t = e.I;
     const n = q;
     q = false;
-    if (read(getPendingSignal(e))) D = true;
-    if (t && read(getPendingSignal(t))) D = true;
+    if (t && e.ee !== undefined) {
+      if (e.ee !== S && (t.Oe || !!(t.ge & a))) {
+        D = true;
+      }
+    } else {
+      if (read(getPendingSignal(e))) D = true;
+      if (t && read(getPendingSignal(t))) D = true;
+    }
     q = n;
     return e.$;
   }
-  let t = B;
+  let t = V;
   if (t?.t) t = t.u;
-  if (Q && e.T) recompute(e);
+  if (Q && e.R) recompute(e);
   if (e.m & l) {
     e.m &= ~l;
     recompute(e, true);
   }
   const n = e.I || e;
-  if (t && R) {
-    if (e.T && e.m & u) recompute(e);
+  if (t && T) {
+    if (e.R && e.m & u) recompute(e);
     link(e, t);
-    if (n.T) {
+    if (n.R) {
       const r = e.m & o;
-      if (n.o >= (r ? v.A : P.A)) {
+      if (n.o >= (r ? v.j : P.j)) {
         markNode(t);
         markHeap(r ? v : P);
         updateIfNecessary(n);
@@ -1432,28 +1440,31 @@ function read(e) {
   }
   if (n.ge & a) {
     if (t && !(H && n.K && k !== n.K)) {
-      if (F) {
+      if (M) {
         const r = n.Y;
-        const i = findLane(F);
+        const i = findLane(M);
         if (r && findLane(r) === i && !hasActiveOverride(n)) {
-          if (!R && e !== t) link(e, t);
+          if (!T && e !== t) link(e, t);
           throw n.ae;
         }
       } else {
-        if (!R && e !== t) link(e, t);
+        if (!T && e !== t) link(e, t);
         throw n.ae;
       }
+    } else if (t && n !== e && n.ge & p) {
+      if (!T && e !== t) link(e, t);
+      throw n.ae;
     } else if (!t && n.ge & p) {
       throw n.ae;
     }
   }
-  if (e.T && e.ge & d) {
+  if (e.R && e.ge & d) {
     if (e.de < E) {
       recompute(e, true);
       return read(e);
     } else throw e.ae;
   }
-  if (M && t && t.he) {
+  if (B && t && t.he) {
     const n = e.pe;
     if (n !== undefined) {
       const r = n === w ? undefined : n;
@@ -1467,21 +1478,21 @@ function read(e) {
     return e.ee;
   }
   return !t ||
-    (F !== null && (e.ee !== undefined || e.Y || (n === e && H) || !!(n.ge & a))) ||
+    (M !== null && (e.ee !== undefined || e.Y || (n === e && H) || !!(n.ge & a))) ||
     e.Z === S ||
     (H && e.K && k !== e.K)
     ? e.$
     : e.Z;
 }
 function setSignal(e, t) {
-  if (e.K && k !== e.K) N.initTransition(e.K);
-  const n = e.ee !== undefined && !j;
+  if (e.K && k !== e.K) A.initTransition(e.K);
+  const n = e.ee !== undefined && !W;
   const r = e.ee !== undefined && e.ee !== S;
   const i = n ? (r ? e.ee : e.$) : e.Z === S ? e.$ : e.Z;
   if (typeof t === "function") t = t(i);
   const s = !e.xe || !e.xe(i, t) || !!(e.ge & p);
   if (!s) {
-    if (n && r && e.T) {
+    if (n && r && e.R) {
       insertSubs(e, true);
       schedule();
     }
@@ -1489,17 +1500,17 @@ function setSignal(e, t) {
   }
   if (n) {
     const n = e.ee === S;
-    if (!n) N.initTransition(resolveTransition(e));
+    if (!n) A.initTransition(resolveTransition(e));
     if (n) {
       e.Z = e.$;
-      N.U.push(e);
+      A.U.push(e);
     }
     e.we = true;
     const r = getOrCreateLane(e);
     e.Y = r;
     e.ee = t;
   } else {
-    if (e.Z === S) N.se.push(e);
+    if (e.Z === S) A.se.push(e);
     e.Z = t;
   }
   updatePendingSignal(e);
@@ -1512,26 +1523,26 @@ function setSignal(e, t) {
   return t;
 }
 function runWithOwner(e, t) {
-  const n = B;
-  const r = R;
-  B = e;
-  R = false;
+  const n = V;
+  const r = T;
+  V = e;
+  T = false;
   try {
     return t();
   } finally {
-    B = n;
-    R = r;
+    V = n;
+    T = r;
   }
 }
 function getPendingSignal(e) {
-  if (!e.Ve) {
-    e.Ve = optimisticSignal(false, { pureWrite: true });
+  if (!e.Fe) {
+    e.Fe = optimisticSignal(false, { pureWrite: true });
     if (e.ye) {
-      e.Ve.ye = e;
+      e.Fe.ye = e;
     }
-    if (computePendingState(e)) setSignal(e.Ve, true);
+    if (computePendingState(e)) setSignal(e.Fe, true);
   }
-  return e.Ve;
+  return e.Fe;
 }
 function computePendingState(e) {
   const t = e;
@@ -1547,13 +1558,16 @@ function computePendingState(e) {
     }
     return true;
   }
+  if (e.ee !== undefined && e.ee === S && !e.ye) {
+    return false;
+  }
   if (e.Z !== S && !(t.ge & p)) return true;
   return !!(t.ge & a && !(t.ge & p));
 }
 function updatePendingSignal(e) {
-  if (e.Ve) {
+  if (e.Fe) {
     const t = computePendingState(e);
-    const n = e.Ve;
+    const n = e.Fe;
     setSignal(n, t);
     if (!t && n.Y) {
       const t = resolveLane(e);
@@ -1563,24 +1577,24 @@ function updatePendingSignal(e) {
           mergeLanes(t, e);
         }
       }
-      W.delete(n);
+      N.delete(n);
       n.Y = undefined;
     }
   }
 }
 function getLatestValueComputed(e) {
   if (!e.Pe) {
-    const t = V;
-    V = false;
+    const t = F;
+    F = false;
     const n = q;
     q = false;
-    const r = B;
-    B = null;
+    const r = V;
+    V = null;
     e.Pe = optimisticComputed(() => read(e));
     e.Pe.ye = e;
-    B = r;
+    V = r;
     q = n;
-    V = t;
+    F = t;
   }
   return e.Pe;
 }
@@ -1594,12 +1608,12 @@ function staleValues(e, t = true) {
   }
 }
 function latest(e) {
-  const t = V;
-  V = true;
+  const t = F;
+  F = true;
   try {
     return e();
   } finally {
-    V = t;
+    F = t;
   }
 }
 function isPending(e) {
@@ -1666,15 +1680,15 @@ function effect(e, t, n, r, i) {
   const o = computed(i?.render ? t => staleValues(() => e(t)) : e, r, {
     ...i,
     equals: () => {
-      o.V = !o.ae;
-      if (s) o.B.enqueue(o.D, runEffect.bind(o));
+      o.F = !o.ae;
+      if (s) o.V.enqueue(o.D, runEffect.bind(o));
       return false;
     },
     lazy: true
   });
-  o.Be = r;
-  o.Fe = t;
-  o.Me = n;
+  o.Ve = r;
+  o.Me = t;
+  o.Be = n;
   o.Ge = undefined;
   o.D = i?.render ? h : g;
   o.ve = (e, t) => {
@@ -1682,11 +1696,11 @@ function effect(e, t, n, r, i) {
     const r = t !== undefined ? t : o.ae;
     if (n & d) {
       let e = r;
-      o.B.notify(o, a, 0);
+      o.V.notify(o, a, 0);
       if (o.D === g) {
         try {
-          return o.Me
-            ? o.Me(e, () => {
+          return o.Be
+            ? o.Be(e, () => {
                 o.Ge?.();
                 o.Ge = undefined;
               })
@@ -1695,36 +1709,39 @@ function effect(e, t, n, r, i) {
           e = t;
         }
       }
-      if (!o.B.notify(o, d, d)) throw e;
+      if (!o.V.notify(o, d, d)) throw e;
     } else if (o.D === h) {
-      o.B.notify(o, a | d, n, r);
+      o.V.notify(o, a | d, n, r);
     }
   };
   recompute(o, true);
-  !i?.defer && (o.D === g ? o.B.enqueue(o.D, runEffect.bind(o)) : runEffect.call(o));
+  !i?.defer && (o.D === g ? o.V.enqueue(o.D, runEffect.bind(o)) : runEffect.call(o));
   s = true;
-  onCleanup(() => o.Ge?.());
+  cleanup(() => o.Ge?.());
 }
 function runEffect() {
-  if (!this.V || this.m & u) return;
+  if (!this.F || this.m & u) return;
   this.Ge?.();
   this.Ge = undefined;
   try {
-    this.Ge = this.Fe(this.$, this.Be);
+    this.Ge = this.Me(this.$, this.Ve);
   } catch (e) {
     this.ae = new StatusError(this, e);
     this.ge |= d;
-    if (!this.B.notify(this, d, d)) throw e;
+    if (!this.V.notify(this, d, d)) throw e;
   } finally {
-    this.Be = this.$;
-    this.V = false;
+    this.Ve = this.$;
+    this.F = false;
   }
 }
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.V || n.m & u) return;
-    n.V = false;
-    recompute(n);
+    if (!n.F || n.m & u) return;
+    try {
+      n.F = false;
+      recompute(n);
+    } finally {
+    }
   };
   const n = computed(
     () => {
@@ -1737,22 +1754,22 @@ function trackedEffect(e, t) {
   );
   n.Ge = undefined;
   n.Ke = true;
-  n.V = true;
+  n.F = true;
   n.D = y;
   n.ve = (e, t) => {
     const r = e !== undefined ? e : n.ge;
     if (r & d) {
-      n.B.notify(n, a, 0);
+      n.V.notify(n, a, 0);
       const e = t !== undefined ? t : n.ae;
-      if (!n.B.notify(n, d, d)) throw e;
+      if (!n.V.notify(n, d, d)) throw e;
     }
   };
-  n.F = run;
-  n.B.enqueue(g, run);
-  onCleanup(() => n.Ge?.());
+  n.M = run;
+  n.V.enqueue(g, run);
+  cleanup(() => n.Ge?.());
 }
 function restoreTransition(e, t) {
-  N.initTransition(e);
+  A.initTransition(e);
   const n = t();
   flush();
   return n;
@@ -1761,7 +1778,7 @@ function action(e) {
   return (...t) =>
     new Promise((n, r) => {
       const i = e(...t);
-      N.initTransition();
+      A.initTransition();
       let s = k;
       s.G.push(i);
       const done = (e, t) => {
@@ -1795,6 +1812,9 @@ function action(e) {
       step();
     });
 }
+function onCleanup(e) {
+  return cleanup(e);
+}
 function accessor(e) {
   const t = read.bind(null, e);
   t.$r = true;
@@ -1823,7 +1843,7 @@ function createTrackedEffect(e, t) {
 }
 function createReaction(e, t) {
   let n = undefined;
-  onCleanup(() => n?.());
+  cleanup(() => n?.());
   const r = getOwner();
   return i => {
     runWithOwner(r, () => {
@@ -1864,13 +1884,13 @@ function onSettled(e) {
   const t = getOwner();
   t && !t.Ke
     ? createTrackedEffect(() => untrack(e))
-    : N.enqueue(g, () => {
+    : A.enqueue(g, () => {
         const t = e();
         t?.();
       });
 }
 function unwrap(e) {
-  return e?.[U]?.[ee] ?? e;
+  return e?.[z]?.[$] ?? e;
 }
 function getOverrideValue(e, t, n, r, i) {
   if (i && r in i) return i[r];
@@ -1882,16 +1902,16 @@ function getAllKeys(e, t, n) {
   return Array.from(new Set([...r, ...i]));
 }
 function applyState(e, t, n) {
-  const r = t?.[U];
+  const r = t?.[z];
   if (!r) return;
-  const i = r[Y];
-  const s = r[Z];
-  const o = r[$];
-  let u = r[ee];
+  const i = r[X];
+  const s = r[Y];
+  const o = r[Z];
+  let u = r[$];
   if (e === i && !s && !o) return;
-  (r[re] || oe).set(e, r[J]);
-  r[Y] = e;
-  r[Z] = undefined;
+  (r[ne] || se).set(e, r[U]);
+  r[X] = e;
+  r[Y] = undefined;
   if (Array.isArray(i)) {
     let t = false;
     const f = getOverrideValue(i, s, u, "length", o);
@@ -1919,16 +1939,16 @@ function applyState(e, t, n) {
       if (a > p || a > d) {
         for (l = a; l <= p; l++) {
           t = true;
-          r[ee][l] && setSignal(r[ee][l], wrap(e[l], r));
+          r[$][l] && setSignal(r[$][l], wrap(e[l], r));
         }
         for (; l < e.length; l++) {
           t = true;
           const i = wrap(S[l], r);
-          r[ee][l] && setSignal(r[ee][l], i);
+          r[$][l] && setSignal(r[$][l], i);
           applyState(e[l], i, n);
         }
-        t && r[ee][z] && setSignal(r[ee][z], void 0);
-        f !== e.length && r[ee].length && setSignal(r[ee].length, e.length);
+        t && r[$][K] && setSignal(r[$][K], void 0);
+        f !== e.length && r[$].length && setSignal(r[$].length, e.length);
         return;
       }
       g = new Array(p + 1);
@@ -1952,26 +1972,26 @@ function applyState(e, t, n) {
       for (l = a; l < e.length; l++) {
         if (l in S) {
           const t = wrap(S[l], r);
-          r[ee][l] && setSignal(r[ee][l], t);
+          r[$][l] && setSignal(r[$][l], t);
           applyState(e[l], t, n);
-        } else r[ee][l] && setSignal(r[ee][l], wrap(e[l], r));
+        } else r[$][l] && setSignal(r[$][l], wrap(e[l], r));
       }
       if (a < e.length) t = true;
     } else if (e.length) {
       for (let t = 0, f = e.length; t < f; t++) {
         const f = getOverrideValue(i, s, u, t, o);
-        isWrappable(f) ? applyState(e[t], wrap(f, r), n) : r[ee][t] && setSignal(r[ee][t], e[t]);
+        isWrappable(f) ? applyState(e[t], wrap(f, r), n) : r[$][t] && setSignal(r[$][t], e[t]);
       }
     }
     if (f !== e.length) {
       t = true;
-      r[ee].length && setSignal(r[ee].length, e.length);
+      r[$].length && setSignal(r[$].length, e.length);
     }
-    t && r[ee][z] && setSignal(r[ee][z], void 0);
+    t && r[$][K] && setSignal(r[$][K], void 0);
     return;
   }
   if (u) {
-    const t = u[z];
+    const t = u[K];
     const f = t ? getAllKeys(i, s, e) : Object.keys(u);
     for (let c = 0, l = f.length; c < l; c++) {
       const l = f[c];
@@ -1985,7 +2005,7 @@ function applyState(e, t, n) {
       } else applyState(p, wrap(d, r), n);
     }
   }
-  if ((u = r[te])) {
+  if ((u = r[ee])) {
     const t = Object.keys(u);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -2007,9 +2027,9 @@ function createProjectionInternal(e, t = {}, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[ne] = wrapProjection;
-    e[re] = i;
-    Object.defineProperty(e, ie, {
+    e[te] = wrapProjection;
+    e[ne] = i;
+    Object.defineProperty(e, re, {
       get() {
         return r;
       },
@@ -2018,19 +2038,27 @@ function createProjectionInternal(e, t = {}, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[U]?.[ne] === wrapProjection) return e;
-    const t = createStoreProxy(e, ce, wrapper);
+    if (e[z]?.[te] === wrapProjection) return e;
+    const t = createStoreProxy(e, fe, wrapper);
     i.set(e, t);
     return t;
   };
   const s = wrapProjection(t);
   r = computed(() => {
     const t = getOwner();
-    storeSetter(new Proxy(s, K), r => {
-      const i = handleAsync(t, e(r), e => {
-        e !== r && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
+    let r = false;
+    let i;
+    const o = new Proxy(
+      s,
+      createWriteTraps(() => !r || t.Oe === i)
+    );
+    storeSetter(o, o => {
+      i = e(o);
+      r = true;
+      const u = handleAsync(t, i, e => {
+        e !== o && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
       });
-      i !== r && i !== undefined && reconcile(i, n?.key || "id")(s);
+      u !== o && u !== undefined && reconcile(u, n?.key || "id")(s);
     });
   });
   r.Qe = true;
@@ -2039,80 +2067,85 @@ function createProjectionInternal(e, t = {}, n) {
 function createProjection(e, t = {}, n) {
   return createProjectionInternal(e, t, n).store;
 }
-const K = {
-  get(e, t) {
-    let n;
-    setWriteOverride(true);
-    setProjectionWriteActive(true);
-    try {
-      n = e[t];
-    } finally {
-      setWriteOverride(false);
-      setProjectionWriteActive(false);
-    }
-    return typeof n === "object" && n !== null ? new Proxy(n, K) : n;
-  },
-  set(e, t, n) {
-    setWriteOverride(true);
-    setProjectionWriteActive(true);
-    try {
-      e[t] = n;
-    } finally {
-      setWriteOverride(false);
-      setProjectionWriteActive(false);
-    }
-    return true;
-  },
-  deleteProperty(e, t) {
-    setWriteOverride(true);
-    setProjectionWriteActive(true);
-    try {
-      delete e[t];
-    } finally {
-      setWriteOverride(false);
-      setProjectionWriteActive(false);
+function createWriteTraps(e) {
+  const t = {
+    get(e, n) {
+      let r;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        r = e[n];
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return typeof r === "object" && r !== null ? new Proxy(r, t) : r;
+    },
+    set(t, n, r) {
+      if (e && !e()) return true;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        t[n] = r;
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return true;
+    },
+    deleteProperty(t, n) {
+      if (e && !e()) return true;
+      setWriteOverride(true);
+      setProjectionWriteActive(true);
+      try {
+        delete t[n];
+      } finally {
+        setWriteOverride(false);
+        setProjectionWriteActive(false);
+      }
+      return true;
     }
-    return true;
-  }
-};
-const z = Symbol(0),
+  };
+  return t;
+}
+const K = Symbol(0),
+  z = Symbol(0),
   U = Symbol(0),
-  J = Symbol(0),
-  X = Symbol(0);
-const Y = "v",
-  Z = "o",
-  $ = "x",
-  ee = "n",
-  te = "h",
-  ne = "w",
-  re = "l",
-  ie = "f",
-  se = "p";
-function createStoreProxy(e, t = ce, n) {
+  J = Symbol(0);
+const X = "v",
+  Y = "o",
+  Z = "x",
+  $ = "n",
+  ee = "h",
+  te = "w",
+  ne = "l",
+  re = "f",
+  ie = "p";
+function createStoreProxy(e, t = fe, n) {
   let r;
   if (Array.isArray(e)) {
     r = [];
     r.v = e;
   } else r = { v: e };
   n && n(r);
-  return (r[J] = new Proxy(r, t));
+  return (r[U] = new Proxy(r, t));
 }
-const oe = new WeakMap();
+const se = new WeakMap();
 function wrap(e, t) {
-  if (t?.[ne]) return t[ne](e, t);
-  let n = e[J] || oe.get(e);
-  if (!n) oe.set(e, (n = createStoreProxy(e)));
+  if (t?.[te]) return t[te](e, t);
+  let n = e[U] || se.get(e);
+  if (!n) se.set(e, (n = createStoreProxy(e)));
   return n;
 }
 function isWrappable(e) {
   return e != null && typeof e === "object" && !Object.isFrozen(e);
 }
-let ue = false;
+let oe = false;
 function setWriteOverride(e) {
-  ue = e;
+  oe = e;
 }
 function writeOnly(e) {
-  return ue || !!fe?.has(e);
+  return oe || !!ue?.has(e);
 }
 function getNodes(e, t) {
   let n = e[t];
@@ -2141,8 +2174,8 @@ function getNode(e, t, n, r, i = isEqual, s, o) {
   }
   return (e[t] = u);
 }
-function trackSelf(e, t = z) {
-  getObserver() && read(getNode(getNodes(e, ee), t, undefined, e[ie], false, e[se]));
+function trackSelf(e, t = K) {
+  getObserver() && read(getNode(getNodes(e, $), t, undefined, e[re], false, e[ie]));
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -2150,7 +2183,7 @@ function getKeys(e, t, n = true) {
   const i = new Set(r);
   const s = Reflect.ownKeys(t);
   for (const e of s) {
-    if (t[e] !== X) i.add(e);
+    if (t[e] !== J) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
@@ -2158,27 +2191,27 @@ function getKeys(e, t, n = true) {
 function getPropertyDescriptor(e, t, n) {
   let r = e;
   if (t && n in t) {
-    if (r[n] === X) return void 0;
+    if (r[n] === J) return void 0;
     if (!(n in r)) r = t;
   }
   return Reflect.getOwnPropertyDescriptor(r, n);
 }
-let fe = null;
-const ce = {
+let ue = null;
+const fe = {
   get(e, t, n) {
-    if (t === U) return e;
-    if (t === J) return n;
-    if (t === O) return e[ie];
-    if (t === z) {
+    if (t === z) return e;
+    if (t === U) return n;
+    if (t === O) return e[re];
+    if (t === K) {
       trackSelf(e);
       return n;
     }
-    const r = getNodes(e, ee);
+    const r = getNodes(e, $);
     const i = r[t];
-    const s = e[$] && t in e[$];
-    const o = s || (e[Z] && t in e[Z]);
-    const u = !!e[Y][U];
-    const f = s ? e[$] : e[Z] && t in e[Z] ? e[Z] : e[Y];
+    const s = e[Z] && t in e[Z];
+    const o = s || (e[Y] && t in e[Y]);
+    const u = !!e[X][z];
+    const f = s ? e[Z] : e[Y] && t in e[Y] ? e[Y] : e[X];
     if (!i) {
       const e = Object.getOwnPropertyDescriptor(f, t);
       if (e && e.get) return e.get.call(n);
@@ -2186,45 +2219,45 @@ const ce = {
     if (writeOnly(n)) {
       let n =
         i && (o || !u) ? (i.ee !== undefined && i.ee !== S ? i.ee : i.Z !== S ? i.Z : i.$) : f[t];
-      n === X && (n = undefined);
+      n === J && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
-      fe?.add(r);
+      ue?.add(r);
       return r;
     }
     let c = i ? (o || !u ? read(r[t]) : (read(r[t]), f[t])) : f[t];
-    c === X && (c = undefined);
+    c === J && (c = undefined);
     if (!i) {
       if (!o && typeof c === "function" && !f.hasOwnProperty(t)) {
         let t;
-        return !Array.isArray(e[Y]) && (t = Object.getPrototypeOf(e[Y])) && t !== Object.prototype
+        return !Array.isArray(e[X]) && (t = Object.getPrototypeOf(e[X])) && t !== Object.prototype
           ? c.bind(f)
           : c;
       } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(c) ? wrap(c, e) : c, e[ie], isEqual, e[se], e[m]));
+        return read(getNode(r, t, isWrappable(c) ? wrap(c, e) : c, e[re], isEqual, e[ie], e[m]));
       }
     }
     return isWrappable(c) ? wrap(c, e) : c;
   },
   has(e, t) {
-    if (t === J || t === z || t === "__proto__") return true;
-    const n = e[$] && t in e[$] ? e[$][t] !== X : e[Z] && t in e[Z] ? e[Z][t] !== X : t in e[Y];
-    getObserver() && read(getNode(getNodes(e, te), t, n, e[ie], isEqual, e[se]));
+    if (t === U || t === K || t === "__proto__") return true;
+    const n = e[Z] && t in e[Z] ? e[Z][t] !== J : e[Y] && t in e[Y] ? e[Y][t] !== J : t in e[X];
+    getObserver() && read(getNode(getNodes(e, ee), t, n, e[re], isEqual, e[ie]));
     return n;
   },
   set(e, t, n) {
-    const r = e[J];
+    const r = e[U];
     if (writeOnly(r)) {
-      if (e[se]) {
-        const t = e[ie];
+      if (e[ie]) {
+        const t = e[re];
         if (t?.K) {
-          N.initTransition(t.K);
+          A.initTransition(t.K);
         }
       }
       untrack(() => {
-        const i = e[Y];
+        const i = e[X];
         const s = i[t];
-        if (M && typeof t !== "symbol" && !((e[ie]?.ge ?? 0) & a)) {
+        if (B && typeof t !== "symbol" && !((e[re]?.ge ?? 0) & a)) {
           if (!e[m]) {
             e[m] = Object.create(null);
             G?.add(e);
@@ -2233,18 +2266,18 @@ const ce = {
             e[m][t] = s;
           }
         }
-        const o = e[se] && !j;
-        const u = o ? $ : Z;
+        const o = e[ie] && !W;
+        const u = o ? Z : Y;
         if (o) trackOptimisticStore(r);
-        const f = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : s;
-        const c = n?.[U]?.[Y] ?? n;
+        const f = e[Z] && t in e[Z] ? e[Z][t] : e[Y] && t in e[Y] ? e[Y][t] : s;
+        const c = n?.[z]?.[X] ?? n;
         if (f === c) return true;
-        const l = e[$]?.length || e[Z]?.length || i.length;
+        const l = e[Z]?.length || e[Y]?.length || i.length;
         if (c !== undefined && c === s) delete e[u][t];
         else (e[u] || (e[u] = Object.create(null)))[t] = c;
         const d = isWrappable(c);
-        e[te]?.[t] && setSignal(e[te][t], true);
-        const p = getNodes(e, ee);
+        e[ee]?.[t] && setSignal(e[ee][t], true);
+        const p = getNodes(e, $);
         p[t] && setSignal(p[t], () => (d ? wrap(c, e) : c));
         if (Array.isArray(i)) {
           if (t === "length") {
@@ -2254,40 +2287,40 @@ const ce = {
             if (e > l) p.length && setSignal(p.length, e);
           }
         }
-        p[z] && setSignal(p[z], undefined);
+        p[K] && setSignal(p[K], undefined);
       });
     }
     return true;
   },
   deleteProperty(e, t) {
-    const n = e[$]?.[t] === X;
-    const r = e[Z]?.[t] === X;
-    if (writeOnly(e[J]) && !n && !r) {
+    const n = e[Z]?.[t] === J;
+    const r = e[Y]?.[t] === J;
+    if (writeOnly(e[U]) && !n && !r) {
       untrack(() => {
-        const n = e[se] && !j;
-        const r = n ? $ : Z;
-        if (n) trackOptimisticStore(e[J]);
-        const i = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : e[Y][t];
-        if (t in e[Y] || (e[Z] && t in e[Z])) {
-          (e[r] || (e[r] = Object.create(null)))[t] = X;
+        const n = e[ie] && !W;
+        const r = n ? Z : Y;
+        if (n) trackOptimisticStore(e[U]);
+        const i = e[Z] && t in e[Z] ? e[Z][t] : e[Y] && t in e[Y] ? e[Y][t] : e[X][t];
+        if (t in e[X] || (e[Y] && t in e[Y])) {
+          (e[r] || (e[r] = Object.create(null)))[t] = J;
         } else if (e[r] && t in e[r]) {
           delete e[r][t];
         } else return true;
-        if (e[te]?.[t]) setSignal(e[te][t], false);
-        const s = getNodes(e, ee);
+        if (e[ee]?.[t]) setSignal(e[ee][t], false);
+        const s = getNodes(e, $);
         s[t] && setSignal(s[t], undefined);
-        s[z] && setSignal(s[z], undefined);
+        s[K] && setSignal(s[K], undefined);
       });
     }
     return true;
   },
   ownKeys(e) {
     trackSelf(e);
-    let t = getKeys(e[Y], e[Z], false);
-    if (e[$]) {
+    let t = getKeys(e[X], e[Y], false);
+    if (e[Z]) {
       const n = new Set(t);
-      for (const t of Reflect.ownKeys(e[$])) {
-        if (e[$][t] !== X) n.add(t);
+      for (const t of Reflect.ownKeys(e[Z])) {
+        if (e[Z][t] !== J) n.add(t);
         else n.delete(t);
       }
       t = Array.from(n);
@@ -2295,25 +2328,25 @@ const ce = {
     return t;
   },
   getOwnPropertyDescriptor(e, t) {
-    if (t === J) return { value: e[J], writable: true, configurable: true };
-    if (e[$] && t in e[$]) {
-      if (e[$][t] === X) return undefined;
-      const n = getPropertyDescriptor(e[Y], e[Z], t);
+    if (t === U) return { value: e[U], writable: true, configurable: true };
+    if (e[Z] && t in e[Z]) {
+      if (e[Z][t] === J) return undefined;
+      const n = getPropertyDescriptor(e[X], e[Y], t);
       if (n) {
-        return { ...n, value: e[$][t] };
+        return { ...n, value: e[Z][t] };
       }
-      return { value: e[$][t], writable: true, enumerable: true, configurable: true };
+      return { value: e[Z][t], writable: true, enumerable: true, configurable: true };
     }
-    return getPropertyDescriptor(e[Y], e[Z], t);
+    return getPropertyDescriptor(e[X], e[Y], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[Y]);
+    return Object.getPrototypeOf(e[X]);
   }
 };
 function storeSetter(e, t) {
-  const n = fe;
-  fe = new Set();
-  fe.add(e);
+  const n = ue;
+  ue = new Set();
+  ue.add(e);
   try {
     const n = t(e);
     if (n !== e && n !== undefined) {
@@ -2329,8 +2362,8 @@ function storeSetter(e, t) {
       }
     }
   } finally {
-    fe.clear();
-    fe = n;
+    ue.clear();
+    ue = n;
   }
 }
 function createStore(e, t, n) {
@@ -2347,39 +2380,39 @@ function createOptimisticStore(e, t, n) {
   return [o, e => storeSetter(o, e)];
 }
 function clearOptimisticStore(e) {
-  const t = e[U];
-  if (!t || !t[$]) return;
-  const n = t[$];
-  const r = t[ee];
+  const t = e[z];
+  if (!t || !t[Z]) return;
+  const n = t[Z];
+  const r = t[$];
   setProjectionWriteActive(true);
   try {
     if (r) {
       for (const e of Reflect.ownKeys(n)) {
         if (r[e]) {
           r[e].Y = undefined;
-          const n = t[Z] && e in t[Z] ? t[Z][e] : t[Y][e];
-          const i = n === X ? undefined : n;
+          const n = t[Y] && e in t[Y] ? t[Y][e] : t[X][e];
+          const i = n === J ? undefined : n;
           setSignal(r[e], isWrappable(i) ? wrap(i, t) : i);
         }
       }
-      if (r[z]) {
-        r[z].Y = undefined;
-        setSignal(r[z], undefined);
+      if (r[K]) {
+        r[K].Y = undefined;
+        setSignal(r[K], undefined);
       }
     }
   } finally {
     setProjectionWriteActive(false);
   }
-  delete t[$];
+  delete t[Z];
 }
 function createOptimisticProjectionInternal(e, t = {}, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[ne] = wrapProjection;
-    e[re] = i;
-    e[se] = true;
-    Object.defineProperty(e, ie, {
+    e[te] = wrapProjection;
+    e[ne] = i;
+    e[ie] = true;
+    Object.defineProperty(e, re, {
       get() {
         return r;
       },
@@ -2388,8 +2421,8 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[U]?.[ne] === wrapProjection) return e;
-    const t = createStoreProxy(e, ce, wrapper);
+    if (e[z]?.[te] === wrapProjection) return e;
+    const t = createStoreProxy(e, fe, wrapper);
     i.set(e, t);
     return t;
   };
@@ -2397,18 +2430,26 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
   if (e) {
     r = computed(() => {
       const t = getOwner();
+      let r = false;
+      let i;
+      const o = new Proxy(
+        s,
+        createWriteTraps(() => !r || t.Oe === i)
+      );
       setProjectionWriteActive(true);
       try {
-        storeSetter(new Proxy(s, K), r => {
-          const i = handleAsync(t, e(r), e => {
+        storeSetter(o, o => {
+          i = e(o);
+          r = true;
+          const u = handleAsync(t, i, e => {
             setProjectionWriteActive(true);
             try {
-              e !== r && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
+              e !== o && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
             } finally {
               setProjectionWriteActive(false);
             }
           });
-          i !== r && i !== undefined && reconcile(i, n?.key || "id")(s);
+          u !== o && u !== undefined && reconcile(u, n?.key || "id")(s);
         });
       } finally {
         setProjectionWriteActive(false);
@@ -2418,7 +2459,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
   }
   return { store: s, node: r };
 }
-const le = Symbol(0);
+const ce = Symbol(0);
 function updatePath(e, t, n = 0) {
   let r,
     i = e;
@@ -2462,7 +2503,7 @@ function updatePath(e, t, n = 0) {
     if (s === i) return;
   }
   if (r === undefined && s == undefined) return;
-  if (s === le) {
+  if (s === ce) {
     delete e[r];
   } else if (r === undefined || (isWrappable(i) && isWrappable(s) && !Array.isArray(s))) {
     const t = r !== undefined ? e[r] : e;
@@ -2472,26 +2513,26 @@ function updatePath(e, t, n = 0) {
     e[r] = s;
   }
 }
-const ae = Object.assign(
+const le = Object.assign(
   function storePath(...e) {
     return t => {
       updatePath(t, e);
     };
   },
-  { DELETE: le }
+  { DELETE: ce }
 );
 function snapshotImpl(e, t, n, r) {
   let i, s, o, u, f, c;
   if (!isWrappable(e)) return e;
   if (n && n.has(e)) return n.get(e);
   if (!n) n = new Map();
-  if ((i = e[U] || r?.get(e)?.[U])) {
-    if (t) trackSelf(i, z);
-    o = i[Z];
-    s = Array.isArray(i[Y]);
-    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[Y]))) : i[Y]);
-    e = i[Y];
-    r = oe;
+  if ((i = e[z] || r?.get(e)?.[z])) {
+    if (t) trackSelf(i, K);
+    o = i[Y];
+    s = Array.isArray(i[X]);
+    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[X]))) : i[X]);
+    e = i[X];
+    r = se;
   } else {
     s = Array.isArray(e);
     n.set(e, e);
@@ -2500,7 +2541,7 @@ function snapshotImpl(e, t, n, r) {
     const s = o?.length || e.length;
     for (let l = 0; l < s; l++) {
       c = o && l in o ? o[l] : e[l];
-      if (c === X) continue;
+      if (c === J) continue;
       if (t && isWrappable(c)) wrap(c, i);
       if ((f = snapshotImpl(c, t, n, r)) !== c || u) {
         if (!u) n.set(e, (u = [...e]));
@@ -2535,13 +2576,13 @@ function deep(e) {
 function trueFn() {
   return true;
 }
-const de = {
+const ae = {
   get(e, t, n) {
-    if (t === J) return n;
+    if (t === U) return n;
     return e.get(t);
   },
   has(e, t) {
-    if (t === J) return true;
+    if (t === U) return true;
     return e.has(t);
   },
   set: trueFn,
@@ -2564,15 +2605,15 @@ const de = {
 function resolveSource(e) {
   return !(e = typeof e === "function" ? e() : e) ? {} : e;
 }
-const pe = Symbol(0);
+const de = Symbol(0);
 function merge(...e) {
   if (e.length === 1 && typeof e[0] !== "function") return e[0];
   let t = false;
   const n = [];
   for (let r = 0; r < e.length; r++) {
     const i = e[r];
-    t = t || (!!i && J in i);
-    const s = !!i && i[pe];
+    t = t || (!!i && U in i);
+    const s = !!i && i[de];
     if (s) n.push(...s);
     else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
   }
@@ -2580,7 +2621,7 @@ function merge(...e) {
     return new Proxy(
       {
         get(e) {
-          if (e === pe) return n;
+          if (e === de) return n;
           for (let t = n.length - 1; t >= 0; t--) {
             const r = resolveSource(n[t]);
             if (e in r) return r[e];
@@ -2598,7 +2639,7 @@ function merge(...e) {
           return [...new Set(e)];
         }
       },
-      de
+      ae
     );
   }
   const r = Object.create(null);
@@ -2630,12 +2671,12 @@ function merge(...e) {
     if (n.get) Object.defineProperty(o, t, n);
     else o[t] = n.value;
   }
-  o[pe] = n;
+  o[de] = n;
   return o;
 }
 function omit(e, ...t) {
   const n = new Set(t);
-  if (b && J in e) {
+  if (b && U in e) {
     return new Proxy(
       {
         get(t) {
@@ -2648,7 +2689,7 @@ function omit(e, ...t) {
           return Object.keys(e).filter(e => !n.has(e));
         }
       },
-      de
+      ae
     );
   }
   const r = {};
@@ -2682,24 +2723,24 @@ function mapArray(e, t, n) {
     })
   );
 }
-const he = { pureWrite: true };
+const pe = { pureWrite: true };
 function updateKeyedMap() {
   const e = this.Je() || [],
     t = e.length;
-  e[z];
+  e[K];
   runWithOwner(this.ze, () => {
     let n,
       r,
       i = this.tt
         ? () => {
-            this.tt[r] = signal(e[r], he);
-            this.nt && (this.nt[r] = signal(r, he));
+            this.tt[r] = signal(e[r], pe);
+            this.nt && (this.nt[r] = signal(r, pe));
             return this.Ye(accessor(this.tt[r]), this.nt ? accessor(this.nt[r]) : undefined);
           }
         : this.nt
           ? () => {
               const t = e[r];
-              this.nt[r] = signal(r, he);
+              this.nt[r] = signal(r, pe);
               return this.Ye(() => t, accessor(this.nt[r]));
             }
           : () => {
@@ -2872,7 +2913,7 @@ function boundaryComputed(e, t) {
     const r = e !== undefined ? e : n.ge;
     const i = t !== undefined ? t : n.ae;
     n.ge &= ~n.ut;
-    n.B.notify(n, n.ut, r, i);
+    n.V.notify(n, n.ut, r, i);
   };
   n.ut = t;
   n.Qe = true;
@@ -2880,22 +2921,22 @@ function boundaryComputed(e, t) {
   return n;
 }
 function createBoundChildren(e, t, n, r) {
-  const i = e.B;
-  i.addChild((e.B = n));
-  onCleanup(() => i.removeChild(e.B));
+  const i = e.V;
+  i.addChild((e.V = n));
+  cleanup(() => i.removeChild(e.V));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
   });
 }
-const ge = Symbol();
+const he = Symbol();
 class CollectionQueue extends Queue {
   ft;
   ct = new Set();
   lt = signal(false, { pureWrite: true, De: true });
   dt = false;
   ht;
-  gt = ge;
+  gt = he;
   constructor(e) {
     super();
     this.ft = e;
@@ -2911,7 +2952,7 @@ class CollectionQueue extends Queue {
         try {
           return this.ht();
         } catch {
-          return ge;
+          return he;
         }
       });
       if (e !== this.gt) {
@@ -3028,10 +3069,10 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-exports.$PROXY = J;
+exports.$PROXY = U;
 exports.$REFRESH = O;
-exports.$TARGET = U;
-exports.$TRACK = z;
+exports.$TARGET = z;
+exports.$TRACK = K;
 exports.ContextNotFoundError = ContextNotFoundError;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
@@ -3084,5 +3125,5 @@ exports.runWithOwner = runWithOwner;
 exports.setContext = setContext;
 exports.setSnapshotCapture = setSnapshotCapture;
 exports.snapshot = snapshot;
-exports.storePath = ae;
+exports.storePath = le;
 exports.untrack = untrack;