@solidjs/signals 0.13.5 → 0.13.7

package/dist/node.cjs

@@ -133,7 +133,7 @@ function adjustHeight(e, t) {
   for (let t = e.A; t; t = t.N) {
     const e = t.L;
     const r = e.I || e;
-    if (r.T && r.o >= n) n = r.o + 1;
+    if (r.R && r.o >= n) n = r.o + 1;
   }
   if (e.o !== n) {
     e.o = n;
@@ -156,7 +156,7 @@ function shouldReadStashedOptimisticValue(e) {
 }
 function runLaneEffects(e) {
   for (const t of L) {
-    if (t.R || t.H.size > 0) continue;
+    if (t.T || t.H.size > 0) continue;
     const n = t.q[e - 1];
     if (n.length) {
       t.q[e - 1] = [];
@@ -169,9 +169,9 @@ function queueStashedOptimisticEffects(e) {
     const e = t.k;
     if (!e.D) continue;
     if (e.D === y) {
-      if (!e.V) {
-        e.V = true;
-        e.B.enqueue(g, e.F);
+      if (!e.F) {
+        e.F = true;
+        e.V.enqueue(g, e.M);
       }
       continue;
     }
@@ -184,7 +184,7 @@ function setProjectionWriteActive(e) {
   W = e;
 }
 function mergeTransitionState(e, t) {
-  t.M = e;
+  t.B = e;
   e.G.push(...t.G);
   for (const n of L) {
     if (n.K === t) n.K = e;
@@ -214,7 +214,7 @@ function cleanupCompletedLanes(e) {
   for (const t of L) {
     const n = e ? t.K === e : !t.K;
     if (!n) continue;
-    if (!t.R) {
+    if (!t.T) {
       if (t.q[0].length) runQueue(t.q[0], h);
       if (t.q[1].length) runQueue(t.q[1], g);
     }
@@ -231,20 +231,6 @@ function schedule() {
   C = true;
   if (!A.ne && !W) queueMicrotask(flush);
 }
-function addTransitionBlocker(e) {
-  if (k && !k.X.includes(e)) {
-    k.X.push(e);
-  }
-}
-function removeTransitionBlocker(e) {
-  const remove = t => {
-    if (!t) return;
-    const n = t.indexOf(e);
-    if (n >= 0) t.splice(n, 1);
-  };
-  remove(e.K?.X);
-  remove(k?.X);
-}
 class Queue {
   i = null;
   re = [[], []];
@@ -275,8 +261,8 @@ class Queue {
   }
   enqueue(e, t) {
     if (e) {
-      if (F) {
-        const n = findLane(F);
+      if (M) {
+        const n = findLane(M);
         n.q[e - 1].push(t);
       } else {
         this.re[e - 1].push(t);
@@ -340,7 +326,7 @@ class GlobalQueue extends Queue {
             j = new Set();
             for (let t = 0; t < e.U.length; t++) {
               const n = e.U[t];
-              if (n.T || n.le) continue;
+              if (n.R || n.le) continue;
               j.add(n);
               queueStashedOptimisticEffects(n);
             }
@@ -402,7 +388,7 @@ class GlobalQueue extends Queue {
         J: new Set(),
         G: [],
         ce: { re: [[], []], ie: [] },
-        M: false
+        B: false
       };
     } else if (e) {
       const t = k;
@@ -438,7 +424,7 @@ class GlobalQueue extends Queue {
   }
 }
 function insertSubs(e, t = false) {
-  const n = e.Y || F;
+  const n = e.Y || M;
   const r = e.pe !== undefined;
   for (let i = e.O; i !== null; i = i.P) {
     if (r && i.k.he) {
@@ -454,9 +440,9 @@ function insertSubs(e, t = false) {
     }
     const e = i.k;
     if (e.D === y) {
-      if (!e.V) {
-        e.V = true;
-        e.B.enqueue(g, e.F);
+      if (!e.F) {
+        e.F = true;
+        e.V.enqueue(g, e.M);
       }
       continue;
     }
@@ -472,10 +458,10 @@ function commitPendingNodes() {
     if (n.Z !== S) {
       n.$ = n.Z;
       n.Z = S;
-      if (n.D && n.D !== y) n.V = true;
+      if (n.D && n.D !== y) n.F = true;
     }
     if (!(n.ge & a)) n.ge &= ~p;
-    if (n.T) GlobalQueue.ue(n, false, true);
+    if (n.R) GlobalQueue.ue(n, false, true);
   }
   e.length = 0;
 }
@@ -515,6 +501,9 @@ function reassignPendingTransition(e) {
 }
 const A = new GlobalQueue();
 function flush() {
+  if (A.ne) {
+    return;
+  }
   while (C || k) {
     A.flush();
   }
@@ -523,7 +512,7 @@ function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function transitionComplete(e) {
-  if (e.M) return true;
+  if (e.B) return true;
   if (e.G.length) return false;
   let t = true;
   for (let n = 0; n < e.X.length; n++) {
@@ -533,11 +522,26 @@ function transitionComplete(e) {
       break;
     }
   }
-  t && (e.M = true);
+  if (t) {
+    for (let n = 0; n < e.U.length; n++) {
+      const r = e.U[n];
+      if (
+        hasActiveOverride(r) &&
+        "ge" in r &&
+        r.ge & a &&
+        r.ae instanceof NotReadyError &&
+        r.ae.source !== r
+      ) {
+        t = false;
+        break;
+      }
+    }
+  }
+  t && (e.B = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.M && typeof e.M === "object") e = e.M;
+  while (e.B && typeof e.B === "object") e = e.B;
   return e;
 }
 function setActiveTransition(e) {
@@ -561,21 +565,21 @@ function getOrCreateLane(e) {
   }
   const n = e.ye;
   const r = n?.Y ? findLane(n.Y) : null;
-  t = { te: e, H: new Set(), q: [[], []], R: null, K: k, Se: r };
+  t = { te: e, H: new Set(), q: [[], []], T: null, K: k, Se: r };
   N.set(e, t);
   L.add(t);
   e.we = false;
   return t;
 }
 function findLane(e) {
-  while (e.R) e = e.R;
+  while (e.T) e = e.T;
   return e;
 }
 function mergeLanes(e, t) {
   e = findLane(e);
   t = findLane(t);
   if (e === t) return e;
-  t.R = 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]);
@@ -599,7 +603,7 @@ function assignOrMergeLane(e, t) {
   const n = findLane(t);
   const r = e.Y;
   if (r) {
-    if (r.R) {
+    if (r.T) {
       e.Y = t;
       return;
     }
@@ -616,39 +620,230 @@ function assignOrMergeLane(e, t) {
   }
   e.Y = t;
 }
+function unlinkSubs(e) {
+  const t = e.L;
+  const n = e.N;
+  const r = e.P;
+  const i = e.me;
+  if (r !== null) r.me = i;
+  else t.be = i;
+  if (i !== null) i.P = r;
+  else {
+    t.O = r;
+    if (r === null) {
+      t._e?.();
+      t.R && !t.Oe && !(t.m & o) && unobserved(t);
+    }
+  }
+  return n;
+}
+function unobserved(e) {
+  deleteFromHeap(e, e.m & o ? v : P);
+  let t = e.A;
+  while (t !== null) {
+    t = unlinkSubs(t);
+  }
+  e.A = null;
+  disposeChildren(e, true);
+}
+function link(e, t) {
+  const n = t.xe;
+  if (n !== null && n.L === e) return;
+  let i = null;
+  const s = t.m & r;
+  if (s) {
+    i = n !== null ? n.N : t.A;
+    if (i !== null && i.L === e) {
+      t.xe = i;
+      return;
+    }
+  }
+  const o = e.be;
+  if (o !== null && o.k === t && (!s || isValidLink(o, t))) return;
+  const u = (t.xe = e.be = { L: e, k: t, N: i, me: o, P: null });
+  if (n !== null) n.N = u;
+  else t.A = u;
+  if (o !== null) o.P = u;
+  else e.O = u;
+}
+function isValidLink(e, t) {
+  const n = t.xe;
+  if (n !== null) {
+    let r = t.A;
+    do {
+      if (r === e) return true;
+      if (r === n) break;
+      r = r.N;
+    } while (r !== null);
+  }
+  return false;
+}
+const I = {};
+function markDisposal(e) {
+  let t = e.Pe;
+  while (t) {
+    t.m |= o;
+    if (t.m & i) {
+      deleteFromHeap(t, P);
+      insertIntoHeap(t, v);
+    }
+    markDisposal(t);
+    t = t.ve;
+  }
+}
+function dispose(e) {
+  let t = e.A || null;
+  do {
+    t = unlinkSubs(t);
+  } while (t !== null);
+  e.A = 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.R) e.Ee = null;
+  let r = n ? e.ke : e.Pe;
+  while (r) {
+    const e = r.ve;
+    if (r.A) {
+      const e = r;
+      deleteFromHeap(e, e.m & o ? v : P);
+      let t = e.A;
+      do {
+        t = unlinkSubs(t);
+      } while (t !== null);
+      e.A = null;
+      e.xe = null;
+    }
+    disposeChildren(r, true);
+    r = e;
+  }
+  if (n) {
+    e.ke = null;
+  } else {
+    e.Pe = null;
+    e.Ce = 0;
+  }
+  runDisposal(e, n);
+}
+function runDisposal(e, t) {
+  let n = t ? e.We : e.je;
+  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.je = null);
+}
+function childId(e, t) {
+  let n = e;
+  while (n.Ae && n.i) n = n.i;
+  if (n.id != null) return formatId(n.id, t ? n.Ce++ : n.Ce);
+  throw new Error("Cannot get child id from owner without an id");
+}
+function getNextChildId(e) {
+  return childId(e, true);
+}
+function peekNextChildId(e) {
+  return childId(e, false);
+}
+function formatId(e, t) {
+  const n = t.toString(36),
+    r = n.length - 1;
+  return e + (r ? String.fromCharCode(64 + r) : "") + n;
+}
+function getObserver() {
+  if (q || F) return I;
+  return T ? V : null;
+}
+function getOwner() {
+  return V;
+}
+function cleanup(e) {
+  if (!V) return e;
+  if (!V.je) V.je = e;
+  else if (Array.isArray(V.je)) V.je.push(e);
+  else V.je = [V.je, e];
+  return e;
+}
+function isDisposed(e) {
+  return !!(e.m & (u | o));
+}
+function createOwner(e) {
+  const t = V;
+  const n = e?.transparent ?? false;
+  const r = {
+    id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
+    Ae: n || undefined,
+    t: true,
+    u: t?.t ? t.u : t,
+    Pe: null,
+    ve: null,
+    je: null,
+    V: t?.V ?? A,
+    Ne: t?.Ne || _,
+    Ce: 0,
+    We: null,
+    ke: null,
+    i: t,
+    dispose(e = true) {
+      disposeChildren(r, e);
+    }
+  };
+  if (t) {
+    const e = t.Pe;
+    if (e === null) {
+      t.Pe = r;
+    } else {
+      r.ve = e;
+      t.Pe = r;
+    }
+  }
+  return r;
+}
+function createRoot(e, t) {
+  const n = createOwner(t);
+  return runWithOwner(n, () => e(n.dispose));
+}
 function addPendingSource(e, t) {
-  if (e.me === t || e.be?.has(t)) return false;
-  if (!e.me) {
-    e.me = t;
+  if (e.Le === t || e.Ie?.has(t)) return false;
+  if (!e.Le) {
+    e.Le = t;
     return true;
   }
-  if (!e.be) {
-    e.be = new Set([e.me, t]);
+  if (!e.Ie) {
+    e.Ie = new Set([e.Le, t]);
   } else {
-    e.be.add(t);
+    e.Ie.add(t);
   }
-  e.me = undefined;
+  e.Le = undefined;
   return true;
 }
 function removePendingSource(e, t) {
-  if (e.me) {
-    if (e.me !== t) return false;
-    e.me = undefined;
+  if (e.Le) {
+    if (e.Le !== t) return false;
+    e.Le = undefined;
     return true;
   }
-  if (!e.be?.delete(t)) return false;
-  if (e.be.size === 1) {
-    e.me = e.be.values().next().value;
-    e.be = undefined;
-  } else if (e.be.size === 0) {
-    e.be = undefined;
+  if (!e.Ie?.delete(t)) return false;
+  if (e.Ie.size === 1) {
+    e.Le = e.Ie.values().next().value;
+    e.Ie = undefined;
+  } else if (e.Ie.size === 0) {
+    e.Ie = undefined;
   }
   return true;
 }
 function clearPendingSources(e) {
-  e.me = undefined;
-  e.be?.clear();
-  e.be = undefined;
+  e.Le = undefined;
+  e.Ie?.clear();
+  e.Ie = undefined;
 }
 function setPendingError(e, t, n) {
   if (!t) {
@@ -677,7 +872,7 @@ function settlePendingSource(e) {
     if (n.has(r) || !removePendingSource(r, e)) return;
     n.add(r);
     r.de = E;
-    const i = r.me ?? r.be?.values().next().value;
+    const i = r.Le ?? r.Ie?.values().next().value;
     if (i) {
       setPendingError(r, i);
       updatePendingSignal(r);
@@ -685,12 +880,12 @@ function settlePendingSource(e) {
       r.ge &= ~a;
       setPendingError(r);
       updatePendingSignal(r);
-      if (r._e) {
+      if (r.Re) {
         if (r.D === y) {
           const e = r;
-          if (!e.V) {
-            e.V = true;
-            e.B.enqueue(g, e.F);
+          if (!e.F) {
+            e.F = true;
+            e.V.enqueue(g, e.M);
           }
         } else {
           const e = r.m & o ? v : P;
@@ -699,7 +894,7 @@ function settlePendingSource(e) {
         }
         t = true;
       }
-      r._e = false;
+      r.Re = false;
     }
     forEachDependent(r, settle);
   };
@@ -711,19 +906,19 @@ 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.Oe = null;
+    e.Ee = null;
     return t;
   }
-  e.Oe = t;
+  e.Ee = t;
   let u;
   const handleError = n => {
-    if (e.Oe !== t) return;
+    if (e.Ee !== t) return;
     A.initTransition(resolveTransition(e));
     notifyStatus(e, n instanceof NotReadyError ? a : d, n);
     e.de = E;
   };
   const asyncWrite = (i, s) => {
-    if (e.Oe !== t) return;
+    if (e.Ee !== t) return;
     if (e.m & (n | f)) return;
     A.initTransition(resolveTransition(e));
     clearStatus(e);
@@ -739,12 +934,12 @@ function handleAsync(e, t, r) {
       e.de = E;
     } else if (o) {
       const t = e.$;
-      const n = e.xe;
+      const n = e.Te;
       if (!n || !n(i, t)) {
         e.$ = i;
         e.de = E;
-        if (e.Pe) {
-          setSignal(e.Pe, i);
+        if (e.He) {
+          setSignal(e.He, i);
         }
         insertSubs(e, true);
       }
@@ -773,55 +968,72 @@ function handleAsync(e, t, r) {
     r = false;
     if (!n) {
       A.initTransition(resolveTransition(e));
-      throw new NotReadyError(B);
+      throw new NotReadyError(V);
     }
   }
   if (s) {
     const n = t[Symbol.asyncIterator]();
     let r = false;
+    let i = false;
+    cleanup(() => {
+      if (i) return;
+      i = true;
+      try {
+        const e = n.return?.();
+        if (e && typeof e.then === "function") {
+          e.then(undefined, () => {});
+        }
+      } catch {}
+    });
     const iterate = () => {
-      let e,
-        t = false,
-        i = true;
+      let s,
+        o = false,
+        f = true;
       n.next().then(
         n => {
-          if (i) {
-            e = n;
-            t = true;
+          if (f) {
+            s = n;
+            o = true;
+            if (n.done) i = true;
+          } else if (e.Ee !== t) {
+            return;
           } else if (!n.done) asyncWrite(n.value, iterate);
           else {
+            i = true;
             schedule();
             flush();
           }
         },
-        e => {
-          if (!i) handleError(e);
+        n => {
+          if (!f && e.Ee === t) {
+            i = true;
+            handleError(n);
+          }
         }
       );
-      i = false;
-      if (t && !e.done) {
-        u = e.value;
+      f = false;
+      if (o && !s.done) {
+        u = s.value;
         r = true;
         return iterate();
       }
-      return t && e.done;
+      return o && s.done;
     };
-    const i = iterate();
-    if (!r && !i) {
+    const s = iterate();
+    if (!r && !s) {
       A.initTransition(resolveTransition(e));
-      throw new NotReadyError(B);
+      throw new NotReadyError(V);
     }
   }
   return u;
 }
 function clearStatus(e, t = false) {
   clearPendingSources(e);
-  removeTransitionBlocker(e);
-  e._e = false;
+  e.Re = false;
   e.ge = t ? 0 : e.ge & p;
   setPendingError(e);
   updatePendingSignal(e);
-  e.ve?.();
+  e.Qe?.();
 }
 function notifyStatus(e, t, n, r, i) {
   if (t === d && !(n instanceof StatusError) && !(n instanceof NotReadyError))
@@ -834,11 +1046,9 @@ function notifyStatus(e, t, n, r, i) {
     if (t === a && s) {
       addPendingSource(e, s);
       e.ge = a | (e.ge & p);
-      setPendingError(e, e.me ?? e.be?.values().next().value, n);
-      if (s === e) addTransitionBlocker(e);
+      setPendingError(e, s, n);
     } else {
       clearPendingSources(e);
-      removeTransitionBlocker(e);
       e.ge = t | (t !== d ? e.ge & p : 0);
       e.ae = n;
     }
@@ -849,31 +1059,34 @@ function notifyStatus(e, t, n, r, i) {
   }
   const c = r || f;
   const l = r || u ? undefined : i;
-  if (e.ve) {
+  if (e.Qe) {
+    if (r && t === a) {
+      return;
+    }
     if (c) {
-      e.ve(t, n);
+      e.Qe(t, n);
     } else {
-      e.ve();
+      e.Qe();
     }
     return;
   }
   forEachDependent(e, e => {
     e.de = E;
     if (
-      (t === a && s && e.me !== s && !e.be?.has(s)) ||
-      (t !== a && (e.ae !== n || e.me || e.be))
+      (t === a && s && e.Le !== s && !e.Ie?.has(s)) ||
+      (t !== a && (e.ae !== n || e.Le || e.Ie))
     ) {
-      !e.K && A.se.push(e);
+      if (!c && !e.K) A.se.push(e);
       notifyStatus(e, t, n, c, l);
     }
   });
 }
-let I = null;
+let R = null;
 function enableExternalSource(e) {
   const { factory: t, untrack: n = e => e() } = e;
-  if (I) {
-    const { factory: e, untrack: r } = I;
-    I = {
+  if (R) {
+    const { factory: e, untrack: r } = R;
+    R = {
       factory: (n, r) => {
         const i = e(n, r);
         const s = t(e => i.track(e), r);
@@ -888,210 +1101,20 @@ function enableExternalSource(e) {
       untrack: e => r(() => n(e))
     };
   } else {
-    I = { factory: t, untrack: n };
+    R = { factory: t, untrack: n };
   }
 }
-const T = {};
-function markDisposal(e) {
-  let t = e.Ee;
-  while (t) {
-    t.m |= o;
-    if (t.m & i) {
-      deleteFromHeap(t, P);
-      insertIntoHeap(t, v);
-    }
-    markDisposal(t);
-    t = t.ke;
-  }
-}
-function dispose(e) {
-  let t = e.A || null;
-  do {
-    t = unlinkSubs(t);
-  } while (t !== null);
-  e.A = null;
-  e.Ce = null;
-  disposeChildren(e, true);
-}
-function disposeChildren(e, t = false, n) {
-  if (e.m & u) return;
-  if (t) e.m = u;
-  let r = n ? e.We : e.Ee;
-  while (r) {
-    const e = r.ke;
-    if (r.A) {
-      const e = r;
-      deleteFromHeap(e, e.m & o ? v : P);
-      let t = e.A;
-      do {
-        t = unlinkSubs(t);
-      } while (t !== null);
-      e.A = null;
-      e.Ce = null;
-    }
-    disposeChildren(r, true);
-    r = e;
-  }
-  if (n) {
-    e.We = null;
-  } else {
-    e.Ee = null;
-    e.je = 0;
-  }
-  runDisposal(e, n);
-}
-function runDisposal(e, t) {
-  let n = t ? e.Ae : e.Ne;
-  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.Ae = null) : (e.Ne = null);
-}
-function childId(e, t) {
-  let n = e;
-  while (n.Le && n.i) n = n.i;
-  if (n.id != null) return formatId(n.id, t ? n.je++ : n.je);
-  throw new Error("Cannot get child id from owner without an id");
-}
-function getNextChildId(e) {
-  return childId(e, true);
-}
-function peekNextChildId(e) {
-  return childId(e, false);
-}
-function formatId(e, t) {
-  const n = t.toString(36),
-    r = n.length - 1;
-  return e + (r ? String.fromCharCode(64 + r) : "") + n;
-}
-function getObserver() {
-  if (q || V) return T;
-  return R ? B : null;
-}
-function getOwner() {
-  return B;
-}
-function cleanup(e) {
-  if (!B) return e;
-  if (!B.Ne) B.Ne = e;
-  else if (Array.isArray(B.Ne)) B.Ne.push(e);
-  else B.Ne = [B.Ne, e];
-  return e;
-}
-function isDisposed(e) {
-  return !!(e.m & (u | o));
-}
-function createOwner(e) {
-  const t = B;
-  const n = e?.transparent ?? false;
-  const r = {
-    id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    Le: n || undefined,
-    t: true,
-    u: t?.t ? t.u : t,
-    Ee: null,
-    ke: null,
-    Ne: null,
-    B: t?.B ?? A,
-    Ie: t?.Ie || _,
-    je: 0,
-    Ae: null,
-    We: null,
-    i: t,
-    dispose(e = true) {
-      disposeChildren(r, e);
-    }
-  };
-  if (t) {
-    const e = t.Ee;
-    if (e === null) {
-      t.Ee = r;
-    } else {
-      r.ke = e;
-      t.Ee = r;
-    }
-  }
-  return r;
-}
-function createRoot(e, t) {
-  const n = createOwner(t);
-  return runWithOwner(n, () => e(n.dispose));
-}
-function unlinkSubs(e) {
-  const t = e.L;
-  const n = e.N;
-  const r = e.P;
-  const i = e.Te;
-  if (r !== null) r.Te = i;
-  else t.Re = i;
-  if (i !== null) i.P = r;
-  else {
-    t.O = r;
-    if (r === null) {
-      t.He?.();
-      t.T && !t.Qe && !(t.m & o) && unobserved(t);
-    }
-  }
-  return n;
-}
-function unobserved(e) {
-  deleteFromHeap(e, e.m & o ? v : P);
-  let t = e.A;
-  while (t !== null) {
-    t = unlinkSubs(t);
-  }
-  e.A = null;
-  disposeChildren(e, true);
-}
-function link(e, t) {
-  const n = t.Ce;
-  if (n !== null && n.L === e) return;
-  let i = null;
-  const s = t.m & r;
-  if (s) {
-    i = n !== null ? n.N : t.A;
-    if (i !== null && i.L === e) {
-      t.Ce = i;
-      return;
-    }
-  }
-  const o = e.Re;
-  if (o !== null && o.k === t && (!s || isValidLink(o, t))) return;
-  const u = (t.Ce = e.Re = { L: e, k: t, N: i, Te: o, P: null });
-  if (n !== null) n.N = u;
-  else t.A = u;
-  if (o !== null) o.P = u;
-  else e.O = u;
-}
-function isValidLink(e, t) {
-  const n = t.Ce;
-  if (n !== null) {
-    let r = t.A;
-    do {
-      if (r === e) return true;
-      if (r === n) break;
-      r = r.N;
-    } while (r !== null);
-  }
-  return false;
-}
 GlobalQueue.oe = recompute;
 GlobalQueue.ue = disposeChildren;
-let R = false;
+let T = false;
 let H = false;
 let Q = false;
 let q = false;
 let D = false;
-let V = false;
-let B = null;
-let F = null;
-let M = false;
+let F = false;
+let V = null;
+let M = null;
+let B = false;
 let G = null;
 function ownerInSnapshotScope(e) {
   while (e) {
@@ -1101,7 +1124,7 @@ function ownerInSnapshotScope(e) {
   return false;
 }
 function setSnapshotCapture(e) {
-  M = e;
+  B = e;
   if (e && !G) G = new Set();
 }
 function markSnapshotScope(e) {
@@ -1113,13 +1136,13 @@ function releaseSnapshotScope(e) {
   schedule();
 }
 function releaseSubtree(e) {
-  let t = e.Ee;
+  let t = e.Pe;
   while (t) {
     if (t.qe) {
-      t = t.ke;
+      t = t.ve;
       continue;
     }
-    if (t.T) {
+    if (t.R) {
       const e = t;
       e.he = false;
       if (e.m & c) {
@@ -1130,7 +1153,7 @@ function releaseSubtree(e) {
       }
     }
     releaseSubtree(t);
-    t = t.ke;
+    t = t.ve;
   }
 }
 function clearSnapshots() {
@@ -1141,42 +1164,43 @@ function clearSnapshots() {
     }
     G = null;
   }
-  M = false;
+  B = false;
 }
 function recompute(t, n = false) {
   const i = t.D;
   if (!n) {
     if (t.K && (!i || k) && k !== t.K) A.initTransition(t.K);
     deleteFromHeap(t, t.m & o ? v : P);
+    t.Ee = null;
     if (t.K || i === y) disposeChildren(t);
     else {
       markDisposal(t);
-      t.Ae = t.Ne;
-      t.We = t.Ee;
-      t.Ne = null;
-      t.Ee = null;
-      t.je = 0;
+      t.We = t.je;
+      t.ke = t.Pe;
+      t.je = null;
+      t.Pe = null;
+      t.Ce = 0;
     }
   }
   const s = !!(t.m & f);
   const u = t.ee !== undefined && t.ee !== S;
   const l = !!(t.ge & a);
-  const p = B;
-  B = t;
-  t.Ce = null;
+  const p = V;
+  V = t;
+  t.xe = null;
   t.m = r;
   t.de = E;
   let h = t.Z === S ? t.$ : t.Z;
   let g = t.o;
-  let w = R;
-  let m = F;
-  R = true;
+  let w = T;
+  let m = M;
+  T = true;
   if (s) {
     const e = resolveLane(t);
-    if (e) F = e;
+    if (e) M = e;
   }
   try {
-    h = handleAsync(t, t.T(h));
+    h = handleAsync(t, t.R(h));
     clearStatus(t, n);
     const e = resolveLane(t);
     if (e) {
@@ -1184,15 +1208,15 @@ function recompute(t, n = false) {
       updatePendingSignal(e.te);
     }
   } catch (e) {
-    if (e instanceof NotReadyError && F) {
-      const e = findLane(F);
+    if (e instanceof NotReadyError && M) {
+      const e = findLane(M);
       if (e.te !== t) {
         e.H.add(t);
         t.Y = e;
         updatePendingSignal(e.te);
       }
     }
-    if (e instanceof NotReadyError) t._e = true;
+    if (e instanceof NotReadyError) t.Re = true;
     notifyStatus(
       t,
       e instanceof NotReadyError ? a : d,
@@ -1201,12 +1225,12 @@ function recompute(t, n = false) {
       e instanceof NotReadyError ? t.Y : undefined
     );
   } finally {
-    R = w;
+    T = w;
     t.m = e | (n ? t.m & c : 0);
-    B = p;
+    V = p;
   }
   if (!t.ae) {
-    const e = t.Ce;
+    const e = t.xe;
     let r = e !== null ? e.N : t.A;
     if (r !== null) {
       do {
@@ -1216,7 +1240,7 @@ function recompute(t, n = false) {
       else t.A = null;
     }
     const f = u ? t.ee : t.Z === S ? t.$ : t.Z;
-    const c = !t.xe || !t.xe(f, h);
+    const c = !t.Te || !t.Te(f, h);
     if (c) {
       const e = u ? t.ee : undefined;
       if (n || (i && k !== t.K) || s) {
@@ -1236,7 +1260,7 @@ function recompute(t, n = false) {
       }
     }
   }
-  F = m;
+  M = m;
   (!n || t.ge & a) && !t.K && !(k && u) && A.se.push(t);
   t.K && i && k !== t.K && runInTransition(t.K, () => recompute(t));
 }
@@ -1245,7 +1269,7 @@ function updateIfNecessary(r) {
     for (let e = r.A; e; e = e.N) {
       const t = e.L;
       const i = t.I || t;
-      if (i.T) {
+      if (i.R) {
         updateIfNecessary(i);
       }
       if (r.m & n) {
@@ -1253,7 +1277,7 @@ function updateIfNecessary(r) {
       }
     }
   }
-  if (r.m & (n | f) || (r.ae && r.de < E && !r.Oe)) {
+  if (r.m & (n | f) || (r.ae && r.de < E && !r.Ee)) {
     recompute(r);
   }
   r.m = e | (r.m & c);
@@ -1261,63 +1285,63 @@ function updateIfNecessary(r) {
 function computed(t, n, r) {
   const i = r?.transparent ?? false;
   const s = {
-    id: r?.id ?? (i ? B?.id : B?.id != null ? getNextChildId(B) : undefined),
-    Le: i || undefined,
-    xe: r?.equals != null ? r.equals : isEqual,
+    id: r?.id ?? (i ? V?.id : V?.id != null ? getNextChildId(V) : undefined),
+    Ae: i || undefined,
+    Te: r?.equals != null ? r.equals : isEqual,
     le: !!r?.pureWrite,
-    He: r?.unobserved,
-    Ne: null,
-    B: B?.B ?? A,
-    Ie: B?.Ie ?? _,
-    je: 0,
-    T: t,
+    _e: r?.unobserved,
+    je: null,
+    V: V?.V ?? A,
+    Ne: V?.Ne ?? _,
+    Ce: 0,
+    R: t,
     $: n,
     o: 0,
     C: null,
     h: undefined,
     p: null,
     A: null,
-    Ce: null,
+    xe: null,
     O: null,
-    Re: null,
-    i: B,
-    ke: null,
-    Ee: null,
+    be: null,
+    i: V,
+    ve: null,
+    Pe: null,
     m: r?.lazy ? l : e,
     ge: p,
     de: E,
     Z: S,
-    Ae: null,
     We: null,
-    Oe: null,
+    ke: null,
+    Ee: null,
     K: null
   };
   s.p = s;
-  const o = B?.t ? B.u : B;
-  if (B) {
-    const e = B.Ee;
+  const o = V?.t ? V.u : V;
+  if (V) {
+    const e = V.Pe;
     if (e === null) {
-      B.Ee = s;
+      V.Pe = s;
     } else {
-      s.ke = e;
-      B.Ee = s;
+      s.ve = e;
+      V.Pe = s;
     }
   }
   if (o) s.o = o.o + 1;
-  if (M && ownerInSnapshotScope(B)) s.he = true;
-  if (I) {
+  if (B && ownerInSnapshotScope(V)) s.he = true;
+  if (R) {
     const e = signal(undefined, { equals: false, pureWrite: true });
-    const t = I.factory(s.T, () => {
+    const t = R.factory(s.R, () => {
       setSignal(e, undefined);
     });
     cleanup(() => t.dispose());
-    s.T = n => {
+    s.R = n => {
       read(e);
       return t.track(n);
     };
   }
   !r?.lazy && recompute(s, true);
-  if (M && !r?.lazy) {
+  if (B && !r?.lazy) {
     if (!(s.ge & a)) {
       s.pe = s.$ === undefined ? w : s.$;
       G.add(s);
@@ -1327,20 +1351,20 @@ function computed(t, n, r) {
 }
 function signal(e, t, n = null) {
   const r = {
-    xe: t?.equals != null ? t.equals : isEqual,
+    Te: t?.equals != null ? t.equals : isEqual,
     le: !!t?.pureWrite,
     De: !!t?.De,
-    He: t?.unobserved,
+    _e: t?.unobserved,
     $: e,
     O: null,
-    Re: null,
+    be: null,
     de: E,
     I: n,
     W: n?.C || null,
     Z: S
   };
   n && (n.C = r);
-  if (M && !r.De && !((n?.ge ?? 0) & a)) {
+  if (B && !r.De && !((n?.ge ?? 0) & a)) {
     r.pe = e === undefined ? w : e;
     G.add(r);
   }
@@ -1360,35 +1384,35 @@ function isEqual(e, t) {
   return e === t;
 }
 function untrack(e, t) {
-  if (!I && !R && true) return e();
-  const n = R;
-  R = false;
+  if (!R && !T && true) return e();
+  const n = T;
+  T = false;
   try {
-    if (I) return I.untrack(e);
+    if (R) return R.untrack(e);
     return e();
   } finally {
-    R = n;
+    T = n;
   }
 }
 function read(e) {
-  if (V) {
+  if (F) {
     const t = getLatestValueComputed(e);
-    const n = V;
-    V = false;
+    const n = F;
+    F = false;
     const r = e.ee !== undefined && e.ee !== S ? e.ee : e.$;
     let i;
     try {
       i = read(t);
     } catch (e) {
-      if (!B && e instanceof NotReadyError) return r;
+      if (!V && e instanceof NotReadyError) return r;
       throw e;
     } finally {
-      V = n;
+      F = n;
     }
     if (t.ge & a) return r;
-    if (H && F && t.Y) {
+    if (H && M && t.Y) {
       const e = findLane(t.Y);
-      const n = findLane(F);
+      const n = findLane(M);
       if (e !== n && e.H.size > 0) {
         return r;
       }
@@ -1400,9 +1424,14 @@ function read(e) {
     const n = q;
     q = false;
     if (t && e.ee !== undefined) {
-      if (e.ee !== S && (t.Oe || !!(t.ge & a))) {
+      if (e.ee !== S && (t.Ee || !!(t.ge & a))) {
         D = true;
       }
+      let n = V;
+      if (n?.t) n = n.u;
+      if (n && T) link(e, n);
+      read(getPendingSignal(e));
+      read(getPendingSignal(t));
     } else {
       if (read(getPendingSignal(e))) D = true;
       if (t && read(getPendingSignal(t))) D = true;
@@ -1410,18 +1439,18 @@ function read(e) {
     q = n;
     return e.$;
   }
-  let t = B;
+  let t = V;
   if (t?.t) t = t.u;
-  if (Q && e.T) recompute(e);
+  if (Q && e.R) recompute(e);
   if (e.m & l) {
     e.m &= ~l;
     recompute(e, true);
   }
   const n = e.I || e;
-  if (t && R) {
-    if (e.T && e.m & u) recompute(e);
+  if (t && T) {
+    if (e.R && e.m & u) recompute(e);
     link(e, t);
-    if (n.T) {
+    if (n.R) {
       const r = e.m & o;
       if (n.o >= (r ? v.j : P.j)) {
         markNode(t);
@@ -1436,28 +1465,31 @@ function read(e) {
   }
   if (n.ge & a) {
     if (t && !(H && n.K && k !== n.K)) {
-      if (F) {
+      if (M) {
         const r = n.Y;
-        const i = findLane(F);
+        const i = findLane(M);
         if (r && findLane(r) === i && !hasActiveOverride(n)) {
-          if (!R && e !== t) link(e, t);
+          if (!T && e !== t) link(e, t);
           throw n.ae;
         }
       } else {
-        if (!R && e !== t) link(e, t);
+        if (!T && e !== t) link(e, t);
         throw n.ae;
       }
+    } else if (t && n !== e && n.ge & p) {
+      if (!T && e !== t) link(e, t);
+      throw n.ae;
     } else if (!t && n.ge & p) {
       throw n.ae;
     }
   }
-  if (e.T && e.ge & d) {
+  if (e.R && e.ge & d) {
     if (e.de < E) {
       recompute(e, true);
       return read(e);
     } else throw e.ae;
   }
-  if (M && t && t.he) {
+  if (B && t && t.he) {
     const n = e.pe;
     if (n !== undefined) {
       const r = n === w ? undefined : n;
@@ -1471,7 +1503,7 @@ function read(e) {
     return e.ee;
   }
   return !t ||
-    (F !== null && (e.ee !== undefined || e.Y || (n === e && H) || !!(n.ge & a))) ||
+    (M !== null && (e.ee !== undefined || e.Y || (n === e && H) || !!(n.ge & a))) ||
     e.Z === S ||
     (H && e.K && k !== e.K)
     ? e.$
@@ -1483,9 +1515,9 @@ function setSignal(e, t) {
   const r = e.ee !== undefined && e.ee !== S;
   const i = n ? (r ? e.ee : e.$) : e.Z === S ? e.$ : e.Z;
   if (typeof t === "function") t = t(i);
-  const s = !e.xe || !e.xe(i, t) || !!(e.ge & p);
+  const s = !e.Te || !e.Te(i, t) || !!(e.ge & p);
   if (!s) {
-    if (n && r && e.T) {
+    if (n && r && e.R) {
       insertSubs(e, true);
       schedule();
     }
@@ -1507,8 +1539,8 @@ function setSignal(e, t) {
     e.Z = t;
   }
   updatePendingSignal(e);
-  if (e.Pe) {
-    setSignal(e.Pe, t);
+  if (e.He) {
+    setSignal(e.He, t);
   }
   e.de = E;
   insertSubs(e, n);
@@ -1516,32 +1548,32 @@ function setSignal(e, t) {
   return t;
 }
 function runWithOwner(e, t) {
-  const n = B;
-  const r = R;
-  B = e;
-  R = false;
+  const n = V;
+  const r = T;
+  V = e;
+  T = false;
   try {
     return t();
   } finally {
-    B = n;
-    R = r;
+    V = n;
+    T = r;
   }
 }
 function getPendingSignal(e) {
-  if (!e.Ve) {
-    e.Ve = optimisticSignal(false, { pureWrite: true });
+  if (!e.Fe) {
+    e.Fe = optimisticSignal(false, { pureWrite: true });
     if (e.ye) {
-      e.Ve.ye = e;
+      e.Fe.ye = e;
     }
-    if (computePendingState(e)) setSignal(e.Ve, true);
+    if (computePendingState(e)) setSignal(e.Fe, true);
   }
-  return e.Ve;
+  return e.Fe;
 }
 function computePendingState(e) {
   const t = e;
   const n = e.I;
   if (n && e.Z !== S) {
-    return !n.Oe && !(n.ge & a);
+    return !n.Ee && !(n.ge & a);
   }
   if (e.ee !== undefined && e.ee !== S) {
     if (t.ge & a && !(t.ge & p)) return true;
@@ -1558,9 +1590,9 @@ function computePendingState(e) {
   return !!(t.ge & a && !(t.ge & p));
 }
 function updatePendingSignal(e) {
-  if (e.Ve) {
+  if (e.Fe) {
     const t = computePendingState(e);
-    const n = e.Ve;
+    const n = e.Fe;
     setSignal(n, t);
     if (!t && n.Y) {
       const t = resolveLane(e);
@@ -1576,20 +1608,20 @@ function updatePendingSignal(e) {
   }
 }
 function getLatestValueComputed(e) {
-  if (!e.Pe) {
-    const t = V;
-    V = false;
+  if (!e.He) {
+    const t = F;
+    F = false;
     const n = q;
     q = false;
-    const r = B;
-    B = null;
-    e.Pe = optimisticComputed(() => read(e));
-    e.Pe.ye = e;
-    B = r;
+    const r = V;
+    V = null;
+    e.He = optimisticComputed(() => read(e));
+    e.He.ye = e;
+    V = r;
     q = n;
-    V = t;
+    F = t;
   }
-  return e.Pe;
+  return e.He;
 }
 function staleValues(e, t = true) {
   const n = H;
@@ -1601,12 +1633,12 @@ function staleValues(e, t = true) {
   }
 }
 function latest(e) {
-  const t = V;
-  V = true;
+  const t = F;
+  F = true;
   try {
     return e();
   } finally {
-    V = t;
+    F = t;
   }
 }
 function isPending(e) {
@@ -1650,7 +1682,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.Ie[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.Ne[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1660,10 +1692,10 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.Ie = { ...n.Ie, [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?.Ie[e.id]);
+  return !isUndefined(t?.Ne[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
@@ -1673,27 +1705,27 @@ function effect(e, t, n, r, i) {
   const o = computed(i?.render ? t => staleValues(() => e(t)) : e, r, {
     ...i,
     equals: () => {
-      o.V = !o.ae;
-      if (s) o.B.enqueue(o.D, runEffect.bind(o));
+      o.F = !o.ae;
+      if (s) o.V.enqueue(o.D, runEffect.bind(o));
       return false;
     },
     lazy: true
   });
-  o.Be = r;
-  o.Fe = t;
-  o.Me = n;
+  o.Ve = r;
+  o.Me = t;
+  o.Be = n;
   o.Ge = undefined;
   o.D = i?.render ? h : g;
-  o.ve = (e, t) => {
+  o.Qe = (e, t) => {
     const n = e !== undefined ? e : o.ge;
     const r = t !== undefined ? t : o.ae;
     if (n & d) {
       let e = r;
-      o.B.notify(o, a, 0);
+      o.V.notify(o, a, 0);
       if (o.D === g) {
         try {
-          return o.Me
-            ? o.Me(e, () => {
+          return o.Be
+            ? o.Be(e, () => {
                 o.Ge?.();
                 o.Ge = undefined;
               })
@@ -1702,60 +1734,66 @@ function effect(e, t, n, r, i) {
           e = t;
         }
       }
-      if (!o.B.notify(o, d, d)) throw e;
+      if (!o.V.notify(o, d, d)) throw e;
     } else if (o.D === h) {
-      o.B.notify(o, a | d, n, r);
+      o.V.notify(o, a | d, n, r);
     }
   };
   recompute(o, true);
-  !i?.defer && (o.D === g ? o.B.enqueue(o.D, runEffect.bind(o)) : runEffect.call(o));
+  !i?.defer && (o.D === g ? o.V.enqueue(o.D, runEffect.bind(o)) : runEffect.call(o));
   s = true;
   cleanup(() => o.Ge?.());
 }
 function runEffect() {
-  if (!this.V || this.m & u) return;
+  if (!this.F || this.m & u) return;
   this.Ge?.();
   this.Ge = undefined;
   try {
-    this.Ge = this.Fe(this.$, this.Be);
+    const e = this.Me(this.$, this.Ve);
+    if (false && e !== undefined && typeof e !== "function");
+    this.Ge = e;
   } catch (e) {
     this.ae = new StatusError(this, e);
     this.ge |= d;
-    if (!this.B.notify(this, d, d)) throw e;
+    if (!this.V.notify(this, d, d)) throw e;
   } finally {
-    this.Be = this.$;
-    this.V = false;
+    this.Ve = this.$;
+    this.F = false;
   }
 }
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.V || n.m & u) return;
-    n.V = false;
-    recompute(n);
+    if (!n.F || n.m & u) return;
+    try {
+      n.F = false;
+      recompute(n);
+    } finally {
+    }
   };
   const n = computed(
     () => {
       n.Ge?.();
       n.Ge = undefined;
-      n.Ge = staleValues(e) || undefined;
+      const t = staleValues(e);
+      n.Ge = t;
     },
     undefined,
     { ...t, lazy: true }
   );
   n.Ge = undefined;
   n.Ke = true;
-  n.V = true;
+  n.F = true;
   n.D = y;
-  n.ve = (e, t) => {
+  n.Qe = (e, t) => {
     const r = e !== undefined ? e : n.ge;
     if (r & d) {
-      n.B.notify(n, a, 0);
+      n.V.notify(n, a, 0);
       const e = t !== undefined ? t : n.ae;
-      if (!n.B.notify(n, d, d)) throw e;
+      if (!n.V.notify(n, d, d)) throw e;
     }
   };
-  n.F = run;
-  n.B.enqueue(g, run);
+  n.M = run;
+  n.V.enqueue(g, run);
   cleanup(() => n.Ge?.());
 }
 function restoreTransition(e, t) {
@@ -1841,7 +1879,9 @@ function createReaction(e, t) {
         () => (i(), getOwner()),
         t => {
           n?.();
-          n = (e.effect || e)?.();
+          const r = (e.effect || e)?.();
+          if (false && r !== undefined && typeof r !== "function");
+          n = r;
           dispose(t);
         },
         e.error,
@@ -1873,7 +1913,7 @@ function createOptimistic(e, t, n) {
 function onSettled(e) {
   const t = getOwner();
   t && !t.Ke
-    ? createTrackedEffect(() => untrack(e))
+    ? createTrackedEffect(() => untrack(e), undefined)
     : A.enqueue(g, () => {
         const t = e();
         t?.();
@@ -2040,7 +2080,7 @@ function createProjectionInternal(e, t = {}, n) {
     let i;
     const o = new Proxy(
       s,
-      createWriteTraps(() => !r || t.Oe === i)
+      createWriteTraps(() => !r || t.Ee === i)
     );
     storeSetter(o, o => {
       i = e(o);
@@ -2051,7 +2091,7 @@ function createProjectionInternal(e, t = {}, n) {
       u !== o && u !== undefined && reconcile(u, n?.key || "id")(s);
     });
   });
-  r.Qe = true;
+  r.Oe = true;
   return { store: s, node: r };
 }
 function createProjection(e, t = {}, n) {
@@ -2247,7 +2287,7 @@ const fe = {
       untrack(() => {
         const i = e[X];
         const s = i[t];
-        if (M && typeof t !== "symbol" && !((e[re]?.ge ?? 0) & a)) {
+        if (B && typeof t !== "symbol" && !((e[re]?.ge ?? 0) & a)) {
           if (!e[m]) {
             e[m] = Object.create(null);
             G?.add(e);
@@ -2424,7 +2464,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
       let i;
       const o = new Proxy(
         s,
-        createWriteTraps(() => !r || t.Oe === i)
+        createWriteTraps(() => !r || t.Ee === i)
       );
       setProjectionWriteActive(true);
       try {
@@ -2445,7 +2485,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
         setProjectionWriteActive(false);
       }
     });
-    r.Qe = true;
+    r.Oe = true;
   }
   return { store: s, node: r };
 }
@@ -2899,21 +2939,21 @@ function compare(e, t, n) {
 }
 function boundaryComputed(e, t) {
   const n = computed(e, undefined, { lazy: true });
-  n.ve = (e, t) => {
+  n.Qe = (e, t) => {
     const r = e !== undefined ? e : n.ge;
     const i = t !== undefined ? t : n.ae;
     n.ge &= ~n.ut;
-    n.B.notify(n, n.ut, r, i);
+    n.V.notify(n, n.ut, r, i);
   };
   n.ut = t;
-  n.Qe = true;
+  n.Oe = true;
   recompute(n, true);
   return n;
 }
 function createBoundChildren(e, t, n, r) {
-  const i = e.B;
-  i.addChild((e.B = n));
-  cleanup(() => i.removeChild(e.B));
+  const i = e.V;
+  i.addChild((e.V = n));
+  cleanup(() => i.removeChild(e.V));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);