@solidjs/signals 0.9.9 → 0.9.11

package/dist/prod.js

@@ -102,8 +102,8 @@ function markNode(e, t = REACTIVE_DIRTY) {
   for (let t = e.p; t !== null; t = t.h) {
     markNode(t.A, REACTIVE_CHECK);
   }
-  if (e.P !== null) {
-    for (let t = e.P; t !== null; t = t.C) {
+  if (e.N !== null) {
+    for (let t = e.N; t !== null; t = t.P) {
       for (let e = t.p; e !== null; e = e.h) {
         markNode(e.A, REACTIVE_CHECK);
       }
@@ -112,12 +112,12 @@ function markNode(e, t = REACTIVE_DIRTY) {
 }
 function runHeap(e, t) {
   e.I = false;
-  for (e.N = 0; e.N <= e.S; e.N++) {
-    let n = e.T[e.N];
+  for (e.C = 0; e.C <= e.S; e.C++) {
+    let n = e.T[e.C];
     while (n !== undefined) {
       if (n._ & REACTIVE_IN_HEAP) t(n);
       else adjustHeight(n, e);
-      n = e.T[e.N];
+      n = e.T[e.C];
     }
   }
   e.S = 0;
@@ -138,8 +138,8 @@ function adjustHeight(e, t) {
   }
 }
 const transitions = new Set();
-const dirtyQueue = { T: new Array(2e3).fill(undefined), I: false, N: 0, S: 0 };
-const zombieQueue = { T: new Array(2e3).fill(undefined), I: false, N: 0, S: 0 };
+const dirtyQueue = { T: new Array(2e3).fill(undefined), I: false, C: 0, S: 0 };
+const zombieQueue = { T: new Array(2e3).fill(undefined), I: false, C: 0, S: 0 };
 let clock = 0;
 let activeTransition = null;
 let scheduled = false;
@@ -155,64 +155,69 @@ function getOrCreateLane(e) {
   if (t) {
     return findLane(t);
   }
-  t = { t: e, k: new Set(), W: [[], []], G: null, M: activeTransition };
+  const n = e.k;
+  const i = n?.W ? findLane(n.W) : null;
+  t = { t: e, G: new Set(), M: [[], []], F: null, $: activeTransition, H: i };
   signalLanes.set(e, t);
   activeLanes.add(t);
-  e.F = e.$ || 0;
+  e.j = e.K || 0;
   return t;
 }
 function findLane(e) {
-  while (e.G) e = e.G;
+  while (e.F) e = e.F;
   return e;
 }
 function mergeLanes(e, t) {
   e = findLane(e);
   t = findLane(t);
   if (e === t) return e;
-  t.G = e;
-  for (const n of t.k) e.k.add(n);
-  e.W[0].push(...t.W[0]);
-  e.W[1].push(...t.W[1]);
+  t.F = e;
+  for (const n of t.G) e.G.add(n);
+  e.M[0].push(...t.M[0]);
+  e.M[1].push(...t.M[1]);
   return e;
 }
 function clearLaneEntry(e) {
   signalLanes.delete(e);
 }
 function resolveLane(e) {
-  const t = e.H;
+  const t = e.W;
   if (!t) return undefined;
   const n = findLane(t);
   if (activeLanes.has(n)) return n;
-  e.H = undefined;
+  e.W = undefined;
   return undefined;
 }
 function hasActiveOverride(e) {
-  return !!(e.j && e.K !== NOT_PENDING);
+  return !!(e.Y && e.B !== NOT_PENDING);
 }
 function assignOrMergeLane(e, t) {
   const n = findLane(t);
-  const i = e.H;
+  const i = e.W;
   if (i) {
-    if (i.G) {
-      e.H = t;
+    if (i.F) {
+      e.W = t;
       return;
     }
     const r = findLane(i);
     if (activeLanes.has(r)) {
       if (r !== n && !hasActiveOverride(e)) {
-        mergeLanes(n, r);
+        if (n.H && findLane(n.H) === r) {
+          e.W = t;
+        } else if (r.H && findLane(r.H) === n);
+        else mergeLanes(n, r);
       }
       return;
     }
   }
-  e.H = t;
+  e.W = t;
 }
 function runLaneEffects(e) {
   for (const t of activeLanes) {
-    if (t.G || t.k.size > 0) continue;
-    const n = t.W[e - 1];
+    if (t.F || t.G.size > 0) continue;
+    const n = t.M[e - 1];
     if (n.length) {
-      t.W[e - 1] = [];
+      t.M[e - 1] = [];
       runQueue(n, e);
     }
   }
@@ -223,21 +228,21 @@ function setProjectionWriteActive(e) {
 function schedule() {
   if (scheduled) return;
   scheduled = true;
-  if (!globalQueue.Y) queueMicrotask(flush);
+  if (!globalQueue.X) queueMicrotask(flush);
 }
 class Queue {
   o = null;
-  B = [[], []];
-  X = [];
+  q = [[], []];
+  Z = [];
   created = clock;
   addChild(e) {
-    this.X.push(e);
+    this.Z.push(e);
     e.o = this;
   }
   removeChild(e) {
-    const t = this.X.indexOf(e);
+    const t = this.Z.indexOf(e);
     if (t >= 0) {
-      this.X.splice(t, 1);
+      this.Z.splice(t, 1);
       e.o = null;
     }
   }
@@ -246,106 +251,106 @@ class Queue {
     return false;
   }
   run(e) {
-    if (this.B[e - 1].length) {
-      const t = this.B[e - 1];
-      this.B[e - 1] = [];
+    if (this.q[e - 1].length) {
+      const t = this.q[e - 1];
+      this.q[e - 1] = [];
       runQueue(t, e);
     }
-    for (let t = 0; t < this.X.length; t++) this.X[t].run?.(e);
+    for (let t = 0; t < this.Z.length; t++) this.Z[t].run?.(e);
   }
   enqueue(e, t) {
     if (e) {
       if (currentOptimisticLane) {
         const n = findLane(currentOptimisticLane);
-        n.W[e - 1].push(t);
+        n.M[e - 1].push(t);
       } else {
-        this.B[e - 1].push(t);
+        this.q[e - 1].push(t);
       }
     }
     schedule();
   }
   stashQueues(e) {
-    e.B[0].push(...this.B[0]);
-    e.B[1].push(...this.B[1]);
-    this.B = [[], []];
-    for (let t = 0; t < this.X.length; t++) {
-      let n = this.X[t];
-      let i = e.X[t];
+    e.q[0].push(...this.q[0]);
+    e.q[1].push(...this.q[1]);
+    this.q = [[], []];
+    for (let t = 0; t < this.Z.length; t++) {
+      let n = this.Z[t];
+      let i = e.Z[t];
       if (!i) {
-        i = { B: [[], []], X: [] };
-        e.X[t] = i;
+        i = { q: [[], []], Z: [] };
+        e.Z[t] = i;
       }
       n.stashQueues(i);
     }
   }
   restoreQueues(e) {
-    this.B[0].push(...e.B[0]);
-    this.B[1].push(...e.B[1]);
-    for (let t = 0; t < e.X.length; t++) {
-      const n = e.X[t];
-      let i = this.X[t];
+    this.q[0].push(...e.q[0]);
+    this.q[1].push(...e.q[1]);
+    for (let t = 0; t < e.Z.length; t++) {
+      const n = e.Z[t];
+      let i = this.Z[t];
       if (i) i.restoreQueues(n);
     }
   }
 }
 class GlobalQueue extends Queue {
-  Y = false;
-  q = [];
-  Z = [];
-  J = new Set();
-  static ee;
-  static te;
-  static ne = null;
+  X = false;
+  J = [];
+  ee = [];
+  te = new Set();
+  static ne;
+  static ie;
+  static re = null;
   flush() {
-    if (this.Y) return;
-    this.Y = true;
+    if (this.X) return;
+    this.X = true;
     try {
-      runHeap(dirtyQueue, GlobalQueue.ee);
+      runHeap(dirtyQueue, GlobalQueue.ne);
       if (activeTransition) {
         const e = transitionComplete(activeTransition);
         if (!e) {
           let e = activeTransition;
-          runHeap(zombieQueue, GlobalQueue.ee);
-          this.q = [];
-          this.Z = [];
-          this.J = new Set();
+          runHeap(zombieQueue, GlobalQueue.ne);
+          this.J = [];
+          this.ee = [];
+          this.te = new Set();
           runLaneEffects(EFFECT_RENDER);
           runLaneEffects(EFFECT_USER);
-          this.stashQueues(activeTransition.ie);
+          this.stashQueues(activeTransition.oe);
           clock++;
-          scheduled = dirtyQueue.S >= dirtyQueue.N;
-          reassignPendingTransition(activeTransition.q);
+          scheduled = dirtyQueue.S >= dirtyQueue.C;
+          reassignPendingTransition(activeTransition.J);
           activeTransition = null;
           finalizePureQueue(null, true);
           return;
         }
-        this.q !== activeTransition.q && this.q.push(...activeTransition.q);
-        this.restoreQueues(activeTransition.ie);
+        this.J !== activeTransition.J && this.J.push(...activeTransition.J);
+        this.restoreQueues(activeTransition.oe);
         transitions.delete(activeTransition);
         const t = activeTransition;
         activeTransition = null;
-        reassignPendingTransition(this.q);
+        reassignPendingTransition(this.J);
         finalizePureQueue(t);
       } else {
-        if (transitions.size) runHeap(zombieQueue, GlobalQueue.ee);
+        if (transitions.size) runHeap(zombieQueue, GlobalQueue.ne);
         finalizePureQueue();
       }
       clock++;
-      scheduled = dirtyQueue.S >= dirtyQueue.N;
+      scheduled = dirtyQueue.S >= dirtyQueue.C;
       runLaneEffects(EFFECT_RENDER);
       this.run(EFFECT_RENDER);
       runLaneEffects(EFFECT_USER);
       this.run(EFFECT_USER);
     } finally {
-      this.Y = false;
+      this.X = false;
     }
   }
   notify(e, t, n, i) {
     if (t & STATUS_PENDING) {
       if (n & STATUS_PENDING) {
-        const t = i !== undefined ? i : e.re;
-        if (activeTransition && t && !activeTransition.oe.includes(t.t)) {
-          activeTransition.oe.push(t.t);
+        const t = i !== undefined ? i : e.se;
+        if (activeTransition && t && !activeTransition.ue.includes(t.t)) {
+          activeTransition.ue.push(t.t);
           schedule();
         }
       }
@@ -356,143 +361,143 @@ class GlobalQueue extends Queue {
   initTransition(e) {
     if (e) e = currentTransition(e);
     if (e && e === activeTransition) return;
-    if (!e && activeTransition && activeTransition.se === clock) return;
+    if (!e && activeTransition && activeTransition.ce === clock) return;
     if (!activeTransition) {
       activeTransition = e ?? {
-        se: clock,
-        q: [],
-        oe: [],
-        Z: [],
-        J: new Set(),
+        ce: clock,
+        J: [],
         ue: [],
-        ie: { B: [[], []], X: [] },
-        ce: false
+        ee: [],
+        te: new Set(),
+        le: [],
+        oe: { q: [[], []], Z: [] },
+        ae: false
       };
     } else if (e) {
       const t = activeTransition;
-      t.ce = e;
-      e.ue.push(...t.ue);
+      t.ae = e;
+      e.le.push(...t.le);
       for (const n of activeLanes) {
-        if (n.M === t) n.M = e;
+        if (n.$ === t) n.$ = e;
       }
-      e.Z.push(...t.Z);
-      for (const n of t.J) {
-        e.J.add(n);
+      e.ee.push(...t.ee);
+      for (const n of t.te) {
+        e.te.add(n);
       }
       transitions.delete(t);
       activeTransition = e;
     }
     transitions.add(activeTransition);
-    activeTransition.se = clock;
-    for (let e = 0; e < this.q.length; e++) {
-      const t = this.q[e];
-      t.M = activeTransition;
-      activeTransition.q.push(t);
-    }
-    this.q = activeTransition.q;
-    for (let e = 0; e < this.Z.length; e++) {
-      const t = this.Z[e];
-      t.M = activeTransition;
-      activeTransition.Z.push(t);
-    }
-    this.Z = activeTransition.Z;
-    for (const e of activeLanes) {
-      if (!e.M) e.M = activeTransition;
+    activeTransition.ce = clock;
+    for (let e = 0; e < this.J.length; e++) {
+      const t = this.J[e];
+      t.$ = activeTransition;
+      activeTransition.J.push(t);
     }
-    for (const e of this.J) activeTransition.J.add(e);
     this.J = activeTransition.J;
+    for (let e = 0; e < this.ee.length; e++) {
+      const t = this.ee[e];
+      t.$ = activeTransition;
+      activeTransition.ee.push(t);
+    }
+    this.ee = activeTransition.ee;
+    for (const e of activeLanes) {
+      if (!e.$) e.$ = activeTransition;
+    }
+    for (const e of this.te) activeTransition.te.add(e);
+    this.te = activeTransition.te;
   }
 }
 function insertSubs(e, t = false) {
-  const n = e.H || currentOptimisticLane;
+  const n = e.W || currentOptimisticLane;
   for (let i = e.p; i !== null; i = i.h) {
     if (t && n) {
       i.A._ |= REACTIVE_OPTIMISTIC_DIRTY;
       assignOrMergeLane(i.A, n);
     } else if (t) {
       i.A._ |= REACTIVE_OPTIMISTIC_DIRTY;
-      i.A.H = undefined;
+      i.A.W = undefined;
     }
     const e = i.A;
-    if (e.le === EFFECT_TRACKED) {
-      if (!e.ae) {
-        e.ae = true;
-        e.fe.enqueue(EFFECT_USER, e.Ee);
+    if (e.fe === EFFECT_TRACKED) {
+      if (!e.Ee) {
+        e.Ee = true;
+        e.Te.enqueue(EFFECT_USER, e.de);
       }
       continue;
     }
     const r = i.A._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (r.N > i.A.u) r.N = i.A.u;
+    if (r.C > i.A.u) r.C = i.A.u;
     insertIntoHeap(i.A, r);
   }
 }
 function finalizePureQueue(e = null, t = false) {
   let n = !t;
   if (!t) checkBoundaryChildren(globalQueue);
-  if (dirtyQueue.S >= dirtyQueue.N) runHeap(dirtyQueue, GlobalQueue.ee);
+  if (dirtyQueue.S >= dirtyQueue.C) runHeap(dirtyQueue, GlobalQueue.ne);
   if (n) {
-    const t = globalQueue.q;
+    const t = globalQueue.J;
     for (let e = 0; e < t.length; e++) {
       const n = t[e];
-      if (n.K !== NOT_PENDING) {
-        n.Te = n.K;
-        n.K = NOT_PENDING;
-        if (n.le && n.le !== EFFECT_TRACKED) n.ae = true;
+      if (n.B !== NOT_PENDING) {
+        n.Re = n.B;
+        n.B = NOT_PENDING;
+        if (n.fe && n.fe !== EFFECT_TRACKED) n.Ee = true;
       }
-      n.de &= ~STATUS_UNINITIALIZED;
-      if (n.U) GlobalQueue.te(n, false, true);
+      n.Oe &= ~STATUS_UNINITIALIZED;
+      if (n.U) GlobalQueue.ie(n, false, true);
     }
     t.length = 0;
-    const n = e ? e.Z : globalQueue.Z;
+    const n = e ? e.ee : globalQueue.ee;
     for (let e = 0; e < n.length; e++) {
       const t = n[e];
-      const i = t.K;
-      t.H = undefined;
-      if (i !== NOT_PENDING && t.Te !== i) {
-        t.Te = i;
+      const i = t.B;
+      t.W = undefined;
+      if (i !== NOT_PENDING && t.Re !== i) {
+        t.Re = i;
         insertSubs(t, true);
       }
-      t.K = NOT_PENDING;
-      t.M = null;
+      t.B = NOT_PENDING;
+      t.$ = null;
     }
     n.length = 0;
-    const i = e ? e.J : globalQueue.J;
-    if (GlobalQueue.ne && i.size) {
+    const i = e ? e.te : globalQueue.te;
+    if (GlobalQueue.re && i.size) {
       for (const e of i) {
-        GlobalQueue.ne(e);
+        GlobalQueue.re(e);
       }
       i.clear();
       schedule();
     }
     for (const t of activeLanes) {
-      const n = e ? t.M === e : !t.M;
+      const n = e ? t.$ === e : !t.$;
       if (!n) continue;
-      if (!t.G) {
-        if (t.W[0].length) runQueue(t.W[0], EFFECT_RENDER);
-        if (t.W[1].length) runQueue(t.W[1], EFFECT_USER);
-      }
-      if (t.t.H === t) t.t.H = undefined;
-      t.k.clear();
-      t.W[0].length = 0;
-      t.W[1].length = 0;
+      if (!t.F) {
+        if (t.M[0].length) runQueue(t.M[0], EFFECT_RENDER);
+        if (t.M[1].length) runQueue(t.M[1], EFFECT_USER);
+      }
+      if (t.t.W === t) t.t.W = undefined;
+      t.G.clear();
+      t.M[0].length = 0;
+      t.M[1].length = 0;
       activeLanes.delete(t);
       signalLanes.delete(t.t);
     }
   }
 }
 function checkBoundaryChildren(e) {
-  for (const t of e.X) {
+  for (const t of e.Z) {
     t.checkSources?.();
     checkBoundaryChildren(t);
   }
 }
 function trackOptimisticStore(e) {
-  globalQueue.J.add(e);
+  globalQueue.te.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
-    e[t].M = activeTransition;
+    e[t].$ = activeTransition;
   }
 }
 const globalQueue = new GlobalQueue();
@@ -505,20 +510,21 @@ function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function transitionComplete(e) {
-  if (e.ce) return true;
-  if (e.ue.length) return false;
+  if (e.ae) return true;
+  if (e.le.length) return false;
   let t = true;
-  for (let n = 0; n < e.oe.length; n++) {
-    if (e.oe[n].de & STATUS_PENDING) {
+  for (let n = 0; n < e.ue.length; n++) {
+    const i = e.ue[n];
+    if (i.Oe & STATUS_PENDING && i.se?.t === i) {
       t = false;
       break;
     }
   }
-  t && (e.ce = true);
+  t && (e.ae = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.ce && typeof e.ce === "object") e = e.ce;
+  while (e.ae && typeof e.ae === "object") e = e.ae;
   return e;
 }
 function runInTransition(e, t) {
@@ -542,11 +548,11 @@ function action(e) {
       const r = e(...t);
       globalQueue.initTransition();
       let o = activeTransition;
-      o.ue.push(r);
+      o.le.push(r);
       const done = (e, t) => {
         o = currentTransition(o);
-        const s = o.ue.indexOf(r);
-        if (s >= 0) o.ue.splice(s, 1);
+        const s = o.le.indexOf(r);
+        if (s >= 0) o.le.splice(s, 1);
         activeTransition = o;
         schedule();
         t ? i(t) : n(e);
@@ -574,8 +580,8 @@ function action(e) {
       step();
     });
 }
-GlobalQueue.ee = recompute;
-GlobalQueue.te = disposeChildren;
+GlobalQueue.ne = recompute;
+GlobalQueue.ie = disposeChildren;
 let tracking = false;
 let stale = false;
 let refreshing = false;
@@ -584,29 +590,29 @@ let foundPending = false;
 let pendingReadActive = false;
 let context = null;
 function recompute(e, t = false) {
-  const n = e.le;
+  const n = e.fe;
   if (!t) {
-    if (e.M && (!n || activeTransition) && activeTransition !== e.M)
-      globalQueue.initTransition(e.M);
+    if (e.$ && (!n || activeTransition) && activeTransition !== e.$)
+      globalQueue.initTransition(e.$);
     deleteFromHeap(e, e._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-    if (e.M || n === EFFECT_TRACKED) disposeChildren(e);
+    if (e.$ || n === EFFECT_TRACKED) disposeChildren(e);
     else {
       markDisposal(e);
-      e.Re = e.Oe;
       e.Se = e._e;
-      e.Oe = null;
+      e.Ie = e.pe;
       e._e = null;
+      e.pe = null;
     }
   }
   const i = !!(e._ & REACTIVE_OPTIMISTIC_DIRTY);
   const r = hasActiveOverride(e);
-  const o = !!(e.de & STATUS_PENDING);
+  const o = !!(e.Oe & STATUS_PENDING);
   const s = context;
   context = e;
-  e.Ie = null;
+  e.he = null;
   e._ = REACTIVE_RECOMPUTING_DEPS;
-  e.se = clock;
-  let u = e.K === NOT_PENDING ? e.Te : e.K;
+  e.ce = clock;
+  let u = e.B === NOT_PENDING ? e.Re : e.B;
   let c = e.u;
   let l = tracking;
   let a = currentOptimisticLane;
@@ -619,13 +625,17 @@ function recompute(e, t = false) {
     u = handleAsync(e, e.U(u));
     clearStatus(e);
     const t = resolveLane(e);
-    if (t) t.k.delete(e);
+    if (t) {
+      t.G.delete(e);
+      updatePendingSignal(t.t);
+    }
   } catch (t) {
     if (t instanceof NotReadyError && currentOptimisticLane) {
       const t = findLane(currentOptimisticLane);
       if (t.t !== e) {
-        t.k.add(e);
-        e.H = t;
+        t.G.add(e);
+        e.W = t;
+        updatePendingSignal(t.t);
       }
     }
     notifyStatus(
@@ -633,15 +643,15 @@ function recompute(e, t = false) {
       t instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR,
       t,
       undefined,
-      t instanceof NotReadyError ? e.H : undefined
+      t instanceof NotReadyError ? e.W : undefined
     );
   } finally {
     tracking = l;
     e._ = REACTIVE_NONE;
     context = s;
   }
-  if (!e.re) {
-    const s = e.Ie;
+  if (!e.se) {
+    const s = e.he;
     let l = s !== null ? s.m : e.D;
     if (l !== null) {
       do {
@@ -650,22 +660,22 @@ function recompute(e, t = false) {
       if (s !== null) s.m = null;
       else e.D = null;
     }
-    const a = r ? e.Te : e.K === NOT_PENDING ? e.Te : e.K;
-    const f = !e.pe || !e.pe(a, u);
+    const a = r ? e.Re : e.B === NOT_PENDING ? e.Re : e.B;
+    const f = !e.Ae || !e.Ae(a, u);
     if (f) {
-      const s = r ? e.Te : undefined;
-      if (t || (n && activeTransition !== e.M) || i) e.Te = u;
-      else e.K = u;
+      const s = r ? e.Re : undefined;
+      if (t || (n && activeTransition !== e.$) || i) e.Re = u;
+      else e.B = u;
       if (r && !i && o) {
-        const t = e.$ || 0;
-        const n = e.F || 0;
-        if (t <= n) e.Te = u;
+        const t = e.K || 0;
+        const n = e.j || 0;
+        if (t <= n) e.Re = u;
       }
-      if (!r || i || e.Te !== s) {
+      if (!r || i || e.Re !== s) {
         insertSubs(e, i || r);
       }
     } else if (r) {
-      e.K = u;
+      e.B = u;
     } else if (e.u != c) {
       for (let t = e.p; t !== null; t = t.h) {
         insertIntoHeapHeight(t.A, t.A._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
@@ -673,49 +683,49 @@ function recompute(e, t = false) {
     }
   }
   setCurrentOptimisticLane(a);
-  (!t || e.de & STATUS_PENDING) && !e.M && !(activeTransition && e.j) && globalQueue.q.push(e);
-  e.M && n && activeTransition !== e.M && runInTransition(e.M, () => recompute(e));
+  (!t || e.Oe & STATUS_PENDING) && !e.$ && !(activeTransition && e.Y) && globalQueue.J.push(e);
+  e.$ && n && activeTransition !== e.$ && runInTransition(e.$, () => recompute(e));
 }
 function handleAsync(e, t, n) {
   const i = typeof t === "object" && t !== null;
   const r = i && untrack(() => t[Symbol.asyncIterator]);
   const o = !r && i && untrack(() => typeof t.then === "function");
   if (!o && !r) {
-    e.he = null;
+    e.ge = null;
     return t;
   }
-  e.he = t;
+  e.ge = t;
   let s;
   const handleError = n => {
-    if (e.he !== t) return;
-    globalQueue.initTransition(e.M);
+    if (e.ge !== t) return;
+    globalQueue.initTransition(e.$);
     notifyStatus(e, n instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR, n);
-    e.se = clock;
+    e.ce = clock;
   };
   const asyncWrite = (i, r) => {
-    if (e.he !== t) return;
+    if (e.ge !== t) return;
     if (e._ & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
-    globalQueue.initTransition(e.M);
+    globalQueue.initTransition(e.$);
     clearStatus(e);
     const o = resolveLane(e);
-    if (o) o.k.delete(e);
+    if (o) o.G.delete(e);
     if (n) n(i);
-    else if (e.j) {
-      const t = e.K !== NOT_PENDING;
-      if (e.U) e.K = i;
+    else if (e.Y) {
+      const t = e.B !== NOT_PENDING;
+      if (e.U) e.B = i;
       if (!t) {
-        e.Te = i;
+        e.Re = i;
         insertSubs(e);
       }
-      e.se = clock;
+      e.ce = clock;
     } else if (o) {
-      const t = e.Te;
-      const n = e.pe;
+      const t = e.Re;
+      const n = e.Ae;
       if (!n || !n(i, t)) {
-        e.Te = i;
-        e.se = clock;
-        if (e.Ae) {
-          setSignal(e.Ae, i);
+        e.Re = i;
+        e.ce = clock;
+        if (e.Ne) {
+          setSignal(e.Ne, i);
         }
         insertSubs(e, true);
       }
@@ -742,7 +752,7 @@ function handleAsync(e, t, n) {
     );
     i = false;
     if (!n) {
-      globalQueue.initTransition(e.M);
+      globalQueue.initTransition(e.$);
       throw new NotReadyError(context);
     }
   }
@@ -774,27 +784,27 @@ function handleAsync(e, t, n) {
     };
     const r = iterate();
     if (!i && !r) {
-      globalQueue.initTransition(e.M);
+      globalQueue.initTransition(e.$);
       throw new NotReadyError(context);
     }
   }
   return s;
 }
 function clearStatus(e) {
-  e.de = e.de & STATUS_UNINITIALIZED;
-  e.re = null;
+  e.Oe = e.Oe & STATUS_UNINITIALIZED;
+  e.se = null;
   updatePendingSignal(e);
-  e.ge?.();
+  e.Pe?.();
 }
 function notifyStatus(e, t, n, i, r) {
   if (t === STATUS_ERROR && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
   const o = n instanceof NotReadyError && n.t === e;
-  const s = t === STATUS_PENDING && e.j && !o;
+  const s = t === STATUS_PENDING && e.Y && !o;
   const u = s && hasActiveOverride(e);
   if (!i) {
-    e.de = t | (t !== STATUS_ERROR ? e.de & STATUS_UNINITIALIZED : 0);
-    e.re = n;
+    e.Oe = t | (t !== STATUS_ERROR ? e.Oe & STATUS_UNINITIALIZED : 0);
+    e.se = n;
     updatePendingSignal(e);
   }
   if (r && !i) {
@@ -802,32 +812,32 @@ function notifyStatus(e, t, n, i, r) {
   }
   if (u && activeTransition && n instanceof NotReadyError) {
     const e = n.t;
-    if (!activeTransition.oe.includes(e)) {
-      activeTransition.oe.push(e);
+    if (!activeTransition.ue.includes(e)) {
+      activeTransition.ue.push(e);
     }
   }
   const c = i || u;
   const l = i || s ? undefined : r;
-  if (e.ge) {
+  if (e.Pe) {
     if (c) {
-      e.ge(t, n);
+      e.Pe(t, n);
     } else {
-      e.ge();
+      e.Pe();
     }
     return;
   }
   for (let i = e.p; i !== null; i = i.h) {
-    i.A.se = clock;
-    if (i.A.re !== n) {
-      !i.A.M && globalQueue.q.push(i.A);
+    i.A.ce = clock;
+    if (i.A.se !== n) {
+      !i.A.$ && globalQueue.J.push(i.A);
       notifyStatus(i.A, t, n, c, l);
     }
   }
-  for (let i = e.P; i !== null; i = i.C) {
+  for (let i = e.N; i !== null; i = i.P) {
     for (let e = i.p; e !== null; e = e.h) {
-      e.A.se = clock;
-      if (e.A.re !== n) {
-        !e.A.M && globalQueue.q.push(e.A);
+      e.A.ce = clock;
+      if (e.A.se !== n) {
+        !e.A.$ && globalQueue.J.push(e.A);
         notifyStatus(e.A, t, n, c, l);
       }
     }
@@ -846,7 +856,7 @@ function updateIfNecessary(e) {
       }
     }
   }
-  if (e._ & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.re && e.se < clock)) {
+  if (e._ & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.se && e.ce < clock)) {
     recompute(e);
   }
   e._ = REACTIVE_NONE;
@@ -855,15 +865,15 @@ function unlinkSubs(e) {
   const t = e.V;
   const n = e.m;
   const i = e.h;
-  const r = e.Pe;
-  if (i !== null) i.Pe = r;
-  else t.Ce = r;
+  const r = e.Ce;
+  if (i !== null) i.Ce = r;
+  else t.ye = r;
   if (r !== null) r.h = i;
   else {
     t.p = i;
     if (i === null) {
-      t.Ne?.();
-      t.U && !t.ye && unobserved(t);
+      t.De?.();
+      t.U && !t.ve && unobserved(t);
     }
   }
   return n;
@@ -878,27 +888,27 @@ function unobserved(e) {
   disposeChildren(e, true);
 }
 function link(e, t) {
-  const n = t.Ie;
+  const n = t.he;
   if (n !== null && n.V === e) return;
   let i = null;
   const r = t._ & REACTIVE_RECOMPUTING_DEPS;
   if (r) {
     i = n !== null ? n.m : t.D;
     if (i !== null && i.V === e) {
-      t.Ie = i;
+      t.he = i;
       return;
     }
   }
-  const o = e.Ce;
+  const o = e.ye;
   if (o !== null && o.A === t && (!r || isValidLink(o, t))) return;
-  const s = (t.Ie = e.Ce = { V: e, A: t, m: i, Pe: o, h: null });
+  const s = (t.he = e.ye = { V: e, A: t, m: i, Ce: o, h: null });
   if (n !== null) n.m = s;
   else t.D = s;
   if (o !== null) o.h = s;
   else e.p = s;
 }
 function isValidLink(e, t) {
-  const n = t.Ie;
+  const n = t.he;
   if (n !== null) {
     let i = t.D;
     do {
@@ -910,7 +920,7 @@ function isValidLink(e, t) {
   return false;
 }
 function markDisposal(e) {
-  let t = e._e;
+  let t = e.pe;
   while (t) {
     t._ |= REACTIVE_ZOMBIE;
     if (t._ & REACTIVE_IN_HEAP) {
@@ -918,7 +928,7 @@ function markDisposal(e) {
       insertIntoHeap(t, zombieQueue);
     }
     markDisposal(t);
-    t = t.De;
+    t = t.we;
   }
 }
 function dispose(e) {
@@ -927,15 +937,15 @@ function dispose(e) {
     t = unlinkSubs(t);
   } while (t !== null);
   e.D = null;
-  e.Ie = null;
+  e.he = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
   if (e._ & REACTIVE_DISPOSED) return;
   if (t) e._ = REACTIVE_DISPOSED;
-  let i = n ? e.Se : e._e;
+  let i = n ? e.Ie : e.pe;
   while (i) {
-    const e = i.De;
+    const e = i.we;
     if (i.D) {
       const e = i;
       deleteFromHeap(e, e._ & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
@@ -944,21 +954,21 @@ function disposeChildren(e, t = false, n) {
         t = unlinkSubs(t);
       } while (t !== null);
       e.D = null;
-      e.Ie = null;
+      e.he = null;
     }
     disposeChildren(i, true);
     i = e;
   }
   if (n) {
-    e.Se = null;
+    e.Ie = null;
   } else {
-    e._e = null;
-    e.De = null;
+    e.pe = null;
+    e.we = null;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.Re : e.Oe;
+  let n = t ? e.Se : e._e;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -968,10 +978,10 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.Re = null) : (e.Oe = null);
+  t ? (e.Se = null) : (e._e = null);
 }
 function getNextChildId(e) {
-  if (e.id != null) return formatId(e.id, e.ve++);
+  if (e.id != null) return formatId(e.id, e.be++);
   throw new Error("Cannot get child id from owner without an id");
 }
 function formatId(e, t) {
@@ -982,44 +992,44 @@ function formatId(e, t) {
 function computed(e, t, n) {
   const i = {
     id: n?.id ?? (context?.id != null ? getNextChildId(context) : undefined),
-    pe: n?.equals != null ? n.equals : isEqual,
-    we: !!n?.pureWrite,
-    Ne: n?.unobserved,
-    Oe: null,
-    fe: context?.fe ?? globalQueue,
-    be: context?.be ?? defaultContext,
-    ve: 0,
+    Ae: n?.equals != null ? n.equals : isEqual,
+    me: !!n?.pureWrite,
+    De: n?.unobserved,
+    _e: null,
+    Te: context?.Te ?? globalQueue,
+    Ve: context?.Ve ?? defaultContext,
+    be: 0,
     U: e,
-    Te: t,
+    Re: t,
     u: 0,
-    P: null,
+    N: null,
     O: undefined,
     R: null,
     D: null,
-    Ie: null,
+    he: null,
     p: null,
-    Ce: null,
+    ye: null,
     o: context,
-    De: null,
-    _e: null,
+    we: null,
+    pe: null,
     _: REACTIVE_NONE,
-    de: STATUS_UNINITIALIZED,
-    se: clock,
-    K: NOT_PENDING,
-    Re: null,
+    Oe: STATUS_UNINITIALIZED,
+    ce: clock,
+    B: NOT_PENDING,
     Se: null,
-    he: null,
-    M: null
+    Ie: null,
+    ge: null,
+    $: null
   };
   i.R = i;
   const r = context?.i ? context.l : context;
   if (context) {
-    const e = context._e;
+    const e = context.pe;
     if (e === null) {
-      context._e = i;
+      context.pe = i;
     } else {
-      i.De = e;
-      context._e = i;
+      i.we = e;
+      context.pe = i;
     }
   }
   if (r) i.u = r.u + 1;
@@ -1028,69 +1038,84 @@ function computed(e, t, n) {
 }
 function signal(e, t, n = null) {
   const i = {
-    pe: t?.equals != null ? t.equals : isEqual,
-    we: !!t?.pureWrite,
-    Ne: t?.unobserved,
-    Te: e,
+    Ae: t?.equals != null ? t.equals : isEqual,
+    me: !!t?.pureWrite,
+    De: t?.unobserved,
+    Re: e,
     p: null,
-    Ce: null,
-    se: clock,
+    ye: null,
+    ce: clock,
     L: n,
-    C: n?.P || null,
-    K: NOT_PENDING
+    P: n?.N || null,
+    B: NOT_PENDING
   };
-  n && (n.P = i);
+  n && (n.N = i);
   return i;
 }
 function optimisticSignal(e, t) {
   const n = signal(e, t);
-  n.j = true;
+  n.Y = true;
   return n;
 }
 function optimisticComputed(e, t, n) {
   const i = computed(e, t, n);
-  i.j = true;
+  i.Y = true;
   return i;
 }
 function getPendingSignal(e) {
-  if (!e.me) {
-    e.me = optimisticSignal(false, { pureWrite: true });
-    if (computePendingState(e)) setSignal(e.me, true);
+  if (!e.Le) {
+    e.Le = optimisticSignal(false, { pureWrite: true });
+    if (e.k) {
+      e.Le.k = e;
+    }
+    if (computePendingState(e)) setSignal(e.Le, true);
   }
-  return e.me;
+  return e.Le;
 }
 function computePendingState(e) {
   const t = e;
-  if (e.K !== NOT_PENDING && !(t.de & STATUS_UNINITIALIZED)) return true;
-  return !!(t.de & STATUS_PENDING && !(t.de & STATUS_UNINITIALIZED));
+  if (e.Y && e.B !== NOT_PENDING) {
+    if (t.Oe & STATUS_PENDING && !(t.Oe & STATUS_UNINITIALIZED)) return true;
+    if (e.k) {
+      const t = e.W ? findLane(e.W) : null;
+      return !!(t && t.G.size > 0);
+    }
+    return true;
+  }
+  if (e.B !== NOT_PENDING && !(t.Oe & STATUS_UNINITIALIZED)) return true;
+  return !!(t.Oe & STATUS_PENDING && !(t.Oe & STATUS_UNINITIALIZED));
 }
 function getPendingValueComputed(e) {
-  if (!e.Ae) {
+  if (!e.Ne) {
     const t = pendingReadActive;
     pendingReadActive = false;
-    const n = context;
+    const n = pendingCheckActive;
+    pendingCheckActive = false;
+    const i = context;
     context = null;
-    e.Ae = optimisticComputed(() => read(e));
-    context = n;
+    e.Ne = optimisticComputed(() => read(e));
+    e.Ne.k = e;
+    context = i;
+    pendingCheckActive = n;
     pendingReadActive = t;
   }
-  return e.Ae;
+  return e.Ne;
 }
 function updatePendingSignal(e) {
-  if (e.me) {
+  if (e.Le) {
     const t = computePendingState(e);
-    const n = e.me;
+    const n = e.Le;
     setSignal(n, t);
-    if (!t && n.H) {
+    if (!t && n.W) {
       const t = resolveLane(e);
-      if (t && t.k.size > 0) {
-        const e = findLane(n.H);
+      if (t && t.G.size > 0) {
+        const e = findLane(n.W);
         if (e !== t) {
           mergeLanes(t, e);
         }
       }
       clearLaneEntry(n);
-      n.H = undefined;
+      n.W = undefined;
     }
   }
 }
@@ -1107,6 +1132,22 @@ function untrack(e) {
   }
 }
 function read(e) {
+  if (pendingReadActive) {
+    const t = getPendingValueComputed(e);
+    const n = pendingReadActive;
+    pendingReadActive = false;
+    const i = read(t);
+    pendingReadActive = n;
+    if (t.Oe & STATUS_PENDING) return e.Re;
+    if (stale && currentOptimisticLane && t.W) {
+      const n = findLane(t.W);
+      const i = findLane(currentOptimisticLane);
+      if (n !== i && n.G.size > 0) {
+        return e.Re;
+      }
+    }
+    return i;
+  }
   if (pendingCheckActive) {
     const t = e.L || e;
     const n = getPendingSignal(t);
@@ -1116,16 +1157,7 @@ function read(e) {
       foundPending = true;
     }
     pendingCheckActive = i;
-    return e.Te;
-  }
-  if (pendingReadActive) {
-    const t = getPendingValueComputed(e);
-    const n = pendingReadActive;
-    pendingReadActive = false;
-    const i = read(t);
-    pendingReadActive = n;
-    if (t.de & STATUS_PENDING) return e.Te;
-    return i;
+    return e.Re;
   }
   let t = context;
   if (t?.i) t = t.l;
@@ -1136,7 +1168,7 @@ function read(e) {
     const n = e.L || e;
     if (n.U) {
       const i = e._ & REACTIVE_ZOMBIE;
-      if (n.u >= (i ? zombieQueue.N : dirtyQueue.N)) {
+      if (n.u >= (i ? zombieQueue.C : dirtyQueue.C)) {
         markNode(t);
         markHeap(i ? zombieQueue : dirtyQueue);
         updateIfNecessary(n);
@@ -1148,69 +1180,69 @@ function read(e) {
     }
   }
   const n = e.L || e;
-  if (t && n.de & STATUS_PENDING && !(stale && n.M && activeTransition !== n.M)) {
+  if (t && n.Oe & STATUS_PENDING && !(stale && n.$ && activeTransition !== n.$)) {
     if (currentOptimisticLane) {
-      const i = n.H;
+      const i = n.W;
       const r = findLane(currentOptimisticLane);
       if (i && findLane(i) === r && !hasActiveOverride(n)) {
         if (!tracking) link(e, t);
-        throw n.re;
+        throw n.se;
       }
     } else {
       if (!tracking) link(e, t);
-      throw n.re;
+      throw n.se;
     }
   }
-  if (e.U && e.de & STATUS_ERROR) {
-    if (e.se < clock) {
+  if (e.U && e.Oe & STATUS_ERROR) {
+    if (e.ce < clock) {
       recompute(e, true);
       return read(e);
-    } else throw e.re;
+    } else throw e.se;
   }
   return !t ||
     currentOptimisticLane !== null ||
-    e.K === NOT_PENDING ||
-    (stale && e.M && activeTransition !== e.M)
-    ? e.Te
-    : e.K;
+    e.B === NOT_PENDING ||
+    (stale && e.$ && activeTransition !== e.$)
+    ? e.Re
+    : e.B;
 }
 function setSignal(e, t) {
-  if (e.M && activeTransition !== e.M) globalQueue.initTransition(e.M);
-  const n = e.j && !projectionWriteActive;
-  const i = n ? e.Te : e.K === NOT_PENDING ? e.Te : e.K;
+  if (e.$ && activeTransition !== e.$) globalQueue.initTransition(e.$);
+  const n = e.Y && !projectionWriteActive;
+  const i = n ? e.Re : e.B === NOT_PENDING ? e.Re : e.B;
   if (typeof t === "function") t = t(i);
-  const r = !e.pe || !e.pe(i, t);
+  const r = !e.Ae || !e.Ae(i, t);
   if (!r) {
-    if (n && e.K !== NOT_PENDING && e.U) {
+    if (n && e.B !== NOT_PENDING && e.U) {
       insertSubs(e, true);
       schedule();
     }
     return t;
   }
   if (n) {
-    const n = globalQueue.Z.includes(e);
-    if (e.M && n) {
-      globalQueue.initTransition(e.M);
+    const n = globalQueue.ee.includes(e);
+    if (e.$ && n) {
+      globalQueue.initTransition(e.$);
     }
-    if (e.K === NOT_PENDING) {
-      e.K = e.Te;
+    if (e.B === NOT_PENDING) {
+      e.B = e.Re;
     }
     if (!n) {
-      globalQueue.Z.push(e);
+      globalQueue.ee.push(e);
     }
-    e.$ = (e.$ || 0) + 1;
+    e.K = (e.K || 0) + 1;
     const i = getOrCreateLane(e);
-    e.H = i;
-    e.Te = t;
+    e.W = i;
+    e.Re = t;
   } else {
-    if (e.K === NOT_PENDING) globalQueue.q.push(e);
-    e.K = t;
+    if (e.B === NOT_PENDING) globalQueue.J.push(e);
+    e.B = t;
   }
   updatePendingSignal(e);
-  if (e.Ae) {
-    setSignal(e.Ae, t);
+  if (e.Ne) {
+    setSignal(e.Ne, t);
   }
-  e.se = clock;
+  e.ce = clock;
   insertSubs(e, n);
   schedule();
   return t;
@@ -1225,9 +1257,9 @@ function getOwner() {
 }
 function onCleanup(e) {
   if (!context) return e;
-  if (!context.Oe) context.Oe = e;
-  else if (Array.isArray(context.Oe)) context.Oe.push(e);
-  else context.Oe = [context.Oe, e];
+  if (!context._e) context._e = e;
+  else if (Array.isArray(context._e)) context._e.push(e);
+  else context._e = [context._e, e];
   return e;
 }
 function createOwner(e) {
@@ -1236,26 +1268,26 @@ function createOwner(e) {
     id: e?.id ?? (t?.id != null ? getNextChildId(t) : undefined),
     i: true,
     l: t?.i ? t.l : t,
+    pe: null,
+    we: null,
     _e: null,
-    De: null,
-    Oe: null,
-    fe: t?.fe ?? globalQueue,
-    be: t?.be || defaultContext,
-    ve: 0,
-    Re: null,
+    Te: t?.Te ?? globalQueue,
+    Ve: t?.Ve || defaultContext,
+    be: 0,
     Se: null,
+    Ie: null,
     o: t,
     dispose(e = true) {
       disposeChildren(n, e);
     }
   };
   if (t) {
-    const e = t._e;
+    const e = t.pe;
     if (e === null) {
-      t._e = n;
+      t.pe = n;
     } else {
-      n.De = e;
-      t._e = n;
+      n.we = e;
+      t.pe = n;
     }
   }
   return n;
@@ -1335,7 +1367,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.be[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.Ve[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1345,10 +1377,10 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.be = { ...n.be, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.Ve = { ...n.Ve, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.be[e.id]);
+  return !isUndefined(t?.Ve[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
@@ -1358,80 +1390,80 @@ function effect(e, t, n, i, r) {
   const s = computed(r?.render ? t => staleValues(() => e(t)) : e, i, {
     ...r,
     equals: () => {
-      s.ae = !s.re;
-      if (o) s.fe.enqueue(s.le, runEffect.bind(s));
+      s.Ee = !s.se;
+      if (o) s.Te.enqueue(s.fe, runEffect.bind(s));
       return false;
     },
     lazy: true
   });
-  s.Ve = i;
-  s.Le = t;
-  s.Ue = n;
-  s.ke = undefined;
-  s.le = r?.render ? EFFECT_RENDER : EFFECT_USER;
-  s.ge = (e, t) => {
-    const n = e !== undefined ? e : s.de;
-    const i = t !== undefined ? t : s.re;
+  s.Ue = i;
+  s.ke = t;
+  s.We = n;
+  s.Qe = undefined;
+  s.fe = r?.render ? EFFECT_RENDER : EFFECT_USER;
+  s.Pe = (e, t) => {
+    const n = e !== undefined ? e : s.Oe;
+    const i = t !== undefined ? t : s.se;
     if (n & STATUS_ERROR) {
       let e = i;
-      s.fe.notify(s, STATUS_PENDING, 0);
-      if (s.le === EFFECT_USER) {
+      s.Te.notify(s, STATUS_PENDING, 0);
+      if (s.fe === EFFECT_USER) {
         try {
-          return s.Ue
-            ? s.Ue(e, () => {
-                s.ke?.();
-                s.ke = undefined;
+          return s.We
+            ? s.We(e, () => {
+                s.Qe?.();
+                s.Qe = undefined;
               })
             : console.error(e);
         } catch (t) {
           e = t;
         }
       }
-      if (!s.fe.notify(s, STATUS_ERROR, STATUS_ERROR)) throw e;
-    } else if (s.le === EFFECT_RENDER) s.fe.notify(s, STATUS_PENDING | STATUS_ERROR, n, i);
+      if (!s.Te.notify(s, STATUS_ERROR, STATUS_ERROR)) throw e;
+    } else if (s.fe === EFFECT_RENDER) s.Te.notify(s, STATUS_PENDING | STATUS_ERROR, n, i);
   };
   recompute(s, true);
-  !r?.defer && (s.le === EFFECT_USER ? s.fe.enqueue(s.le, runEffect.bind(s)) : runEffect.call(s));
+  !r?.defer && (s.fe === EFFECT_USER ? s.Te.enqueue(s.fe, runEffect.bind(s)) : runEffect.call(s));
   o = true;
-  onCleanup(() => s.ke?.());
+  onCleanup(() => s.Qe?.());
 }
 function runEffect() {
-  if (!this.ae || this._ & REACTIVE_DISPOSED) return;
-  this.ke?.();
-  this.ke = undefined;
+  if (!this.Ee || this._ & REACTIVE_DISPOSED) return;
+  this.Qe?.();
+  this.Qe = undefined;
   try {
-    this.ke = this.Le(this.Te, this.Ve);
+    this.Qe = this.ke(this.Re, this.Ue);
   } catch (e) {
-    if (!this.fe.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
+    if (!this.Te.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
   } finally {
-    this.Ve = this.Te;
-    this.ae = false;
+    this.Ue = this.Re;
+    this.Ee = false;
   }
 }
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.ae || n._ & REACTIVE_DISPOSED) return;
-    n.ae = false;
+    if (!n.Ee || n._ & REACTIVE_DISPOSED) return;
+    n.Ee = false;
     recompute(n);
   };
   const n = computed(
     () => {
       try {
-        n.ke?.();
-        n.ke = undefined;
-        n.ke = staleValues(e) || undefined;
+        n.Qe?.();
+        n.Qe = undefined;
+        n.Qe = staleValues(e) || undefined;
       } finally {
       }
     },
     undefined,
     { ...t, lazy: true, pureWrite: true }
   );
-  n.ke = undefined;
-  n.ae = true;
-  n.le = EFFECT_TRACKED;
-  n.Ee = run;
-  n.fe.enqueue(EFFECT_USER, run);
-  onCleanup(() => n.ke?.());
+  n.Qe = undefined;
+  n.Ee = true;
+  n.fe = EFFECT_TRACKED;
+  n.de = run;
+  n.Te.enqueue(EFFECT_USER, run);
+  onCleanup(() => n.Qe?.());
 }
 function createSignal(e, t, n) {
   if (typeof e === "function") {
@@ -1610,7 +1642,7 @@ function applyState(e, t, n, i) {
       const E = unwrap(getOverrideValue(o, s, u, a));
       let T = unwrap(e[a]);
       if (E === T) continue;
-      if (!E || !isWrappable(E) || (n(E) != null && n(E) !== n(T))) {
+      if (!E || !isWrappable(E) || !isWrappable(T) || (n(E) != null && n(E) !== n(T))) {
         t && setSignal(t, void 0);
         f && setSignal(f, isWrappable(T) ? wrap(T, r) : T);
       } else applyState(T, wrap(E, r), n, i);
@@ -1665,7 +1697,7 @@ function createProjectionInternal(e, t = {}, n) {
       r !== i && r !== undefined && reconcile(r, n?.key || "id", n?.all)(o);
     });
   });
-  i.ye = true;
+  i.ve = true;
   return { store: o, node: i };
 }
 function createProjection(e, t = {}, n) {
@@ -1765,7 +1797,7 @@ function getNode(e, t, n, i, r = isEqual, o) {
     },
     i
   );
-  if (o) s.j = true;
+  if (o) s.Y = true;
   return (e[t] = s);
 }
 function trackSelf(e, t = $TRACK) {
@@ -1818,7 +1850,7 @@ const storeTraps = {
       if (e && e.get) return e.get.call(n);
     }
     if (writeOnly(n)) {
-      let n = r && (s || !u) ? (r.K !== NOT_PENDING ? (r.j ? r.Te : r.K) : r.Te) : c[t];
+      let n = r && (s || !u) ? (r.B !== NOT_PENDING ? (r.Y ? r.Re : r.B) : r.Re) : c[t];
       n === $DELETED && (n = undefined);
       if (!isWrappable(n)) return n;
       const i = wrap(n, e);
@@ -1867,8 +1899,8 @@ const storeTraps = {
     if (writeOnly(i)) {
       if (e[STORE_OPTIMISTIC]) {
         const t = e[STORE_FIREWALL];
-        if (t?.M) {
-          globalQueue.initTransition(t.M);
+        if (t?.$) {
+          globalQueue.initTransition(t.$);
         }
       }
       untrack(() => {
@@ -2057,7 +2089,7 @@ function deep(e) {
   return e[$DEEP];
 }
 function createOptimisticStore(e, t, n) {
-  GlobalQueue.ne ||= clearOptimisticStore;
+  GlobalQueue.re ||= clearOptimisticStore;
   const i = typeof e === "function";
   const r = (i ? t : e) ?? {};
   const o = i ? e : undefined;
@@ -2074,7 +2106,7 @@ function clearOptimisticStore(e) {
     if (i) {
       for (const e of Reflect.ownKeys(n)) {
         if (i[e]) {
-          i[e].H = undefined;
+          i[e].W = undefined;
           const n =
             t[STORE_OVERRIDE] && e in t[STORE_OVERRIDE] ? t[STORE_OVERRIDE][e] : t[STORE_VALUE][e];
           const r = n === $DELETED ? undefined : n;
@@ -2082,7 +2114,7 @@ function clearOptimisticStore(e) {
         }
       }
       if (i[$TRACK]) {
-        i[$TRACK].H = undefined;
+        i[$TRACK].W = undefined;
         setSignal(i[$TRACK], undefined);
       }
     }
@@ -2133,7 +2165,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
         setProjectionWriteActive(false);
       }
     });
-    i.ye = true;
+    i.ve = true;
   }
   return { store: o, node: i };
 }
@@ -2317,68 +2349,68 @@ function mapArray(e, t, n) {
   const i = typeof n?.keyed === "function" ? n.keyed : undefined;
   return createMemo(
     updateKeyedMap.bind({
-      We: createOwner(),
-      Qe: 0,
-      xe: e,
-      Ge: [],
-      Me: t,
+      xe: createOwner(),
+      Ge: 0,
+      Me: e,
       Fe: [],
-      $e: [],
-      He: i,
-      je: i || n?.keyed === false ? [] : undefined,
-      Ke: t.length > 1 ? [] : undefined,
-      Ye: n?.fallback
+      $e: t,
+      He: [],
+      je: [],
+      Ke: i,
+      Ye: i || n?.keyed === false ? [] : undefined,
+      Be: t.length > 1 ? [] : undefined,
+      Xe: n?.fallback
     })
   );
 }
 const pureOptions = { pureWrite: true };
 function updateKeyedMap() {
-  const e = this.xe() || [],
+  const e = this.Me() || [],
     t = e.length;
   e[$TRACK];
-  runWithOwner(this.We, () => {
+  runWithOwner(this.xe, () => {
     let n,
       i,
-      r = this.je
+      r = this.Ye
         ? () => {
-            this.je[i] = signal(e[i], pureOptions);
-            this.Ke && (this.Ke[i] = signal(i, pureOptions));
-            return this.Me(
-              read.bind(null, this.je[i]),
-              this.Ke ? read.bind(null, this.Ke[i]) : undefined
+            this.Ye[i] = signal(e[i], pureOptions);
+            this.Be && (this.Be[i] = signal(i, pureOptions));
+            return this.$e(
+              read.bind(null, this.Ye[i]),
+              this.Be ? read.bind(null, this.Be[i]) : undefined
             );
           }
-        : this.Ke
+        : this.Be
           ? () => {
               const t = e[i];
-              this.Ke[i] = signal(i, pureOptions);
-              return this.Me(() => t, read.bind(null, this.Ke[i]));
+              this.Be[i] = signal(i, pureOptions);
+              return this.$e(() => t, read.bind(null, this.Be[i]));
             }
           : () => {
               const t = e[i];
-              return this.Me(() => t);
+              return this.$e(() => t);
             };
     if (t === 0) {
-      if (this.Qe !== 0) {
-        this.We.dispose(false);
-        this.$e = [];
-        this.Ge = [];
+      if (this.Ge !== 0) {
+        this.xe.dispose(false);
+        this.je = [];
         this.Fe = [];
-        this.Qe = 0;
-        this.je && (this.je = []);
-        this.Ke && (this.Ke = []);
+        this.He = [];
+        this.Ge = 0;
+        this.Ye && (this.Ye = []);
+        this.Be && (this.Be = []);
       }
-      if (this.Ye && !this.Fe[0]) {
-        this.Fe[0] = runWithOwner((this.$e[0] = createOwner()), this.Ye);
+      if (this.Xe && !this.He[0]) {
+        this.He[0] = runWithOwner((this.je[0] = createOwner()), this.Xe);
       }
-    } else if (this.Qe === 0) {
-      if (this.$e[0]) this.$e[0].dispose();
-      this.Fe = new Array(t);
+    } else if (this.Ge === 0) {
+      if (this.je[0]) this.je[0].dispose();
+      this.He = new Array(t);
       for (i = 0; i < t; i++) {
-        this.Ge[i] = e[i];
-        this.Fe[i] = runWithOwner((this.$e[i] = createOwner()), r);
+        this.Fe[i] = e[i];
+        this.He[i] = runWithOwner((this.je[i] = createOwner()), r);
       }
-      this.Qe = t;
+      this.Ge = t;
     } else {
       let o,
         s,
@@ -2389,217 +2421,217 @@ function updateKeyedMap() {
         f,
         E = new Array(t),
         T = new Array(t),
-        d = this.je ? new Array(t) : undefined,
-        R = this.Ke ? new Array(t) : undefined;
+        d = this.Ye ? new Array(t) : undefined,
+        R = this.Be ? new Array(t) : undefined;
       for (
-        o = 0, s = Math.min(this.Qe, t);
-        o < s && (this.Ge[o] === e[o] || (this.je && compare(this.He, this.Ge[o], e[o])));
+        o = 0, s = Math.min(this.Ge, t);
+        o < s && (this.Fe[o] === e[o] || (this.Ye && compare(this.Ke, this.Fe[o], e[o])));
         o++
       ) {
-        if (this.je) setSignal(this.je[o], e[o]);
+        if (this.Ye) setSignal(this.Ye[o], e[o]);
       }
       for (
-        s = this.Qe - 1, u = t - 1;
+        s = this.Ge - 1, u = t - 1;
         s >= o &&
         u >= o &&
-        (this.Ge[s] === e[u] || (this.je && compare(this.He, this.Ge[s], e[u])));
+        (this.Fe[s] === e[u] || (this.Ye && compare(this.Ke, this.Fe[s], e[u])));
         s--, u--
       ) {
-        E[u] = this.Fe[s];
-        T[u] = this.$e[s];
-        d && (d[u] = this.je[s]);
-        R && (R[u] = this.Ke[s]);
+        E[u] = this.He[s];
+        T[u] = this.je[s];
+        d && (d[u] = this.Ye[s]);
+        R && (R[u] = this.Be[s]);
       }
       a = new Map();
       f = new Array(u + 1);
       for (i = u; i >= o; i--) {
         c = e[i];
-        l = this.He ? this.He(c) : c;
+        l = this.Ke ? this.Ke(c) : c;
         n = a.get(l);
         f[i] = n === undefined ? -1 : n;
         a.set(l, i);
       }
       for (n = o; n <= s; n++) {
-        c = this.Ge[n];
-        l = this.He ? this.He(c) : c;
+        c = this.Fe[n];
+        l = this.Ke ? this.Ke(c) : c;
         i = a.get(l);
         if (i !== undefined && i !== -1) {
-          E[i] = this.Fe[n];
-          T[i] = this.$e[n];
-          d && (d[i] = this.je[n]);
-          R && (R[i] = this.Ke[n]);
+          E[i] = this.He[n];
+          T[i] = this.je[n];
+          d && (d[i] = this.Ye[n]);
+          R && (R[i] = this.Be[n]);
           i = f[i];
           a.set(l, i);
-        } else this.$e[n].dispose();
+        } else this.je[n].dispose();
       }
       for (i = o; i < t; i++) {
         if (i in E) {
-          this.Fe[i] = E[i];
-          this.$e[i] = T[i];
+          this.He[i] = E[i];
+          this.je[i] = T[i];
           if (d) {
-            this.je[i] = d[i];
-            setSignal(this.je[i], e[i]);
+            this.Ye[i] = d[i];
+            setSignal(this.Ye[i], e[i]);
           }
           if (R) {
-            this.Ke[i] = R[i];
-            setSignal(this.Ke[i], i);
+            this.Be[i] = R[i];
+            setSignal(this.Be[i], i);
           }
         } else {
-          this.Fe[i] = runWithOwner((this.$e[i] = createOwner()), r);
+          this.He[i] = runWithOwner((this.je[i] = createOwner()), r);
         }
       }
-      this.Fe = this.Fe.slice(0, (this.Qe = t));
-      this.Ge = e.slice(0);
+      this.He = this.He.slice(0, (this.Ge = t));
+      this.Fe = e.slice(0);
     }
   });
-  return this.Fe;
+  return this.He;
 }
 function repeat(e, t, n) {
   return updateRepeat.bind({
-    We: createOwner(),
-    Qe: 0,
-    Be: 0,
-    Xe: e,
-    Me: t,
-    $e: [],
-    Fe: [],
-    qe: n?.from,
-    Ye: n?.fallback
+    xe: createOwner(),
+    Ge: 0,
+    qe: 0,
+    ze: e,
+    $e: t,
+    je: [],
+    He: [],
+    Ze: n?.from,
+    Xe: n?.fallback
   });
 }
 function updateRepeat() {
-  const e = this.Xe();
-  const t = this.qe?.() || 0;
-  runWithOwner(this.We, () => {
+  const e = this.ze();
+  const t = this.Ze?.() || 0;
+  runWithOwner(this.xe, () => {
     if (e === 0) {
-      if (this.Qe !== 0) {
-        this.We.dispose(false);
-        this.$e = [];
-        this.Fe = [];
-        this.Qe = 0;
+      if (this.Ge !== 0) {
+        this.xe.dispose(false);
+        this.je = [];
+        this.He = [];
+        this.Ge = 0;
       }
-      if (this.Ye && !this.Fe[0]) {
-        this.Fe[0] = runWithOwner((this.$e[0] = createOwner()), this.Ye);
+      if (this.Xe && !this.He[0]) {
+        this.He[0] = runWithOwner((this.je[0] = createOwner()), this.Xe);
       }
       return;
     }
     const n = t + e;
-    const i = this.Be + this.Qe;
-    if (this.Qe === 0 && this.$e[0]) this.$e[0].dispose();
-    for (let e = n; e < i; e++) this.$e[e - this.Be].dispose();
-    if (this.Be < t) {
-      let e = this.Be;
-      while (e < t && e < this.Qe) this.$e[e++].dispose();
-      this.$e.splice(0, t - this.Be);
-      this.Fe.splice(0, t - this.Be);
-    } else if (this.Be > t) {
-      let n = i - this.Be - 1;
-      let r = this.Be - t;
-      this.$e.length = this.Fe.length = e;
+    const i = this.qe + this.Ge;
+    if (this.Ge === 0 && this.je[0]) this.je[0].dispose();
+    for (let e = n; e < i; e++) this.je[e - this.qe].dispose();
+    if (this.qe < t) {
+      let e = this.qe;
+      while (e < t && e < this.Ge) this.je[e++].dispose();
+      this.je.splice(0, t - this.qe);
+      this.He.splice(0, t - this.qe);
+    } else if (this.qe > t) {
+      let n = i - this.qe - 1;
+      let r = this.qe - t;
+      this.je.length = this.He.length = e;
       while (n >= r) {
-        this.$e[n] = this.$e[n - r];
-        this.Fe[n] = this.Fe[n - r];
+        this.je[n] = this.je[n - r];
+        this.He[n] = this.He[n - r];
         n--;
       }
       for (let e = 0; e < r; e++) {
-        this.Fe[e] = runWithOwner((this.$e[e] = createOwner()), () => this.Me(e + t));
+        this.He[e] = runWithOwner((this.je[e] = createOwner()), () => this.$e(e + t));
       }
     }
     for (let e = i; e < n; e++) {
-      this.Fe[e - t] = runWithOwner((this.$e[e - t] = createOwner()), () => this.Me(e));
+      this.He[e - t] = runWithOwner((this.je[e - t] = createOwner()), () => this.$e(e));
     }
-    this.Fe = this.Fe.slice(0, e);
-    this.Be = t;
-    this.Qe = e;
+    this.He = this.He.slice(0, e);
+    this.qe = t;
+    this.Ge = e;
   });
-  return this.Fe;
+  return this.He;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
 }
 function boundaryComputed(e, t) {
   const n = computed(e, undefined, { lazy: true });
-  n.ge = (e, t) => {
-    const i = e !== undefined ? e : n.de;
-    const r = t !== undefined ? t : n.re;
-    n.de &= ~n.ze;
-    n.fe.notify(n, n.ze, i, r);
+  n.Pe = (e, t) => {
+    const i = e !== undefined ? e : n.Oe;
+    const r = t !== undefined ? t : n.se;
+    n.Oe &= ~n.Je;
+    n.Te.notify(n, n.Je, i, r);
   };
-  n.ze = t;
-  n.ye = true;
+  n.Je = t;
+  n.ve = true;
   recompute(n, true);
   return n;
 }
 function createBoundChildren(e, t, n, i) {
-  const r = e.fe;
-  r.addChild((e.fe = n));
-  onCleanup(() => r.removeChild(e.fe));
+  const r = e.Te;
+  r.addChild((e.Te = n));
+  onCleanup(() => r.removeChild(e.Te));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), i);
   });
 }
 class ConditionalQueue extends Queue {
-  Ze;
-  Je = new Set();
-  q = new Set();
+  et;
+  tt = new Set();
+  J = new Set();
   constructor(e) {
     super();
-    this.Ze = e;
+    this.et = e;
   }
   run(e) {
-    if (!e || read(this.Ze)) return;
+    if (!e || read(this.et)) return;
     return super.run(e);
   }
   notify(e, t, n, i) {
-    if (read(this.Ze)) {
+    if (read(this.et)) {
       if (t & STATUS_PENDING) {
         if (n & STATUS_PENDING) {
-          this.q.add(e);
+          this.J.add(e);
           t &= ~STATUS_PENDING;
-        } else if (this.q.delete(e)) t &= ~STATUS_PENDING;
+        } else if (this.J.delete(e)) t &= ~STATUS_PENDING;
       }
       if (t & STATUS_ERROR) {
         if (n & STATUS_ERROR) {
-          this.Je.add(e);
+          this.tt.add(e);
           t &= ~STATUS_ERROR;
-        } else if (this.Je.delete(e)) t &= ~STATUS_ERROR;
+        } else if (this.tt.delete(e)) t &= ~STATUS_ERROR;
       }
     }
-    return t ? super.notify(e, t, n, i ?? e.re) : true;
+    return t ? super.notify(e, t, n, i ?? e.se) : true;
   }
 }
 class CollectionQueue extends Queue {
-  et;
-  tt = new Set();
-  Ze = signal(false, { pureWrite: true });
-  nt = false;
+  nt;
+  it = new Set();
+  et = signal(false, { pureWrite: true });
+  rt = false;
   constructor(e) {
     super();
-    this.et = e;
+    this.nt = e;
   }
   run(e) {
-    if (!e || read(this.Ze)) return;
+    if (!e || read(this.et)) return;
     return super.run(e);
   }
   notify(e, t, n, i) {
-    if (!(t & this.et) || (this.et & STATUS_PENDING && this.nt)) return super.notify(e, t, n, i);
-    if (n & this.et) {
-      const t = i?.t || e.re?.t;
+    if (!(t & this.nt) || (this.nt & STATUS_PENDING && this.rt)) return super.notify(e, t, n, i);
+    if (n & this.nt) {
+      const t = i?.t || e.se?.t;
       if (t) {
-        const e = this.tt.size === 0;
-        this.tt.add(t);
-        if (e) setSignal(this.Ze, true);
+        const e = this.it.size === 0;
+        this.it.add(t);
+        if (e) setSignal(this.et, true);
       }
     }
-    t &= ~this.et;
+    t &= ~this.nt;
     return t ? super.notify(e, t, n, i) : true;
   }
   checkSources() {
-    for (const e of this.tt) {
-      if (!(e.de & this.et)) this.tt.delete(e);
+    for (const e of this.it) {
+      if (!(e.Oe & this.nt)) this.it.delete(e);
     }
-    if (!this.tt.size) setSignal(this.Ze, false);
+    if (!this.it.size) setSignal(this.et, false);
   }
 }
 var BoundaryMode;
@@ -2612,26 +2644,26 @@ function createBoundary(e, t) {
   const i = new ConditionalQueue(computed(() => t() === BoundaryMode.HIDDEN));
   const r = createBoundChildren(n, e, i, 0);
   computed(() => {
-    const e = read(i.Ze);
-    r.ze = e ? STATUS_ERROR | STATUS_PENDING : 0;
+    const e = read(i.et);
+    r.Je = e ? STATUS_ERROR | STATUS_PENDING : 0;
     if (!e) {
-      i.q.forEach(e => i.notify(e, STATUS_PENDING, STATUS_PENDING, e.re));
-      i.Je.forEach(e => i.notify(e, STATUS_ERROR, STATUS_ERROR, e.re));
-      i.q.clear();
-      i.Je.clear();
+      i.J.forEach(e => i.notify(e, STATUS_PENDING, STATUS_PENDING, e.se));
+      i.tt.forEach(e => i.notify(e, STATUS_ERROR, STATUS_ERROR, e.se));
+      i.J.clear();
+      i.tt.clear();
     }
   });
-  return () => (read(i.Ze) ? undefined : read(r));
+  return () => (read(i.et) ? undefined : read(r));
 }
 function createCollectionBoundary(e, t, n) {
   const i = createOwner();
   const r = new CollectionQueue(e);
   const o = createBoundChildren(i, t, r, e);
   const s = computed(() => {
-    if (!read(r.Ze)) {
+    if (!read(r.et)) {
       const e = read(o);
-      if (!untrack(() => read(r.Ze))) {
-        r.nt = true;
+      if (!untrack(() => read(r.et))) {
+        r.rt = true;
         return e;
       }
     }
@@ -2644,10 +2676,10 @@ function createLoadBoundary(e, t) {
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(STATUS_ERROR, e, e => {
-    let n = e.tt.values().next().value;
-    const i = n.re?.cause ?? n.re;
+    let n = e.it.values().next().value;
+    const i = n.se?.cause ?? n.se;
     return t(i, () => {
-      for (const t of e.tt) recompute(t);
+      for (const t of e.it) recompute(t);
       schedule();
     });
   });