@solidjs/signals 0.9.10 → 0.10.0

package/dist/node.cjs

@@ -100,12 +100,12 @@ function markNode(e, r = n) {
   const i = e._;
   if ((i & (t | n)) >= r) return;
   e._ = (i & -4) | r;
-  for (let n = e.P; n !== null; n = n.C) {
+  for (let n = e.P; n !== null; n = n.A) {
     markNode(n.k, t);
   }
-  if (e.A !== null) {
-    for (let n = e.A; n !== null; n = n.W) {
-      for (let e = n.P; e !== null; e = e.C) {
+  if (e.C !== null) {
+    for (let n = e.C; n !== null; n = n.W) {
+      for (let e = n.P; e !== null; e = e.A) {
         markNode(e.k, t);
       }
     }
@@ -133,7 +133,7 @@ function adjustHeight(e, t) {
   }
   if (e.u !== n) {
     e.u = n;
-    for (let n = e.P; n !== null; n = n.C) {
+    for (let n = e.P; n !== null; n = n.A) {
       insertIntoHeapHeight(n.k, t);
     }
   }
@@ -145,82 +145,12 @@ let O = 0;
 let x = null;
 let v = false;
 let P = false;
-const C = new WeakMap();
-const k = new Set();
-let A = null;
-function setCurrentOptimisticLane(e) {
-  A = e;
-}
-function getOrCreateLane(e) {
-  let t = C.get(e);
-  if (t) {
-    return findLane(t);
-  }
-  const n = e.T;
-  const r = n?.M ? findLane(n.M) : null;
-  t = { t: e, q: new Set(), F: [[], []], V: null, B: x, D: r };
-  C.set(e, t);
-  k.add(t);
-  e.G = e.K || 0;
-  return t;
-}
-function findLane(e) {
-  while (e.V) e = e.V;
-  return e;
-}
-function mergeLanes(e, t) {
-  e = findLane(e);
-  t = findLane(t);
-  if (e === t) return e;
-  t.V = e;
-  for (const n of t.q) e.q.add(n);
-  e.F[0].push(...t.F[0]);
-  e.F[1].push(...t.F[1]);
-  return e;
-}
-function clearLaneEntry(e) {
-  C.delete(e);
-}
-function resolveLane(e) {
-  const t = e.M;
-  if (!t) return undefined;
-  const n = findLane(t);
-  if (k.has(n)) return n;
-  e.M = undefined;
-  return undefined;
-}
-function hasActiveOverride(e) {
-  return !!(e.U && e.J !== y);
-}
-function assignOrMergeLane(e, t) {
-  const n = findLane(t);
-  const r = e.M;
-  if (r) {
-    if (r.V) {
-      e.M = t;
-      return;
-    }
-    const i = findLane(r);
-    if (k.has(i)) {
-      if (i !== n && !hasActiveOverride(e)) {
-        if (n.D && findLane(n.D) === i) {
-          e.M = t;
-        } else if (i.D && findLane(i.D) === n);
-        else {
-          mergeLanes(n, i);
-        }
-      }
-      return;
-    }
-  }
-  e.M = t;
-}
 function runLaneEffects(e) {
-  for (const t of k) {
-    if (t.V || t.q.size > 0) continue;
-    const n = t.F[e - 1];
+  for (const t of C) {
+    if (t.T || t.M.size > 0) continue;
+    const n = t.q[e - 1];
     if (n.length) {
-      t.F[e - 1] = [];
+      t.q[e - 1] = [];
       runQueue(n, e);
     }
   }
@@ -231,21 +161,21 @@ function setProjectionWriteActive(e) {
 function schedule() {
   if (v) return;
   v = true;
-  if (!E.X) queueMicrotask(flush);
+  if (!A.F) queueMicrotask(flush);
 }
 class Queue {
   o = null;
-  Y = [[], []];
-  Z = [];
+  V = [[], []];
+  D = [];
   created = O;
   addChild(e) {
-    this.Z.push(e);
+    this.D.push(e);
     e.o = this;
   }
   removeChild(e) {
-    const t = this.Z.indexOf(e);
+    const t = this.D.indexOf(e);
     if (t >= 0) {
-      this.Z.splice(t, 1);
+      this.D.splice(t, 1);
       e.o = null;
     }
   }
@@ -254,88 +184,88 @@ class Queue {
     return false;
   }
   run(e) {
-    if (this.Y[e - 1].length) {
-      const t = this.Y[e - 1];
-      this.Y[e - 1] = [];
+    if (this.V[e - 1].length) {
+      const t = this.V[e - 1];
+      this.V[e - 1] = [];
       runQueue(t, e);
     }
-    for (let t = 0; t < this.Z.length; t++) this.Z[t].run?.(e);
+    for (let t = 0; t < this.D.length; t++) this.D[t].run?.(e);
   }
   enqueue(e, t) {
     if (e) {
-      if (A) {
-        const n = findLane(A);
-        n.F[e - 1].push(t);
+      if (R) {
+        const n = findLane(R);
+        n.q[e - 1].push(t);
       } else {
-        this.Y[e - 1].push(t);
+        this.V[e - 1].push(t);
       }
     }
     schedule();
   }
   stashQueues(e) {
-    e.Y[0].push(...this.Y[0]);
-    e.Y[1].push(...this.Y[1]);
-    this.Y = [[], []];
-    for (let t = 0; t < this.Z.length; t++) {
-      let n = this.Z[t];
-      let r = e.Z[t];
+    e.V[0].push(...this.V[0]);
+    e.V[1].push(...this.V[1]);
+    this.V = [[], []];
+    for (let t = 0; t < this.D.length; t++) {
+      let n = this.D[t];
+      let r = e.D[t];
       if (!r) {
-        r = { Y: [[], []], Z: [] };
-        e.Z[t] = r;
+        r = { V: [[], []], D: [] };
+        e.D[t] = r;
       }
       n.stashQueues(r);
     }
   }
   restoreQueues(e) {
-    this.Y[0].push(...e.Y[0]);
-    this.Y[1].push(...e.Y[1]);
-    for (let t = 0; t < e.Z.length; t++) {
-      const n = e.Z[t];
-      let r = this.Z[t];
+    this.V[0].push(...e.V[0]);
+    this.V[1].push(...e.V[1]);
+    for (let t = 0; t < e.D.length; t++) {
+      const n = e.D[t];
+      let r = this.D[t];
       if (r) r.restoreQueues(n);
     }
   }
 }
 class GlobalQueue extends Queue {
-  X = false;
-  $ = [];
-  ee = [];
-  te = new Set();
-  static ne;
-  static re;
-  static ie = null;
+  F = false;
+  B = [];
+  G = [];
+  K = new Set();
+  static U;
+  static J;
+  static X = null;
   flush() {
-    if (this.X) return;
-    this.X = true;
+    if (this.F) return;
+    this.F = true;
     try {
-      runHeap(_, GlobalQueue.ne);
+      runHeap(_, GlobalQueue.U);
       if (x) {
         const e = transitionComplete(x);
         if (!e) {
           let e = x;
-          runHeap(b, GlobalQueue.ne);
-          this.$ = [];
-          this.ee = [];
-          this.te = new Set();
+          runHeap(b, GlobalQueue.U);
+          this.B = [];
+          this.G = [];
+          this.K = new Set();
           runLaneEffects(d);
           runLaneEffects(p);
-          this.stashQueues(x.se);
+          this.stashQueues(x.Y);
           O++;
           v = _.m >= _.j;
-          reassignPendingTransition(x.$);
+          reassignPendingTransition(x.B);
           x = null;
           finalizePureQueue(null, true);
           return;
         }
-        this.$ !== x.$ && this.$.push(...x.$);
-        this.restoreQueues(x.se);
+        this.B !== x.B && this.B.push(...x.B);
+        this.restoreQueues(x.Y);
         m.delete(x);
         const t = x;
         x = null;
-        reassignPendingTransition(this.$);
+        reassignPendingTransition(this.B);
         finalizePureQueue(t);
       } else {
-        if (m.size) runHeap(b, GlobalQueue.ne);
+        if (m.size) runHeap(b, GlobalQueue.U);
         finalizePureQueue();
       }
       O++;
@@ -345,15 +275,15 @@ class GlobalQueue extends Queue {
       runLaneEffects(p);
       this.run(p);
     } finally {
-      this.X = false;
+      this.F = false;
     }
   }
   notify(e, t, n, r) {
     if (t & l) {
       if (n & l) {
-        const t = r !== undefined ? r : e.oe;
-        if (x && t && !x.ue.includes(t.t)) {
-          x.ue.push(t.t);
+        const t = r !== undefined ? r : e.Z;
+        if (x && t && !x.$.includes(t.t)) {
+          x.$.push(t.t);
           schedule();
         }
       }
@@ -364,68 +294,68 @@ class GlobalQueue extends Queue {
   initTransition(e) {
     if (e) e = currentTransition(e);
     if (e && e === x) return;
-    if (!e && x && x.fe === O) return;
+    if (!e && x && x.ee === O) return;
     if (!x) {
       x = e ?? {
-        fe: O,
+        ee: O,
+        B: [],
         $: [],
-        ue: [],
-        ee: [],
-        te: new Set(),
-        le: [],
-        se: { Y: [[], []], Z: [] },
-        ce: false
+        G: [],
+        K: new Set(),
+        te: [],
+        Y: { V: [[], []], D: [] },
+        ne: false
       };
     } else if (e) {
       const t = x;
-      t.ce = e;
-      e.le.push(...t.le);
-      for (const n of k) {
-        if (n.B === t) n.B = e;
+      t.ne = e;
+      e.te.push(...t.te);
+      for (const n of C) {
+        if (n.re === t) n.re = e;
       }
-      e.ee.push(...t.ee);
-      for (const n of t.te) {
-        e.te.add(n);
+      e.G.push(...t.G);
+      for (const n of t.K) {
+        e.K.add(n);
       }
       m.delete(t);
       x = e;
     }
     m.add(x);
-    x.fe = O;
-    for (let e = 0; e < this.$.length; e++) {
-      const t = this.$[e];
-      t.B = x;
-      x.$.push(t);
+    x.ee = O;
+    for (let e = 0; e < this.B.length; e++) {
+      const t = this.B[e];
+      t.re = x;
+      x.B.push(t);
     }
-    this.$ = x.$;
-    for (let e = 0; e < this.ee.length; e++) {
-      const t = this.ee[e];
-      t.B = x;
-      x.ee.push(t);
+    this.B = x.B;
+    for (let e = 0; e < this.G.length; e++) {
+      const t = this.G[e];
+      t.re = x;
+      x.G.push(t);
     }
-    this.ee = x.ee;
-    for (const e of k) {
-      if (!e.B) e.B = x;
+    this.G = x.G;
+    for (const e of C) {
+      if (!e.re) e.re = x;
     }
-    for (const e of this.te) x.te.add(e);
-    this.te = x.te;
+    for (const e of this.K) x.K.add(e);
+    this.K = x.K;
   }
 }
 function insertSubs(e, t = false) {
-  const n = e.M || A;
-  for (let r = e.P; r !== null; r = r.C) {
+  const n = e.ie || R;
+  for (let r = e.P; r !== null; r = r.A) {
     if (t && n) {
       r.k._ |= f;
       assignOrMergeLane(r.k, n);
     } else if (t) {
       r.k._ |= f;
-      r.k.M = undefined;
+      r.k.ie = undefined;
     }
     const e = r.k;
-    if (e.ae === h) {
-      if (!e.de) {
-        e.de = true;
-        e.pe.enqueue(p, e.he);
+    if (e.se === h) {
+      if (!e.oe) {
+        e.oe = true;
+        e.ue.enqueue(p, e.fe);
       }
       continue;
     }
@@ -436,100 +366,103 @@ function insertSubs(e, t = false) {
 }
 function finalizePureQueue(e = null, t = false) {
   let n = !t;
-  if (!t) checkBoundaryChildren(E);
-  if (_.m >= _.j) runHeap(_, GlobalQueue.ne);
+  if (!t) checkBoundaryChildren(A);
+  if (_.m >= _.j) runHeap(_, GlobalQueue.U);
   if (n) {
-    const t = E.$;
+    const t = A.B;
     for (let e = 0; e < t.length; e++) {
       const n = t[e];
-      if (n.J !== y) {
-        n.ye = n.J;
-        n.J = y;
-        if (n.ae && n.ae !== h) n.de = true;
+      if (n.le !== y) {
+        n.ce = n.le;
+        n.le = y;
+        if (n.se && n.se !== h) n.oe = true;
       }
-      n.ge &= ~a;
-      if (n.R) GlobalQueue.re(n, false, true);
+      n.ae &= ~a;
+      if (n.R) GlobalQueue.J(n, false, true);
     }
     t.length = 0;
-    const n = e ? e.ee : E.ee;
+    const n = e ? e.G : A.G;
     for (let e = 0; e < n.length; e++) {
       const t = n[e];
-      const r = t.J;
-      t.M = undefined;
-      if (r !== y && t.ye !== r) {
-        t.ye = r;
+      const r = t.le;
+      t.ie = undefined;
+      if (r !== y && t.ce !== r) {
+        t.ce = r;
         insertSubs(t, true);
       }
-      t.J = y;
-      t.B = null;
+      t.le = y;
+      t.re = null;
     }
     n.length = 0;
-    const r = e ? e.te : E.te;
-    if (GlobalQueue.ie && r.size) {
+    const r = e ? e.K : A.K;
+    if (GlobalQueue.X && r.size) {
       for (const e of r) {
-        GlobalQueue.ie(e);
+        GlobalQueue.X(e);
       }
       r.clear();
       schedule();
     }
-    for (const t of k) {
-      const n = e ? t.B === e : !t.B;
+    for (const t of C) {
+      const n = e ? t.re === e : !t.re;
       if (!n) continue;
-      if (!t.V) {
-        if (t.F[0].length) runQueue(t.F[0], d);
-        if (t.F[1].length) runQueue(t.F[1], p);
+      if (!t.T) {
+        if (t.q[0].length) runQueue(t.q[0], d);
+        if (t.q[1].length) runQueue(t.q[1], p);
       }
-      if (t.t.M === t) t.t.M = undefined;
-      t.q.clear();
-      t.F[0].length = 0;
-      t.F[1].length = 0;
-      k.delete(t);
-      C.delete(t.t);
+      if (t.t.ie === t) t.t.ie = undefined;
+      t.M.clear();
+      t.q[0].length = 0;
+      t.q[1].length = 0;
+      C.delete(t);
+      k.delete(t.t);
     }
   }
 }
 function checkBoundaryChildren(e) {
-  for (const t of e.Z) {
+  for (const t of e.D) {
     t.checkSources?.();
     checkBoundaryChildren(t);
   }
 }
 function trackOptimisticStore(e) {
-  E.te.add(e);
+  A.K.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
-    e[t].B = x;
+    e[t].re = x;
   }
 }
-const E = new GlobalQueue();
+const A = new GlobalQueue();
 function flush() {
   while (v) {
-    E.flush();
+    A.flush();
   }
 }
 function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function transitionComplete(e) {
-  if (e.ce) return true;
-  if (e.le.length) return false;
+  if (e.ne) return true;
+  if (e.te.length) return false;
   let t = true;
-  for (let n = 0; n < e.ue.length; n++) {
-    const r = e.ue[n];
-    if (r.ge & l && r.oe?.t === r) {
+  for (let n = 0; n < e.$.length; n++) {
+    const r = e.$[n];
+    if (r.ae & l && r.Z?.t === r) {
       t = false;
       break;
     }
   }
-  t && (e.ce = true);
+  t && (e.ne = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.ce && typeof e.ce === "object") e = e.ce;
+  while (e.ne && typeof e.ne === "object") e = e.ne;
   return e;
 }
+function setActiveTransition(e) {
+  x = e;
+}
 function runInTransition(e, t) {
   const n = x;
   try {
@@ -539,195 +472,107 @@ function runInTransition(e, t) {
     x = n;
   }
 }
-function restoreTransition(e, t) {
-  E.initTransition(e);
-  const n = t();
-  flush();
-  return n;
+const k = new WeakMap();
+const C = new Set();
+function getOrCreateLane(e) {
+  let t = k.get(e);
+  if (t) {
+    return findLane(t);
+  }
+  const n = e.de;
+  const r = n?.ie ? findLane(n.ie) : null;
+  t = { t: e, M: new Set(), q: [[], []], T: null, re: x, pe: r };
+  k.set(e, t);
+  C.add(t);
+  e.he = e.ye || 0;
+  return t;
 }
-function action(e) {
-  return (...t) =>
-    new Promise((n, r) => {
-      const i = e(...t);
-      E.initTransition();
-      let s = x;
-      s.le.push(i);
-      const done = (e, t) => {
-        s = currentTransition(s);
-        const o = s.le.indexOf(i);
-        if (o >= 0) s.le.splice(o, 1);
-        x = s;
-        schedule();
-        t ? r(t) : n(e);
-      };
-      const step = (e, t) => {
-        let n;
-        try {
-          n = t ? i.throw(e) : i.next(e);
-        } catch (e) {
-          return done(undefined, e);
-        }
-        if (n instanceof Promise)
-          return void n.then(run, e => restoreTransition(s, () => step(e, true)));
-        run(n);
-      };
-      const run = e => {
-        if (e.done) return done(e.value);
-        if (e.value instanceof Promise)
-          return void e.value.then(
-            e => restoreTransition(s, () => step(e)),
-            e => restoreTransition(s, () => step(e, true))
-          );
-        restoreTransition(s, () => step(e.value));
-      };
-      step();
-    });
+function findLane(e) {
+  while (e.T) e = e.T;
+  return e;
 }
-GlobalQueue.ne = recompute;
-GlobalQueue.re = disposeChildren;
-let W = false;
-let j = false;
-let N = false;
-let L = false;
-let Q = false;
-let I = false;
-let H = null;
-function recompute(t, n = false) {
-  const i = t.ae;
-  if (!n) {
-    if (t.B && (!i || x) && x !== t.B) E.initTransition(t.B);
-    deleteFromHeap(t, t._ & o ? b : _);
-    if (t.B || i === h) disposeChildren(t);
-    else {
-      markDisposal(t);
-      t.we = t.Se;
-      t.me = t._e;
-      t.Se = null;
-      t._e = null;
-    }
-  }
-  const s = !!(t._ & f);
-  const u = hasActiveOverride(t);
-  const a = !!(t.ge & l);
-  const d = H;
-  H = t;
-  t.be = null;
-  t._ = r;
-  t.fe = O;
-  let p = t.J === y ? t.ye : t.J;
-  let g = t.u;
-  let w = W;
-  let S = A;
-  W = true;
-  if (s) {
-    const e = resolveLane(t);
-    if (e) setCurrentOptimisticLane(e);
-  }
-  try {
-    p = handleAsync(t, t.R(p));
-    clearStatus(t);
-    const e = resolveLane(t);
-    if (e) {
-      e.q.delete(t);
-      updatePendingSignal(e.t);
-    }
-  } catch (e) {
-    if (e instanceof NotReadyError && A) {
-      const e = findLane(A);
-      if (e.t !== t) {
-        e.q.add(t);
-        t.M = e;
-        updatePendingSignal(e.t);
-      }
-    }
-    notifyStatus(
-      t,
-      e instanceof NotReadyError ? l : c,
-      e,
-      undefined,
-      e instanceof NotReadyError ? t.M : undefined
-    );
-  } finally {
-    W = w;
-    t._ = e;
-    H = d;
-  }
-  if (!t.oe) {
-    const e = t.be;
-    let r = e !== null ? e.L : t.N;
-    if (r !== null) {
-      do {
-        r = unlinkSubs(r);
-      } while (r !== null);
-      if (e !== null) e.L = null;
-      else t.N = null;
+function mergeLanes(e, t) {
+  e = findLane(e);
+  t = findLane(t);
+  if (e === t) return e;
+  t.T = e;
+  for (const n of t.M) e.M.add(n);
+  e.q[0].push(...t.q[0]);
+  e.q[1].push(...t.q[1]);
+  return e;
+}
+function resolveLane(e) {
+  const t = e.ie;
+  if (!t) return undefined;
+  const n = findLane(t);
+  if (C.has(n)) return n;
+  e.ie = undefined;
+  return undefined;
+}
+function hasActiveOverride(e) {
+  return !!(e.ge && e.le !== y);
+}
+function assignOrMergeLane(e, t) {
+  const n = findLane(t);
+  const r = e.ie;
+  if (r) {
+    if (r.T) {
+      e.ie = t;
+      return;
     }
-    const f = u ? t.ye : t.J === y ? t.ye : t.J;
-    const l = !t.Oe || !t.Oe(f, p);
-    if (l) {
-      const e = u ? t.ye : undefined;
-      if (n || (i && x !== t.B) || s) t.ye = p;
-      else t.J = p;
-      if (u && !s && a) {
-        const e = t.K || 0;
-        const n = t.G || 0;
-        if (e <= n) t.ye = p;
-      }
-      if (!u || s || t.ye !== e) {
-        insertSubs(t, s || u);
-      }
-    } else if (u) {
-      t.J = p;
-    } else if (t.u != g) {
-      for (let e = t.P; e !== null; e = e.C) {
-        insertIntoHeapHeight(e.k, e.k._ & o ? b : _);
+    const i = findLane(r);
+    if (C.has(i)) {
+      if (i !== n && !hasActiveOverride(e)) {
+        if (n.pe && findLane(n.pe) === i) {
+          e.ie = t;
+        } else if (i.pe && findLane(i.pe) === n);
+        else mergeLanes(n, i);
       }
+      return;
     }
   }
-  setCurrentOptimisticLane(S);
-  (!n || t.ge & l) && !t.B && !(x && t.U) && E.$.push(t);
-  t.B && i && x !== t.B && runInTransition(t.B, () => recompute(t));
+  e.ie = t;
 }
 function handleAsync(e, t, r) {
   const i = typeof t === "object" && t !== null;
   const s = i && untrack(() => t[Symbol.asyncIterator]);
   const o = !s && i && untrack(() => typeof t.then === "function");
   if (!o && !s) {
-    e.xe = null;
+    e.we = null;
     return t;
   }
-  e.xe = t;
+  e.we = t;
   let u;
   const handleError = n => {
-    if (e.xe !== t) return;
-    E.initTransition(e.B);
+    if (e.we !== t) return;
+    A.initTransition(e.re);
     notifyStatus(e, n instanceof NotReadyError ? l : c, n);
-    e.fe = O;
+    e.ee = O;
   };
   const asyncWrite = (i, s) => {
-    if (e.xe !== t) return;
+    if (e.we !== t) return;
     if (e._ & (n | f)) return;
-    E.initTransition(e.B);
+    A.initTransition(e.re);
     clearStatus(e);
     const o = resolveLane(e);
-    if (o) o.q.delete(e);
+    if (o) o.M.delete(e);
     if (r) r(i);
-    else if (e.U) {
-      const t = e.J !== y;
-      if (e.R) e.J = i;
+    else if (e.ge) {
+      const t = e.le !== y;
+      if (e.R) e.le = i;
       if (!t) {
-        e.ye = i;
+        e.ce = i;
         insertSubs(e);
       }
-      e.fe = O;
+      e.ee = O;
     } else if (o) {
-      const t = e.ye;
-      const n = e.Oe;
+      const t = e.ce;
+      const n = e.Se;
       if (!n || !n(i, t)) {
-        e.ye = i;
-        e.fe = O;
-        if (e.ve) {
-          setSignal(e.ve, i);
+        e.ce = i;
+        e.ee = O;
+        if (e.me) {
+          setSignal(e.me, i);
         }
         insertSubs(e, true);
       }
@@ -754,8 +599,8 @@ function handleAsync(e, t, r) {
     );
     r = false;
     if (!n) {
-      E.initTransition(e.B);
-      throw new NotReadyError(H);
+      A.initTransition(e.re);
+      throw new NotReadyError(Q);
     }
   }
   if (s) {
@@ -786,27 +631,27 @@ function handleAsync(e, t, r) {
     };
     const i = iterate();
     if (!r && !i) {
-      E.initTransition(e.B);
-      throw new NotReadyError(H);
+      A.initTransition(e.re);
+      throw new NotReadyError(Q);
     }
   }
   return u;
 }
 function clearStatus(e) {
-  e.ge = e.ge & a;
-  e.oe = null;
+  e.ae = e.ae & a;
+  e.Z = null;
   updatePendingSignal(e);
-  e.Pe?.();
+  e._e?.();
 }
 function notifyStatus(e, t, n, r, i) {
   if (t === c && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
   const s = n instanceof NotReadyError && n.t === e;
-  const o = t === l && e.U && !s;
+  const o = t === l && e.ge && !s;
   const u = o && hasActiveOverride(e);
   if (!r) {
-    e.ge = t | (t !== c ? e.ge & a : 0);
-    e.oe = n;
+    e.ae = t | (t !== c ? e.ae & a : 0);
+    e.Z = n;
     updatePendingSignal(e);
   }
   if (i && !r) {
@@ -814,68 +659,249 @@ function notifyStatus(e, t, n, r, i) {
   }
   if (u && x && n instanceof NotReadyError) {
     const e = n.t;
-    if (!x.ue.includes(e)) {
-      x.ue.push(e);
+    if (!x.$.includes(e)) {
+      x.$.push(e);
     }
   }
   const f = r || u;
   const d = r || o ? undefined : i;
-  if (e.Pe) {
+  if (e._e) {
     if (f) {
-      e.Pe(t, n);
+      e._e(t, n);
     } else {
-      e.Pe();
+      e._e();
     }
     return;
   }
-  for (let r = e.P; r !== null; r = r.C) {
-    r.k.fe = O;
-    if (r.k.oe !== n) {
-      !r.k.B && E.$.push(r.k);
+  for (let r = e.P; r !== null; r = r.A) {
+    r.k.ee = O;
+    if (r.k.Z !== n) {
+      !r.k.re && A.B.push(r.k);
       notifyStatus(r.k, t, n, f, d);
     }
   }
-  for (let r = e.A; r !== null; r = r.W) {
-    for (let e = r.P; e !== null; e = e.C) {
-      e.k.fe = O;
-      if (e.k.oe !== n) {
-        !e.k.B && E.$.push(e.k);
+  for (let r = e.C; r !== null; r = r.W) {
+    for (let e = r.P; e !== null; e = e.A) {
+      e.k.ee = O;
+      if (e.k.Z !== n) {
+        !e.k.re && A.B.push(e.k);
         notifyStatus(e.k, t, n, f, d);
       }
     }
   }
 }
-function updateIfNecessary(r) {
-  if (r._ & t) {
-    for (let e = r.N; e; e = e.L) {
-      const t = e.I;
-      const i = t.H || t;
-      if (i.R) {
-        updateIfNecessary(i);
+function effect(e, t, n, r, i) {
+  let s = false;
+  const o = computed(i?.render ? t => staleValues(() => e(t)) : e, r, {
+    ...i,
+    equals: () => {
+      o.oe = !o.Z;
+      if (s) o.ue.enqueue(o.se, runEffect.bind(o));
+      return false;
+    },
+    lazy: true
+  });
+  o.be = r;
+  o.Oe = t;
+  o.xe = n;
+  o.ve = undefined;
+  o.se = i?.render ? d : p;
+  o._e = (e, t) => {
+    const n = e !== undefined ? e : o.ae;
+    const r = t !== undefined ? t : o.Z;
+    if (n & c) {
+      let e = r;
+      o.ue.notify(o, l, 0);
+      if (o.se === p) {
+        try {
+          return o.xe
+            ? o.xe(e, () => {
+                o.ve?.();
+                o.ve = undefined;
+              })
+            : console.error(e);
+        } catch (t) {
+          e = t;
+        }
       }
-      if (r._ & n) {
-        break;
+      if (!o.ue.notify(o, c, c)) throw e;
+    } else if (o.se === d) o.ue.notify(o, l | c, n, r);
+  };
+  recompute(o, true);
+  !i?.defer && (o.se === p ? o.ue.enqueue(o.se, runEffect.bind(o)) : runEffect.call(o));
+  s = true;
+  onCleanup(() => o.ve?.());
+}
+function runEffect() {
+  if (!this.oe || this._ & u) return;
+  this.ve?.();
+  this.ve = undefined;
+  try {
+    this.ve = this.Oe(this.ce, this.be);
+  } catch (e) {
+    if (!this.ue.notify(this, c, c)) throw e;
+  } finally {
+    this.be = this.ce;
+    this.oe = false;
+  }
+}
+function trackedEffect(e, t) {
+  const run = () => {
+    if (!n.oe || n._ & u) return;
+    n.oe = false;
+    recompute(n);
+  };
+  const n = computed(
+    () => {
+      try {
+        n.ve?.();
+        n.ve = undefined;
+        n.ve = staleValues(e) || undefined;
+      } finally {
       }
+    },
+    undefined,
+    { ...t, lazy: true, pureWrite: true }
+  );
+  n.ve = undefined;
+  n.oe = true;
+  n.se = h;
+  n.fe = run;
+  n.ue.enqueue(p, run);
+  onCleanup(() => n.ve?.());
+}
+const W = {};
+function markDisposal(e) {
+  let t = e.Pe;
+  while (t) {
+    t._ |= o;
+    if (t._ & i) {
+      deleteFromHeap(t, _);
+      insertIntoHeap(t, b);
     }
+    markDisposal(t);
+    t = t.Ae;
   }
-  if (r._ & (n | f) || (r.oe && r.fe < O)) {
-    recompute(r);
+}
+function dispose(e) {
+  let t = e.N || null;
+  do {
+    t = unlinkSubs(t);
+  } while (t !== null);
+  e.N = null;
+  e.ke = null;
+  disposeChildren(e, true);
+}
+function disposeChildren(e, t = false, n) {
+  if (e._ & u) return;
+  if (t) e._ = u;
+  let r = n ? e.Ce : e.Pe;
+  while (r) {
+    const e = r.Ae;
+    if (r.N) {
+      const e = r;
+      deleteFromHeap(e, e._ & o ? b : _);
+      let t = e.N;
+      do {
+        t = unlinkSubs(t);
+      } while (t !== null);
+      e.N = null;
+      e.ke = null;
+    }
+    disposeChildren(r, true);
+    r = e;
   }
-  r._ = e;
+  if (n) {
+    e.Ce = null;
+  } else {
+    e.Pe = null;
+    e.Ae = null;
+  }
+  runDisposal(e, n);
+}
+function runDisposal(e, t) {
+  let n = t ? e.We : e.Ee;
+  if (!n) return;
+  if (Array.isArray(n)) {
+    for (let e = 0; e < n.length; e++) {
+      const t = n[e];
+      t.call(t);
+    }
+  } else {
+    n.call(n);
+  }
+  t ? (e.We = null) : (e.Ee = null);
+}
+function getNextChildId(e) {
+  if (e.id != null) return formatId(e.id, e.je++);
+  throw new Error("Cannot get child id from owner without an id");
+}
+function formatId(e, t) {
+  const n = t.toString(36),
+    r = n.length - 1;
+  return e + (r ? String.fromCharCode(64 + r) : "") + n;
+}
+function getObserver() {
+  if (L || H) return W;
+  return E ? Q : null;
+}
+function getOwner() {
+  return Q;
+}
+function onCleanup(e) {
+  if (!Q) return e;
+  if (!Q.Ee) Q.Ee = e;
+  else if (Array.isArray(Q.Ee)) Q.Ee.push(e);
+  else Q.Ee = [Q.Ee, e];
+  return e;
+}
+function createOwner(e) {
+  const t = Q;
+  const n = {
+    id: e?.id ?? (t?.id != null ? getNextChildId(t) : undefined),
+    i: true,
+    l: t?.i ? t.l : t,
+    Pe: null,
+    Ae: null,
+    Ee: null,
+    ue: t?.ue ?? A,
+    Ne: t?.Ne || w,
+    je: 0,
+    We: null,
+    Ce: null,
+    o: t,
+    dispose(e = true) {
+      disposeChildren(n, e);
+    }
+  };
+  if (t) {
+    const e = t.Pe;
+    if (e === null) {
+      t.Pe = n;
+    } else {
+      n.Ae = e;
+      t.Pe = n;
+    }
+  }
+  return n;
+}
+function createRoot(e, t) {
+  const n = createOwner(t);
+  return runWithOwner(n, () => e(n.dispose));
 }
 function unlinkSubs(e) {
   const t = e.I;
   const n = e.L;
-  const r = e.C;
-  const i = e.Ce;
-  if (r !== null) r.Ce = i;
-  else t.ke = i;
-  if (i !== null) i.C = r;
+  const r = e.A;
+  const i = e.Le;
+  if (r !== null) r.Le = i;
+  else t.Ie = i;
+  if (i !== null) i.A = r;
   else {
     t.P = r;
     if (r === null) {
-      t.Ae?.();
-      t.R && !t.Ee && unobserved(t);
+      t.He?.();
+      t.R && !t.Qe && unobserved(t);
     }
   }
   return n;
@@ -890,27 +916,27 @@ function unobserved(e) {
   disposeChildren(e, true);
 }
 function link(e, t) {
-  const n = t.be;
+  const n = t.ke;
   if (n !== null && n.I === e) return;
   let i = null;
   const s = t._ & r;
   if (s) {
     i = n !== null ? n.L : t.N;
     if (i !== null && i.I === e) {
-      t.be = i;
+      t.ke = i;
       return;
     }
   }
-  const o = e.ke;
+  const o = e.Ie;
   if (o !== null && o.k === t && (!s || isValidLink(o, t))) return;
-  const u = (t.be = e.ke = { I: e, k: t, L: i, Ce: o, C: null });
+  const u = (t.ke = e.Ie = { I: e, k: t, L: i, Le: o, A: null });
   if (n !== null) n.L = u;
   else t.N = u;
-  if (o !== null) o.C = u;
+  if (o !== null) o.A = u;
   else e.P = u;
 }
 function isValidLink(e, t) {
-  const n = t.be;
+  const n = t.ke;
   if (n !== null) {
     let r = t.N;
     do {
@@ -921,117 +947,171 @@ function isValidLink(e, t) {
   }
   return false;
 }
-function markDisposal(e) {
-  let t = e._e;
-  while (t) {
-    t._ |= o;
-    if (t._ & i) {
-      deleteFromHeap(t, _);
-      insertIntoHeap(t, b);
+GlobalQueue.U = recompute;
+GlobalQueue.J = disposeChildren;
+let E = false;
+let j = false;
+let N = false;
+let L = false;
+let I = false;
+let H = false;
+let Q = null;
+let R = null;
+function recompute(t, n = false) {
+  const i = t.se;
+  if (!n) {
+    if (t.re && (!i || x) && x !== t.re) A.initTransition(t.re);
+    deleteFromHeap(t, t._ & o ? b : _);
+    if (t.re || i === h) disposeChildren(t);
+    else {
+      markDisposal(t);
+      t.We = t.Ee;
+      t.Ce = t.Pe;
+      t.Ee = null;
+      t.Pe = null;
     }
-    markDisposal(t);
-    t = t.We;
   }
-}
-function dispose(e) {
-  let t = e.N || null;
-  do {
-    t = unlinkSubs(t);
-  } while (t !== null);
-  e.N = null;
-  e.be = null;
-  disposeChildren(e, true);
-}
-function disposeChildren(e, t = false, n) {
-  if (e._ & u) return;
-  if (t) e._ = u;
-  let r = n ? e.me : e._e;
-  while (r) {
-    const e = r.We;
-    if (r.N) {
-      const e = r;
-      deleteFromHeap(e, e._ & o ? b : _);
-      let t = e.N;
-      do {
-        t = unlinkSubs(t);
-      } while (t !== null);
-      e.N = null;
-      e.be = null;
+  const s = !!(t._ & f);
+  const u = hasActiveOverride(t);
+  const a = !!(t.ae & l);
+  const d = Q;
+  Q = t;
+  t.ke = null;
+  t._ = r;
+  t.ee = O;
+  let p = t.le === y ? t.ce : t.le;
+  let g = t.u;
+  let w = E;
+  let S = R;
+  E = true;
+  if (s) {
+    const e = resolveLane(t);
+    if (e) R = e;
+  }
+  try {
+    p = handleAsync(t, t.R(p));
+    clearStatus(t);
+    const e = resolveLane(t);
+    if (e) {
+      e.M.delete(t);
+      updatePendingSignal(e.t);
     }
-    disposeChildren(r, true);
-    r = e;
+  } catch (e) {
+    if (e instanceof NotReadyError && R) {
+      const e = findLane(R);
+      if (e.t !== t) {
+        e.M.add(t);
+        t.ie = e;
+        updatePendingSignal(e.t);
+      }
+    }
+    notifyStatus(
+      t,
+      e instanceof NotReadyError ? l : c,
+      e,
+      undefined,
+      e instanceof NotReadyError ? t.ie : undefined
+    );
+  } finally {
+    E = w;
+    t._ = e;
+    Q = d;
   }
-  if (n) {
-    e.me = null;
-  } else {
-    e._e = null;
-    e.We = null;
+  if (!t.Z) {
+    const e = t.ke;
+    let r = e !== null ? e.L : t.N;
+    if (r !== null) {
+      do {
+        r = unlinkSubs(r);
+      } while (r !== null);
+      if (e !== null) e.L = null;
+      else t.N = null;
+    }
+    const f = u ? t.ce : t.le === y ? t.ce : t.le;
+    const l = !t.Se || !t.Se(f, p);
+    if (l) {
+      const e = u ? t.ce : undefined;
+      if (n || (i && x !== t.re) || s) t.ce = p;
+      else t.le = p;
+      if (u && !s && a) {
+        const e = t.ye || 0;
+        const n = t.he || 0;
+        if (e <= n) t.ce = p;
+      }
+      if (!u || s || t.ce !== e) {
+        insertSubs(t, s || u);
+      }
+    } else if (u) {
+      t.le = p;
+    } else if (t.u != g) {
+      for (let e = t.P; e !== null; e = e.A) {
+        insertIntoHeapHeight(e.k, e.k._ & o ? b : _);
+      }
+    }
   }
-  runDisposal(e, n);
+  R = S;
+  (!n || t.ae & l) && !t.re && !(x && t.ge) && A.B.push(t);
+  t.re && i && x !== t.re && runInTransition(t.re, () => recompute(t));
 }
-function runDisposal(e, t) {
-  let n = t ? e.we : e.Se;
-  if (!n) return;
-  if (Array.isArray(n)) {
-    for (let e = 0; e < n.length; e++) {
-      const t = n[e];
-      t.call(t);
+function updateIfNecessary(r) {
+  if (r._ & t) {
+    for (let e = r.N; e; e = e.L) {
+      const t = e.I;
+      const i = t.H || t;
+      if (i.R) {
+        updateIfNecessary(i);
+      }
+      if (r._ & n) {
+        break;
+      }
     }
-  } else {
-    n.call(n);
   }
-  t ? (e.we = null) : (e.Se = null);
-}
-function getNextChildId(e) {
-  if (e.id != null) return formatId(e.id, e.je++);
-  throw new Error("Cannot get child id from owner without an id");
-}
-function formatId(e, t) {
-  const n = t.toString(36),
-    r = n.length - 1;
-  return e + (r ? String.fromCharCode(64 + r) : "") + n;
+  if (r._ & (n | f) || (r.Z && r.ee < O)) {
+    recompute(r);
+  }
+  r._ = e;
 }
 function computed(t, n, r) {
   const i = {
-    id: r?.id ?? (H?.id != null ? getNextChildId(H) : undefined),
-    Oe: r?.equals != null ? r.equals : isEqual,
-    Ne: !!r?.pureWrite,
-    Ae: r?.unobserved,
-    Se: null,
-    pe: H?.pe ?? E,
-    Le: H?.Le ?? w,
+    id: r?.id ?? (Q?.id != null ? getNextChildId(Q) : undefined),
+    Se: r?.equals != null ? r.equals : isEqual,
+    Re: !!r?.pureWrite,
+    He: r?.unobserved,
+    Ee: null,
+    ue: Q?.ue ?? A,
+    Ne: Q?.Ne ?? w,
     je: 0,
     R: t,
-    ye: n,
+    ce: n,
     u: 0,
-    A: null,
+    C: null,
     S: undefined,
     h: null,
     N: null,
-    be: null,
-    P: null,
     ke: null,
-    o: H,
-    We: null,
-    _e: null,
+    P: null,
+    Ie: null,
+    o: Q,
+    Ae: null,
+    Pe: null,
     _: e,
-    ge: a,
-    fe: O,
-    J: y,
+    ae: a,
+    ee: O,
+    le: y,
+    We: null,
+    Ce: null,
     we: null,
-    me: null,
-    xe: null,
-    B: null
+    re: null
   };
   i.h = i;
-  const s = H?.i ? H.l : H;
-  if (H) {
-    const e = H._e;
+  const s = Q?.i ? Q.l : Q;
+  if (Q) {
+    const e = Q.Pe;
     if (e === null) {
-      H._e = i;
+      Q.Pe = i;
     } else {
-      i.We = e;
-      H._e = i;
+      i.Ae = e;
+      Q.Pe = i;
     }
   }
   if (s) i.u = s.u + 1;
@@ -1040,112 +1120,55 @@ function computed(t, n, r) {
 }
 function signal(e, t, n = null) {
   const r = {
-    Oe: t?.equals != null ? t.equals : isEqual,
-    Ne: !!t?.pureWrite,
-    Ae: t?.unobserved,
-    ye: e,
+    Se: t?.equals != null ? t.equals : isEqual,
+    Re: !!t?.pureWrite,
+    He: t?.unobserved,
+    ce: e,
     P: null,
-    ke: null,
-    fe: O,
+    Ie: null,
+    ee: O,
     H: n,
-    W: n?.A || null,
-    J: y
+    W: n?.C || null,
+    le: y
   };
-  n && (n.A = r);
+  n && (n.C = r);
   return r;
 }
 function optimisticSignal(e, t) {
   const n = signal(e, t);
-  n.U = true;
+  n.ge = true;
   return n;
 }
 function optimisticComputed(e, t, n) {
   const r = computed(e, t, n);
-  r.U = true;
+  r.ge = true;
   return r;
 }
-function getPendingSignal(e) {
-  if (!e.Qe) {
-    e.Qe = optimisticSignal(false, { pureWrite: true });
-    if (e.T) {
-      e.Qe.T = e;
-    }
-    if (computePendingState(e)) setSignal(e.Qe, true);
-  }
-  return e.Qe;
-}
-function computePendingState(e) {
-  const t = e;
-  if (e.U && e.J !== y) {
-    if (t.ge & l && !(t.ge & a)) return true;
-    if (e.T) {
-      const t = e.M ? findLane(e.M) : null;
-      return !!(t && t.q.size > 0);
-    }
-    return true;
-  }
-  if (e.J !== y && !(t.ge & a)) return true;
-  return !!(t.ge & l && !(t.ge & a));
-}
-function getPendingValueComputed(e) {
-  if (!e.ve) {
-    const t = I;
-    I = false;
-    const n = L;
-    L = false;
-    const r = H;
-    H = null;
-    e.ve = optimisticComputed(() => read(e));
-    e.ve.T = e;
-    H = r;
-    L = n;
-    I = t;
-  }
-  return e.ve;
-}
-function updatePendingSignal(e) {
-  if (e.Qe) {
-    const t = computePendingState(e);
-    const n = e.Qe;
-    setSignal(n, t);
-    if (!t && n.M) {
-      const t = resolveLane(e);
-      if (t && t.q.size > 0) {
-        const e = findLane(n.M);
-        if (e !== t) {
-          mergeLanes(t, e);
-        }
-      }
-      clearLaneEntry(n);
-      n.M = undefined;
-    }
-  }
-}
 function isEqual(e, t) {
   return e === t;
 }
 function untrack(e) {
-  if (!W) return e();
-  W = false;
+  if (!E) return e();
+  E = false;
   try {
     return e();
   } finally {
-    W = true;
+    E = true;
   }
 }
 function read(e) {
-  if (I) {
+  if (H) {
     const t = getPendingValueComputed(e);
-    const n = I;
-    I = false;
+    const n = H;
+    H = false;
     const r = read(t);
-    I = n;
-    if (t.ge & l) return e.ye;
-    if (j && A && t.M) {
-      const n = findLane(t.M);
-      const r = findLane(A);
-      if (n !== r && n.q.size > 0) {
-        return e.ye;
+    H = n;
+    if (t.ae & l) return e.ce;
+    if (j && R && t.ie) {
+      const n = findLane(t.ie);
+      const r = findLane(R);
+      if (n !== r && n.M.size > 0) {
+        return e.ce;
       }
     }
     return r;
@@ -1156,15 +1179,15 @@ function read(e) {
     const r = L;
     L = false;
     if (read(n)) {
-      Q = true;
+      I = true;
     }
     L = r;
-    return e.ye;
+    return e.ce;
   }
-  let t = H;
+  let t = Q;
   if (t?.i) t = t.l;
   if (N && e.R) recompute(e);
-  if (t && W) {
+  if (t && E) {
     if (e.R && e._ & u) recompute(e);
     link(e, t);
     const n = e.H || e;
@@ -1182,128 +1205,136 @@ function read(e) {
     }
   }
   const n = e.H || e;
-  if (t && n.ge & l && !(j && n.B && x !== n.B)) {
-    if (A) {
-      const r = n.M;
-      const i = findLane(A);
+  if (t && n.ae & l && !(j && n.re && x !== n.re)) {
+    if (R) {
+      const r = n.ie;
+      const i = findLane(R);
       if (r && findLane(r) === i && !hasActiveOverride(n)) {
-        if (!W) link(e, t);
-        throw n.oe;
+        if (!E) link(e, t);
+        throw n.Z;
       }
     } else {
-      if (!W) link(e, t);
-      throw n.oe;
+      if (!E) link(e, t);
+      throw n.Z;
     }
   }
-  if (e.R && e.ge & c) {
-    if (e.fe < O) {
+  if (e.R && e.ae & c) {
+    if (e.ee < O) {
       recompute(e, true);
       return read(e);
-    } else throw e.oe;
+    } else throw e.Z;
   }
-  return !t || A !== null || e.J === y || (j && e.B && x !== e.B) ? e.ye : e.J;
+  return !t || R !== null || e.le === y || (j && e.re && x !== e.re) ? e.ce : e.le;
 }
 function setSignal(e, t) {
-  if (e.B && x !== e.B) E.initTransition(e.B);
-  const n = e.U && !P;
-  const r = n ? e.ye : e.J === y ? e.ye : e.J;
+  if (e.re && x !== e.re) A.initTransition(e.re);
+  const n = e.ge && !P;
+  const r = n ? e.ce : e.le === y ? e.ce : e.le;
   if (typeof t === "function") t = t(r);
-  const i = !e.Oe || !e.Oe(r, t);
+  const i = !e.Se || !e.Se(r, t);
   if (!i) {
-    if (n && e.J !== y && e.R) {
+    if (n && e.le !== y && e.R) {
       insertSubs(e, true);
       schedule();
     }
     return t;
   }
   if (n) {
-    const n = E.ee.includes(e);
-    if (e.B && n) {
-      E.initTransition(e.B);
+    const n = A.G.includes(e);
+    if (e.re && n) {
+      A.initTransition(e.re);
     }
-    if (e.J === y) {
-      e.J = e.ye;
+    if (e.le === y) {
+      e.le = e.ce;
     }
     if (!n) {
-      E.ee.push(e);
+      A.G.push(e);
     }
-    e.K = (e.K || 0) + 1;
+    e.ye = (e.ye || 0) + 1;
     const r = getOrCreateLane(e);
-    e.M = r;
-    e.ye = t;
+    e.ie = r;
+    e.ce = t;
   } else {
-    if (e.J === y) E.$.push(e);
-    e.J = t;
+    if (e.le === y) A.B.push(e);
+    e.le = t;
   }
   updatePendingSignal(e);
-  if (e.ve) {
-    setSignal(e.ve, t);
+  if (e.me) {
+    setSignal(e.me, t);
   }
-  e.fe = O;
+  e.ee = O;
   insertSubs(e, n);
   schedule();
   return t;
 }
-const R = {};
-function getObserver() {
-  if (L || I) return R;
-  return W ? H : null;
-}
-function getOwner() {
-  return H;
-}
-function onCleanup(e) {
-  if (!H) return e;
-  if (!H.Se) H.Se = e;
-  else if (Array.isArray(H.Se)) H.Se.push(e);
-  else H.Se = [H.Se, e];
-  return e;
+function runWithOwner(e, t) {
+  const n = Q;
+  const r = E;
+  Q = e;
+  E = false;
+  try {
+    return t();
+  } finally {
+    Q = n;
+    E = r;
+  }
 }
-function createOwner(e) {
-  const t = H;
-  const n = {
-    id: e?.id ?? (t?.id != null ? getNextChildId(t) : undefined),
-    i: true,
-    l: t?.i ? t.l : t,
-    _e: null,
-    We: null,
-    Se: null,
-    pe: t?.pe ?? E,
-    Le: t?.Le || w,
-    je: 0,
-    we: null,
-    me: null,
-    o: t,
-    dispose(e = true) {
-      disposeChildren(n, e);
+function getPendingSignal(e) {
+  if (!e.Te) {
+    e.Te = optimisticSignal(false, { pureWrite: true });
+    if (e.de) {
+      e.Te.de = e;
     }
-  };
-  if (t) {
-    const e = t._e;
-    if (e === null) {
-      t._e = n;
-    } else {
-      n.We = e;
-      t._e = n;
+    if (computePendingState(e)) setSignal(e.Te, true);
+  }
+  return e.Te;
+}
+function computePendingState(e) {
+  const t = e;
+  if (e.ge && e.le !== y) {
+    if (t.ae & l && !(t.ae & a)) return true;
+    if (e.de) {
+      const t = e.ie ? findLane(e.ie) : null;
+      return !!(t && t.M.size > 0);
     }
+    return true;
   }
-  return n;
+  if (e.le !== y && !(t.ae & a)) return true;
+  return !!(t.ae & l && !(t.ae & a));
 }
-function createRoot(e, t) {
-  const n = createOwner(t);
-  return runWithOwner(n, () => e(n.dispose));
+function updatePendingSignal(e) {
+  if (e.Te) {
+    const t = computePendingState(e);
+    const n = e.Te;
+    setSignal(n, t);
+    if (!t && n.ie) {
+      const t = resolveLane(e);
+      if (t && t.M.size > 0) {
+        const e = findLane(n.ie);
+        if (e !== t) {
+          mergeLanes(t, e);
+        }
+      }
+      k.delete(n);
+      n.ie = undefined;
+    }
+  }
 }
-function runWithOwner(e, t) {
-  const n = H;
-  const r = W;
-  H = e;
-  W = false;
-  try {
-    return t();
-  } finally {
-    H = n;
-    W = r;
+function getPendingValueComputed(e) {
+  if (!e.me) {
+    const t = H;
+    H = false;
+    const n = L;
+    L = false;
+    const r = Q;
+    Q = null;
+    e.me = optimisticComputed(() => read(e));
+    e.me.de = e;
+    Q = r;
+    L = n;
+    H = t;
   }
+  return e.me;
 }
 function staleValues(e, t = true) {
   const n = j;
@@ -1315,27 +1346,27 @@ function staleValues(e, t = true) {
   }
 }
 function pending(e) {
-  const t = I;
-  I = true;
+  const t = H;
+  H = true;
   try {
     return e();
   } finally {
-    I = t;
+    H = t;
   }
 }
 function isPending(e) {
   const t = L;
-  const n = Q;
+  const n = I;
   L = true;
-  Q = false;
+  I = false;
   try {
     e();
-    return Q;
+    return I;
   } catch {
-    return Q;
+    return I;
   } finally {
     L = t;
-    Q = n;
+    I = n;
   }
 }
 function refresh(e) {
@@ -1364,7 +1395,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.Ne[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1374,93 +1405,57 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.Le = { ...n.Le, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.Ne = { ...n.Ne, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.Le[e.id]);
+  return !isUndefined(t?.Ne[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,
-    equals: () => {
-      o.de = !o.oe;
-      if (s) o.pe.enqueue(o.ae, runEffect.bind(o));
-      return false;
-    },
-    lazy: true
-  });
-  o.Ie = r;
-  o.He = t;
-  o.Re = n;
-  o.Te = undefined;
-  o.ae = i?.render ? d : p;
-  o.Pe = (e, t) => {
-    const n = e !== undefined ? e : o.ge;
-    const r = t !== undefined ? t : o.oe;
-    if (n & c) {
-      let e = r;
-      o.pe.notify(o, l, 0);
-      if (o.ae === p) {
+function restoreTransition(e, t) {
+  A.initTransition(e);
+  const n = t();
+  flush();
+  return n;
+}
+function action(e) {
+  return (...t) =>
+    new Promise((n, r) => {
+      const i = e(...t);
+      A.initTransition();
+      let s = x;
+      s.te.push(i);
+      const done = (e, t) => {
+        s = currentTransition(s);
+        const o = s.te.indexOf(i);
+        if (o >= 0) s.te.splice(o, 1);
+        setActiveTransition(s);
+        schedule();
+        t ? r(t) : n(e);
+      };
+      const step = (e, t) => {
+        let n;
         try {
-          return o.Re
-            ? o.Re(e, () => {
-                o.Te?.();
-                o.Te = undefined;
-              })
-            : console.error(e);
-        } catch (t) {
-          e = t;
+          n = t ? i.throw(e) : i.next(e);
+        } catch (e) {
+          return done(undefined, e);
         }
-      }
-      if (!o.pe.notify(o, c, c)) throw e;
-    } else if (o.ae === d) o.pe.notify(o, l | c, n, r);
-  };
-  recompute(o, true);
-  !i?.defer && (o.ae === p ? o.pe.enqueue(o.ae, runEffect.bind(o)) : runEffect.call(o));
-  s = true;
-  onCleanup(() => o.Te?.());
-}
-function runEffect() {
-  if (!this.de || this._ & u) return;
-  this.Te?.();
-  this.Te = undefined;
-  try {
-    this.Te = this.He(this.ye, this.Ie);
-  } catch (e) {
-    if (!this.pe.notify(this, c, c)) throw e;
-  } finally {
-    this.Ie = this.ye;
-    this.de = false;
-  }
-}
-function trackedEffect(e, t) {
-  const run = () => {
-    if (!n.de || n._ & u) return;
-    n.de = false;
-    recompute(n);
-  };
-  const n = computed(
-    () => {
-      try {
-        n.Te?.();
-        n.Te = undefined;
-        n.Te = staleValues(e) || undefined;
-      } finally {
-      }
-    },
-    undefined,
-    { ...t, lazy: true, pureWrite: true }
-  );
-  n.Te = undefined;
-  n.de = true;
-  n.ae = h;
-  n.he = run;
-  n.pe.enqueue(p, run);
-  onCleanup(() => n.Te?.());
+        if (n instanceof Promise)
+          return void n.then(run, e => restoreTransition(s, () => step(e, true)));
+        run(n);
+      };
+      const run = e => {
+        if (e.done) return done(e.value);
+        if (e.value instanceof Promise)
+          return void e.value.then(
+            e => restoreTransition(s, () => step(e)),
+            e => restoreTransition(s, () => step(e, true))
+          );
+        restoreTransition(s, () => step(e.value));
+      };
+      step();
+    });
 }
 function createSignal(e, t, n) {
   if (typeof e === "function") {
@@ -1525,7 +1520,7 @@ function createOptimistic(e, t, n) {
 function onSettled(e) {
   getOwner()
     ? createTrackedEffect(() => untrack(e))
-    : E.enqueue(p, () => {
+    : A.enqueue(p, () => {
         const t = e();
         t?.();
       });
@@ -1637,7 +1632,7 @@ function applyState(e, t, n, r) {
       const d = unwrap(getOverrideValue(s, o, u, c));
       let p = unwrap(e[c]);
       if (d === p) continue;
-      if (!d || !isWrappable(d) || (n(d) != null && n(d) !== n(p))) {
+      if (!d || !isWrappable(d) || !isWrappable(p) || (n(d) != null && n(d) !== n(p))) {
         t && setSignal(t, void 0);
         a && setSignal(a, isWrappable(p) ? wrap(p, i) : p);
       } else applyState(p, wrap(d, i), n, r);
@@ -1692,7 +1687,7 @@ function createProjectionInternal(e, t = {}, n) {
       i !== r && i !== undefined && reconcile(i, n?.key || "id", n?.all)(s);
     });
   });
-  r.Ee = true;
+  r.Qe = true;
   return { store: s, node: r };
 }
 function createProjection(e, t = {}, n) {
@@ -1738,8 +1733,8 @@ const M = Symbol(0),
   q = Symbol(0),
   F = Symbol(0),
   V = Symbol(0),
-  B = Symbol(0);
-const D = new WeakMap();
+  D = Symbol(0);
+const B = new WeakMap();
 const G = "v",
   K = "o",
   z = "x",
@@ -1792,7 +1787,7 @@ function getNode(e, t, n, r, i = isEqual, s) {
     },
     r
   );
-  if (s) o.U = true;
+  if (s) o.ge = true;
   return (e[t] = o);
 }
 function trackSelf(e, t = M) {
@@ -1804,7 +1799,7 @@ function getKeys(e, t, n = true) {
   const i = new Set(r);
   const s = Reflect.ownKeys(t);
   for (const e of s) {
-    if (t[e] !== B) i.add(e);
+    if (t[e] !== D) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
@@ -1812,7 +1807,7 @@ function getKeys(e, t, n = true) {
 function getPropertyDescriptor(e, t, n) {
   let r = e;
   if (t && n in t) {
-    if (r[n] === B) return void 0;
+    if (r[n] === D) return void 0;
     if (!(n in r)) r = t;
   }
   return Reflect.getOwnPropertyDescriptor(r, n);
@@ -1838,15 +1833,15 @@ const re = {
       if (e && e.get) return e.get.call(n);
     }
     if (writeOnly(n)) {
-      let n = i && (o || !u) ? (i.J !== y ? (i.U ? i.ye : i.J) : i.ye) : f[t];
-      n === B && (n = undefined);
+      let n = i && (o || !u) ? (i.le !== y ? (i.ge ? i.ce : i.le) : i.ce) : f[t];
+      n === D && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
       ne?.add(r);
       return r;
     }
     let l = i ? (o || !u ? read(r[t]) : (read(r[t]), f[t])) : f[t];
-    l === B && (l = undefined);
+    l === D && (l = undefined);
     if (!i) {
       if (!o && typeof l === "function" && !f.hasOwnProperty(t)) {
         let t;
@@ -1861,7 +1856,7 @@ const re = {
   },
   has(e, t) {
     if (t === V || t === M || t === "__proto__") return true;
-    const n = e[z] && t in e[z] ? e[z][t] !== B : e[K] && t in e[K] ? e[K][t] !== B : t in e[G];
+    const n = e[z] && t in e[z] ? e[z][t] !== D : e[K] && t in e[K] ? e[K][t] !== D : t in e[G];
     getObserver() && read(getNode(getNodes(e, J), t, n, e[Z], isEqual, e[$]));
     return n;
   },
@@ -1870,8 +1865,8 @@ const re = {
     if (writeOnly(r)) {
       if (e[$]) {
         const t = e[Z];
-        if (t?.B) {
-          E.initTransition(t.B);
+        if (t?.re) {
+          A.initTransition(t.re);
         }
       }
       untrack(() => {
@@ -1888,8 +1883,8 @@ const re = {
         else (e[u] || (e[u] = Object.create(null)))[t] = l;
         const a = isWrappable(l);
         if (isWrappable(f)) {
-          const e = D.get(f);
-          e && (e instanceof Set ? e.delete(r) : D.delete(f));
+          const e = B.get(f);
+          e && (e instanceof Set ? e.delete(r) : B.delete(f));
         }
         if (recursivelyNotify(r, ee) && a) recursivelyAddParent(l, r);
         e[J]?.[t] && setSignal(e[J][t], true);
@@ -1909,8 +1904,8 @@ const re = {
     return true;
   },
   deleteProperty(e, t) {
-    const n = e[z]?.[t] === B;
-    const r = e[K]?.[t] === B;
+    const n = e[z]?.[t] === D;
+    const r = e[K]?.[t] === D;
     if (writeOnly(e[V]) && !n && !r) {
       untrack(() => {
         const n = e[$] && !P;
@@ -1918,13 +1913,13 @@ const re = {
         if (n) trackOptimisticStore(e[V]);
         const i = e[z] && t in e[z] ? e[z][t] : e[K] && t in e[K] ? e[K][t] : e[G][t];
         if (t in e[G] || (e[K] && t in e[K])) {
-          (e[r] || (e[r] = Object.create(null)))[t] = B;
+          (e[r] || (e[r] = Object.create(null)))[t] = D;
         } else if (e[r] && t in e[r]) {
           delete e[r][t];
         } else return true;
         if (isWrappable(i)) {
-          const t = D.get(i);
-          t && (t instanceof Set ? t.delete(e) : D.delete(i));
+          const t = B.get(i);
+          t && (t instanceof Set ? t.delete(e) : B.delete(i));
         }
         if (e[J]?.[t]) setSignal(e[J][t], false);
         const s = getNodes(e, U);
@@ -1940,7 +1935,7 @@ const re = {
     if (e[z]) {
       const n = new Set(t);
       for (const t of Reflect.ownKeys(e[z])) {
-        if (e[z][t] !== B) n.add(t);
+        if (e[z][t] !== D) n.add(t);
         else n.delete(t);
       }
       t = Array.from(n);
@@ -1950,7 +1945,7 @@ const re = {
   getOwnPropertyDescriptor(e, t) {
     if (t === V) return { value: e[V], writable: true, configurable: true };
     if (e[z] && t in e[z]) {
-      if (e[z][t] === B) return undefined;
+      if (e[z][t] === D) return undefined;
       const n = getPropertyDescriptor(e[G], e[K], t);
       if (n) {
         return { ...n, value: e[z][t] };
@@ -2002,7 +1997,7 @@ function recursivelyNotify(e, t) {
     }
     t = n[Y] || t;
   }
-  const i = D.get(n?.[G] || e);
+  const i = B.get(n?.[G] || e);
   if (!i) return r;
   if (i instanceof Set) {
     for (let e of i) r = recursivelyNotify(e, t) || r;
@@ -2017,10 +2012,10 @@ function recursivelyAddParent(e, t) {
     e = r[G];
   }
   if (t) {
-    let n = D.get(e);
-    if (!n) D.set(e, t);
+    let n = B.get(e);
+    if (!n) B.set(e, t);
     else if (n !== t) {
-      if (!(n instanceof Set)) D.set(e, (n = new Set([n])));
+      if (!(n instanceof Set)) B.set(e, (n = new Set([n])));
       else if (n.has(t)) return;
       n.add(t);
     } else return;
@@ -2045,7 +2040,7 @@ function deep(e) {
   return e[q];
 }
 function createOptimisticStore(e, t, n) {
-  GlobalQueue.ie ||= clearOptimisticStore;
+  GlobalQueue.X ||= clearOptimisticStore;
   const r = typeof e === "function";
   const i = (r ? t : e) ?? {};
   const s = r ? e : undefined;
@@ -2062,14 +2057,14 @@ function clearOptimisticStore(e) {
     if (r) {
       for (const e of Reflect.ownKeys(n)) {
         if (r[e]) {
-          r[e].M = undefined;
+          r[e].ie = undefined;
           const n = t[K] && e in t[K] ? t[K][e] : t[G][e];
-          const i = n === B ? undefined : n;
+          const i = n === D ? undefined : n;
           setSignal(r[e], isWrappable(i) ? wrap(i, t) : i);
         }
       }
       if (r[M]) {
-        r[M].M = undefined;
+        r[M].ie = undefined;
         setSignal(r[M], undefined);
       }
     }
@@ -2120,7 +2115,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
         setProjectionWriteActive(false);
       }
     });
-    r.Ee = true;
+    r.Qe = true;
   }
   return { store: s, node: r };
 }
@@ -2143,7 +2138,7 @@ function snapshot(e, t, n) {
     const r = s?.length || e.length;
     for (let i = 0; i < r; i++) {
       f = s && i in s ? s[i] : e[i];
-      if (f === B) continue;
+      if (f === D) continue;
       if ((u = snapshot(f, t, n)) !== f || o) {
         if (!o) t.set(e, (o = [...e]));
         o[i] = u;
@@ -2305,8 +2300,8 @@ function mapArray(e, t, n) {
       qe: 0,
       Fe: e,
       Ve: [],
-      Be: t,
-      De: [],
+      De: t,
+      Be: [],
       Ge: [],
       Ke: r,
       ze: r || n?.keyed === false ? [] : undefined,
@@ -2327,7 +2322,7 @@ function updateKeyedMap() {
         ? () => {
             this.ze[r] = signal(e[r], oe);
             this.Ue && (this.Ue[r] = signal(r, oe));
-            return this.Be(
+            return this.De(
               read.bind(null, this.ze[r]),
               this.Ue ? read.bind(null, this.Ue[r]) : undefined
             );
@@ -2336,31 +2331,31 @@ function updateKeyedMap() {
           ? () => {
               const t = e[r];
               this.Ue[r] = signal(r, oe);
-              return this.Be(() => t, read.bind(null, this.Ue[r]));
+              return this.De(() => t, read.bind(null, this.Ue[r]));
             }
           : () => {
               const t = e[r];
-              return this.Be(() => t);
+              return this.De(() => t);
             };
     if (t === 0) {
       if (this.qe !== 0) {
         this.Me.dispose(false);
         this.Ge = [];
         this.Ve = [];
-        this.De = [];
+        this.Be = [];
         this.qe = 0;
         this.ze && (this.ze = []);
         this.Ue && (this.Ue = []);
       }
-      if (this.Je && !this.De[0]) {
-        this.De[0] = runWithOwner((this.Ge[0] = createOwner()), this.Je);
+      if (this.Je && !this.Be[0]) {
+        this.Be[0] = runWithOwner((this.Ge[0] = createOwner()), this.Je);
       }
     } else if (this.qe === 0) {
       if (this.Ge[0]) this.Ge[0].dispose();
-      this.De = new Array(t);
+      this.Be = new Array(t);
       for (r = 0; r < t; r++) {
         this.Ve[r] = e[r];
-        this.De[r] = runWithOwner((this.Ge[r] = createOwner()), i);
+        this.Be[r] = runWithOwner((this.Ge[r] = createOwner()), i);
       }
       this.qe = t;
     } else {
@@ -2389,7 +2384,7 @@ function updateKeyedMap() {
         (this.Ve[o] === e[u] || (this.ze && compare(this.Ke, this.Ve[o], e[u])));
         o--, u--
       ) {
-        d[u] = this.De[o];
+        d[u] = this.Be[o];
         p[u] = this.Ge[o];
         h && (h[u] = this.ze[o]);
         y && (y[u] = this.Ue[o]);
@@ -2408,7 +2403,7 @@ function updateKeyedMap() {
         l = this.Ke ? this.Ke(f) : f;
         r = c.get(l);
         if (r !== undefined && r !== -1) {
-          d[r] = this.De[n];
+          d[r] = this.Be[n];
           p[r] = this.Ge[n];
           h && (h[r] = this.ze[n]);
           y && (y[r] = this.Ue[n]);
@@ -2418,7 +2413,7 @@ function updateKeyedMap() {
       }
       for (r = s; r < t; r++) {
         if (r in d) {
-          this.De[r] = d[r];
+          this.Be[r] = d[r];
           this.Ge[r] = p[r];
           if (h) {
             this.ze[r] = h[r];
@@ -2429,14 +2424,14 @@ function updateKeyedMap() {
             setSignal(this.Ue[r], r);
           }
         } else {
-          this.De[r] = runWithOwner((this.Ge[r] = createOwner()), i);
+          this.Be[r] = runWithOwner((this.Ge[r] = createOwner()), i);
         }
       }
-      this.De = this.De.slice(0, (this.qe = t));
+      this.Be = this.Be.slice(0, (this.qe = t));
       this.Ve = e.slice(0);
     }
   });
-  return this.De;
+  return this.Be;
 }
 function repeat(e, t, n) {
   return updateRepeat.bind({
@@ -2444,9 +2439,9 @@ function repeat(e, t, n) {
     qe: 0,
     Xe: 0,
     Ye: e,
-    Be: t,
+    De: t,
     Ge: [],
-    De: [],
+    Be: [],
     Ze: n?.from,
     Je: n?.fallback
   });
@@ -2459,11 +2454,11 @@ function updateRepeat() {
       if (this.qe !== 0) {
         this.Me.dispose(false);
         this.Ge = [];
-        this.De = [];
+        this.Be = [];
         this.qe = 0;
       }
-      if (this.Je && !this.De[0]) {
-        this.De[0] = runWithOwner((this.Ge[0] = createOwner()), this.Je);
+      if (this.Je && !this.Be[0]) {
+        this.Be[0] = runWithOwner((this.Ge[0] = createOwner()), this.Je);
       }
       return;
     }
@@ -2475,147 +2470,96 @@ function updateRepeat() {
       let e = this.Xe;
       while (e < t && e < this.qe) this.Ge[e++].dispose();
       this.Ge.splice(0, t - this.Xe);
-      this.De.splice(0, t - this.Xe);
+      this.Be.splice(0, t - this.Xe);
     } else if (this.Xe > t) {
       let n = r - this.Xe - 1;
       let i = this.Xe - t;
-      this.Ge.length = this.De.length = e;
+      this.Ge.length = this.Be.length = e;
       while (n >= i) {
         this.Ge[n] = this.Ge[n - i];
-        this.De[n] = this.De[n - i];
+        this.Be[n] = this.Be[n - i];
         n--;
       }
       for (let e = 0; e < i; e++) {
-        this.De[e] = runWithOwner((this.Ge[e] = createOwner()), () => this.Be(e + t));
+        this.Be[e] = runWithOwner((this.Ge[e] = createOwner()), () => this.De(e + t));
       }
     }
     for (let e = r; e < n; e++) {
-      this.De[e - t] = runWithOwner((this.Ge[e - t] = createOwner()), () => this.Be(e));
+      this.Be[e - t] = runWithOwner((this.Ge[e - t] = createOwner()), () => this.De(e));
     }
-    this.De = this.De.slice(0, e);
+    this.Be = this.Be.slice(0, e);
     this.Xe = t;
     this.qe = e;
   });
-  return this.De;
+  return this.Be;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
 }
 function boundaryComputed(e, t) {
   const n = computed(e, undefined, { lazy: true });
-  n.Pe = (e, t) => {
-    const r = e !== undefined ? e : n.ge;
-    const i = t !== undefined ? t : n.oe;
-    n.ge &= ~n.$e;
-    n.pe.notify(n, n.$e, r, i);
+  n._e = (e, t) => {
+    const r = e !== undefined ? e : n.ae;
+    const i = t !== undefined ? t : n.Z;
+    n.ae &= ~n.$e;
+    n.ue.notify(n, n.$e, r, i);
   };
   n.$e = t;
-  n.Ee = true;
+  n.Qe = true;
   recompute(n, true);
   return n;
 }
 function createBoundChildren(e, t, n, r) {
-  const i = e.pe;
-  i.addChild((e.pe = n));
-  onCleanup(() => i.removeChild(e.pe));
+  const i = e.ue;
+  i.addChild((e.ue = n));
+  onCleanup(() => i.removeChild(e.ue));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
   });
 }
-class ConditionalQueue extends Queue {
+class CollectionQueue extends Queue {
   et;
   tt = new Set();
-  $ = new Set();
+  nt = signal(false, { pureWrite: true });
+  rt = false;
   constructor(e) {
     super();
     this.et = e;
   }
   run(e) {
-    if (!e || read(this.et)) return;
-    return super.run(e);
-  }
-  notify(e, t, n, r) {
-    if (read(this.et)) {
-      if (t & l) {
-        if (n & l) {
-          this.$.add(e);
-          t &= ~l;
-        } else if (this.$.delete(e)) t &= ~l;
-      }
-      if (t & c) {
-        if (n & c) {
-          this.tt.add(e);
-          t &= ~c;
-        } else if (this.tt.delete(e)) t &= ~c;
-      }
-    }
-    return t ? super.notify(e, t, n, r ?? e.oe) : true;
-  }
-}
-class CollectionQueue extends Queue {
-  nt;
-  rt = new Set();
-  et = signal(false, { pureWrite: true });
-  it = false;
-  constructor(e) {
-    super();
-    this.nt = e;
-  }
-  run(e) {
-    if (!e || read(this.et)) return;
+    if (!e || read(this.nt)) return;
     return super.run(e);
   }
   notify(e, t, n, r) {
-    if (!(t & this.nt) || (this.nt & l && this.it)) return super.notify(e, t, n, r);
-    if (n & this.nt) {
-      const t = r?.t || e.oe?.t;
+    if (!(t & this.et) || (this.et & l && this.rt)) return super.notify(e, t, n, r);
+    if (n & this.et) {
+      const t = r?.t || e.Z?.t;
       if (t) {
-        const e = this.rt.size === 0;
-        this.rt.add(t);
-        if (e) setSignal(this.et, true);
+        const e = this.tt.size === 0;
+        this.tt.add(t);
+        if (e) setSignal(this.nt, true);
       }
     }
-    t &= ~this.nt;
+    t &= ~this.et;
     return t ? super.notify(e, t, n, r) : true;
   }
   checkSources() {
-    for (const e of this.rt) {
-      if (!(e.ge & this.nt)) this.rt.delete(e);
-    }
-    if (!this.rt.size) setSignal(this.et, false);
-  }
-}
-var ue;
-(function (e) {
-  e["VISIBLE"] = "visible";
-  e["HIDDEN"] = "hidden";
-})(ue || (ue = {}));
-function createBoundary(e, t) {
-  const n = createOwner();
-  const r = new ConditionalQueue(computed(() => t() === ue.HIDDEN));
-  const i = createBoundChildren(n, e, r, 0);
-  computed(() => {
-    const e = read(r.et);
-    i.$e = e ? c | l : 0;
-    if (!e) {
-      r.$.forEach(e => r.notify(e, l, l, e.oe));
-      r.tt.forEach(e => r.notify(e, c, c, e.oe));
-      r.$.clear();
-      r.tt.clear();
+    for (const e of this.tt) {
+      if (!(e.ae & this.et)) this.tt.delete(e);
     }
-  });
-  return () => (read(r.et) ? undefined : read(i));
+    if (!this.tt.size) setSignal(this.nt, false);
+  }
 }
 function createCollectionBoundary(e, t, n) {
   const r = createOwner();
   const i = new CollectionQueue(e);
   const s = createBoundChildren(r, t, i, e);
   const o = computed(() => {
-    if (!read(i.et)) {
+    if (!read(i.nt)) {
       const e = read(s);
-      if (!untrack(() => read(i.et))) {
-        i.it = true;
+      if (!untrack(() => read(i.nt))) {
+        i.rt = true;
         return e;
       }
     }
@@ -2628,10 +2572,10 @@ function createLoadBoundary(e, t) {
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(c, e, e => {
-    let n = e.rt.values().next().value;
-    const r = n.oe?.cause ?? n.oe;
+    let n = e.tt.values().next().value;
+    const r = n.Z?.cause ?? n.Z;
     return t(r, () => {
-      for (const t of e.rt) recompute(t);
+      for (const t of e.tt) recompute(t);
       schedule();
     });
   });
@@ -2693,7 +2637,6 @@ exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
 exports.SUPPORTS_PROXY = g;
 exports.action = action;
-exports.createBoundary = createBoundary;
 exports.createContext = createContext;
 exports.createEffect = createEffect;
 exports.createErrorBoundary = createErrorBoundary;
@@ -2701,6 +2644,7 @@ exports.createLoadBoundary = createLoadBoundary;
 exports.createMemo = createMemo;
 exports.createOptimistic = createOptimistic;
 exports.createOptimisticStore = createOptimisticStore;
+exports.createOwner = createOwner;
 exports.createProjection = createProjection;
 exports.createReaction = createReaction;
 exports.createRenderEffect = createRenderEffect;