@solidjs/signals 2.0.0-beta.14 → 2.0.0-beta.15

package/dist/node.cjs

@@ -54,442 +54,337 @@ const C = "sp";
 const E = typeof Proxy === "function";
 const k = {};
 const j = Symbol("refresh");
-const W = new Set();
-const R = new Set();
-let A = 0;
-const I = undefined;
-function emitDiagnostic(e) {
-  const t = { sequence: ++A, ...e };
-  for (const e of W) e(t);
-  for (const e of R) e.push(t);
-  return t;
-}
-function actualInsertIntoHeap(e, t) {
-  const n = (e.i?.t ? e.i.u?.o : e.i?.o) ?? -1;
-  if (n >= e.o) e.o = n + 1;
-  const r = e.o;
-  const i = t.l[r];
-  if (i === undefined) t.l[r] = e;
-  else {
-    const t = i.p;
-    t.h = e;
-    e.p = t;
-    i.p = e;
-  }
-  if (r > t.S) t.S = r;
-}
-function insertIntoHeap(e, o) {
-  let u = e._;
-  if (u & (i | r | a)) return;
-  if (u & t) {
-    e._ = (u & -4) | n | i;
-  } else e._ = u | i;
-  if (!(u & s)) actualInsertIntoHeap(e, o);
-}
-function insertIntoHeapHeight(e, t) {
-  let n = e._;
-  if (n & (i | r | s | a)) return;
-  e._ = n | s;
-  actualInsertIntoHeap(e, t);
-}
-function deleteFromHeap(e, t) {
-  const n = e._;
-  if (!(n & (i | s))) return;
-  e._ = n & -25;
-  const r = e.o;
-  if (e.p === e) t.l[r] = undefined;
-  else {
-    const n = e.h;
-    const i = t.l[r];
-    const s = n ?? i;
-    if (e === i) t.l[r] = n;
-    else e.p.h = n;
-    s.p = e.p;
-  }
-  e.p = e;
-  e.h = undefined;
-}
-function markHeap(e) {
-  if (e.m) return;
-  e.m = true;
-  for (let t = 0; t <= e.S; t++) {
-    for (let n = e.l[t]; n !== undefined; n = n.h) {
-      if (n._ & i) markNode(n);
-    }
-  }
-}
-function markNode(e, r = n) {
-  const i = e._;
-  if ((i & (t | n)) >= r) return;
-  e._ = (i & -4) | r;
-  for (let n = e.O; n !== null; n = n.P) {
-    markNode(n.N, t);
-  }
-  if (e.C !== null) {
-    for (let n = e.C; n !== null; n = n.k) {
-      for (let e = n.O; e !== null; e = e.P) {
-        markNode(e.N, t);
-      }
-    }
-  }
-}
-function runHeap(e, t) {
-  e.m = false;
-  for (e.j = 0; e.j <= e.S; e.j++) {
-    let n = e.l[e.j];
-    while (n !== undefined) {
-      if (n._ & i) t(n);
-      else adjustHeight(n, e);
-      n = e.l[e.j];
-    }
-  }
-  e.S = 0;
-}
-function adjustHeight(e, t) {
-  deleteFromHeap(e, t);
-  let n = e.o;
-  for (let t = e.W; t; t = t.R) {
-    const e = t.A;
-    const r = e.I || e;
-    if (r.L && r.o >= n) n = r.o + 1;
-  }
-  if (e.o !== n) {
-    e.o = n;
-    for (let n = e.O; n !== null; n = n.P) {
-      insertIntoHeapHeight(n.N, t);
-    }
-  }
-}
-const L = new WeakMap();
-const T = new Set();
+const W = undefined;
+const R = new WeakMap();
+const A = new Set();
 function getOrCreateLane(e) {
-  let t = L.get(e);
+  let t = R.get(e);
   if (t) {
     return findLane(t);
   }
-  const n = e.T;
-  const r = n?.H ? findLane(n.H) : null;
-  t = { q: e, F: new Set(), M: [[], []], D: null, V: M, K: r };
-  L.set(e, t);
-  T.add(t);
-  e.B = false;
+  const n = e.t;
+  const r = n?.i ? findLane(n.i) : null;
+  t = { o: e, u: new Set(), l: [[], []], p: null, h: q, S: r };
+  R.set(e, t);
+  A.add(t);
+  e._ = false;
   return t;
 }
 function findLane(e) {
-  while (e.D) e = e.D;
+  while (e.p) e = e.p;
   return e;
 }
 function mergeLanes(e, t) {
   e = findLane(e);
   t = findLane(t);
   if (e === t) return e;
-  t.D = e;
-  for (const n of t.F) e.F.add(n);
-  e.M[0].push(...t.M[0]);
-  e.M[1].push(...t.M[1]);
+  t.p = e;
+  for (const n of t.u) e.u.add(n);
+  e.l[0].push(...t.l[0]);
+  e.l[1].push(...t.l[1]);
   return e;
 }
 function resolveLane(e) {
-  const t = e.H;
+  const t = e.i;
   if (!t) return undefined;
   const n = findLane(t);
-  if (T.has(n)) return n;
-  e.H = undefined;
+  if (A.has(n)) return n;
+  e.i = undefined;
   return undefined;
 }
 function resolveTransition(e) {
-  return resolveLane(e)?.V ?? e.V;
+  return resolveLane(e)?.h ?? e.h;
 }
 function hasActiveOverride(e) {
-  return !!(e.G !== undefined && e.G !== x);
+  return !!(e.m !== undefined && e.m !== x);
 }
 function assignOrMergeLane(e, t) {
   const n = findLane(t);
-  const r = e.H;
+  const r = e.i;
   if (r) {
-    if (r.D) {
-      e.H = t;
+    if (r.p) {
+      e.i = t;
       return;
     }
     const i = findLane(r);
-    if (T.has(i)) {
+    if (A.has(i)) {
       if (i !== n && !hasActiveOverride(e)) {
-        if (n.K && findLane(n.K) === i) {
-          e.H = t;
-        } else if (i.K && findLane(i.K) === n);
+        if (n.S && findLane(n.S) === i) {
+          e.i = t;
+        } else if (i.S && findLane(i.S) === n);
         else mergeLanes(n, i);
       }
       return;
     }
   }
-  e.H = t;
+  e.i = t;
 }
-const H = new Set();
-const q = { l: new Array(2e3).fill(undefined), m: false, j: 0, S: 0 };
-const Q = { l: new Array(2e3).fill(undefined), m: false, j: 0, S: 0 };
+const I = new Set();
+const L = { O: new Array(2e3).fill(undefined), P: false, N: 0, C: 0 };
+const T = { O: new Array(2e3).fill(undefined), P: false, N: 0, C: 0 };
+let H = 0;
+let q = null;
+let Q = false;
 let F = 0;
-let M = null;
-let D = false;
-let V = 0;
-let K = false;
-let B = null;
-const G = new Set();
+let M = false;
+let V = null;
+const D = new Set();
 function registerTransientStoreNode(e) {
-  G.add(e);
+  D.add(e);
 }
 function canUseSimpleSyncFlush(e) {
   return (
-    H.size === 0 &&
-    T.size === 0 &&
-    e.U.length === 0 &&
-    e.$.length === 0 &&
-    e.J.size === 0 &&
-    G.size === 0
+    I.size === 0 &&
+    A.size === 0 &&
+    e.k.length === 0 &&
+    e.j.length === 0 &&
+    e.W.size === 0 &&
+    D.size === 0
   );
 }
 function sweepTransientStoreNodes() {
-  if (G.size === 0) return;
-  for (const e of G) {
-    if (e.O !== null) {
-      G.delete(e);
+  if (D.size === 0) return;
+  for (const e of D) {
+    if (e.R !== null) {
+      D.delete(e);
       continue;
     }
-    if (e.X !== x) continue;
-    if (e.G !== undefined && e.G !== x) continue;
-    G.delete(e);
-    e.Y?.();
+    if (e.A !== x) continue;
+    if (e.m !== undefined && e.m !== x) continue;
+    D.delete(e);
+    e.I?.();
   }
 }
 function enforceLoadingBoundary(e) {}
 function shouldReadStashedOptimisticValue(e) {
-  return !!B?.has(e);
+  return !!V?.has(e);
 }
 function runLaneEffects(e) {
-  for (const t of T) {
-    if (t.D || t.F.size > 0) continue;
-    const n = t.M[e - 1];
+  for (const t of A) {
+    if (t.p || t.u.size > 0) continue;
+    const n = t.l[e - 1];
     if (n.length) {
-      t.M[e - 1] = [];
+      t.l[e - 1] = [];
       runQueue(n, e);
     }
   }
 }
 function queueStashedOptimisticEffects(e) {
-  for (let t = e.O; t !== null; t = t.P) {
-    const e = t.N;
-    if (!e.Z) continue;
-    if (e.Z === P) {
-      if (!e.ee) {
-        e.ee = true;
-        e.te.enqueue(v, e.ne);
+  for (let t = e.R; t !== null; t = t.L) {
+    const e = t.T;
+    if (!e.H) continue;
+    if (e.H === P) {
+      if (!e.q) {
+        e.q = true;
+        e.F.enqueue(v, e.M);
       }
       continue;
     }
-    const n = e._ & o ? Q : q;
-    if (n.j > e.o) n.j = e.o;
+    const n = e.V & o ? T : L;
+    if (n.N > e.D) n.N = e.D;
     insertIntoHeap(e, n);
   }
 }
 function setProjectionWriteActive(e) {
-  K = e;
+  M = e;
 }
 function mergeTransitionState(e, t) {
-  t.re = e;
-  e.ie.push(...t.ie);
-  for (const n of T) if (n.V === t) n.V = e;
-  e.$.push(...t.$);
-  for (const n of t.J) e.J.add(n);
-  for (const [n, r] of t.se) {
-    let t = e.se.get(n);
-    if (!t) e.se.set(n, (t = new Set()));
+  t.K = e;
+  e.B.push(...t.B);
+  for (const n of A) if (n.h === t) n.h = e;
+  e.j.push(...t.j);
+  for (const n of t.W) e.W.add(n);
+  for (const [n, r] of t.G) {
+    let t = e.G.get(n);
+    if (!t) e.G.set(n, (t = new Set()));
     for (const e of r) t.add(e);
   }
-  for (const n of t.oe) e.oe.add(n);
+  for (const n of t.U) e.U.add(n);
 }
 function resolveOptimisticNodes(e) {
   for (let t = 0; t < e.length; t++) {
     const n = e[t];
-    n.H = undefined;
-    if (n.X !== x) {
-      n.ue = n.X;
-      n.X = x;
+    n.i = undefined;
+    if (n.A !== x) {
+      n.$ = n.A;
+      n.A = x;
     }
-    const r = n.G;
-    n.G = x;
-    if (r !== x && n.ue !== r) insertSubs(n, true);
-    n.V = null;
+    const r = n.m;
+    n.m = x;
+    if (r !== x && n.$ !== r) insertSubs(n, true);
+    n.h = null;
   }
   e.length = 0;
 }
 function cleanupCompletedLanes(e) {
-  for (const t of T) {
-    const n = e ? t.V === e : !t.V;
+  for (const t of A) {
+    const n = e ? t.h === e : !t.h;
     if (!n) continue;
-    if (!t.D) {
-      if (t.M[0].length) runQueue(t.M[0], O);
-      if (t.M[1].length) runQueue(t.M[1], v);
+    if (!t.p) {
+      if (t.l[0].length) runQueue(t.l[0], O);
+      if (t.l[1].length) runQueue(t.l[1], v);
     }
-    if (t.q.H === t) t.q.H = undefined;
-    t.F.clear();
-    t.M[0].length = 0;
-    t.M[1].length = 0;
-    T.delete(t);
-    L.delete(t.q);
+    if (t.o.i === t) t.o.i = undefined;
+    t.u.clear();
+    t.l[0].length = 0;
+    t.l[1].length = 0;
+    A.delete(t);
+    R.delete(t.o);
   }
 }
 function schedule() {
-  if (D) return;
-  D = true;
-  if (!V && !z.fe && !K) queueMicrotask(flush);
+  if (Q) return;
+  Q = true;
+  if (!F && !K.J && !M) queueMicrotask(flush);
 }
 class Queue {
-  i = null;
-  le = [[], []];
-  U = [];
-  created = F;
+  X = null;
+  Y = [[], []];
+  k = [];
+  created = H;
   addChild(e) {
-    this.U.push(e);
-    e.i = this;
+    this.k.push(e);
+    e.X = this;
   }
   removeChild(e) {
-    const t = this.U.indexOf(e);
+    const t = this.k.indexOf(e);
     if (t >= 0) {
-      this.U.splice(t, 1);
-      e.i = null;
+      this.k.splice(t, 1);
+      e.X = null;
     }
   }
   notify(e, t, n, r) {
-    if (this.i) return this.i.notify(e, t, n, r);
+    if (this.X) return this.X.notify(e, t, n, r);
     return false;
   }
   run(e) {
-    if (this.le[e - 1].length) {
-      const t = this.le[e - 1];
-      this.le[e - 1] = [];
+    if (this.Y[e - 1].length) {
+      const t = this.Y[e - 1];
+      this.Y[e - 1] = [];
       runQueue(t, e);
     }
-    for (let t = 0; t < this.U.length; t++) this.U[t].run?.(e);
+    for (let t = 0; t < this.k.length; t++) this.k[t].run?.(e);
   }
   enqueue(e, t) {
     if (e) {
-      if (re) {
-        const n = findLane(re);
-        n.M[e - 1].push(t);
+      if (Z) {
+        const n = findLane(Z);
+        n.l[e - 1].push(t);
       } else {
-        this.le[e - 1].push(t);
+        this.Y[e - 1].push(t);
       }
     }
     schedule();
   }
   stashQueues(e) {
-    e.le[0].push(...this.le[0]);
-    e.le[1].push(...this.le[1]);
-    this.le = [[], []];
-    for (let t = 0; t < this.U.length; t++) {
-      let n = this.U[t];
-      let r = e.U[t];
+    e.Y[0].push(...this.Y[0]);
+    e.Y[1].push(...this.Y[1]);
+    this.Y = [[], []];
+    for (let t = 0; t < this.k.length; t++) {
+      let n = this.k[t];
+      let r = e.k[t];
       if (!r) {
-        r = { le: [[], []], U: [] };
-        e.U[t] = r;
+        r = { Y: [[], []], k: [] };
+        e.k[t] = r;
       }
       n.stashQueues(r);
     }
   }
   restoreQueues(e) {
-    this.le[0].push(...e.le[0]);
-    this.le[1].push(...e.le[1]);
-    for (let t = 0; t < e.U.length; t++) {
-      const n = e.U[t];
-      let r = this.U[t];
+    this.Y[0].push(...e.Y[0]);
+    this.Y[1].push(...e.Y[1]);
+    for (let t = 0; t < e.k.length; t++) {
+      const n = e.k[t];
+      let r = this.k[t];
       if (r) r.restoreQueues(n);
     }
   }
 }
 class GlobalQueue extends Queue {
-  fe = false;
-  ce = null;
-  ae = [];
-  $ = [];
-  J = new Set();
-  static de;
-  static pe;
-  static he;
-  static ye = null;
+  J = false;
+  Z = null;
+  ee = [];
+  j = [];
+  W = new Set();
+  static te;
+  static ne;
+  static re;
+  static ie = null;
   flush() {
-    if (this.fe) return;
-    this.fe = true;
+    if (this.J) return;
+    this.J = true;
     try {
-      runHeap(q, GlobalQueue.de);
-      if (M) {
-        const e = transitionComplete(M);
+      runHeap(L, GlobalQueue.te);
+      if (q) {
+        const e = transitionComplete(q);
         if (!e) {
-          const e = M;
-          runHeap(Q, GlobalQueue.de);
-          this.ce = null;
-          this.ae = [];
-          this.$ = [];
-          this.J = new Set();
+          const e = q;
+          runHeap(T, GlobalQueue.te);
+          this.Z = null;
+          this.ee = [];
+          this.j = [];
+          this.W = new Set();
           runLaneEffects(O);
           runLaneEffects(v);
-          this.stashQueues(e.Se);
-          F++;
-          D = q.S >= q.j;
-          reassignPendingTransition(e.ae);
-          M = null;
-          if (!e.ie.length && !e.se.size && e.$.length) {
-            B = new Set();
-            for (let t = 0; t < e.$.length; t++) {
-              const n = e.$[t];
-              if (n.L || n.ge & d) continue;
-              B.add(n);
+          this.stashQueues(e.se);
+          H++;
+          Q = L.C >= L.N;
+          reassignPendingTransition(e.ee);
+          q = null;
+          if (!e.B.length && !e.G.size && e.j.length) {
+            V = new Set();
+            for (let t = 0; t < e.j.length; t++) {
+              const n = e.j[t];
+              if (n.oe || n.ue & d) continue;
+              V.add(n);
               queueStashedOptimisticEffects(n);
             }
           }
           try {
             finalizePureQueue(null, true);
           } finally {
-            B = null;
+            V = null;
           }
           return;
         }
-        this.ae !== M.ae && this.ae.push(...M.ae);
-        this.restoreQueues(M.Se);
-        H.delete(M);
-        const t = M;
-        M = null;
-        reassignPendingTransition(this.ae);
+        this.ee !== q.ee && this.ee.push(...q.ee);
+        this.restoreQueues(q.se);
+        I.delete(q);
+        const t = q;
+        q = null;
+        reassignPendingTransition(this.ee);
         finalizePureQueue(t);
       } else {
         if (canUseSimpleSyncFlush(this)) {
           commitPendingNodes();
-          if (q.S >= q.j) {
-            runHeap(q, GlobalQueue.de);
+          if (L.C >= L.N) {
+            runHeap(L, GlobalQueue.te);
             commitPendingNodes();
           }
         } else {
-          if (H.size) runHeap(Q, GlobalQueue.de);
+          if (I.size) runHeap(T, GlobalQueue.te);
           finalizePureQueue();
         }
       }
-      F++;
-      D = q.S >= q.j;
-      T.size && runLaneEffects(O);
+      H++;
+      Q = L.C >= L.N;
+      A.size && runLaneEffects(O);
       this.run(O);
-      T.size && runLaneEffects(v);
+      A.size && runLaneEffects(v);
       this.run(v);
       if (false);
     } finally {
-      this.fe = false;
+      this.J = false;
     }
   }
   notify(e, t, n, r) {
     if (t & _) {
       if (n & _) {
-        const t = r !== undefined ? r : e.we;
-        if (M && t) {
+        const t = r !== undefined ? r : e.fe;
+        if (q && t) {
           const n = t.source;
-          let r = M.se.get(n);
-          if (!r) M.se.set(n, (r = new Set()));
+          let r = q.G.get(n);
+          if (!r) q.G.set(n, (r = new Set()));
           const i = r.size;
           r.add(e);
           if (r.size !== i) schedule();
@@ -501,125 +396,125 @@ class GlobalQueue extends Queue {
   }
   initTransition(e) {
     if (e) e = currentTransition(e);
-    if (e && e === M) return;
-    if (!e && M && M._e === F) return;
-    if (!M) {
-      M = e ?? {
-        _e: F,
-        ae: [],
-        se: new Map(),
-        $: [],
-        J: new Set(),
-        ie: [],
-        Se: { le: [[], []], U: [] },
-        re: false,
-        oe: new Set()
+    if (e && e === q) return;
+    if (!e && q && q.le === H) return;
+    if (!q) {
+      q = e ?? {
+        le: H,
+        ee: [],
+        G: new Map(),
+        j: [],
+        W: new Set(),
+        B: [],
+        se: { Y: [[], []], k: [] },
+        K: false,
+        U: new Set()
       };
     } else if (e) {
-      const t = M;
+      const t = q;
       mergeTransitionState(e, t);
-      H.delete(t);
-      M = e;
+      I.delete(t);
+      q = e;
     }
-    H.add(M);
-    M._e = F;
-    if (this.ce !== null) {
-      this.ce.V = M;
-      M.ae.push(this.ce);
-      this.ce = null;
+    I.add(q);
+    q.le = H;
+    if (this.Z !== null) {
+      this.Z.h = q;
+      q.ee.push(this.Z);
+      this.Z = null;
     }
-    if (this.ae !== M.ae) {
-      for (let e = 0; e < this.ae.length; e++) {
-        const t = this.ae[e];
-        t.V = M;
-        M.ae.push(t);
+    if (this.ee !== q.ee) {
+      for (let e = 0; e < this.ee.length; e++) {
+        const t = this.ee[e];
+        t.h = q;
+        q.ee.push(t);
       }
-      this.ae = M.ae;
+      this.ee = q.ee;
     }
-    if (this.$ !== M.$) {
-      for (let e = 0; e < this.$.length; e++) {
-        const t = this.$[e];
-        t.V = M;
-        M.$.push(t);
+    if (this.j !== q.j) {
+      for (let e = 0; e < this.j.length; e++) {
+        const t = this.j[e];
+        t.h = q;
+        q.j.push(t);
       }
-      this.$ = M.$;
+      this.j = q.j;
     }
-    for (const e of T) {
-      if (!e.V) e.V = M;
+    for (const e of A) {
+      if (!e.h) e.h = q;
     }
-    if (this.J !== M.J) {
-      for (const e of this.J) M.J.add(e);
-      this.J = M.J;
+    if (this.W !== q.W) {
+      for (const e of this.W) q.W.add(e);
+      this.W = q.W;
     }
   }
 }
 function queuePendingNode(e) {
-  if (M) {
-    z.ae.push(e);
+  if (q) {
+    K.ee.push(e);
     return;
   }
-  if (z.ce === null && z.ae.length === 0) {
-    z.ce = e;
+  if (K.Z === null && K.ee.length === 0) {
+    K.Z = e;
     return;
   }
-  if (z.ce !== null) {
-    z.ae.push(z.ce);
-    z.ce = null;
+  if (K.Z !== null) {
+    K.ee.push(K.Z);
+    K.Z = null;
   }
-  z.ae.push(e);
+  K.ee.push(e);
 }
 function insertSubs(e, t = false) {
-  const n = e.H || re;
-  const r = e.me !== undefined;
-  for (let i = e.O; i !== null; i = i.P) {
-    if (r && i.N.ge & y) {
-      i.N._ |= l;
+  const n = e.i || Z;
+  const r = e.ce !== undefined;
+  for (let i = e.R; i !== null; i = i.L) {
+    if (r && i.T.ue & y) {
+      i.T.V |= l;
       continue;
     }
     if (t && n) {
-      i.N._ |= f;
-      assignOrMergeLane(i.N, n);
+      i.T.V |= f;
+      assignOrMergeLane(i.T, n);
     } else if (t) {
-      i.N._ |= f;
-      i.N.H = undefined;
+      i.T.V |= f;
+      i.T.i = undefined;
     }
-    const e = i.N;
-    if (e.Z === P) {
-      if (!e.ee) {
-        e.ee = true;
-        e.te.enqueue(v, e.ne);
+    const e = i.T;
+    if (e.H === P) {
+      if (!e.q) {
+        e.q = true;
+        e.F.enqueue(v, e.M);
       }
       continue;
     }
-    const s = i.N._ & o ? Q : q;
-    if (s.j > i.N.o) s.j = i.N.o;
-    insertIntoHeap(i.N, s);
+    const s = i.T.V & o ? T : L;
+    if (s.N > i.T.D) s.N = i.T.D;
+    insertIntoHeap(i.T, s);
   }
 }
 function commitPendingNode(e) {
   const t = e;
-  if (!t.L) {
-    if (e.X !== x) {
-      e.ue = e.X;
-      e.X = x;
+  if (!t.oe) {
+    if (e.A !== x) {
+      e.$ = e.A;
+      e.A = x;
     }
     return;
   }
-  if (e.X !== x) {
-    e.ue = e.X;
-    e.X = x;
-    if (e.Z && e.Z !== P) e.ee = true;
+  if (e.A !== x) {
+    e.$ = e.A;
+    e.A = x;
+    if (e.H && e.H !== P) e.q = true;
   }
-  t._ &= ~a;
-  if (!(t.be & _)) t.be &= ~b;
-  if (t.Oe !== null || t.ve !== null) GlobalQueue.pe(t, false, true);
+  t.V &= ~a;
+  if (!(t.ae & _)) t.ae &= ~b;
+  if (t.de !== null || t.pe !== null) GlobalQueue.ne(t, false, true);
 }
 function commitPendingNodes() {
-  if (z.ce !== null) {
-    commitPendingNode(z.ce);
-    z.ce = null;
+  if (K.Z !== null) {
+    commitPendingNode(K.Z);
+    K.Z = null;
   }
-  const e = z.ae;
+  const e = K.ee;
   for (let t = 0; t < e.length; t++) {
     commitPendingNode(e[t]);
   }
@@ -628,32 +523,32 @@ function commitPendingNodes() {
 function finalizePureQueue(e = null, t = false) {
   const n = !t;
   if (n) commitPendingNodes();
-  if (!t && z.U.length) checkBoundaryChildren(z);
-  const r = q.S >= q.j;
-  if (r) runHeap(q, GlobalQueue.de);
+  if (!t && K.k.length) checkBoundaryChildren(K);
+  const r = L.C >= L.N;
+  if (r) runHeap(L, GlobalQueue.te);
   if (n) {
     if (r) commitPendingNodes();
-    resolveOptimisticNodes(e ? e.$ : z.$);
-    if (e && e.oe.size) {
-      for (const t of e.oe) {
-        if (t._ & u) continue;
-        if (t.Z === P) {
-          if (!t.ee) {
-            t.ee = true;
-            t.te.enqueue(v, t.ne);
+    resolveOptimisticNodes(e ? e.j : K.j);
+    if (e && e.U.size) {
+      for (const t of e.U) {
+        if (t.V & u) continue;
+        if (t.H === P) {
+          if (!t.q) {
+            t.q = true;
+            t.F.enqueue(v, t.M);
           }
           continue;
         }
-        const e = t._ & o ? Q : q;
-        if (e.j > t.o) e.j = t.o;
+        const e = t.V & o ? T : L;
+        if (e.N > t.D) e.N = t.D;
         insertIntoHeap(t, e);
       }
-      e.oe.clear();
+      e.U.clear();
     }
-    const t = e ? e.J : z.J;
-    if (GlobalQueue.ye && t.size) {
+    const t = e ? e.W : K.W;
+    if (GlobalQueue.ie && t.size) {
       for (const e of t) {
-        GlobalQueue.ye(e);
+        GlobalQueue.ie(e);
       }
       t.clear();
       schedule();
@@ -663,58 +558,61 @@ function finalizePureQueue(e = null, t = false) {
   }
 }
 function checkBoundaryChildren(e) {
-  for (const t of e.U) {
+  for (const t of e.k) {
     t.checkSources?.();
     checkBoundaryChildren(t);
   }
 }
 function trackOptimisticStore(e) {
-  z.J.add(e);
+  K.W.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
-    e[t].V = M;
+    e[t].h = q;
   }
 }
-const z = new GlobalQueue();
+const K = new GlobalQueue();
 function flush(e) {
   if (e) {
-    V++;
+    F++;
     try {
       return e();
     } finally {
-      flush();
-      V--;
+      try {
+        flush();
+      } finally {
+        F--;
+      }
     }
   }
-  if (z.fe) {
+  if (K.J) {
     return;
   }
-  while (D || M) {
-    z.flush();
+  while (Q || q) {
+    K.flush();
   }
 }
 function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function reporterBlocksSource(e, t) {
-  if (e._ & (o | u)) return false;
-  if (e.Pe === t || e.xe?.has(t)) return true;
-  for (let n = e.W; n; n = n.R) {
-    let e = n.A;
+  if (e.V & (o | u)) return false;
+  if (e.he === t || e.ye?.has(t)) return true;
+  for (let n = e.Se; n; n = n.ge) {
+    let e = n.we;
     while (e) {
-      if (e === t || e.I === t) return true;
-      e = e.T;
+      if (e === t || e._e === t) return true;
+      e = e.t;
     }
   }
-  return !!(e.be & _ && e.we instanceof NotReadyError && e.we.source === t);
+  return !!(e.ae & _ && e.fe instanceof NotReadyError && e.fe.source === t);
 }
 function transitionComplete(e) {
-  if (e.re) return true;
-  if (e.ie.length) return false;
+  if (e.K) return true;
+  if (e.B.length) return false;
   let t = true;
-  for (const [n, r] of e.se) {
+  for (const [n, r] of e.G) {
     let i = false;
     for (const e of r) {
       if (reporterBlocksSource(e, n)) {
@@ -723,107 +621,205 @@ function transitionComplete(e) {
       }
       r.delete(e);
     }
-    if (!i) e.se.delete(n);
-    else if (n.be & _ && n.we?.source === n) {
+    if (!i) e.G.delete(n);
+    else if (n.ae & _ && n.fe?.source === n) {
       t = false;
       break;
     }
   }
   if (t) {
-    for (let n = 0; n < e.$.length; n++) {
-      const r = e.$[n];
+    for (let n = 0; n < e.j.length; n++) {
+      const r = e.j[n];
       if (
         hasActiveOverride(r) &&
-        "be" in r &&
-        r.be & _ &&
-        r.we instanceof NotReadyError &&
-        r.we.source !== r
+        "ae" in r &&
+        r.ae & _ &&
+        r.fe instanceof NotReadyError &&
+        r.fe.source !== r
       ) {
         t = false;
         break;
       }
     }
   }
-  t && (e.re = true);
+  t && (e.K = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.re && typeof e.re === "object") e = e.re;
+  while (e.K && typeof e.K === "object") e = e.K;
   return e;
 }
 function setActiveTransition(e) {
-  M = e;
+  q = e;
 }
 function runInTransition(e, t) {
-  const n = M;
+  const n = q;
   try {
-    M = currentTransition(e);
+    q = currentTransition(e);
     return t();
   } finally {
-    M = n;
+    q = n;
+  }
+}
+function actualInsertIntoHeap(e, t) {
+  const n = (e.X?.me ? e.X.be?.D : e.X?.D) ?? -1;
+  if (n >= e.D) e.D = n + 1;
+  const r = e.D;
+  const i = t.O[r];
+  if (i === undefined) t.O[r] = e;
+  else {
+    const t = i.Oe;
+    t.ve = e;
+    e.Oe = t;
+    i.Oe = e;
+  }
+  if (r > t.C) t.C = r;
+}
+function insertIntoHeap(e, o) {
+  let u = e.V;
+  if (u & (i | r | a)) return;
+  if (u & t) {
+    e.V = (u & -4) | n | i;
+  } else e.V = u | i;
+  if (!(u & s)) actualInsertIntoHeap(e, o);
+}
+function insertIntoHeapHeight(e, t) {
+  let n = e.V;
+  if (n & (i | r | s | a)) return;
+  e.V = n | s;
+  actualInsertIntoHeap(e, t);
+}
+function deleteFromHeap(e, t) {
+  const n = e.V;
+  if (!(n & (i | s))) return;
+  e.V = n & -25;
+  const r = e.D;
+  if (e.Oe === e) t.O[r] = undefined;
+  else {
+    const n = e.ve;
+    const i = t.O[r];
+    const s = n ?? i;
+    if (e === i) t.O[r] = n;
+    else e.Oe.ve = n;
+    s.Oe = e.Oe;
+  }
+  e.Oe = e;
+  e.ve = undefined;
+}
+function markHeap(e) {
+  if (e.P) return;
+  e.P = true;
+  for (let t = 0; t <= e.C; t++) {
+    for (let n = e.O[t]; n !== undefined; n = n.ve) {
+      if (n.V & i) markNode(n);
+    }
+  }
+}
+function markNode(e, r = n) {
+  const i = e.V;
+  if ((i & (t | n)) >= r) return;
+  e.V = (i & -4) | r;
+  for (let n = e.R; n !== null; n = n.L) {
+    markNode(n.T, t);
+  }
+  if (e.Pe !== null) {
+    for (let n = e.Pe; n !== null; n = n.xe) {
+      for (let e = n.R; e !== null; e = e.L) {
+        markNode(e.T, t);
+      }
+    }
+  }
+}
+function runHeap(e, t) {
+  e.P = false;
+  for (e.N = 0; e.N <= e.C; e.N++) {
+    let n = e.O[e.N];
+    while (n !== undefined) {
+      if (n.V & i) t(n);
+      else adjustHeight(n, e);
+      n = e.O[e.N];
+    }
   }
+  e.C = 0;
 }
-const U = {};
+function adjustHeight(e, t) {
+  deleteFromHeap(e, t);
+  let n = e.D;
+  for (let t = e.Se; t; t = t.ge) {
+    const e = t.we;
+    const r = e._e || e;
+    if (r.oe && r.D >= n) n = r.D + 1;
+  }
+  if (e.D !== n) {
+    e.D = n;
+    for (let t = e.R; t !== null; t = t.L) {
+      insertIntoHeapHeight(t.T, t.T.V & o ? T : L);
+    }
+  }
+}
+const B = {};
 function markDisposal(e) {
   let t = e.Ne;
   while (t) {
-    t._ |= o;
-    if (t._ & i) {
-      deleteFromHeap(t, q);
-      insertIntoHeap(t, Q);
+    const e = t.V;
+    t.V = e | o;
+    if (e & (i | s)) {
+      deleteFromHeap(t, e & o ? T : L);
+      if (e & i) insertIntoHeap(t, T);
+      else insertIntoHeapHeight(t, T);
     }
     markDisposal(t);
     t = t.Ce;
   }
 }
 function dispose(e) {
-  let t = e.W || null;
-  do {
+  let t = e.Se;
+  while (t !== null) {
     t = unlinkSubs(t);
-  } while (t !== null);
-  e.W = null;
+  }
+  e.Se = null;
   e.Ee = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
-  const r = e._;
+  const r = e.V;
   if (r & u) return;
-  if (t) e._ = r | u;
-  if (t && e.L) e.ke = null;
-  let i = n ? e.Oe : e.Ne;
+  if (t) e.V = r | u;
+  if (t && e.oe) e.ke = null;
+  let i = n ? e.de : e.Ne;
   while (i) {
     const e = i.Ce;
-    if (i.W) {
+    if (i.Se) {
       const e = i;
-      deleteFromHeap(e, e._ & o ? Q : q);
-      let t = e.W;
+      deleteFromHeap(e, e.V & o ? T : L);
+      let t = e.Se;
       do {
         t = unlinkSubs(t);
       } while (t !== null);
-      e.W = null;
+      e.Se = null;
       e.Ee = null;
     }
     disposeChildren(i, true);
     i = e;
   }
   if (n) {
-    e.Oe = null;
+    e.de = null;
   } else {
     e.Ne = null;
     e.je = 0;
   }
-  if (t && !n && !(r & o) && e.i !== null && !(e.i._ & u)) {
+  if (t && !n && !(r & o) && e.X !== null && !(e.X.V & u)) {
     const t = e.We;
     const n = e.Ce;
     if (t !== null) t.Ce = n;
-    else e.i.Ne = n;
+    else e.X.Ne = n;
     if (n !== null) n.We = t;
     e.We = null;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.ve : e.Re;
+  let n = t ? e.pe : e.Re;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -833,11 +829,11 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.ve = null) : (e.Re = null);
+  t ? (e.pe = null) : (e.Re = null);
 }
 function childId(e, t) {
   let n = e;
-  while (n.ge & h && n.i) n = n.i;
+  while (n.ue & h && n.X) n = n.X;
   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");
 }
@@ -853,43 +849,43 @@ function formatId(e, t) {
   return e + (r ? String.fromCharCode(64 + r) : "") + n;
 }
 function getObserver() {
-  if (Z || te) return U;
-  return J ? ne : null;
+  if ($ || X) return B;
+  return z ? Y : null;
 }
 function getOwner() {
-  return ne;
+  return Y;
 }
 function cleanup(e) {
-  if (!ne) return e;
-  if (!ne.Re) ne.Re = e;
-  else if (Array.isArray(ne.Re)) ne.Re.push(e);
-  else ne.Re = [ne.Re, e];
+  if (!Y) return e;
+  if (!Y.Re) Y.Re = e;
+  else if (Array.isArray(Y.Re)) Y.Re.push(e);
+  else Y.Re = [Y.Re, e];
   return e;
 }
 function isDisposed(e) {
-  return !!(e._ & (u | o));
+  return !!(e.V & (u | o));
 }
 function disposeRootSelf(e = true) {
   disposeChildren(this, e);
 }
 function createOwner(e) {
-  const t = ne;
+  const t = Y;
   const n = e?.transparent ?? false;
   const r = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    ge: n ? h : 0,
-    t: true,
-    u: t?.t ? t.u : t,
+    ue: n ? h : 0,
+    me: true,
+    be: t?.me ? t.be : t,
     Ne: null,
     Ce: null,
     We: null,
     Re: null,
-    te: t?.te ?? z,
+    F: t?.F ?? K,
     Ae: t?.Ae || k,
     je: 0,
-    ve: null,
-    Oe: null,
-    i: t,
+    pe: null,
+    de: null,
+    X: t,
     dispose: disposeRootSelf
   };
   if (t) {
@@ -909,128 +905,128 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(() => n.dispose()));
 }
 function unlinkSubs(e) {
-  const t = e.A;
-  const n = e.R;
-  const r = e.P;
+  const t = e.we;
+  const n = e.ge;
+  const r = e.L;
   const i = e.Ie;
   if (r !== null) r.Ie = i;
   else t.Le = i;
-  if (i !== null) i.P = r;
+  if (i !== null) i.L = r;
   else {
-    t.O = r;
+    t.R = r;
     if (r === null) {
-      t.Y?.();
+      t.I?.();
       const e = t;
-      e.L && e.ge & g && !(e._ & o) && unobserved(e);
+      e.oe && e.ue & g && !(e.V & o) && unobserved(e);
     }
   }
   return n;
 }
 function trimStaleDeps(e) {
   const t = e.Ee;
-  let n = t !== null ? t.R : e.W;
+  let n = t !== null ? t.ge : e.Se;
   if (n !== null) {
     do {
       n = unlinkSubs(n);
     } while (n !== null);
-    if (t !== null) t.R = null;
-    else e.W = null;
+    if (t !== null) t.ge = null;
+    else e.Se = null;
   }
 }
 function unobserved(e) {
-  deleteFromHeap(e, e._ & o ? Q : q);
-  let t = e.W;
+  deleteFromHeap(e, e.V & o ? T : L);
+  let t = e.Se;
   while (t !== null) {
     t = unlinkSubs(t);
   }
-  e.W = null;
+  e.Se = null;
   e.Ee = null;
   disposeChildren(e, true);
 }
 function link(e, t) {
   const n = t.Ee;
-  if (n !== null && n.A === e) return;
+  if (n !== null && n.we === e) return;
   let i = null;
-  const s = t._ & r;
+  const s = t.V & r;
   if (s) {
-    i = n !== null ? n.R : t.W;
-    if (i !== null && i.A === e) {
+    i = n !== null ? n.ge : t.Se;
+    if (i !== null && i.we === e) {
       t.Ee = i;
       return;
     }
   }
   const o = e.Le;
-  if (o !== null && o.N === t && (!s || isValidLink(o, t))) return;
-  const u = (t.Ee = e.Le = { A: e, N: t, R: i, Ie: o, P: null });
-  if (n !== null) n.R = u;
-  else t.W = u;
-  if (o !== null) o.P = u;
-  else e.O = u;
+  if (o !== null && o.T === t && (!s || isValidLink(o, t))) return;
+  const u = (t.Ee = e.Le = { we: e, T: t, ge: i, Ie: o, L: null });
+  if (n !== null) n.ge = u;
+  else t.Se = u;
+  if (o !== null) o.L = u;
+  else e.R = u;
 }
 function isValidLink(e, t) {
   const n = t.Ee;
   if (n !== null) {
-    let r = t.W;
+    let r = t.Se;
     do {
       if (r === e) return true;
       if (r === n) break;
-      r = r.R;
+      r = r.ge;
     } while (r !== null);
   }
   return false;
 }
 function addPendingSource(e, t) {
-  if (e.Pe === t || e.xe?.has(t)) return false;
-  if (!e.Pe) {
-    e.Pe = t;
+  if (e.he === t || e.ye?.has(t)) return false;
+  if (!e.he) {
+    e.he = t;
     return true;
   }
-  if (!e.xe) {
-    e.xe = new Set([e.Pe, t]);
+  if (!e.ye) {
+    e.ye = new Set([e.he, t]);
   } else {
-    e.xe.add(t);
+    e.ye.add(t);
   }
-  e.Pe = undefined;
+  e.he = undefined;
   return true;
 }
 function removePendingSource(e, t) {
-  if (e.Pe) {
-    if (e.Pe !== t) return false;
-    e.Pe = undefined;
+  if (e.he) {
+    if (e.he !== t) return false;
+    e.he = undefined;
     return true;
   }
-  if (!e.xe?.delete(t)) return false;
-  if (e.xe.size === 1) {
-    e.Pe = e.xe.values().next().value;
-    e.xe = undefined;
-  } else if (e.xe.size === 0) {
-    e.xe = undefined;
+  if (!e.ye?.delete(t)) return false;
+  if (e.ye.size === 1) {
+    e.he = e.ye.values().next().value;
+    e.ye = undefined;
+  } else if (e.ye.size === 0) {
+    e.ye = undefined;
   }
   return true;
 }
 function clearPendingSources(e) {
-  e.Pe = undefined;
-  e.xe?.clear();
-  e.xe = undefined;
+  e.he = undefined;
+  e.ye?.clear();
+  e.ye = undefined;
 }
 function setPendingError(e, t, n) {
   if (!t) {
-    e.we = null;
+    e.fe = null;
     return;
   }
   if (n instanceof NotReadyError && n.source === t) {
-    e.we = n;
+    e.fe = n;
     return;
   }
-  const r = e.we;
+  const r = e.fe;
   if (!(r instanceof NotReadyError) || r.source !== t) {
-    e.we = new NotReadyError(t);
+    e.fe = new NotReadyError(t);
   }
 }
 function forEachDependent(e, t) {
-  for (let n = e.O; n !== null; n = n.P) t(n.N);
-  for (let n = e.C; n !== null; n = n.k) {
-    for (let e = n.O; e !== null; e = e.P) t(e.N);
+  for (let n = e.R; n !== null; n = n.L) t(n.T);
+  for (let n = e.Pe; n !== null; n = n.xe) {
+    for (let e = n.R; e !== null; e = e.L) t(e.T);
   }
 }
 function settlePendingSource(e) {
@@ -1039,25 +1035,25 @@ function settlePendingSource(e) {
   const settle = r => {
     if (n.has(r) || !removePendingSource(r, e)) return;
     n.add(r);
-    r._e = F;
-    const i = r.Pe ?? r.xe?.values().next().value;
+    r.le = H;
+    const i = r.he ?? r.ye?.values().next().value;
     if (i) {
       setPendingError(r, i);
       updatePendingSignal(r);
     } else {
-      r.be &= ~_;
+      r.ae &= ~_;
       setPendingError(r);
       updatePendingSignal(r);
       if (r.Te) {
-        if (r.Z === P) {
+        if (r.H === P) {
           const e = r;
-          if (!e.ee) {
-            e.ee = true;
-            e.te.enqueue(v, e.ne);
+          if (!e.q) {
+            e.q = true;
+            e.F.enqueue(v, e.M);
           }
         } else {
-          const e = r._ & o ? Q : q;
-          if (e.j > r.o) e.j = r.o;
+          const e = r.V & o ? T : L;
+          if (e.N > r.D) e.N = r.D;
           insertIntoHeap(r, e);
         }
         t = true;
@@ -1086,34 +1082,36 @@ function handleAsync(e, t, r) {
   let o;
   const handleError = n => {
     if (e.ke !== t) return;
-    z.initTransition(resolveTransition(e));
+    K.initTransition(resolveTransition(e));
     notifyStatus(e, n instanceof NotReadyError ? _ : m, n);
-    e._e = F;
+    e.le = H;
   };
   const asyncWrite = (i, s) => {
     if (e.ke !== t) return;
-    if (e._ & (n | f)) return;
-    z.initTransition(resolveTransition(e));
-    const o = !!(e.be & b);
+    if (e.V & (n | f)) return;
+    K.initTransition(resolveTransition(e));
+    const o = !!(e.ae & b);
     trimStaleDeps(e);
     clearStatus(e);
     const u = resolveLane(e);
-    if (u) u.F.delete(e);
-    if (r) r(i);
-    else if (e.G !== undefined) {
-      if (e.G !== undefined && e.G !== x) e.X = i;
+    if (u) u.u.delete(e);
+    if (r) {
+      r(i);
+      if (o) clearStatus(e, true);
+    } else if (e.m !== undefined) {
+      if (e.m !== undefined && e.m !== x) e.A = i;
       else {
-        e.ue = i;
+        e.$ = i;
         insertSubs(e);
       }
-      e._e = F;
+      e.le = H;
     } else if (u) {
-      const t = e.Z;
-      const n = e.ue;
+      const t = e.H;
+      const n = e.$;
       const r = e.He;
       if ((!t && o) || !r || !r(i, n)) {
-        e.ue = i;
-        e._e = F;
+        e.$ = i;
+        e.le = H;
         if (e.qe) {
           setSignal(e.qe, i);
         }
@@ -1143,8 +1141,8 @@ function handleAsync(e, t, r) {
     );
     r = false;
     if (!n) {
-      z.initTransition(resolveTransition(e));
-      throw new NotReadyError(ne);
+      K.initTransition(resolveTransition(e));
+      throw new NotReadyError(Y);
     }
   }
   if (i) {
@@ -1197,17 +1195,17 @@ function handleAsync(e, t, r) {
     };
     const s = iterate();
     if (!r && !s) {
-      z.initTransition(resolveTransition(e));
-      throw new NotReadyError(ne);
+      K.initTransition(resolveTransition(e));
+      throw new NotReadyError(Y);
     }
   }
   return o;
 }
 function clearStatus(e, t = false) {
-  if (e.Pe || e.xe) clearPendingSources(e);
+  if (e.he || e.ye) clearPendingSources(e);
   if (e.Te) e.Te = false;
-  e.be = t ? 0 : e.be & b;
-  if (e.we) setPendingError(e);
+  e.ae = t ? 0 : e.ae & b;
+  if (e.fe) setPendingError(e);
   if (e.Qe) updatePendingSignal(e);
   if (e.Fe) e.Fe();
 }
@@ -1216,17 +1214,17 @@ function notifyStatus(e, t, n, r, i) {
     n = new StatusError(e, n);
   const s = t === _ && n instanceof NotReadyError ? n.source : undefined;
   const o = s === e;
-  const u = t === _ && e.G !== undefined && !o;
+  const u = t === _ && e.m !== undefined && !o;
   const f = u && hasActiveOverride(e);
   if (!r) {
     if (t === _ && s) {
       addPendingSource(e, s);
-      e.be = _ | (e.be & b);
+      e.ae = _ | (e.ae & b);
       setPendingError(e, s, n);
     } else {
       clearPendingSources(e);
-      e.be = t | (t !== m ? e.be & b : 0);
-      e.we = n;
+      e.ae = t | (t !== m ? e.ae & b : 0);
+      e.fe = n;
     }
     updatePendingSignal(e);
   }
@@ -1247,22 +1245,22 @@ function notifyStatus(e, t, n, r, i) {
     return;
   }
   forEachDependent(e, e => {
-    e._e = F;
+    e.le = H;
     if (
-      (t === _ && s && e.Pe !== s && !e.xe?.has(s)) ||
-      (t !== _ && (e.we !== n || e.Pe || e.xe))
+      (t === _ && s && e.he !== s && !e.ye?.has(s)) ||
+      (t !== _ && (e.fe !== n || e.he || e.ye))
     ) {
-      if (!l && !e.V) queuePendingNode(e);
+      if (!l && !e.h) queuePendingNode(e);
       notifyStatus(e, t, n, l, c);
     }
   });
 }
-let $ = null;
+let G = null;
 function enableExternalSource(e) {
   const { factory: t, untrack: n = e => e() } = e;
-  if ($) {
-    const { factory: e, untrack: r } = $;
-    $ = {
+  if (G) {
+    const { factory: e, untrack: r } = G;
+    G = {
       factory: (n, r) => {
         const i = e(n, r);
         const s = t(e => i.track(e), r);
@@ -1277,32 +1275,31 @@ function enableExternalSource(e) {
       untrack: e => r(() => n(e))
     };
   } else {
-    $ = { factory: t, untrack: n };
+    G = { factory: t, untrack: n };
   }
 }
-GlobalQueue.de = recompute;
-GlobalQueue.pe = disposeChildren;
+GlobalQueue.te = recompute;
+GlobalQueue.ne = disposeChildren;
+let z = false;
+let U = false;
+let $ = false;
 let J = false;
 let X = false;
-let Y = false;
-let Z = false;
-let ee = false;
+let Y = null;
+let Z = null;
+let ee = null;
 let te = false;
 let ne = null;
-let re = null;
-let ie = null;
-let se = false;
-let oe = null;
 function ownerInSnapshotScope(e) {
   while (e) {
     if (e.Me) return true;
-    e = e.i;
+    e = e.X;
   }
   return false;
 }
 function setSnapshotCapture(e) {
-  se = e;
-  if (e && !oe) oe = new Set();
+  te = e;
+  if (e && !ne) ne = new Set();
 }
 function markSnapshotScope(e) {
   e.Me = true;
@@ -1319,14 +1316,14 @@ function releaseSubtree(e) {
       t = t.Ce;
       continue;
     }
-    if (t.L) {
+    if (t.oe) {
       const e = t;
-      e.ge &= ~y;
-      if (e._ & l) {
-        e._ &= ~l;
-        e._ |= n;
-        if (q.j > e.o) q.j = e.o;
-        insertIntoHeap(e, q);
+      e.ue &= ~y;
+      if (e.V & l) {
+        e.V &= ~l;
+        e.V |= n;
+        if (L.N > e.D) L.N = e.D;
+        insertIntoHeap(e, L);
       }
     }
     releaseSubtree(t);
@@ -1334,57 +1331,57 @@ function releaseSubtree(e) {
   }
 }
 function clearSnapshots() {
-  if (oe) {
-    for (const e of oe) {
-      delete e.me;
+  if (ne) {
+    for (const e of ne) {
+      delete e.ce;
       delete e[C];
     }
-    oe = null;
+    ne = null;
   }
-  se = false;
+  te = false;
 }
 function recompute(t, n = false) {
-  const i = t.Z;
+  const i = t.H;
   if (!n) {
-    if (t.V && (!i || M) && M !== t.V) z.initTransition(t.V);
-    deleteFromHeap(t, t._ & o ? Q : q);
+    if (t.h && (!i || q) && q !== t.h) K.initTransition(t.h);
+    deleteFromHeap(t, t.V & o ? T : L);
     t.ke = null;
-    if (t.V || i === P) disposeChildren(t);
+    if (t.h || i === P) disposeChildren(t);
     else if (t.Ne !== null || t.Re !== null) {
       markDisposal(t);
-      t.ve = t.Re;
-      t.Oe = t.Ne;
+      t.pe = t.Re;
+      t.de = t.Ne;
       t.Re = null;
       t.Ne = null;
       t.je = 0;
     } else;
   }
-  let s = !!(t._ & f);
-  const u = t.G !== undefined && t.G !== x;
-  const c = !!(t.be & _);
-  const a = !!(t.be & b);
-  const d = ne;
-  ne = t;
+  let s = !!(t.V & f);
+  const u = t.m !== undefined && t.m !== x;
+  const c = !!(t.ae & _);
+  const a = !!(t.ae & b);
+  const d = Y;
+  Y = t;
   t.Ee = null;
-  t._ = r;
-  t._e = F;
-  let p = t.X === x ? t.ue : t.X;
-  let h = t.o;
-  let y = J;
-  let S = re;
-  J = true;
+  t.V = r;
+  t.le = H;
+  let p = t.A === x ? t.$ : t.A;
+  let h = t.D;
+  let y = z;
+  let S = Z;
+  z = true;
   if (s) {
     const e = resolveLane(t);
-    if (e) re = e;
-  } else if (M && !n && M.$.length) {
-    for (let e = t.W; e; e = e.R) {
-      const n = e.A;
-      if (n._ & f) {
+    if (e) Z = e;
+  } else if (q && !n && q.j.length) {
+    for (let e = t.Se; e; e = e.ge) {
+      const n = e.we;
+      if (n.V & f) {
         const e = resolveLane(n);
         if (e) {
           s = true;
-          re = e;
-          t._ |= f;
+          Z = e;
+          t.V |= f;
           assignOrMergeLane(t, e);
           break;
         }
@@ -1392,35 +1389,35 @@ function recompute(t, n = false) {
     }
   }
   const g = i && i !== v;
-  const O = X;
-  if (g) X = true;
+  const O = U;
+  if (g) U = true;
   try {
-    if (!false && t.ge & w) {
-      p = t.L(p);
+    if (!false && t.ue & w) {
+      p = t.oe(p);
       t.ke = null;
     } else {
       const e = t.ke;
-      const n = t.L(p);
+      const n = t.oe(p);
       const r = typeof n === "object" && n !== null;
       const i = t.ke !== e;
       p = i || !r ? n : handleAsync(t, n);
       if (!i && !r) t.ke = null;
     }
     clearStatus(t, n);
-    if (t.H) {
+    if (t.i) {
       const e = resolveLane(t);
       if (e) {
-        e.F.delete(t);
-        updatePendingSignal(e.q);
+        e.u.delete(t);
+        updatePendingSignal(e.o);
       }
     }
   } catch (e) {
-    if (e instanceof NotReadyError && re) {
-      const e = findLane(re);
-      if (e.q !== t) {
-        e.F.add(t);
-        t.H = e;
-        updatePendingSignal(e.q);
+    if (e instanceof NotReadyError && Z) {
+      const e = findLane(Z);
+      if (e.o !== t) {
+        e.u.add(t);
+        t.i = e;
+        updatePendingSignal(e.o);
       }
     }
     if (e instanceof NotReadyError) t.Te = true;
@@ -1429,102 +1426,102 @@ function recompute(t, n = false) {
       e instanceof NotReadyError ? _ : m,
       e,
       undefined,
-      e instanceof NotReadyError ? t.H : undefined
+      e instanceof NotReadyError ? t.i : undefined
     );
   } finally {
-    J = y;
-    if (g) X = O;
-    t._ = e | (n ? t._ & l : 0);
-    ne = d;
+    z = y;
+    if (g) U = O;
+    t.V = e | (n ? t.V & l : 0);
+    Y = d;
   }
-  if (!t.we) {
+  if (!t.fe) {
     trimStaleDeps(t);
-    const e = u ? t.G : t.X === x ? t.ue : t.X;
+    const e = u ? t.m : t.A === x ? t.$ : t.A;
     const r = (!i && a) || !t.He || !t.He(e, p);
     if (i && r) {
-      t.ee = !t.we;
-      if (!n) t.te.enqueue(i, GlobalQueue.he.bind(null, t));
+      t.q = !t.fe;
+      if (!n) t.F.enqueue(i, GlobalQueue.re.bind(null, t));
     }
     if (r) {
-      const e = u ? t.G : undefined;
-      if (n || (i && M !== t.V) || s) {
-        t.ue = p;
+      const e = u ? t.m : undefined;
+      if (n || (i && q !== t.h) || s) {
+        t.$ = p;
         if (u && s) {
-          t.G = p;
-          t.X = p;
+          t.m = p;
+          t.A = p;
         }
-      } else t.X = p;
-      if (u && !s && c && !t.B) t.G = p;
-      if (!u || s || t.G !== e) insertSubs(t, s || u);
+      } else t.A = p;
+      if (u && !s && c && !t._) t.m = p;
+      if (!u || s || t.m !== e) insertSubs(t, s || u);
     } else if (u) {
-      t.X = p;
-    } else if (t.o != h) {
-      for (let e = t.O; e !== null; e = e.P) {
-        insertIntoHeapHeight(e.N, e.N._ & o ? Q : q);
+      t.A = p;
+    } else if (t.D != h) {
+      for (let e = t.R; e !== null; e = e.L) {
+        insertIntoHeapHeight(e.T, e.T.V & o ? T : L);
       }
     }
   }
-  re = S;
-  const N = t.X !== x || t.Oe !== null || t.ve !== null || !!(t.be & (_ | b));
-  N && (!n || t.be & _) && !t.V && !(M && u) && queuePendingNode(t);
-  t.V && i && M !== t.V && runInTransition(t.V, () => recompute(t));
+  Z = S;
+  const N = t.A !== x || t.de !== null || t.pe !== null || !!(t.ae & (_ | b));
+  N && (!n || t.ae & _) && !t.h && !(q && u) && queuePendingNode(t);
+  t.h && i && q !== t.h && runInTransition(t.h, () => recompute(t));
 }
 function updateIfNecessary(e) {
-  if (e._ & t) {
-    for (let t = e.W; t; t = t.R) {
-      const r = t.A;
-      const i = r.I || r;
-      if (i.L) {
+  if (e.V & t) {
+    for (let t = e.Se; t; t = t.ge) {
+      const r = t.we;
+      const i = r._e || r;
+      if (i.oe) {
         updateIfNecessary(i);
       }
-      if (e._ & n) {
+      if (e.V & n) {
         break;
       }
     }
   }
-  if (e._ & (n | f) || (e.we && e._e < F && !e.ke)) {
+  if (e.V & (n | f) || (e.fe && e.le < H && !e.ke)) {
     recompute(e);
   }
-  e._ = e._ & (l | i | s);
+  e.V = e.V & (l | i | s);
 }
 function computed(t, n) {
   const r = n?.transparent ?? false;
   const i = {
-    id: n?.id ?? (r ? ne?.id : ne?.id != null ? getNextChildId(ne) : undefined),
-    ge:
+    id: n?.id ?? (r ? Y?.id : Y?.id != null ? getNextChildId(Y) : undefined),
+    ue:
       (r ? h : 0) |
       (n?.ownedWrite ? d : 0) |
-      (!ne || n?.lazy ? g : 0) |
+      (!Y || n?.lazy ? g : 0) |
       (n?.sync ? w : 0) |
-      (se && ownerInSnapshotScope(ne) ? y : 0),
+      (te && ownerInSnapshotScope(Y) ? y : 0),
     He: n?.equals != null ? n.equals : isEqual,
-    Y: n?.unobserved,
+    I: n?.unobserved,
     Re: null,
-    te: ne?.te ?? z,
-    Ae: ne?.Ae ?? k,
+    F: Y?.F ?? K,
+    Ae: Y?.Ae ?? k,
     je: 0,
-    L: t,
-    ue: undefined,
-    o: 0,
-    C: null,
-    h: undefined,
-    p: null,
-    W: null,
+    oe: t,
+    $: undefined,
+    D: 0,
+    Pe: null,
+    ve: undefined,
+    Oe: null,
+    Se: null,
     Ee: null,
-    O: null,
+    R: null,
     Le: null,
-    i: ne,
+    X: Y,
     Ce: null,
     We: null,
     Ne: null,
-    _: n?.lazy ? c : e,
-    be: b,
-    _e: F,
-    X: x,
-    ve: null,
-    Oe: null,
+    V: n?.lazy ? c : e,
+    ae: b,
+    le: H,
+    A: x,
+    pe: null,
+    de: null,
     ke: null,
-    V: null
+    h: null
   };
   setupComputedNode(i, n);
   return i;
@@ -1532,330 +1529,337 @@ function computed(t, n) {
 function createEffectNode(e, t, n, r, i, s) {
   const o = s?.transparent ?? false;
   const u = {
-    id: s?.id ?? (o ? ne?.id : ne?.id != null ? getNextChildId(ne) : undefined),
-    ge:
+    id: s?.id ?? (o ? Y?.id : Y?.id != null ? getNextChildId(Y) : undefined),
+    ue:
       (o ? h : 0) |
       (s?.ownedWrite ? d : 0) |
       (s?.sync ? w : 0) |
-      (se && ownerInSnapshotScope(ne) ? y : 0),
+      (te && ownerInSnapshotScope(Y) ? y : 0),
     He: false,
-    Y: s?.unobserved,
+    I: s?.unobserved,
     Re: null,
-    te: ne?.te ?? z,
-    Ae: ne?.Ae ?? k,
+    F: Y?.F ?? K,
+    Ae: Y?.Ae ?? k,
     je: 0,
-    L: e,
-    ue: undefined,
-    o: 0,
-    C: null,
-    h: undefined,
-    p: null,
-    W: null,
+    oe: e,
+    $: undefined,
+    D: 0,
+    Pe: null,
+    ve: undefined,
+    Oe: null,
+    Se: null,
     Ee: null,
-    O: null,
+    R: null,
     Le: null,
-    i: ne,
+    X: Y,
     Ce: null,
     We: null,
     Ne: null,
-    _: c,
-    be: b,
-    _e: F,
-    X: x,
-    ve: null,
-    Oe: null,
+    V: c,
+    ae: b,
+    le: H,
+    A: x,
+    pe: null,
+    de: null,
     ke: null,
-    V: null,
-    ee: false,
-    De: undefined,
-    Ve: t,
+    h: null,
+    q: false,
+    Ve: undefined,
+    De: t,
     Ke: n,
     Be: undefined,
     Ge: false,
-    Z: r,
+    H: r,
     Fe: i
   };
-  setupComputedNode(u, ue);
+  setupComputedNode(u, re);
   return u;
 }
-const ue = { lazy: true };
+const re = { lazy: true };
 function setupComputedNode(e, t) {
-  e.p = e;
-  const n = ne?.t ? ne.u : ne;
-  if (ne) {
-    const t = ne.Ne;
+  e.Oe = e;
+  const n = Y?.me ? Y.be : Y;
+  if (Y) {
+    const t = Y.Ne;
     if (t === null) {
-      ne.Ne = e;
+      Y.Ne = e;
     } else {
       e.Ce = t;
       t.We = e;
-      ne.Ne = e;
+      Y.Ne = e;
     }
   }
-  if (n) e.o = n.o + 1;
-  if ($) {
+  if (n) e.D = n.D + 1;
+  if (G) {
     const t = signal(undefined, { equals: false, ownedWrite: true });
-    const n = $.factory(e.L, () => {
+    const n = G.factory(e.oe, () => {
       setSignal(t, undefined);
     });
     cleanup(() => n.dispose());
-    e.L = e => {
+    e.oe = e => {
       read(t);
       return n.track(e);
     };
   }
   !t?.lazy && recompute(e, true);
-  if (se && !t?.lazy) {
-    if (!(e.be & _)) {
-      e.me = e.ue === undefined ? N : e.ue;
-      oe.add(e);
+  if (te && !t?.lazy) {
+    if (!(e.ae & _)) {
+      e.ce = e.$ === undefined ? N : e.$;
+      ne.add(e);
     }
   }
 }
 function signal(e, t, n = null) {
   const r = {
     He: t?.equals != null ? t.equals : isEqual,
-    ge: (t?.ownedWrite ? d : 0) | (t?.ze ? p : 0),
-    Y: t?.unobserved,
-    ue: e,
-    O: null,
+    ue: (t?.ownedWrite ? d : 0) | (t?.ze ? p : 0),
+    I: t?.unobserved,
+    $: e,
+    R: null,
     Le: null,
-    _e: F,
-    I: n,
-    k: n?.C || null,
-    X: x
+    le: H,
+    _e: n,
+    xe: n?.Pe || null,
+    A: x
   };
-  n && (n.C = r);
-  if (se && !(r.ge & p) && !((n?.be ?? 0) & _)) {
-    r.me = e === undefined ? N : e;
-    oe.add(r);
+  n && (n.Pe = r);
+  if (te && !(r.ue & p) && !((n?.ae ?? 0) & _)) {
+    r.ce = e === undefined ? N : e;
+    ne.add(r);
   }
   return r;
 }
 function optimisticSignal(e, t) {
   const n = signal(e, t);
-  n.G = x;
+  n.m = x;
   return n;
 }
 function optimisticComputed(e, t) {
   const n = computed(e, t);
-  n.G = x;
+  n.m = x;
   return n;
 }
 function isEqual(e, t) {
   return e === t;
 }
 function untrack(e, t) {
-  if (!$ && !J && true) return e();
-  const n = J;
-  J = false;
+  if (!G && !z && true) return e();
+  const n = z;
+  z = false;
   try {
-    if ($) return $.untrack(e);
+    if (G) return G.untrack(e);
     return e();
   } finally {
-    J = n;
+    z = n;
   }
 }
 function read(e) {
-  if (te) {
+  if (X) {
     const t = getLatestValueComputed(e);
-    const n = te;
-    te = false;
-    const r = e.G !== undefined && e.G !== x ? e.G : e.ue;
+    const n = X;
+    X = false;
+    const r = e.m !== undefined && e.m !== x ? e.m : e.$;
     let i;
     try {
       i = read(t);
     } catch (e) {
-      if (!ne && e instanceof NotReadyError) return r;
+      if (!Y && e instanceof NotReadyError) return r;
       throw e;
     } finally {
-      te = n;
+      X = n;
     }
-    if (t.be & _) return r;
-    if (X && re && t.H) {
-      const e = findLane(t.H);
-      const n = findLane(re);
-      if (e !== n && e.F.size > 0) {
+    if (t.ae & _) return r;
+    if (U && Z && t.i) {
+      const e = findLane(t.i);
+      const n = findLane(Z);
+      if (e !== n && e.u.size > 0) {
         return r;
       }
     }
     return i;
   }
-  if (Z) {
-    const t = e.I;
-    const n = Z;
-    Z = false;
-    let r = ne;
-    if (r?.t) r = r.u;
+  if ($) {
+    const t = e._e;
+    const n = $;
+    $ = false;
+    let r = Y;
+    if (r?.me) r = r.be;
     const i = t || e;
     const s = e;
-    if (typeof s.L === "function") {
+    if (typeof s.oe === "function") {
       const t = e;
-      if (t._ & c) {
-        t._ &= ~c;
+      if (t.V & c) {
+        t.V &= ~c;
         recompute(t, true);
-      } else if (t._ & u) {
+      } else if (t.V & u) {
         recompute(t, true);
       } else {
         updateIfNecessary(t);
       }
     }
-    if (r && i.be & _ && i.be & b) {
-      if (J && e !== r) link(e, r);
-      Z = n;
-      throw i.we;
+    if (r && i.ae & _ && i.ae & b) {
+      if (z && e !== r) link(e, r);
+      $ = n;
+      throw i.fe;
     }
-    if (t && e.G !== undefined) {
-      if (e.G !== x && (t.ke || !!(t.be & _))) {
-        ee = true;
+    if (t && e.m !== undefined) {
+      if (e.m !== x && (t.ke || !!(t.ae & _))) {
+        J = true;
       }
       collectPendingSources(e);
       collectPendingSources(t);
-      if (r && J) link(e, r);
+      if (r && z) link(e, r);
     } else {
       collectPendingSources(e);
       if (t) collectPendingSources(t);
     }
-    Z = n;
+    $ = n;
   }
-  let t = ne;
-  if (t?.t) t = t.u;
+  let t = Y;
+  if (t?.me) t = t.be;
   const n = e;
-  if (typeof n.L === "function") {
+  if (typeof n.oe === "function") {
     const t = e;
-    if (t._ & c) {
-      t._ &= ~c;
+    if (t.V & c) {
+      t.V &= ~c;
       recompute(t, true);
-    } else if (t._ & u) {
+    } else if (t.V & u) {
       recompute(t, true);
     }
   }
-  const r = e.I || e;
+  const r = e._e || e;
   if (
-    !n.L &&
+    !n.oe &&
     r === e &&
-    e.G === undefined &&
-    e.me === undefined &&
-    M === null &&
-    re === null &&
-    !se &&
+    e.m === undefined &&
+    e.ce === undefined &&
+    q === null &&
+    Z === null &&
+    !te &&
     true
   ) {
-    if (t && J) link(e, t);
-    return !t || e.X === x ? e.ue : e.X;
+    if (t && z) link(e, t);
+    return !t || e.A === x ? e.$ : e.A;
   }
-  if (t && J) {
+  if (t && z) {
     link(e, t);
-    if (r.L) {
-      const n = e._ & o;
-      if (r.o >= (n ? Q.j : q.j)) {
+    if (r.oe) {
+      const n = e.V & o;
+      if (r.D >= (n ? T.N : L.N)) {
         markNode(t);
-        markHeap(n ? Q : q);
+        markHeap(n ? T : L);
         updateIfNecessary(r);
       }
-      const i = r.o;
-      if (i >= t.o && e.i !== t) {
-        t.o = i + 1;
+      const i = r.D;
+      if (i >= t.D && e.X !== t) {
+        t.D = i + 1;
       }
     }
   }
-  if (r.be & _) {
-    if (t && !(X && r.V && M !== r.V)) {
-      if (re) {
-        const n = r.H;
-        const i = findLane(re);
+  if (r.ae & _) {
+    if (t && !(U && r.h && q !== r.h)) {
+      if (Z) {
+        const n = r.i;
+        const i = findLane(Z);
         if (n && findLane(n) === i && !hasActiveOverride(r)) {
-          if (!J && e !== t) link(e, t);
-          throw r.we;
+          if (!z && e !== t) link(e, t);
+          throw r.fe;
         }
       } else {
-        if (!J && e !== t) link(e, t);
-        throw r.we;
+        if (!z && e !== t) link(e, t);
+        throw r.fe;
       }
-    } else if (t && r !== e && r.be & b) {
-      if (!J && e !== t) link(e, t);
-      throw r.we;
-    } else if (!t && r.be & b) {
-      throw r.we;
+    } else if (t && r !== e && r.ae & b) {
+      if (!z && e !== t) link(e, t);
+      throw r.fe;
+    } else if (!t && r.ae & b) {
+      throw r.fe;
     }
   }
-  if (e.L && e.be & m) {
-    if (e._e < F) {
+  if (e.oe && e.ae & m) {
+    if (e.le < H) {
       recompute(e);
       return read(e);
-    } else throw e.we;
+    } else throw e.fe;
   }
-  if (se && t && t.ge & y) {
-    const n = e.me;
+  if (te && t && t.ue & y) {
+    const n = e.ce;
     if (n !== undefined) {
       const r = n === N ? undefined : n;
-      const i = e.X !== x ? e.X : e.ue;
-      if (i !== r) t._ |= l;
+      const i = e.A !== x ? e.A : e.$;
+      if (i !== r) t.V |= l;
       return r;
     }
   }
-  if (e.G !== undefined && e.G !== x) {
-    if (t && X && shouldReadStashedOptimisticValue(e)) return e.ue;
-    return e.G;
+  if (e.m !== undefined && e.m !== x) {
+    if (t && U && shouldReadStashedOptimisticValue(e)) return e.$;
+    return e.m;
   }
-  if (M !== null && re !== null && !te && e.X !== x && r === e && !e.L && t) {
-    M.oe.add(t);
-    return e.ue;
+  if (q !== null && Z !== null && !X && e.A !== x && (r === e || !!(r.V & a)) && !e.oe && t) {
+    q.U.add(t);
+    return e.$;
   }
   const i =
     !t ||
-    (re !== null && (e.G !== undefined || e.H || (r === e && X) || !!(r.be & _))) ||
-    e.X === x ||
-    (X && e.V && M !== e.V)
-      ? e.ue
-      : e.X;
-  if (!t && r === e && typeof n.L === "function" && e.ge & g && !(r.be & _) && !e.O) {
+    (Z !== null && (e.m !== undefined || e.i || (r === e && U) || !!(r.ae & _))) ||
+    e.A === x ||
+    (U && e.h && q !== e.h)
+      ? e.$
+      : e.A;
+  if (!t && r === e && typeof n.oe === "function" && e.ue & g && !(r.ae & _) && !e.R) {
     unobserved(e);
   }
   return i;
 }
 function setSignal(e, t) {
-  if (e.V && M !== e.V) z.initTransition(e.V);
-  const n = e.G !== undefined && !K;
-  const r = e.G !== undefined && e.G !== x;
-  const i = n ? (r ? e.G : e.ue) : e.X === x ? e.ue : e.X;
+  if (e.h && q !== e.h) K.initTransition(e.h);
+  const n = e.m !== undefined && !M;
+  const r = e.m !== undefined && e.m !== x;
+  const i = n ? (r ? e.m : e.$) : e.A === x ? e.$ : e.A;
   if (typeof t === "function") t = t(i);
-  const s = !e.He || !e.He(i, t) || !!(e.be & b);
+  const s = !e.He || !e.He(i, t) || !!(e.ae & b);
   if (!s) {
-    if (n && r && e.L) {
-      insertSubs(e, true);
-      schedule();
+    if (n && r) {
+      const t = resolveTransition(e);
+      if (t && q !== t) K.initTransition(t);
+      if (e.oe) {
+        insertSubs(e, true);
+        schedule();
+      }
     }
     return t;
   }
   if (n) {
-    const n = e.G === x;
-    if (!n) z.initTransition(resolveTransition(e));
+    const n = e.m === x;
+    if (!n) K.initTransition(resolveTransition(e));
     if (n) {
-      e.X = e.ue;
-      z.$.push(e);
+      e.A = e.$;
+      K.j.push(e);
     }
-    e.B = true;
+    e._ = true;
     const r = getOrCreateLane(e);
-    e.H = r;
-    e.G = t;
+    e.i = r;
+    e.m = t;
   } else {
-    if (e.X === x) queuePendingNode(e);
-    e.X = t;
+    if (e.A === x) queuePendingNode(e);
+    e.A = t;
   }
   if (e.Qe) updatePendingSignal(e);
   if (e.qe) {
     setSignal(e.qe, t);
   }
-  e._e = F;
+  e.le = H;
   insertSubs(e, n);
   schedule();
   return t;
 }
 function suppressComputedRecompute(e) {
-  deleteFromHeap(e, e._ & o ? Q : q);
-  if (!(e._ & a) && e.X === x) queuePendingNode(e);
-  e._ = (e._ & -4) | a;
+  deleteFromHeap(e, e.V & o ? T : L);
+  if (!(e.V & a) && e.A === x) {
+    queuePendingNode(e);
+    schedule();
+  }
+  e.V = (e.V & -4) | a;
 }
 function setMemo(e, t) {
   const n = setSignal(e, t);
@@ -1863,161 +1867,153 @@ function setMemo(e, t) {
   return n;
 }
 function runWithOwner(e, t) {
-  const n = ne;
-  const r = J;
-  ne = e;
-  J = false;
+  const n = Y;
+  const r = z;
+  Y = e;
+  z = false;
   try {
     return t();
   } finally {
-    ne = n;
-    J = r;
+    Y = n;
+    z = r;
   }
 }
 function getPendingSignal(e) {
   if (!e.Qe) {
     e.Qe = optimisticSignal(false, { ownedWrite: true });
-    if (e.T) {
-      e.Qe.T = e;
+    if (e.t) {
+      e.Qe.t = e;
     }
     if (computePendingState(e)) setSignal(e.Qe, true);
   }
   return e.Qe;
 }
 function collectPendingSources(e) {
-  ie?.add(e);
-  const t = e.I || e;
-  if (t !== e) ie?.add(t);
+  ee?.add(e);
+  const t = e._e || e;
+  if (t !== e) ee?.add(t);
 }
 function computePendingState(e) {
   const t = e;
-  const n = e.I;
-  if (e.T) {
-    const n = e.T;
-    if (n.be & _ && !(n.be & b)) return true;
-    return e.X !== x && !(t.be & b);
+  const n = e._e;
+  if (e.t) {
+    const n = e.t;
+    if (n.ae & _ && !(n.ae & b)) return true;
+    return e.A !== x && !(t.ae & b);
   }
-  if (n && e.X !== x) {
-    return !n.ke && !(n.be & _);
+  if (n && e.A !== x) {
+    return !!(n.V & a) || (!n.ke && !(n.ae & _));
   }
-  if (e.G !== undefined && e.G !== x) {
-    if (t.be & _ && !(t.be & b)) return true;
-    if (e.T) {
-      const t = e.H ? findLane(e.H) : null;
-      return !!(t && t.F.size > 0);
+  if (e.m !== undefined && e.m !== x) {
+    if (t.ae & _ && !(t.ae & b)) return true;
+    if (e.t) {
+      const t = e.i ? findLane(e.i) : null;
+      return !!(t && t.u.size > 0);
     }
     return true;
   }
-  if (e.G !== undefined && e.G === x && !e.T) {
+  if (e.m !== undefined && e.m === x && !e.t) {
     return false;
   }
-  if (e.X !== x && !(t.be & b)) return true;
-  return !!(t.be & _ && !(t.be & b));
+  if (e.A !== x && !(t.ae & b)) return true;
+  return !!(t.ae & _ && !(t.ae & b));
 }
 function updatePendingSignal(e) {
   if (e.Qe) {
     const t = computePendingState(e);
     const n = e.Qe;
     setSignal(n, t);
-    if (!t && n.H) {
+    if (!t && n.i) {
       const t = resolveLane(e);
-      if (t && t.F.size > 0) {
-        const e = findLane(n.H);
+      if (t && t.u.size > 0) {
+        const e = findLane(n.i);
         if (e !== t) {
           mergeLanes(t, e);
         }
       }
-      L.delete(n);
-      n.H = undefined;
+      R.delete(n);
+      n.i = undefined;
     }
   }
 }
 function getLatestValueComputed(e) {
   if (!e.qe) {
-    const t = te;
-    te = false;
-    const n = Z;
-    Z = false;
-    const r = ne;
-    ne = null;
+    const t = X;
+    X = false;
+    const n = $;
+    $ = false;
+    const r = Y;
+    Y = null;
     e.qe = optimisticComputed(() => read(e));
-    e.qe.T = e;
-    ne = r;
-    Z = n;
-    te = t;
+    e.qe.t = e;
+    Y = r;
+    $ = n;
+    X = t;
   }
   return e.qe;
 }
 function staleValues(e, t = true) {
-  const n = X;
-  X = t;
+  const n = U;
+  U = t;
   try {
     return e();
   } finally {
-    X = n;
+    U = n;
   }
 }
 function latest(e) {
-  const t = te;
-  te = true;
+  const t = X;
+  X = true;
   try {
     return e();
   } finally {
-    te = t;
+    X = t;
   }
 }
 function isPending(e) {
-  const t = Z;
-  const n = ee;
-  const r = ie;
-  Z = true;
-  ee = false;
-  ie = new Set();
+  const t = $;
+  const n = J;
+  const r = ee;
+  $ = true;
+  J = false;
+  ee = new Set();
   const collectPending = () => {
-    Z = false;
+    $ = false;
     try {
-      ie.forEach(e => {
-        if (read(getPendingSignal(e))) ee = true;
+      ee.forEach(e => {
+        if (read(getPendingSignal(e))) J = true;
       });
     } finally {
-      Z = true;
+      $ = true;
     }
   };
   try {
     e();
     collectPending();
-    return ee;
+    return J;
   } catch (e) {
     collectPending();
     if (e instanceof NotReadyError) {
-      if (ee && !(e.source?.be & b)) return true;
-      if (ne) throw e;
+      if (J && !(e.source?.ae & b)) return true;
+      if (Y) throw e;
     }
-    return ee;
+    return J;
   } finally {
-    Z = t;
-    ee = n;
-    ie = r;
+    $ = t;
+    J = n;
+    ee = r;
   }
 }
 function refresh(e) {
-  let t = Y;
-  Y = true;
-  try {
-    const t = e?.[j];
-    if (false && !t);
-    if (t && typeof t.L === "function" && !(t._ & u)) {
-      recompute(t);
-    }
-  } finally {
-    Y = t;
-    if (!t) {
-      schedule();
-    }
+  const r = e?.[j];
+  if (!r) {
+    return;
+  }
+  if (typeof r.oe === "function" && !(r.V & (u | a))) {
+    r.V = (r.V & ~t) | n;
+    insertIntoHeap(r, r.V & o ? T : L);
+    schedule();
   }
-}
-function isRefreshing() {
-  return Y;
 }
 function createContext(e, t) {
   return { id: Symbol(t), defaultValue: e };
@@ -2049,15 +2045,15 @@ function effect(e, t, n, r) {
   const s = createEffectNode(e, t, n, i ? v : O, notifyEffectStatus, r);
   recompute(s, true);
   !r?.defer &&
-    (s.Z === v || r?.schedule ? s.te.enqueue(s.Z, runEffect.bind(null, s)) : runEffect(s));
+    (s.H === v || r?.schedule ? s.F.enqueue(s.H, runEffect.bind(null, s)) : runEffect(s));
 }
 function notifyEffectStatus(e, t) {
-  const n = e !== undefined ? e : this.be;
-  const r = t !== undefined ? t : this.we;
+  const n = e !== undefined ? e : this.ae;
+  const r = t !== undefined ? t : this.fe;
   if (n & m) {
     let e = r;
-    this.te.notify(this, _, 0);
-    if (this.Z === v) {
+    this.F.notify(this, _, 0);
+    if (this.H === v) {
       try {
         return this.Ke
           ? this.Ke(e, () => {
@@ -2069,38 +2065,38 @@ function notifyEffectStatus(e, t) {
         e = t;
       }
     }
-    if (!this.te.notify(this, m, m)) throw e;
-  } else if (this.Z === O) {
-    this.te.notify(this, _ | m, n, r);
+    if (!this.F.notify(this, m, m)) throw e;
+  } else if (this.H === O) {
+    this.F.notify(this, _ | m, n, r);
   }
 }
 function runEffect(e) {
-  if (!e.ee || e._ & u) return;
+  if (!e.q || e.V & u) return;
   e.Be?.();
   e.Be = undefined;
   try {
-    const t = e.Ve(e.ue, e.De);
+    const t = e.De(e.$, e.Ve);
     if (false && t !== undefined && typeof t !== "function");
     e.Be = t;
     if (e.Be && !e.Ge) {
       e.Ge = true;
-      runWithOwner(e.i, () => cleanup(() => e.Be?.()));
+      runWithOwner(e.X, () => cleanup(() => e.Be?.()));
     }
   } catch (t) {
-    e.we = new StatusError(e, t);
-    e.be |= m;
-    if (!e.te.notify(e, m, m)) throw t;
+    e.fe = new StatusError(e, t);
+    e.ae |= m;
+    if (!e.F.notify(e, m, m)) throw t;
   } finally {
-    e.De = e.ue;
-    e.ee = false;
+    e.Ve = e.$;
+    e.q = false;
   }
 }
-GlobalQueue.he = runEffect;
+GlobalQueue.re = runEffect;
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.ee || n._ & u) return;
+    if (!n.q || n.V & u) return;
     try {
-      n.ee = false;
+      n.q = false;
       recompute(n);
     } finally {
     }
@@ -2115,23 +2111,23 @@ function trackedEffect(e, t) {
     { ...t, lazy: true }
   );
   n.Be = undefined;
-  n.ge = (n.ge & ~g) | S;
-  n.ee = true;
-  n.Z = P;
+  n.ue = (n.ue & ~g) | S;
+  n.q = true;
+  n.H = P;
   n.Fe = (e, t) => {
-    const r = e !== undefined ? e : n.be;
+    const r = e !== undefined ? e : n.ae;
     if (r & m) {
-      n.te.notify(n, _, 0);
-      const e = t !== undefined ? t : n.we;
-      if (!n.te.notify(n, m, m)) throw e;
+      n.F.notify(n, _, 0);
+      const e = t !== undefined ? t : n.fe;
+      if (!n.F.notify(n, m, m)) throw e;
     }
   };
-  n.ne = run;
-  n.te.enqueue(v, run);
+  n.M = run;
+  n.F.enqueue(v, run);
   cleanup(() => n.Be?.());
 }
 function restoreTransition(e, t) {
-  z.initTransition(e);
+  K.initTransition(e);
   const n = t();
   flush();
   return n;
@@ -2140,13 +2136,13 @@ function action(e) {
   return (...t) =>
     new Promise((n, r) => {
       const i = e(...t);
-      z.initTransition();
-      let s = M;
-      s.ie.push(i);
+      K.initTransition();
+      let s = q;
+      s.B.push(i);
       const done = (e, t) => {
         s = currentTransition(s);
-        const o = s.ie.indexOf(i);
-        if (o >= 0) s.ie.splice(o, 1);
+        const o = s.B.indexOf(i);
+        if (o >= 0) s.B.splice(o, 1);
         setActiveTransition(s);
         schedule();
         t ? r(t) : n(e);
@@ -2185,7 +2181,7 @@ function accessor(e) {
 function createSignal(e, t) {
   if (typeof e === "function") {
     const n = computed(e, t);
-    n.ge &= ~g;
+    n.ue &= ~g;
     return [accessor(n), setMemo.bind(null, n)];
   }
   const n = signal(e, t);
@@ -2242,7 +2238,7 @@ function resolve(e) {
 function createOptimistic(e, t) {
   if (typeof e === "function") {
     const n = optimisticComputed(e, t);
-    n.ge &= ~g;
+    n.ue &= ~g;
     return [accessor(n), setSignal.bind(null, n)];
   }
   const n = optimisticSignal(e, t);
@@ -2250,15 +2246,15 @@ function createOptimistic(e, t) {
 }
 function onSettled(e) {
   const t = getOwner();
-  t && !(t.ge & S)
+  t && !(t.ue & S)
     ? createTrackedEffect(() => untrack(e), undefined)
-    : z.enqueue(v, () => {
+    : K.enqueue(v, () => {
         const t = e();
         t?.();
       });
 }
 function unwrap(e) {
-  return e?.[le]?.[ye] ?? e;
+  return e?.[se]?.[ae] ?? e;
 }
 function getOverrideValue(e, t, n, r) {
   if (r && n in r) return r[n];
@@ -2270,205 +2266,216 @@ function getAllKeys(e, t, n) {
   return Array.from(new Set([...r, ...i]));
 }
 function applyState(e, t, n) {
-  const r = t?.[le];
+  const r = t?.[se];
   if (!r) return;
-  if (r[pe] || r[he]) {
+  if (r[le] || r[ce]) {
     applyStateSlow(e, r, n);
   } else {
     applyStateFast(e, r, n);
   }
 }
 function applyStateFast(e, t, n) {
-  const r = t[de];
+  const r = t[fe];
   if (e === r) return;
-  (t[_e] || Oe).set(e, t[ce]);
-  t[de] = e;
+  const i = t[ae];
+  (t[ye] || _e).set(e, t[oe]);
+  t[fe] = e;
   if (Array.isArray(r)) {
-    let i = false;
-    const s = r.length;
-    if (e.length && s && e[0] && n(e[0]) != null) {
-      let o, u, f, l, c, a, d, p;
+    let s = false;
+    const o = r.length;
+    if (e.length && o && e[0] && n(e[0]) != null) {
+      let u, f, l, c, a, d, p, h;
       for (
-        f = 0, l = Math.min(s, e.length);
-        f < l && ((a = r[f]) === e[f] || (a && e[f] && n(a) === n(e[f])));
-        f++
+        l = 0, c = Math.min(o, e.length);
+        l < c && ((d = r[l]) === e[l] || (d && e[l] && n(d) === n(e[l])));
+        l++
       ) {
-        applyState(e[f], wrap(a, t), n);
+        applyState(e[l], wrap(d, t), n);
       }
-      const h = new Array(e.length),
-        y = new Map();
+      const y = new Array(e.length),
+        S = new Map();
       for (
-        l = s - 1, c = e.length - 1;
-        l >= f && c >= f && ((a = r[l]) === e[c] || (a && e[c] && n(a) === n(e[c])));
-        l--, c--
+        c = o - 1, a = e.length - 1;
+        c >= l && a >= l && ((d = r[c]) === e[a] || (d && e[a] && n(d) === n(e[a])));
+        c--, a--
       ) {
-        h[c] = a;
+        y[a] = d;
       }
-      if (f > c || f > l) {
-        for (u = f; u <= c; u++) {
-          i = true;
-          t[ye][u] && setSignal(t[ye][u], wrap(e[u], t));
+      if (l > a || l > c) {
+        for (f = l; f <= a; f++) {
+          s = true;
+          i?.[f] && setSignal(i[f], wrap(e[f], t));
         }
-        for (; u < e.length; u++) {
-          i = true;
-          const r = wrap(h[u], t);
-          t[ye][u] && setSignal(t[ye][u], r);
-          applyState(e[u], r, n);
+        for (; f < e.length; f++) {
+          s = true;
+          const r = wrap(y[f], t);
+          i?.[f] && setSignal(i[f], r);
+          applyState(e[f], r, n);
         }
-        i && t[ye][fe] && setSignal(t[ye][fe], void 0);
-        s !== e.length && t[ye].length && setSignal(t[ye].length, e.length);
+        s && notifySelf(t);
+        o !== e.length && i?.length && setSignal(i.length, e.length);
         return;
       }
-      d = new Array(c + 1);
-      for (u = c; u >= f; u--) {
-        a = e[u];
-        p = a ? n(a) : a;
-        o = y.get(p);
-        d[u] = o === undefined ? -1 : o;
-        y.set(p, u);
-      }
-      for (o = f; o <= l; o++) {
-        a = r[o];
-        p = a ? n(a) : a;
-        u = y.get(p);
-        if (u !== undefined && u !== -1) {
-          h[u] = a;
-          u = d[u];
-          y.set(p, u);
+      p = new Array(a + 1);
+      for (f = a; f >= l; f--) {
+        d = e[f];
+        h = d ? n(d) : d;
+        u = S.get(h);
+        p[f] = u === undefined ? -1 : u;
+        S.set(h, f);
+      }
+      for (u = l; u <= c; u++) {
+        d = r[u];
+        h = d ? n(d) : d;
+        f = S.get(h);
+        if (f !== undefined && f !== -1) {
+          y[f] = d;
+          f = p[f];
+          S.set(h, f);
         }
       }
-      for (u = f; u < e.length; u++) {
-        if (u in h) {
-          const r = wrap(h[u], t);
-          t[ye][u] && setSignal(t[ye][u], r);
-          applyState(e[u], r, n);
-        } else t[ye][u] && setSignal(t[ye][u], wrap(e[u], t));
+      for (f = l; f < e.length; f++) {
+        if (f in y) {
+          const r = wrap(y[f], t);
+          i?.[f] && setSignal(i[f], r);
+          applyState(e[f], r, n);
+        } else i?.[f] && setSignal(i[f], wrap(e[f], t));
       }
-      if (f < e.length) i = true;
+      if (l < e.length) s = true;
     } else if (e.length) {
-      for (let i = 0, s = e.length; i < s; i++) {
-        const s = r[i];
-        isWrappable(s) ? applyState(e[i], wrap(s, t), n) : t[ye][i] && setSignal(t[ye][i], e[i]);
+      for (let o = 0, u = e.length; o < u; o++) {
+        const u = r[o];
+        if (isWrappable(u)) applyState(e[o], wrap(u, t), n);
+        else {
+          if (u !== e[o]) s = true;
+          i?.[o] && setSignal(i[o], e[o]);
+        }
       }
     }
-    if (s !== e.length) {
-      i = true;
-      t[ye].length && setSignal(t[ye].length, e.length);
+    if (o !== e.length) {
+      s = true;
+      i?.length && setSignal(i.length, e.length);
     }
-    i && t[ye][fe] && setSignal(t[ye][fe], void 0);
+    s && notifySelf(t);
     return;
   }
-  let i = t[ye];
-  if (i) {
-    const s = i[fe];
-    const o = s ? getAllKeys(r, undefined, e) : Object.keys(i);
+  let s = t[ae];
+  if (s) {
+    const i = s[ie];
+    const o = i ? getAllKeys(r, undefined, e) : Object.keys(s);
     for (let u = 0, f = o.length; u < f; u++) {
       const f = o[u];
-      const l = i[f];
+      const l = s[f];
       const c = unwrap(r[f]);
       let a = unwrap(e[f]);
       if (c === a) continue;
       if (!c || !isWrappable(c) || !isWrappable(a) || (n(c) != null && n(c) !== n(a))) {
-        s && setSignal(s, void 0);
+        i && setSignal(i, void 0);
         l && setSignal(l, isWrappable(a) ? wrap(a, t) : a);
       } else applyState(a, wrap(c, t), n);
     }
   }
-  if ((i = t[Se])) {
-    const t = Object.keys(i);
+  if ((s = t[de])) {
+    const t = Object.keys(s);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
-      setSignal(i[r], r in e);
+      setSignal(s[r], r in e);
     }
   }
 }
 function applyStateSlow(e, t, n) {
-  const r = t[de];
-  const i = t[pe];
-  const s = t[he];
-  let o = t[ye];
-  (t[_e] || Oe).set(e, t[ce]);
-  t[de] = e;
-  t[pe] = undefined;
+  const r = t[fe];
+  const i = t[le];
+  const s = t[ce];
+  let o = t[ae];
+  (t[ye] || _e).set(e, t[oe]);
+  t[fe] = e;
+  t[le] = undefined;
   if (Array.isArray(r)) {
-    let o = false;
-    const u = getOverrideValue(r, i, "length", s);
-    if (e.length && u && e[0] && n(e[0]) != null) {
-      let f, l, c, a, d, p, h, y;
+    let u = false;
+    const f = getOverrideValue(r, i, "length", s);
+    if (e.length && f && e[0] && n(e[0]) != null) {
+      let l, c, a, d, p, h, y, S;
       for (
-        c = 0, a = Math.min(u, e.length);
-        c < a && ((p = getOverrideValue(r, i, c, s)) === e[c] || (p && e[c] && n(p) === n(e[c])));
-        c++
+        a = 0, d = Math.min(f, e.length);
+        a < d && ((h = getOverrideValue(r, i, a, s)) === e[a] || (h && e[a] && n(h) === n(e[a])));
+        a++
       ) {
-        applyState(e[c], wrap(p, t), n);
+        applyState(e[a], wrap(h, t), n);
       }
-      const S = new Array(e.length),
-        g = new Map();
+      const g = new Array(e.length),
+        w = new Map();
       for (
-        a = u - 1, d = e.length - 1;
-        a >= c &&
-        d >= c &&
-        ((p = getOverrideValue(r, i, a, s)) === e[d] || (p && e[d] && n(p) === n(e[d])));
-        a--, d--
+        d = f - 1, p = e.length - 1;
+        d >= a &&
+        p >= a &&
+        ((h = getOverrideValue(r, i, d, s)) === e[p] || (h && e[p] && n(h) === n(e[p])));
+        d--, p--
       ) {
-        S[d] = p;
+        g[p] = h;
       }
-      if (c > d || c > a) {
-        for (l = c; l <= d; l++) {
-          o = true;
-          t[ye][l] && setSignal(t[ye][l], wrap(e[l], t));
+      if (a > p || a > d) {
+        for (c = a; c <= p; c++) {
+          u = true;
+          o?.[c] && setSignal(o[c], wrap(e[c], t));
         }
-        for (; l < e.length; l++) {
-          o = true;
-          const r = wrap(S[l], t);
-          t[ye][l] && setSignal(t[ye][l], r);
-          applyState(e[l], r, n);
+        for (; c < e.length; c++) {
+          u = true;
+          const r = wrap(g[c], t);
+          o?.[c] && setSignal(o[c], r);
+          applyState(e[c], r, n);
         }
-        o && t[ye][fe] && setSignal(t[ye][fe], void 0);
-        u !== e.length && t[ye].length && setSignal(t[ye].length, e.length);
+        const r = e.length;
+        u && notifySelf(t);
+        f !== r && o?.length && setSignal(o.length, r);
         return;
       }
-      h = new Array(d + 1);
-      for (l = d; l >= c; l--) {
-        p = e[l];
-        y = p ? n(p) : p;
-        f = g.get(y);
-        h[l] = f === undefined ? -1 : f;
-        g.set(y, l);
-      }
-      for (f = c; f <= a; f++) {
-        p = getOverrideValue(r, i, f, s);
-        y = p ? n(p) : p;
-        l = g.get(y);
-        if (l !== undefined && l !== -1) {
-          S[l] = p;
-          l = h[l];
-          g.set(y, l);
+      y = new Array(p + 1);
+      for (c = p; c >= a; c--) {
+        h = e[c];
+        S = h ? n(h) : h;
+        l = w.get(S);
+        y[c] = l === undefined ? -1 : l;
+        w.set(S, c);
+      }
+      for (l = a; l <= d; l++) {
+        h = getOverrideValue(r, i, l, s);
+        S = h ? n(h) : h;
+        c = w.get(S);
+        if (c !== undefined && c !== -1) {
+          g[c] = h;
+          c = y[c];
+          w.set(S, c);
         }
       }
-      for (l = c; l < e.length; l++) {
-        if (l in S) {
-          const r = wrap(S[l], t);
-          t[ye][l] && setSignal(t[ye][l], r);
-          applyState(e[l], r, n);
-        } else t[ye][l] && setSignal(t[ye][l], wrap(e[l], t));
+      for (c = a; c < e.length; c++) {
+        if (c in g) {
+          const r = wrap(g[c], t);
+          o?.[c] && setSignal(o[c], r);
+          applyState(e[c], r, n);
+        } else o?.[c] && setSignal(o[c], wrap(e[c], t));
       }
-      if (c < e.length) o = true;
+      if (a < e.length) u = true;
     } else if (e.length) {
-      for (let o = 0, u = e.length; o < u; o++) {
-        const u = getOverrideValue(r, i, o, s);
-        isWrappable(u) ? applyState(e[o], wrap(u, t), n) : t[ye][o] && setSignal(t[ye][o], e[o]);
+      for (let f = 0, l = e.length; f < l; f++) {
+        const l = getOverrideValue(r, i, f, s);
+        if (isWrappable(l)) applyState(e[f], wrap(l, t), n);
+        else {
+          if (l !== e[f]) u = true;
+          o?.[f] && setSignal(o[f], e[f]);
+        }
       }
     }
-    if (u !== e.length) {
-      o = true;
-      t[ye].length && setSignal(t[ye].length, e.length);
+    const l = e.length;
+    if (f !== l) {
+      u = true;
+      o?.length && setSignal(o.length, l);
     }
-    o && t[ye][fe] && setSignal(t[ye][fe], void 0);
+    u && notifySelf(t);
     return;
   }
   if (o) {
-    const u = o[fe];
+    const u = o[ie];
     const f = u ? getAllKeys(r, i, e) : Object.keys(o);
     for (let l = 0, c = f.length; l < c; l++) {
       const c = f[l];
@@ -2482,7 +2489,7 @@ function applyStateSlow(e, t, n) {
       } else applyState(p, wrap(d, t), n);
     }
   }
-  if ((o = t[Se])) {
+  if ((o = t[de])) {
     const t = Object.keys(o);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -2495,7 +2502,7 @@ function reconcile(e, t) {
     if (n == null) throw new Error("Cannot reconcile null or undefined state");
     const r = typeof t === "string" ? e => e[t] : t;
     const i = r(n);
-    if (i !== undefined && r(e) !== r(n))
+    if (i !== undefined && r(e) !== i)
       throw new Error("Cannot reconcile states with different identity");
     applyState(e, n, r);
   };
@@ -2504,9 +2511,9 @@ function createProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[we] = wrapProjection;
-    e[_e] = i;
-    Object.defineProperty(e, me, {
+    e[he] = wrapProjection;
+    e[ye] = i;
+    Object.defineProperty(e, Se, {
       get() {
         return r;
       },
@@ -2515,8 +2522,8 @@ function createProjectionInternal(e, t, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[le]?.[we] === wrapProjection) return e;
-    const t = createStoreProxy(e, xe, wrapper);
+    if (e[se]?.[he] === wrapProjection) return e;
+    const t = createStoreProxy(e, Oe, wrapper);
     i.set(e, t);
     return t;
   };
@@ -2525,45 +2532,46 @@ function createProjectionInternal(e, t, n) {
     if (!r) r = getOwner();
     runProjectionComputed(s, e, n?.key || "id");
   }, undefined);
-  r.ge &= ~g;
+  r.ue &= ~g;
   return { store: s, node: r };
 }
 function createProjection(e, t, n) {
   return createProjectionInternal(e, t, n).store;
 }
-function runProjectionComputed(e, t, n, r) {
-  const i = getOwner();
-  let s = false;
-  let o;
-  const u = new Proxy(
+function runProjectionComputed(e, t, n, r, i) {
+  const s = getOwner();
+  let o = false;
+  let u;
+  const f = new Proxy(
     e,
-    createWriteTraps(() => !s || i.ke === o)
+    createWriteTraps(() => !o || s.ke === u, i)
   );
-  storeSetter(u, u => {
-    o = t(u);
-    s = true;
+  storeSetter(f, i => {
+    u = t(i);
+    o = true;
     const commit = t => {
-      if (t === u || t === undefined) return;
+      if (t === i || t === undefined) return;
       const write = () => storeSetter(e, reconcile(t, n));
       r ? r(write) : write();
     };
-    commit(handleAsync(i, o, commit));
+    commit(handleAsync(s, u, commit));
   });
-  return i;
+  return s;
 }
-function createWriteTraps(e) {
-  const t = {
-    get(e, n) {
+function createWriteTraps(e, t) {
+  const n = {
+    get(e, t) {
       let r;
       setWriteOverride(true);
       setProjectionWriteActive(true);
       try {
-        r = e[n];
+        r = e[t];
       } finally {
         setWriteOverride(false);
         setProjectionWriteActive(false);
       }
-      return typeof r === "object" && r !== null ? new Proxy(r, t) : r;
+      if (t === se) return r;
+      return typeof r === "object" && r !== null ? new Proxy(r, n) : r;
     },
     has(e, t) {
       let n;
@@ -2577,24 +2585,26 @@ function createWriteTraps(e) {
       }
       return n;
     },
-    set(t, n, r) {
+    set(n, r, i) {
       if (e && !e()) return true;
       setWriteOverride(true);
       setProjectionWriteActive(true);
       try {
-        t[n] = r;
+        n[r] = i;
+        t?.();
       } finally {
         setWriteOverride(false);
         setProjectionWriteActive(false);
       }
       return true;
     },
-    deleteProperty(t, n) {
+    deleteProperty(n, r) {
       if (e && !e()) return true;
       setWriteOverride(true);
       setProjectionWriteActive(true);
       try {
-        delete t[n];
+        delete n[r];
+        t?.();
       } finally {
         setWriteOverride(false);
         setProjectionWriteActive(false);
@@ -2602,68 +2612,86 @@ function createWriteTraps(e) {
       return true;
     }
   };
-  return t;
+  return n;
 }
-const fe = Symbol(0),
-  le = Symbol(0),
-  ce = Symbol(0),
-  ae = Symbol(0);
-const de = "v",
-  pe = "o",
-  he = "x",
-  ye = "n",
-  Se = "h",
-  ge = "c",
-  we = "w",
-  _e = "l",
-  me = "f",
-  be = "p";
-function createStoreProxy(e, t = xe, n) {
+const ie = Symbol(0),
+  se = Symbol(0),
+  oe = Symbol(0),
+  ue = Symbol(0);
+const fe = "v",
+  le = "o",
+  ce = "x",
+  ae = "n",
+  de = "h",
+  pe = "c",
+  he = "w",
+  ye = "l",
+  Se = "f",
+  ge = "p";
+const we = Symbol(0);
+function createStoreProxy(e, t = Oe, n) {
   let r;
   if (Array.isArray(e)) {
     r = [];
     r.v = e;
   } else {
     r = { v: e };
-    const t = e?.[le]?.[de] ?? e;
+    const t = e?.[se]?.[fe] ?? e;
     const n = Object.getPrototypeOf(t);
     if (n !== null && n !== Object.prototype) {
-      r[ge] = true;
+      r[pe] = true;
     }
   }
   n && n(r);
-  return (r[ce] = new Proxy(r, t));
+  return (r[oe] = new Proxy(r, t));
 }
-const Oe = new WeakMap();
+const _e = new WeakMap();
 function wrap(e, t) {
-  if (t?.[we]) return t[we](e, t);
-  let n = e[ce] || Oe.get(e);
-  if (!n) Oe.set(e, (n = createStoreProxy(e)));
+  if (t?.[he]) return t[he](e, t);
+  let n = e[oe] || _e.get(e);
+  if (!n) _e.set(e, (n = createStoreProxy(e)));
   return n;
 }
 function isWrappable(e) {
   if (e == null || typeof e !== "object" || Object.isFrozen(e)) return false;
   return typeof Node === "undefined" || !(e instanceof Node);
 }
-let ve = false;
+let me = false;
 function setWriteOverride(e) {
-  ve = e;
+  me = e;
 }
 function writeOnly(e) {
-  return ve || !!Pe?.has(e);
-}
-function unwrapStoreValue(e) {
-  return e?.[le]?.[de] ?? e;
+  return me || !!be?.has(e);
+}
+function unwrapStoreValue(e, t, n) {
+  const r = e?.[se] || n?.get(e)?.[se];
+  if (!r) return e;
+  const i = r[le];
+  if (!i) return r[fe];
+  if (!t) t = new Map();
+  if (t.has(e)) return t.get(e);
+  const s = r[fe];
+  const o = Array.isArray(s);
+  const u = o ? [] : Object.create(Object.getPrototypeOf(s));
+  t.set(e, u);
+  n = r[ye] ?? _e;
+  for (const e of getKeys(s, i)) {
+    if (o && e === "length") continue;
+    const r = e in i ? i[e] : s[e];
+    if (r !== ue) u[e] = unwrapStoreValue(r, t, n);
+  }
+  if (o) u.length = i.length ?? s.length;
+  return u;
 }
 function isPrototypePollutionKey$1(e) {
   return e === "__proto__" || e === "constructor" || e === "prototype";
 }
 function hasOwnStoreProperty(e, t) {
-  const n = e[he];
-  if (n && Object.prototype.hasOwnProperty.call(n, t) && n[t] !== ae) return true;
-  const r = e[pe];
-  if (r && Object.prototype.hasOwnProperty.call(r, t) && r[t] !== ae) return true;
-  return Object.prototype.hasOwnProperty.call(unwrapStoreValue(e[de]), t);
+  const n = e[ce];
+  if (n && Object.prototype.hasOwnProperty.call(n, t) && n[t] !== ue) return true;
+  const r = e[le];
+  if (r && Object.prototype.hasOwnProperty.call(r, t) && r[t] !== ue) return true;
+  return Object.prototype.hasOwnProperty.call(unwrapStoreValue(e[fe]), t);
 }
 function hasInheritedAccessor(e, t) {
   let n = Object.getPrototypeOf(e);
@@ -2692,17 +2720,21 @@ function getNode(e, t, n, r, i = isEqual, s, o) {
     r
   );
   if (s) {
-    u.G = x;
+    u.m = x;
   }
   if (o && t in o) {
     const e = o[t];
-    u.me = e === undefined ? N : e;
-    oe?.add(u);
+    u.ce = e === undefined ? N : e;
+    ne?.add(u);
   }
   return (e[t] = u);
 }
-function trackSelf(e, t = fe) {
-  getObserver() && read(getNode(getNodes(e, ye), t, undefined, e[me], false, e[be]));
+function trackSelf(e, t = ie) {
+  getObserver() && read(getNode(getNodes(e, ae), t, undefined, e[Se], false, e[ge]));
+}
+function notifySelf(e) {
+  const t = e[ae]?.[ie];
+  t && setSignal(t, e[ge] && !M ? we : undefined);
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -2710,60 +2742,60 @@ function getKeys(e, t, n = true) {
   const i = new Set(r);
   const s = Reflect.ownKeys(t);
   for (const e of s) {
-    if (t[e] !== ae) i.add(e);
+    if (t[e] !== ue) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
 }
 function getPropertyDescriptor(e, t, n) {
   if (t && n in t) {
-    if (t[n] === ae) return void 0;
+    if (t[n] === ue) return void 0;
     const r = Reflect.getOwnPropertyDescriptor(t, n);
     if (r?.get || r?.set || !(n in e)) return r;
   }
   return Reflect.getOwnPropertyDescriptor(e, n);
 }
 function prepareStoreWrite(e, t, n) {
-  if (e[be]) {
-    const t = e[me];
-    if (t?.V) {
-      z.initTransition(t.V);
+  if (e[ge]) {
+    const t = e[Se];
+    if (t?.h) {
+      K.initTransition(t.h);
     }
   }
-  const r = e[de];
+  const r = e[fe];
   const i = r[n];
-  if (se && typeof n !== "symbol" && !((e[me]?.be ?? 0) & _)) {
+  if (te && typeof n !== "symbol" && !((e[Se]?.ae ?? 0) & _)) {
     if (!e[C]) {
       e[C] = Object.create(null);
-      oe?.add(e);
+      ne?.add(e);
     }
     if (!(n in e[C])) {
       e[C][n] = i;
     }
   }
-  const s = e[be] && !K;
-  const o = s ? he : pe;
+  const s = e[ge] && !M;
+  const o = s ? ce : le;
   if (s) trackOptimisticStore(t);
   return { base: i, overrideKey: o, state: r };
 }
 function upsertStoreNode(e, t, n, r, i) {
   if (t[n]) return t[n];
   const s = isWrappable(r) ? wrap(r, e) : r;
-  const o = getNode(t, n, s, e[me], isEqual, e[be], i);
+  const o = getNode(t, n, s, e[Se], isEqual, e[ge], i);
   registerTransientStoreNode(o);
   return o;
 }
 function notifyStoreProperty(e, t, n, r, i, s) {
-  const o = K || e[be];
+  const o = M || e[ge];
   const u = n !== "delete";
-  const f = e[Se]?.[t];
+  const f = e[de]?.[t];
   if (f) {
     setSignal(f, u);
   } else if (!o && n !== "invalidate" && s !== u) {
-    const n = upsertStoreNode(e, getNodes(e, Se), t, s);
+    const n = upsertStoreNode(e, getNodes(e, de), t, s);
     setSignal(n, u);
   }
-  const l = getNodes(e, ye);
+  const l = getNodes(e, ae);
   if (n === "set") {
     if (l[t]) {
       setSignal(l[t], () => (isWrappable(r) ? wrap(r, e) : r));
@@ -2784,107 +2816,109 @@ function notifyStoreProperty(e, t, n, r, i, s) {
       setSignal(n, undefined);
     }
   }
-  l[fe] && setSignal(l[fe], undefined);
+  notifySelf(e);
 }
-let Pe = null;
-const xe = {
+let be = null;
+const Oe = {
   get(e, t, n) {
-    if (t === le) return e;
-    if (t === ce) return n;
-    if (t === j) return e[me];
-    if (t === fe) {
+    if (t === se) return e;
+    if (t === oe) return n;
+    if (t === j) return e[Se];
+    if (t === ie) {
       trackSelf(e);
       return n;
     }
-    const r = getNodes(e, ye);
-    const i = r[t];
-    const s = e[de];
+    const r = getObserver() === e[Se];
+    const i = getNodes(e, ae);
+    const s = r ? undefined : i[t];
+    const o = e[fe];
     if (
-      !i &&
+      !s &&
+      !e[le] &&
+      !e[ce] &&
       !e[pe] &&
-      !e[he] &&
       !e[ge] &&
-      !e[be] &&
       !e[C] &&
-      !s[le] &&
-      !(t in s) &&
+      !o[se] &&
+      !(t in o) &&
       getObserver() &&
+      !r &&
       !writeOnly(n)
     ) {
-      return read(getNode(r, t, undefined, e[me]));
-    }
-    const o = e[he] && t in e[he];
-    const u = o || (e[pe] && t in e[pe]);
-    const f = !!e[de][le];
-    const l = o ? e[he] : e[pe] && t in e[pe] ? e[pe] : e[de];
-    if (!i) {
-      const r = Object.getOwnPropertyDescriptor(l, t);
+      return read(getNode(i, t, undefined, e[Se]));
+    }
+    const u = e[ce] && t in e[ce];
+    const f = u || (e[le] && t in e[le]);
+    const l = !!e[fe][se];
+    const c = u ? e[ce] : e[le] && t in e[le] ? e[le] : e[fe];
+    if (!s) {
+      const r = Object.getOwnPropertyDescriptor(c, t);
       if (r && r.get) return r.get.call(n);
-      if (!r && !u && e[ge]) {
-        const e = unwrapStoreValue(l);
+      if (!r && !f && e[pe]) {
+        const e = unwrapStoreValue(c);
         if (hasInheritedAccessor(e, t)) {
-          return Reflect.get(l, t, n);
+          return Reflect.get(c, t, n);
         }
       }
     }
     if (writeOnly(n)) {
       if (isPrototypePollutionKey$1(t) && !hasOwnStoreProperty(e, t)) return undefined;
       let n =
-        i && (u || !f) ? (i.G !== undefined && i.G !== x ? i.G : i.X !== x ? i.X : i.ue) : l[t];
-      n === ae && (n = undefined);
+        s && (f || !l) ? (s.m !== undefined && s.m !== x ? s.m : s.A !== x ? s.A : s.$) : c[t];
+      n === ue && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
-      Pe?.add(r);
+      be?.add(r);
       return r;
     }
-    let c = i ? (u || !f ? read(r[t]) : (read(r[t]), l[t])) : l[t];
-    c === ae && (c = undefined);
-    if (!i) {
-      if (!u && typeof c === "function" && !l.hasOwnProperty(t)) {
+    let a = s ? (f || !l ? read(i[t]) : (read(i[t]), c[t])) : c[t];
+    a === ue && (a = undefined);
+    if (!s) {
+      if (!f && typeof a === "function" && !c.hasOwnProperty(t)) {
         let t;
-        return !Array.isArray(e[de]) && (t = Object.getPrototypeOf(e[de])) && t !== Object.prototype
-          ? c.bind(l)
-          : c;
-      } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(c) ? wrap(c, e) : c, e[me], isEqual, e[be], e[C]));
+        return !Array.isArray(e[fe]) && (t = Object.getPrototypeOf(e[fe])) && t !== Object.prototype
+          ? a.bind(c)
+          : a;
+      } else if (getObserver() && !r) {
+        return read(getNode(i, t, isWrappable(a) ? wrap(a, e) : a, e[Se], isEqual, e[ge], e[C]));
       }
     }
-    return isWrappable(c) ? wrap(c, e) : c;
+    return isWrappable(a) ? wrap(a, e) : a;
   },
   has(e, t) {
-    if (t === ce || t === fe || t === "__proto__") return true;
+    if (t === oe || t === ie || t === "__proto__") return true;
     const n =
-      e[he] && t in e[he] ? e[he][t] !== ae : e[pe] && t in e[pe] ? e[pe][t] !== ae : t in e[de];
-    if (writeOnly(e[ce])) return n;
-    const r = getNodes(e, Se);
+      e[ce] && t in e[ce] ? e[ce][t] !== ue : e[le] && t in e[le] ? e[le][t] !== ue : t in e[fe];
+    if (writeOnly(e[oe]) || getObserver() === e[Se]) return n;
+    const r = getNodes(e, de);
     if (r[t]) return read(r[t]);
     if (getObserver()) {
-      return read(getNode(r, t, n, e[me], isEqual, e[be]));
+      return read(getNode(r, t, n, e[Se], isEqual, e[ge]));
     }
     return n;
   },
   set(e, t, n) {
     if (t === "__proto__") return true;
-    const r = e[ce];
+    const r = e[oe];
     if (writeOnly(r)) {
       untrack(() => {
         const { base: i, overrideKey: s, state: o } = prepareStoreWrite(e, r, t);
-        const u = e[he] && t in e[he] ? e[he][t] : e[pe] && t in e[pe] ? e[pe][t] : i;
+        const u = e[ce] && t in e[ce] ? e[ce][t] : e[le] && t in e[le] ? e[le][t] : i;
         const f =
-          e[he] && t in e[he]
-            ? e[he][t] !== ae
-            : e[pe] && t in e[pe]
-              ? e[pe][t] !== ae
-              : t in e[de];
+          e[ce] && t in e[ce]
+            ? e[ce][t] !== ue
+            : e[le] && t in e[le]
+              ? e[le][t] !== ue
+              : t in e[fe];
         const l = unwrapStoreValue(n);
         const c = Array.isArray(o) && t !== "length";
         const a = c ? parseInt(t) + 1 : 0;
         const d =
           c &&
-          (e[he] && "length" in e[he]
-            ? e[he].length
-            : e[pe] && "length" in e[pe]
-              ? e[pe].length
+          (e[ce] && "length" in e[ce]
+            ? e[ce].length
+            : e[le] && "length" in e[le]
+              ? e[le].length
               : o.length);
         const p = c && a > d ? a : undefined;
         if (u === l && p === undefined) return true;
@@ -2896,10 +2930,10 @@ const xe = {
         }
         notifyStoreProperty(e, t, "set", l, u, f);
         if (Array.isArray(o) && t !== "length" && p !== undefined) {
-          const t = getNodes(e, ye);
+          const t = getNodes(e, ae);
           if (t.length) {
             setSignal(t.length, p);
-          } else if (!K && !e[be]) {
+          } else if (!M && !e[ge]) {
             const n = upsertStoreNode(e, t, "length", d, e[C]);
             setSignal(n, p);
           }
@@ -2911,7 +2945,7 @@ const xe = {
   },
   defineProperty(e, t, n) {
     if (t === "__proto__") return true;
-    const r = e[ce];
+    const r = e[oe];
     if (writeOnly(r)) {
       untrack(() => {
         const { base: i, overrideKey: s } = prepareStoreWrite(e, r, t);
@@ -2925,16 +2959,16 @@ const xe = {
   },
   deleteProperty(e, t) {
     if (t === "__proto__") return true;
-    const n = e[he]?.[t] === ae;
-    const r = e[pe]?.[t] === ae;
-    if (writeOnly(e[ce]) && !n && !r) {
+    const n = e[ce]?.[t] === ue;
+    const r = e[le]?.[t] === ue;
+    if (writeOnly(e[oe]) && !n && !r) {
       untrack(() => {
-        const n = e[be] && !K;
-        const r = n ? he : pe;
-        if (n) trackOptimisticStore(e[ce]);
-        const i = e[he] && t in e[he] ? e[he][t] : e[pe] && t in e[pe] ? e[pe][t] : e[de][t];
-        if (t in e[de] || (e[pe] && t in e[pe])) {
-          (e[r] || (e[r] = Object.create(null)))[t] = ae;
+        const n = e[ge] && !M;
+        const r = n ? ce : le;
+        if (n) trackOptimisticStore(e[oe]);
+        const i = e[ce] && t in e[ce] ? e[ce][t] : e[le] && t in e[le] ? e[le][t] : e[fe][t];
+        if (t in e[fe] || (e[le] && t in e[le])) {
+          (e[r] || (e[r] = Object.create(null)))[t] = ue;
         } else if (e[r] && t in e[r]) {
           delete e[r][t];
         } else return true;
@@ -2944,12 +2978,12 @@ const xe = {
     return true;
   },
   ownKeys(e) {
-    trackSelf(e);
-    let t = getKeys(e[de], e[pe], false);
-    if (e[he]) {
+    if (getObserver() !== e[Se]) trackSelf(e);
+    let t = getKeys(e[fe], e[le], false);
+    if (e[ce]) {
       const n = new Set(t);
-      for (const t of Reflect.ownKeys(e[he])) {
-        if (e[he][t] !== ae) n.add(t);
+      for (const t of Reflect.ownKeys(e[ce])) {
+        if (e[ce][t] !== ue) n.add(t);
         else n.delete(t);
       }
       t = Array.from(n);
@@ -2957,27 +2991,27 @@ const xe = {
     return t;
   },
   getOwnPropertyDescriptor(e, t) {
-    if (t === ce) return { value: e[ce], writable: true, configurable: true };
-    if (e[he] && t in e[he]) {
-      if (e[he][t] === ae) return undefined;
-      const n = Reflect.getOwnPropertyDescriptor(e[he], t);
-      if (n?.get || n?.set || !(t in e[de])) return n;
-      const r = getPropertyDescriptor(e[de], e[pe], t);
+    if (t === oe) return { value: e[oe], writable: true, configurable: true };
+    if (e[ce] && t in e[ce]) {
+      if (e[ce][t] === ue) return undefined;
+      const n = Reflect.getOwnPropertyDescriptor(e[ce], t);
+      if (n?.get || n?.set || !(t in e[fe])) return n;
+      const r = getPropertyDescriptor(e[fe], e[le], t);
       if (r) {
-        return { ...r, value: e[he][t] };
+        return { ...r, value: e[ce][t] };
       }
-      return { value: e[he][t], writable: true, enumerable: true, configurable: true };
+      return { value: e[ce][t], writable: true, enumerable: true, configurable: true };
     }
-    return getPropertyDescriptor(e[de], e[pe], t);
+    return getPropertyDescriptor(e[fe], e[le], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[de]);
+    return Object.getPrototypeOf(e[fe]);
   }
 };
 function storeSetter(e, t) {
-  const n = Pe;
-  Pe = new Set();
-  Pe.add(e);
+  const n = be;
+  be = new Set();
+  be.add(e);
   try {
     const n = t(e);
     if (n !== e && n !== undefined) {
@@ -2993,8 +3027,8 @@ function storeSetter(e, t) {
       }
     }
   } finally {
-    Pe.clear();
-    Pe = n;
+    be.clear();
+    be = n;
   }
 }
 function createStore(e, t, n) {
@@ -3002,11 +3036,16 @@ function createStore(e, t, n) {
     i = r ? createProjectionInternal(e, t, n).store : wrap(e);
   return [
     i,
-    r ? e => (storeSetter(i, e), suppressComputedRecompute(i[j])) : e => storeSetter(i, e)
+    r
+      ? e => {
+          suppressComputedRecompute(i[j]);
+          storeSetter(i, e);
+        }
+      : e => storeSetter(i, e)
   ];
 }
 function createOptimisticStore(e, t, n) {
-  GlobalQueue.ye ||= clearOptimisticStore;
+  GlobalQueue.ie ||= clearOptimisticStore;
   const r = typeof e === "function";
   const i = r ? t : e;
   const s = r ? e : undefined;
@@ -3014,39 +3053,53 @@ function createOptimisticStore(e, t, n) {
   return [o, e => storeSetter(o, e)];
 }
 function clearOptimisticStore(e) {
-  const t = e[le];
-  if (!t || !t[he]) return;
-  const n = t[he];
-  const r = t[ye];
+  const t = e[se];
+  if (!t || !t[ce]) return;
+  clearOptimisticOverride(t);
+}
+function clearOptimisticOverride(e) {
+  const t = e[ce];
+  if (!t) return;
+  const n = e[ae];
+  delete e[ce];
+  const r = M;
   setProjectionWriteActive(true);
   try {
-    if (r) {
-      for (const e of Reflect.ownKeys(n)) {
-        if (r[e]) {
-          r[e].H = undefined;
-          const n = t[pe] && e in t[pe] ? t[pe][e] : t[de][e];
-          const i = n === ae ? undefined : n;
-          setSignal(r[e], isWrappable(i) ? wrap(i, t) : i);
+    if (n) {
+      for (const r of Reflect.ownKeys(t)) {
+        if (n[r]) {
+          const t = n[r];
+          t.i = undefined;
+          const i = e[le] && r in e[le] ? e[le][r] : e[fe][r];
+          const s = i === ue ? undefined : i;
+          const o = isWrappable(s) ? wrap(s, e) : s;
+          const u = t.m !== undefined && t.m !== x ? t.m : t.A !== x ? t.A : t.$;
+          t.m = x;
+          t.A = x;
+          t.$ = o;
+          if (!t.He || !t.He(u, o)) {
+            insertSubs(t, true);
+            schedule();
+          }
         }
       }
-      if (r[fe]) {
-        r[fe].H = undefined;
-        setSignal(r[fe], undefined);
+      if (n[ie]) {
+        n[ie].i = undefined;
+        notifySelf(e);
       }
     }
   } finally {
-    setProjectionWriteActive(false);
+    setProjectionWriteActive(r);
   }
-  delete t[he];
 }
 function createOptimisticProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[we] = wrapProjection;
-    e[_e] = i;
-    e[be] = true;
-    Object.defineProperty(e, me, {
+    e[he] = wrapProjection;
+    e[ye] = i;
+    e[ge] = true;
+    Object.defineProperty(e, Se, {
       get() {
         return r;
       },
@@ -3055,34 +3108,40 @@ function createOptimisticProjectionInternal(e, t, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[le]?.[we] === wrapProjection) return e;
-    const t = createStoreProxy(e, xe, wrapper);
+    if (e[se]?.[he] === wrapProjection) return e;
+    const t = createStoreProxy(e, Oe, wrapper);
     i.set(e, t);
     return t;
   };
   const s = wrapProjection(t);
   if (e) {
+    const clearProjectionOverride = () => {
+      const e = s[se];
+      if (e?.[ce]) clearOptimisticOverride(e);
+    };
     const wrapCommit = e => {
+      const t = M;
       setProjectionWriteActive(true);
       try {
         e();
+        clearProjectionOverride();
       } finally {
-        setProjectionWriteActive(false);
+        setProjectionWriteActive(t);
       }
     };
     r = computed(() => {
       setProjectionWriteActive(true);
       try {
-        runProjectionComputed(s, e, n?.key || "id", wrapCommit);
+        runProjectionComputed(s, e, n?.key || "id", wrapCommit, clearProjectionOverride);
       } finally {
         setProjectionWriteActive(false);
       }
     }, undefined);
-    r.ge &= ~g;
+    r.ue &= ~g;
   }
   return { store: s, node: r };
 }
-const Ne = Symbol(0);
+const ve = Symbol(0);
 function isPrototypePollutionKey(e) {
   return e === "__proto__" || e === "constructor" || e === "prototype";
 }
@@ -3130,7 +3189,7 @@ function updatePath(e, t, n = 0) {
     if (s === i) return;
   }
   if (r === undefined && s == undefined) return;
-  if (s === Ne) {
+  if (s === ve) {
     delete e[r];
   } else if (r === undefined || (isWrappable(i) && isWrappable(s) && !Array.isArray(s))) {
     const t = r !== undefined ? e[r] : e;
@@ -3146,35 +3205,35 @@ function updatePath(e, t, n = 0) {
     e[r] = s;
   }
 }
-const Ce = Object.assign(
+const Pe = Object.assign(
   function storePath(...e) {
     return t => {
       updatePath(t, e);
     };
   },
-  { DELETE: Ne }
+  { DELETE: ve }
 );
 function snapshotImpl(e, t, n, r) {
   let i, s, o, u, f, l;
   if (!isWrappable(e)) return e;
   if (n && n.has(e)) return n.get(e);
   if (!n) n = new Map();
-  if ((i = e[le] || r?.get(e)?.[le])) {
-    if (t) trackSelf(i, fe);
-    o = i[pe];
-    s = Array.isArray(i[de]);
-    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[de]))) : i[de]);
-    e = i[de];
-    r = Oe;
+  if ((i = e[se] || r?.get(e)?.[se])) {
+    if (t) trackSelf(i, ie);
+    o = i[le];
+    s = Array.isArray(i[fe]);
+    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[fe]))) : i[fe]);
+    e = i[fe];
+    r = i[ye] ?? _e;
   } else {
     s = Array.isArray(e);
     n.set(e, e);
   }
   if (s) {
-    const s = o?.length || e.length;
+    const s = o?.length ?? e.length;
     for (let c = 0; c < s; c++) {
       l = o && c in o ? o[c] : e[c];
-      if (l === ae) continue;
+      if (l === ue) continue;
       if (t && isWrappable(l)) wrap(l, i);
       if ((f = snapshotImpl(l, t, n, r)) !== l || u) {
         if (!u) n.set(e, (u = [...e]));
@@ -3209,13 +3268,13 @@ function deep(e) {
 function trueFn() {
   return true;
 }
-const Ee = {
+const xe = {
   get(e, t, n) {
-    if (t === ce) return n;
+    if (t === oe) return n;
     return e.get(t);
   },
   has(e, t) {
-    if (t === ce) return true;
+    if (t === oe) return true;
     return e.has(t);
   },
   set: trueFn,
@@ -3238,15 +3297,15 @@ const Ee = {
 function resolveSource(e) {
   return !(e = typeof e === "function" ? e() : e) ? {} : e;
 }
-const ke = Symbol(0);
+const Ne = 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 && ce in i);
-    const s = !!i && i[ke];
+    t = t || (!!i && oe in i);
+    const s = !!i && i[Ne];
     if (s) {
       for (let e = 0; e < s.length; e++) n.push(s[e]);
     } else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
@@ -3255,7 +3314,7 @@ function merge(...e) {
     return new Proxy(
       {
         get(e) {
-          if (e === ke) return n;
+          if (e === Ne) return n;
           for (let t = n.length - 1; t >= 0; t--) {
             const r = resolveSource(n[t]);
             if (e in r) return r[e];
@@ -3276,7 +3335,7 @@ function merge(...e) {
           return [...e];
         }
       },
-      Ee
+      xe
     );
   }
   const r = Object.create(null);
@@ -3308,11 +3367,11 @@ function merge(...e) {
     if (n.get) Object.defineProperty(o, t, n);
     else o[t] = n.value;
   }
-  o[ke] = n;
+  o[Ne] = n;
   return o;
 }
 function omit(e, ...t) {
-  if (E && ce in e) {
+  if (E && oe in e) {
     return new Proxy(
       {
         get(n) {
@@ -3325,7 +3384,7 @@ function omit(e, ...t) {
           return Object.keys(e).filter(e => !t.includes(e));
         }
       },
-      Ee
+      xe
     );
   }
   const n = {};
@@ -3360,33 +3419,33 @@ function mapArray(e, t, n) {
     st: n?.fallback
   };
   const u = computed(updateKeyedMap.bind(o));
-  o.Ue.u = u;
-  u.ge &= ~g;
+  o.Ue.be = u;
+  u.ue &= ~g;
   return accessor(u);
 }
-const je = { ownedWrite: true };
+const Ce = { ownedWrite: true };
 function updateKeyedMap() {
   const e = this.Je() || [],
     t = e.length;
-  e[fe];
+  e[ie];
   runWithOwner(this.Ue, () => {
     let n,
       r,
       i = this.nt
         ? this.it
           ? () => {
-              this.nt[r] = signal(e[r], je);
+              this.nt[r] = signal(e[r], Ce);
               return this.Ye(accessor(this.nt[r]), r);
             }
           : () => {
-              this.nt[r] = signal(e[r], je);
-              this.rt && (this.rt[r] = signal(r, je));
+              this.nt[r] = signal(e[r], Ce);
+              this.rt && (this.rt[r] = signal(r, Ce));
               return this.Ye(accessor(this.nt[r]), this.rt ? accessor(this.rt[r]) : undefined);
             }
         : this.rt
           ? () => {
               const t = e[r];
-              this.rt[r] = signal(r, je);
+              this.rt[r] = signal(r, Ce);
               return this.Ye(t, accessor(this.rt[r]));
             }
           : () => {
@@ -3504,7 +3563,7 @@ function repeat(e, t, n) {
       st: n?.fallback
     })
   );
-  i.ge &= ~g;
+  i.ue &= ~g;
   return accessor(i);
 }
 function updateRepeat() {
@@ -3517,6 +3576,7 @@ function updateRepeat() {
         this.et = [];
         this.Ze = [];
         this.$e = 0;
+        this.ot = 0;
       }
       if (this.st && !this.Ze[0]) {
         this.Ze[0] = runWithOwner((this.et[0] = createOwner()), this.st);
@@ -3528,10 +3588,10 @@ function updateRepeat() {
     if (this.$e === 0 && this.et[0]) this.et[0].dispose();
     for (let e = n; e < r; e++) this.et[e - this.ot].dispose();
     if (this.ot < t) {
-      let e = this.ot;
-      while (e < t && e < this.$e) this.et[e++].dispose();
-      this.et.splice(0, t - this.ot);
-      this.Ze.splice(0, t - this.ot);
+      const e = t - this.ot;
+      for (let t = 0; t < e && t < this.$e; t++) this.et[t].dispose();
+      this.et.splice(0, e);
+      this.Ze.splice(0, e);
     } else if (this.ot > t) {
       let n = r - this.ot - 1;
       let i = this.ot - t;
@@ -3560,28 +3620,28 @@ function compare(e, t, n) {
 function boundaryComputed(e, t) {
   const n = computed(e, { lazy: true });
   n.Fe = (e, t) => {
-    const r = e !== undefined ? e : n.be;
-    const i = t !== undefined ? t : n.we;
-    n.be &= ~n.lt;
-    n.te.notify(n, n.lt, r, i);
+    const r = e !== undefined ? e : n.ae;
+    const i = t !== undefined ? t : n.fe;
+    n.ae &= ~n.lt;
+    n.F.notify(n, n.lt, r, i);
   };
   n.lt = t;
-  n.ge &= ~g;
+  n.ue &= ~g;
   recompute(n, true);
   return n;
 }
 function createBoundChildren(e, t, n, r) {
-  const i = e.te;
-  i.addChild((e.te = n));
-  cleanup(() => i.removeChild(e.te));
+  const i = e.F;
+  i.addChild((e.F = n));
+  cleanup(() => i.removeChild(e.F));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => flatten(read(e)), r);
   });
 }
-const We = Symbol();
-const Re = createContext(null);
-let Ae = false;
+const Ee = Symbol();
+const ke = createContext(null);
+let je = false;
 const FALSE_ACCESSOR = () => false;
 const SEQUENTIAL_ACCESSOR = () => "sequential";
 function isRevealController(e) {
@@ -3715,18 +3775,18 @@ class CollectionQueue extends Queue {
   Et;
   dt = true;
   ht = signal(false, { ownedWrite: true, ze: true });
-  we;
+  fe;
   yt = signal(false, { ownedWrite: true, ze: true });
   gt;
   wt = false;
   kt;
-  jt = We;
+  jt = Ee;
   constructor(e) {
     super();
     this.Ct = e;
   }
   run(e) {
-    if (!e || (read(this.ht) && (!Ae || read(this.yt)))) return;
+    if (!e || (read(this.ht) && (!je || read(this.yt)))) return;
     return super.run(e);
   }
   notify(e, t, n, r) {
@@ -3736,7 +3796,7 @@ class CollectionQueue extends Queue {
         try {
           return this.kt();
         } catch {
-          return We;
+          return Ee;
         }
       });
       if (e !== this.jt) {
@@ -3751,13 +3811,13 @@ class CollectionQueue extends Queue {
     }
     if (n & this.Ct) {
       this.dt = true;
-      const t = r?.source || e.we?.source;
+      const t = r?.source || e.fe?.source;
       if (t) {
         const e = this.ct.size === 0;
         this.ct.add(t);
         if (e) setSignal(this.ht, true);
         if (this.Ct & m) {
-          setSignal(this.we, t.we?.cause ?? t.we);
+          setSignal(this.fe, t.fe?.cause ?? t.fe);
         }
       }
     }
@@ -3766,11 +3826,11 @@ class CollectionQueue extends Queue {
   }
   checkSources() {
     for (const e of this.ct) {
-      if (e._ & u || (!(e.be & this.Ct) && !(this.Ct & m && e.be & _))) this.ct.delete(e);
+      if (e.V & u || (!(e.ae & this.Ct) && !(this.Ct & m && e.ae & _))) this.ct.delete(e);
     }
     if (!this.ct.size) {
       if (this.Ct & _ && this.dt && !this.wt && this.Et) {
-        this.dt = !!(this.Et.be & this.Ct);
+        this.dt = !!(this.Et.ae & this.Ct);
       } else {
         this.dt = false;
       }
@@ -3783,14 +3843,14 @@ class CollectionQueue extends Queue {
         }
       }
     }
-    if (Ae) this.gt?.evaluate();
+    if (je) this.gt?.evaluate();
   }
 }
 function createCollectionBoundary(e, t, n, r) {
   const i = createOwner();
-  if (Ae) setContext(Re, null, i);
+  if (je) setContext(ke, null, i);
   const s = new CollectionQueue(e);
-  if (e === m) s.we = signal(undefined, { ownedWrite: true, ze: true });
+  if (e === m) s.fe = signal(undefined, { ownedWrite: true, ze: true });
   if (r) s.kt = r;
   const o = (s.Et = createBoundChildren(i, t, s, e));
   untrack(() => {
@@ -3801,9 +3861,9 @@ function createCollectionBoundary(e, t, n, r) {
       if (e instanceof NotReadyError) t = true;
       else throw e;
     }
-    s.dt = t || !!(o.be & e) || o.we instanceof NotReadyError;
+    s.dt = t || !!(o.ae & e) || o.fe instanceof NotReadyError;
   });
-  const u = Ae && e === _ ? getContext(Re) : null;
+  const u = je && e === _ ? getContext(ke) : null;
   if (u) {
     s.gt = u;
     u.register(s);
@@ -3815,7 +3875,7 @@ function createCollectionBoundary(e, t, n, r) {
         const e = read(o);
         if (!untrack(() => read(s.ht))) return ((s.wt = true), e);
       }
-      if (Ae && read(s.yt)) return undefined;
+      if (je && read(s.yt)) return undefined;
       return n(s);
     })
   );
@@ -3825,20 +3885,20 @@ function createLoadingBoundary(e, t, n) {
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(m, e, e =>
-    t(accessor(e.we), () => {
+    t(accessor(e.fe), () => {
       for (const t of e.ct) recompute(t);
       schedule();
     })
   );
 }
 function createRevealOrder(e, t) {
-  Ae = true;
+  je = true;
   const n = createOwner();
-  const r = getContext(Re);
+  const r = getContext(ke);
   const i = t?.order || SEQUENTIAL_ACCESSOR,
     s = t?.collapsed || FALSE_ACCESSOR;
   const o = new RevealController(i, s);
-  setContext(Re, o, n);
+  setContext(ke, o, n);
   return runWithOwner(n, () => {
     const t = e();
     computed(() => {
@@ -3903,13 +3963,13 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-const Ie = undefined;
-exports.$PROXY = ce;
+const We = undefined;
+exports.$PROXY = oe;
 exports.$REFRESH = j;
-exports.$TARGET = le;
-exports.$TRACK = fe;
+exports.$TARGET = se;
+exports.$TRACK = ie;
 exports.ContextNotFoundError = ContextNotFoundError;
-exports.DEV = Ie;
+exports.DEV = We;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
 exports.SUPPORTS_PROXY = E;
@@ -3943,7 +4003,6 @@ exports.getOwner = getOwner;
 exports.isDisposed = isDisposed;
 exports.isEqual = isEqual;
 exports.isPending = isPending;
-exports.isRefreshing = isRefreshing;
 exports.isWrappable = isWrappable;
 exports.latest = latest;
 exports.mapArray = mapArray;
@@ -3962,5 +4021,5 @@ exports.runWithOwner = runWithOwner;
 exports.setContext = setContext;
 exports.setSnapshotCapture = setSnapshotCapture;
 exports.snapshot = snapshot;
-exports.storePath = Ce;
+exports.storePath = Pe;
 exports.untrack = untrack;