@solidjs/signals 2.0.0-beta.7 → 2.0.0-beta.9

package/dist/node.cjs

@@ -37,15 +37,21 @@ const c = 1 << 9;
 const a = 1 << 0;
 const d = 1 << 1;
 const h = 1 << 2;
-const p = 1;
-const y = 2;
-const g = 3;
-const S = {};
-const w = {};
-const m = "sp";
-const b = typeof Proxy === "function";
-const _ = {};
-const O = Symbol("refresh");
+const p = 1 << 3;
+const y = 1 << 4;
+const g = 1 << 5;
+const S = 1 << 0;
+const w = 1 << 1;
+const m = 1 << 2;
+const b = 1;
+const _ = 2;
+const O = 3;
+const v = {};
+const x = {};
+const P = "sp";
+const k = typeof Proxy === "function";
+const E = {};
+const C = Symbol("refresh");
 function actualInsertIntoHeap(e, t) {
   const n = (e.i?.t ? e.i.u?.o : e.i?.o) ?? -1;
   if (n >= e.o) e.o = n + 1;
@@ -108,7 +114,7 @@ function markNode(e, r = n) {
     markNode(n.k, t);
   }
   if (e.C !== null) {
-    for (let n = e.C; n !== null; n = n.W) {
+    for (let n = e.C; n !== null; n = n.N) {
       for (let e = n.O; e !== null; e = e.P) {
         markNode(e.k, t);
       }
@@ -117,12 +123,12 @@ function markNode(e, r = n) {
 }
 function runHeap(e, t) {
   e._ = false;
-  for (e.j = 0; e.j <= e.S; e.j++) {
-    let n = e.l[e.j];
+  for (e.W = 0; e.W <= e.S; e.W++) {
+    let n = e.l[e.W];
     while (n !== undefined) {
       if (n.m & i) t(n);
       else adjustHeight(n, e);
-      n = e.l[e.j];
+      n = e.l[e.W];
     }
   }
   e.S = 0;
@@ -130,8 +136,8 @@ function runHeap(e, t) {
 function adjustHeight(e, t) {
   deleteFromHeap(e, t);
   let n = e.o;
-  for (let t = e.A; t; t = t.N) {
-    const e = t.R;
+  for (let t = e.j; t; t = t.R) {
+    const e = t.A;
     const r = e.L || e;
     if (r.I && r.o >= n) n = r.o + 1;
   }
@@ -142,25 +148,42 @@ function adjustHeight(e, t) {
     }
   }
 }
-const x = undefined;
-const v = new Set();
-const P = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
-const k = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
-let E = 0;
-let C = null;
-let W = false;
-let j = false;
-let A = null;
+const N = undefined;
+const W = new Set();
+const j = { l: new Array(2e3).fill(undefined), _: false, W: 0, S: 0 };
+const R = { l: new Array(2e3).fill(undefined), _: false, W: 0, S: 0 };
+let A = 0;
+let L = null;
+let I = false;
+let T = false;
+let H = null;
+const Q = new Set();
+function registerTransientStoreNode(e) {
+  Q.add(e);
+}
+function sweepTransientStoreNodes() {
+  if (Q.size === 0) return;
+  for (const e of Q) {
+    if (e.O !== null) {
+      Q.delete(e);
+      continue;
+    }
+    if (e.T !== v) continue;
+    if (e.H !== undefined && e.H !== v) continue;
+    Q.delete(e);
+    e.q?.();
+  }
+}
 function enforceLoadingBoundary(e) {}
 function shouldReadStashedOptimisticValue(e) {
-  return !!A?.has(e);
+  return !!H?.has(e);
 }
 function runLaneEffects(e) {
-  for (const t of L) {
-    if (t.T || t.H.size > 0) continue;
-    const n = t.q[e - 1];
+  for (const t of D) {
+    if (t.M || t.D.size > 0) continue;
+    const n = t.F[e - 1];
     if (n.length) {
-      t.q[e - 1] = [];
+      t.F[e - 1] = [];
       runQueue(n, e);
     }
   }
@@ -168,83 +191,84 @@ function runLaneEffects(e) {
 function queueStashedOptimisticEffects(e) {
   for (let t = e.O; t !== null; t = t.P) {
     const e = t.k;
-    if (!e.D) continue;
-    if (e.D === g) {
-      if (!e.F) {
-        e.F = true;
-        e.V.enqueue(y, e.M);
+    if (!e.V) continue;
+    if (e.V === O) {
+      if (!e.B) {
+        e.B = true;
+        e.K.enqueue(_, e.G);
       }
       continue;
     }
-    const n = e.m & o ? k : P;
-    if (n.j > e.o) n.j = e.o;
+    const n = e.m & o ? R : j;
+    if (n.W > e.o) n.W = e.o;
     insertIntoHeap(e, n);
   }
 }
 function setProjectionWriteActive(e) {
-  j = e;
+  T = e;
 }
 function mergeTransitionState(e, t) {
-  t.B = e;
-  e.K.push(...t.K);
-  for (const n of L) if (n.G === t) n.G = e;
-  e.U.push(...t.U);
-  for (const n of t.J) e.J.add(n);
-  for (const [n, r] of t.X) {
-    let t = e.X.get(n);
-    if (!t) e.X.set(n, (t = new Set()));
+  t.U = e;
+  e.J.push(...t.J);
+  for (const n of D) if (n.X === t) n.X = e;
+  e.Y.push(...t.Y);
+  for (const n of t.Z) e.Z.add(n);
+  for (const [n, r] of t.$) {
+    let t = e.$.get(n);
+    if (!t) e.$.set(n, (t = new Set()));
     for (const e of r) t.add(e);
   }
+  for (const n of t.ee) e.ee.add(n);
 }
 function resolveOptimisticNodes(e) {
   for (let t = 0; t < e.length; t++) {
     const n = e[t];
-    n.Y = undefined;
-    if (n.Z !== S) {
-      n.$ = n.Z;
-      n.Z = S;
+    n.te = undefined;
+    if (n.T !== v) {
+      n.ne = n.T;
+      n.T = v;
     }
-    const r = n.ee;
-    n.ee = S;
-    if (r !== S && n.$ !== r) insertSubs(n, true);
-    n.G = null;
+    const r = n.H;
+    n.H = v;
+    if (r !== v && n.ne !== r) insertSubs(n, true);
+    n.X = null;
   }
   e.length = 0;
 }
 function cleanupCompletedLanes(e) {
-  for (const t of L) {
-    const n = e ? t.G === e : !t.G;
+  for (const t of D) {
+    const n = e ? t.X === e : !t.X;
     if (!n) continue;
-    if (!t.T) {
-      if (t.q[0].length) runQueue(t.q[0], p);
-      if (t.q[1].length) runQueue(t.q[1], y);
+    if (!t.M) {
+      if (t.F[0].length) runQueue(t.F[0], b);
+      if (t.F[1].length) runQueue(t.F[1], _);
     }
-    if (t.te.Y === t) t.te.Y = undefined;
-    t.H.clear();
-    t.q[0].length = 0;
-    t.q[1].length = 0;
-    L.delete(t);
-    R.delete(t.te);
+    if (t.re.te === t) t.re.te = undefined;
+    t.D.clear();
+    t.F[0].length = 0;
+    t.F[1].length = 0;
+    D.delete(t);
+    M.delete(t.re);
   }
 }
 function schedule() {
-  if (W) return;
-  W = true;
-  if (!N.ne && !j) queueMicrotask(flush);
+  if (I) return;
+  I = true;
+  if (!q.ie && !T) queueMicrotask(flush);
 }
 class Queue {
   i = null;
-  re = [[], []];
-  ie = [];
-  created = E;
+  se = [[], []];
+  oe = [];
+  created = A;
   addChild(e) {
-    this.ie.push(e);
+    this.oe.push(e);
     e.i = this;
   }
   removeChild(e) {
-    const t = this.ie.indexOf(e);
+    const t = this.oe.indexOf(e);
     if (t >= 0) {
-      this.ie.splice(t, 1);
+      this.oe.splice(t, 1);
       e.i = null;
     }
   }
@@ -253,122 +277,122 @@ class Queue {
     return false;
   }
   run(e) {
-    if (this.re[e - 1].length) {
-      const t = this.re[e - 1];
-      this.re[e - 1] = [];
+    if (this.se[e - 1].length) {
+      const t = this.se[e - 1];
+      this.se[e - 1] = [];
       runQueue(t, e);
     }
-    for (let t = 0; t < this.ie.length; t++) this.ie[t].run?.(e);
+    for (let t = 0; t < this.oe.length; t++) this.oe[t].run?.(e);
   }
   enqueue(e, t) {
     if (e) {
-      if (B) {
-        const n = findLane(B);
-        n.q[e - 1].push(t);
+      if (Y) {
+        const n = findLane(Y);
+        n.F[e - 1].push(t);
       } else {
-        this.re[e - 1].push(t);
+        this.se[e - 1].push(t);
       }
     }
     schedule();
   }
   stashQueues(e) {
-    e.re[0].push(...this.re[0]);
-    e.re[1].push(...this.re[1]);
-    this.re = [[], []];
-    for (let t = 0; t < this.ie.length; t++) {
-      let n = this.ie[t];
-      let r = e.ie[t];
+    e.se[0].push(...this.se[0]);
+    e.se[1].push(...this.se[1]);
+    this.se = [[], []];
+    for (let t = 0; t < this.oe.length; t++) {
+      let n = this.oe[t];
+      let r = e.oe[t];
       if (!r) {
-        r = { re: [[], []], ie: [] };
-        e.ie[t] = r;
+        r = { se: [[], []], oe: [] };
+        e.oe[t] = r;
       }
       n.stashQueues(r);
     }
   }
   restoreQueues(e) {
-    this.re[0].push(...e.re[0]);
-    this.re[1].push(...e.re[1]);
-    for (let t = 0; t < e.ie.length; t++) {
-      const n = e.ie[t];
-      let r = this.ie[t];
+    this.se[0].push(...e.se[0]);
+    this.se[1].push(...e.se[1]);
+    for (let t = 0; t < e.oe.length; t++) {
+      const n = e.oe[t];
+      let r = this.oe[t];
       if (r) r.restoreQueues(n);
     }
   }
 }
 class GlobalQueue extends Queue {
-  ne = false;
-  se = [];
-  U = [];
-  J = new Set();
-  static oe;
-  static ue;
-  static fe = null;
+  ie = false;
+  ue = [];
+  Y = [];
+  Z = new Set();
+  static fe;
+  static le;
+  static ce = null;
   flush() {
-    if (this.ne) return;
-    this.ne = true;
+    if (this.ie) return;
+    this.ie = true;
     try {
-      runHeap(P, GlobalQueue.oe);
-      if (C) {
-        const e = transitionComplete(C);
+      runHeap(j, GlobalQueue.fe);
+      if (L) {
+        const e = transitionComplete(L);
         if (!e) {
-          const e = C;
-          runHeap(k, GlobalQueue.oe);
-          this.se = [];
-          this.U = [];
-          this.J = new Set();
-          runLaneEffects(p);
-          runLaneEffects(y);
-          this.stashQueues(e.le);
-          E++;
-          W = P.S >= P.j;
-          reassignPendingTransition(e.se);
-          C = null;
-          if (!e.K.length && e.U.length) {
-            A = new Set();
-            for (let t = 0; t < e.U.length; t++) {
-              const n = e.U[t];
-              if (n.I || n.ce) continue;
-              A.add(n);
+          const e = L;
+          runHeap(R, GlobalQueue.fe);
+          this.ue = [];
+          this.Y = [];
+          this.Z = new Set();
+          runLaneEffects(b);
+          runLaneEffects(_);
+          this.stashQueues(e.ae);
+          A++;
+          I = j.S >= j.W;
+          reassignPendingTransition(e.ue);
+          L = null;
+          if (!e.J.length && !e.$.size && e.Y.length) {
+            H = new Set();
+            for (let t = 0; t < e.Y.length; t++) {
+              const n = e.Y[t];
+              if (n.I || n.de & a) continue;
+              H.add(n);
               queueStashedOptimisticEffects(n);
             }
           }
           try {
             finalizePureQueue(null, true);
           } finally {
-            A = null;
+            H = null;
           }
           return;
         }
-        this.se !== C.se && this.se.push(...C.se);
-        this.restoreQueues(C.le);
-        v.delete(C);
-        const t = C;
-        C = null;
-        reassignPendingTransition(this.se);
+        this.ue !== L.ue && this.ue.push(...L.ue);
+        this.restoreQueues(L.ae);
+        W.delete(L);
+        const t = L;
+        L = null;
+        reassignPendingTransition(this.ue);
         finalizePureQueue(t);
       } else {
-        if (v.size) runHeap(k, GlobalQueue.oe);
+        if (W.size) runHeap(R, GlobalQueue.fe);
         finalizePureQueue();
       }
-      E++;
-      W = P.S >= P.j;
-      runLaneEffects(p);
-      this.run(p);
-      runLaneEffects(y);
-      this.run(y);
+      A++;
+      I = j.S >= j.W;
+      runLaneEffects(b);
+      this.run(b);
+      runLaneEffects(_);
+      this.run(_);
       if (false);
     } finally {
-      this.ne = false;
+      this.ie = false;
     }
   }
   notify(e, t, n, r) {
-    if (t & a) {
-      if (n & a) {
-        const t = r !== undefined ? r : e.ae;
-        if (C && t) {
+    if (t & S) {
+      if (n & S) {
+        const t = r !== undefined ? r : e.he;
+        if (L && t) {
           const n = t.source;
-          let r = C.X.get(n);
-          if (!r) C.X.set(n, (r = new Set()));
+          let r = L.$.get(n);
+          if (!r) L.$.set(n, (r = new Set()));
           const i = r.size;
           r.add(e);
           if (r.size !== i) schedule();
@@ -380,57 +404,58 @@ class GlobalQueue extends Queue {
   }
   initTransition(e) {
     if (e) e = currentTransition(e);
-    if (e && e === C) return;
-    if (!e && C && C.de === E) return;
-    if (!C) {
-      C = e ?? {
-        de: E,
-        se: [],
-        X: new Map(),
-        U: [],
-        J: new Set(),
-        K: [],
-        le: { re: [[], []], ie: [] },
-        B: false
+    if (e && e === L) return;
+    if (!e && L && L.pe === A) return;
+    if (!L) {
+      L = e ?? {
+        pe: A,
+        ue: [],
+        $: new Map(),
+        Y: [],
+        Z: new Set(),
+        J: [],
+        ae: { se: [[], []], oe: [] },
+        U: false,
+        ee: new Set()
       };
     } else if (e) {
-      const t = C;
+      const t = L;
       mergeTransitionState(e, t);
-      v.delete(t);
-      C = e;
+      W.delete(t);
+      L = e;
     }
-    v.add(C);
-    C.de = E;
-    if (this.se !== C.se) {
-      for (let e = 0; e < this.se.length; e++) {
-        const t = this.se[e];
-        t.G = C;
-        C.se.push(t);
+    W.add(L);
+    L.pe = A;
+    if (this.ue !== L.ue) {
+      for (let e = 0; e < this.ue.length; e++) {
+        const t = this.ue[e];
+        t.X = L;
+        L.ue.push(t);
       }
-      this.se = C.se;
+      this.ue = L.ue;
     }
-    if (this.U !== C.U) {
-      for (let e = 0; e < this.U.length; e++) {
-        const t = this.U[e];
-        t.G = C;
-        C.U.push(t);
+    if (this.Y !== L.Y) {
+      for (let e = 0; e < this.Y.length; e++) {
+        const t = this.Y[e];
+        t.X = L;
+        L.Y.push(t);
       }
-      this.U = C.U;
+      this.Y = L.Y;
     }
-    for (const e of L) {
-      if (!e.G) e.G = C;
+    for (const e of D) {
+      if (!e.X) e.X = L;
     }
-    if (this.J !== C.J) {
-      for (const e of this.J) C.J.add(e);
-      this.J = C.J;
+    if (this.Z !== L.Z) {
+      for (const e of this.Z) L.Z.add(e);
+      this.Z = L.Z;
     }
   }
 }
 function insertSubs(e, t = false) {
-  const n = e.Y || B;
-  const r = e.he !== undefined;
+  const n = e.te || Y;
+  const r = e.ye !== undefined;
   for (let i = e.O; i !== null; i = i.P) {
-    if (r && i.k.pe) {
+    if (r && i.k.de & p) {
       i.k.m |= l;
       continue;
     }
@@ -439,76 +464,93 @@ function insertSubs(e, t = false) {
       assignOrMergeLane(i.k, n);
     } else if (t) {
       i.k.m |= f;
-      i.k.Y = undefined;
+      i.k.te = undefined;
     }
     const e = i.k;
-    if (e.D === g) {
-      if (!e.F) {
-        e.F = true;
-        e.V.enqueue(y, e.M);
+    if (e.V === O) {
+      if (!e.B) {
+        e.B = true;
+        e.K.enqueue(_, e.G);
       }
       continue;
     }
-    const s = i.k.m & o ? k : P;
-    if (s.j > i.k.o) s.j = i.k.o;
+    const s = i.k.m & o ? R : j;
+    if (s.W > i.k.o) s.W = i.k.o;
     insertIntoHeap(i.k, s);
   }
 }
 function commitPendingNodes() {
-  const e = N.se;
+  const e = q.ue;
   for (let t = 0; t < e.length; t++) {
     const n = e[t];
-    if (n.Z !== S) {
-      n.$ = n.Z;
-      n.Z = S;
-      if (n.D && n.D !== g) n.F = true;
+    if (n.T !== v) {
+      n.ne = n.T;
+      n.T = v;
+      if (n.V && n.V !== O) n.B = true;
     }
-    if (!(n.ye & a)) n.ye &= ~h;
-    if (n.I) GlobalQueue.ue(n, false, true);
+    if (!(n.ge & S)) n.ge &= ~m;
+    if (n.I) GlobalQueue.le(n, false, true);
   }
   e.length = 0;
 }
 function finalizePureQueue(e = null, t = false) {
   const n = !t;
   if (n) commitPendingNodes();
-  if (!t) checkBoundaryChildren(N);
-  if (P.S >= P.j) runHeap(P, GlobalQueue.oe);
+  if (!t) checkBoundaryChildren(q);
+  if (j.S >= j.W) runHeap(j, GlobalQueue.fe);
   if (n) {
     commitPendingNodes();
-    resolveOptimisticNodes(e ? e.U : N.U);
-    const t = e ? e.J : N.J;
-    if (GlobalQueue.fe && t.size) {
+    resolveOptimisticNodes(e ? e.Y : q.Y);
+    if (e && e.ee.size) {
+      for (const t of e.ee) {
+        if (t.m & u) continue;
+        if (t.V === O) {
+          if (!t.B) {
+            t.B = true;
+            t.K.enqueue(_, t.G);
+          }
+          continue;
+        }
+        const e = t.m & o ? R : j;
+        if (e.W > t.o) e.W = t.o;
+        insertIntoHeap(t, e);
+      }
+      e.ee.clear();
+    }
+    const t = e ? e.Z : q.Z;
+    if (GlobalQueue.ce && t.size) {
       for (const e of t) {
-        GlobalQueue.fe(e);
+        GlobalQueue.ce(e);
       }
       t.clear();
       schedule();
     }
+    sweepTransientStoreNodes();
     cleanupCompletedLanes(e);
   }
 }
 function checkBoundaryChildren(e) {
-  for (const t of e.ie) {
+  for (const t of e.oe) {
     t.checkSources?.();
     checkBoundaryChildren(t);
   }
 }
 function trackOptimisticStore(e) {
-  N.J.add(e);
+  q.Z.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
-    e[t].G = C;
+    e[t].X = L;
   }
 }
-const N = new GlobalQueue();
+const q = new GlobalQueue();
 function flush() {
-  if (N.ne) {
+  if (q.ie) {
     return;
   }
-  while (W || C) {
-    N.flush();
+  while (I || L) {
+    q.flush();
   }
 }
 function runQueue(e, t) {
@@ -516,21 +558,21 @@ function runQueue(e, t) {
 }
 function reporterBlocksSource(e, t) {
   if (e.m & (o | u)) return false;
-  if (e.ge === t || e.Se?.has(t)) return true;
-  for (let n = e.A; n; n = n.N) {
-    let e = n.R;
+  if (e.Se === t || e.we?.has(t)) return true;
+  for (let n = e.j; n; n = n.R) {
+    let e = n.A;
     while (e) {
       if (e === t || e.L === t) return true;
-      e = e.we;
+      e = e.me;
     }
   }
-  return !!(e.ye & a && e.ae instanceof NotReadyError && e.ae.source === t);
+  return !!(e.ge & S && e.he instanceof NotReadyError && e.he.source === t);
 }
 function transitionComplete(e) {
-  if (e.B) return true;
-  if (e.K.length) return false;
+  if (e.U) return true;
+  if (e.J.length) return false;
   let t = true;
-  for (const [n, r] of e.X) {
+  for (const [n, r] of e.$) {
     let i = false;
     for (const e of r) {
       if (reporterBlocksSource(e, n)) {
@@ -539,221 +581,222 @@ function transitionComplete(e) {
       }
       r.delete(e);
     }
-    if (!i) e.X.delete(n);
-    else if (n.ye & a && n.ae?.source === n) {
+    if (!i) e.$.delete(n);
+    else if (n.ge & S && n.he?.source === n) {
       t = false;
       break;
     }
   }
   if (t) {
-    for (let n = 0; n < e.U.length; n++) {
-      const r = e.U[n];
+    for (let n = 0; n < e.Y.length; n++) {
+      const r = e.Y[n];
       if (
         hasActiveOverride(r) &&
-        "ye" in r &&
-        r.ye & a &&
-        r.ae instanceof NotReadyError &&
-        r.ae.source !== r
+        "ge" in r &&
+        r.ge & S &&
+        r.he instanceof NotReadyError &&
+        r.he.source !== r
       ) {
         t = false;
         break;
       }
     }
   }
-  t && (e.B = true);
+  t && (e.U = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.B && typeof e.B === "object") e = e.B;
+  while (e.U && typeof e.U === "object") e = e.U;
   return e;
 }
 function setActiveTransition(e) {
-  C = e;
+  L = e;
 }
 function runInTransition(e, t) {
-  const n = C;
+  const n = L;
   try {
-    C = currentTransition(e);
+    L = currentTransition(e);
     return t();
   } finally {
-    C = n;
+    L = n;
   }
 }
-const R = new WeakMap();
-const L = new Set();
+const M = new WeakMap();
+const D = new Set();
 function getOrCreateLane(e) {
-  let t = R.get(e);
+  let t = M.get(e);
   if (t) {
     return findLane(t);
   }
-  const n = e.we;
-  const r = n?.Y ? findLane(n.Y) : null;
-  t = { te: e, H: new Set(), q: [[], []], T: null, G: C, me: r };
-  R.set(e, t);
-  L.add(t);
-  e.be = false;
+  const n = e.me;
+  const r = n?.te ? findLane(n.te) : null;
+  t = { re: e, D: new Set(), F: [[], []], M: null, X: L, be: r };
+  M.set(e, t);
+  D.add(t);
+  e._e = false;
   return t;
 }
 function findLane(e) {
-  while (e.T) e = e.T;
+  while (e.M) e = e.M;
   return e;
 }
 function mergeLanes(e, t) {
   e = findLane(e);
   t = findLane(t);
   if (e === t) return e;
-  t.T = e;
-  for (const n of t.H) e.H.add(n);
-  e.q[0].push(...t.q[0]);
-  e.q[1].push(...t.q[1]);
+  t.M = e;
+  for (const n of t.D) e.D.add(n);
+  e.F[0].push(...t.F[0]);
+  e.F[1].push(...t.F[1]);
   return e;
 }
 function resolveLane(e) {
-  const t = e.Y;
+  const t = e.te;
   if (!t) return undefined;
   const n = findLane(t);
-  if (L.has(n)) return n;
-  e.Y = undefined;
+  if (D.has(n)) return n;
+  e.te = undefined;
   return undefined;
 }
 function resolveTransition(e) {
-  return resolveLane(e)?.G ?? e.G;
+  return resolveLane(e)?.X ?? e.X;
 }
 function hasActiveOverride(e) {
-  return !!(e.ee !== undefined && e.ee !== S);
+  return !!(e.H !== undefined && e.H !== v);
 }
 function assignOrMergeLane(e, t) {
   const n = findLane(t);
-  const r = e.Y;
+  const r = e.te;
   if (r) {
-    if (r.T) {
-      e.Y = t;
+    if (r.M) {
+      e.te = t;
       return;
     }
     const i = findLane(r);
-    if (L.has(i)) {
+    if (D.has(i)) {
       if (i !== n && !hasActiveOverride(e)) {
-        if (n.me && findLane(n.me) === i) {
-          e.Y = t;
-        } else if (i.me && findLane(i.me) === n);
+        if (n.be && findLane(n.be) === i) {
+          e.te = t;
+        } else if (i.be && findLane(i.be) === n);
         else mergeLanes(n, i);
       }
       return;
     }
   }
-  e.Y = t;
+  e.te = t;
 }
 function unlinkSubs(e) {
-  const t = e.R;
-  const n = e.N;
+  const t = e.A;
+  const n = e.R;
   const r = e.P;
-  const i = e._e;
-  if (r !== null) r._e = i;
-  else t.Oe = i;
+  const i = e.Oe;
+  if (r !== null) r.Oe = i;
+  else t.ve = i;
   if (i !== null) i.P = r;
   else {
     t.O = r;
     if (r === null) {
-      t.xe?.();
-      t.I && !t.ve && !(t.m & o) && unobserved(t);
+      t.q?.();
+      const e = t;
+      e.I && e.de & g && !(e.m & o) && unobserved(e);
     }
   }
   return n;
 }
 function unobserved(e) {
-  deleteFromHeap(e, e.m & o ? k : P);
-  let t = e.A;
+  deleteFromHeap(e, e.m & o ? R : j);
+  let t = e.j;
   while (t !== null) {
     t = unlinkSubs(t);
   }
-  e.A = null;
-  e.Pe = null;
+  e.j = null;
+  e.xe = null;
   disposeChildren(e, true);
 }
 function link(e, t) {
-  const n = t.Pe;
-  if (n !== null && n.R === e) return;
+  const n = t.xe;
+  if (n !== null && n.A === e) return;
   let i = null;
   const s = t.m & r;
   if (s) {
-    i = n !== null ? n.N : t.A;
-    if (i !== null && i.R === e) {
-      t.Pe = i;
+    i = n !== null ? n.R : t.j;
+    if (i !== null && i.A === e) {
+      t.xe = i;
       return;
     }
   }
-  const o = e.Oe;
+  const o = e.ve;
   if (o !== null && o.k === t && (!s || isValidLink(o, t))) return;
-  const u = (t.Pe = e.Oe = { R: e, k: t, N: i, _e: o, P: null });
-  if (n !== null) n.N = u;
-  else t.A = u;
+  const u = (t.xe = e.ve = { A: e, k: t, R: i, Oe: o, P: null });
+  if (n !== null) n.R = u;
+  else t.j = u;
   if (o !== null) o.P = u;
   else e.O = u;
 }
 function isValidLink(e, t) {
-  const n = t.Pe;
+  const n = t.xe;
   if (n !== null) {
-    let r = t.A;
+    let r = t.j;
     do {
       if (r === e) return true;
       if (r === n) break;
-      r = r.N;
+      r = r.R;
     } while (r !== null);
   }
   return false;
 }
-const I = {};
+const F = {};
 function markDisposal(e) {
-  let t = e.ke;
+  let t = e.Pe;
   while (t) {
     t.m |= o;
     if (t.m & i) {
-      deleteFromHeap(t, P);
-      insertIntoHeap(t, k);
+      deleteFromHeap(t, j);
+      insertIntoHeap(t, R);
     }
     markDisposal(t);
-    t = t.Ee;
+    t = t.ke;
   }
 }
 function dispose(e) {
-  let t = e.A || null;
+  let t = e.j || null;
   do {
     t = unlinkSubs(t);
   } while (t !== null);
-  e.A = null;
-  e.Pe = null;
+  e.j = null;
+  e.xe = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
   if (e.m & u) return;
   if (t) e.m = u;
-  if (t && e.I) e.Ce = null;
-  let r = n ? e.We : e.ke;
+  if (t && e.I) e.Ee = null;
+  let r = n ? e.Ce : e.Pe;
   while (r) {
-    const e = r.Ee;
-    if (r.A) {
+    const e = r.ke;
+    if (r.j) {
       const e = r;
-      deleteFromHeap(e, e.m & o ? k : P);
-      let t = e.A;
+      deleteFromHeap(e, e.m & o ? R : j);
+      let t = e.j;
       do {
         t = unlinkSubs(t);
       } while (t !== null);
-      e.A = null;
-      e.Pe = null;
+      e.j = null;
+      e.xe = null;
     }
     disposeChildren(r, true);
     r = e;
   }
   if (n) {
-    e.We = null;
+    e.Ce = null;
   } else {
-    e.ke = null;
-    e.je = 0;
+    e.Pe = null;
+    e.Ne = 0;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.Ae : e.Ne;
+  let n = t ? e.We : e.je;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -763,12 +806,12 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.Ae = null) : (e.Ne = null);
+  t ? (e.We = null) : (e.je = null);
 }
 function childId(e, t) {
   let n = e;
-  while (n.Re && n.i) n = n.i;
-  if (n.id != null) return formatId(n.id, t ? n.je++ : n.je);
+  while (n.de & h && n.i) n = n.i;
+  if (n.id != null) return formatId(n.id, t ? n.Ne++ : n.Ne);
   throw new Error("Cannot get child id from owner without an id");
 }
 function getNextChildId(e) {
@@ -783,50 +826,50 @@ function formatId(e, t) {
   return e + (r ? String.fromCharCode(64 + r) : "") + n;
 }
 function getObserver() {
-  if (D || V) return I;
-  return H ? M : null;
+  if (z || J) return F;
+  return B ? X : null;
 }
 function getOwner() {
-  return M;
+  return X;
 }
 function cleanup(e) {
-  if (!M) return e;
-  if (!M.Ne) M.Ne = e;
-  else if (Array.isArray(M.Ne)) M.Ne.push(e);
-  else M.Ne = [M.Ne, e];
+  if (!X) return e;
+  if (!X.je) X.je = e;
+  else if (Array.isArray(X.je)) X.je.push(e);
+  else X.je = [X.je, e];
   return e;
 }
 function isDisposed(e) {
   return !!(e.m & (u | o));
 }
 function createOwner(e) {
-  const t = M;
+  const t = X;
   const n = e?.transparent ?? false;
   const r = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    Re: n || undefined,
+    de: n ? h : 0,
     t: true,
     u: t?.t ? t.u : t,
+    Pe: null,
     ke: null,
-    Ee: null,
-    Ne: null,
-    V: t?.V ?? N,
-    Le: t?.Le || _,
-    je: 0,
-    Ae: null,
+    je: null,
+    K: t?.K ?? q,
+    Re: t?.Re || E,
+    Ne: 0,
     We: null,
+    Ce: null,
     i: t,
     dispose(e = true) {
       disposeChildren(r, e);
     }
   };
   if (t) {
-    const e = t.ke;
+    const e = t.Pe;
     if (e === null) {
-      t.ke = r;
+      t.Pe = r;
     } else {
-      r.Ee = e;
-      t.ke = r;
+      r.ke = e;
+      t.Pe = r;
     }
   }
   return r;
@@ -836,56 +879,56 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(n.dispose));
 }
 function addPendingSource(e, t) {
-  if (e.ge === t || e.Se?.has(t)) return false;
-  if (!e.ge) {
-    e.ge = t;
+  if (e.Se === t || e.we?.has(t)) return false;
+  if (!e.Se) {
+    e.Se = t;
     return true;
   }
-  if (!e.Se) {
-    e.Se = new Set([e.ge, t]);
+  if (!e.we) {
+    e.we = new Set([e.Se, t]);
   } else {
-    e.Se.add(t);
+    e.we.add(t);
   }
-  e.ge = undefined;
+  e.Se = undefined;
   return true;
 }
 function removePendingSource(e, t) {
-  if (e.ge) {
-    if (e.ge !== t) return false;
-    e.ge = undefined;
+  if (e.Se) {
+    if (e.Se !== t) return false;
+    e.Se = undefined;
     return true;
   }
-  if (!e.Se?.delete(t)) return false;
-  if (e.Se.size === 1) {
-    e.ge = e.Se.values().next().value;
-    e.Se = undefined;
-  } else if (e.Se.size === 0) {
-    e.Se = undefined;
+  if (!e.we?.delete(t)) return false;
+  if (e.we.size === 1) {
+    e.Se = e.we.values().next().value;
+    e.we = undefined;
+  } else if (e.we.size === 0) {
+    e.we = undefined;
   }
   return true;
 }
 function clearPendingSources(e) {
-  e.ge = undefined;
-  e.Se?.clear();
   e.Se = undefined;
+  e.we?.clear();
+  e.we = undefined;
 }
 function setPendingError(e, t, n) {
   if (!t) {
-    e.ae = null;
+    e.he = null;
     return;
   }
   if (n instanceof NotReadyError && n.source === t) {
-    e.ae = n;
+    e.he = n;
     return;
   }
-  const r = e.ae;
+  const r = e.he;
   if (!(r instanceof NotReadyError) || r.source !== t) {
-    e.ae = new NotReadyError(t);
+    e.he = new NotReadyError(t);
   }
 }
 function forEachDependent(e, t) {
   for (let n = e.O; n !== null; n = n.P) t(n.k);
-  for (let n = e.C; n !== null; n = n.W) {
+  for (let n = e.C; n !== null; n = n.N) {
     for (let e = n.O; e !== null; e = e.P) t(e.k);
   }
 }
@@ -895,30 +938,30 @@ function settlePendingSource(e) {
   const settle = r => {
     if (n.has(r) || !removePendingSource(r, e)) return;
     n.add(r);
-    r.de = E;
-    const i = r.ge ?? r.Se?.values().next().value;
+    r.pe = A;
+    const i = r.Se ?? r.we?.values().next().value;
     if (i) {
       setPendingError(r, i);
       updatePendingSignal(r);
     } else {
-      r.ye &= ~a;
+      r.ge &= ~S;
       setPendingError(r);
       updatePendingSignal(r);
-      if (r.Ie) {
-        if (r.D === g) {
+      if (r.Ae) {
+        if (r.V === O) {
           const e = r;
-          if (!e.F) {
-            e.F = true;
-            e.V.enqueue(y, e.M);
+          if (!e.B) {
+            e.B = true;
+            e.K.enqueue(_, e.G);
           }
         } else {
-          const e = r.m & o ? k : P;
-          if (e.j > r.o) e.j = r.o;
+          const e = r.m & o ? R : j;
+          if (e.W > r.o) e.W = r.o;
           insertIntoHeap(r, e);
         }
         t = true;
       }
-      r.Ie = false;
+      r.Ae = false;
     }
     forEachDependent(r, settle);
   };
@@ -930,42 +973,42 @@ function handleAsync(e, t, r) {
   const s = i && untrack(() => t[Symbol.asyncIterator]);
   const o = !s && i && untrack(() => typeof t.then === "function");
   if (!o && !s) {
-    e.Ce = null;
+    e.Ee = null;
     return t;
   }
-  e.Ce = t;
+  e.Ee = t;
   let u;
   const handleError = n => {
-    if (e.Ce !== t) return;
-    N.initTransition(resolveTransition(e));
-    notifyStatus(e, n instanceof NotReadyError ? a : d, n);
-    e.de = E;
+    if (e.Ee !== t) return;
+    q.initTransition(resolveTransition(e));
+    notifyStatus(e, n instanceof NotReadyError ? S : w, n);
+    e.pe = A;
   };
   const asyncWrite = (i, s) => {
-    if (e.Ce !== t) return;
+    if (e.Ee !== t) return;
     if (e.m & (n | f)) return;
-    N.initTransition(resolveTransition(e));
-    const o = !!(e.ye & h);
+    q.initTransition(resolveTransition(e));
+    const o = !!(e.ge & m);
     clearStatus(e);
     const u = resolveLane(e);
-    if (u) u.H.delete(e);
+    if (u) u.D.delete(e);
     if (r) r(i);
-    else if (e.ee !== undefined) {
-      if (e.ee !== undefined && e.ee !== S) e.Z = i;
+    else if (e.H !== undefined) {
+      if (e.H !== undefined && e.H !== v) e.T = i;
       else {
-        e.$ = i;
+        e.ne = i;
         insertSubs(e);
       }
-      e.de = E;
+      e.pe = A;
     } else if (u) {
-      const t = e.D;
-      const n = e.$;
-      const r = e.Te;
+      const t = e.V;
+      const n = e.ne;
+      const r = e.Le;
       if ((!t && o) || !r || !r(i, n)) {
-        e.$ = i;
-        e.de = E;
-        if (e.He) {
-          setSignal(e.He, i);
+        e.ne = i;
+        e.pe = A;
+        if (e.Ie) {
+          setSignal(e.Ie, i);
         }
         insertSubs(e, true);
       }
@@ -993,8 +1036,8 @@ function handleAsync(e, t, r) {
     );
     r = false;
     if (!n) {
-      N.initTransition(resolveTransition(e));
-      throw new NotReadyError(M);
+      q.initTransition(resolveTransition(e));
+      throw new NotReadyError(X);
     }
   }
   if (s) {
@@ -1021,7 +1064,7 @@ function handleAsync(e, t, r) {
             s = n;
             o = true;
             if (n.done) i = true;
-          } else if (e.Ce !== t) {
+          } else if (e.Ee !== t) {
             return;
           } else if (!n.done) asyncWrite(n.value, iterate);
           else {
@@ -1031,7 +1074,7 @@ function handleAsync(e, t, r) {
           }
         },
         n => {
-          if (!f && e.Ce === t) {
+          if (!f && e.Ee === t) {
             i = true;
             handleError(n);
           }
@@ -1047,36 +1090,36 @@ function handleAsync(e, t, r) {
     };
     const s = iterate();
     if (!r && !s) {
-      N.initTransition(resolveTransition(e));
-      throw new NotReadyError(M);
+      q.initTransition(resolveTransition(e));
+      throw new NotReadyError(X);
     }
   }
   return u;
 }
 function clearStatus(e, t = false) {
   clearPendingSources(e);
-  e.Ie = false;
-  e.ye = t ? 0 : e.ye & h;
+  e.Ae = false;
+  e.ge = t ? 0 : e.ge & m;
   setPendingError(e);
   updatePendingSignal(e);
-  e.Qe?.();
+  e.Te?.();
 }
 function notifyStatus(e, t, n, r, i) {
-  if (t === d && !(n instanceof StatusError) && !(n instanceof NotReadyError))
+  if (t === w && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
-  const s = t === a && n instanceof NotReadyError ? n.source : undefined;
+  const s = t === S && n instanceof NotReadyError ? n.source : undefined;
   const o = s === e;
-  const u = t === a && e.ee !== undefined && !o;
+  const u = t === S && e.H !== undefined && !o;
   const f = u && hasActiveOverride(e);
   if (!r) {
-    if (t === a && s) {
+    if (t === S && s) {
       addPendingSource(e, s);
-      e.ye = a | (e.ye & h);
+      e.ge = S | (e.ge & m);
       setPendingError(e, s, n);
     } else {
       clearPendingSources(e);
-      e.ye = t | (t !== d ? e.ye & h : 0);
-      e.ae = n;
+      e.ge = t | (t !== w ? e.ge & m : 0);
+      e.he = n;
     }
     updatePendingSignal(e);
   }
@@ -1085,34 +1128,34 @@ function notifyStatus(e, t, n, r, i) {
   }
   const l = r || f;
   const c = r || u ? undefined : i;
-  if (e.Qe) {
-    if (r && t === a) {
+  if (e.Te) {
+    if (r && t === S) {
       return;
     }
     if (l) {
-      e.Qe(t, n);
+      e.Te(t, n);
     } else {
-      e.Qe();
+      e.Te();
     }
     return;
   }
   forEachDependent(e, e => {
-    e.de = E;
+    e.pe = A;
     if (
-      (t === a && s && e.ge !== s && !e.Se?.has(s)) ||
-      (t !== a && (e.ae !== n || e.ge || e.Se))
+      (t === S && s && e.Se !== s && !e.we?.has(s)) ||
+      (t !== S && (e.he !== n || e.Se || e.we))
     ) {
-      if (!l && !e.G) N.se.push(e);
+      if (!l && !e.X) q.ue.push(e);
       notifyStatus(e, t, n, l, c);
     }
   });
 }
-let T = null;
+let V = null;
 function enableExternalSource(e) {
   const { factory: t, untrack: n = e => e() } = e;
-  if (T) {
-    const { factory: e, untrack: r } = T;
-    T = {
+  if (V) {
+    const { factory: e, untrack: r } = V;
+    V = {
       factory: (n, r) => {
         const i = e(n, r);
         const s = t(e => i.track(e), r);
@@ -1127,174 +1170,190 @@ function enableExternalSource(e) {
       untrack: e => r(() => n(e))
     };
   } else {
-    T = { factory: t, untrack: n };
-  }
-}
-GlobalQueue.oe = recompute;
-GlobalQueue.ue = disposeChildren;
-let H = false;
-let Q = false;
-let q = false;
-let D = false;
-let F = false;
-let V = false;
-let M = null;
-let B = null;
+    V = { factory: t, untrack: n };
+  }
+}
+GlobalQueue.fe = recompute;
+GlobalQueue.le = disposeChildren;
+let B = false;
 let K = false;
-let G = null;
+let G = false;
+let z = false;
+let U = false;
+let J = false;
+let X = null;
+let Y = null;
+let Z = false;
+let $ = null;
 function ownerInSnapshotScope(e) {
   while (e) {
-    if (e.qe) return true;
+    if (e.He) return true;
     e = e.i;
   }
   return false;
 }
 function setSnapshotCapture(e) {
-  K = e;
-  if (e && !G) G = new Set();
+  Z = e;
+  if (e && !$) $ = new Set();
 }
 function markSnapshotScope(e) {
-  e.qe = true;
+  e.He = true;
 }
 function releaseSnapshotScope(e) {
-  e.qe = false;
+  e.He = false;
   releaseSubtree(e);
   schedule();
 }
 function releaseSubtree(e) {
-  let t = e.ke;
+  let t = e.Pe;
   while (t) {
-    if (t.qe) {
-      t = t.Ee;
+    if (t.He) {
+      t = t.ke;
       continue;
     }
     if (t.I) {
       const e = t;
-      e.pe = false;
+      e.de &= ~p;
       if (e.m & l) {
         e.m &= ~l;
         e.m |= n;
-        if (P.j > e.o) P.j = e.o;
-        insertIntoHeap(e, P);
+        if (j.W > e.o) j.W = e.o;
+        insertIntoHeap(e, j);
       }
     }
     releaseSubtree(t);
-    t = t.Ee;
+    t = t.ke;
   }
 }
 function clearSnapshots() {
-  if (G) {
-    for (const e of G) {
-      delete e.he;
-      delete e[m];
+  if ($) {
+    for (const e of $) {
+      delete e.ye;
+      delete e[P];
     }
-    G = null;
+    $ = null;
   }
-  K = false;
+  Z = false;
 }
 function recompute(t, n = false) {
-  const i = t.D;
+  const i = t.V;
   if (!n) {
-    if (t.G && (!i || C) && C !== t.G) N.initTransition(t.G);
-    deleteFromHeap(t, t.m & o ? k : P);
-    t.Ce = null;
-    if (t.G || i === g) disposeChildren(t);
+    if (t.X && (!i || L) && L !== t.X) q.initTransition(t.X);
+    deleteFromHeap(t, t.m & o ? R : j);
+    t.Ee = null;
+    if (t.X || i === O) disposeChildren(t);
     else {
       markDisposal(t);
-      t.Ae = t.Ne;
-      t.We = t.ke;
-      t.Ne = null;
-      t.ke = null;
-      t.je = 0;
-    }
-  }
-  const s = !!(t.m & f);
-  const u = t.ee !== undefined && t.ee !== S;
-  const c = !!(t.ye & a);
-  const p = !!(t.ye & h);
-  const y = M;
-  M = t;
-  t.Pe = null;
+      t.We = t.je;
+      t.Ce = t.Pe;
+      t.je = null;
+      t.Pe = null;
+      t.Ne = 0;
+    }
+  }
+  let s = !!(t.m & f);
+  const u = t.H !== undefined && t.H !== v;
+  const c = !!(t.ge & S);
+  const a = !!(t.ge & m);
+  const d = X;
+  X = t;
+  t.xe = null;
   t.m = r;
-  t.de = E;
-  let w = t.Z === S ? t.$ : t.Z;
-  let m = t.o;
-  let b = H;
-  let _ = B;
-  H = true;
+  t.pe = A;
+  let h = t.T === v ? t.ne : t.T;
+  let p = t.o;
+  let y = B;
+  let g = Y;
+  B = true;
   if (s) {
     const e = resolveLane(t);
-    if (e) B = e;
+    if (e) Y = e;
+  } else if (L && !n && L.Y.length) {
+    for (let e = t.j; e; e = e.R) {
+      const n = e.A;
+      if (n.m & f) {
+        const e = resolveLane(n);
+        if (e) {
+          s = true;
+          Y = e;
+          t.m |= f;
+          assignOrMergeLane(t, e);
+          break;
+        }
+      }
+    }
   }
   try {
-    w = handleAsync(t, t.I(w));
+    const e = t.Ee;
+    const r = t.I(h);
+    h = t.Ee !== e ? r : handleAsync(t, r);
     clearStatus(t, n);
-    const e = resolveLane(t);
-    if (e) {
-      e.H.delete(t);
-      updatePendingSignal(e.te);
+    const i = resolveLane(t);
+    if (i) {
+      i.D.delete(t);
+      updatePendingSignal(i.re);
     }
   } catch (e) {
-    if (e instanceof NotReadyError && B) {
-      const e = findLane(B);
-      if (e.te !== t) {
-        e.H.add(t);
-        t.Y = e;
-        updatePendingSignal(e.te);
+    if (e instanceof NotReadyError && Y) {
+      const e = findLane(Y);
+      if (e.re !== t) {
+        e.D.add(t);
+        t.te = e;
+        updatePendingSignal(e.re);
       }
     }
-    if (e instanceof NotReadyError) t.Ie = true;
+    if (e instanceof NotReadyError) t.Ae = true;
     notifyStatus(
       t,
-      e instanceof NotReadyError ? a : d,
+      e instanceof NotReadyError ? S : w,
       e,
       undefined,
-      e instanceof NotReadyError ? t.Y : undefined
+      e instanceof NotReadyError ? t.te : undefined
     );
   } finally {
-    H = b;
+    B = y;
     t.m = e | (n ? t.m & l : 0);
-    M = y;
+    X = d;
   }
-  if (!t.ae) {
-    const e = t.Pe;
-    let r = e !== null ? e.N : t.A;
+  if (!t.he) {
+    const e = t.xe;
+    let r = e !== null ? e.R : t.j;
     if (r !== null) {
       do {
         r = unlinkSubs(r);
       } while (r !== null);
-      if (e !== null) e.N = null;
-      else t.A = null;
+      if (e !== null) e.R = null;
+      else t.j = null;
     }
-    const f = u ? t.ee : t.Z === S ? t.$ : t.Z;
-    const l = (!i && p) || !t.Te || !t.Te(f, w);
+    const f = u ? t.H : t.T === v ? t.ne : t.T;
+    const l = (!i && a) || !t.Le || !t.Le(f, h);
     if (l) {
-      const e = u ? t.ee : undefined;
-      if (n || (i && C !== t.G) || s) {
-        t.$ = w;
+      const e = u ? t.H : undefined;
+      if (n || (i && L !== t.X) || s) {
+        t.ne = h;
         if (u && s) {
-          t.ee = w;
-          t.Z = w;
+          t.H = h;
+          t.T = h;
         }
-      } else t.Z = w;
-      if (u && !s && c && !t.be) t.ee = w;
-      if (!u || s || t.ee !== e) insertSubs(t, s || u);
+      } else t.T = h;
+      if (u && !s && c && !t._e) t.H = h;
+      if (!u || s || t.H !== e) insertSubs(t, s || u);
     } else if (u) {
-      t.Z = w;
-    } else if (t.o != m) {
+      t.T = h;
+    } else if (t.o != p) {
       for (let e = t.O; e !== null; e = e.P) {
-        insertIntoHeapHeight(e.k, e.k.m & o ? k : P);
+        insertIntoHeapHeight(e.k, e.k.m & o ? R : j);
       }
     }
   }
-  B = _;
-  (!n || t.ye & a) && !t.G && !(C && u) && N.se.push(t);
-  t.G && i && C !== t.G && runInTransition(t.G, () => recompute(t));
+  Y = g;
+  (!n || t.ge & S) && !t.X && !(L && u) && q.ue.push(t);
+  t.X && i && L !== t.X && runInTransition(t.X, () => recompute(t));
 }
 function updateIfNecessary(e) {
   if (e.m & t) {
-    for (let t = e.A; t; t = t.N) {
-      const r = t.R;
+    for (let t = e.j; t; t = t.R) {
+      const r = t.A;
       const i = r.L || r;
       if (i.I) {
         updateIfNecessary(i);
@@ -1304,174 +1363,175 @@ function updateIfNecessary(e) {
       }
     }
   }
-  if (e.m & (n | f) || (e.ae && e.de < E && !e.Ce)) {
+  if (e.m & (n | f) || (e.he && e.pe < A && !e.Ee)) {
     recompute(e);
   }
   e.m = e.m & (l | i | s);
 }
-function computed(t, n, r) {
-  const i = r?.transparent ?? false;
-  const s = {
-    id: r?.id ?? (i ? M?.id : M?.id != null ? getNextChildId(M) : undefined),
-    Re: i || undefined,
-    Te: r?.equals != null ? r.equals : isEqual,
-    ce: !!r?.ownedWrite,
-    xe: r?.unobserved,
-    Ne: null,
-    V: M?.V ?? N,
-    Le: M?.Le ?? _,
-    je: 0,
+function computed(t, n) {
+  const r = n?.transparent ?? false;
+  const i = {
+    id: n?.id ?? (r ? X?.id : X?.id != null ? getNextChildId(X) : undefined),
+    de:
+      (r ? h : 0) |
+      (n?.ownedWrite ? a : 0) |
+      (!X || n?.lazy ? g : 0) |
+      (Z && ownerInSnapshotScope(X) ? p : 0),
+    Le: n?.equals != null ? n.equals : isEqual,
+    q: n?.unobserved,
+    je: null,
+    K: X?.K ?? q,
+    Re: X?.Re ?? E,
+    Ne: 0,
     I: t,
-    $: n,
+    ne: undefined,
     o: 0,
     C: null,
     p: undefined,
     h: null,
-    A: null,
-    Pe: null,
+    j: null,
+    xe: null,
     O: null,
-    Oe: null,
-    i: M,
-    Ee: null,
+    ve: null,
+    i: X,
     ke: null,
-    m: r?.lazy ? c : e,
-    ye: h,
-    de: E,
-    Z: S,
-    Ae: null,
+    Pe: null,
+    m: n?.lazy ? c : e,
+    ge: m,
+    pe: A,
+    T: v,
     We: null,
     Ce: null,
-    G: null
+    Ee: null,
+    X: null
   };
-  s.h = s;
-  const o = M?.t ? M.u : M;
-  if (M) {
-    const e = M.ke;
+  i.h = i;
+  const s = X?.t ? X.u : X;
+  if (X) {
+    const e = X.Pe;
     if (e === null) {
-      M.ke = s;
+      X.Pe = i;
     } else {
-      s.Ee = e;
-      M.ke = s;
+      i.ke = e;
+      X.Pe = i;
     }
   }
-  if (o) s.o = o.o + 1;
-  if (K && ownerInSnapshotScope(M)) s.pe = true;
-  if (T) {
+  if (s) i.o = s.o + 1;
+  if (V) {
     const e = signal(undefined, { equals: false, ownedWrite: true });
-    const t = T.factory(s.I, () => {
+    const t = V.factory(i.I, () => {
       setSignal(e, undefined);
     });
     cleanup(() => t.dispose());
-    s.I = n => {
+    i.I = n => {
       read(e);
       return t.track(n);
     };
   }
-  !r?.lazy && recompute(s, true);
-  if (K && !r?.lazy) {
-    if (!(s.ye & a)) {
-      s.he = s.$ === undefined ? w : s.$;
-      G.add(s);
+  !n?.lazy && recompute(i, true);
+  if (Z && !n?.lazy) {
+    if (!(i.ge & S)) {
+      i.ye = i.ne === undefined ? x : i.ne;
+      $.add(i);
     }
   }
-  return s;
+  return i;
 }
 function signal(e, t, n = null) {
   const r = {
-    Te: t?.equals != null ? t.equals : isEqual,
-    ce: !!t?.ownedWrite,
-    De: !!t?.De,
-    xe: t?.unobserved,
-    $: e,
+    Le: t?.equals != null ? t.equals : isEqual,
+    de: (t?.ownedWrite ? a : 0) | (t?.Qe ? d : 0),
+    q: t?.unobserved,
+    ne: e,
     O: null,
-    Oe: null,
-    de: E,
+    ve: null,
+    pe: A,
     L: n,
-    W: n?.C || null,
-    Z: S
+    N: n?.C || null,
+    T: v
   };
   n && (n.C = r);
-  if (K && !r.De && !((n?.ye ?? 0) & a)) {
-    r.he = e === undefined ? w : e;
-    G.add(r);
+  if (Z && !(r.de & d) && !((n?.ge ?? 0) & S)) {
+    r.ye = e === undefined ? x : e;
+    $.add(r);
   }
   return r;
 }
 function optimisticSignal(e, t) {
   const n = signal(e, t);
-  n.ee = S;
+  n.H = v;
   return n;
 }
-function optimisticComputed(e, t, n) {
-  const r = computed(e, t, n);
-  r.ee = S;
-  return r;
+function optimisticComputed(e, t) {
+  const n = computed(e, t);
+  n.H = v;
+  return n;
 }
 function isEqual(e, t) {
   return e === t;
 }
 function untrack(e, t) {
-  if (!T && !H && true) return e();
-  const n = H;
-  H = false;
+  if (!V && !B && true) return e();
+  const n = B;
+  B = false;
   try {
-    if (T) return T.untrack(e);
+    if (V) return V.untrack(e);
     return e();
   } finally {
-    H = n;
+    B = n;
   }
 }
 function read(e) {
-  if (V) {
+  if (J) {
     const t = getLatestValueComputed(e);
-    const n = V;
-    V = false;
-    const r = e.ee !== undefined && e.ee !== S ? e.ee : e.$;
+    const n = J;
+    J = false;
+    const r = e.H !== undefined && e.H !== v ? e.H : e.ne;
     let i;
     try {
       i = read(t);
     } catch (e) {
-      if (!M && e instanceof NotReadyError) return r;
+      if (!X && e instanceof NotReadyError) return r;
       throw e;
     } finally {
-      V = n;
+      J = n;
     }
-    if (t.ye & a) return r;
-    if (Q && B && t.Y) {
-      const e = findLane(t.Y);
-      const n = findLane(B);
-      if (e !== n && e.H.size > 0) {
+    if (t.ge & S) return r;
+    if (K && Y && t.te) {
+      const e = findLane(t.te);
+      const n = findLane(Y);
+      if (e !== n && e.D.size > 0) {
         return r;
       }
     }
     return i;
   }
-  if (D) {
+  if (z) {
     const t = e.L;
-    const n = D;
-    D = false;
-    if (t && e.ee !== undefined) {
-      if (e.ee !== S && (t.Ce || !!(t.ye & a))) {
-        F = true;
+    const n = z;
+    z = false;
+    if (t && e.H !== undefined) {
+      if (e.H !== v && (t.Ee || !!(t.ge & S))) {
+        U = true;
       }
-      let n = M;
+      let n = X;
       if (n?.t) n = n.u;
-      if (n && H) link(e, n);
+      if (n && B) link(e, n);
       read(getPendingSignal(e));
       read(getPendingSignal(t));
     } else {
-      if (read(getPendingSignal(e))) F = true;
-      if (t && read(getPendingSignal(t))) F = true;
+      if (read(getPendingSignal(e))) U = true;
+      if (t && read(getPendingSignal(t))) U = true;
     }
-    D = n;
-    return e.$;
+    z = n;
+    return e.ne;
   }
-  let t = M;
+  let t = X;
   if (t?.t) t = t.u;
   const n = e;
   if (typeof n.I === "function") {
     const t = e;
-    if (q && !(t.m & u)) recompute(t);
+    if (G && !(t.m & u)) recompute(t);
     if (t.m & c) {
       t.m &= ~c;
       recompute(t, true);
@@ -1480,13 +1540,13 @@ function read(e) {
     }
   }
   const r = e.L || e;
-  if (t && H) {
+  if (t && B) {
     link(e, t);
     if (r.I) {
       const n = e.m & o;
-      if (r.o >= (n ? k.j : P.j)) {
+      if (r.o >= (n ? R.W : j.W)) {
         markNode(t);
-        markHeap(n ? k : P);
+        markHeap(n ? R : j);
         updateIfNecessary(r);
       }
       const i = r.o;
@@ -1495,64 +1555,68 @@ function read(e) {
       }
     }
   }
-  if (r.ye & a) {
-    if (t && !(Q && r.G && C !== r.G)) {
-      if (B) {
-        const n = r.Y;
-        const i = findLane(B);
+  if (r.ge & S) {
+    if (t && !(K && r.X && L !== r.X)) {
+      if (Y) {
+        const n = r.te;
+        const i = findLane(Y);
         if (n && findLane(n) === i && !hasActiveOverride(r)) {
-          if (!H && e !== t) link(e, t);
-          throw r.ae;
+          if (!B && e !== t) link(e, t);
+          throw r.he;
         }
       } else {
-        if (!H && e !== t) link(e, t);
-        throw r.ae;
+        if (!B && e !== t) link(e, t);
+        throw r.he;
       }
-    } else if (t && r !== e && r.ye & h) {
-      if (!H && e !== t) link(e, t);
-      throw r.ae;
-    } else if (!t && r.ye & h) {
-      throw r.ae;
+    } else if (t && r !== e && r.ge & m) {
+      if (!B && e !== t) link(e, t);
+      throw r.he;
+    } else if (!t && r.ge & m) {
+      throw r.he;
     }
   }
-  if (e.I && e.ye & d) {
-    if (e.de < E) {
+  if (e.I && e.ge & w) {
+    if (e.pe < A) {
       recompute(e);
       return read(e);
-    } else throw e.ae;
+    } else throw e.he;
   }
-  if (K && t && t.pe) {
-    const n = e.he;
+  if (Z && t && t.de & p) {
+    const n = e.ye;
     if (n !== undefined) {
-      const r = n === w ? undefined : n;
-      const i = e.Z !== S ? e.Z : e.$;
+      const r = n === x ? undefined : n;
+      const i = e.T !== v ? e.T : e.ne;
       if (i !== r) t.m |= l;
       return r;
     }
   }
-  if (e.ee !== undefined && e.ee !== S) {
-    if (t && Q && shouldReadStashedOptimisticValue(e)) return e.$;
-    return e.ee;
+  if (e.H !== undefined && e.H !== v) {
+    if (t && K && shouldReadStashedOptimisticValue(e)) return e.ne;
+    return e.H;
+  }
+  if (L !== null && Y !== null && !J && e.T !== v && r === e && !e.I && t) {
+    L.ee.add(t);
+    return e.ne;
   }
   const i =
     !t ||
-    (B !== null && (e.ee !== undefined || e.Y || (r === e && Q) || !!(r.ye & a))) ||
-    e.Z === S ||
-    (Q && e.G && C !== e.G)
-      ? e.$
-      : e.Z;
-  if (!t && r === e && typeof n.I === "function" && !n.ve && !(r.ye & a) && !n.i && !e.O) {
+    (Y !== null && (e.H !== undefined || e.te || (r === e && K) || !!(r.ge & S))) ||
+    e.T === v ||
+    (K && e.X && L !== e.X)
+      ? e.ne
+      : e.T;
+  if (!t && r === e && typeof n.I === "function" && e.de & g && !(r.ge & S) && !e.O) {
     unobserved(e);
   }
   return i;
 }
 function setSignal(e, t) {
-  if (e.G && C !== e.G) N.initTransition(e.G);
-  const n = e.ee !== undefined && !j;
-  const r = e.ee !== undefined && e.ee !== S;
-  const i = n ? (r ? e.ee : e.$) : e.Z === S ? e.$ : e.Z;
+  if (e.X && L !== e.X) q.initTransition(e.X);
+  const n = e.H !== undefined && !T;
+  const r = e.H !== undefined && e.H !== v;
+  const i = n ? (r ? e.H : e.ne) : e.T === v ? e.ne : e.T;
   if (typeof t === "function") t = t(i);
-  const s = !e.Te || !e.Te(i, t) || !!(e.ye & h);
+  const s = !e.Le || !e.Le(i, t) || !!(e.ge & m);
   if (!s) {
     if (n && r && e.I) {
       insertSubs(e, true);
@@ -1561,156 +1625,156 @@ function setSignal(e, t) {
     return t;
   }
   if (n) {
-    const n = e.ee === S;
-    if (!n) N.initTransition(resolveTransition(e));
+    const n = e.H === v;
+    if (!n) q.initTransition(resolveTransition(e));
     if (n) {
-      e.Z = e.$;
-      N.U.push(e);
+      e.T = e.ne;
+      q.Y.push(e);
     }
-    e.be = true;
+    e._e = true;
     const r = getOrCreateLane(e);
-    e.Y = r;
-    e.ee = t;
+    e.te = r;
+    e.H = t;
   } else {
-    if (e.Z === S) N.se.push(e);
-    e.Z = t;
+    if (e.T === v) q.ue.push(e);
+    e.T = t;
   }
   updatePendingSignal(e);
-  if (e.He) {
-    setSignal(e.He, t);
+  if (e.Ie) {
+    setSignal(e.Ie, t);
   }
-  e.de = E;
+  e.pe = A;
   insertSubs(e, n);
   schedule();
   return t;
 }
 function runWithOwner(e, t) {
-  const n = M;
-  const r = H;
-  M = e;
-  H = false;
+  const n = X;
+  const r = B;
+  X = e;
+  B = false;
   try {
     return t();
   } finally {
-    M = n;
-    H = r;
+    X = n;
+    B = r;
   }
 }
 function getPendingSignal(e) {
-  if (!e.Fe) {
-    e.Fe = optimisticSignal(false, { ownedWrite: true });
-    if (e.we) {
-      e.Fe.we = e;
+  if (!e.qe) {
+    e.qe = optimisticSignal(false, { ownedWrite: true });
+    if (e.me) {
+      e.qe.me = e;
     }
-    if (computePendingState(e)) setSignal(e.Fe, true);
+    if (computePendingState(e)) setSignal(e.qe, true);
   }
-  return e.Fe;
+  return e.qe;
 }
 function computePendingState(e) {
   const t = e;
   const n = e.L;
-  if (n && e.Z !== S) {
-    return !n.Ce && !(n.ye & a);
+  if (n && e.T !== v) {
+    return !n.Ee && !(n.ge & S);
   }
-  if (e.ee !== undefined && e.ee !== S) {
-    if (t.ye & a && !(t.ye & h)) return true;
-    if (e.we) {
-      const t = e.Y ? findLane(e.Y) : null;
-      return !!(t && t.H.size > 0);
+  if (e.H !== undefined && e.H !== v) {
+    if (t.ge & S && !(t.ge & m)) return true;
+    if (e.me) {
+      const t = e.te ? findLane(e.te) : null;
+      return !!(t && t.D.size > 0);
     }
     return true;
   }
-  if (e.ee !== undefined && e.ee === S && !e.we) {
+  if (e.H !== undefined && e.H === v && !e.me) {
     return false;
   }
-  if (e.Z !== S && !(t.ye & h)) return true;
-  return !!(t.ye & a && !(t.ye & h));
+  if (e.T !== v && !(t.ge & m)) return true;
+  return !!(t.ge & S && !(t.ge & m));
 }
 function updatePendingSignal(e) {
-  if (e.Fe) {
+  if (e.qe) {
     const t = computePendingState(e);
-    const n = e.Fe;
+    const n = e.qe;
     setSignal(n, t);
-    if (!t && n.Y) {
+    if (!t && n.te) {
       const t = resolveLane(e);
-      if (t && t.H.size > 0) {
-        const e = findLane(n.Y);
+      if (t && t.D.size > 0) {
+        const e = findLane(n.te);
         if (e !== t) {
           mergeLanes(t, e);
         }
       }
-      R.delete(n);
-      n.Y = undefined;
+      M.delete(n);
+      n.te = undefined;
     }
   }
 }
 function getLatestValueComputed(e) {
-  if (!e.He) {
-    const t = V;
-    V = false;
-    const n = D;
-    D = false;
-    const r = M;
-    M = null;
-    e.He = optimisticComputed(() => read(e));
-    e.He.we = e;
-    M = r;
-    D = n;
-    V = t;
-  }
-  return e.He;
+  if (!e.Ie) {
+    const t = J;
+    J = false;
+    const n = z;
+    z = false;
+    const r = X;
+    X = null;
+    e.Ie = optimisticComputed(() => read(e));
+    e.Ie.me = e;
+    X = r;
+    z = n;
+    J = t;
+  }
+  return e.Ie;
 }
 function staleValues(e, t = true) {
-  const n = Q;
-  Q = t;
+  const n = K;
+  K = t;
   try {
     return e();
   } finally {
-    Q = n;
+    K = n;
   }
 }
 function latest(e) {
-  const t = V;
-  V = true;
+  const t = J;
+  J = true;
   try {
     return e();
   } finally {
-    V = t;
+    J = t;
   }
 }
 function isPending(e) {
-  const t = D;
-  const n = F;
-  D = true;
-  F = false;
+  const t = z;
+  const n = U;
+  z = true;
+  U = false;
   try {
     e();
-    return F;
+    return U;
   } catch {
-    return F;
+    return U;
   } finally {
-    D = t;
-    F = n;
+    z = t;
+    U = n;
   }
 }
 function refresh(e) {
-  let t = q;
-  q = true;
+  let t = G;
+  G = true;
   try {
     if (typeof e !== "function") {
-      recompute(e[O]);
+      recompute(e[C]);
       return e;
     }
     return untrack(e);
   } finally {
-    q = t;
+    G = t;
     if (!t) {
       schedule();
     }
   }
 }
 function isRefreshing() {
-  return q;
+  return G;
 }
 function createContext(e, t) {
   return { id: Symbol(t), defaultValue: e };
@@ -1719,7 +1783,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.Le[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.Re[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1729,112 +1793,113 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.Le = { ...n.Le, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.Re = { ...n.Re, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.Le[e.id]);
+  return !isUndefined(t?.Re[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
 }
-function effect(e, t, n, r, i) {
-  let s = false;
-  const o = computed(i?.render ? t => staleValues(() => e(t)) : e, r, {
-    ...i,
+function effect(e, t, n, r) {
+  let i = false;
+  const s = !!r?.user;
+  const o = computed(s ? e : t => staleValues(() => e(t)), {
+    ...r,
     equals: () => {
-      o.F = !o.ae;
-      if (s) o.V.enqueue(o.D, runEffect.bind(o));
+      o.B = !o.he;
+      if (i) o.K.enqueue(o.V, runEffect.bind(o));
       return false;
     },
     lazy: true
   });
-  o.Ve = r;
-  o.Me = t;
-  o.Be = n;
-  o.Ke = undefined;
-  o.D = i?.render ? p : y;
-  o.Qe = (e, t) => {
-    const n = e !== undefined ? e : o.ye;
-    const r = t !== undefined ? t : o.ae;
-    if (n & d) {
+  o.de &= ~g;
+  o.Me = undefined;
+  o.De = t;
+  o.Fe = n;
+  o.Ve = undefined;
+  o.V = s ? _ : b;
+  o.Te = (e, t) => {
+    const n = e !== undefined ? e : o.ge;
+    const r = t !== undefined ? t : o.he;
+    if (n & w) {
       let e = r;
-      o.V.notify(o, a, 0);
-      if (o.D === y) {
+      o.K.notify(o, S, 0);
+      if (o.V === _) {
         try {
-          return o.Be
-            ? o.Be(e, () => {
-                o.Ke?.();
-                o.Ke = undefined;
+          return o.Fe
+            ? o.Fe(e, () => {
+                o.Ve?.();
+                o.Ve = undefined;
               })
             : console.error(e);
         } catch (t) {
           e = t;
         }
       }
-      if (!o.V.notify(o, d, d)) throw e;
-    } else if (o.D === p) {
-      o.V.notify(o, a | d, n, r);
+      if (!o.K.notify(o, w, w)) throw e;
+    } else if (o.V === b) {
+      o.K.notify(o, S | w, n, r);
     }
   };
   recompute(o, true);
-  !i?.defer && (o.D === y ? o.V.enqueue(o.D, runEffect.bind(o)) : runEffect.call(o));
-  s = true;
-  cleanup(() => o.Ke?.());
+  !r?.defer && (o.V === _ || r?.schedule ? o.K.enqueue(o.V, runEffect.bind(o)) : runEffect.call(o));
+  i = true;
+  cleanup(() => o.Ve?.());
 }
 function runEffect() {
-  if (!this.F || this.m & u) return;
-  this.Ke?.();
-  this.Ke = undefined;
+  if (!this.B || this.m & u) return;
+  this.Ve?.();
+  this.Ve = undefined;
   try {
-    const e = this.Me(this.$, this.Ve);
+    const e = this.De(this.ne, this.Me);
     if (false && e !== undefined && typeof e !== "function");
-    this.Ke = e;
+    this.Ve = e;
   } catch (e) {
-    this.ae = new StatusError(this, e);
-    this.ye |= d;
-    if (!this.V.notify(this, d, d)) throw e;
+    this.he = new StatusError(this, e);
+    this.ge |= w;
+    if (!this.K.notify(this, w, w)) throw e;
   } finally {
-    this.Ve = this.$;
-    this.F = false;
+    this.Me = this.ne;
+    this.B = false;
   }
 }
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.F || n.m & u) return;
+    if (!n.B || n.m & u) return;
     try {
-      n.F = false;
+      n.B = false;
       recompute(n);
     } finally {
     }
   };
   const n = computed(
     () => {
-      n.Ke?.();
-      n.Ke = undefined;
+      n.Ve?.();
+      n.Ve = undefined;
       const t = staleValues(e);
-      n.Ke = t;
+      n.Ve = t;
     },
-    undefined,
     { ...t, lazy: true }
   );
-  n.Ke = undefined;
-  n.Ge = true;
-  n.F = true;
-  n.D = g;
-  n.Qe = (e, t) => {
-    const r = e !== undefined ? e : n.ye;
-    if (r & d) {
-      n.V.notify(n, a, 0);
-      const e = t !== undefined ? t : n.ae;
-      if (!n.V.notify(n, d, d)) throw e;
+  n.Ve = undefined;
+  n.de = (n.de & ~g) | y;
+  n.B = true;
+  n.V = O;
+  n.Te = (e, t) => {
+    const r = e !== undefined ? e : n.ge;
+    if (r & w) {
+      n.K.notify(n, S, 0);
+      const e = t !== undefined ? t : n.he;
+      if (!n.K.notify(n, w, w)) throw e;
     }
   };
-  n.M = run;
-  n.V.enqueue(y, run);
-  cleanup(() => n.Ke?.());
+  n.G = run;
+  n.K.enqueue(_, run);
+  cleanup(() => n.Ve?.());
 }
 function restoreTransition(e, t) {
-  N.initTransition(e);
+  q.initTransition(e);
   const n = t();
   flush();
   return n;
@@ -1843,13 +1908,13 @@ function action(e) {
   return (...t) =>
     new Promise((n, r) => {
       const i = e(...t);
-      N.initTransition();
-      let s = C;
-      s.K.push(i);
+      q.initTransition();
+      let s = L;
+      s.J.push(i);
       const done = (e, t) => {
         s = currentTransition(s);
-        const o = s.K.indexOf(i);
-        if (o >= 0) s.K.splice(o, 1);
+        const o = s.J.indexOf(i);
+        if (o >= 0) s.J.splice(o, 1);
         setActiveTransition(s);
         schedule();
         t ? r(t) : n(e);
@@ -1881,28 +1946,25 @@ function onCleanup(e) {
   return cleanup(e);
 }
 function accessor(e) {
-  const t = read.bind(null, e);
-  t.$r = true;
-  return t;
+  return read.bind(null, e);
 }
 function createSignal(e, t) {
   if (typeof e === "function") {
-    const n = computed(e, undefined, t);
-    n.ve = true;
+    const n = computed(e, t);
+    n.de &= ~g;
     return [accessor(n), setSignal.bind(null, n)];
   }
   const n = signal(e, t);
   return [accessor(n), setSignal.bind(null, n)];
 }
 function createMemo(e, t) {
-  let n = computed(e, undefined, t);
-  return accessor(n);
+  return accessor(computed(e, t));
 }
 function createEffect(e, t, n) {
-  effect(e, t.effect || t, t.error, undefined, n);
+  effect(e, t.effect || t, t.error, { user: true, ...n });
 }
 function createRenderEffect(e, t, n) {
-  effect(e, t, undefined, undefined, { render: true, ...n });
+  effect(e, t, undefined, n);
 }
 function createTrackedEffect(e, t) {
   trackedEffect(e, t);
@@ -1923,8 +1985,7 @@ function createReaction(e, t) {
           dispose(t);
         },
         e.error,
-        undefined,
-        { defer: true, ...(false ? { ...t, name: t?.name ?? "effect" } : t) }
+        { ...(false ? { ...t, name: t?.name ?? "effect" } : t), user: true, defer: true }
       );
     });
   };
@@ -1946,8 +2007,8 @@ function resolve(e) {
 }
 function createOptimistic(e, t) {
   if (typeof e === "function") {
-    const n = optimisticComputed(e, undefined, t);
-    n.ve = true;
+    const n = optimisticComputed(e, t);
+    n.de &= ~g;
     return [accessor(n), setSignal.bind(null, n)];
   }
   const n = optimisticSignal(e, t);
@@ -1955,15 +2016,15 @@ function createOptimistic(e, t) {
 }
 function onSettled(e) {
   const t = getOwner();
-  t && !t.Ge
+  t && !(t.de & y)
     ? createTrackedEffect(() => untrack(e), undefined)
-    : N.enqueue(y, () => {
+    : q.enqueue(_, () => {
         const t = e();
         t?.();
       });
 }
 function unwrap(e) {
-  return e?.[U]?.[ee] ?? e;
+  return e?.[te]?.[ue] ?? e;
 }
 function getOverrideValue(e, t, n, r, i) {
   if (i && r in i) return i[r];
@@ -1975,16 +2036,16 @@ function getAllKeys(e, t, n) {
   return Array.from(new Set([...r, ...i]));
 }
 function applyState(e, t, n) {
-  const r = t?.[U];
+  const r = t?.[te];
   if (!r) return;
-  const i = r[Y];
-  const s = r[Z];
-  const o = r[$];
-  let u = r[ee];
+  const i = r[ie];
+  const s = r[se];
+  const o = r[oe];
+  let u = r[ue];
   if (e === i && !s && !o) return;
-  (r[re] || oe).set(e, r[J]);
-  r[Y] = e;
-  r[Z] = undefined;
+  (r[ce] || he).set(e, r[ne]);
+  r[ie] = e;
+  r[se] = undefined;
   if (Array.isArray(i)) {
     let t = false;
     const f = getOverrideValue(i, s, u, "length", o);
@@ -2012,16 +2073,16 @@ function applyState(e, t, n) {
       if (a > h || a > d) {
         for (c = a; c <= h; c++) {
           t = true;
-          r[ee][c] && setSignal(r[ee][c], wrap(e[c], r));
+          r[ue][c] && setSignal(r[ue][c], wrap(e[c], r));
         }
         for (; c < e.length; c++) {
           t = true;
           const i = wrap(S[c], r);
-          r[ee][c] && setSignal(r[ee][c], i);
+          r[ue][c] && setSignal(r[ue][c], i);
           applyState(e[c], i, n);
         }
-        t && r[ee][z] && setSignal(r[ee][z], void 0);
-        f !== e.length && r[ee].length && setSignal(r[ee].length, e.length);
+        t && r[ue][ee] && setSignal(r[ue][ee], void 0);
+        f !== e.length && r[ue].length && setSignal(r[ue].length, e.length);
         return;
       }
       y = new Array(h + 1);
@@ -2045,26 +2106,26 @@ function applyState(e, t, n) {
       for (c = a; c < e.length; c++) {
         if (c in S) {
           const t = wrap(S[c], r);
-          r[ee][c] && setSignal(r[ee][c], t);
+          r[ue][c] && setSignal(r[ue][c], t);
           applyState(e[c], t, n);
-        } else r[ee][c] && setSignal(r[ee][c], wrap(e[c], r));
+        } else r[ue][c] && setSignal(r[ue][c], wrap(e[c], r));
       }
       if (a < e.length) t = true;
     } else if (e.length) {
       for (let t = 0, f = e.length; t < f; t++) {
         const f = getOverrideValue(i, s, u, t, o);
-        isWrappable(f) ? applyState(e[t], wrap(f, r), n) : r[ee][t] && setSignal(r[ee][t], e[t]);
+        isWrappable(f) ? applyState(e[t], wrap(f, r), n) : r[ue][t] && setSignal(r[ue][t], e[t]);
       }
     }
     if (f !== e.length) {
       t = true;
-      r[ee].length && setSignal(r[ee].length, e.length);
+      r[ue].length && setSignal(r[ue].length, e.length);
     }
-    t && r[ee][z] && setSignal(r[ee][z], void 0);
+    t && r[ue][ee] && setSignal(r[ue][ee], void 0);
     return;
   }
   if (u) {
-    const t = u[z];
+    const t = u[ee];
     const f = t ? getAllKeys(i, s, e) : Object.keys(u);
     for (let l = 0, c = f.length; l < c; l++) {
       const c = f[l];
@@ -2078,7 +2139,7 @@ function applyState(e, t, n) {
       } else applyState(h, wrap(d, r), n);
     }
   }
-  if ((u = r[te])) {
+  if ((u = r[fe])) {
     const t = Object.keys(u);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -2100,9 +2161,9 @@ function createProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[ne] = wrapProjection;
-    e[re] = i;
-    Object.defineProperty(e, ie, {
+    e[le] = wrapProjection;
+    e[ce] = i;
+    Object.defineProperty(e, ae, {
       get() {
         return r;
       },
@@ -2111,35 +2172,42 @@ function createProjectionInternal(e, t, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[U]?.[ne] === wrapProjection) return e;
-    const t = createStoreProxy(e, le, wrapper);
+    if (e[te]?.[le] === wrapProjection) return e;
+    const t = createStoreProxy(e, ge, wrapper);
     i.set(e, t);
     return t;
   };
   const s = wrapProjection(t);
   r = computed(() => {
-    const t = getOwner();
-    let r = false;
-    let i;
-    const o = new Proxy(
-      s,
-      createWriteTraps(() => !r || t.Ce === i)
-    );
-    storeSetter(o, o => {
-      i = e(o);
-      r = true;
-      const u = handleAsync(t, i, e => {
-        e !== o && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
-      });
-      u !== o && u !== undefined && reconcile(u, n?.key || "id")(s);
-    });
-  });
-  r.ve = true;
+    if (!r) r = getOwner();
+    runProjectionComputed(s, e, n?.key || "id");
+  }, undefined);
+  r.de &= ~g;
   return { store: s, node: r };
 }
 function createProjection(e, t, n) {
   return createProjectionInternal(e, t, n).store;
 }
+function runProjectionComputed(e, t, n, r) {
+  const i = getOwner();
+  let s = false;
+  let o;
+  const u = new Proxy(
+    e,
+    createWriteTraps(() => !s || i.Ee === o)
+  );
+  storeSetter(u, u => {
+    o = t(u);
+    s = true;
+    const commit = t => {
+      if (t === u || t === undefined) return;
+      const write = () => storeSetter(e, reconcile(t, n));
+      r ? r(write) : write();
+    };
+    commit(handleAsync(i, o, commit));
+  });
+  return i;
+}
 function createWriteTraps(e) {
   const t = {
     get(e, n) {
@@ -2193,33 +2261,33 @@ function createWriteTraps(e) {
   };
   return t;
 }
-const z = Symbol(0),
-  U = Symbol(0),
-  J = Symbol(0),
-  X = Symbol(0);
-const Y = "v",
-  Z = "o",
-  $ = "x",
-  ee = "n",
-  te = "h",
-  ne = "w",
-  re = "l",
-  ie = "f",
-  se = "p";
-function createStoreProxy(e, t = le, n) {
+const ee = Symbol(0),
+  te = Symbol(0),
+  ne = Symbol(0),
+  re = Symbol(0);
+const ie = "v",
+  se = "o",
+  oe = "x",
+  ue = "n",
+  fe = "h",
+  le = "w",
+  ce = "l",
+  ae = "f",
+  de = "p";
+function createStoreProxy(e, t = ge, n) {
   let r;
   if (Array.isArray(e)) {
     r = [];
     r.v = e;
   } else r = { v: e };
   n && n(r);
-  return (r[J] = new Proxy(r, t));
+  return (r[ne] = new Proxy(r, t));
 }
-const oe = new WeakMap();
+const he = new WeakMap();
 function wrap(e, t) {
-  if (t?.[ne]) return t[ne](e, t);
-  let n = e[J] || oe.get(e);
-  if (!n) oe.set(e, (n = createStoreProxy(e)));
+  if (t?.[le]) return t[le](e, t);
+  let n = e[ne] || he.get(e);
+  if (!n) he.set(e, (n = createStoreProxy(e)));
   return n;
 }
 function isWrappable(e) {
@@ -2230,12 +2298,12 @@ function isWrappable(e) {
     !(typeof Node !== "undefined" && e instanceof Node)
   );
 }
-let ue = false;
+let pe = false;
 function setWriteOverride(e) {
-  ue = e;
+  pe = e;
 }
 function writeOnly(e) {
-  return ue || !!fe?.has(e);
+  return pe || !!ye?.has(e);
 }
 function getNodes(e, t) {
   let n = e[t];
@@ -2249,23 +2317,23 @@ function getNode(e, t, n, r, i = isEqual, s, o) {
     {
       equals: i,
       unobserved() {
-        delete e[t];
+        if (e[t] === u) delete e[t];
       }
     },
     r
   );
   if (s) {
-    u.ee = S;
+    u.H = v;
   }
   if (o && t in o) {
     const e = o[t];
-    u.he = e === undefined ? w : e;
-    G?.add(u);
+    u.ye = e === undefined ? x : e;
+    $?.add(u);
   }
   return (e[t] = u);
 }
-function trackSelf(e, t = z) {
-  getObserver() && read(getNode(getNodes(e, ee), t, undefined, e[ie], false, e[se]));
+function trackSelf(e, t = ee) {
+  getObserver() && read(getNode(getNodes(e, ue), t, undefined, e[ae], false, e[de]));
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -2273,137 +2341,176 @@ function getKeys(e, t, n = true) {
   const i = new Set(r);
   const s = Reflect.ownKeys(t);
   for (const e of s) {
-    if (t[e] !== X) i.add(e);
+    if (t[e] !== re) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
 }
 function getPropertyDescriptor(e, t, n) {
   if (t && n in t) {
-    if (t[n] === X) return void 0;
+    if (t[n] === re) 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[se]) {
-    const t = e[ie];
-    if (t?.G) {
-      N.initTransition(t.G);
+  if (e[de]) {
+    const t = e[ae];
+    if (t?.X) {
+      q.initTransition(t.X);
     }
   }
-  const r = e[Y];
+  const r = e[ie];
   const i = r[n];
-  if (K && typeof n !== "symbol" && !((e[ie]?.ye ?? 0) & a)) {
-    if (!e[m]) {
-      e[m] = Object.create(null);
-      G?.add(e);
+  if (Z && typeof n !== "symbol" && !((e[ae]?.ge ?? 0) & S)) {
+    if (!e[P]) {
+      e[P] = Object.create(null);
+      $?.add(e);
     }
-    if (!(n in e[m])) {
-      e[m][n] = i;
+    if (!(n in e[P])) {
+      e[P][n] = i;
     }
   }
-  const s = e[se] && !j;
-  const o = s ? $ : Z;
+  const s = e[de] && !T;
+  const o = s ? oe : se;
   if (s) trackOptimisticStore(t);
   return { base: i, overrideKey: o, state: r };
 }
-function notifyStoreProperty(e, t, n, r) {
-  if (e[te]?.[t]) setSignal(e[te][t], n !== "delete");
-  const i = getNodes(e, ee);
+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[ae], isEqual, e[de], i);
+  registerTransientStoreNode(o);
+  return o;
+}
+function notifyStoreProperty(e, t, n, r, i, s) {
+  const o = T || e[de];
+  const u = n !== "delete";
+  const f = e[fe]?.[t];
+  if (f) {
+    setSignal(f, u);
+  } else if (!o && n !== "invalidate" && s !== u) {
+    const n = upsertStoreNode(e, getNodes(e, fe), t, s);
+    setSignal(n, u);
+  }
+  const l = getNodes(e, ue);
   if (n === "set") {
-    i[t] && setSignal(i[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, l, t, i, e[P]);
+      setSignal(n, () => (isWrappable(r) ? wrap(r, e) : r));
+    }
   } else if (n === "invalidate") {
-    if (i[t]) {
-      setSignal(i[t], {});
-      delete i[t];
+    if (l[t]) {
+      setSignal(l[t], {});
+      delete l[t];
     }
   } else {
-    i[t] && setSignal(i[t], undefined);
+    if (l[t]) {
+      setSignal(l[t], undefined);
+    } else if (!o) {
+      const n = upsertStoreNode(e, l, t, i, e[P]);
+      setSignal(n, undefined);
+    }
   }
-  i[z] && setSignal(i[z], undefined);
+  l[ee] && setSignal(l[ee], undefined);
 }
-let fe = null;
-const le = {
+let ye = null;
+const ge = {
   get(e, t, n) {
-    if (t === U) return e;
-    if (t === J) return n;
-    if (t === O) return e[ie];
-    if (t === z) {
+    if (t === te) return e;
+    if (t === ne) return n;
+    if (t === C) return e[ae];
+    if (t === ee) {
       trackSelf(e);
       return n;
     }
-    const r = getNodes(e, ee);
+    const r = getNodes(e, ue);
     const i = r[t];
-    const s = e[$] && t in e[$];
-    const o = s || (e[Z] && t in e[Z]);
-    const u = !!e[Y][U];
-    const f = s ? e[$] : e[Z] && t in e[Z] ? e[Z] : e[Y];
+    const s = e[oe] && t in e[oe];
+    const o = s || (e[se] && t in e[se]);
+    const u = !!e[ie][te];
+    const f = s ? e[oe] : e[se] && t in e[se] ? e[se] : e[ie];
     if (!i) {
       const e = Object.getOwnPropertyDescriptor(f, t);
       if (e && e.get) return e.get.call(n);
     }
     if (writeOnly(n)) {
       let n =
-        i && (o || !u) ? (i.ee !== undefined && i.ee !== S ? i.ee : i.Z !== S ? i.Z : i.$) : f[t];
-      n === X && (n = undefined);
+        i && (o || !u) ? (i.H !== undefined && i.H !== v ? i.H : i.T !== v ? i.T : i.ne) : f[t];
+      n === re && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
-      fe?.add(r);
+      ye?.add(r);
       return r;
     }
     let l = i ? (o || !u ? read(r[t]) : (read(r[t]), f[t])) : f[t];
-    l === X && (l = undefined);
+    l === re && (l = undefined);
     if (!i) {
       if (!o && typeof l === "function" && !f.hasOwnProperty(t)) {
         let t;
-        return !Array.isArray(e[Y]) && (t = Object.getPrototypeOf(e[Y])) && t !== Object.prototype
+        return !Array.isArray(e[ie]) && (t = Object.getPrototypeOf(e[ie])) && t !== Object.prototype
           ? l.bind(f)
           : l;
       } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[ie], isEqual, e[se], e[m]));
+        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[ae], isEqual, e[de], e[P]));
       }
     }
     return isWrappable(l) ? wrap(l, e) : l;
   },
   has(e, t) {
-    if (t === J || t === z || t === "__proto__") return true;
-    const n = e[$] && t in e[$] ? e[$][t] !== X : e[Z] && t in e[Z] ? e[Z][t] !== X : t in e[Y];
-    if (!writeOnly(e[J])) {
-      getObserver() && read(getNode(getNodes(e, te), t, n, e[ie], isEqual, e[se]));
+    if (t === ne || t === ee || t === "__proto__") return true;
+    const n =
+      e[oe] && t in e[oe] ? e[oe][t] !== re : e[se] && t in e[se] ? e[se][t] !== re : t in e[ie];
+    if (writeOnly(e[ne])) return n;
+    const r = getNodes(e, fe);
+    if (r[t]) return read(r[t]);
+    if (getObserver()) {
+      return read(getNode(r, t, n, e[ae], isEqual, e[de]));
     }
     return n;
   },
   set(e, t, n) {
-    const r = e[J];
+    const r = e[ne];
     if (writeOnly(r)) {
       untrack(() => {
         const { base: i, overrideKey: s, state: o } = prepareStoreWrite(e, r, t);
-        const u = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : i;
-        const f = n?.[U]?.[Y] ?? n;
-        const l = Array.isArray(o) && t !== "length";
-        const c = l ? parseInt(t) + 1 : 0;
-        const a =
-          l &&
-          (e[$] && "length" in e[$]
-            ? e[$].length
-            : e[Z] && "length" in e[Z]
-              ? e[Z].length
+        const u = e[oe] && t in e[oe] ? e[oe][t] : e[se] && t in e[se] ? e[se][t] : i;
+        const f =
+          e[oe] && t in e[oe]
+            ? e[oe][t] !== re
+            : e[se] && t in e[se]
+              ? e[se][t] !== re
+              : t in e[ie];
+        const l = n?.[te]?.[ie] ?? n;
+        const c = Array.isArray(o) && t !== "length";
+        const a = c ? parseInt(t) + 1 : 0;
+        const d =
+          c &&
+          (e[oe] && "length" in e[oe]
+            ? e[oe].length
+            : e[se] && "length" in e[se]
+              ? e[se].length
               : o.length);
-        const d = l && c > a ? c : undefined;
-        if (u === f && d === undefined) return true;
-        if (f !== undefined && f === i && d === undefined) delete e[s]?.[t];
+        const h = c && a > d ? a : undefined;
+        if (u === l && h === undefined) return true;
+        if (l !== undefined && l === i && h === undefined) delete e[s]?.[t];
         else {
           const n = e[s] || (e[s] = Object.create(null));
-          n[t] = f;
-          if (d !== undefined) n.length = d;
+          n[t] = l;
+          if (h !== undefined) n.length = h;
         }
-        notifyStoreProperty(e, t, "set", f);
-        if (Array.isArray(o)) {
-          const n = getNodes(e, ee);
-          const r = t === "length" ? f : d;
-          r !== undefined && n.length && setSignal(n.length, r);
+        notifyStoreProperty(e, t, "set", l, u, f);
+        if (Array.isArray(o) && t !== "length" && h !== undefined) {
+          const t = getNodes(e, ue);
+          if (t.length) {
+            setSignal(t.length, h);
+          } else if (!T && !e[de]) {
+            const n = upsertStoreNode(e, t, "length", d, e[P]);
+            setSignal(n, h);
+          }
         }
         if (false);
       });
@@ -2411,11 +2518,11 @@ const le = {
     return true;
   },
   defineProperty(e, t, n) {
-    const r = e[J];
+    const r = e[ne];
     if (writeOnly(r)) {
       untrack(() => {
         const { base: i, overrideKey: s } = prepareStoreWrite(e, r, t);
-        const o = "value" in n ? { ...n, value: n.value?.[U]?.[Y] ?? n.value } : n;
+        const o = "value" in n ? { ...n, value: n.value?.[te]?.[ie] ?? n.value } : n;
         Object.defineProperty(e[s] || (e[s] = Object.create(null)), t, o);
         notifyStoreProperty(e, t, "invalidate");
         if (false);
@@ -2424,31 +2531,31 @@ const le = {
     return true;
   },
   deleteProperty(e, t) {
-    const n = e[$]?.[t] === X;
-    const r = e[Z]?.[t] === X;
-    if (writeOnly(e[J]) && !n && !r) {
+    const n = e[oe]?.[t] === re;
+    const r = e[se]?.[t] === re;
+    if (writeOnly(e[ne]) && !n && !r) {
       untrack(() => {
-        const n = e[se] && !j;
-        const r = n ? $ : Z;
-        if (n) trackOptimisticStore(e[J]);
-        const i = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : e[Y][t];
-        if (t in e[Y] || (e[Z] && t in e[Z])) {
-          (e[r] || (e[r] = Object.create(null)))[t] = X;
+        const n = e[de] && !T;
+        const r = n ? oe : se;
+        if (n) trackOptimisticStore(e[ne]);
+        const i = e[oe] && t in e[oe] ? e[oe][t] : e[se] && t in e[se] ? e[se][t] : e[ie][t];
+        if (t in e[ie] || (e[se] && t in e[se])) {
+          (e[r] || (e[r] = Object.create(null)))[t] = re;
         } else if (e[r] && t in e[r]) {
           delete e[r][t];
         } else return true;
-        notifyStoreProperty(e, t, "delete");
+        notifyStoreProperty(e, t, "delete", undefined, i, true);
       });
     }
     return true;
   },
   ownKeys(e) {
     trackSelf(e);
-    let t = getKeys(e[Y], e[Z], false);
-    if (e[$]) {
+    let t = getKeys(e[ie], e[se], false);
+    if (e[oe]) {
       const n = new Set(t);
-      for (const t of Reflect.ownKeys(e[$])) {
-        if (e[$][t] !== X) n.add(t);
+      for (const t of Reflect.ownKeys(e[oe])) {
+        if (e[oe][t] !== re) n.add(t);
         else n.delete(t);
       }
       t = Array.from(n);
@@ -2456,27 +2563,27 @@ const le = {
     return t;
   },
   getOwnPropertyDescriptor(e, t) {
-    if (t === J) return { value: e[J], writable: true, configurable: true };
-    if (e[$] && t in e[$]) {
-      if (e[$][t] === X) return undefined;
-      const n = Reflect.getOwnPropertyDescriptor(e[$], t);
-      if (n?.get || n?.set || !(t in e[Y])) return n;
-      const r = getPropertyDescriptor(e[Y], e[Z], t);
+    if (t === ne) return { value: e[ne], writable: true, configurable: true };
+    if (e[oe] && t in e[oe]) {
+      if (e[oe][t] === re) return undefined;
+      const n = Reflect.getOwnPropertyDescriptor(e[oe], t);
+      if (n?.get || n?.set || !(t in e[ie])) return n;
+      const r = getPropertyDescriptor(e[ie], e[se], t);
       if (r) {
-        return { ...r, value: e[$][t] };
+        return { ...r, value: e[oe][t] };
       }
-      return { value: e[$][t], writable: true, enumerable: true, configurable: true };
+      return { value: e[oe][t], writable: true, enumerable: true, configurable: true };
     }
-    return getPropertyDescriptor(e[Y], e[Z], t);
+    return getPropertyDescriptor(e[ie], e[se], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[Y]);
+    return Object.getPrototypeOf(e[ie]);
   }
 };
 function storeSetter(e, t) {
-  const n = fe;
-  fe = new Set();
-  fe.add(e);
+  const n = ye;
+  ye = new Set();
+  ye.add(e);
   try {
     const n = t(e);
     if (n !== e && n !== undefined) {
@@ -2492,8 +2599,8 @@ function storeSetter(e, t) {
       }
     }
   } finally {
-    fe.clear();
-    fe = n;
+    ye.clear();
+    ye = n;
   }
 }
 function createStore(e, t, n) {
@@ -2502,7 +2609,7 @@ function createStore(e, t, n) {
   return [i, e => storeSetter(i, e)];
 }
 function createOptimisticStore(e, t, n) {
-  GlobalQueue.fe ||= clearOptimisticStore;
+  GlobalQueue.ce ||= clearOptimisticStore;
   const r = typeof e === "function";
   const i = r ? t : e;
   const s = r ? e : undefined;
@@ -2510,39 +2617,39 @@ function createOptimisticStore(e, t, n) {
   return [o, e => storeSetter(o, e)];
 }
 function clearOptimisticStore(e) {
-  const t = e[U];
-  if (!t || !t[$]) return;
-  const n = t[$];
-  const r = t[ee];
+  const t = e[te];
+  if (!t || !t[oe]) return;
+  const n = t[oe];
+  const r = t[ue];
   setProjectionWriteActive(true);
   try {
     if (r) {
       for (const e of Reflect.ownKeys(n)) {
         if (r[e]) {
-          r[e].Y = undefined;
-          const n = t[Z] && e in t[Z] ? t[Z][e] : t[Y][e];
-          const i = n === X ? undefined : n;
+          r[e].te = undefined;
+          const n = t[se] && e in t[se] ? t[se][e] : t[ie][e];
+          const i = n === re ? undefined : n;
           setSignal(r[e], isWrappable(i) ? wrap(i, t) : i);
         }
       }
-      if (r[z]) {
-        r[z].Y = undefined;
-        setSignal(r[z], undefined);
+      if (r[ee]) {
+        r[ee].te = undefined;
+        setSignal(r[ee], undefined);
       }
     }
   } finally {
     setProjectionWriteActive(false);
   }
-  delete t[$];
+  delete t[oe];
 }
 function createOptimisticProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[ne] = wrapProjection;
-    e[re] = i;
-    e[se] = true;
-    Object.defineProperty(e, ie, {
+    e[le] = wrapProjection;
+    e[ce] = i;
+    e[de] = true;
+    Object.defineProperty(e, ae, {
       get() {
         return r;
       },
@@ -2551,45 +2658,34 @@ function createOptimisticProjectionInternal(e, t, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[U]?.[ne] === wrapProjection) return e;
-    const t = createStoreProxy(e, le, wrapper);
+    if (e[te]?.[le] === wrapProjection) return e;
+    const t = createStoreProxy(e, ge, wrapper);
     i.set(e, t);
     return t;
   };
   const s = wrapProjection(t);
   if (e) {
+    const wrapCommit = e => {
+      setProjectionWriteActive(true);
+      try {
+        e();
+      } finally {
+        setProjectionWriteActive(false);
+      }
+    };
     r = computed(() => {
-      const t = getOwner();
-      let r = false;
-      let i;
-      const o = new Proxy(
-        s,
-        createWriteTraps(() => !r || t.Ce === i)
-      );
       setProjectionWriteActive(true);
       try {
-        storeSetter(o, o => {
-          i = e(o);
-          r = true;
-          const u = handleAsync(t, i, e => {
-            setProjectionWriteActive(true);
-            try {
-              e !== o && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
-            } finally {
-              setProjectionWriteActive(false);
-            }
-          });
-          u !== o && u !== undefined && reconcile(u, n?.key || "id")(s);
-        });
+        runProjectionComputed(s, e, n?.key || "id", wrapCommit);
       } finally {
         setProjectionWriteActive(false);
       }
-    });
-    r.ve = true;
+    }, undefined);
+    r.de &= ~g;
   }
   return { store: s, node: r };
 }
-const ce = Symbol(0);
+const Se = Symbol(0);
 function updatePath(e, t, n = 0) {
   let r,
     i = e;
@@ -2633,7 +2729,7 @@ function updatePath(e, t, n = 0) {
     if (s === i) return;
   }
   if (r === undefined && s == undefined) return;
-  if (s === ce) {
+  if (s === Se) {
     delete e[r];
   } else if (r === undefined || (isWrappable(i) && isWrappable(s) && !Array.isArray(s))) {
     const t = r !== undefined ? e[r] : e;
@@ -2648,26 +2744,26 @@ function updatePath(e, t, n = 0) {
     e[r] = s;
   }
 }
-const ae = Object.assign(
+const we = Object.assign(
   function storePath(...e) {
     return t => {
       updatePath(t, e);
     };
   },
-  { DELETE: ce }
+  { DELETE: Se }
 );
 function snapshotImpl(e, t, n, r) {
   let i, s, o, u, f, l;
   if (!isWrappable(e)) return e;
   if (n && n.has(e)) return n.get(e);
   if (!n) n = new Map();
-  if ((i = e[U] || r?.get(e)?.[U])) {
-    if (t) trackSelf(i, z);
-    o = i[Z];
-    s = Array.isArray(i[Y]);
-    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[Y]))) : i[Y]);
-    e = i[Y];
-    r = oe;
+  if ((i = e[te] || r?.get(e)?.[te])) {
+    if (t) trackSelf(i, ee);
+    o = i[se];
+    s = Array.isArray(i[ie]);
+    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[ie]))) : i[ie]);
+    e = i[ie];
+    r = he;
   } else {
     s = Array.isArray(e);
     n.set(e, e);
@@ -2676,7 +2772,7 @@ function snapshotImpl(e, t, n, r) {
     const s = o?.length || e.length;
     for (let c = 0; c < s; c++) {
       l = o && c in o ? o[c] : e[c];
-      if (l === X) continue;
+      if (l === re) continue;
       if (t && isWrappable(l)) wrap(l, i);
       if ((f = snapshotImpl(l, t, n, r)) !== l || u) {
         if (!u) n.set(e, (u = [...e]));
@@ -2711,13 +2807,13 @@ function deep(e) {
 function trueFn() {
   return true;
 }
-const de = {
+const me = {
   get(e, t, n) {
-    if (t === J) return n;
+    if (t === ne) return n;
     return e.get(t);
   },
   has(e, t) {
-    if (t === J) return true;
+    if (t === ne) return true;
     return e.has(t);
   },
   set: trueFn,
@@ -2740,23 +2836,23 @@ const de = {
 function resolveSource(e) {
   return !(e = typeof e === "function" ? e() : e) ? {} : e;
 }
-const he = Symbol(0);
+const be = Symbol(0);
 function merge(...e) {
   if (e.length === 1 && typeof e[0] !== "function") return e[0];
   let t = false;
   const n = [];
   for (let r = 0; r < e.length; r++) {
     const i = e[r];
-    t = t || (!!i && J in i);
-    const s = !!i && i[he];
+    t = t || (!!i && ne in i);
+    const s = !!i && i[be];
     if (s) n.push(...s);
     else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
   }
-  if (b && t) {
+  if (k && t) {
     return new Proxy(
       {
         get(e) {
-          if (e === he) return n;
+          if (e === be) return n;
           for (let t = n.length - 1; t >= 0; t--) {
             const r = resolveSource(n[t]);
             if (e in r) return r[e];
@@ -2774,7 +2870,7 @@ function merge(...e) {
           return [...new Set(e)];
         }
       },
-      de
+      me
     );
   }
   const r = Object.create(null);
@@ -2806,12 +2902,12 @@ function merge(...e) {
     if (n.get) Object.defineProperty(o, t, n);
     else o[t] = n.value;
   }
-  o[he] = n;
+  o[be] = n;
   return o;
 }
 function omit(e, ...t) {
   const n = new Set(t);
-  if (b && J in e) {
+  if (k && ne in e) {
     return new Proxy(
       {
         get(t) {
@@ -2824,7 +2920,7 @@ function omit(e, ...t) {
           return Object.keys(e).filter(e => !n.has(e));
         }
       },
-      de
+      me
     );
   }
   const r = {};
@@ -2842,69 +2938,69 @@ function mapArray(e, t, n) {
   const r = typeof n?.keyed === "function" ? n.keyed : undefined;
   const i = t.length > 1;
   const s = t;
-  const o = computed(
-    updateKeyedMap.bind({
-      ze: createOwner(),
-      Ue: 0,
-      Je: e,
-      Xe: [],
-      Ye: s,
-      Ze: [],
-      $e: [],
-      et: r,
-      tt: r || n?.keyed === false ? [] : undefined,
-      nt: i ? [] : undefined,
-      rt: n?.fallback
-    })
-  );
-  o.ve = true;
-  return accessor(o);
+  const o = {
+    Be: createOwner(),
+    Ke: 0,
+    Ge: e,
+    ze: [],
+    Ue: s,
+    Je: [],
+    Xe: [],
+    Ye: r,
+    Ze: r || n?.keyed === false ? [] : undefined,
+    $e: i ? [] : undefined,
+    et: n?.fallback
+  };
+  const u = computed(updateKeyedMap.bind(o));
+  o.Be.u = u;
+  u.de &= ~g;
+  return accessor(u);
 }
-const pe = { ownedWrite: true };
+const _e = { ownedWrite: true };
 function updateKeyedMap() {
-  const e = this.Je() || [],
+  const e = this.Ge() || [],
     t = e.length;
-  e[z];
-  runWithOwner(this.ze, () => {
+  e[ee];
+  runWithOwner(this.Be, () => {
     let n,
       r,
-      i = this.tt
+      i = this.Ze
         ? () => {
-            this.tt[r] = signal(e[r], pe);
-            this.nt && (this.nt[r] = signal(r, pe));
-            return this.Ye(accessor(this.tt[r]), this.nt ? accessor(this.nt[r]) : undefined);
+            this.Ze[r] = signal(e[r], _e);
+            this.$e && (this.$e[r] = signal(r, _e));
+            return this.Ue(accessor(this.Ze[r]), this.$e ? accessor(this.$e[r]) : undefined);
           }
-        : this.nt
+        : this.$e
           ? () => {
               const t = e[r];
-              this.nt[r] = signal(r, pe);
-              return this.Ye(() => t, accessor(this.nt[r]));
+              this.$e[r] = signal(r, _e);
+              return this.Ue(() => t, accessor(this.$e[r]));
             }
           : () => {
               const t = e[r];
-              return this.Ye(() => t);
+              return this.Ue(() => t);
             };
     if (t === 0) {
-      if (this.Ue !== 0) {
-        this.ze.dispose(false);
-        this.$e = [];
+      if (this.Ke !== 0) {
+        this.Be.dispose(false);
         this.Xe = [];
-        this.Ze = [];
-        this.Ue = 0;
-        this.tt && (this.tt = []);
-        this.nt && (this.nt = []);
-      }
-      if (this.rt && !this.Ze[0]) {
-        this.Ze[0] = runWithOwner((this.$e[0] = createOwner()), this.rt);
-      }
-    } else if (this.Ue === 0) {
-      if (this.$e[0]) this.$e[0].dispose();
-      this.Ze = new Array(t);
+        this.ze = [];
+        this.Je = [];
+        this.Ke = 0;
+        this.Ze && (this.Ze = []);
+        this.$e && (this.$e = []);
+      }
+      if (this.et && !this.Je[0]) {
+        this.Je[0] = runWithOwner((this.Xe[0] = createOwner()), this.et);
+      }
+    } else if (this.Ke === 0) {
+      if (this.Xe[0]) this.Xe[0].dispose();
+      this.Je = new Array(t);
       for (r = 0; r < t; r++) {
-        this.Xe[r] = e[r];
-        this.Ze[r] = runWithOwner((this.$e[r] = createOwner()), i);
+        this.ze[r] = e[r];
+        this.Je[r] = runWithOwner((this.Xe[r] = createOwner()), i);
       }
-      this.Ue = t;
+      this.Ke = t;
     } else {
       let s,
         o,
@@ -2915,323 +3011,370 @@ function updateKeyedMap() {
         a,
         d = new Array(t),
         h = new Array(t),
-        p = this.tt ? new Array(t) : undefined,
-        y = this.nt ? new Array(t) : undefined;
+        p = this.Ze ? new Array(t) : undefined,
+        y = this.$e ? new Array(t) : undefined;
       for (
-        s = 0, o = Math.min(this.Ue, t);
-        s < o && (this.Xe[s] === e[s] || (this.tt && compare(this.et, this.Xe[s], e[s])));
+        s = 0, o = Math.min(this.Ke, t);
+        s < o && (this.ze[s] === e[s] || (this.Ze && compare(this.Ye, this.ze[s], e[s])));
         s++
       ) {
-        if (this.tt) setSignal(this.tt[s], e[s]);
+        if (this.Ze) setSignal(this.Ze[s], e[s]);
       }
       for (
-        o = this.Ue - 1, u = t - 1;
+        o = this.Ke - 1, u = t - 1;
         o >= s &&
         u >= s &&
-        (this.Xe[o] === e[u] || (this.tt && compare(this.et, this.Xe[o], e[u])));
+        (this.ze[o] === e[u] || (this.Ze && compare(this.Ye, this.ze[o], e[u])));
         o--, u--
       ) {
-        d[u] = this.Ze[o];
-        h[u] = this.$e[o];
-        p && (p[u] = this.tt[o]);
-        y && (y[u] = this.nt[o]);
+        d[u] = this.Je[o];
+        h[u] = this.Xe[o];
+        p && (p[u] = this.Ze[o]);
+        y && (y[u] = this.$e[o]);
       }
       c = new Map();
       a = new Array(u + 1);
       for (r = u; r >= s; r--) {
         f = e[r];
-        l = this.et ? this.et(f) : f;
+        l = this.Ye ? this.Ye(f) : f;
         n = c.get(l);
         a[r] = n === undefined ? -1 : n;
         c.set(l, r);
       }
       for (n = s; n <= o; n++) {
-        f = this.Xe[n];
-        l = this.et ? this.et(f) : f;
+        f = this.ze[n];
+        l = this.Ye ? this.Ye(f) : f;
         r = c.get(l);
         if (r !== undefined && r !== -1) {
-          d[r] = this.Ze[n];
-          h[r] = this.$e[n];
-          p && (p[r] = this.tt[n]);
-          y && (y[r] = this.nt[n]);
+          d[r] = this.Je[n];
+          h[r] = this.Xe[n];
+          p && (p[r] = this.Ze[n]);
+          y && (y[r] = this.$e[n]);
           r = a[r];
           c.set(l, r);
-        } else this.$e[n].dispose();
+        } else this.Xe[n].dispose();
       }
       for (r = s; r < t; r++) {
         if (r in d) {
-          this.Ze[r] = d[r];
-          this.$e[r] = h[r];
+          this.Je[r] = d[r];
+          this.Xe[r] = h[r];
           if (p) {
-            this.tt[r] = p[r];
-            setSignal(this.tt[r], e[r]);
+            this.Ze[r] = p[r];
+            setSignal(this.Ze[r], e[r]);
           }
           if (y) {
-            this.nt[r] = y[r];
-            setSignal(this.nt[r], r);
+            this.$e[r] = y[r];
+            setSignal(this.$e[r], r);
           }
         } else {
-          this.Ze[r] = runWithOwner((this.$e[r] = createOwner()), i);
+          this.Je[r] = runWithOwner((this.Xe[r] = createOwner()), i);
         }
       }
-      this.Ze = this.Ze.slice(0, (this.Ue = t));
-      this.Xe = e.slice(0);
+      this.Je = this.Je.slice(0, (this.Ke = t));
+      this.ze = e.slice(0);
     }
   });
-  return this.Ze;
+  return this.Je;
 }
 function repeat(e, t, n) {
   const r = t;
   const i = computed(
     updateRepeat.bind({
-      ze: createOwner(),
-      Ue: 0,
-      it: 0,
-      st: e,
-      Ye: r,
-      $e: [],
-      Ze: [],
-      ot: n?.from,
-      rt: n?.fallback
+      Be: createOwner(),
+      Ke: 0,
+      tt: 0,
+      nt: e,
+      Ue: r,
+      Xe: [],
+      Je: [],
+      rt: n?.from,
+      et: n?.fallback
     })
   );
-  i.ve = true;
+  i.de &= ~g;
   return accessor(i);
 }
 function updateRepeat() {
-  const e = this.st();
-  const t = this.ot?.() || 0;
-  runWithOwner(this.ze, () => {
+  const e = this.nt();
+  const t = this.rt?.() || 0;
+  runWithOwner(this.Be, () => {
     if (e === 0) {
-      if (this.Ue !== 0) {
-        this.ze.dispose(false);
-        this.$e = [];
-        this.Ze = [];
-        this.Ue = 0;
+      if (this.Ke !== 0) {
+        this.Be.dispose(false);
+        this.Xe = [];
+        this.Je = [];
+        this.Ke = 0;
       }
-      if (this.rt && !this.Ze[0]) {
-        this.Ze[0] = runWithOwner((this.$e[0] = createOwner()), this.rt);
+      if (this.et && !this.Je[0]) {
+        this.Je[0] = runWithOwner((this.Xe[0] = createOwner()), this.et);
       }
       return;
     }
     const n = t + e;
-    const r = this.it + this.Ue;
-    if (this.Ue === 0 && this.$e[0]) this.$e[0].dispose();
-    for (let e = n; e < r; e++) this.$e[e - this.it].dispose();
-    if (this.it < t) {
-      let e = this.it;
-      while (e < t && e < this.Ue) this.$e[e++].dispose();
-      this.$e.splice(0, t - this.it);
-      this.Ze.splice(0, t - this.it);
-    } else if (this.it > t) {
-      let n = r - this.it - 1;
-      let i = this.it - t;
-      this.$e.length = this.Ze.length = e;
+    const r = this.tt + this.Ke;
+    if (this.Ke === 0 && this.Xe[0]) this.Xe[0].dispose();
+    for (let e = n; e < r; e++) this.Xe[e - this.tt].dispose();
+    if (this.tt < t) {
+      let e = this.tt;
+      while (e < t && e < this.Ke) this.Xe[e++].dispose();
+      this.Xe.splice(0, t - this.tt);
+      this.Je.splice(0, t - this.tt);
+    } else if (this.tt > t) {
+      let n = r - this.tt - 1;
+      let i = this.tt - t;
+      this.Xe.length = this.Je.length = e;
       while (n >= i) {
-        this.$e[n] = this.$e[n - i];
-        this.Ze[n] = this.Ze[n - i];
+        this.Xe[n] = this.Xe[n - i];
+        this.Je[n] = this.Je[n - i];
         n--;
       }
       for (let e = 0; e < i; e++) {
-        this.Ze[e] = runWithOwner((this.$e[e] = createOwner()), () => this.Ye(e + t));
+        this.Je[e] = runWithOwner((this.Xe[e] = createOwner()), () => this.Ue(e + t));
       }
     }
     for (let e = r; e < n; e++) {
-      this.Ze[e - t] = runWithOwner((this.$e[e - t] = createOwner()), () => this.Ye(e));
+      this.Je[e - t] = runWithOwner((this.Xe[e - t] = createOwner()), () => this.Ue(e));
     }
-    this.Ze = this.Ze.slice(0, e);
-    this.it = t;
-    this.Ue = e;
+    this.Je = this.Je.slice(0, e);
+    this.tt = t;
+    this.Ke = e;
   });
-  return this.Ze;
+  return this.Je;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
 }
 function boundaryComputed(e, t) {
-  const n = computed(e, undefined, { lazy: true });
-  n.Qe = (e, t) => {
-    const r = e !== undefined ? e : n.ye;
-    const i = t !== undefined ? t : n.ae;
-    n.ye &= ~n.ut;
-    n.V.notify(n, n.ut, r, i);
+  const n = computed(e, { lazy: true });
+  n.Te = (e, t) => {
+    const r = e !== undefined ? e : n.ge;
+    const i = t !== undefined ? t : n.he;
+    n.ge &= ~n.it;
+    n.K.notify(n, n.it, r, i);
   };
-  n.ut = t;
-  n.ve = true;
+  n.it = t;
+  n.de &= ~g;
   recompute(n, true);
   return n;
 }
 function createBoundChildren(e, t, n, r) {
-  const i = e.V;
-  i.addChild((e.V = n));
-  cleanup(() => i.removeChild(e.V));
+  const i = e.K;
+  i.addChild((e.K = n));
+  cleanup(() => i.removeChild(e.K));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
   });
 }
-const ye = Symbol();
-const ge = createContext(null);
-let Se = false;
+const Oe = Symbol();
+const ve = createContext(null);
+let xe = false;
 const FALSE_ACCESSOR = () => false;
+const SEQUENTIAL_ACCESSOR = () => "sequential";
 function isRevealController(e) {
   return e instanceof RevealController;
 }
 function isSlotReady(e) {
-  return isRevealController(e) ? e.isReady() : e.ft.size === 0 && !e.lt;
+  return isRevealController(e) ? e.isReady() : e.st.size === 0 && !e.ot;
+}
+function isSlotMinimallyReady(e) {
+  return isRevealController(e) ? e.isMinimallyReady() : isSlotReady(e);
 }
 function setSlotState(e, t, n, r) {
-  setSignal(e.ct, n);
-  setSignal(e.dt, r);
+  setSignal(e.ut, n);
+  setSignal(e.ft, r);
   if (isRevealController(e)) {
-    if (!n && e.ht === t) e.ht = undefined;
+    if (!n && e.lt === t) e.lt = undefined;
     return e.evaluate(n, r);
   }
-  if (!n && e.yt === t && e.gt) e.yt = undefined;
+  if (!n && e.ct === t && e.dt) e.ct = undefined;
 }
 class RevealController {
-  St;
-  wt;
-  bt = [];
   ht;
-  ct = signal(false, { ownedWrite: true, De: true });
-  dt = signal(false, { ownedWrite: true, De: true });
-  _t = true;
-  Ot = false;
+  yt;
+  gt = [];
+  lt;
+  ut = signal(false, { ownedWrite: true, Qe: true });
+  ft = signal(false, { ownedWrite: true, Qe: true });
+  St = true;
+  wt = true;
+  bt = false;
   constructor(e, t) {
-    this.St = e;
-    this.wt = t;
+    this.ht = e;
+    this.yt = t;
   }
-  xt(e) {
-    for (let t = 0; t < this.bt.length; t++) {
-      const n = this.bt[t];
-      if ((isRevealController(n) ? n.ht : n.yt) !== this) continue;
+  _t(e) {
+    for (let t = 0; t < this.gt.length; t++) {
+      const n = this.gt[t];
+      if ((isRevealController(n) ? n.lt : n.ct) !== this) continue;
       if (e(n) === false) return false;
     }
     return true;
   }
   isReady() {
-    return this.xt(isSlotReady);
+    return this._t(isSlotReady);
+  }
+  isMinimallyReady() {
+    const e = untrack(this.ht);
+    if (e === "together") return this.isReady();
+    if (e === "natural") {
+      let e = false;
+      let t = false;
+      this._t(n => {
+        e = true;
+        if (isSlotMinimallyReady(n)) {
+          t = true;
+          return false;
+        }
+      });
+      return !e || t;
+    }
+    let t = true;
+    this._t(e => {
+      t = isSlotMinimallyReady(e);
+      return false;
+    });
+    return t;
   }
   register(e) {
-    if (this.bt.includes(e)) return;
-    this.bt.push(e);
-    const t = !!untrack(this.St);
-    (setSignal(e.ct, true), setSignal(e.dt, t ? false : !!untrack(this.wt)));
+    if (this.gt.includes(e)) return;
+    this.gt.push(e);
+    const t = untrack(this.ht);
+    (setSignal(e.ut, true), setSignal(e.ft, t === "sequential" ? !!untrack(this.yt) : false));
     untrack(() => this.evaluate());
   }
   unregister(e) {
-    const t = this.bt.indexOf(e);
-    if (t >= 0) this.bt.splice(t, 1);
+    const t = this.gt.indexOf(e);
+    if (t >= 0) this.gt.splice(t, 1);
     untrack(() => this.evaluate());
   }
   evaluate(e, t) {
-    if (this.Ot) return;
-    this.Ot = true;
-    const n = this._t;
+    if (this.bt) return;
+    this.bt = true;
+    const n = this.St;
+    const r = this.wt;
     try {
-      const n = e ?? read(this.ct),
-        r = !!untrack(this.wt),
-        i = t ?? r;
-      if (n && i) this.xt(e => setSlotState(e, this, true, true));
-      else if (!!untrack(this.St)) {
-        const e = this.isReady();
-        this.xt(t => setSlotState(t, this, !e, false));
+      const n = e ?? read(this.ut),
+        r = untrack(this.ht),
+        i = r === "sequential" && !!untrack(this.yt),
+        s = t ?? i;
+      if (n) {
+        this._t(e => setSlotState(e, this, true, s));
+      } else if (r === "natural") {
+        this._t(e => {
+          if (isRevealController(e)) {
+            setSignal(e.ft, false);
+            setSignal(e.ut, false);
+            e.evaluate(false, false);
+          } else {
+            setSlotState(e, this, !isSlotReady(e), false);
+          }
+        });
+      } else if (r === "together") {
+        const e = this._t(isSlotMinimallyReady);
+        this._t(t => setSlotState(t, this, !e, false));
       } else {
         let e = false;
-        this.xt(t => {
-          if (e) return setSlotState(t, this, true, r);
+        this._t(t => {
+          if (e) return setSlotState(t, this, true, i);
           if (isSlotReady(t)) return setSlotState(t, this, false, false);
           e = true;
-          setSlotState(t, this, true, false);
+          if (isRevealController(t)) {
+            setSignal(t.ft, false);
+            setSignal(t.ut, false);
+            t.evaluate(false, false);
+          } else {
+            setSlotState(t, this, true, false);
+          }
         });
       }
     } finally {
-      this._t = this.isReady();
-      this.Ot = false;
+      this.St = this.isReady();
+      this.wt = this.isMinimallyReady();
+      this.bt = false;
     }
-    if (this.ht && n !== this._t) this.ht.evaluate();
+    if (this.lt && (n !== this.St || r !== this.wt)) this.lt.evaluate();
   }
 }
 class CollectionQueue extends Queue {
+  Ot;
+  st = new Set();
   vt;
-  ft = new Set();
-  Pt;
-  lt = true;
-  ct = signal(false, { ownedWrite: true, De: true });
-  dt = signal(false, { ownedWrite: true, De: true });
-  yt;
-  gt = false;
-  kt;
-  Et = ye;
+  ot = true;
+  ut = signal(false, { ownedWrite: true, Qe: true });
+  ft = signal(false, { ownedWrite: true, Qe: true });
+  ct;
+  dt = false;
+  xt;
+  Pt = Oe;
   constructor(e) {
     super();
-    this.vt = e;
+    this.Ot = e;
   }
   run(e) {
-    if (!e || (read(this.ct) && (!Se || read(this.dt)))) return;
+    if (!e || (read(this.ut) && (!xe || read(this.ft)))) return;
     return super.run(e);
   }
   notify(e, t, n, r) {
-    if (!(t & this.vt)) return super.notify(e, t, n, r);
-    if (this.gt && this.kt) {
+    if (!(t & this.Ot)) return super.notify(e, t, n, r);
+    if (this.dt && this.xt) {
       const e = untrack(() => {
         try {
-          return this.kt();
+          return this.xt();
         } catch {
-          return ye;
+          return Oe;
         }
       });
-      if (e !== this.Et) {
-        this.Et = e;
-        this.gt = false;
-        this.ft.clear();
+      if (e !== this.Pt) {
+        this.Pt = e;
+        this.dt = false;
+        this.st.clear();
       }
     }
-    if (this.vt & a && this.gt) return super.notify(e, t, n, r);
-    if (this.vt & a && n & d) {
-      return super.notify(e, d, n, r);
+    if (this.Ot & S && this.dt) return super.notify(e, t, n, r);
+    if (this.Ot & S && n & w) {
+      return super.notify(e, w, n, r);
     }
-    if (n & this.vt) {
-      this.lt = true;
-      const t = r?.source || e.ae?.source;
+    if (n & this.Ot) {
+      this.ot = true;
+      const t = r?.source || e.he?.source;
       if (t) {
-        const e = this.ft.size === 0;
-        this.ft.add(t);
-        if (e) setSignal(this.ct, true);
+        const e = this.st.size === 0;
+        this.st.add(t);
+        if (e) setSignal(this.ut, true);
       }
     }
-    t &= ~this.vt;
+    t &= ~this.Ot;
     return t ? super.notify(e, t, n, r) : true;
   }
   checkSources() {
-    for (const e of this.ft) {
-      if (e.m & u || (!(e.ye & this.vt) && !(this.vt & d && e.ye & a))) this.ft.delete(e);
+    for (const e of this.st) {
+      if (e.m & u || (!(e.ge & this.Ot) && !(this.Ot & w && e.ge & S))) this.st.delete(e);
     }
-    if (!this.ft.size) {
-      if (this.vt & a && this.lt && !this.gt && this.Pt) {
-        this.lt = !!(this.Pt.ye & this.vt);
+    if (!this.st.size) {
+      if (this.Ot & S && this.ot && !this.dt && this.vt) {
+        this.ot = !!(this.vt.ge & this.Ot);
       } else {
-        this.lt = false;
+        this.ot = false;
       }
-      if (!this.lt) {
-        setSignal(this.ct, false);
-        if (this.kt) {
+      if (!this.ot) {
+        setSignal(this.ut, false);
+        if (this.xt) {
           try {
-            this.Et = untrack(() => this.kt());
+            this.Pt = untrack(() => this.xt());
           } catch {}
         }
       }
     }
-    if (Se) this.yt?.evaluate();
+    if (xe) this.ct?.evaluate();
   }
 }
 function createCollectionBoundary(e, t, n, r) {
   const i = createOwner();
-  if (Se) setContext(ge, null, i);
+  if (xe) setContext(ve, null, i);
   const s = new CollectionQueue(e);
-  if (r) s.kt = r;
-  const o = (s.Pt = createBoundChildren(i, t, s, e));
+  if (r) s.xt = r;
+  const o = (s.vt = createBoundChildren(i, t, s, e));
   untrack(() => {
     let t = false;
     try {
@@ -3240,45 +3383,46 @@ function createCollectionBoundary(e, t, n, r) {
       if (e instanceof NotReadyError) t = true;
       else throw e;
     }
-    s.lt = t || !!(o.ye & e) || o.ae instanceof NotReadyError;
+    s.ot = t || !!(o.ge & e) || o.he instanceof NotReadyError;
   });
-  const u = Se && e === a ? getContext(ge) : null;
+  const u = xe && e === S ? getContext(ve) : null;
   if (u) {
-    s.yt = u;
+    s.ct = u;
     u.register(s);
     cleanup(() => u.unregister(s));
   }
-  const f = computed(() => {
-    if (!read(s.ct)) {
-      const e = read(o);
-      if (!untrack(() => read(s.ct))) return ((s.gt = true), e);
-    }
-    if (Se && read(s.dt)) return undefined;
-    return n(s);
-  });
-  return accessor(f);
+  return accessor(
+    computed(() => {
+      if (!read(s.ut)) {
+        const e = read(o);
+        if (!untrack(() => read(s.ut))) return ((s.dt = true), e);
+      }
+      if (xe && read(s.ft)) return undefined;
+      return n(s);
+    })
+  );
 }
 function createLoadingBoundary(e, t, n) {
-  return createCollectionBoundary(a, e, () => t(), n?.on);
+  return createCollectionBoundary(S, e, () => t(), n?.on);
 }
 function createErrorBoundary(e, t) {
-  return createCollectionBoundary(d, e, e => {
-    let n = e.ft.values().next().value;
-    const r = n.ae?.cause ?? n.ae;
+  return createCollectionBoundary(w, e, e => {
+    let n = e.st.values().next().value;
+    const r = n.he?.cause ?? n.he;
     return t(r, () => {
-      for (const t of e.ft) recompute(t);
+      for (const t of e.st) recompute(t);
       schedule();
     });
   });
 }
 function createRevealOrder(e, t) {
-  Se = true;
+  xe = true;
   const n = createOwner();
-  const r = getContext(ge);
-  const i = t?.together || FALSE_ACCESSOR,
+  const r = getContext(ve);
+  const i = t?.order || SEQUENTIAL_ACCESSOR,
     s = t?.collapsed || FALSE_ACCESSOR;
   const o = new RevealController(i, s);
-  setContext(ge, o, n);
+  setContext(ve, o, n);
   return runWithOwner(n, () => {
     const t = e();
     computed(() => {
@@ -3287,7 +3431,7 @@ function createRevealOrder(e, t) {
       o.evaluate();
     });
     if (r) {
-      o.ht = r;
+      o.lt = r;
       r.register(o);
       cleanup(() => r.unregister(o));
     }
@@ -3343,16 +3487,16 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-const we = undefined;
-exports.$PROXY = J;
-exports.$REFRESH = O;
-exports.$TARGET = U;
-exports.$TRACK = z;
+const Pe = undefined;
+exports.$PROXY = ne;
+exports.$REFRESH = C;
+exports.$TARGET = te;
+exports.$TRACK = ee;
 exports.ContextNotFoundError = ContextNotFoundError;
-exports.DEV = we;
+exports.DEV = Pe;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
-exports.SUPPORTS_PROXY = b;
+exports.SUPPORTS_PROXY = k;
 exports.action = action;
 exports.clearSnapshots = clearSnapshots;
 exports.createContext = createContext;
@@ -3402,5 +3546,5 @@ exports.runWithOwner = runWithOwner;
 exports.setContext = setContext;
 exports.setSnapshotCapture = setSnapshotCapture;
 exports.snapshot = snapshot;
-exports.storePath = ae;
+exports.storePath = we;
 exports.untrack = untrack;