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

package/dist/node.cjs

@@ -31,26 +31,26 @@ const i = 1 << 3;
 const s = 1 << 4;
 const o = 1 << 5;
 const u = 1 << 6;
-const l = 1 << 7;
-const f = 1 << 8;
+const f = 1 << 7;
+const l = 1 << 8;
 const c = 1 << 9;
 const a = 1 << 10;
 const d = 1 << 0;
 const p = 1 << 1;
 const h = 1 << 2;
-const g = 1 << 3;
+const y = 1 << 3;
 const S = 1 << 4;
-const y = 1 << 5;
+const g = 1 << 5;
 const w = 1 << 6;
-const m = 1 << 0;
-const _ = 1 << 1;
+const _ = 1 << 0;
+const m = 1 << 1;
 const b = 1 << 2;
 const O = 1;
 const v = 2;
 const P = 3;
 const x = {};
-const C = {};
-const N = "sp";
+const N = {};
+const C = "sp";
 const E = typeof Proxy === "function";
 const k = {};
 const j = Symbol("refresh");
@@ -79,23 +79,23 @@ function actualInsertIntoHeap(e, t) {
   if (r > t.S) t.S = r;
 }
 function insertIntoHeap(e, o) {
-  let u = e.m;
+  let u = e._;
   if (u & (i | r | a)) return;
   if (u & t) {
-    e.m = (u & -4) | n | i;
-  } else e.m = u | i;
+    e._ = (u & -4) | n | i;
+  } else e._ = u | i;
   if (!(u & s)) actualInsertIntoHeap(e, o);
 }
 function insertIntoHeapHeight(e, t) {
-  let n = e.m;
+  let n = e._;
   if (n & (i | r | s | a)) return;
-  e.m = n | s;
+  e._ = n | s;
   actualInsertIntoHeap(e, t);
 }
 function deleteFromHeap(e, t) {
-  const n = e.m;
+  const n = e._;
   if (!(n & (i | s))) return;
-  e.m = n & -25;
+  e._ = n & -25;
   const r = e.o;
   if (e.p === e) t.l[r] = undefined;
   else {
@@ -110,35 +110,35 @@ function deleteFromHeap(e, t) {
   e.h = undefined;
 }
 function markHeap(e) {
-  if (e._) return;
-  e._ = true;
+  if (e.m) return;
+  e.m = true;
   for (let t = 0; t <= e.S; t++) {
     for (let n = e.l[t]; n !== undefined; n = n.h) {
-      if (n.m & i) markNode(n);
+      if (n._ & i) markNode(n);
     }
   }
 }
 function markNode(e, r = n) {
-  const i = e.m;
+  const i = e._;
   if ((i & (t | n)) >= r) return;
-  e.m = (i & -4) | r;
+  e._ = (i & -4) | r;
   for (let n = e.O; n !== null; n = n.P) {
-    markNode(n.C, t);
+    markNode(n.N, t);
   }
-  if (e.N !== null) {
-    for (let n = e.N; n !== null; n = n.k) {
+  if (e.C !== null) {
+    for (let n = e.C; n !== null; n = n.k) {
       for (let e = n.O; e !== null; e = e.P) {
-        markNode(e.C, t);
+        markNode(e.N, t);
       }
     }
   }
 }
 function runHeap(e, t) {
-  e._ = false;
+  e.m = false;
   for (e.j = 0; e.j <= e.S; e.j++) {
     let n = e.l[e.j];
     while (n !== undefined) {
-      if (n.m & i) t(n);
+      if (n._ & i) t(n);
       else adjustHeight(n, e);
       n = e.l[e.j];
     }
@@ -156,7 +156,7 @@ function adjustHeight(e, t) {
   if (e.o !== n) {
     e.o = n;
     for (let n = e.O; n !== null; n = n.P) {
-      insertIntoHeapHeight(n.C, t);
+      insertIntoHeapHeight(n.N, t);
     }
   }
 }
@@ -225,8 +225,8 @@ function assignOrMergeLane(e, t) {
   e.H = t;
 }
 const H = new Set();
-const q = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
-const Q = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
+const q = { l: new Array(2e3).fill(undefined), m: false, j: 0, S: 0 };
+const Q = { l: new Array(2e3).fill(undefined), m: false, j: 0, S: 0 };
 let F = 0;
 let M = null;
 let D = false;
@@ -242,8 +242,8 @@ function canUseSimpleSyncFlush(e) {
     H.size === 0 &&
     T.size === 0 &&
     e.U.length === 0 &&
-    e.J.length === 0 &&
-    e.X.size === 0 &&
+    e.$.length === 0 &&
+    e.J.size === 0 &&
     G.size === 0
   );
 }
@@ -254,10 +254,10 @@ function sweepTransientStoreNodes() {
       G.delete(e);
       continue;
     }
-    if (e.Y !== x) continue;
+    if (e.X !== x) continue;
     if (e.G !== undefined && e.G !== x) continue;
     G.delete(e);
-    e.Z?.();
+    e.Y?.();
   }
 }
 function enforceLoadingBoundary(e) {}
@@ -276,16 +276,16 @@ function runLaneEffects(e) {
 }
 function queueStashedOptimisticEffects(e) {
   for (let t = e.O; t !== null; t = t.P) {
-    const e = t.C;
-    if (!e.$) continue;
-    if (e.$ === P) {
+    const e = t.N;
+    if (!e.Z) continue;
+    if (e.Z === P) {
       if (!e.ee) {
         e.ee = true;
         e.te.enqueue(v, e.ne);
       }
       continue;
     }
-    const n = e.m & o ? Q : q;
+    const n = e._ & o ? Q : q;
     if (n.j > e.o) n.j = e.o;
     insertIntoHeap(e, n);
   }
@@ -297,8 +297,8 @@ function mergeTransitionState(e, t) {
   t.re = e;
   e.ie.push(...t.ie);
   for (const n of T) if (n.V === t) n.V = e;
-  e.J.push(...t.J);
-  for (const n of t.X) e.X.add(n);
+  e.$.push(...t.$);
+  for (const n of t.J) e.J.add(n);
   for (const [n, r] of t.se) {
     let t = e.se.get(n);
     if (!t) e.se.set(n, (t = new Set()));
@@ -310,9 +310,9 @@ function resolveOptimisticNodes(e) {
   for (let t = 0; t < e.length; t++) {
     const n = e[t];
     n.H = undefined;
-    if (n.Y !== x) {
-      n.ue = n.Y;
-      n.Y = x;
+    if (n.X !== x) {
+      n.ue = n.X;
+      n.X = x;
     }
     const r = n.G;
     n.G = x;
@@ -340,11 +340,11 @@ function cleanupCompletedLanes(e) {
 function schedule() {
   if (D) return;
   D = true;
-  if (!V && !z.le && !K) queueMicrotask(flush);
+  if (!V && !z.fe && !K) queueMicrotask(flush);
 }
 class Queue {
   i = null;
-  fe = [[], []];
+  le = [[], []];
   U = [];
   created = F;
   addChild(e) {
@@ -363,9 +363,9 @@ class Queue {
     return false;
   }
   run(e) {
-    if (this.fe[e - 1].length) {
-      const t = this.fe[e - 1];
-      this.fe[e - 1] = [];
+    if (this.le[e - 1].length) {
+      const t = this.le[e - 1];
+      this.le[e - 1] = [];
       runQueue(t, e);
     }
     for (let t = 0; t < this.U.length; t++) this.U[t].run?.(e);
@@ -376,28 +376,28 @@ class Queue {
         const n = findLane(re);
         n.M[e - 1].push(t);
       } else {
-        this.fe[e - 1].push(t);
+        this.le[e - 1].push(t);
       }
     }
     schedule();
   }
   stashQueues(e) {
-    e.fe[0].push(...this.fe[0]);
-    e.fe[1].push(...this.fe[1]);
-    this.fe = [[], []];
+    e.le[0].push(...this.le[0]);
+    e.le[1].push(...this.le[1]);
+    this.le = [[], []];
     for (let t = 0; t < this.U.length; t++) {
       let n = this.U[t];
       let r = e.U[t];
       if (!r) {
-        r = { fe: [[], []], U: [] };
+        r = { le: [[], []], U: [] };
         e.U[t] = r;
       }
       n.stashQueues(r);
     }
   }
   restoreQueues(e) {
-    this.fe[0].push(...e.fe[0]);
-    this.fe[1].push(...e.fe[1]);
+    this.le[0].push(...e.le[0]);
+    this.le[1].push(...e.le[1]);
     for (let t = 0; t < e.U.length; t++) {
       const n = e.U[t];
       let r = this.U[t];
@@ -406,18 +406,18 @@ class Queue {
   }
 }
 class GlobalQueue extends Queue {
-  le = false;
+  fe = false;
   ce = null;
   ae = [];
-  J = [];
-  X = new Set();
+  $ = [];
+  J = new Set();
   static de;
   static pe;
   static he;
-  static ge = null;
+  static ye = null;
   flush() {
-    if (this.le) return;
-    this.le = true;
+    if (this.fe) return;
+    this.fe = true;
     try {
       runHeap(q, GlobalQueue.de);
       if (M) {
@@ -427,8 +427,8 @@ class GlobalQueue extends Queue {
           runHeap(Q, GlobalQueue.de);
           this.ce = null;
           this.ae = [];
-          this.J = [];
-          this.X = new Set();
+          this.$ = [];
+          this.J = new Set();
           runLaneEffects(O);
           runLaneEffects(v);
           this.stashQueues(e.Se);
@@ -436,11 +436,11 @@ class GlobalQueue extends Queue {
           D = q.S >= q.j;
           reassignPendingTransition(e.ae);
           M = null;
-          if (!e.ie.length && !e.se.size && e.J.length) {
+          if (!e.ie.length && !e.se.size && e.$.length) {
             B = new Set();
-            for (let t = 0; t < e.J.length; t++) {
-              const n = e.J[t];
-              if (n.L || n.ye & d) continue;
+            for (let t = 0; t < e.$.length; t++) {
+              const n = e.$[t];
+              if (n.L || n.ge & d) continue;
               B.add(n);
               queueStashedOptimisticEffects(n);
             }
@@ -479,12 +479,12 @@ class GlobalQueue extends Queue {
       this.run(v);
       if (false);
     } finally {
-      this.le = false;
+      this.fe = false;
     }
   }
   notify(e, t, n, r) {
-    if (t & m) {
-      if (n & m) {
+    if (t & _) {
+      if (n & _) {
         const t = r !== undefined ? r : e.we;
         if (M && t) {
           const n = t.source;
@@ -502,16 +502,16 @@ class GlobalQueue extends Queue {
   initTransition(e) {
     if (e) e = currentTransition(e);
     if (e && e === M) return;
-    if (!e && M && M.me === F) return;
+    if (!e && M && M._e === F) return;
     if (!M) {
       M = e ?? {
-        me: F,
+        _e: F,
         ae: [],
         se: new Map(),
-        J: [],
-        X: new Set(),
+        $: [],
+        J: new Set(),
         ie: [],
-        Se: { fe: [[], []], U: [] },
+        Se: { le: [[], []], U: [] },
         re: false,
         oe: new Set()
       };
@@ -522,7 +522,7 @@ class GlobalQueue extends Queue {
       M = e;
     }
     H.add(M);
-    M.me = F;
+    M._e = F;
     if (this.ce !== null) {
       this.ce.V = M;
       M.ae.push(this.ce);
@@ -536,20 +536,20 @@ class GlobalQueue extends Queue {
       }
       this.ae = M.ae;
     }
-    if (this.J !== M.J) {
-      for (let e = 0; e < this.J.length; e++) {
-        const t = this.J[e];
+    if (this.$ !== M.$) {
+      for (let e = 0; e < this.$.length; e++) {
+        const t = this.$[e];
         t.V = M;
-        M.J.push(t);
+        M.$.push(t);
       }
-      this.J = M.J;
+      this.$ = M.$;
     }
     for (const e of T) {
       if (!e.V) e.V = M;
     }
-    if (this.X !== M.X) {
-      for (const e of this.X) M.X.add(e);
-      this.X = M.X;
+    if (this.J !== M.J) {
+      for (const e of this.J) M.J.add(e);
+      this.J = M.J;
     }
   }
 }
@@ -570,48 +570,48 @@ function queuePendingNode(e) {
 }
 function insertSubs(e, t = false) {
   const n = e.H || re;
-  const r = e._e !== undefined;
+  const r = e.me !== undefined;
   for (let i = e.O; i !== null; i = i.P) {
-    if (r && i.C.ye & g) {
-      i.C.m |= f;
+    if (r && i.N.ge & y) {
+      i.N._ |= l;
       continue;
     }
     if (t && n) {
-      i.C.m |= l;
-      assignOrMergeLane(i.C, n);
+      i.N._ |= f;
+      assignOrMergeLane(i.N, n);
     } else if (t) {
-      i.C.m |= l;
-      i.C.H = undefined;
+      i.N._ |= f;
+      i.N.H = undefined;
     }
-    const e = i.C;
-    if (e.$ === P) {
+    const e = i.N;
+    if (e.Z === P) {
       if (!e.ee) {
         e.ee = true;
         e.te.enqueue(v, e.ne);
       }
       continue;
     }
-    const s = i.C.m & o ? Q : q;
-    if (s.j > i.C.o) s.j = i.C.o;
-    insertIntoHeap(i.C, s);
+    const s = i.N._ & o ? Q : q;
+    if (s.j > i.N.o) s.j = i.N.o;
+    insertIntoHeap(i.N, s);
   }
 }
 function commitPendingNode(e) {
   const t = e;
   if (!t.L) {
-    if (e.Y !== x) {
-      e.ue = e.Y;
-      e.Y = x;
+    if (e.X !== x) {
+      e.ue = e.X;
+      e.X = x;
     }
     return;
   }
-  if (e.Y !== x) {
-    e.ue = e.Y;
-    e.Y = x;
-    if (e.$ && e.$ !== P) e.ee = true;
+  if (e.X !== x) {
+    e.ue = e.X;
+    e.X = x;
+    if (e.Z && e.Z !== P) e.ee = true;
   }
-  t.m &= ~a;
-  if (!(t.be & m)) t.be &= ~b;
+  t._ &= ~a;
+  if (!(t.be & _)) t.be &= ~b;
   if (t.Oe !== null || t.ve !== null) GlobalQueue.pe(t, false, true);
 }
 function commitPendingNodes() {
@@ -633,27 +633,27 @@ function finalizePureQueue(e = null, t = false) {
   if (r) runHeap(q, GlobalQueue.de);
   if (n) {
     if (r) commitPendingNodes();
-    resolveOptimisticNodes(e ? e.J : z.J);
+    resolveOptimisticNodes(e ? e.$ : z.$);
     if (e && e.oe.size) {
       for (const t of e.oe) {
-        if (t.m & u) continue;
-        if (t.$ === P) {
+        if (t._ & u) continue;
+        if (t.Z === P) {
           if (!t.ee) {
             t.ee = true;
             t.te.enqueue(v, t.ne);
           }
           continue;
         }
-        const e = t.m & o ? Q : q;
+        const e = t._ & o ? Q : q;
         if (e.j > t.o) e.j = t.o;
         insertIntoHeap(t, e);
       }
       e.oe.clear();
     }
-    const t = e ? e.X : z.X;
-    if (GlobalQueue.ge && t.size) {
+    const t = e ? e.J : z.J;
+    if (GlobalQueue.ye && t.size) {
       for (const e of t) {
-        GlobalQueue.ge(e);
+        GlobalQueue.ye(e);
       }
       t.clear();
       schedule();
@@ -669,7 +669,7 @@ function checkBoundaryChildren(e) {
   }
 }
 function trackOptimisticStore(e) {
-  z.X.add(e);
+  z.J.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
@@ -688,7 +688,7 @@ function flush(e) {
       V--;
     }
   }
-  if (z.le) {
+  if (z.fe) {
     return;
   }
   while (D || M) {
@@ -699,7 +699,7 @@ function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function reporterBlocksSource(e, t) {
-  if (e.m & (o | u)) return false;
+  if (e._ & (o | u)) return false;
   if (e.Pe === t || e.xe?.has(t)) return true;
   for (let n = e.W; n; n = n.R) {
     let e = n.A;
@@ -708,7 +708,7 @@ function reporterBlocksSource(e, t) {
       e = e.T;
     }
   }
-  return !!(e.be & m && e.we instanceof NotReadyError && e.we.source === t);
+  return !!(e.be & _ && e.we instanceof NotReadyError && e.we.source === t);
 }
 function transitionComplete(e) {
   if (e.re) return true;
@@ -724,18 +724,18 @@ function transitionComplete(e) {
       r.delete(e);
     }
     if (!i) e.se.delete(n);
-    else if (n.be & m && n.we?.source === n) {
+    else if (n.be & _ && n.we?.source === n) {
       t = false;
       break;
     }
   }
   if (t) {
-    for (let n = 0; n < e.J.length; n++) {
-      const r = e.J[n];
+    for (let n = 0; n < e.$.length; n++) {
+      const r = e.$[n];
       if (
         hasActiveOverride(r) &&
         "be" in r &&
-        r.be & m &&
+        r.be & _ &&
         r.we instanceof NotReadyError &&
         r.we.source !== r
       ) {
@@ -765,15 +765,15 @@ function runInTransition(e, t) {
 }
 const U = {};
 function markDisposal(e) {
-  let t = e.Ce;
+  let t = e.Ne;
   while (t) {
-    t.m |= o;
-    if (t.m & i) {
+    t._ |= o;
+    if (t._ & i) {
       deleteFromHeap(t, q);
       insertIntoHeap(t, Q);
     }
     markDisposal(t);
-    t = t.Ne;
+    t = t.Ce;
   }
 }
 function dispose(e) {
@@ -786,16 +786,16 @@ function dispose(e) {
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
-  const r = e.m;
+  const r = e._;
   if (r & u) return;
-  if (t) e.m = r | u;
+  if (t) e._ = r | u;
   if (t && e.L) e.ke = null;
-  let i = n ? e.Oe : e.Ce;
+  let i = n ? e.Oe : e.Ne;
   while (i) {
-    const e = i.Ne;
+    const e = i.Ce;
     if (i.W) {
       const e = i;
-      deleteFromHeap(e, e.m & o ? Q : q);
+      deleteFromHeap(e, e._ & o ? Q : q);
       let t = e.W;
       do {
         t = unlinkSubs(t);
@@ -809,14 +809,14 @@ function disposeChildren(e, t = false, n) {
   if (n) {
     e.Oe = null;
   } else {
-    e.Ce = null;
+    e.Ne = null;
     e.je = 0;
   }
-  if (t && !n && !(r & o) && e.i !== null && !(e.i.m & u)) {
+  if (t && !n && !(r & o) && e.i !== null && !(e.i._ & u)) {
     const t = e.We;
-    const n = e.Ne;
-    if (t !== null) t.Ne = n;
-    else e.i.Ce = n;
+    const n = e.Ce;
+    if (t !== null) t.Ce = n;
+    else e.i.Ne = n;
     if (n !== null) n.We = t;
     e.We = null;
   }
@@ -837,7 +837,7 @@ function runDisposal(e, t) {
 }
 function childId(e, t) {
   let n = e;
-  while (n.ye & h && n.i) n = n.i;
+  while (n.ge & h && n.i) n = n.i;
   if (n.id != null) return formatId(n.id, t ? n.je++ : n.je);
   throw new Error("Cannot get child id from owner without an id");
 }
@@ -853,8 +853,8 @@ function formatId(e, t) {
   return e + (r ? String.fromCharCode(64 + r) : "") + n;
 }
 function getObserver() {
-  if ($ || te) return U;
-  return X ? ne : null;
+  if (Z || te) return U;
+  return J ? ne : null;
 }
 function getOwner() {
   return ne;
@@ -867,7 +867,7 @@ function cleanup(e) {
   return e;
 }
 function isDisposed(e) {
-  return !!(e.m & (u | o));
+  return !!(e._ & (u | o));
 }
 function disposeRootSelf(e = true) {
   disposeChildren(this, e);
@@ -877,11 +877,11 @@ function createOwner(e) {
   const n = e?.transparent ?? false;
   const r = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    ye: n ? h : 0,
+    ge: n ? h : 0,
     t: true,
     u: t?.t ? t.u : t,
-    Ce: null,
     Ne: null,
+    Ce: null,
     We: null,
     Re: null,
     te: t?.te ?? z,
@@ -893,13 +893,13 @@ function createOwner(e) {
     dispose: disposeRootSelf
   };
   if (t) {
-    const e = t.Ce;
+    const e = t.Ne;
     if (e === null) {
-      t.Ce = r;
+      t.Ne = r;
     } else {
-      r.Ne = e;
+      r.Ce = e;
       e.We = r;
-      t.Ce = r;
+      t.Ne = r;
     }
   }
   return r;
@@ -919,9 +919,9 @@ function unlinkSubs(e) {
   else {
     t.O = r;
     if (r === null) {
-      t.Z?.();
+      t.Y?.();
       const e = t;
-      e.L && e.ye & y && !(e.m & o) && unobserved(e);
+      e.L && e.ge & g && !(e._ & o) && unobserved(e);
     }
   }
   return n;
@@ -938,7 +938,7 @@ function trimStaleDeps(e) {
   }
 }
 function unobserved(e) {
-  deleteFromHeap(e, e.m & o ? Q : q);
+  deleteFromHeap(e, e._ & o ? Q : q);
   let t = e.W;
   while (t !== null) {
     t = unlinkSubs(t);
@@ -951,7 +951,7 @@ function link(e, t) {
   const n = t.Ee;
   if (n !== null && n.A === e) return;
   let i = null;
-  const s = t.m & r;
+  const s = t._ & r;
   if (s) {
     i = n !== null ? n.R : t.W;
     if (i !== null && i.A === e) {
@@ -960,8 +960,8 @@ function link(e, t) {
     }
   }
   const o = e.Le;
-  if (o !== null && o.C === t && (!s || isValidLink(o, t))) return;
-  const u = (t.Ee = e.Le = { A: e, C: t, R: i, Ie: o, P: null });
+  if (o !== null && o.N === t && (!s || isValidLink(o, t))) return;
+  const u = (t.Ee = e.Le = { A: e, N: t, R: i, Ie: o, P: null });
   if (n !== null) n.R = u;
   else t.W = u;
   if (o !== null) o.P = u;
@@ -1028,9 +1028,9 @@ function setPendingError(e, t, n) {
   }
 }
 function forEachDependent(e, t) {
-  for (let n = e.O; n !== null; n = n.P) t(n.C);
-  for (let n = e.N; n !== null; n = n.k) {
-    for (let e = n.O; e !== null; e = e.P) t(e.C);
+  for (let n = e.O; n !== null; n = n.P) t(n.N);
+  for (let n = e.C; n !== null; n = n.k) {
+    for (let e = n.O; e !== null; e = e.P) t(e.N);
   }
 }
 function settlePendingSource(e) {
@@ -1039,24 +1039,24 @@ function settlePendingSource(e) {
   const settle = r => {
     if (n.has(r) || !removePendingSource(r, e)) return;
     n.add(r);
-    r.me = F;
+    r._e = F;
     const i = r.Pe ?? r.xe?.values().next().value;
     if (i) {
       setPendingError(r, i);
       updatePendingSignal(r);
     } else {
-      r.be &= ~m;
+      r.be &= ~_;
       setPendingError(r);
       updatePendingSignal(r);
       if (r.Te) {
-        if (r.$ === P) {
+        if (r.Z === P) {
           const e = r;
           if (!e.ee) {
             e.ee = true;
             e.te.enqueue(v, e.ne);
           }
         } else {
-          const e = r.m & o ? Q : q;
+          const e = r._ & o ? Q : q;
           if (e.j > r.o) e.j = r.o;
           insertIntoHeap(r, e);
         }
@@ -1087,12 +1087,12 @@ function handleAsync(e, t, r) {
   const handleError = n => {
     if (e.ke !== t) return;
     z.initTransition(resolveTransition(e));
-    notifyStatus(e, n instanceof NotReadyError ? m : _, n);
-    e.me = F;
+    notifyStatus(e, n instanceof NotReadyError ? _ : m, n);
+    e._e = F;
   };
   const asyncWrite = (i, s) => {
     if (e.ke !== t) return;
-    if (e.m & (n | l)) return;
+    if (e._ & (n | f)) return;
     z.initTransition(resolveTransition(e));
     const o = !!(e.be & b);
     trimStaleDeps(e);
@@ -1101,19 +1101,19 @@ function handleAsync(e, t, r) {
     if (u) u.F.delete(e);
     if (r) r(i);
     else if (e.G !== undefined) {
-      if (e.G !== undefined && e.G !== x) e.Y = i;
+      if (e.G !== undefined && e.G !== x) e.X = i;
       else {
         e.ue = i;
         insertSubs(e);
       }
-      e.me = F;
+      e._e = F;
     } else if (u) {
-      const t = e.$;
+      const t = e.Z;
       const n = e.ue;
       const r = e.He;
       if ((!t && o) || !r || !r(i, n)) {
         e.ue = i;
-        e.me = F;
+        e._e = F;
         if (e.qe) {
           setSignal(e.qe, i);
         }
@@ -1164,10 +1164,10 @@ function handleAsync(e, t, r) {
     const iterate = () => {
       let s,
         u = false,
-        l = true;
+        f = true;
       n.next().then(
         n => {
-          if (l) {
+          if (f) {
             s = n;
             u = true;
             if (n.done) i = true;
@@ -1181,13 +1181,13 @@ function handleAsync(e, t, r) {
           }
         },
         n => {
-          if (!l && e.ke === t) {
+          if (!f && e.ke === t) {
             i = true;
             handleError(n);
           }
         }
       );
-      l = false;
+      f = false;
       if (u && !s.done) {
         o = s.value;
         r = true;
@@ -1212,20 +1212,20 @@ function clearStatus(e, t = false) {
   if (e.Fe) e.Fe();
 }
 function notifyStatus(e, t, n, r, i) {
-  if (t === _ && !(n instanceof StatusError) && !(n instanceof NotReadyError))
+  if (t === m && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
-  const s = t === m && n instanceof NotReadyError ? n.source : undefined;
+  const s = t === _ && n instanceof NotReadyError ? n.source : undefined;
   const o = s === e;
-  const u = t === m && e.G !== undefined && !o;
-  const l = u && hasActiveOverride(e);
+  const u = t === _ && e.G !== undefined && !o;
+  const f = u && hasActiveOverride(e);
   if (!r) {
-    if (t === m && s) {
+    if (t === _ && s) {
       addPendingSource(e, s);
-      e.be = m | (e.be & b);
+      e.be = _ | (e.be & b);
       setPendingError(e, s, n);
     } else {
       clearPendingSources(e);
-      e.be = t | (t !== _ ? e.be & b : 0);
+      e.be = t | (t !== m ? e.be & b : 0);
       e.we = n;
     }
     updatePendingSignal(e);
@@ -1233,13 +1233,13 @@ function notifyStatus(e, t, n, r, i) {
   if (i && !r) {
     assignOrMergeLane(e, i);
   }
-  const f = r || l;
+  const l = r || f;
   const c = r || u ? undefined : i;
   if (e.Fe) {
-    if (r && t === m) {
+    if (r && t === _) {
       return;
     }
-    if (f) {
+    if (l) {
       e.Fe(t, n);
     } else {
       e.Fe();
@@ -1247,22 +1247,22 @@ function notifyStatus(e, t, n, r, i) {
     return;
   }
   forEachDependent(e, e => {
-    e.me = F;
+    e._e = F;
     if (
-      (t === m && s && e.Pe !== s && !e.xe?.has(s)) ||
-      (t !== m && (e.we !== n || e.Pe || e.xe))
+      (t === _ && s && e.Pe !== s && !e.xe?.has(s)) ||
+      (t !== _ && (e.we !== n || e.Pe || e.xe))
     ) {
-      if (!f && !e.V) queuePendingNode(e);
-      notifyStatus(e, t, n, f, c);
+      if (!l && !e.V) queuePendingNode(e);
+      notifyStatus(e, t, n, l, c);
     }
   });
 }
-let J = null;
+let $ = null;
 function enableExternalSource(e) {
   const { factory: t, untrack: n = e => e() } = e;
-  if (J) {
-    const { factory: e, untrack: r } = J;
-    J = {
+  if ($) {
+    const { factory: e, untrack: r } = $;
+    $ = {
       factory: (n, r) => {
         const i = e(n, r);
         const s = t(e => i.track(e), r);
@@ -1277,21 +1277,22 @@ function enableExternalSource(e) {
       untrack: e => r(() => n(e))
     };
   } else {
-    J = { factory: t, untrack: n };
+    $ = { factory: t, untrack: n };
   }
 }
 GlobalQueue.de = recompute;
 GlobalQueue.pe = disposeChildren;
+let J = false;
 let X = false;
 let Y = false;
 let Z = false;
-let $ = false;
 let ee = false;
 let te = false;
 let ne = null;
 let re = null;
-let ie = false;
-let se = null;
+let ie = null;
+let se = false;
+let oe = null;
 function ownerInSnapshotScope(e) {
   while (e) {
     if (e.Me) return true;
@@ -1300,8 +1301,8 @@ function ownerInSnapshotScope(e) {
   return false;
 }
 function setSnapshotCapture(e) {
-  ie = e;
-  if (e && !se) se = new Set();
+  se = e;
+  if (e && !oe) oe = new Set();
 }
 function markSnapshotScope(e) {
   e.Me = true;
@@ -1312,89 +1313,89 @@ function releaseSnapshotScope(e) {
   schedule();
 }
 function releaseSubtree(e) {
-  let t = e.Ce;
+  let t = e.Ne;
   while (t) {
     if (t.Me) {
-      t = t.Ne;
+      t = t.Ce;
       continue;
     }
     if (t.L) {
       const e = t;
-      e.ye &= ~g;
-      if (e.m & f) {
-        e.m &= ~f;
-        e.m |= n;
+      e.ge &= ~y;
+      if (e._ & l) {
+        e._ &= ~l;
+        e._ |= n;
         if (q.j > e.o) q.j = e.o;
         insertIntoHeap(e, q);
       }
     }
     releaseSubtree(t);
-    t = t.Ne;
+    t = t.Ce;
   }
 }
 function clearSnapshots() {
-  if (se) {
-    for (const e of se) {
-      delete e._e;
-      delete e[N];
+  if (oe) {
+    for (const e of oe) {
+      delete e.me;
+      delete e[C];
     }
-    se = null;
+    oe = null;
   }
-  ie = false;
+  se = false;
 }
 function recompute(t, n = false) {
-  const i = t.$;
+  const i = t.Z;
   if (!n) {
     if (t.V && (!i || M) && M !== t.V) z.initTransition(t.V);
-    deleteFromHeap(t, t.m & o ? Q : q);
+    deleteFromHeap(t, t._ & o ? Q : q);
     t.ke = null;
     if (t.V || i === P) disposeChildren(t);
-    else if (t.Ce !== null || t.Re !== null) {
+    else if (t.Ne !== null || t.Re !== null) {
       markDisposal(t);
       t.ve = t.Re;
-      t.Oe = t.Ce;
+      t.Oe = t.Ne;
       t.Re = null;
-      t.Ce = null;
+      t.Ne = null;
       t.je = 0;
     } else;
   }
-  let s = !!(t.m & l);
+  let s = !!(t._ & f);
   const u = t.G !== undefined && t.G !== x;
-  const c = !!(t.be & m);
+  const c = !!(t.be & _);
   const a = !!(t.be & b);
   const d = ne;
   ne = t;
   t.Ee = null;
-  t.m = r;
-  t.me = F;
-  let p = t.Y === x ? t.ue : t.Y;
+  t._ = r;
+  t._e = F;
+  let p = t.X === x ? t.ue : t.X;
   let h = t.o;
-  let g = X;
+  let y = J;
   let S = re;
-  X = true;
+  J = true;
   if (s) {
     const e = resolveLane(t);
     if (e) re = e;
-  } else if (M && !n && M.J.length) {
+  } else if (M && !n && M.$.length) {
     for (let e = t.W; e; e = e.R) {
       const n = e.A;
-      if (n.m & l) {
+      if (n._ & f) {
         const e = resolveLane(n);
         if (e) {
           s = true;
           re = e;
-          t.m |= l;
+          t._ |= f;
           assignOrMergeLane(t, e);
           break;
         }
       }
     }
   }
-  const y = i && i !== v;
-  const O = Y;
-  if (y) Y = true;
+  const g = i && i !== v;
+  const O = X;
+  if (g) X = true;
   try {
-    if (!false && t.ye & w) {
+    if (!false && t.ge & w) {
       p = t.L(p);
       t.ke = null;
     } else {
@@ -1425,20 +1426,20 @@ function recompute(t, n = false) {
     if (e instanceof NotReadyError) t.Te = true;
     notifyStatus(
       t,
-      e instanceof NotReadyError ? m : _,
+      e instanceof NotReadyError ? _ : m,
       e,
       undefined,
       e instanceof NotReadyError ? t.H : undefined
     );
   } finally {
-    X = g;
-    if (y) Y = O;
-    t.m = e | (n ? t.m & f : 0);
+    J = y;
+    if (g) X = O;
+    t._ = e | (n ? t._ & l : 0);
     ne = d;
   }
   if (!t.we) {
     trimStaleDeps(t);
-    const e = u ? t.G : t.Y === x ? t.ue : t.Y;
+    const e = u ? t.G : t.X === x ? t.ue : t.X;
     const r = (!i && a) || !t.He || !t.He(e, p);
     if (i && r) {
       t.ee = !t.we;
@@ -1450,54 +1451,54 @@ function recompute(t, n = false) {
         t.ue = p;
         if (u && s) {
           t.G = p;
-          t.Y = p;
+          t.X = p;
         }
-      } else t.Y = p;
+      } else t.X = p;
       if (u && !s && c && !t.B) t.G = p;
       if (!u || s || t.G !== e) insertSubs(t, s || u);
     } else if (u) {
-      t.Y = p;
+      t.X = p;
     } else if (t.o != h) {
       for (let e = t.O; e !== null; e = e.P) {
-        insertIntoHeapHeight(e.C, e.C.m & o ? Q : q);
+        insertIntoHeapHeight(e.N, e.N._ & o ? Q : q);
       }
     }
   }
   re = S;
-  const C = t.Y !== x || t.Oe !== null || t.ve !== null || !!(t.be & (m | b));
-  C && (!n || t.be & m) && !t.V && !(M && u) && queuePendingNode(t);
+  const N = t.X !== x || t.Oe !== null || t.ve !== null || !!(t.be & (_ | b));
+  N && (!n || t.be & _) && !t.V && !(M && u) && queuePendingNode(t);
   t.V && i && M !== t.V && runInTransition(t.V, () => recompute(t));
 }
 function updateIfNecessary(e) {
-  if (e.m & t) {
+  if (e._ & t) {
     for (let t = e.W; t; t = t.R) {
       const r = t.A;
       const i = r.I || r;
       if (i.L) {
         updateIfNecessary(i);
       }
-      if (e.m & n) {
+      if (e._ & n) {
         break;
       }
     }
   }
-  if (e.m & (n | l) || (e.we && e.me < F && !e.ke)) {
+  if (e._ & (n | f) || (e.we && e._e < F && !e.ke)) {
     recompute(e);
   }
-  e.m = e.m & (f | i | s);
+  e._ = e._ & (l | i | s);
 }
 function computed(t, n) {
   const r = n?.transparent ?? false;
   const i = {
     id: n?.id ?? (r ? ne?.id : ne?.id != null ? getNextChildId(ne) : undefined),
-    ye:
+    ge:
       (r ? h : 0) |
       (n?.ownedWrite ? d : 0) |
-      (!ne || n?.lazy ? y : 0) |
+      (!ne || n?.lazy ? g : 0) |
       (n?.sync ? w : 0) |
-      (ie && ownerInSnapshotScope(ne) ? g : 0),
+      (se && ownerInSnapshotScope(ne) ? y : 0),
     He: n?.equals != null ? n.equals : isEqual,
-    Z: n?.unobserved,
+    Y: n?.unobserved,
     Re: null,
     te: ne?.te ?? z,
     Ae: ne?.Ae ?? k,
@@ -1505,7 +1506,7 @@ function computed(t, n) {
     L: t,
     ue: undefined,
     o: 0,
-    N: null,
+    C: null,
     h: undefined,
     p: null,
     W: null,
@@ -1513,13 +1514,13 @@ function computed(t, n) {
     O: null,
     Le: null,
     i: ne,
-    Ne: null,
-    We: null,
     Ce: null,
-    m: n?.lazy ? c : e,
+    We: null,
+    Ne: null,
+    _: n?.lazy ? c : e,
     be: b,
-    me: F,
-    Y: x,
+    _e: F,
+    X: x,
     ve: null,
     Oe: null,
     ke: null,
@@ -1532,13 +1533,13 @@ function createEffectNode(e, t, n, r, i, s) {
   const o = s?.transparent ?? false;
   const u = {
     id: s?.id ?? (o ? ne?.id : ne?.id != null ? getNextChildId(ne) : undefined),
-    ye:
+    ge:
       (o ? h : 0) |
       (s?.ownedWrite ? d : 0) |
       (s?.sync ? w : 0) |
-      (ie && ownerInSnapshotScope(ne) ? g : 0),
+      (se && ownerInSnapshotScope(ne) ? y : 0),
     He: false,
-    Z: s?.unobserved,
+    Y: s?.unobserved,
     Re: null,
     te: ne?.te ?? z,
     Ae: ne?.Ae ?? k,
@@ -1546,7 +1547,7 @@ function createEffectNode(e, t, n, r, i, s) {
     L: e,
     ue: undefined,
     o: 0,
-    N: null,
+    C: null,
     h: undefined,
     p: null,
     W: null,
@@ -1554,13 +1555,13 @@ function createEffectNode(e, t, n, r, i, s) {
     O: null,
     Le: null,
     i: ne,
-    Ne: null,
-    We: null,
     Ce: null,
-    m: c,
+    We: null,
+    Ne: null,
+    _: c,
     be: b,
-    me: F,
-    Y: x,
+    _e: F,
+    X: x,
     ve: null,
     Oe: null,
     ke: null,
@@ -1571,30 +1572,30 @@ function createEffectNode(e, t, n, r, i, s) {
     Ke: n,
     Be: undefined,
     Ge: false,
-    $: r,
+    Z: r,
     Fe: i
   };
-  setupComputedNode(u, oe);
+  setupComputedNode(u, ue);
   return u;
 }
-const oe = { lazy: true };
+const ue = { lazy: true };
 function setupComputedNode(e, t) {
   e.p = e;
   const n = ne?.t ? ne.u : ne;
   if (ne) {
-    const t = ne.Ce;
+    const t = ne.Ne;
     if (t === null) {
-      ne.Ce = e;
+      ne.Ne = e;
     } else {
-      e.Ne = t;
+      e.Ce = t;
       t.We = e;
-      ne.Ce = e;
+      ne.Ne = e;
     }
   }
   if (n) e.o = n.o + 1;
-  if (J) {
+  if ($) {
     const t = signal(undefined, { equals: false, ownedWrite: true });
-    const n = J.factory(e.L, () => {
+    const n = $.factory(e.L, () => {
       setSignal(t, undefined);
     });
     cleanup(() => n.dispose());
@@ -1604,30 +1605,30 @@ function setupComputedNode(e, t) {
     };
   }
   !t?.lazy && recompute(e, true);
-  if (ie && !t?.lazy) {
-    if (!(e.be & m)) {
-      e._e = e.ue === undefined ? C : e.ue;
-      se.add(e);
+  if (se && !t?.lazy) {
+    if (!(e.be & _)) {
+      e.me = e.ue === undefined ? N : e.ue;
+      oe.add(e);
     }
   }
 }
 function signal(e, t, n = null) {
   const r = {
     He: t?.equals != null ? t.equals : isEqual,
-    ye: (t?.ownedWrite ? d : 0) | (t?.ze ? p : 0),
-    Z: t?.unobserved,
+    ge: (t?.ownedWrite ? d : 0) | (t?.ze ? p : 0),
+    Y: t?.unobserved,
     ue: e,
     O: null,
     Le: null,
-    me: F,
+    _e: F,
     I: n,
-    k: n?.N || null,
-    Y: x
+    k: n?.C || null,
+    X: x
   };
-  n && (n.N = r);
-  if (ie && !(r.ye & p) && !((n?.be ?? 0) & m)) {
-    r._e = e === undefined ? C : e;
-    se.add(r);
+  n && (n.C = r);
+  if (se && !(r.ge & p) && !((n?.be ?? 0) & _)) {
+    r.me = e === undefined ? N : e;
+    oe.add(r);
   }
   return r;
 }
@@ -1645,14 +1646,14 @@ function isEqual(e, t) {
   return e === t;
 }
 function untrack(e, t) {
-  if (!J && !X && true) return e();
-  const n = X;
-  X = false;
+  if (!$ && !J && true) return e();
+  const n = J;
+  J = false;
   try {
-    if (J) return J.untrack(e);
+    if ($) return $.untrack(e);
     return e();
   } finally {
-    X = n;
+    J = n;
   }
 }
 function read(e) {
@@ -1670,8 +1671,8 @@ function read(e) {
     } finally {
       te = n;
     }
-    if (t.be & m) return r;
-    if (Y && re && t.H) {
+    if (t.be & _) return r;
+    if (X && re && t.H) {
       const e = findLane(t.H);
       const n = findLane(re);
       if (e !== n && e.F.size > 0) {
@@ -1680,35 +1681,52 @@ function read(e) {
     }
     return i;
   }
-  if ($) {
+  if (Z) {
     const t = e.I;
-    const n = $;
-    $ = false;
+    const n = Z;
+    Z = false;
+    let r = ne;
+    if (r?.t) r = r.u;
+    const i = t || e;
+    const s = e;
+    if (typeof s.L === "function") {
+      const t = e;
+      if (t._ & c) {
+        t._ &= ~c;
+        recompute(t, true);
+      } else if (t._ & u) {
+        recompute(t, true);
+      } else {
+        updateIfNecessary(t);
+      }
+    }
+    if (r && i.be & _ && i.be & b) {
+      if (J && e !== r) link(e, r);
+      Z = n;
+      throw i.we;
+    }
     if (t && e.G !== undefined) {
-      if (e.G !== x && (t.ke || !!(t.be & m))) {
+      if (e.G !== x && (t.ke || !!(t.be & _))) {
         ee = true;
       }
-      let n = ne;
-      if (n?.t) n = n.u;
-      if (n && X) link(e, n);
-      read(getPendingSignal(e));
-      read(getPendingSignal(t));
+      collectPendingSources(e);
+      collectPendingSources(t);
+      if (r && J) link(e, r);
     } else {
-      if (read(getPendingSignal(e))) ee = true;
-      if (t && read(getPendingSignal(t))) ee = true;
+      collectPendingSources(e);
+      if (t) collectPendingSources(t);
     }
-    $ = n;
-    return e.ue;
+    Z = n;
   }
   let t = ne;
   if (t?.t) t = t.u;
   const n = e;
   if (typeof n.L === "function") {
     const t = e;
-    if (t.m & c) {
-      t.m &= ~c;
+    if (t._ & c) {
+      t._ &= ~c;
       recompute(t, true);
-    } else if (t.m & u) {
+    } else if (t._ & u) {
       recompute(t, true);
     }
   }
@@ -1717,19 +1735,19 @@ function read(e) {
     !n.L &&
     r === e &&
     e.G === undefined &&
-    e._e === undefined &&
+    e.me === undefined &&
     M === null &&
     re === null &&
-    !ie &&
+    !se &&
     true
   ) {
-    if (t && X) link(e, t);
-    return !t || e.Y === x ? e.ue : e.Y;
+    if (t && J) link(e, t);
+    return !t || e.X === x ? e.ue : e.X;
   }
-  if (t && X) {
+  if (t && J) {
     link(e, t);
     if (r.L) {
-      const n = e.m & o;
+      const n = e._ & o;
       if (r.o >= (n ? Q.j : q.j)) {
         markNode(t);
         markHeap(n ? Q : q);
@@ -1741,57 +1759,57 @@ function read(e) {
       }
     }
   }
-  if (r.be & m) {
-    if (t && !(Y && r.V && M !== r.V)) {
+  if (r.be & _) {
+    if (t && !(X && r.V && M !== r.V)) {
       if (re) {
         const n = r.H;
         const i = findLane(re);
         if (n && findLane(n) === i && !hasActiveOverride(r)) {
-          if (!X && e !== t) link(e, t);
+          if (!J && e !== t) link(e, t);
           throw r.we;
         }
       } else {
-        if (!X && e !== t) link(e, t);
+        if (!J && e !== t) link(e, t);
         throw r.we;
       }
     } else if (t && r !== e && r.be & b) {
-      if (!X && e !== t) link(e, t);
+      if (!J && e !== t) link(e, t);
       throw r.we;
     } else if (!t && r.be & b) {
       throw r.we;
     }
   }
-  if (e.L && e.be & _) {
-    if (e.me < F) {
+  if (e.L && e.be & m) {
+    if (e._e < F) {
       recompute(e);
       return read(e);
     } else throw e.we;
   }
-  if (ie && t && t.ye & g) {
-    const n = e._e;
+  if (se && t && t.ge & y) {
+    const n = e.me;
     if (n !== undefined) {
-      const r = n === C ? undefined : n;
-      const i = e.Y !== x ? e.Y : e.ue;
-      if (i !== r) t.m |= f;
+      const r = n === N ? undefined : n;
+      const i = e.X !== x ? e.X : e.ue;
+      if (i !== r) t._ |= l;
       return r;
     }
   }
   if (e.G !== undefined && e.G !== x) {
-    if (t && Y && shouldReadStashedOptimisticValue(e)) return e.ue;
+    if (t && X && shouldReadStashedOptimisticValue(e)) return e.ue;
     return e.G;
   }
-  if (M !== null && re !== null && !te && e.Y !== x && r === e && !e.L && t) {
+  if (M !== null && re !== null && !te && e.X !== x && r === e && !e.L && t) {
     M.oe.add(t);
     return e.ue;
   }
   const i =
     !t ||
-    (re !== null && (e.G !== undefined || e.H || (r === e && Y) || !!(r.be & m))) ||
-    e.Y === x ||
-    (Y && e.V && M !== e.V)
+    (re !== null && (e.G !== undefined || e.H || (r === e && X) || !!(r.be & _))) ||
+    e.X === x ||
+    (X && e.V && M !== e.V)
       ? e.ue
-      : e.Y;
-  if (!t && r === e && typeof n.L === "function" && e.ye & y && !(r.be & m) && !e.O) {
+      : e.X;
+  if (!t && r === e && typeof n.L === "function" && e.ge & g && !(r.be & _) && !e.O) {
     unobserved(e);
   }
   return i;
@@ -1800,7 +1818,7 @@ function setSignal(e, t) {
   if (e.V && M !== e.V) z.initTransition(e.V);
   const n = e.G !== undefined && !K;
   const r = e.G !== undefined && e.G !== x;
-  const i = n ? (r ? e.G : e.ue) : e.Y === x ? e.ue : e.Y;
+  const i = n ? (r ? e.G : e.ue) : e.X === x ? e.ue : e.X;
   if (typeof t === "function") t = t(i);
   const s = !e.He || !e.He(i, t) || !!(e.be & b);
   if (!s) {
@@ -1814,30 +1832,30 @@ function setSignal(e, t) {
     const n = e.G === x;
     if (!n) z.initTransition(resolveTransition(e));
     if (n) {
-      e.Y = e.ue;
-      z.J.push(e);
+      e.X = e.ue;
+      z.$.push(e);
     }
     e.B = true;
     const r = getOrCreateLane(e);
     e.H = r;
     e.G = t;
   } else {
-    if (e.Y === x) queuePendingNode(e);
-    e.Y = t;
+    if (e.X === x) queuePendingNode(e);
+    e.X = t;
   }
   if (e.Qe) updatePendingSignal(e);
   if (e.qe) {
     setSignal(e.qe, t);
   }
-  e.me = F;
+  e._e = F;
   insertSubs(e, n);
   schedule();
   return t;
 }
 function suppressComputedRecompute(e) {
-  deleteFromHeap(e, e.m & o ? Q : q);
-  if (!(e.m & a) && e.Y === x) queuePendingNode(e);
-  e.m = (e.m & -4) | a;
+  deleteFromHeap(e, e._ & o ? Q : q);
+  if (!(e._ & a) && e.X === x) queuePendingNode(e);
+  e._ = (e._ & -4) | a;
 }
 function setMemo(e, t) {
   const n = setSignal(e, t);
@@ -1846,14 +1864,14 @@ function setMemo(e, t) {
 }
 function runWithOwner(e, t) {
   const n = ne;
-  const r = X;
+  const r = J;
   ne = e;
-  X = false;
+  J = false;
   try {
     return t();
   } finally {
     ne = n;
-    X = r;
+    J = r;
   }
 }
 function getPendingSignal(e) {
@@ -1866,14 +1884,24 @@ function getPendingSignal(e) {
   }
   return e.Qe;
 }
+function collectPendingSources(e) {
+  ie?.add(e);
+  const t = e.I || e;
+  if (t !== e) ie?.add(t);
+}
 function computePendingState(e) {
   const t = e;
   const n = e.I;
-  if (n && e.Y !== x) {
-    return !n.ke && !(n.be & m);
+  if (e.T) {
+    const n = e.T;
+    if (n.be & _ && !(n.be & b)) return true;
+    return e.X !== x && !(t.be & b);
+  }
+  if (n && e.X !== x) {
+    return !n.ke && !(n.be & _);
   }
   if (e.G !== undefined && e.G !== x) {
-    if (t.be & m && !(t.be & b)) return true;
+    if (t.be & _ && !(t.be & b)) return true;
     if (e.T) {
       const t = e.H ? findLane(e.H) : null;
       return !!(t && t.F.size > 0);
@@ -1883,8 +1911,8 @@ function computePendingState(e) {
   if (e.G !== undefined && e.G === x && !e.T) {
     return false;
   }
-  if (e.Y !== x && !(t.be & b)) return true;
-  return !!(t.be & m && !(t.be & b));
+  if (e.X !== x && !(t.be & b)) return true;
+  return !!(t.be & _ && !(t.be & b));
 }
 function updatePendingSignal(e) {
   if (e.Qe) {
@@ -1908,25 +1936,25 @@ function getLatestValueComputed(e) {
   if (!e.qe) {
     const t = te;
     te = false;
-    const n = $;
-    $ = false;
+    const n = Z;
+    Z = false;
     const r = ne;
     ne = null;
     e.qe = optimisticComputed(() => read(e));
     e.qe.T = e;
     ne = r;
-    $ = n;
+    Z = n;
     te = t;
   }
   return e.qe;
 }
 function staleValues(e, t = true) {
-  const n = Y;
-  Y = t;
+  const n = X;
+  X = t;
   try {
     return e();
   } finally {
-    Y = n;
+    X = n;
   }
 }
 function latest(e) {
@@ -1939,38 +1967,57 @@ function latest(e) {
   }
 }
 function isPending(e) {
-  const t = $;
+  const t = Z;
   const n = ee;
-  $ = true;
+  const r = ie;
+  Z = true;
   ee = false;
+  ie = new Set();
+  const collectPending = () => {
+    Z = false;
+    try {
+      ie.forEach(e => {
+        if (read(getPendingSignal(e))) ee = true;
+      });
+    } finally {
+      Z = true;
+    }
+  };
   try {
     e();
+    collectPending();
     return ee;
-  } catch {
+  } catch (e) {
+    collectPending();
+    if (e instanceof NotReadyError) {
+      if (ee && !(e.source?.be & b)) return true;
+      if (ne) throw e;
+    }
     return ee;
   } finally {
-    $ = t;
+    Z = t;
     ee = n;
+    ie = r;
   }
 }
 function refresh(e) {
-  let t = Z;
-  Z = true;
+  let t = Y;
+  Y = true;
   try {
     const t = e?.[j];
     if (false && !t);
-    if (t && typeof t.L === "function" && !(t.m & u)) {
+    if (t && typeof t.L === "function" && !(t._ & u)) {
       recompute(t);
     }
   } finally {
-    Z = t;
+    Y = t;
     if (!t) {
       schedule();
     }
   }
 }
 function isRefreshing() {
-  return Z;
+  return Y;
 }
 function createContext(e, t) {
   return { id: Symbol(t), defaultValue: e };
@@ -2002,15 +2049,15 @@ function effect(e, t, n, r) {
   const s = createEffectNode(e, t, n, i ? v : O, notifyEffectStatus, r);
   recompute(s, true);
   !r?.defer &&
-    (s.$ === v || r?.schedule ? s.te.enqueue(s.$, runEffect.bind(null, s)) : runEffect(s));
+    (s.Z === v || r?.schedule ? s.te.enqueue(s.Z, runEffect.bind(null, s)) : runEffect(s));
 }
 function notifyEffectStatus(e, t) {
   const n = e !== undefined ? e : this.be;
   const r = t !== undefined ? t : this.we;
-  if (n & _) {
+  if (n & m) {
     let e = r;
-    this.te.notify(this, m, 0);
-    if (this.$ === v) {
+    this.te.notify(this, _, 0);
+    if (this.Z === v) {
       try {
         return this.Ke
           ? this.Ke(e, () => {
@@ -2022,13 +2069,13 @@ function notifyEffectStatus(e, t) {
         e = t;
       }
     }
-    if (!this.te.notify(this, _, _)) throw e;
-  } else if (this.$ === O) {
-    this.te.notify(this, m | _, n, r);
+    if (!this.te.notify(this, m, m)) throw e;
+  } else if (this.Z === O) {
+    this.te.notify(this, _ | m, n, r);
   }
 }
 function runEffect(e) {
-  if (!e.ee || e.m & u) return;
+  if (!e.ee || e._ & u) return;
   e.Be?.();
   e.Be = undefined;
   try {
@@ -2041,8 +2088,8 @@ function runEffect(e) {
     }
   } catch (t) {
     e.we = new StatusError(e, t);
-    e.be |= _;
-    if (!e.te.notify(e, _, _)) throw t;
+    e.be |= m;
+    if (!e.te.notify(e, m, m)) throw t;
   } finally {
     e.De = e.ue;
     e.ee = false;
@@ -2051,7 +2098,7 @@ function runEffect(e) {
 GlobalQueue.he = runEffect;
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.ee || n.m & u) return;
+    if (!n.ee || n._ & u) return;
     try {
       n.ee = false;
       recompute(n);
@@ -2068,15 +2115,15 @@ function trackedEffect(e, t) {
     { ...t, lazy: true }
   );
   n.Be = undefined;
-  n.ye = (n.ye & ~y) | S;
+  n.ge = (n.ge & ~g) | S;
   n.ee = true;
-  n.$ = P;
+  n.Z = P;
   n.Fe = (e, t) => {
     const r = e !== undefined ? e : n.be;
-    if (r & _) {
-      n.te.notify(n, m, 0);
+    if (r & m) {
+      n.te.notify(n, _, 0);
       const e = t !== undefined ? t : n.we;
-      if (!n.te.notify(n, _, _)) throw e;
+      if (!n.te.notify(n, m, m)) throw e;
     }
   };
   n.ne = run;
@@ -2138,7 +2185,7 @@ function accessor(e) {
 function createSignal(e, t) {
   if (typeof e === "function") {
     const n = computed(e, t);
-    n.ye &= ~y;
+    n.ge &= ~g;
     return [accessor(n), setMemo.bind(null, n)];
   }
   const n = signal(e, t);
@@ -2195,7 +2242,7 @@ function resolve(e) {
 function createOptimistic(e, t) {
   if (typeof e === "function") {
     const n = optimisticComputed(e, t);
-    n.ye &= ~y;
+    n.ge &= ~g;
     return [accessor(n), setSignal.bind(null, n)];
   }
   const n = optimisticSignal(e, t);
@@ -2203,7 +2250,7 @@ function createOptimistic(e, t) {
 }
 function onSettled(e) {
   const t = getOwner();
-  t && !(t.ye & S)
+  t && !(t.ge & S)
     ? createTrackedEffect(() => untrack(e), undefined)
     : z.enqueue(v, () => {
         const t = e();
@@ -2211,7 +2258,7 @@ function onSettled(e) {
       });
 }
 function unwrap(e) {
-  return e?.[le]?.[he] ?? e;
+  return e?.[le]?.[ye] ?? e;
 }
 function getOverrideValue(e, t, n, r) {
   if (r && n in r) return r[n];
@@ -2225,109 +2272,109 @@ function getAllKeys(e, t, n) {
 function applyState(e, t, n) {
   const r = t?.[le];
   if (!r) return;
-  if (r[de] || r[pe]) {
+  if (r[pe] || r[he]) {
     applyStateSlow(e, r, n);
   } else {
     applyStateFast(e, r, n);
   }
 }
 function applyStateFast(e, t, n) {
-  const r = t[ae];
+  const r = t[de];
   if (e === r) return;
-  (t[we] || be).set(e, t[fe]);
-  t[ae] = e;
+  (t[_e] || Oe).set(e, t[ce]);
+  t[de] = e;
   if (Array.isArray(r)) {
     let i = false;
     const s = r.length;
     if (e.length && s && e[0] && n(e[0]) != null) {
-      let o, u, l, f, c, a, d, p;
+      let o, u, f, l, c, a, d, p;
       for (
-        l = 0, f = Math.min(s, e.length);
-        l < f && ((a = r[l]) === e[l] || (a && e[l] && n(a) === n(e[l])));
-        l++
+        f = 0, l = Math.min(s, e.length);
+        f < l && ((a = r[f]) === e[f] || (a && e[f] && n(a) === n(e[f])));
+        f++
       ) {
-        applyState(e[l], wrap(a, t), n);
+        applyState(e[f], wrap(a, t), n);
       }
       const h = new Array(e.length),
-        g = new Map();
+        y = new Map();
       for (
-        f = s - 1, c = e.length - 1;
-        f >= l && c >= l && ((a = r[f]) === e[c] || (a && e[c] && n(a) === n(e[c])));
-        f--, c--
+        l = s - 1, c = e.length - 1;
+        l >= f && c >= f && ((a = r[l]) === e[c] || (a && e[c] && n(a) === n(e[c])));
+        l--, c--
       ) {
         h[c] = a;
       }
-      if (l > c || l > f) {
-        for (u = l; u <= c; u++) {
+      if (f > c || f > l) {
+        for (u = f; u <= c; u++) {
           i = true;
-          t[he][u] && setSignal(t[he][u], wrap(e[u], t));
+          t[ye][u] && setSignal(t[ye][u], wrap(e[u], t));
         }
         for (; u < e.length; u++) {
           i = true;
           const r = wrap(h[u], t);
-          t[he][u] && setSignal(t[he][u], r);
+          t[ye][u] && setSignal(t[ye][u], r);
           applyState(e[u], r, n);
         }
-        i && t[he][ue] && setSignal(t[he][ue], void 0);
-        s !== e.length && t[he].length && setSignal(t[he].length, e.length);
+        i && t[ye][fe] && setSignal(t[ye][fe], void 0);
+        s !== e.length && t[ye].length && setSignal(t[ye].length, e.length);
         return;
       }
       d = new Array(c + 1);
-      for (u = c; u >= l; u--) {
+      for (u = c; u >= f; u--) {
         a = e[u];
         p = a ? n(a) : a;
-        o = g.get(p);
+        o = y.get(p);
         d[u] = o === undefined ? -1 : o;
-        g.set(p, u);
+        y.set(p, u);
       }
-      for (o = l; o <= f; o++) {
+      for (o = f; o <= l; o++) {
         a = r[o];
         p = a ? n(a) : a;
-        u = g.get(p);
+        u = y.get(p);
         if (u !== undefined && u !== -1) {
           h[u] = a;
           u = d[u];
-          g.set(p, u);
+          y.set(p, u);
         }
       }
-      for (u = l; u < e.length; u++) {
+      for (u = f; u < e.length; u++) {
         if (u in h) {
           const r = wrap(h[u], t);
-          t[he][u] && setSignal(t[he][u], r);
+          t[ye][u] && setSignal(t[ye][u], r);
           applyState(e[u], r, n);
-        } else t[he][u] && setSignal(t[he][u], wrap(e[u], t));
+        } else t[ye][u] && setSignal(t[ye][u], wrap(e[u], t));
       }
-      if (l < e.length) i = true;
+      if (f < e.length) i = true;
     } else if (e.length) {
       for (let i = 0, s = e.length; i < s; i++) {
         const s = r[i];
-        isWrappable(s) ? applyState(e[i], wrap(s, t), n) : t[he][i] && setSignal(t[he][i], e[i]);
+        isWrappable(s) ? applyState(e[i], wrap(s, t), n) : t[ye][i] && setSignal(t[ye][i], e[i]);
       }
     }
     if (s !== e.length) {
       i = true;
-      t[he].length && setSignal(t[he].length, e.length);
+      t[ye].length && setSignal(t[ye].length, e.length);
     }
-    i && t[he][ue] && setSignal(t[he][ue], void 0);
+    i && t[ye][fe] && setSignal(t[ye][fe], void 0);
     return;
   }
-  let i = t[he];
+  let i = t[ye];
   if (i) {
-    const s = i[ue];
+    const s = i[fe];
     const o = s ? getAllKeys(r, undefined, e) : Object.keys(i);
-    for (let u = 0, l = o.length; u < l; u++) {
-      const l = o[u];
-      const f = i[l];
-      const c = unwrap(r[l]);
-      let a = unwrap(e[l]);
+    for (let u = 0, f = o.length; u < f; u++) {
+      const f = o[u];
+      const l = i[f];
+      const c = unwrap(r[f]);
+      let a = unwrap(e[f]);
       if (c === a) continue;
       if (!c || !isWrappable(c) || !isWrappable(a) || (n(c) != null && n(c) !== n(a))) {
         s && setSignal(s, void 0);
-        f && setSignal(f, isWrappable(a) ? wrap(a, t) : a);
+        l && setSignal(l, isWrappable(a) ? wrap(a, t) : a);
       } else applyState(a, wrap(c, t), n);
     }
   }
-  if ((i = t[ge])) {
+  if ((i = t[Se])) {
     const t = Object.keys(i);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -2336,18 +2383,18 @@ function applyStateFast(e, t, n) {
   }
 }
 function applyStateSlow(e, t, n) {
-  const r = t[ae];
-  const i = t[de];
-  const s = t[pe];
-  let o = t[he];
-  (t[we] || be).set(e, t[fe]);
-  t[ae] = e;
-  t[de] = undefined;
+  const r = t[de];
+  const i = t[pe];
+  const s = t[he];
+  let o = t[ye];
+  (t[_e] || Oe).set(e, t[ce]);
+  t[de] = e;
+  t[pe] = undefined;
   if (Array.isArray(r)) {
     let o = false;
     const u = getOverrideValue(r, i, "length", s);
     if (e.length && u && e[0] && n(e[0]) != null) {
-      let l, f, c, a, d, p, h, g;
+      let f, l, c, a, d, p, h, y;
       for (
         c = 0, a = Math.min(u, e.length);
         c < a && ((p = getOverrideValue(r, i, c, s)) === e[c] || (p && e[c] && n(p) === n(e[c])));
@@ -2356,7 +2403,7 @@ function applyStateSlow(e, t, n) {
         applyState(e[c], wrap(p, t), n);
       }
       const S = new Array(e.length),
-        y = new Map();
+        g = new Map();
       for (
         a = u - 1, d = e.length - 1;
         a >= c &&
@@ -2367,64 +2414,64 @@ function applyStateSlow(e, t, n) {
         S[d] = p;
       }
       if (c > d || c > a) {
-        for (f = c; f <= d; f++) {
+        for (l = c; l <= d; l++) {
           o = true;
-          t[he][f] && setSignal(t[he][f], wrap(e[f], t));
+          t[ye][l] && setSignal(t[ye][l], wrap(e[l], t));
         }
-        for (; f < e.length; f++) {
+        for (; l < e.length; l++) {
           o = true;
-          const r = wrap(S[f], t);
-          t[he][f] && setSignal(t[he][f], r);
-          applyState(e[f], r, n);
+          const r = wrap(S[l], t);
+          t[ye][l] && setSignal(t[ye][l], r);
+          applyState(e[l], r, n);
         }
-        o && t[he][ue] && setSignal(t[he][ue], void 0);
-        u !== e.length && t[he].length && setSignal(t[he].length, e.length);
+        o && t[ye][fe] && setSignal(t[ye][fe], void 0);
+        u !== e.length && t[ye].length && setSignal(t[ye].length, e.length);
         return;
       }
       h = new Array(d + 1);
-      for (f = d; f >= c; f--) {
-        p = e[f];
-        g = p ? n(p) : p;
-        l = y.get(g);
-        h[f] = l === undefined ? -1 : l;
-        y.set(g, f);
-      }
-      for (l = c; l <= a; l++) {
-        p = getOverrideValue(r, i, l, s);
-        g = p ? n(p) : p;
-        f = y.get(g);
-        if (f !== undefined && f !== -1) {
-          S[f] = p;
-          f = h[f];
-          y.set(g, f);
+      for (l = d; l >= c; l--) {
+        p = e[l];
+        y = p ? n(p) : p;
+        f = g.get(y);
+        h[l] = f === undefined ? -1 : f;
+        g.set(y, l);
+      }
+      for (f = c; f <= a; f++) {
+        p = getOverrideValue(r, i, f, s);
+        y = p ? n(p) : p;
+        l = g.get(y);
+        if (l !== undefined && l !== -1) {
+          S[l] = p;
+          l = h[l];
+          g.set(y, l);
         }
       }
-      for (f = c; f < e.length; f++) {
-        if (f in S) {
-          const r = wrap(S[f], t);
-          t[he][f] && setSignal(t[he][f], r);
-          applyState(e[f], r, n);
-        } else t[he][f] && setSignal(t[he][f], wrap(e[f], t));
+      for (l = c; l < e.length; l++) {
+        if (l in S) {
+          const r = wrap(S[l], t);
+          t[ye][l] && setSignal(t[ye][l], r);
+          applyState(e[l], r, n);
+        } else t[ye][l] && setSignal(t[ye][l], wrap(e[l], t));
       }
       if (c < e.length) o = true;
     } else if (e.length) {
       for (let o = 0, u = e.length; o < u; o++) {
         const u = getOverrideValue(r, i, o, s);
-        isWrappable(u) ? applyState(e[o], wrap(u, t), n) : t[he][o] && setSignal(t[he][o], e[o]);
+        isWrappable(u) ? applyState(e[o], wrap(u, t), n) : t[ye][o] && setSignal(t[ye][o], e[o]);
       }
     }
     if (u !== e.length) {
       o = true;
-      t[he].length && setSignal(t[he].length, e.length);
+      t[ye].length && setSignal(t[ye].length, e.length);
     }
-    o && t[he][ue] && setSignal(t[he][ue], void 0);
+    o && t[ye][fe] && setSignal(t[ye][fe], void 0);
     return;
   }
   if (o) {
-    const u = o[ue];
-    const l = u ? getAllKeys(r, i, e) : Object.keys(o);
-    for (let f = 0, c = l.length; f < c; f++) {
-      const c = l[f];
+    const u = o[fe];
+    const f = u ? getAllKeys(r, i, e) : Object.keys(o);
+    for (let l = 0, c = f.length; l < c; l++) {
+      const c = f[l];
       const a = o[c];
       const d = unwrap(getOverrideValue(r, i, c, s));
       let p = unwrap(e[c]);
@@ -2435,7 +2482,7 @@ function applyStateSlow(e, t, n) {
       } else applyState(p, wrap(d, t), n);
     }
   }
-  if ((o = t[ge])) {
+  if ((o = t[Se])) {
     const t = Object.keys(o);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -2457,8 +2504,8 @@ function createProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[ye] = wrapProjection;
-    e[we] = i;
+    e[we] = wrapProjection;
+    e[_e] = i;
     Object.defineProperty(e, me, {
       get() {
         return r;
@@ -2468,8 +2515,8 @@ function createProjectionInternal(e, t, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[le]?.[ye] === wrapProjection) return e;
-    const t = createStoreProxy(e, Pe, wrapper);
+    if (e[le]?.[we] === wrapProjection) return e;
+    const t = createStoreProxy(e, xe, wrapper);
     i.set(e, t);
     return t;
   };
@@ -2478,7 +2525,7 @@ function createProjectionInternal(e, t, n) {
     if (!r) r = getOwner();
     runProjectionComputed(s, e, n?.key || "id");
   }, undefined);
-  r.ye &= ~y;
+  r.ge &= ~g;
   return { store: s, node: r };
 }
 function createProjection(e, t, n) {
@@ -2557,56 +2604,66 @@ function createWriteTraps(e) {
   };
   return t;
 }
-const ue = Symbol(0),
+const fe = Symbol(0),
   le = Symbol(0),
-  fe = Symbol(0),
-  ce = Symbol(0);
-const ae = "v",
-  de = "o",
-  pe = "x",
-  he = "n",
-  ge = "h",
-  Se = "c",
-  ye = "w",
-  we = "l",
+  ce = Symbol(0),
+  ae = Symbol(0);
+const de = "v",
+  pe = "o",
+  he = "x",
+  ye = "n",
+  Se = "h",
+  ge = "c",
+  we = "w",
+  _e = "l",
   me = "f",
-  _e = "p";
-function createStoreProxy(e, t = Pe, n) {
+  be = "p";
+function createStoreProxy(e, t = xe, n) {
   let r;
   if (Array.isArray(e)) {
     r = [];
     r.v = e;
   } else {
     r = { v: e };
-    const t = e?.[le]?.[ae] ?? e;
+    const t = e?.[le]?.[de] ?? e;
     const n = Object.getPrototypeOf(t);
     if (n !== null && n !== Object.prototype) {
-      r[Se] = true;
+      r[ge] = true;
     }
   }
   n && n(r);
-  return (r[fe] = new Proxy(r, t));
+  return (r[ce] = new Proxy(r, t));
 }
-const be = new WeakMap();
+const Oe = new WeakMap();
 function wrap(e, t) {
-  if (t?.[ye]) return t[ye](e, t);
-  let n = e[fe] || be.get(e);
-  if (!n) be.set(e, (n = createStoreProxy(e)));
+  if (t?.[we]) return t[we](e, t);
+  let n = e[ce] || Oe.get(e);
+  if (!n) Oe.set(e, (n = createStoreProxy(e)));
   return n;
 }
 function isWrappable(e) {
   if (e == null || typeof e !== "object" || Object.isFrozen(e)) return false;
   return typeof Node === "undefined" || !(e instanceof Node);
 }
-let Oe = false;
+let ve = false;
 function setWriteOverride(e) {
-  Oe = e;
+  ve = e;
 }
 function writeOnly(e) {
-  return Oe || !!ve?.has(e);
+  return ve || !!Pe?.has(e);
 }
 function unwrapStoreValue(e) {
-  return e?.[le]?.[ae] ?? e;
+  return e?.[le]?.[de] ?? e;
+}
+function isPrototypePollutionKey$1(e) {
+  return e === "__proto__" || e === "constructor" || e === "prototype";
+}
+function hasOwnStoreProperty(e, t) {
+  const n = e[he];
+  if (n && Object.prototype.hasOwnProperty.call(n, t) && n[t] !== ae) return true;
+  const r = e[pe];
+  if (r && Object.prototype.hasOwnProperty.call(r, t) && r[t] !== ae) return true;
+  return Object.prototype.hasOwnProperty.call(unwrapStoreValue(e[de]), t);
 }
 function hasInheritedAccessor(e, t) {
   let n = Object.getPrototypeOf(e);
@@ -2639,13 +2696,13 @@ function getNode(e, t, n, r, i = isEqual, s, o) {
   }
   if (o && t in o) {
     const e = o[t];
-    u._e = e === undefined ? C : e;
-    se?.add(u);
+    u.me = e === undefined ? N : e;
+    oe?.add(u);
   }
   return (e[t] = u);
 }
-function trackSelf(e, t = ue) {
-  getObserver() && read(getNode(getNodes(e, he), t, undefined, e[me], false, e[_e]));
+function trackSelf(e, t = fe) {
+  getObserver() && read(getNode(getNodes(e, ye), t, undefined, e[me], false, e[be]));
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -2653,102 +2710,102 @@ function getKeys(e, t, n = true) {
   const i = new Set(r);
   const s = Reflect.ownKeys(t);
   for (const e of s) {
-    if (t[e] !== ce) i.add(e);
+    if (t[e] !== ae) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
 }
 function getPropertyDescriptor(e, t, n) {
   if (t && n in t) {
-    if (t[n] === ce) return void 0;
+    if (t[n] === ae) return void 0;
     const r = Reflect.getOwnPropertyDescriptor(t, n);
     if (r?.get || r?.set || !(n in e)) return r;
   }
   return Reflect.getOwnPropertyDescriptor(e, n);
 }
 function prepareStoreWrite(e, t, n) {
-  if (e[_e]) {
+  if (e[be]) {
     const t = e[me];
     if (t?.V) {
       z.initTransition(t.V);
     }
   }
-  const r = e[ae];
+  const r = e[de];
   const i = r[n];
-  if (ie && typeof n !== "symbol" && !((e[me]?.be ?? 0) & m)) {
-    if (!e[N]) {
-      e[N] = Object.create(null);
-      se?.add(e);
+  if (se && typeof n !== "symbol" && !((e[me]?.be ?? 0) & _)) {
+    if (!e[C]) {
+      e[C] = Object.create(null);
+      oe?.add(e);
     }
-    if (!(n in e[N])) {
-      e[N][n] = i;
+    if (!(n in e[C])) {
+      e[C][n] = i;
     }
   }
-  const s = e[_e] && !K;
-  const o = s ? pe : de;
+  const s = e[be] && !K;
+  const o = s ? he : pe;
   if (s) trackOptimisticStore(t);
   return { base: i, overrideKey: o, state: r };
 }
 function upsertStoreNode(e, t, n, r, i) {
   if (t[n]) return t[n];
   const s = isWrappable(r) ? wrap(r, e) : r;
-  const o = getNode(t, n, s, e[me], isEqual, e[_e], i);
+  const o = getNode(t, n, s, e[me], isEqual, e[be], i);
   registerTransientStoreNode(o);
   return o;
 }
 function notifyStoreProperty(e, t, n, r, i, s) {
-  const o = K || e[_e];
+  const o = K || e[be];
   const u = n !== "delete";
-  const l = e[ge]?.[t];
-  if (l) {
-    setSignal(l, u);
+  const f = e[Se]?.[t];
+  if (f) {
+    setSignal(f, u);
   } else if (!o && n !== "invalidate" && s !== u) {
-    const n = upsertStoreNode(e, getNodes(e, ge), t, s);
+    const n = upsertStoreNode(e, getNodes(e, Se), t, s);
     setSignal(n, u);
   }
-  const f = getNodes(e, he);
+  const l = getNodes(e, ye);
   if (n === "set") {
-    if (f[t]) {
-      setSignal(f[t], () => (isWrappable(r) ? wrap(r, e) : r));
+    if (l[t]) {
+      setSignal(l[t], () => (isWrappable(r) ? wrap(r, e) : r));
     } else if (!o) {
-      const n = upsertStoreNode(e, f, t, i, e[N]);
+      const n = upsertStoreNode(e, l, t, i, e[C]);
       setSignal(n, () => (isWrappable(r) ? wrap(r, e) : r));
     }
   } else if (n === "invalidate") {
-    if (f[t]) {
-      setSignal(f[t], {});
-      delete f[t];
+    if (l[t]) {
+      setSignal(l[t], {});
+      delete l[t];
     }
   } else {
-    if (f[t]) {
-      setSignal(f[t], undefined);
+    if (l[t]) {
+      setSignal(l[t], undefined);
     } else if (!o) {
-      const n = upsertStoreNode(e, f, t, i, e[N]);
+      const n = upsertStoreNode(e, l, t, i, e[C]);
       setSignal(n, undefined);
     }
   }
-  f[ue] && setSignal(f[ue], undefined);
+  l[fe] && setSignal(l[fe], undefined);
 }
-let ve = null;
-const Pe = {
+let Pe = null;
+const xe = {
   get(e, t, n) {
     if (t === le) return e;
-    if (t === fe) return n;
+    if (t === ce) return n;
     if (t === j) return e[me];
-    if (t === ue) {
+    if (t === fe) {
       trackSelf(e);
       return n;
     }
-    const r = getNodes(e, he);
+    const r = getNodes(e, ye);
     const i = r[t];
-    const s = e[ae];
+    const s = e[de];
     if (
       !i &&
-      !e[de] &&
       !e[pe] &&
-      !e[Se] &&
-      !e[_e] &&
-      !e[N] &&
+      !e[he] &&
+      !e[ge] &&
+      !e[be] &&
+      !e[C] &&
       !s[le] &&
       !(t in s) &&
       getObserver() &&
@@ -2756,92 +2813,94 @@ const Pe = {
     ) {
       return read(getNode(r, t, undefined, e[me]));
     }
-    const o = e[pe] && t in e[pe];
-    const u = o || (e[de] && t in e[de]);
-    const l = !!e[ae][le];
-    const f = o ? e[pe] : e[de] && t in e[de] ? e[de] : e[ae];
+    const o = e[he] && t in e[he];
+    const u = o || (e[pe] && t in e[pe]);
+    const f = !!e[de][le];
+    const l = o ? e[he] : e[pe] && t in e[pe] ? e[pe] : e[de];
     if (!i) {
-      const r = Object.getOwnPropertyDescriptor(f, t);
+      const r = Object.getOwnPropertyDescriptor(l, t);
       if (r && r.get) return r.get.call(n);
-      if (!r && !u && e[Se]) {
-        const e = unwrapStoreValue(f);
+      if (!r && !u && e[ge]) {
+        const e = unwrapStoreValue(l);
         if (hasInheritedAccessor(e, t)) {
-          return Reflect.get(f, t, n);
+          return Reflect.get(l, t, n);
         }
       }
     }
     if (writeOnly(n)) {
+      if (isPrototypePollutionKey$1(t) && !hasOwnStoreProperty(e, t)) return undefined;
       let n =
-        i && (u || !l) ? (i.G !== undefined && i.G !== x ? i.G : i.Y !== x ? i.Y : i.ue) : f[t];
-      n === ce && (n = undefined);
+        i && (u || !f) ? (i.G !== undefined && i.G !== x ? i.G : i.X !== x ? i.X : i.ue) : l[t];
+      n === ae && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
-      ve?.add(r);
+      Pe?.add(r);
       return r;
     }
-    let c = i ? (u || !l ? read(r[t]) : (read(r[t]), f[t])) : f[t];
-    c === ce && (c = undefined);
+    let c = i ? (u || !f ? read(r[t]) : (read(r[t]), l[t])) : l[t];
+    c === ae && (c = undefined);
     if (!i) {
-      if (!u && typeof c === "function" && !f.hasOwnProperty(t)) {
+      if (!u && typeof c === "function" && !l.hasOwnProperty(t)) {
         let t;
-        return !Array.isArray(e[ae]) && (t = Object.getPrototypeOf(e[ae])) && t !== Object.prototype
-          ? c.bind(f)
+        return !Array.isArray(e[de]) && (t = Object.getPrototypeOf(e[de])) && t !== Object.prototype
+          ? c.bind(l)
           : c;
       } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(c) ? wrap(c, e) : c, e[me], isEqual, e[_e], e[N]));
+        return read(getNode(r, t, isWrappable(c) ? wrap(c, e) : c, e[me], isEqual, e[be], e[C]));
       }
     }
     return isWrappable(c) ? wrap(c, e) : c;
   },
   has(e, t) {
-    if (t === fe || t === ue || t === "__proto__") return true;
+    if (t === ce || t === fe || t === "__proto__") return true;
     const n =
-      e[pe] && t in e[pe] ? e[pe][t] !== ce : e[de] && t in e[de] ? e[de][t] !== ce : t in e[ae];
-    if (writeOnly(e[fe])) return n;
-    const r = getNodes(e, ge);
+      e[he] && t in e[he] ? e[he][t] !== ae : e[pe] && t in e[pe] ? e[pe][t] !== ae : t in e[de];
+    if (writeOnly(e[ce])) return n;
+    const r = getNodes(e, Se);
     if (r[t]) return read(r[t]);
     if (getObserver()) {
-      return read(getNode(r, t, n, e[me], isEqual, e[_e]));
+      return read(getNode(r, t, n, e[me], isEqual, e[be]));
     }
     return n;
   },
   set(e, t, n) {
-    const r = e[fe];
+    if (t === "__proto__") return true;
+    const r = e[ce];
     if (writeOnly(r)) {
       untrack(() => {
         const { base: i, overrideKey: s, state: o } = prepareStoreWrite(e, r, t);
-        const u = e[pe] && t in e[pe] ? e[pe][t] : e[de] && t in e[de] ? e[de][t] : i;
-        const l =
-          e[pe] && t in e[pe]
-            ? e[pe][t] !== ce
-            : e[de] && t in e[de]
-              ? e[de][t] !== ce
-              : t in e[ae];
-        const f = unwrapStoreValue(n);
+        const u = e[he] && t in e[he] ? e[he][t] : e[pe] && t in e[pe] ? e[pe][t] : i;
+        const f =
+          e[he] && t in e[he]
+            ? e[he][t] !== ae
+            : e[pe] && t in e[pe]
+              ? e[pe][t] !== ae
+              : t in e[de];
+        const l = unwrapStoreValue(n);
         const c = Array.isArray(o) && t !== "length";
         const a = c ? parseInt(t) + 1 : 0;
         const d =
           c &&
-          (e[pe] && "length" in e[pe]
-            ? e[pe].length
-            : e[de] && "length" in e[de]
-              ? e[de].length
+          (e[he] && "length" in e[he]
+            ? e[he].length
+            : e[pe] && "length" in e[pe]
+              ? e[pe].length
               : o.length);
         const p = c && a > d ? a : undefined;
-        if (u === f && p === undefined) return true;
-        if (f !== undefined && f === i && p === undefined) delete e[s]?.[t];
+        if (u === l && p === undefined) return true;
+        if (l !== undefined && l === i && p === undefined) delete e[s]?.[t];
         else {
           const n = e[s] || (e[s] = Object.create(null));
-          n[t] = f;
+          n[t] = l;
           if (p !== undefined) n.length = p;
         }
-        notifyStoreProperty(e, t, "set", f, u, l);
+        notifyStoreProperty(e, t, "set", l, u, f);
         if (Array.isArray(o) && t !== "length" && p !== undefined) {
-          const t = getNodes(e, he);
+          const t = getNodes(e, ye);
           if (t.length) {
             setSignal(t.length, p);
-          } else if (!K && !e[_e]) {
-            const n = upsertStoreNode(e, t, "length", d, e[N]);
+          } else if (!K && !e[be]) {
+            const n = upsertStoreNode(e, t, "length", d, e[C]);
             setSignal(n, p);
           }
         }
@@ -2851,7 +2910,8 @@ const Pe = {
     return true;
   },
   defineProperty(e, t, n) {
-    const r = e[fe];
+    if (t === "__proto__") return true;
+    const r = e[ce];
     if (writeOnly(r)) {
       untrack(() => {
         const { base: i, overrideKey: s } = prepareStoreWrite(e, r, t);
@@ -2864,16 +2924,17 @@ const Pe = {
     return true;
   },
   deleteProperty(e, t) {
-    const n = e[pe]?.[t] === ce;
-    const r = e[de]?.[t] === ce;
-    if (writeOnly(e[fe]) && !n && !r) {
+    if (t === "__proto__") return true;
+    const n = e[he]?.[t] === ae;
+    const r = e[pe]?.[t] === ae;
+    if (writeOnly(e[ce]) && !n && !r) {
       untrack(() => {
-        const n = e[_e] && !K;
-        const r = n ? pe : de;
-        if (n) trackOptimisticStore(e[fe]);
-        const i = e[pe] && t in e[pe] ? e[pe][t] : e[de] && t in e[de] ? e[de][t] : e[ae][t];
-        if (t in e[ae] || (e[de] && t in e[de])) {
-          (e[r] || (e[r] = Object.create(null)))[t] = ce;
+        const n = e[be] && !K;
+        const r = n ? he : pe;
+        if (n) trackOptimisticStore(e[ce]);
+        const i = e[he] && t in e[he] ? e[he][t] : e[pe] && t in e[pe] ? e[pe][t] : e[de][t];
+        if (t in e[de] || (e[pe] && t in e[pe])) {
+          (e[r] || (e[r] = Object.create(null)))[t] = ae;
         } else if (e[r] && t in e[r]) {
           delete e[r][t];
         } else return true;
@@ -2884,11 +2945,11 @@ const Pe = {
   },
   ownKeys(e) {
     trackSelf(e);
-    let t = getKeys(e[ae], e[de], false);
-    if (e[pe]) {
+    let t = getKeys(e[de], e[pe], false);
+    if (e[he]) {
       const n = new Set(t);
-      for (const t of Reflect.ownKeys(e[pe])) {
-        if (e[pe][t] !== ce) n.add(t);
+      for (const t of Reflect.ownKeys(e[he])) {
+        if (e[he][t] !== ae) n.add(t);
         else n.delete(t);
       }
       t = Array.from(n);
@@ -2896,27 +2957,27 @@ const Pe = {
     return t;
   },
   getOwnPropertyDescriptor(e, t) {
-    if (t === fe) return { value: e[fe], writable: true, configurable: true };
-    if (e[pe] && t in e[pe]) {
-      if (e[pe][t] === ce) return undefined;
-      const n = Reflect.getOwnPropertyDescriptor(e[pe], t);
-      if (n?.get || n?.set || !(t in e[ae])) return n;
-      const r = getPropertyDescriptor(e[ae], e[de], t);
+    if (t === ce) return { value: e[ce], writable: true, configurable: true };
+    if (e[he] && t in e[he]) {
+      if (e[he][t] === ae) return undefined;
+      const n = Reflect.getOwnPropertyDescriptor(e[he], t);
+      if (n?.get || n?.set || !(t in e[de])) return n;
+      const r = getPropertyDescriptor(e[de], e[pe], t);
       if (r) {
-        return { ...r, value: e[pe][t] };
+        return { ...r, value: e[he][t] };
       }
-      return { value: e[pe][t], writable: true, enumerable: true, configurable: true };
+      return { value: e[he][t], writable: true, enumerable: true, configurable: true };
     }
-    return getPropertyDescriptor(e[ae], e[de], t);
+    return getPropertyDescriptor(e[de], e[pe], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[ae]);
+    return Object.getPrototypeOf(e[de]);
   }
 };
 function storeSetter(e, t) {
-  const n = ve;
-  ve = new Set();
-  ve.add(e);
+  const n = Pe;
+  Pe = new Set();
+  Pe.add(e);
   try {
     const n = t(e);
     if (n !== e && n !== undefined) {
@@ -2932,8 +2993,8 @@ function storeSetter(e, t) {
       }
     }
   } finally {
-    ve.clear();
-    ve = n;
+    Pe.clear();
+    Pe = n;
   }
 }
 function createStore(e, t, n) {
@@ -2945,7 +3006,7 @@ function createStore(e, t, n) {
   ];
 }
 function createOptimisticStore(e, t, n) {
-  GlobalQueue.ge ||= clearOptimisticStore;
+  GlobalQueue.ye ||= clearOptimisticStore;
   const r = typeof e === "function";
   const i = r ? t : e;
   const s = r ? e : undefined;
@@ -2954,37 +3015,37 @@ function createOptimisticStore(e, t, n) {
 }
 function clearOptimisticStore(e) {
   const t = e[le];
-  if (!t || !t[pe]) return;
-  const n = t[pe];
-  const r = t[he];
+  if (!t || !t[he]) return;
+  const n = t[he];
+  const r = t[ye];
   setProjectionWriteActive(true);
   try {
     if (r) {
       for (const e of Reflect.ownKeys(n)) {
         if (r[e]) {
           r[e].H = undefined;
-          const n = t[de] && e in t[de] ? t[de][e] : t[ae][e];
-          const i = n === ce ? undefined : n;
+          const n = t[pe] && e in t[pe] ? t[pe][e] : t[de][e];
+          const i = n === ae ? undefined : n;
           setSignal(r[e], isWrappable(i) ? wrap(i, t) : i);
         }
       }
-      if (r[ue]) {
-        r[ue].H = undefined;
-        setSignal(r[ue], undefined);
+      if (r[fe]) {
+        r[fe].H = undefined;
+        setSignal(r[fe], undefined);
       }
     }
   } finally {
     setProjectionWriteActive(false);
   }
-  delete t[pe];
+  delete t[he];
 }
 function createOptimisticProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[ye] = wrapProjection;
-    e[we] = i;
-    e[_e] = true;
+    e[we] = wrapProjection;
+    e[_e] = i;
+    e[be] = true;
     Object.defineProperty(e, me, {
       get() {
         return r;
@@ -2994,8 +3055,8 @@ function createOptimisticProjectionInternal(e, t, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[le]?.[ye] === wrapProjection) return e;
-    const t = createStoreProxy(e, Pe, wrapper);
+    if (e[le]?.[we] === wrapProjection) return e;
+    const t = createStoreProxy(e, xe, wrapper);
     i.set(e, t);
     return t;
   };
@@ -3017,11 +3078,11 @@ function createOptimisticProjectionInternal(e, t, n) {
         setProjectionWriteActive(false);
       }
     }, undefined);
-    r.ye &= ~y;
+    r.ge &= ~g;
   }
   return { store: s, node: r };
 }
-const xe = Symbol(0);
+const Ne = Symbol(0);
 function isPrototypePollutionKey(e) {
   return e === "__proto__" || e === "constructor" || e === "prototype";
 }
@@ -3069,7 +3130,7 @@ function updatePath(e, t, n = 0) {
     if (s === i) return;
   }
   if (r === undefined && s == undefined) return;
-  if (s === xe) {
+  if (s === Ne) {
     delete e[r];
   } else if (r === undefined || (isWrappable(i) && isWrappable(s) && !Array.isArray(s))) {
     const t = r !== undefined ? e[r] : e;
@@ -3091,20 +3152,20 @@ const Ce = Object.assign(
       updatePath(t, e);
     };
   },
-  { DELETE: xe }
+  { DELETE: Ne }
 );
 function snapshotImpl(e, t, n, r) {
-  let i, s, o, u, l, f;
+  let i, s, o, u, f, l;
   if (!isWrappable(e)) return e;
   if (n && n.has(e)) return n.get(e);
   if (!n) n = new Map();
   if ((i = e[le] || r?.get(e)?.[le])) {
-    if (t) trackSelf(i, ue);
-    o = i[de];
-    s = Array.isArray(i[ae]);
-    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[ae]))) : i[ae]);
-    e = i[ae];
-    r = be;
+    if (t) trackSelf(i, fe);
+    o = i[pe];
+    s = Array.isArray(i[de]);
+    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[de]))) : i[de]);
+    e = i[de];
+    r = Oe;
   } else {
     s = Array.isArray(e);
     n.set(e, e);
@@ -3112,12 +3173,12 @@ function snapshotImpl(e, t, n, r) {
   if (s) {
     const s = o?.length || e.length;
     for (let c = 0; c < s; c++) {
-      f = o && c in o ? o[c] : e[c];
-      if (f === ce) continue;
-      if (t && isWrappable(f)) wrap(f, i);
-      if ((l = snapshotImpl(f, t, n, r)) !== f || u) {
+      l = o && c in o ? o[c] : e[c];
+      if (l === ae) continue;
+      if (t && isWrappable(l)) wrap(l, i);
+      if ((f = snapshotImpl(l, t, n, r)) !== l || u) {
         if (!u) n.set(e, (u = [...e]));
-        u[c] = l;
+        u[c] = f;
       }
     }
   } else {
@@ -3126,14 +3187,14 @@ function snapshotImpl(e, t, n, r) {
       let a = s[c];
       const d = getPropertyDescriptor(e, o, a);
       if (d.get) continue;
-      f = o && a in o ? o[a] : e[a];
-      if (t && isWrappable(f)) wrap(f, i);
-      if ((l = snapshotImpl(f, t, n, r)) !== e[a] || u) {
+      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) {
         if (!u) {
           u = Object.create(Object.getPrototypeOf(e));
           Object.assign(u, e);
         }
-        u[a] = l;
+        u[a] = f;
       }
     }
   }
@@ -3148,13 +3209,13 @@ function deep(e) {
 function trueFn() {
   return true;
 }
-const Ne = {
+const Ee = {
   get(e, t, n) {
-    if (t === fe) return n;
+    if (t === ce) return n;
     return e.get(t);
   },
   has(e, t) {
-    if (t === fe) return true;
+    if (t === ce) return true;
     return e.has(t);
   },
   set: trueFn,
@@ -3177,15 +3238,15 @@ const Ne = {
 function resolveSource(e) {
   return !(e = typeof e === "function" ? e() : e) ? {} : e;
 }
-const Ee = Symbol(0);
+const ke = 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 && fe in i);
-    const s = !!i && i[Ee];
+    t = t || (!!i && ce in i);
+    const s = !!i && i[ke];
     if (s) {
       for (let e = 0; e < s.length; e++) n.push(s[e]);
     } else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
@@ -3194,7 +3255,7 @@ function merge(...e) {
     return new Proxy(
       {
         get(e) {
-          if (e === Ee) return n;
+          if (e === ke) return n;
           for (let t = n.length - 1; t >= 0; t--) {
             const r = resolveSource(n[t]);
             if (e in r) return r[e];
@@ -3215,7 +3276,7 @@ function merge(...e) {
           return [...e];
         }
       },
-      Ne
+      Ee
     );
   }
   const r = Object.create(null);
@@ -3247,11 +3308,11 @@ function merge(...e) {
     if (n.get) Object.defineProperty(o, t, n);
     else o[t] = n.value;
   }
-  o[Ee] = n;
+  o[ke] = n;
   return o;
 }
 function omit(e, ...t) {
-  if (E && fe in e) {
+  if (E && ce in e) {
     return new Proxy(
       {
         get(n) {
@@ -3264,7 +3325,7 @@ function omit(e, ...t) {
           return Object.keys(e).filter(e => !t.includes(e));
         }
       },
-      Ne
+      Ee
     );
   }
   const n = {};
@@ -3286,11 +3347,11 @@ function mapArray(e, t, n) {
   const s = t;
   const o = {
     Ue: createOwner(),
-    Je: 0,
-    Xe: e,
-    Ye: [],
-    Ze: s,
-    $e: [],
+    $e: 0,
+    Je: e,
+    Xe: [],
+    Ye: s,
+    Ze: [],
     et: [],
     tt: r,
     nt: r || n?.keyed === false ? [] : undefined,
@@ -3300,198 +3361,198 @@ function mapArray(e, t, n) {
   };
   const u = computed(updateKeyedMap.bind(o));
   o.Ue.u = u;
-  u.ye &= ~y;
+  u.ge &= ~g;
   return accessor(u);
 }
-const ke = { ownedWrite: true };
+const je = { ownedWrite: true };
 function updateKeyedMap() {
-  const e = this.Xe() || [],
+  const e = this.Je() || [],
     t = e.length;
-  e[ue];
+  e[fe];
   runWithOwner(this.Ue, () => {
     let n,
       r,
       i = this.nt
         ? this.it
           ? () => {
-              this.nt[r] = signal(e[r], ke);
-              return this.Ze(accessor(this.nt[r]), r);
+              this.nt[r] = signal(e[r], je);
+              return this.Ye(accessor(this.nt[r]), r);
             }
           : () => {
-              this.nt[r] = signal(e[r], ke);
-              this.rt && (this.rt[r] = signal(r, ke));
-              return this.Ze(accessor(this.nt[r]), this.rt ? accessor(this.rt[r]) : undefined);
+              this.nt[r] = signal(e[r], je);
+              this.rt && (this.rt[r] = signal(r, je));
+              return this.Ye(accessor(this.nt[r]), this.rt ? accessor(this.rt[r]) : undefined);
             }
         : this.rt
           ? () => {
               const t = e[r];
-              this.rt[r] = signal(r, ke);
-              return this.Ze(t, accessor(this.rt[r]));
+              this.rt[r] = signal(r, je);
+              return this.Ye(t, accessor(this.rt[r]));
             }
           : () => {
               const t = e[r];
-              return this.Ze(t);
+              return this.Ye(t);
             };
     if (t === 0) {
-      if (this.Je !== 0) {
+      if (this.$e !== 0) {
         this.Ue.dispose(false);
         this.et = [];
-        this.Ye = [];
-        this.$e = [];
-        this.Je = 0;
+        this.Xe = [];
+        this.Ze = [];
+        this.$e = 0;
         this.nt && (this.nt = []);
         this.rt && (this.rt = []);
       }
-      if (this.st && !this.$e[0]) {
-        this.$e[0] = runWithOwner((this.et[0] = createOwner()), this.st);
+      if (this.st && !this.Ze[0]) {
+        this.Ze[0] = runWithOwner((this.et[0] = createOwner()), this.st);
       }
-    } else if (this.Je === 0) {
+    } else if (this.$e === 0) {
       if (this.et[0]) this.et[0].dispose();
-      this.$e = new Array(t);
+      this.Ze = new Array(t);
       for (r = 0; r < t; r++) {
-        this.Ye[r] = e[r];
-        this.$e[r] = runWithOwner((this.et[r] = createOwner()), i);
+        this.Xe[r] = e[r];
+        this.Ze[r] = runWithOwner((this.et[r] = createOwner()), i);
       }
-      this.Je = t;
+      this.$e = t;
     } else {
       let s,
         o,
         u,
-        l,
         f,
+        l,
         c,
         a,
         d = new Array(t),
         p = new Array(t),
         h = this.nt ? new Array(t) : undefined,
-        g = this.rt ? new Array(t) : undefined;
+        y = this.rt ? new Array(t) : undefined;
       for (
-        s = 0, o = Math.min(this.Je, t);
-        s < o && (this.Ye[s] === e[s] || (this.nt && compare(this.tt, this.Ye[s], e[s])));
+        s = 0, o = Math.min(this.$e, t);
+        s < o && (this.Xe[s] === e[s] || (this.nt && compare(this.tt, this.Xe[s], e[s])));
         s++
       ) {
         if (this.nt) setSignal(this.nt[s], e[s]);
       }
       for (
-        o = this.Je - 1, u = t - 1;
+        o = this.$e - 1, u = t - 1;
         o >= s &&
         u >= s &&
-        (this.Ye[o] === e[u] || (this.nt && compare(this.tt, this.Ye[o], e[u])));
+        (this.Xe[o] === e[u] || (this.nt && compare(this.tt, this.Xe[o], e[u])));
         o--, u--
       ) {
-        d[u] = this.$e[o];
+        d[u] = this.Ze[o];
         p[u] = this.et[o];
         h && (h[u] = this.nt[o]);
-        g && (g[u] = this.rt[o]);
+        y && (y[u] = this.rt[o]);
       }
       c = new Map();
       a = new Array(u + 1);
       for (r = u; r >= s; r--) {
-        l = e[r];
-        f = this.tt ? this.tt(l) : l;
-        n = c.get(f);
+        f = e[r];
+        l = this.tt ? this.tt(f) : f;
+        n = c.get(l);
         a[r] = n === undefined ? -1 : n;
-        c.set(f, r);
+        c.set(l, r);
       }
       for (n = s; n <= o; n++) {
-        l = this.Ye[n];
-        f = this.tt ? this.tt(l) : l;
-        r = c.get(f);
+        f = this.Xe[n];
+        l = this.tt ? this.tt(f) : f;
+        r = c.get(l);
         if (r !== undefined && r !== -1) {
-          d[r] = this.$e[n];
+          d[r] = this.Ze[n];
           p[r] = this.et[n];
           h && (h[r] = this.nt[n]);
-          g && (g[r] = this.rt[n]);
+          y && (y[r] = this.rt[n]);
           r = a[r];
-          c.set(f, r);
+          c.set(l, r);
         } else this.et[n].dispose();
       }
       for (r = s; r < t; r++) {
         if (r in d) {
-          this.$e[r] = d[r];
+          this.Ze[r] = d[r];
           this.et[r] = p[r];
           if (h) {
             this.nt[r] = h[r];
             setSignal(this.nt[r], e[r]);
           }
-          if (g) {
-            this.rt[r] = g[r];
+          if (y) {
+            this.rt[r] = y[r];
             setSignal(this.rt[r], r);
           }
         } else {
-          this.$e[r] = runWithOwner((this.et[r] = createOwner()), i);
+          this.Ze[r] = runWithOwner((this.et[r] = createOwner()), i);
         }
       }
-      this.$e = this.$e.slice(0, (this.Je = t));
-      this.Ye = e.slice(0);
+      this.Ze = this.Ze.slice(0, (this.$e = t));
+      this.Xe = e.slice(0);
     }
   });
-  return this.$e;
+  return this.Ze;
 }
 function repeat(e, t, n) {
   const r = t;
   const i = computed(
     updateRepeat.bind({
       Ue: createOwner(),
-      Je: 0,
+      $e: 0,
       ot: 0,
       ut: e,
-      Ze: r,
+      Ye: r,
       et: [],
-      $e: [],
-      lt: n?.from,
+      Ze: [],
+      ft: n?.from,
       st: n?.fallback
     })
   );
-  i.ye &= ~y;
+  i.ge &= ~g;
   return accessor(i);
 }
 function updateRepeat() {
   const e = this.ut();
-  const t = this.lt?.() || 0;
+  const t = this.ft?.() || 0;
   runWithOwner(this.Ue, () => {
     if (e === 0) {
-      if (this.Je !== 0) {
+      if (this.$e !== 0) {
         this.Ue.dispose(false);
         this.et = [];
-        this.$e = [];
-        this.Je = 0;
+        this.Ze = [];
+        this.$e = 0;
       }
-      if (this.st && !this.$e[0]) {
-        this.$e[0] = runWithOwner((this.et[0] = createOwner()), this.st);
+      if (this.st && !this.Ze[0]) {
+        this.Ze[0] = runWithOwner((this.et[0] = createOwner()), this.st);
       }
       return;
     }
     const n = t + e;
-    const r = this.ot + this.Je;
-    if (this.Je === 0 && this.et[0]) this.et[0].dispose();
+    const r = this.ot + this.$e;
+    if (this.$e === 0 && this.et[0]) this.et[0].dispose();
     for (let e = n; e < r; e++) this.et[e - this.ot].dispose();
     if (this.ot < t) {
       let e = this.ot;
-      while (e < t && e < this.Je) this.et[e++].dispose();
+      while (e < t && e < this.$e) this.et[e++].dispose();
       this.et.splice(0, t - this.ot);
-      this.$e.splice(0, t - this.ot);
+      this.Ze.splice(0, t - this.ot);
     } else if (this.ot > t) {
       let n = r - this.ot - 1;
       let i = this.ot - t;
-      this.et.length = this.$e.length = e;
+      this.et.length = this.Ze.length = e;
       while (n >= i) {
         this.et[n] = this.et[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.$e[e] = runWithOwner((this.et[e] = createOwner()), () => this.Ze(e + t));
+        this.Ze[e] = runWithOwner((this.et[e] = createOwner()), () => this.Ye(e + t));
       }
     }
     for (let e = r; e < n; e++) {
-      this.$e[e - t] = runWithOwner((this.et[e - t] = createOwner()), () => this.Ze(e));
+      this.Ze[e - t] = runWithOwner((this.et[e - t] = createOwner()), () => this.Ye(e));
     }
-    this.$e = this.$e.slice(0, e);
+    this.Ze = this.Ze.slice(0, e);
     this.ot = t;
-    this.Je = e;
+    this.$e = e;
   });
-  return this.$e;
+  return this.Ze;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
@@ -3501,11 +3562,11 @@ function boundaryComputed(e, t) {
   n.Fe = (e, t) => {
     const r = e !== undefined ? e : n.be;
     const i = t !== undefined ? t : n.we;
-    n.be &= ~n.ft;
-    n.te.notify(n, n.ft, r, i);
+    n.be &= ~n.lt;
+    n.te.notify(n, n.lt, r, i);
   };
-  n.ft = t;
-  n.ye &= ~y;
+  n.lt = t;
+  n.ge &= ~g;
   recompute(n, true);
   return n;
 }
@@ -3515,12 +3576,12 @@ function createBoundChildren(e, t, n, r) {
   cleanup(() => i.removeChild(e.te));
   return runWithOwner(e, () => {
     const e = computed(t);
-    return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
+    return boundaryComputed(() => flatten(read(e)), r);
   });
 }
-const je = Symbol();
-const We = createContext(null);
-let Re = false;
+const We = Symbol();
+const Re = createContext(null);
+let Ae = false;
 const FALSE_ACCESSOR = () => false;
 const SEQUENTIAL_ACCESSOR = () => "sequential";
 function isRevealController(e) {
@@ -3534,12 +3595,12 @@ function isSlotMinimallyReady(e) {
 }
 function setSlotState(e, t, n, r) {
   setSignal(e.ht, n);
-  setSignal(e.gt, r);
+  setSignal(e.yt, r);
   if (isRevealController(e)) {
     if (!n && e.St === t) e.St = undefined;
     return e.evaluate(n, r);
   }
-  if (!n && e.yt === t && e.wt) e.yt = undefined;
+  if (!n && e.gt === t && e.wt) e.gt = undefined;
 }
 class RevealController {
   _t;
@@ -3547,7 +3608,7 @@ class RevealController {
   Ot = [];
   St;
   ht = signal(false, { ownedWrite: true, ze: true });
-  gt = signal(false, { ownedWrite: true, ze: true });
+  yt = signal(false, { ownedWrite: true, ze: true });
   vt = true;
   Pt = true;
   xt = false;
@@ -3555,16 +3616,16 @@ class RevealController {
     this._t = e;
     this.bt = t;
   }
-  Ct(e) {
+  Nt(e) {
     for (let t = 0; t < this.Ot.length; t++) {
       const n = this.Ot[t];
-      if ((isRevealController(n) ? n.St : n.yt) !== this) continue;
+      if ((isRevealController(n) ? n.St : n.gt) !== this) continue;
       if (e(n) === false) return false;
     }
     return true;
   }
   isReady() {
-    return this.Ct(isSlotReady);
+    return this.Nt(isSlotReady);
   }
   isMinimallyReady() {
     const e = untrack(this._t);
@@ -3572,7 +3633,7 @@ class RevealController {
     if (e === "natural") {
       let e = false;
       let t = false;
-      this.Ct(n => {
+      this.Nt(n => {
         e = true;
         if (isSlotMinimallyReady(n)) {
           t = true;
@@ -3582,7 +3643,7 @@ class RevealController {
       return !e || t;
     }
     let t = true;
-    this.Ct(e => {
+    this.Nt(e => {
       t = isSlotMinimallyReady(e);
       return false;
     });
@@ -3592,7 +3653,7 @@ class RevealController {
     if (this.Ot.includes(e)) return;
     this.Ot.push(e);
     const t = untrack(this._t);
-    (setSignal(e.ht, true), setSignal(e.gt, t === "sequential" ? !!untrack(this.bt) : false));
+    (setSignal(e.ht, true), setSignal(e.yt, t === "sequential" ? !!untrack(this.bt) : false));
     untrack(() => this.evaluate());
   }
   unregister(e) {
@@ -3611,11 +3672,11 @@ class RevealController {
         i = r === "sequential" && !!untrack(this.bt),
         s = t ?? i;
       if (n) {
-        this.Ct(e => setSlotState(e, this, true, s));
+        this.Nt(e => setSlotState(e, this, true, s));
       } else if (r === "natural") {
-        this.Ct(e => {
+        this.Nt(e => {
           if (isRevealController(e)) {
-            setSignal(e.gt, false);
+            setSignal(e.yt, false);
             setSignal(e.ht, false);
             e.evaluate(false, false);
           } else {
@@ -3623,16 +3684,16 @@ class RevealController {
           }
         });
       } else if (r === "together") {
-        const e = this.Ct(isSlotMinimallyReady);
-        this.Ct(t => setSlotState(t, this, !e, false));
+        const e = this.Nt(isSlotMinimallyReady);
+        this.Nt(t => setSlotState(t, this, !e, false));
       } else {
         let e = false;
-        this.Ct(t => {
+        this.Nt(t => {
           if (e) return setSlotState(t, this, true, i);
           if (isSlotReady(t)) return setSlotState(t, this, false, false);
           e = true;
           if (isRevealController(t)) {
-            setSignal(t.gt, false);
+            setSignal(t.yt, false);
             setSignal(t.ht, false);
             t.evaluate(false, false);
           } else {
@@ -3649,32 +3710,33 @@ class RevealController {
   }
 }
 class CollectionQueue extends Queue {
-  Nt;
+  Ct;
   ct = new Set();
   Et;
   dt = true;
   ht = signal(false, { ownedWrite: true, ze: true });
-  gt = signal(false, { ownedWrite: true, ze: true });
-  yt;
+  we;
+  yt = signal(false, { ownedWrite: true, ze: true });
+  gt;
   wt = false;
   kt;
-  jt = je;
+  jt = We;
   constructor(e) {
     super();
-    this.Nt = e;
+    this.Ct = e;
   }
   run(e) {
-    if (!e || (read(this.ht) && (!Re || read(this.gt)))) return;
+    if (!e || (read(this.ht) && (!Ae || read(this.yt)))) return;
     return super.run(e);
   }
   notify(e, t, n, r) {
-    if (!(t & this.Nt)) return super.notify(e, t, n, r);
+    if (!(t & this.Ct)) return super.notify(e, t, n, r);
     if (this.wt && this.kt) {
       const e = untrack(() => {
         try {
           return this.kt();
         } catch {
-          return je;
+          return We;
         }
       });
       if (e !== this.jt) {
@@ -3683,29 +3745,32 @@ class CollectionQueue extends Queue {
         this.ct.clear();
       }
     }
-    if (this.Nt & m && this.wt) return super.notify(e, t, n, r);
-    if (this.Nt & m && n & _) {
-      return super.notify(e, _, n, r);
+    if (this.Ct & _ && this.wt) return super.notify(e, t, n, r);
+    if (this.Ct & _ && n & m) {
+      return super.notify(e, m, n, r);
     }
-    if (n & this.Nt) {
+    if (n & this.Ct) {
       this.dt = true;
       const t = r?.source || e.we?.source;
       if (t) {
         const e = this.ct.size === 0;
         this.ct.add(t);
         if (e) setSignal(this.ht, true);
+        if (this.Ct & m) {
+          setSignal(this.we, t.we?.cause ?? t.we);
+        }
       }
     }
-    t &= ~this.Nt;
+    t &= ~this.Ct;
     return t ? super.notify(e, t, n, r) : true;
   }
   checkSources() {
     for (const e of this.ct) {
-      if (e.m & u || (!(e.be & this.Nt) && !(this.Nt & _ && e.be & m))) this.ct.delete(e);
+      if (e._ & u || (!(e.be & this.Ct) && !(this.Ct & m && e.be & _))) this.ct.delete(e);
     }
     if (!this.ct.size) {
-      if (this.Nt & m && this.dt && !this.wt && this.Et) {
-        this.dt = !!(this.Et.be & this.Nt);
+      if (this.Ct & _ && this.dt && !this.wt && this.Et) {
+        this.dt = !!(this.Et.be & this.Ct);
       } else {
         this.dt = false;
       }
@@ -3718,13 +3783,14 @@ class CollectionQueue extends Queue {
         }
       }
     }
-    if (Re) this.yt?.evaluate();
+    if (Ae) this.gt?.evaluate();
   }
 }
 function createCollectionBoundary(e, t, n, r) {
   const i = createOwner();
-  if (Re) setContext(We, null, i);
+  if (Ae) setContext(Re, null, i);
   const s = new CollectionQueue(e);
+  if (e === m) s.we = signal(undefined, { ownedWrite: true, ze: true });
   if (r) s.kt = r;
   const o = (s.Et = createBoundChildren(i, t, s, e));
   untrack(() => {
@@ -3737,9 +3803,9 @@ function createCollectionBoundary(e, t, n, r) {
     }
     s.dt = t || !!(o.be & e) || o.we instanceof NotReadyError;
   });
-  const u = Re && e === m ? getContext(We) : null;
+  const u = Ae && e === _ ? getContext(Re) : null;
   if (u) {
-    s.yt = u;
+    s.gt = u;
     u.register(s);
     cleanup(() => u.unregister(s));
   }
@@ -3749,32 +3815,30 @@ function createCollectionBoundary(e, t, n, r) {
         const e = read(o);
         if (!untrack(() => read(s.ht))) return ((s.wt = true), e);
       }
-      if (Re && read(s.gt)) return undefined;
+      if (Ae && read(s.yt)) return undefined;
       return n(s);
     })
   );
 }
 function createLoadingBoundary(e, t, n) {
-  return createCollectionBoundary(m, e, () => t(), n?.on);
+  return createCollectionBoundary(_, e, () => t(), n?.on);
 }
 function createErrorBoundary(e, t) {
-  return createCollectionBoundary(_, e, e => {
-    let n = e.ct.values().next().value;
-    const r = n.we?.cause ?? n.we;
-    return t(r, () => {
+  return createCollectionBoundary(m, e, e =>
+    t(accessor(e.we), () => {
       for (const t of e.ct) recompute(t);
       schedule();
-    });
-  });
+    })
+  );
 }
 function createRevealOrder(e, t) {
-  Re = true;
+  Ae = true;
   const n = createOwner();
-  const r = getContext(We);
+  const r = getContext(Re);
   const i = t?.order || SEQUENTIAL_ACCESSOR,
     s = t?.collapsed || FALSE_ACCESSOR;
   const o = new RevealController(i, s);
-  setContext(We, o, n);
+  setContext(Re, o, n);
   return runWithOwner(n, () => {
     const t = e();
     computed(() => {
@@ -3839,13 +3903,13 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-const Ae = undefined;
-exports.$PROXY = fe;
+const Ie = undefined;
+exports.$PROXY = ce;
 exports.$REFRESH = j;
 exports.$TARGET = le;
-exports.$TRACK = ue;
+exports.$TRACK = fe;
 exports.ContextNotFoundError = ContextNotFoundError;
-exports.DEV = Ae;
+exports.DEV = Ie;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
 exports.SUPPORTS_PROXY = E;