@solidjs/signals 0.13.2 → 0.13.4

package/dist/node.cjs

@@ -32,14 +32,14 @@ const s = 1 << 4;
 const o = 1 << 5;
 const u = 1 << 6;
 const f = 1 << 7;
-const l = 1 << 8;
-const c = 1 << 9;
+const c = 1 << 8;
+const l = 1 << 9;
 const a = 1 << 0;
 const d = 1 << 1;
 const p = 1 << 2;
 const h = 1;
-const y = 2;
-const g = 3;
+const g = 2;
+const y = 3;
 const S = {};
 const w = {};
 const m = "sp";
@@ -130,10 +130,10 @@ function runHeap(e, t) {
 function adjustHeight(e, t) {
   deleteFromHeap(e, t);
   let n = e.o;
-  for (let t = e.W; t; t = t.N) {
+  for (let t = e.N; t; t = t.W) {
     const e = t.L;
     const r = e.I || e;
-    if (r.H && r.o >= n) n = r.o + 1;
+    if (r.T && r.o >= n) n = r.o + 1;
   }
   if (e.o !== n) {
     e.o = n;
@@ -145,14 +145,18 @@ function adjustHeight(e, t) {
 const x = new Set();
 const P = { l: new Array(2e3).fill(undefined), _: false, A: 0, S: 0 };
 const v = { l: new Array(2e3).fill(undefined), _: false, A: 0, S: 0 };
-let k = 0;
-let C = null;
-let E = false;
+let E = 0;
+let k = null;
+let C = false;
 let j = false;
+let A = null;
 function enforceLoadingBoundary(e) {}
+function shouldReadStashedOptimisticValue(e) {
+  return !!A?.has(e);
+}
 function runLaneEffects(e) {
-  for (const t of N) {
-    if (t.R || t.T.size > 0) continue;
+  for (const t of L) {
+    if (t.R || t.H.size > 0) continue;
     const n = t.q[e - 1];
     if (n.length) {
       t.q[e - 1] = [];
@@ -160,27 +164,100 @@ function runLaneEffects(e) {
     }
   }
 }
+function queueStashedOptimisticEffects(e) {
+  for (let t = e.O; t !== null; t = t.P) {
+    const e = t.k;
+    if (!e.D) continue;
+    if (e.D === y) {
+      if (!e.V) {
+        e.V = true;
+        e.B.enqueue(g, e.F);
+      }
+      continue;
+    }
+    const n = e.m & o ? v : P;
+    if (n.A > e.o) n.A = e.o;
+    insertIntoHeap(e, n);
+  }
+}
 function setProjectionWriteActive(e) {
   j = e;
 }
+function mergeTransitionState(e, t) {
+  t.M = e;
+  e.G.push(...t.G);
+  for (const n of L) {
+    if (n.K === t) n.K = e;
+  }
+  e.U.push(...t.U);
+  for (const n of t.J) e.J.add(n);
+  for (const n of t.X) {
+    if (!e.X.includes(n)) e.X.push(n);
+  }
+}
+function resolveOptimisticNodes(e) {
+  for (let t = 0; t < e.length; t++) {
+    const n = e[t];
+    n.Y = undefined;
+    if (n.Z !== S) {
+      n.$ = n.Z;
+      n.Z = S;
+    }
+    const r = n.ee;
+    n.ee = S;
+    if (r !== S && n.$ !== r) insertSubs(n, true);
+    n.K = null;
+  }
+  e.length = 0;
+}
+function cleanupCompletedLanes(e) {
+  for (const t of L) {
+    const n = e ? t.K === e : !t.K;
+    if (!n) continue;
+    if (!t.R) {
+      if (t.q[0].length) runQueue(t.q[0], h);
+      if (t.q[1].length) runQueue(t.q[1], g);
+    }
+    if (t.te.Y === t) t.te.Y = undefined;
+    t.H.clear();
+    t.q[0].length = 0;
+    t.q[1].length = 0;
+    L.delete(t);
+    W.delete(t.te);
+  }
+}
 function schedule() {
-  if (E) return;
-  E = true;
-  if (!A.F && !j) queueMicrotask(flush);
+  if (C) return;
+  C = true;
+  if (!N.ne && !j) queueMicrotask(flush);
+}
+function addTransitionBlocker(e) {
+  if (k && !k.X.includes(e)) {
+    k.X.push(e);
+  }
+}
+function removeTransitionBlocker(e) {
+  const remove = t => {
+    if (!t) return;
+    const n = t.indexOf(e);
+    if (n >= 0) t.splice(n, 1);
+  };
+  remove(e.K?.X);
+  remove(k?.X);
 }
 class Queue {
   i = null;
-  M = [[], []];
-  V = [];
-  created = k;
+  re = [[], []];
+  ie = [];
+  created = E;
   addChild(e) {
-    this.V.push(e);
+    this.ie.push(e);
     e.i = this;
   }
   removeChild(e) {
-    const t = this.V.indexOf(e);
+    const t = this.ie.indexOf(e);
     if (t >= 0) {
-      this.V.splice(t, 1);
+      this.ie.splice(t, 1);
       e.i = null;
     }
   }
@@ -189,107 +266,123 @@ class Queue {
     return false;
   }
   run(e) {
-    if (this.M[e - 1].length) {
-      const t = this.M[e - 1];
-      this.M[e - 1] = [];
+    if (this.re[e - 1].length) {
+      const t = this.re[e - 1];
+      this.re[e - 1] = [];
       runQueue(t, e);
     }
-    for (let t = 0; t < this.V.length; t++) this.V[t].run?.(e);
+    for (let t = 0; t < this.ie.length; t++) this.ie[t].run?.(e);
   }
   enqueue(e, t) {
     if (e) {
-      if (V) {
-        const n = findLane(V);
+      if (F) {
+        const n = findLane(F);
         n.q[e - 1].push(t);
       } else {
-        this.M[e - 1].push(t);
+        this.re[e - 1].push(t);
       }
     }
     schedule();
   }
   stashQueues(e) {
-    e.M[0].push(...this.M[0]);
-    e.M[1].push(...this.M[1]);
-    this.M = [[], []];
-    for (let t = 0; t < this.V.length; t++) {
-      let n = this.V[t];
-      let r = e.V[t];
+    e.re[0].push(...this.re[0]);
+    e.re[1].push(...this.re[1]);
+    this.re = [[], []];
+    for (let t = 0; t < this.ie.length; t++) {
+      let n = this.ie[t];
+      let r = e.ie[t];
       if (!r) {
-        r = { M: [[], []], V: [] };
-        e.V[t] = r;
+        r = { re: [[], []], ie: [] };
+        e.ie[t] = r;
       }
       n.stashQueues(r);
     }
   }
   restoreQueues(e) {
-    this.M[0].push(...e.M[0]);
-    this.M[1].push(...e.M[1]);
-    for (let t = 0; t < e.V.length; t++) {
-      const n = e.V[t];
-      let r = this.V[t];
+    this.re[0].push(...e.re[0]);
+    this.re[1].push(...e.re[1]);
+    for (let t = 0; t < e.ie.length; t++) {
+      const n = e.ie[t];
+      let r = this.ie[t];
       if (r) r.restoreQueues(n);
     }
   }
 }
 class GlobalQueue extends Queue {
-  F = false;
-  D = [];
-  B = [];
-  G = new Set();
-  static K;
-  static U;
-  static J = null;
+  ne = false;
+  se = [];
+  U = [];
+  J = new Set();
+  static oe;
+  static ue;
+  static fe = null;
   flush() {
-    if (this.F) return;
-    this.F = true;
+    if (this.ne) return;
+    this.ne = true;
     try {
-      runHeap(P, GlobalQueue.K);
-      if (C) {
-        const e = transitionComplete(C);
+      runHeap(P, GlobalQueue.oe);
+      if (k) {
+        const e = transitionComplete(k);
         if (!e) {
-          let e = C;
-          runHeap(v, GlobalQueue.K);
-          this.D = [];
-          this.B = [];
-          this.G = new Set();
+          const e = k;
+          runHeap(v, GlobalQueue.oe);
+          this.se = [];
+          this.U = [];
+          this.J = new Set();
           runLaneEffects(h);
-          runLaneEffects(y);
-          this.stashQueues(C.X);
-          k++;
-          E = P.S >= P.A;
-          reassignPendingTransition(C.D);
-          C = null;
-          finalizePureQueue(null, true);
+          runLaneEffects(g);
+          this.stashQueues(e.ce);
+          E++;
+          C = P.S >= P.A;
+          reassignPendingTransition(e.se);
+          k = null;
+          if (!e.G.length && e.U.length) {
+            A = new Set();
+            for (let t = 0; t < e.U.length; t++) {
+              const n = e.U[t];
+              if (n.T || n.le) continue;
+              A.add(n);
+              queueStashedOptimisticEffects(n);
+            }
+          }
+          try {
+            finalizePureQueue(null, true);
+          } finally {
+            A = null;
+          }
           return;
         }
-        this.D !== C.D && this.D.push(...C.D);
-        this.restoreQueues(C.X);
-        x.delete(C);
-        const t = C;
-        C = null;
-        reassignPendingTransition(this.D);
+        this.se !== k.se && this.se.push(...k.se);
+        this.restoreQueues(k.ce);
+        x.delete(k);
+        const t = k;
+        k = null;
+        reassignPendingTransition(this.se);
         finalizePureQueue(t);
       } else {
-        if (x.size) runHeap(v, GlobalQueue.K);
+        if (x.size) runHeap(v, GlobalQueue.oe);
         finalizePureQueue();
       }
-      k++;
-      E = P.S >= P.A;
+      E++;
+      C = P.S >= P.A;
       runLaneEffects(h);
       this.run(h);
-      runLaneEffects(y);
-      this.run(y);
+      runLaneEffects(g);
+      this.run(g);
     } finally {
-      this.F = false;
+      this.ne = false;
     }
   }
   notify(e, t, n, r) {
     if (t & a) {
       if (n & a) {
-        const t = r !== undefined ? r : e.Y;
-        if (C && t && !C.Z.includes(t.source)) {
-          C.Z.push(t.source);
-          schedule();
+        const t = r !== undefined ? r : e.ae;
+        if (k && t) {
+          const e = t.source;
+          if (!k.X.includes(e)) {
+            k.X.push(e);
+            schedule();
+          }
         }
       }
       return true;
@@ -298,60 +391,58 @@ class GlobalQueue extends Queue {
   }
   initTransition(e) {
     if (e) e = currentTransition(e);
-    if (e && e === C) return;
-    if (!e && C && C.$ === k) return;
-    if (!C) {
-      C = e ?? {
-        $: k,
-        D: [],
-        Z: [],
-        B: [],
-        G: new Set(),
-        ee: [],
-        X: { M: [[], []], V: [] },
-        te: false
+    if (e && e === k) return;
+    if (!e && k && k.de === E) return;
+    if (!k) {
+      k = e ?? {
+        de: E,
+        se: [],
+        X: [],
+        U: [],
+        J: new Set(),
+        G: [],
+        ce: { re: [[], []], ie: [] },
+        M: false
       };
     } else if (e) {
-      const t = C;
-      t.te = e;
-      e.ee.push(...t.ee);
-      for (const n of N) {
-        if (n.ne === t) n.ne = e;
-      }
-      e.B.push(...t.B);
-      for (const n of t.G) {
-        e.G.add(n);
-      }
+      const t = k;
+      mergeTransitionState(e, t);
       x.delete(t);
-      C = e;
+      k = e;
+    }
+    x.add(k);
+    k.de = E;
+    if (this.se !== k.se) {
+      for (let e = 0; e < this.se.length; e++) {
+        const t = this.se[e];
+        t.K = k;
+        k.se.push(t);
+      }
+      this.se = k.se;
     }
-    x.add(C);
-    C.$ = k;
-    for (let e = 0; e < this.D.length; e++) {
-      const t = this.D[e];
-      t.ne = C;
-      C.D.push(t);
+    if (this.U !== k.U) {
+      for (let e = 0; e < this.U.length; e++) {
+        const t = this.U[e];
+        t.K = k;
+        k.U.push(t);
+      }
+      this.U = k.U;
     }
-    this.D = C.D;
-    for (let e = 0; e < this.B.length; e++) {
-      const t = this.B[e];
-      t.ne = C;
-      C.B.push(t);
+    for (const e of L) {
+      if (!e.K) e.K = k;
     }
-    this.B = C.B;
-    for (const e of N) {
-      if (!e.ne) e.ne = C;
+    if (this.J !== k.J) {
+      for (const e of this.J) k.J.add(e);
+      this.J = k.J;
     }
-    for (const e of this.G) C.G.add(e);
-    this.G = C.G;
   }
 }
 function insertSubs(e, t = false) {
-  const n = e.re || V;
-  const r = e.ie !== undefined;
+  const n = e.Y || F;
+  const r = e.pe !== undefined;
   for (let i = e.O; i !== null; i = i.P) {
-    if (r && i.k.se) {
-      i.k.m |= l;
+    if (r && i.k.he) {
+      i.k.m |= c;
       continue;
     }
     if (t && n) {
@@ -359,13 +450,13 @@ function insertSubs(e, t = false) {
       assignOrMergeLane(i.k, n);
     } else if (t) {
       i.k.m |= f;
-      i.k.re = undefined;
+      i.k.Y = undefined;
     }
     const e = i.k;
-    if (e.oe === g) {
-      if (!e.ue) {
-        e.ue = true;
-        e.fe.enqueue(y, e.le);
+    if (e.D === y) {
+      if (!e.V) {
+        e.V = true;
+        e.B.enqueue(g, e.F);
       }
       continue;
     }
@@ -375,137 +466,105 @@ function insertSubs(e, t = false) {
   }
 }
 function commitPendingNodes() {
-  const e = A.D;
+  const e = N.se;
   for (let t = 0; t < e.length; t++) {
     const n = e[t];
-    if (n.ce !== S) {
-      n.ae = n.ce;
-      n.ce = S;
-      if (n.oe && n.oe !== g) n.ue = true;
+    if (n.Z !== S) {
+      n.$ = n.Z;
+      n.Z = S;
+      if (n.D && n.D !== y) n.V = true;
     }
-    if (n.de & a) {
-      const e = n.Y?.source;
-      if (e && !(e.de & a)) {
-        n.de &= -6;
-        n.Y = null;
-      }
-    } else n.de &= ~p;
-    if (n.H) GlobalQueue.U(n, false, true);
+    if (!(n.ge & a)) n.ge &= ~p;
+    if (n.T) GlobalQueue.ue(n, false, true);
   }
   e.length = 0;
 }
 function finalizePureQueue(e = null, t = false) {
-  let n = !t;
+  const n = !t;
   if (n) commitPendingNodes();
-  if (!t) checkBoundaryChildren(A);
-  if (P.S >= P.A) runHeap(P, GlobalQueue.K);
+  if (!t) checkBoundaryChildren(N);
+  if (P.S >= P.A) runHeap(P, GlobalQueue.oe);
   if (n) {
     commitPendingNodes();
-    const t = e ? e.B : A.B;
-    for (let e = 0; e < t.length; e++) {
-      const n = t[e];
-      n.re = undefined;
-      if (n.ce !== S) {
-        n.ae = n.ce;
-        n.ce = S;
-      }
-      const r = n.pe;
-      n.pe = S;
-      if (r !== S && n.ae !== r) insertSubs(n, true);
-      n.ne = null;
-    }
-    t.length = 0;
-    const n = e ? e.G : A.G;
-    if (GlobalQueue.J && n.size) {
-      for (const e of n) {
-        GlobalQueue.J(e);
-      }
-      n.clear();
-      schedule();
-    }
-    for (const t of N) {
-      const n = e ? t.ne === e : !t.ne;
-      if (!n) continue;
-      if (!t.R) {
-        if (t.q[0].length) runQueue(t.q[0], h);
-        if (t.q[1].length) runQueue(t.q[1], y);
+    resolveOptimisticNodes(e ? e.U : N.U);
+    const t = e ? e.J : N.J;
+    if (GlobalQueue.fe && t.size) {
+      for (const e of t) {
+        GlobalQueue.fe(e);
       }
-      if (t.he.re === t) t.he.re = undefined;
-      t.T.clear();
-      t.q[0].length = 0;
-      t.q[1].length = 0;
-      N.delete(t);
-      W.delete(t.he);
+      t.clear();
+      schedule();
     }
+    cleanupCompletedLanes(e);
   }
 }
 function checkBoundaryChildren(e) {
-  for (const t of e.V) {
+  for (const t of e.ie) {
     t.checkSources?.();
     checkBoundaryChildren(t);
   }
 }
 function trackOptimisticStore(e) {
-  A.G.add(e);
+  N.J.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
-    e[t].ne = C;
+    e[t].K = k;
   }
 }
-const A = new GlobalQueue();
+const N = new GlobalQueue();
 function flush() {
-  while (E) {
-    A.flush();
+  while (C || k) {
+    N.flush();
   }
 }
 function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function transitionComplete(e) {
-  if (e.te) return true;
-  if (e.ee.length) return false;
+  if (e.M) return true;
+  if (e.G.length) return false;
   let t = true;
-  for (let n = 0; n < e.Z.length; n++) {
-    const r = e.Z[n];
-    if (r.de & a && r.Y?.source === r) {
+  for (let n = 0; n < e.X.length; n++) {
+    const r = e.X[n];
+    if (r.ge & a && r.ae?.source === r) {
       t = false;
       break;
     }
   }
-  t && (e.te = true);
+  t && (e.M = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.te && typeof e.te === "object") e = e.te;
+  while (e.M && typeof e.M === "object") e = e.M;
   return e;
 }
 function setActiveTransition(e) {
-  C = e;
+  k = e;
 }
 function runInTransition(e, t) {
-  const n = C;
+  const n = k;
   try {
-    C = currentTransition(e);
+    k = currentTransition(e);
     return t();
   } finally {
-    C = n;
+    k = n;
   }
 }
 const W = new WeakMap();
-const N = new Set();
+const L = new Set();
 function getOrCreateLane(e) {
   let t = W.get(e);
   if (t) {
     return findLane(t);
   }
   const n = e.ye;
-  const r = n?.re ? findLane(n.re) : null;
-  t = { he: e, T: new Set(), q: [[], []], R: null, ne: C, ge: r };
+  const r = n?.Y ? findLane(n.Y) : null;
+  t = { te: e, H: new Set(), q: [[], []], R: null, K: k, Se: r };
   W.set(e, t);
-  N.add(t);
-  e.Se = false;
+  L.add(t);
+  e.we = false;
   return t;
 }
 function findLane(e) {
@@ -517,88 +576,182 @@ function mergeLanes(e, t) {
   t = findLane(t);
   if (e === t) return e;
   t.R = e;
-  for (const n of t.T) e.T.add(n);
+  for (const n of t.H) e.H.add(n);
   e.q[0].push(...t.q[0]);
   e.q[1].push(...t.q[1]);
   return e;
 }
 function resolveLane(e) {
-  const t = e.re;
+  const t = e.Y;
   if (!t) return undefined;
   const n = findLane(t);
-  if (N.has(n)) return n;
-  e.re = undefined;
+  if (L.has(n)) return n;
+  e.Y = undefined;
   return undefined;
 }
+function resolveTransition(e) {
+  return resolveLane(e)?.K ?? e.K;
+}
 function hasActiveOverride(e) {
-  return !!(e.pe !== undefined && e.pe !== S);
+  return !!(e.ee !== undefined && e.ee !== S);
 }
 function assignOrMergeLane(e, t) {
   const n = findLane(t);
-  const r = e.re;
+  const r = e.Y;
   if (r) {
     if (r.R) {
-      e.re = t;
+      e.Y = t;
       return;
     }
     const i = findLane(r);
-    if (N.has(i)) {
+    if (L.has(i)) {
       if (i !== n && !hasActiveOverride(e)) {
-        if (n.ge && findLane(n.ge) === i) {
-          e.re = t;
-        } else if (i.ge && findLane(i.ge) === n);
+        if (n.Se && findLane(n.Se) === i) {
+          e.Y = t;
+        } else if (i.Se && findLane(i.Se) === n);
         else mergeLanes(n, i);
       }
       return;
     }
   }
-  e.re = t;
+  e.Y = t;
+}
+function addPendingSource(e, t) {
+  if (e.me === t || e.be?.has(t)) return false;
+  if (!e.me) {
+    e.me = t;
+    return true;
+  }
+  if (!e.be) {
+    e.be = new Set([e.me, t]);
+  } else {
+    e.be.add(t);
+  }
+  e.me = undefined;
+  return true;
+}
+function removePendingSource(e, t) {
+  if (e.me) {
+    if (e.me !== t) return false;
+    e.me = undefined;
+    return true;
+  }
+  if (!e.be?.delete(t)) return false;
+  if (e.be.size === 1) {
+    e.me = e.be.values().next().value;
+    e.be = undefined;
+  } else if (e.be.size === 0) {
+    e.be = undefined;
+  }
+  return true;
+}
+function clearPendingSources(e) {
+  e.me = undefined;
+  e.be?.clear();
+  e.be = undefined;
+}
+function setPendingError(e, t, n) {
+  if (!t) {
+    e.ae = null;
+    return;
+  }
+  if (n instanceof NotReadyError && n.source === t) {
+    e.ae = n;
+    return;
+  }
+  const r = e.ae;
+  if (!(r instanceof NotReadyError) || r.source !== t) {
+    e.ae = new NotReadyError(t);
+  }
+}
+function forEachDependent(e, t) {
+  for (let n = e.O; n !== null; n = n.P) t(n.k);
+  for (let n = e.C; n !== null; n = n.j) {
+    for (let e = n.O; e !== null; e = e.P) t(e.k);
+  }
+}
+function settlePendingSource(e) {
+  let t = false;
+  const n = new Set();
+  const settle = r => {
+    if (n.has(r) || !removePendingSource(r, e)) return;
+    n.add(r);
+    r.de = E;
+    const i = r.me ?? r.be?.values().next().value;
+    if (i) {
+      setPendingError(r, i);
+      updatePendingSignal(r);
+    } else {
+      r.ge &= ~a;
+      setPendingError(r);
+      updatePendingSignal(r);
+      if (r._e) {
+        if (r.D === y) {
+          const e = r;
+          if (!e.V) {
+            e.V = true;
+            e.B.enqueue(g, e.F);
+          }
+        } else {
+          const e = r.m & o ? v : P;
+          if (e.A > r.o) e.A = r.o;
+          insertIntoHeap(r, e);
+        }
+        t = true;
+      }
+      r._e = false;
+    }
+    forEachDependent(r, settle);
+  };
+  forEachDependent(e, settle);
+  if (t) schedule();
 }
 function handleAsync(e, t, r) {
   const i = typeof t === "object" && t !== null;
   const s = i && untrack(() => t[Symbol.asyncIterator]);
   const o = !s && i && untrack(() => typeof t.then === "function");
   if (!o && !s) {
-    e.we = null;
+    e.Oe = null;
     return t;
   }
-  e.we = t;
+  e.Oe = t;
   let u;
   const handleError = n => {
-    if (e.we !== t) return;
-    A.initTransition(e.ne);
+    if (e.Oe !== t) return;
+    N.initTransition(resolveTransition(e));
     notifyStatus(e, n instanceof NotReadyError ? a : d, n);
-    e.$ = k;
+    e.de = E;
   };
   const asyncWrite = (i, s) => {
-    if (e.we !== t) return;
+    if (e.Oe !== t) return;
     if (e.m & (n | f)) return;
-    A.initTransition(e.ne);
+    N.initTransition(resolveTransition(e));
     clearStatus(e);
     const o = resolveLane(e);
-    if (o) o.T.delete(e);
+    if (o) o.H.delete(e);
     if (r) r(i);
-    else if (e.pe !== undefined) {
-      if (e.pe !== undefined && e.pe !== S) e.ce = i;
+    else if (e.ee !== undefined) {
+      if (e.ee !== undefined && e.ee !== S) e.Z = i;
       else {
-        e.ae = i;
+        e.$ = i;
         insertSubs(e);
       }
-      e.$ = k;
+      e.de = E;
     } else if (o) {
-      const t = e.ae;
-      const n = e.me;
+      const t = e.$;
+      const n = e.xe;
       if (!n || !n(i, t)) {
-        e.ae = i;
-        e.$ = k;
-        if (e.be) {
-          setSignal(e.be, i);
+        e.$ = i;
+        e.de = E;
+        if (e.Pe) {
+          setSignal(e.Pe, i);
         }
         insertSubs(e, true);
       }
     } else {
       setSignal(e, () => i);
     }
+    settlePendingSource(e);
     schedule();
     flush();
     s?.();
@@ -619,8 +772,8 @@ function handleAsync(e, t, r) {
     );
     r = false;
     if (!n) {
-      A.initTransition(e.ne);
-      throw new NotReadyError(M);
+      N.initTransition(resolveTransition(e));
+      throw new NotReadyError(B);
     }
   }
   if (s) {
@@ -655,126 +808,92 @@ function handleAsync(e, t, r) {
     };
     const i = iterate();
     if (!r && !i) {
-      A.initTransition(e.ne);
-      throw new NotReadyError(M);
+      N.initTransition(resolveTransition(e));
+      throw new NotReadyError(B);
     }
   }
   return u;
 }
-function clearStatus(e) {
-  e.de = e.de & p;
-  e.Y = null;
+function clearStatus(e, t = false) {
+  clearPendingSources(e);
+  removeTransitionBlocker(e);
+  e._e = false;
+  e.ge = t ? 0 : e.ge & p;
+  setPendingError(e);
   updatePendingSignal(e);
-  e._e?.();
+  e.ve?.();
 }
 function notifyStatus(e, t, n, r, i) {
   if (t === d && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
-  const s = n instanceof NotReadyError && n.source === e;
-  const o = t === a && e.pe !== undefined && !s;
-  const u = o && hasActiveOverride(e);
+  const s = t === a && n instanceof NotReadyError ? n.source : undefined;
+  const o = s === e;
+  const u = t === a && e.ee !== undefined && !o;
+  const f = u && hasActiveOverride(e);
   if (!r) {
-    e.de = t | (t !== d ? e.de & p : 0);
-    e.Y = n;
+    if (t === a && s) {
+      addPendingSource(e, s);
+      e.ge = a | (e.ge & p);
+      setPendingError(e, e.me ?? e.be?.values().next().value, n);
+      if (s === e) addTransitionBlocker(e);
+    } else {
+      clearPendingSources(e);
+      removeTransitionBlocker(e);
+      e.ge = t | (t !== d ? e.ge & p : 0);
+      e.ae = n;
+    }
     updatePendingSignal(e);
   }
   if (i && !r) {
     assignOrMergeLane(e, i);
   }
-  if (u && C && n instanceof NotReadyError) {
-    const e = n.source;
-    if (!C.Z.includes(e)) {
-      C.Z.push(e);
-    }
-  }
-  const f = r || u;
-  const l = r || o ? undefined : i;
-  if (e._e) {
-    if (f) {
-      e._e(t, n);
+  const c = r || f;
+  const l = r || u ? undefined : i;
+  if (e.ve) {
+    if (c) {
+      e.ve(t, n);
     } else {
-      e._e();
+      e.ve();
     }
     return;
   }
-  for (let r = e.O; r !== null; r = r.P) {
-    r.k.$ = k;
-    if (r.k.Y !== n) {
-      !r.k.ne && A.D.push(r.k);
-      notifyStatus(r.k, t, n, f, l);
-    }
-  }
-  for (let r = e.C; r !== null; r = r.j) {
-    for (let e = r.O; e !== null; e = e.P) {
-      e.k.$ = k;
-      if (e.k.Y !== n) {
-        !e.k.ne && A.D.push(e.k);
-        notifyStatus(e.k, t, n, f, l);
-      }
-    }
-  }
-}
-function unlinkSubs(e) {
-  const t = e.L;
-  const n = e.N;
-  const r = e.P;
-  const i = e.Oe;
-  if (r !== null) r.Oe = i;
-  else t.xe = i;
-  if (i !== null) i.P = r;
-  else {
-    t.O = r;
-    if (r === null) {
-      t.Pe?.();
-      t.H && !t.ve && !(t.m & o) && unobserved(t);
-    }
-  }
-  return n;
-}
-function unobserved(e) {
-  deleteFromHeap(e, e.m & o ? v : P);
-  let t = e.W;
-  while (t !== null) {
-    t = unlinkSubs(t);
-  }
-  e.W = null;
-  disposeChildren(e, true);
-}
-function link(e, t) {
-  const n = t.ke;
-  if (n !== null && n.L === e) return;
-  let i = null;
-  const s = t.m & r;
-  if (s) {
-    i = n !== null ? n.N : t.W;
-    if (i !== null && i.L === e) {
-      t.ke = i;
-      return;
+  forEachDependent(e, e => {
+    e.de = E;
+    if (
+      (t === a && s && e.me !== s && !e.be?.has(s)) ||
+      (t !== a && (e.ae !== n || e.me || e.be))
+    ) {
+      !e.K && N.se.push(e);
+      notifyStatus(e, t, n, c, l);
     }
-  }
-  const o = e.xe;
-  if (o !== null && o.k === t && (!s || isValidLink(o, t))) return;
-  const u = (t.ke = e.xe = { L: e, k: t, N: i, Oe: o, P: null });
-  if (n !== null) n.N = u;
-  else t.W = u;
-  if (o !== null) o.P = u;
-  else e.O = u;
+  });
 }
-function isValidLink(e, t) {
-  const n = t.ke;
-  if (n !== null) {
-    let r = t.W;
-    do {
-      if (r === e) return true;
-      if (r === n) break;
-      r = r.N;
-    } while (r !== null);
+let I = null;
+function enableExternalSource(e) {
+  const { factory: t, untrack: n = e => e() } = e;
+  if (I) {
+    const { factory: e, untrack: r } = I;
+    I = {
+      factory: (n, r) => {
+        const i = e(n, r);
+        const s = t(e => i.track(e), r);
+        return {
+          track: e => s.track(e),
+          dispose() {
+            s.dispose();
+            i.dispose();
+          }
+        };
+      },
+      untrack: e => r(() => n(e))
+    };
+  } else {
+    I = { factory: t, untrack: n };
   }
-  return false;
 }
-const L = {};
+const T = {};
 function markDisposal(e) {
-  let t = e.Ce;
+  let t = e.Ee;
   while (t) {
     t.m |= o;
     if (t.m & i) {
@@ -782,33 +901,33 @@ function markDisposal(e) {
       insertIntoHeap(t, v);
     }
     markDisposal(t);
-    t = t.Ee;
+    t = t.ke;
   }
 }
 function dispose(e) {
-  let t = e.W || null;
+  let t = e.N || null;
   do {
     t = unlinkSubs(t);
   } while (t !== null);
-  e.W = null;
-  e.ke = null;
+  e.N = null;
+  e.Ce = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
   if (e.m & u) return;
   if (t) e.m = u;
-  let r = n ? e.je : e.Ce;
+  let r = n ? e.je : e.Ee;
   while (r) {
-    const e = r.Ee;
-    if (r.W) {
+    const e = r.ke;
+    if (r.N) {
       const e = r;
       deleteFromHeap(e, e.m & o ? v : P);
-      let t = e.W;
+      let t = e.N;
       do {
         t = unlinkSubs(t);
       } while (t !== null);
-      e.W = null;
-      e.ke = null;
+      e.N = null;
+      e.Ce = null;
     }
     disposeChildren(r, true);
     r = e;
@@ -816,13 +935,13 @@ function disposeChildren(e, t = false, n) {
   if (n) {
     e.je = null;
   } else {
-    e.Ce = null;
+    e.Ee = null;
     e.Ae = 0;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.We : e.Ne;
+  let n = t ? e.Ne : e.We;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -832,7 +951,7 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.We = null) : (e.Ne = null);
+  t ? (e.Ne = null) : (e.We = null);
 }
 function childId(e, t) {
   let n = e;
@@ -852,37 +971,39 @@ function formatId(e, t) {
   return e + (r ? String.fromCharCode(64 + r) : "") + n;
 }
 function getObserver() {
-  if (T || F) return L;
-  return H ? M : null;
+  if (q || V) return T;
+  return R ? B : null;
 }
 function getOwner() {
-  return M;
+  return B;
 }
 function onCleanup(e) {
-  if (!M) return e;
-  if (!M.Ne) M.Ne = e;
-  else if (Array.isArray(M.Ne)) M.Ne.push(e);
-  else M.Ne = [M.Ne, e];
+  if (!B) {
+    return e;
+  }
+  if (!B.We) B.We = e;
+  else if (Array.isArray(B.We)) B.We.push(e);
+  else B.We = [B.We, e];
   return e;
 }
 function isDisposed(e) {
   return !!(e.m & (u | o));
 }
 function createOwner(e) {
-  const t = M;
+  const t = B;
   const n = e?.transparent ?? false;
   const r = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
     Le: n || undefined,
     t: true,
     u: t?.t ? t.u : t,
-    Ce: null,
     Ee: null,
-    Ne: null,
-    fe: t?.fe ?? A,
+    ke: null,
+    We: null,
+    B: t?.B ?? N,
     Ie: t?.Ie || _,
     Ae: 0,
-    We: null,
+    Ne: null,
     je: null,
     i: t,
     dispose(e = true) {
@@ -890,12 +1011,12 @@ function createOwner(e) {
     }
   };
   if (t) {
-    const e = t.Ce;
+    const e = t.Ee;
     if (e === null) {
-      t.Ce = r;
+      t.Ee = r;
     } else {
-      r.Ee = e;
-      t.Ce = r;
+      r.ke = e;
+      t.Ee = r;
     }
   }
   return r;
@@ -904,125 +1025,76 @@ function createRoot(e, t) {
   const n = createOwner(t);
   return runWithOwner(n, () => e(n.dispose));
 }
-function effect(e, t, n, r, i) {
-  let s = false;
-  const o = computed(i?.render ? t => staleValues(() => e(t)) : e, r, {
-    ...i,
-    equals: () => {
-      o.ue = !o.Y;
-      if (s) o.fe.enqueue(o.oe, runEffect.bind(o));
-      return false;
-    },
-    lazy: true
-  });
-  o.He = r;
-  o.Re = t;
-  o.Qe = n;
-  o.Te = undefined;
-  o.oe = i?.render ? h : y;
-  o._e = (e, t) => {
-    const n = e !== undefined ? e : o.de;
-    const r = t !== undefined ? t : o.Y;
-    if (n & d) {
-      let e = r;
-      o.fe.notify(o, a, 0);
-      if (o.oe === y) {
-        try {
-          return o.Qe
-            ? o.Qe(e, () => {
-                o.Te?.();
-                o.Te = undefined;
-              })
-            : console.error(e);
-        } catch (t) {
-          e = t;
-        }
-      }
-      if (!o.fe.notify(o, d, d)) throw e;
-    } else if (o.oe === h) {
-      o.fe.notify(o, a | d, n, r);
+function unlinkSubs(e) {
+  const t = e.L;
+  const n = e.W;
+  const r = e.P;
+  const i = e.Te;
+  if (r !== null) r.Te = i;
+  else t.Re = i;
+  if (i !== null) i.P = r;
+  else {
+    t.O = r;
+    if (r === null) {
+      t.He?.();
+      t.T && !t.Qe && !(t.m & o) && unobserved(t);
     }
-  };
-  recompute(o, true);
-  !i?.defer && (o.oe === y ? o.fe.enqueue(o.oe, runEffect.bind(o)) : runEffect.call(o));
-  s = true;
-  onCleanup(() => o.Te?.());
+  }
+  return n;
 }
-function runEffect() {
-  if (!this.ue || this.m & u) return;
-  this.Te?.();
-  this.Te = undefined;
-  try {
-    this.Te = this.Re(this.ae, this.He);
-  } catch (e) {
-    this.Y = new StatusError(this, e);
-    this.de |= d;
-    if (!this.fe.notify(this, d, d)) throw e;
-  } finally {
-    this.He = this.ae;
-    this.ue = false;
+function unobserved(e) {
+  deleteFromHeap(e, e.m & o ? v : P);
+  let t = e.N;
+  while (t !== null) {
+    t = unlinkSubs(t);
   }
+  e.N = null;
+  disposeChildren(e, true);
 }
-function trackedEffect(e, t) {
-  const run = () => {
-    if (!n.ue || n.m & u) return;
-    n.ue = false;
-    recompute(n);
-  };
-  const n = computed(
-    () => {
-      try {
-        n.Te?.();
-        n.Te = undefined;
-        n.Te = staleValues(e) || undefined;
-      } finally {
-      }
-    },
-    undefined,
-    { ...t, lazy: true }
-  );
-  n.Te = undefined;
-  n.ue = true;
-  n.oe = g;
-  n.le = run;
-  n.fe.enqueue(y, run);
-  onCleanup(() => n.Te?.());
+function link(e, t) {
+  const n = t.Ce;
+  if (n !== null && n.L === e) return;
+  let i = null;
+  const s = t.m & r;
+  if (s) {
+    i = n !== null ? n.W : t.N;
+    if (i !== null && i.L === e) {
+      t.Ce = i;
+      return;
+    }
+  }
+  const o = e.Re;
+  if (o !== null && o.k === t && (!s || isValidLink(o, t))) return;
+  const u = (t.Ce = e.Re = { L: e, k: t, W: i, Te: o, P: null });
+  if (n !== null) n.W = u;
+  else t.N = u;
+  if (o !== null) o.P = u;
+  else e.O = u;
 }
-let I = null;
-function enableExternalSource(e) {
-  const { factory: t, untrack: n = e => e() } = e;
-  if (I) {
-    const { factory: e, untrack: r } = I;
-    I = {
-      factory: (n, r) => {
-        const i = e(n, r);
-        const s = t(e => i.track(e), r);
-        return {
-          track: e => s.track(e),
-          dispose() {
-            s.dispose();
-            i.dispose();
-          }
-        };
-      },
-      untrack: e => r(() => n(e))
-    };
-  } else {
-    I = { factory: t, untrack: n };
+function isValidLink(e, t) {
+  const n = t.Ce;
+  if (n !== null) {
+    let r = t.N;
+    do {
+      if (r === e) return true;
+      if (r === n) break;
+      r = r.W;
+    } while (r !== null);
   }
+  return false;
 }
-GlobalQueue.K = recompute;
-GlobalQueue.U = disposeChildren;
-let H = false;
+GlobalQueue.oe = recompute;
+GlobalQueue.ue = disposeChildren;
 let R = false;
+let H = false;
 let Q = false;
-let T = false;
 let q = false;
-let F = false;
-let M = null;
-let V = null;
 let D = false;
+let V = false;
 let B = null;
+let F = null;
+let M = false;
+let G = null;
 function ownerInSnapshotScope(e) {
   while (e) {
     if (e.qe) return true;
@@ -1031,8 +1103,8 @@ function ownerInSnapshotScope(e) {
   return false;
 }
 function setSnapshotCapture(e) {
-  D = e;
-  if (e && !B) B = new Set();
+  M = e;
+  if (e && !G) G = new Set();
 }
 function markSnapshotScope(e) {
   e.qe = true;
@@ -1043,138 +1115,139 @@ function releaseSnapshotScope(e) {
   schedule();
 }
 function releaseSubtree(e) {
-  let t = e.Ce;
+  let t = e.Ee;
   while (t) {
     if (t.qe) {
-      t = t.Ee;
+      t = t.ke;
       continue;
     }
-    if (t.H) {
+    if (t.T) {
       const e = t;
-      e.se = false;
-      if (e.m & l) {
-        e.m &= ~l;
+      e.he = false;
+      if (e.m & c) {
+        e.m &= ~c;
         e.m |= n;
         if (P.A > e.o) P.A = e.o;
         insertIntoHeap(e, P);
       }
     }
     releaseSubtree(t);
-    t = t.Ee;
+    t = t.ke;
   }
 }
 function clearSnapshots() {
-  if (B) {
-    for (const e of B) {
-      delete e.ie;
+  if (G) {
+    for (const e of G) {
+      delete e.pe;
       delete e[m];
     }
-    B = null;
+    G = null;
   }
-  D = false;
+  M = false;
 }
 function recompute(t, n = false) {
-  const i = t.oe;
+  const i = t.D;
   if (!n) {
-    if (t.ne && (!i || C) && C !== t.ne) A.initTransition(t.ne);
+    if (t.K && (!i || k) && k !== t.K) N.initTransition(t.K);
     deleteFromHeap(t, t.m & o ? v : P);
-    if (t.ne || i === g) disposeChildren(t);
+    if (t.K || i === y) disposeChildren(t);
     else {
       markDisposal(t);
-      t.We = t.Ne;
-      t.je = t.Ce;
-      t.Ne = null;
-      t.Ce = null;
+      t.Ne = t.We;
+      t.je = t.Ee;
+      t.We = null;
+      t.Ee = null;
       t.Ae = 0;
     }
   }
   const s = !!(t.m & f);
-  const u = t.pe !== undefined && t.pe !== S;
-  const c = !!(t.de & a);
-  const p = M;
-  M = t;
-  t.ke = null;
+  const u = t.ee !== undefined && t.ee !== S;
+  const l = !!(t.ge & a);
+  const p = B;
+  B = t;
+  t.Ce = null;
   t.m = r;
-  t.$ = k;
-  let h = t.ce === S ? t.ae : t.ce;
-  let y = t.o;
-  let w = H;
-  let m = V;
-  H = true;
+  t.de = E;
+  let h = t.Z === S ? t.$ : t.Z;
+  let g = t.o;
+  let w = R;
+  let m = F;
+  R = true;
   if (s) {
     const e = resolveLane(t);
-    if (e) V = e;
+    if (e) F = e;
   }
   try {
-    h = handleAsync(t, t.H(h));
-    clearStatus(t);
+    h = handleAsync(t, t.T(h));
+    clearStatus(t, n);
     const e = resolveLane(t);
     if (e) {
-      e.T.delete(t);
-      updatePendingSignal(e.he);
+      e.H.delete(t);
+      updatePendingSignal(e.te);
     }
   } catch (e) {
-    if (e instanceof NotReadyError && V) {
-      const e = findLane(V);
-      if (e.he !== t) {
-        e.T.add(t);
-        t.re = e;
-        updatePendingSignal(e.he);
+    if (e instanceof NotReadyError && F) {
+      const e = findLane(F);
+      if (e.te !== t) {
+        e.H.add(t);
+        t.Y = e;
+        updatePendingSignal(e.te);
       }
     }
+    if (e instanceof NotReadyError) t._e = true;
     notifyStatus(
       t,
       e instanceof NotReadyError ? a : d,
       e,
       undefined,
-      e instanceof NotReadyError ? t.re : undefined
+      e instanceof NotReadyError ? t.Y : undefined
     );
   } finally {
-    H = w;
-    t.m = e | (n ? t.m & l : 0);
-    M = p;
+    R = w;
+    t.m = e | (n ? t.m & c : 0);
+    B = p;
   }
-  if (!t.Y) {
-    const e = t.ke;
-    let r = e !== null ? e.N : t.W;
+  if (!t.ae) {
+    const e = t.Ce;
+    let r = e !== null ? e.W : t.N;
     if (r !== null) {
       do {
         r = unlinkSubs(r);
       } while (r !== null);
-      if (e !== null) e.N = null;
-      else t.W = null;
-    }
-    const f = u ? t.pe : t.ce === S ? t.ae : t.ce;
-    const l = !t.me || !t.me(f, h);
-    if (l) {
-      const e = u ? t.pe : undefined;
-      if (n || (i && C !== t.ne) || s) {
-        t.ae = h;
+      if (e !== null) e.W = null;
+      else t.N = null;
+    }
+    const f = u ? t.ee : t.Z === S ? t.$ : t.Z;
+    const c = !t.xe || !t.xe(f, h);
+    if (c) {
+      const e = u ? t.ee : undefined;
+      if (n || (i && k !== t.K) || s) {
+        t.$ = h;
         if (u && s) {
-          t.pe = h;
-          t.ce = h;
+          t.ee = h;
+          t.Z = h;
         }
-      } else t.ce = h;
-      if (u && !s && c && !t.Se) t.pe = h;
-      if (!u || s || t.pe !== e) insertSubs(t, s || u);
+      } else t.Z = h;
+      if (u && !s && l && !t.we) t.ee = h;
+      if (!u || s || t.ee !== e) insertSubs(t, s || u);
     } else if (u) {
-      t.ce = h;
-    } else if (t.o != y) {
+      t.Z = h;
+    } else if (t.o != g) {
       for (let e = t.O; e !== null; e = e.P) {
         insertIntoHeapHeight(e.k, e.k.m & o ? v : P);
       }
     }
   }
-  V = m;
-  (!n || t.de & a) && !t.ne && !(C && u) && A.D.push(t);
-  t.ne && i && C !== t.ne && runInTransition(t.ne, () => recompute(t));
+  F = m;
+  (!n || t.ge & a) && !t.K && !(k && u) && N.se.push(t);
+  t.K && i && k !== t.K && runInTransition(t.K, () => recompute(t));
 }
 function updateIfNecessary(r) {
   if (r.m & t) {
-    for (let e = r.W; e; e = e.N) {
+    for (let e = r.N; e; e = e.W) {
       const t = e.L;
       const i = t.I || t;
-      if (i.H) {
+      if (i.T) {
         updateIfNecessary(i);
       }
       if (r.m & n) {
@@ -1182,170 +1255,169 @@ function updateIfNecessary(r) {
       }
     }
   }
-  if (r.m & (n | f) || (r.Y && r.$ < k && !r.we)) {
+  if (r.m & (n | f) || (r.ae && r.de < E && !r.Oe)) {
     recompute(r);
   }
-  r.m = e | (r.m & l);
+  r.m = e | (r.m & c);
 }
 function computed(t, n, r) {
   const i = r?.transparent ?? false;
   const s = {
-    id: r?.id ?? (i ? M?.id : M?.id != null ? getNextChildId(M) : undefined),
+    id: r?.id ?? (i ? B?.id : B?.id != null ? getNextChildId(B) : undefined),
     Le: i || undefined,
-    me: r?.equals != null ? r.equals : isEqual,
-    Fe: !!r?.pureWrite,
-    Pe: r?.unobserved,
-    Ne: null,
-    fe: M?.fe ?? A,
-    Ie: M?.Ie ?? _,
+    xe: r?.equals != null ? r.equals : isEqual,
+    le: !!r?.pureWrite,
+    He: r?.unobserved,
+    We: null,
+    B: B?.B ?? N,
+    Ie: B?.Ie ?? _,
     Ae: 0,
-    H: t,
-    ae: n,
+    T: t,
+    $: n,
     o: 0,
     C: null,
     h: undefined,
     p: null,
-    W: null,
-    ke: null,
+    N: null,
+    Ce: null,
     O: null,
-    xe: null,
-    i: M,
+    Re: null,
+    i: B,
+    ke: null,
     Ee: null,
-    Ce: null,
-    m: r?.lazy ? c : e,
-    de: p,
-    $: k,
-    ce: S,
-    We: null,
+    m: r?.lazy ? l : e,
+    ge: p,
+    de: E,
+    Z: S,
+    Ne: null,
     je: null,
-    we: null,
-    ne: null
+    Oe: null,
+    K: null
   };
   s.p = s;
-  const o = M?.t ? M.u : M;
-  if (M) {
-    const e = M.Ce;
+  const o = B?.t ? B.u : B;
+  if (B) {
+    const e = B.Ee;
     if (e === null) {
-      M.Ce = s;
+      B.Ee = s;
     } else {
-      s.Ee = e;
-      M.Ce = s;
+      s.ke = e;
+      B.Ee = s;
     }
   }
   if (o) s.o = o.o + 1;
-  if (D && ownerInSnapshotScope(M)) s.se = true;
+  if (M && ownerInSnapshotScope(B)) s.he = true;
   if (I) {
     const e = signal(undefined, { equals: false, pureWrite: true });
-    const t = I.factory(s.H, () => {
+    const t = I.factory(s.T, () => {
       setSignal(e, undefined);
     });
     onCleanup(() => t.dispose());
-    s.H = n => {
+    s.T = n => {
       read(e);
       return t.track(n);
     };
   }
   !r?.lazy && recompute(s, true);
-  if (D && !r?.lazy) {
-    if (!(s.de & a)) {
-      s.ie = s.ae === undefined ? w : s.ae;
-      B.add(s);
+  if (M && !r?.lazy) {
+    if (!(s.ge & a)) {
+      s.pe = s.$ === undefined ? w : s.$;
+      G.add(s);
     }
   }
   return s;
 }
 function signal(e, t, n = null) {
   const r = {
-    me: t?.equals != null ? t.equals : isEqual,
-    Fe: !!t?.pureWrite,
-    Pe: t?.unobserved,
-    ae: e,
+    xe: t?.equals != null ? t.equals : isEqual,
+    le: !!t?.pureWrite,
+    De: !!t?.De,
+    He: t?.unobserved,
+    $: e,
     O: null,
-    xe: null,
-    $: k,
+    Re: null,
+    de: E,
     I: n,
     j: n?.C || null,
-    ce: S
+    Z: S
   };
   n && (n.C = r);
-  if (D && !r.Fe && !((n?.de ?? 0) & a)) {
-    r.ie = e === undefined ? w : e;
-    B.add(r);
+  if (M && !r.De && !((n?.ge ?? 0) & a)) {
+    r.pe = e === undefined ? w : e;
+    G.add(r);
   }
   return r;
 }
 function optimisticSignal(e, t) {
   const n = signal(e, t);
-  n.pe = S;
+  n.ee = S;
   return n;
 }
 function optimisticComputed(e, t, n) {
   const r = computed(e, t, n);
-  r.pe = S;
+  r.ee = S;
   return r;
 }
 function isEqual(e, t) {
   return e === t;
 }
 function untrack(e, t) {
-  if (!I && !H && true) return e();
-  const n = H;
-  H = false;
+  if (!I && !R && true) return e();
+  const n = R;
+  R = false;
   try {
     if (I) return I.untrack(e);
     return e();
   } finally {
-    H = n;
+    R = n;
   }
 }
 function read(e) {
-  if (F) {
+  if (V) {
     const t = getLatestValueComputed(e);
-    const n = F;
-    F = false;
-    const r = e.pe !== undefined && e.pe !== S ? e.pe : e.ae;
+    const n = V;
+    V = false;
+    const r = e.ee !== undefined && e.ee !== S ? e.ee : e.$;
     let i;
     try {
       i = read(t);
     } catch (e) {
-      if (!M && e instanceof NotReadyError) return r;
+      if (!B && e instanceof NotReadyError) return r;
       throw e;
     } finally {
-      F = n;
+      V = n;
     }
-    if (t.de & a) return r;
-    if (R && V && t.re) {
-      const e = findLane(t.re);
-      const n = findLane(V);
-      if (e !== n && e.T.size > 0) {
+    if (t.ge & a) return r;
+    if (H && F && t.Y) {
+      const e = findLane(t.Y);
+      const n = findLane(F);
+      if (e !== n && e.H.size > 0) {
         return r;
       }
     }
     return i;
   }
-  if (T) {
-    const t = e.I || e;
-    const n = getPendingSignal(t);
-    const r = T;
-    T = false;
-    if (read(n)) {
-      q = true;
-    }
-    T = r;
-    return e.ae;
+  if (q) {
+    const t = e.I;
+    const n = q;
+    q = false;
+    if (read(getPendingSignal(e))) D = true;
+    if (t && read(getPendingSignal(t))) D = true;
+    q = n;
+    return e.$;
   }
-  let t = M;
+  let t = B;
   if (t?.t) t = t.u;
-  if (Q && e.H) recompute(e);
-  if (e.m & c) {
-    e.m &= ~c;
+  if (Q && e.T) recompute(e);
+  if (e.m & l) {
+    e.m &= ~l;
     recompute(e, true);
   }
   const n = e.I || e;
-  if (t && H) {
-    if (e.H && e.m & u) recompute(e);
+  if (t && R) {
+    if (e.T && e.m & u) recompute(e);
     link(e, t);
-    if (n.H) {
+    if (n.T) {
       const r = e.m & o;
       if (n.o >= (r ? v.A : P.A)) {
         markNode(t);
@@ -1358,186 +1430,191 @@ function read(e) {
       }
     }
   }
-  if (n.de & a) {
-    const r = n.Y?.source;
-    if (r && !(r.de & a)) clearStatus(n);
-    else if (t && !(R && n.ne && C !== n.ne)) {
-      if (V) {
-        const r = n.re;
-        const i = findLane(V);
+  if (n.ge & a) {
+    if (t && !(H && n.K && k !== n.K)) {
+      if (F) {
+        const r = n.Y;
+        const i = findLane(F);
         if (r && findLane(r) === i && !hasActiveOverride(n)) {
-          if (!H && e !== t) link(e, t);
-          throw n.Y;
+          if (!R && e !== t) link(e, t);
+          throw n.ae;
         }
       } else {
-        if (!H && e !== t) link(e, t);
-        throw n.Y;
+        if (!R && e !== t) link(e, t);
+        throw n.ae;
       }
-    } else if (!t && n.de & p) {
-      throw n.Y;
+    } else if (!t && n.ge & p) {
+      throw n.ae;
     }
   }
-  if (e.H && e.de & d) {
-    if (e.$ < k) {
+  if (e.T && e.ge & d) {
+    if (e.de < E) {
       recompute(e, true);
       return read(e);
-    } else throw e.Y;
+    } else throw e.ae;
   }
-  if (D && t && t.se) {
-    const n = e.ie;
+  if (M && t && t.he) {
+    const n = e.pe;
     if (n !== undefined) {
       const r = n === w ? undefined : n;
-      const i = e.ce !== S ? e.ce : e.ae;
-      if (i !== r) t.m |= l;
+      const i = e.Z !== S ? e.Z : e.$;
+      if (i !== r) t.m |= c;
       return r;
     }
   }
-  if (e.pe !== undefined && e.pe !== S) return e.pe;
+  if (e.ee !== undefined && e.ee !== S) {
+    if (t && H && shouldReadStashedOptimisticValue(e)) return e.$;
+    return e.ee;
+  }
   return !t ||
-    (V !== null && (e.pe !== undefined || e.re || (n === e && R) || !!(n.de & a))) ||
-    e.ce === S ||
-    (R && e.ne && C !== e.ne)
-    ? e.ae
-    : e.ce;
+    (F !== null && (e.ee !== undefined || e.Y || (n === e && H) || !!(n.ge & a))) ||
+    e.Z === S ||
+    (H && e.K && k !== e.K)
+    ? e.$
+    : e.Z;
 }
 function setSignal(e, t) {
-  if (e.ne && C !== e.ne) A.initTransition(e.ne);
-  const n = e.pe !== undefined && !j;
-  const r = e.pe !== undefined && e.pe !== S;
-  const i = n ? (r ? e.pe : e.ae) : e.ce === S ? e.ae : e.ce;
+  if (e.K && k !== e.K) N.initTransition(e.K);
+  const n = e.ee !== undefined && !j;
+  const r = e.ee !== undefined && e.ee !== S;
+  const i = n ? (r ? e.ee : e.$) : e.Z === S ? e.$ : e.Z;
   if (typeof t === "function") t = t(i);
-  const s = !e.me || !e.me(i, t) || !!(e.de & p);
+  const s = !e.xe || !e.xe(i, t) || !!(e.ge & p);
   if (!s) {
-    if (n && r && e.H) {
+    if (n && r && e.T) {
       insertSubs(e, true);
       schedule();
     }
     return t;
   }
   if (n) {
-    const n = e.pe === S;
-    if (!n && e.ne) A.initTransition(e.ne);
+    const n = e.ee === S;
+    if (!n) N.initTransition(resolveTransition(e));
     if (n) {
-      e.ce = e.ae;
-      A.B.push(e);
+      e.Z = e.$;
+      N.U.push(e);
     }
-    e.Se = true;
+    e.we = true;
     const r = getOrCreateLane(e);
-    e.re = r;
-    e.pe = t;
+    e.Y = r;
+    e.ee = t;
   } else {
-    if (e.ce === S) A.D.push(e);
-    e.ce = t;
+    if (e.Z === S) N.se.push(e);
+    e.Z = t;
   }
   updatePendingSignal(e);
-  if (e.be) {
-    setSignal(e.be, t);
+  if (e.Pe) {
+    setSignal(e.Pe, t);
   }
-  e.$ = k;
+  e.de = E;
   insertSubs(e, n);
   schedule();
   return t;
 }
 function runWithOwner(e, t) {
-  const n = M;
-  const r = H;
-  M = e;
-  H = false;
+  const n = B;
+  const r = R;
+  B = e;
+  R = false;
   try {
     return t();
   } finally {
-    M = n;
-    H = r;
+    B = n;
+    R = r;
   }
 }
 function getPendingSignal(e) {
-  if (!e.Me) {
-    e.Me = optimisticSignal(false, { pureWrite: true });
+  if (!e.Ve) {
+    e.Ve = optimisticSignal(false, { pureWrite: true });
     if (e.ye) {
-      e.Me.ye = e;
+      e.Ve.ye = e;
     }
-    if (computePendingState(e)) setSignal(e.Me, true);
+    if (computePendingState(e)) setSignal(e.Ve, true);
   }
-  return e.Me;
+  return e.Ve;
 }
 function computePendingState(e) {
   const t = e;
-  if (e.pe !== undefined && e.pe !== S) {
-    if (t.de & a && !(t.de & p)) return true;
+  const n = e.I;
+  if (n && e.Z !== S) {
+    return !n.Oe && !(n.ge & a);
+  }
+  if (e.ee !== undefined && e.ee !== S) {
+    if (t.ge & a && !(t.ge & p)) return true;
     if (e.ye) {
-      const t = e.re ? findLane(e.re) : null;
-      return !!(t && t.T.size > 0);
+      const t = e.Y ? findLane(e.Y) : null;
+      return !!(t && t.H.size > 0);
     }
     return true;
   }
-  if (e.ce !== S && !(t.de & p)) return true;
-  return !!(t.de & a && !(t.de & p));
+  if (e.Z !== S && !(t.ge & p)) return true;
+  return !!(t.ge & a && !(t.ge & p));
 }
 function updatePendingSignal(e) {
-  if (e.Me) {
+  if (e.Ve) {
     const t = computePendingState(e);
-    const n = e.Me;
+    const n = e.Ve;
     setSignal(n, t);
-    if (!t && n.re) {
+    if (!t && n.Y) {
       const t = resolveLane(e);
-      if (t && t.T.size > 0) {
-        const e = findLane(n.re);
+      if (t && t.H.size > 0) {
+        const e = findLane(n.Y);
         if (e !== t) {
           mergeLanes(t, e);
         }
       }
       W.delete(n);
-      n.re = undefined;
+      n.Y = undefined;
     }
   }
 }
 function getLatestValueComputed(e) {
-  if (!e.be) {
-    const t = F;
-    F = false;
-    const n = T;
-    T = false;
-    const r = M;
-    M = null;
-    e.be = optimisticComputed(() => read(e));
-    e.be.ye = e;
-    M = r;
-    T = n;
-    F = t;
-  }
-  return e.be;
+  if (!e.Pe) {
+    const t = V;
+    V = false;
+    const n = q;
+    q = false;
+    const r = B;
+    B = null;
+    e.Pe = optimisticComputed(() => read(e));
+    e.Pe.ye = e;
+    B = r;
+    q = n;
+    V = t;
+  }
+  return e.Pe;
 }
 function staleValues(e, t = true) {
-  const n = R;
-  R = t;
+  const n = H;
+  H = t;
   try {
     return e();
   } finally {
-    R = n;
+    H = n;
   }
 }
 function latest(e) {
-  const t = F;
-  F = true;
+  const t = V;
+  V = true;
   try {
     return e();
   } finally {
-    F = t;
+    V = t;
   }
 }
 function isPending(e) {
-  const t = T;
-  const n = q;
-  T = true;
-  q = false;
+  const t = q;
+  const n = D;
+  q = true;
+  D = false;
   try {
     e();
-    return q;
+    return D;
   } catch {
-    return q;
+    return D;
   } finally {
-    T = t;
-    q = n;
+    q = t;
+    D = n;
   }
 }
 function refresh(e) {
@@ -1584,8 +1661,98 @@ function hasContext(e, t) {
 function isUndefined(e) {
   return typeof e === "undefined";
 }
+function effect(e, t, n, r, i) {
+  let s = false;
+  const o = computed(i?.render ? t => staleValues(() => e(t)) : e, r, {
+    ...i,
+    equals: () => {
+      o.V = !o.ae;
+      if (s) o.B.enqueue(o.D, runEffect.bind(o));
+      return false;
+    },
+    lazy: true
+  });
+  o.Be = r;
+  o.Fe = t;
+  o.Me = n;
+  o.Ge = undefined;
+  o.D = i?.render ? h : g;
+  o.ve = (e, t) => {
+    const n = e !== undefined ? e : o.ge;
+    const r = t !== undefined ? t : o.ae;
+    if (n & d) {
+      let e = r;
+      o.B.notify(o, a, 0);
+      if (o.D === g) {
+        try {
+          return o.Me
+            ? o.Me(e, () => {
+                o.Ge?.();
+                o.Ge = undefined;
+              })
+            : console.error(e);
+        } catch (t) {
+          e = t;
+        }
+      }
+      if (!o.B.notify(o, d, d)) throw e;
+    } else if (o.D === h) {
+      o.B.notify(o, a | d, n, r);
+    }
+  };
+  recompute(o, true);
+  !i?.defer && (o.D === g ? o.B.enqueue(o.D, runEffect.bind(o)) : runEffect.call(o));
+  s = true;
+  onCleanup(() => o.Ge?.());
+}
+function runEffect() {
+  if (!this.V || this.m & u) return;
+  this.Ge?.();
+  this.Ge = undefined;
+  try {
+    this.Ge = this.Fe(this.$, this.Be);
+  } catch (e) {
+    this.ae = new StatusError(this, e);
+    this.ge |= d;
+    if (!this.B.notify(this, d, d)) throw e;
+  } finally {
+    this.Be = this.$;
+    this.V = false;
+  }
+}
+function trackedEffect(e, t) {
+  const run = () => {
+    if (!n.V || n.m & u) return;
+    n.V = false;
+    recompute(n);
+  };
+  const n = computed(
+    () => {
+      n.Ge?.();
+      n.Ge = undefined;
+      n.Ge = staleValues(e) || undefined;
+    },
+    undefined,
+    { ...t, lazy: true }
+  );
+  n.Ge = undefined;
+  n.Ke = true;
+  n.V = true;
+  n.D = y;
+  n.ve = (e, t) => {
+    const r = e !== undefined ? e : n.ge;
+    if (r & d) {
+      n.B.notify(n, a, 0);
+      const e = t !== undefined ? t : n.ae;
+      if (!n.B.notify(n, d, d)) throw e;
+    }
+  };
+  n.F = run;
+  n.B.enqueue(g, run);
+  onCleanup(() => n.Ge?.());
+}
 function restoreTransition(e, t) {
-  A.initTransition(e);
+  N.initTransition(e);
   const n = t();
   flush();
   return n;
@@ -1594,13 +1761,13 @@ function action(e) {
   return (...t) =>
     new Promise((n, r) => {
       const i = e(...t);
-      A.initTransition();
-      let s = C;
-      s.ee.push(i);
+      N.initTransition();
+      let s = k;
+      s.G.push(i);
       const done = (e, t) => {
         s = currentTransition(s);
-        const o = s.ee.indexOf(i);
-        if (o >= 0) s.ee.splice(o, 1);
+        const o = s.G.indexOf(i);
+        if (o >= 0) s.G.splice(o, 1);
         setActiveTransition(s);
         schedule();
         t ? r(t) : n(e);
@@ -1694,15 +1861,16 @@ function createOptimistic(e, t, n) {
   return [accessor(r), setSignal.bind(null, r)];
 }
 function onSettled(e) {
-  getOwner()
+  const t = getOwner();
+  t && !t.Ke
     ? createTrackedEffect(() => untrack(e))
-    : A.enqueue(y, () => {
+    : N.enqueue(g, () => {
         const t = e();
         t?.();
       });
 }
 function unwrap(e) {
-  return e?.[z]?.[$] ?? e;
+  return e?.[U]?.[ee] ?? e;
 }
 function getOverrideValue(e, t, n, r, i) {
   if (i && r in i) return i[r];
@@ -1714,21 +1882,21 @@ function getAllKeys(e, t, n) {
   return Array.from(new Set([...r, ...i]));
 }
 function applyState(e, t, n) {
-  const r = t?.[z];
+  const r = t?.[U];
   if (!r) return;
-  const i = r[X];
-  const s = r[Y];
-  const o = r[Z];
-  let u = r[$];
+  const i = r[Y];
+  const s = r[Z];
+  const o = r[$];
+  let u = r[ee];
   if (e === i && !s && !o) return;
-  (r[ne] || se).set(e, r[U]);
-  r[X] = e;
-  r[Y] = undefined;
+  (r[re] || oe).set(e, r[J]);
+  r[Y] = e;
+  r[Z] = undefined;
   if (Array.isArray(i)) {
     let t = false;
     const f = getOverrideValue(i, s, u, "length", o);
     if (e.length && f && e[0] && n(e[0]) != null) {
-      let l, c, a, d, p, h, y, g;
+      let c, l, a, d, p, h, g, y;
       for (
         a = 0, d = Math.min(f, e.length);
         a < d &&
@@ -1749,67 +1917,67 @@ function applyState(e, t, n) {
         S[p] = h;
       }
       if (a > p || a > d) {
-        for (c = a; c <= p; c++) {
+        for (l = a; l <= p; l++) {
           t = true;
-          r[$][c] && setSignal(r[$][c], wrap(e[c], r));
+          r[ee][l] && setSignal(r[ee][l], wrap(e[l], r));
         }
-        for (; c < e.length; c++) {
+        for (; l < e.length; l++) {
           t = true;
-          const i = wrap(S[c], r);
-          r[$][c] && setSignal(r[$][c], i);
-          applyState(e[c], i, n);
+          const i = wrap(S[l], r);
+          r[ee][l] && setSignal(r[ee][l], i);
+          applyState(e[l], i, n);
         }
-        t && r[$][K] && setSignal(r[$][K], void 0);
-        f !== e.length && r[$].length && setSignal(r[$].length, e.length);
+        t && r[ee][z] && setSignal(r[ee][z], void 0);
+        f !== e.length && r[ee].length && setSignal(r[ee].length, e.length);
         return;
       }
-      y = new Array(p + 1);
-      for (c = p; c >= a; c--) {
-        h = e[c];
-        g = h ? n(h) : h;
-        l = w.get(g);
-        y[c] = l === undefined ? -1 : l;
-        w.set(g, c);
-      }
-      for (l = a; l <= d; l++) {
-        h = getOverrideValue(i, s, u, l, o);
-        g = h ? n(h) : h;
-        c = w.get(g);
-        if (c !== undefined && c !== -1) {
-          S[c] = h;
-          c = y[c];
-          w.set(g, c);
+      g = new Array(p + 1);
+      for (l = p; l >= a; l--) {
+        h = e[l];
+        y = h ? n(h) : h;
+        c = w.get(y);
+        g[l] = c === undefined ? -1 : c;
+        w.set(y, l);
+      }
+      for (c = a; c <= d; c++) {
+        h = getOverrideValue(i, s, u, c, o);
+        y = h ? n(h) : h;
+        l = w.get(y);
+        if (l !== undefined && l !== -1) {
+          S[l] = h;
+          l = g[l];
+          w.set(y, l);
         }
       }
-      for (c = a; c < e.length; c++) {
-        if (c in S) {
-          const t = wrap(S[c], r);
-          r[$][c] && setSignal(r[$][c], t);
-          applyState(e[c], t, n);
-        } else r[$][c] && setSignal(r[$][c], wrap(e[c], r));
+      for (l = a; l < e.length; l++) {
+        if (l in S) {
+          const t = wrap(S[l], r);
+          r[ee][l] && setSignal(r[ee][l], t);
+          applyState(e[l], t, n);
+        } else r[ee][l] && setSignal(r[ee][l], wrap(e[l], r));
       }
       if (a < e.length) t = true;
     } else if (e.length) {
       for (let t = 0, f = e.length; t < f; t++) {
         const f = getOverrideValue(i, s, u, t, o);
-        isWrappable(f) ? applyState(e[t], wrap(f, r), n) : r[$][t] && setSignal(r[$][t], e[t]);
+        isWrappable(f) ? applyState(e[t], wrap(f, r), n) : r[ee][t] && setSignal(r[ee][t], e[t]);
       }
     }
     if (f !== e.length) {
       t = true;
-      r[$].length && setSignal(r[$].length, e.length);
+      r[ee].length && setSignal(r[ee].length, e.length);
     }
-    t && r[$][K] && setSignal(r[$][K], void 0);
+    t && r[ee][z] && setSignal(r[ee][z], void 0);
     return;
   }
   if (u) {
-    const t = u[K];
+    const t = u[z];
     const f = t ? getAllKeys(i, s, e) : Object.keys(u);
-    for (let l = 0, c = f.length; l < c; l++) {
-      const c = f[l];
-      const a = u[c];
-      const d = unwrap(getOverrideValue(i, s, u, c, o));
-      let p = unwrap(e[c]);
+    for (let c = 0, l = f.length; c < l; c++) {
+      const l = f[c];
+      const a = u[l];
+      const d = unwrap(getOverrideValue(i, s, u, l, o));
+      let p = unwrap(e[l]);
       if (d === p) continue;
       if (!d || !isWrappable(d) || !isWrappable(p) || (n(d) != null && n(d) !== n(p))) {
         t && setSignal(t, void 0);
@@ -1817,7 +1985,7 @@ function applyState(e, t, n) {
       } else applyState(p, wrap(d, r), n);
     }
   }
-  if ((u = r[ee])) {
+  if ((u = r[te])) {
     const t = Object.keys(u);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -1839,9 +2007,9 @@ function createProjectionInternal(e, t = {}, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[te] = wrapProjection;
-    e[ne] = i;
-    Object.defineProperty(e, re, {
+    e[ne] = wrapProjection;
+    e[re] = i;
+    Object.defineProperty(e, ie, {
       get() {
         return r;
       },
@@ -1850,28 +2018,28 @@ function createProjectionInternal(e, t = {}, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[z]?.[te] === wrapProjection) return e;
-    const t = createStoreProxy(e, fe, wrapper);
+    if (e[U]?.[ne] === wrapProjection) return e;
+    const t = createStoreProxy(e, ce, wrapper);
     i.set(e, t);
     return t;
   };
   const s = wrapProjection(t);
   r = computed(() => {
     const t = getOwner();
-    storeSetter(new Proxy(s, G), r => {
+    storeSetter(new Proxy(s, K), r => {
       const i = handleAsync(t, e(r), e => {
         e !== r && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
       });
       i !== r && i !== undefined && reconcile(i, n?.key || "id")(s);
     });
   });
-  r.ve = true;
+  r.Qe = true;
   return { store: s, node: r };
 }
 function createProjection(e, t = {}, n) {
   return createProjectionInternal(e, t, n).store;
 }
-const G = {
+const K = {
   get(e, t) {
     let n;
     setWriteOverride(true);
@@ -1882,7 +2050,7 @@ const G = {
       setWriteOverride(false);
       setProjectionWriteActive(false);
     }
-    return typeof n === "object" && n !== null ? new Proxy(n, G) : n;
+    return typeof n === "object" && n !== null ? new Proxy(n, K) : n;
   },
   set(e, t, n) {
     setWriteOverride(true);
@@ -1907,44 +2075,44 @@ const G = {
     return true;
   }
 };
-const K = Symbol(0),
-  z = Symbol(0),
+const z = Symbol(0),
   U = Symbol(0),
-  J = Symbol(0);
-const X = "v",
-  Y = "o",
-  Z = "x",
-  $ = "n",
-  ee = "h",
-  te = "w",
-  ne = "l",
-  re = "f",
-  ie = "p";
-function createStoreProxy(e, t = fe, n) {
+  J = Symbol(0),
+  X = Symbol(0);
+const Y = "v",
+  Z = "o",
+  $ = "x",
+  ee = "n",
+  te = "h",
+  ne = "w",
+  re = "l",
+  ie = "f",
+  se = "p";
+function createStoreProxy(e, t = ce, n) {
   let r;
   if (Array.isArray(e)) {
     r = [];
     r.v = e;
   } else r = { v: e };
   n && n(r);
-  return (r[U] = new Proxy(r, t));
+  return (r[J] = new Proxy(r, t));
 }
-const se = new WeakMap();
+const oe = new WeakMap();
 function wrap(e, t) {
-  if (t?.[te]) return t[te](e, t);
-  let n = e[U] || se.get(e);
-  if (!n) se.set(e, (n = createStoreProxy(e)));
+  if (t?.[ne]) return t[ne](e, t);
+  let n = e[J] || oe.get(e);
+  if (!n) oe.set(e, (n = createStoreProxy(e)));
   return n;
 }
 function isWrappable(e) {
   return e != null && typeof e === "object" && !Object.isFrozen(e);
 }
-let oe = false;
+let ue = false;
 function setWriteOverride(e) {
-  oe = e;
+  ue = e;
 }
 function writeOnly(e) {
-  return oe || !!ue?.has(e);
+  return ue || !!fe?.has(e);
 }
 function getNodes(e, t) {
   let n = e[t];
@@ -1964,17 +2132,17 @@ function getNode(e, t, n, r, i = isEqual, s, o) {
     r
   );
   if (s) {
-    u.pe = S;
+    u.ee = S;
   }
   if (o && t in o) {
     const e = o[t];
-    u.ie = e === undefined ? w : e;
-    B?.add(u);
+    u.pe = e === undefined ? w : e;
+    G?.add(u);
   }
   return (e[t] = u);
 }
-function trackSelf(e, t = K) {
-  getObserver() && read(getNode(getNodes(e, $), t, undefined, e[re], false, e[ie]));
+function trackSelf(e, t = z) {
+  getObserver() && read(getNode(getNodes(e, ee), t, undefined, e[ie], false, e[se]));
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -1982,7 +2150,7 @@ function getKeys(e, t, n = true) {
   const i = new Set(r);
   const s = Reflect.ownKeys(t);
   for (const e of s) {
-    if (t[e] !== J) i.add(e);
+    if (t[e] !== X) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
@@ -1990,142 +2158,136 @@ function getKeys(e, t, n = true) {
 function getPropertyDescriptor(e, t, n) {
   let r = e;
   if (t && n in t) {
-    if (r[n] === J) return void 0;
+    if (r[n] === X) return void 0;
     if (!(n in r)) r = t;
   }
   return Reflect.getOwnPropertyDescriptor(r, n);
 }
-let ue = null;
-const fe = {
+let fe = null;
+const ce = {
   get(e, t, n) {
-    if (t === z) return e;
-    if (t === U) return n;
-    if (t === O) return e[re];
-    if (t === K) {
+    if (t === U) return e;
+    if (t === J) return n;
+    if (t === O) return e[ie];
+    if (t === z) {
       trackSelf(e);
       return n;
     }
-    const r = getNodes(e, $);
+    const r = getNodes(e, ee);
     const i = r[t];
-    const s = e[Z] && t in e[Z];
-    const o = s || (e[Y] && t in e[Y]);
-    const u = !!e[X][z];
-    const f = s ? e[Z] : e[Y] && t in e[Y] ? e[Y] : e[X];
+    const s = e[$] && t in e[$];
+    const o = s || (e[Z] && t in e[Z]);
+    const u = !!e[Y][U];
+    const f = s ? e[$] : e[Z] && t in e[Z] ? e[Z] : e[Y];
     if (!i) {
       const e = Object.getOwnPropertyDescriptor(f, t);
       if (e && e.get) return e.get.call(n);
     }
     if (writeOnly(n)) {
       let n =
-        i && (o || !u)
-          ? i.pe !== undefined && i.pe !== S
-            ? i.pe
-            : i.ce !== S
-              ? i.ce
-              : i.ae
-          : f[t];
-      n === J && (n = undefined);
+        i && (o || !u) ? (i.ee !== undefined && i.ee !== S ? i.ee : i.Z !== S ? i.Z : i.$) : f[t];
+      n === X && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
-      ue?.add(r);
+      fe?.add(r);
       return r;
     }
-    let l = i ? (o || !u ? read(r[t]) : (read(r[t]), f[t])) : f[t];
-    l === J && (l = undefined);
+    let c = i ? (o || !u ? read(r[t]) : (read(r[t]), f[t])) : f[t];
+    c === X && (c = undefined);
     if (!i) {
-      if (!o && typeof l === "function" && !f.hasOwnProperty(t)) {
+      if (!o && typeof c === "function" && !f.hasOwnProperty(t)) {
         let t;
-        return !Array.isArray(e[X]) && (t = Object.getPrototypeOf(e[X])) && t !== Object.prototype
-          ? l.bind(f)
-          : l;
+        return !Array.isArray(e[Y]) && (t = Object.getPrototypeOf(e[Y])) && t !== Object.prototype
+          ? c.bind(f)
+          : c;
       } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[re], isEqual, e[ie], e[m]));
+        return read(getNode(r, t, isWrappable(c) ? wrap(c, e) : c, e[ie], isEqual, e[se], e[m]));
       }
     }
-    return isWrappable(l) ? wrap(l, e) : l;
+    return isWrappable(c) ? wrap(c, e) : c;
   },
   has(e, t) {
-    if (t === U || t === K || t === "__proto__") return true;
-    const n = e[Z] && t in e[Z] ? e[Z][t] !== J : e[Y] && t in e[Y] ? e[Y][t] !== J : t in e[X];
-    getObserver() && read(getNode(getNodes(e, ee), t, n, e[re], isEqual, e[ie]));
+    if (t === J || t === z || t === "__proto__") return true;
+    const n = e[$] && t in e[$] ? e[$][t] !== X : e[Z] && t in e[Z] ? e[Z][t] !== X : t in e[Y];
+    getObserver() && read(getNode(getNodes(e, te), t, n, e[ie], isEqual, e[se]));
     return n;
   },
   set(e, t, n) {
-    const r = e[U];
+    const r = e[J];
     if (writeOnly(r)) {
-      if (e[ie]) {
-        const t = e[re];
-        if (t?.ne) {
-          A.initTransition(t.ne);
+      if (e[se]) {
+        const t = e[ie];
+        if (t?.K) {
+          N.initTransition(t.K);
         }
       }
       untrack(() => {
-        const i = e[X];
+        const i = e[Y];
         const s = i[t];
-        if (D && typeof t !== "symbol" && !((e[re]?.de ?? 0) & a)) {
+        if (M && typeof t !== "symbol" && !((e[ie]?.ge ?? 0) & a)) {
           if (!e[m]) {
             e[m] = Object.create(null);
-            B?.add(e);
+            G?.add(e);
           }
           if (!(t in e[m])) {
             e[m][t] = s;
           }
         }
-        const o = e[ie] && !j;
-        const u = o ? Z : Y;
+        const o = e[se] && !j;
+        const u = o ? $ : Z;
         if (o) trackOptimisticStore(r);
-        const f = e[Z] && t in e[Z] ? e[Z][t] : e[Y] && t in e[Y] ? e[Y][t] : s;
-        const l = n?.[z]?.[X] ?? n;
-        if (f === l) return true;
-        const c = e[Z]?.length || e[Y]?.length || i.length;
-        if (l !== undefined && l === s) delete e[u][t];
-        else (e[u] || (e[u] = Object.create(null)))[t] = l;
-        const d = isWrappable(l);
-        e[ee]?.[t] && setSignal(e[ee][t], true);
-        const p = getNodes(e, $);
-        p[t] && setSignal(p[t], () => (d ? wrap(l, e) : l));
+        const f = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : s;
+        const c = n?.[U]?.[Y] ?? n;
+        if (f === c) return true;
+        const l = e[$]?.length || e[Z]?.length || i.length;
+        if (c !== undefined && c === s) delete e[u][t];
+        else (e[u] || (e[u] = Object.create(null)))[t] = c;
+        const d = isWrappable(c);
+        e[te]?.[t] && setSignal(e[te][t], true);
+        const p = getNodes(e, ee);
+        p[t] && setSignal(p[t], () => (d ? wrap(c, e) : c));
         if (Array.isArray(i)) {
           if (t === "length") {
-            p.length && setSignal(p.length, l);
+            p.length && setSignal(p.length, c);
           } else {
             const e = parseInt(t) + 1;
-            if (e > c) p.length && setSignal(p.length, e);
+            if (e > l) p.length && setSignal(p.length, e);
           }
         }
-        p[K] && setSignal(p[K], undefined);
+        p[z] && setSignal(p[z], undefined);
       });
     }
     return true;
   },
   deleteProperty(e, t) {
-    const n = e[Z]?.[t] === J;
-    const r = e[Y]?.[t] === J;
-    if (writeOnly(e[U]) && !n && !r) {
+    const n = e[$]?.[t] === X;
+    const r = e[Z]?.[t] === X;
+    if (writeOnly(e[J]) && !n && !r) {
       untrack(() => {
-        const n = e[ie] && !j;
-        const r = n ? Z : Y;
-        if (n) trackOptimisticStore(e[U]);
-        const i = e[Z] && t in e[Z] ? e[Z][t] : e[Y] && t in e[Y] ? e[Y][t] : e[X][t];
-        if (t in e[X] || (e[Y] && t in e[Y])) {
-          (e[r] || (e[r] = Object.create(null)))[t] = J;
+        const n = e[se] && !j;
+        const r = n ? $ : Z;
+        if (n) trackOptimisticStore(e[J]);
+        const i = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : e[Y][t];
+        if (t in e[Y] || (e[Z] && t in e[Z])) {
+          (e[r] || (e[r] = Object.create(null)))[t] = X;
         } else if (e[r] && t in e[r]) {
           delete e[r][t];
         } else return true;
-        if (e[ee]?.[t]) setSignal(e[ee][t], false);
-        const s = getNodes(e, $);
+        if (e[te]?.[t]) setSignal(e[te][t], false);
+        const s = getNodes(e, ee);
         s[t] && setSignal(s[t], undefined);
-        s[K] && setSignal(s[K], undefined);
+        s[z] && setSignal(s[z], undefined);
       });
     }
     return true;
   },
   ownKeys(e) {
     trackSelf(e);
-    let t = getKeys(e[X], e[Y], false);
-    if (e[Z]) {
+    let t = getKeys(e[Y], e[Z], false);
+    if (e[$]) {
       const n = new Set(t);
-      for (const t of Reflect.ownKeys(e[Z])) {
-        if (e[Z][t] !== J) n.add(t);
+      for (const t of Reflect.ownKeys(e[$])) {
+        if (e[$][t] !== X) n.add(t);
         else n.delete(t);
       }
       t = Array.from(n);
@@ -2133,25 +2295,25 @@ const fe = {
     return t;
   },
   getOwnPropertyDescriptor(e, t) {
-    if (t === U) return { value: e[U], writable: true, configurable: true };
-    if (e[Z] && t in e[Z]) {
-      if (e[Z][t] === J) return undefined;
-      const n = getPropertyDescriptor(e[X], e[Y], t);
+    if (t === J) return { value: e[J], writable: true, configurable: true };
+    if (e[$] && t in e[$]) {
+      if (e[$][t] === X) return undefined;
+      const n = getPropertyDescriptor(e[Y], e[Z], t);
       if (n) {
-        return { ...n, value: e[Z][t] };
+        return { ...n, value: e[$][t] };
       }
-      return { value: e[Z][t], writable: true, enumerable: true, configurable: true };
+      return { value: e[$][t], writable: true, enumerable: true, configurable: true };
     }
-    return getPropertyDescriptor(e[X], e[Y], t);
+    return getPropertyDescriptor(e[Y], e[Z], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[X]);
+    return Object.getPrototypeOf(e[Y]);
   }
 };
 function storeSetter(e, t) {
-  const n = ue;
-  ue = new Set();
-  ue.add(e);
+  const n = fe;
+  fe = new Set();
+  fe.add(e);
   try {
     const n = t(e);
     if (n !== e && n !== undefined) {
@@ -2167,8 +2329,8 @@ function storeSetter(e, t) {
       }
     }
   } finally {
-    ue.clear();
-    ue = n;
+    fe.clear();
+    fe = n;
   }
 }
 function createStore(e, t, n) {
@@ -2177,7 +2339,7 @@ function createStore(e, t, n) {
   return [i, e => storeSetter(i, e)];
 }
 function createOptimisticStore(e, t, n) {
-  GlobalQueue.J ||= clearOptimisticStore;
+  GlobalQueue.fe ||= clearOptimisticStore;
   const r = typeof e === "function";
   const i = (r ? t : e) ?? {};
   const s = r ? e : undefined;
@@ -2185,39 +2347,39 @@ function createOptimisticStore(e, t, n) {
   return [o, e => storeSetter(o, e)];
 }
 function clearOptimisticStore(e) {
-  const t = e[z];
-  if (!t || !t[Z]) return;
-  const n = t[Z];
-  const r = t[$];
+  const t = e[U];
+  if (!t || !t[$]) return;
+  const n = t[$];
+  const r = t[ee];
   setProjectionWriteActive(true);
   try {
     if (r) {
       for (const e of Reflect.ownKeys(n)) {
         if (r[e]) {
-          r[e].re = undefined;
-          const n = t[Y] && e in t[Y] ? t[Y][e] : t[X][e];
-          const i = n === J ? undefined : n;
+          r[e].Y = undefined;
+          const n = t[Z] && e in t[Z] ? t[Z][e] : t[Y][e];
+          const i = n === X ? undefined : n;
           setSignal(r[e], isWrappable(i) ? wrap(i, t) : i);
         }
       }
-      if (r[K]) {
-        r[K].re = undefined;
-        setSignal(r[K], undefined);
+      if (r[z]) {
+        r[z].Y = undefined;
+        setSignal(r[z], undefined);
       }
     }
   } finally {
     setProjectionWriteActive(false);
   }
-  delete t[Z];
+  delete t[$];
 }
 function createOptimisticProjectionInternal(e, t = {}, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[te] = wrapProjection;
-    e[ne] = i;
-    e[ie] = true;
-    Object.defineProperty(e, re, {
+    e[ne] = wrapProjection;
+    e[re] = i;
+    e[se] = true;
+    Object.defineProperty(e, ie, {
       get() {
         return r;
       },
@@ -2226,8 +2388,8 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[z]?.[te] === wrapProjection) return e;
-    const t = createStoreProxy(e, fe, wrapper);
+    if (e[U]?.[ne] === wrapProjection) return e;
+    const t = createStoreProxy(e, ce, wrapper);
     i.set(e, t);
     return t;
   };
@@ -2237,7 +2399,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
       const t = getOwner();
       setProjectionWriteActive(true);
       try {
-        storeSetter(new Proxy(s, G), r => {
+        storeSetter(new Proxy(s, K), r => {
           const i = handleAsync(t, e(r), e => {
             setProjectionWriteActive(true);
             try {
@@ -2252,7 +2414,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
         setProjectionWriteActive(false);
       }
     });
-    r.ve = true;
+    r.Qe = true;
   }
   return { store: s, node: r };
 }
@@ -2310,7 +2472,7 @@ function updatePath(e, t, n = 0) {
     e[r] = s;
   }
 }
-const ce = Object.assign(
+const ae = Object.assign(
   function storePath(...e) {
     return t => {
       updatePath(t, e);
@@ -2319,41 +2481,41 @@ const ce = Object.assign(
   { DELETE: le }
 );
 function snapshotImpl(e, t, n, r) {
-  let i, s, o, u, f, l;
+  let i, s, o, u, f, c;
   if (!isWrappable(e)) return e;
   if (n && n.has(e)) return n.get(e);
   if (!n) n = new Map();
-  if ((i = e[z] || r?.get(e)?.[z])) {
-    if (t) trackSelf(i, K);
-    o = i[Y];
-    s = Array.isArray(i[X]);
-    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[X]))) : i[X]);
-    e = i[X];
-    r = se;
+  if ((i = e[U] || r?.get(e)?.[U])) {
+    if (t) trackSelf(i, z);
+    o = i[Z];
+    s = Array.isArray(i[Y]);
+    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[Y]))) : i[Y]);
+    e = i[Y];
+    r = oe;
   } else {
     s = Array.isArray(e);
     n.set(e, e);
   }
   if (s) {
     const s = o?.length || e.length;
-    for (let c = 0; c < s; c++) {
-      l = o && c in o ? o[c] : e[c];
-      if (l === J) continue;
-      if (t && isWrappable(l)) wrap(l, i);
-      if ((f = snapshotImpl(l, t, n, r)) !== l || u) {
+    for (let l = 0; l < s; l++) {
+      c = o && l in o ? o[l] : e[l];
+      if (c === X) continue;
+      if (t && isWrappable(c)) wrap(c, i);
+      if ((f = snapshotImpl(c, t, n, r)) !== c || u) {
         if (!u) n.set(e, (u = [...e]));
-        u[c] = f;
+        u[l] = f;
       }
     }
   } else {
     const s = getKeys(e, o);
-    for (let c = 0, a = s.length; c < a; c++) {
-      let a = s[c];
+    for (let l = 0, a = s.length; l < a; l++) {
+      let a = s[l];
       const d = getPropertyDescriptor(e, o, a);
       if (d.get) continue;
-      l = o && a in o ? o[a] : e[a];
-      if (t && isWrappable(l)) wrap(l, i);
-      if ((f = snapshotImpl(l, t, n, r)) !== e[a] || u) {
+      c = o && a in o ? o[a] : e[a];
+      if (t && isWrappable(c)) wrap(c, i);
+      if ((f = snapshotImpl(c, t, n, r)) !== e[a] || u) {
         if (!u) {
           u = Object.create(Object.getPrototypeOf(e));
           Object.assign(u, e);
@@ -2373,13 +2535,13 @@ function deep(e) {
 function trueFn() {
   return true;
 }
-const ae = {
+const de = {
   get(e, t, n) {
-    if (t === U) return n;
+    if (t === J) return n;
     return e.get(t);
   },
   has(e, t) {
-    if (t === U) return true;
+    if (t === J) return true;
     return e.has(t);
   },
   set: trueFn,
@@ -2402,15 +2564,15 @@ const ae = {
 function resolveSource(e) {
   return !(e = typeof e === "function" ? e() : e) ? {} : e;
 }
-const de = Symbol(0);
+const pe = 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 && U in i);
-    const s = !!i && i[de];
+    t = t || (!!i && J in i);
+    const s = !!i && i[pe];
     if (s) n.push(...s);
     else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
   }
@@ -2418,7 +2580,7 @@ function merge(...e) {
     return new Proxy(
       {
         get(e) {
-          if (e === de) return n;
+          if (e === pe) return n;
           for (let t = n.length - 1; t >= 0; t--) {
             const r = resolveSource(n[t]);
             if (e in r) return r[e];
@@ -2436,7 +2598,7 @@ function merge(...e) {
           return [...new Set(e)];
         }
       },
-      ae
+      de
     );
   }
   const r = Object.create(null);
@@ -2468,12 +2630,12 @@ function merge(...e) {
     if (n.get) Object.defineProperty(o, t, n);
     else o[t] = n.value;
   }
-  o[de] = n;
+  o[pe] = n;
   return o;
 }
 function omit(e, ...t) {
   const n = new Set(t);
-  if (b && U in e) {
+  if (b && J in e) {
     return new Proxy(
       {
         get(t) {
@@ -2486,7 +2648,7 @@ function omit(e, ...t) {
           return Object.keys(e).filter(e => !n.has(e));
         }
       },
-      ae
+      de
     );
   }
   const r = {};
@@ -2506,279 +2668,282 @@ function mapArray(e, t, n) {
   const s = t;
   return createMemo(
     updateKeyedMap.bind({
-      Ve: createOwner(),
-      De: 0,
-      Be: e,
-      Ge: [],
-      Ke: s,
-      ze: [],
-      Ue: [],
-      Je: r,
-      Xe: r || n?.keyed === false ? [] : undefined,
-      Ye: i ? [] : undefined,
-      Ze: n?.fallback
+      ze: createOwner(),
+      Ue: 0,
+      Je: e,
+      Xe: [],
+      Ye: s,
+      Ze: [],
+      $e: [],
+      et: r,
+      tt: r || n?.keyed === false ? [] : undefined,
+      nt: i ? [] : undefined,
+      rt: n?.fallback
     })
   );
 }
-const pe = { pureWrite: true };
+const he = { pureWrite: true };
 function updateKeyedMap() {
-  const e = this.Be() || [],
+  const e = this.Je() || [],
     t = e.length;
-  e[K];
-  runWithOwner(this.Ve, () => {
+  e[z];
+  runWithOwner(this.ze, () => {
     let n,
       r,
-      i = this.Xe
+      i = this.tt
         ? () => {
-            this.Xe[r] = signal(e[r], pe);
-            this.Ye && (this.Ye[r] = signal(r, pe));
-            return this.Ke(accessor(this.Xe[r]), this.Ye ? accessor(this.Ye[r]) : undefined);
+            this.tt[r] = signal(e[r], he);
+            this.nt && (this.nt[r] = signal(r, he));
+            return this.Ye(accessor(this.tt[r]), this.nt ? accessor(this.nt[r]) : undefined);
           }
-        : this.Ye
+        : this.nt
           ? () => {
               const t = e[r];
-              this.Ye[r] = signal(r, pe);
-              return this.Ke(() => t, accessor(this.Ye[r]));
+              this.nt[r] = signal(r, he);
+              return this.Ye(() => t, accessor(this.nt[r]));
             }
           : () => {
               const t = e[r];
-              return this.Ke(() => t);
+              return this.Ye(() => t);
             };
     if (t === 0) {
-      if (this.De !== 0) {
-        this.Ve.dispose(false);
-        this.Ue = [];
-        this.Ge = [];
-        this.ze = [];
-        this.De = 0;
-        this.Xe && (this.Xe = []);
-        this.Ye && (this.Ye = []);
-      }
-      if (this.Ze && !this.ze[0]) {
-        this.ze[0] = runWithOwner((this.Ue[0] = createOwner()), this.Ze);
-      }
-    } else if (this.De === 0) {
-      if (this.Ue[0]) this.Ue[0].dispose();
-      this.ze = new Array(t);
+      if (this.Ue !== 0) {
+        this.ze.dispose(false);
+        this.$e = [];
+        this.Xe = [];
+        this.Ze = [];
+        this.Ue = 0;
+        this.tt && (this.tt = []);
+        this.nt && (this.nt = []);
+      }
+      if (this.rt && !this.Ze[0]) {
+        this.Ze[0] = runWithOwner((this.$e[0] = createOwner()), this.rt);
+      }
+    } else if (this.Ue === 0) {
+      if (this.$e[0]) this.$e[0].dispose();
+      this.Ze = new Array(t);
       for (r = 0; r < t; r++) {
-        this.Ge[r] = e[r];
-        this.ze[r] = runWithOwner((this.Ue[r] = createOwner()), i);
+        this.Xe[r] = e[r];
+        this.Ze[r] = runWithOwner((this.$e[r] = createOwner()), i);
       }
-      this.De = t;
+      this.Ue = t;
     } else {
       let s,
         o,
         u,
         f,
-        l,
         c,
+        l,
         a,
         d = new Array(t),
         p = new Array(t),
-        h = this.Xe ? new Array(t) : undefined,
-        y = this.Ye ? new Array(t) : undefined;
+        h = this.tt ? new Array(t) : undefined,
+        g = this.nt ? new Array(t) : undefined;
       for (
-        s = 0, o = Math.min(this.De, t);
-        s < o && (this.Ge[s] === e[s] || (this.Xe && compare(this.Je, this.Ge[s], e[s])));
+        s = 0, o = Math.min(this.Ue, t);
+        s < o && (this.Xe[s] === e[s] || (this.tt && compare(this.et, this.Xe[s], e[s])));
         s++
       ) {
-        if (this.Xe) setSignal(this.Xe[s], e[s]);
+        if (this.tt) setSignal(this.tt[s], e[s]);
       }
       for (
-        o = this.De - 1, u = t - 1;
+        o = this.Ue - 1, u = t - 1;
         o >= s &&
         u >= s &&
-        (this.Ge[o] === e[u] || (this.Xe && compare(this.Je, this.Ge[o], e[u])));
+        (this.Xe[o] === e[u] || (this.tt && compare(this.et, this.Xe[o], e[u])));
         o--, u--
       ) {
-        d[u] = this.ze[o];
-        p[u] = this.Ue[o];
-        h && (h[u] = this.Xe[o]);
-        y && (y[u] = this.Ye[o]);
+        d[u] = this.Ze[o];
+        p[u] = this.$e[o];
+        h && (h[u] = this.tt[o]);
+        g && (g[u] = this.nt[o]);
       }
-      c = new Map();
+      l = new Map();
       a = new Array(u + 1);
       for (r = u; r >= s; r--) {
         f = e[r];
-        l = this.Je ? this.Je(f) : f;
-        n = c.get(l);
+        c = this.et ? this.et(f) : f;
+        n = l.get(c);
         a[r] = n === undefined ? -1 : n;
-        c.set(l, r);
+        l.set(c, r);
       }
       for (n = s; n <= o; n++) {
-        f = this.Ge[n];
-        l = this.Je ? this.Je(f) : f;
-        r = c.get(l);
+        f = this.Xe[n];
+        c = this.et ? this.et(f) : f;
+        r = l.get(c);
         if (r !== undefined && r !== -1) {
-          d[r] = this.ze[n];
-          p[r] = this.Ue[n];
-          h && (h[r] = this.Xe[n]);
-          y && (y[r] = this.Ye[n]);
+          d[r] = this.Ze[n];
+          p[r] = this.$e[n];
+          h && (h[r] = this.tt[n]);
+          g && (g[r] = this.nt[n]);
           r = a[r];
-          c.set(l, r);
-        } else this.Ue[n].dispose();
+          l.set(c, r);
+        } else this.$e[n].dispose();
       }
       for (r = s; r < t; r++) {
         if (r in d) {
-          this.ze[r] = d[r];
-          this.Ue[r] = p[r];
+          this.Ze[r] = d[r];
+          this.$e[r] = p[r];
           if (h) {
-            this.Xe[r] = h[r];
-            setSignal(this.Xe[r], e[r]);
+            this.tt[r] = h[r];
+            setSignal(this.tt[r], e[r]);
           }
-          if (y) {
-            this.Ye[r] = y[r];
-            setSignal(this.Ye[r], r);
+          if (g) {
+            this.nt[r] = g[r];
+            setSignal(this.nt[r], r);
           }
         } else {
-          this.ze[r] = runWithOwner((this.Ue[r] = createOwner()), i);
+          this.Ze[r] = runWithOwner((this.$e[r] = createOwner()), i);
         }
       }
-      this.ze = this.ze.slice(0, (this.De = t));
-      this.Ge = e.slice(0);
+      this.Ze = this.Ze.slice(0, (this.Ue = t));
+      this.Xe = e.slice(0);
     }
   });
-  return this.ze;
+  return this.Ze;
 }
 function repeat(e, t, n) {
   const r = t;
   return updateRepeat.bind({
-    Ve: createOwner(),
-    De: 0,
-    $e: 0,
-    et: e,
-    Ke: r,
-    Ue: [],
-    ze: [],
-    tt: n?.from,
-    Ze: n?.fallback
+    ze: createOwner(),
+    Ue: 0,
+    it: 0,
+    st: e,
+    Ye: r,
+    $e: [],
+    Ze: [],
+    ot: n?.from,
+    rt: n?.fallback
   });
 }
 function updateRepeat() {
-  const e = this.et();
-  const t = this.tt?.() || 0;
-  runWithOwner(this.Ve, () => {
+  const e = this.st();
+  const t = this.ot?.() || 0;
+  runWithOwner(this.ze, () => {
     if (e === 0) {
-      if (this.De !== 0) {
-        this.Ve.dispose(false);
-        this.Ue = [];
-        this.ze = [];
-        this.De = 0;
+      if (this.Ue !== 0) {
+        this.ze.dispose(false);
+        this.$e = [];
+        this.Ze = [];
+        this.Ue = 0;
       }
-      if (this.Ze && !this.ze[0]) {
-        this.ze[0] = runWithOwner((this.Ue[0] = createOwner()), this.Ze);
+      if (this.rt && !this.Ze[0]) {
+        this.Ze[0] = runWithOwner((this.$e[0] = createOwner()), this.rt);
       }
       return;
     }
     const n = t + e;
-    const r = this.$e + this.De;
-    if (this.De === 0 && this.Ue[0]) this.Ue[0].dispose();
-    for (let e = n; e < r; e++) this.Ue[e - this.$e].dispose();
-    if (this.$e < t) {
-      let e = this.$e;
-      while (e < t && e < this.De) this.Ue[e++].dispose();
-      this.Ue.splice(0, t - this.$e);
-      this.ze.splice(0, t - this.$e);
-    } else if (this.$e > t) {
-      let n = r - this.$e - 1;
-      let i = this.$e - t;
-      this.Ue.length = this.ze.length = e;
+    const r = this.it + this.Ue;
+    if (this.Ue === 0 && this.$e[0]) this.$e[0].dispose();
+    for (let e = n; e < r; e++) this.$e[e - this.it].dispose();
+    if (this.it < t) {
+      let e = this.it;
+      while (e < t && e < this.Ue) this.$e[e++].dispose();
+      this.$e.splice(0, t - this.it);
+      this.Ze.splice(0, t - this.it);
+    } else if (this.it > t) {
+      let n = r - this.it - 1;
+      let i = this.it - t;
+      this.$e.length = this.Ze.length = e;
       while (n >= i) {
-        this.Ue[n] = this.Ue[n - i];
-        this.ze[n] = this.ze[n - i];
+        this.$e[n] = this.$e[n - i];
+        this.Ze[n] = this.Ze[n - i];
         n--;
       }
       for (let e = 0; e < i; e++) {
-        this.ze[e] = runWithOwner((this.Ue[e] = createOwner()), () => this.Ke(e + t));
+        this.Ze[e] = runWithOwner((this.$e[e] = createOwner()), () => this.Ye(e + t));
       }
     }
     for (let e = r; e < n; e++) {
-      this.ze[e - t] = runWithOwner((this.Ue[e - t] = createOwner()), () => this.Ke(e));
+      this.Ze[e - t] = runWithOwner((this.$e[e - t] = createOwner()), () => this.Ye(e));
     }
-    this.ze = this.ze.slice(0, e);
-    this.$e = t;
-    this.De = e;
+    this.Ze = this.Ze.slice(0, e);
+    this.it = t;
+    this.Ue = e;
   });
-  return this.ze;
+  return this.Ze;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
 }
 function boundaryComputed(e, t) {
   const n = computed(e, undefined, { lazy: true });
-  n._e = (e, t) => {
-    const r = e !== undefined ? e : n.de;
-    const i = t !== undefined ? t : n.Y;
-    n.de &= ~n.nt;
-    n.fe.notify(n, n.nt, r, i);
+  n.ve = (e, t) => {
+    const r = e !== undefined ? e : n.ge;
+    const i = t !== undefined ? t : n.ae;
+    n.ge &= ~n.ut;
+    n.B.notify(n, n.ut, r, i);
   };
-  n.nt = t;
-  n.ve = true;
+  n.ut = t;
+  n.Qe = true;
   recompute(n, true);
   return n;
 }
 function createBoundChildren(e, t, n, r) {
-  const i = e.fe;
-  i.addChild((e.fe = n));
-  onCleanup(() => i.removeChild(e.fe));
+  const i = e.B;
+  i.addChild((e.B = n));
+  onCleanup(() => i.removeChild(e.B));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
   });
 }
-const he = Symbol();
+const ge = Symbol();
 class CollectionQueue extends Queue {
-  rt;
-  it = new Set();
-  st = signal(false, { pureWrite: true });
-  ot = false;
-  ut;
-  ft = he;
+  ft;
+  ct = new Set();
+  lt = signal(false, { pureWrite: true, De: true });
+  dt = false;
+  ht;
+  gt = ge;
   constructor(e) {
     super();
-    this.rt = e;
+    this.ft = e;
   }
   run(e) {
-    if (!e || read(this.st)) return;
+    if (!e || read(this.lt)) return;
     return super.run(e);
   }
   notify(e, t, n, r) {
-    if (!(t & this.rt)) return super.notify(e, t, n, r);
-    if (this.ot && this.ut) {
+    if (!(t & this.ft)) return super.notify(e, t, n, r);
+    if (this.dt && this.ht) {
       const e = untrack(() => {
         try {
-          return this.ut();
+          return this.ht();
         } catch {
-          return he;
+          return ge;
         }
       });
-      if (e !== this.ft) {
-        this.ft = e;
-        this.ot = false;
-        this.it.clear();
+      if (e !== this.gt) {
+        this.gt = e;
+        this.dt = false;
+        this.ct.clear();
       }
     }
-    if (this.rt & a && this.ot) return super.notify(e, t, n, r);
-    if (n & this.rt) {
-      const t = r?.source || e.Y?.source;
+    if (this.ft & a && this.dt) return super.notify(e, t, n, r);
+    if (this.ft & a && n & d) {
+      return super.notify(e, d, n, r);
+    }
+    if (n & this.ft) {
+      const t = r?.source || e.ae?.source;
       if (t) {
-        const e = this.it.size === 0;
-        this.it.add(t);
-        if (e) setSignal(this.st, true);
+        const e = this.ct.size === 0;
+        this.ct.add(t);
+        if (e) setSignal(this.lt, true);
       }
     }
-    t &= ~this.rt;
+    t &= ~this.ft;
     return t ? super.notify(e, t, n, r) : true;
   }
   checkSources() {
-    for (const e of this.it) {
-      if (!(e.de & this.rt)) this.it.delete(e);
+    for (const e of this.ct) {
+      if (!(e.ge & this.ft) && !(this.ft & d && e.ge & a)) this.ct.delete(e);
     }
-    if (!this.it.size) {
-      setSignal(this.st, false);
-      if (this.ut) {
+    if (!this.ct.size) {
+      setSignal(this.lt, false);
+      if (this.ht) {
         try {
-          this.ft = untrack(() => this.ut());
+          this.gt = untrack(() => this.ht());
         } catch {}
       }
     }
@@ -2787,13 +2952,13 @@ class CollectionQueue extends Queue {
 function createCollectionBoundary(e, t, n, r) {
   const i = createOwner();
   const s = new CollectionQueue(e);
-  if (r) s.ut = r;
+  if (r) s.ht = r;
   const o = createBoundChildren(i, t, s, e);
   const u = computed(() => {
-    if (!read(s.st)) {
+    if (!read(s.lt)) {
       const e = read(o);
-      if (!untrack(() => read(s.st))) {
-        s.ot = true;
+      if (!untrack(() => read(s.lt))) {
+        s.dt = true;
         return e;
       }
     }
@@ -2806,10 +2971,10 @@ function createLoadingBoundary(e, t, n) {
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(d, e, e => {
-    let n = e.it.values().next().value;
-    const r = n.Y?.cause ?? n.Y;
+    let n = e.ct.values().next().value;
+    const r = n.ae?.cause ?? n.ae;
     return t(r, () => {
-      for (const t of e.it) recompute(t);
+      for (const t of e.ct) recompute(t);
       schedule();
     });
   });
@@ -2863,10 +3028,10 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-exports.$PROXY = U;
+exports.$PROXY = J;
 exports.$REFRESH = O;
-exports.$TARGET = z;
-exports.$TRACK = K;
+exports.$TARGET = U;
+exports.$TRACK = z;
 exports.ContextNotFoundError = ContextNotFoundError;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
@@ -2919,5 +3084,5 @@ exports.runWithOwner = runWithOwner;
 exports.setContext = setContext;
 exports.setSnapshotCapture = setSnapshotCapture;
 exports.snapshot = snapshot;
-exports.storePath = ce;
+exports.storePath = ae;
 exports.untrack = untrack;