@solidjs/signals 0.13.5 → 0.13.6

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;
     }
@@ -688,9 +692,9 @@ function settlePendingSource(e) {
       if (r._e) {
         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;
@@ -773,7 +777,7 @@ function handleAsync(e, t, r) {
     r = false;
     if (!n) {
       A.initTransition(resolveTransition(e));
-      throw new NotReadyError(B);
+      throw new NotReadyError(V);
     }
   }
   if (s) {
@@ -809,14 +813,13 @@ function handleAsync(e, t, r) {
     const i = iterate();
     if (!r && !i) {
       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.ge = t ? 0 : e.ge & p;
   setPendingError(e);
@@ -834,11 +837,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;
     }
@@ -850,6 +851,9 @@ function notifyStatus(e, t, n, r, i) {
   const c = r || f;
   const l = r || u ? undefined : i;
   if (e.ve) {
+    if (r && t === a) {
+      return;
+    }
     if (c) {
       e.ve(t, n);
     } else {
@@ -863,7 +867,7 @@ function notifyStatus(e, t, n, r, i) {
       (t === a && s && e.me !== s && !e.be?.has(s)) ||
       (t !== a && (e.ae !== n || e.me || e.be))
     ) {
-      !e.K && A.se.push(e);
+      if (!c && !e.K) A.se.push(e);
       notifyStatus(e, t, n, c, l);
     }
   });
@@ -891,7 +895,7 @@ function enableExternalSource(e) {
     I = { factory: t, untrack: n };
   }
 }
-const T = {};
+const R = {};
 function markDisposal(e) {
   let t = e.Ee;
   while (t) {
@@ -971,24 +975,24 @@ function formatId(e, t) {
   return e + (r ? String.fromCharCode(64 + r) : "") + n;
 }
 function getObserver() {
-  if (q || V) return T;
-  return R ? B : null;
+  if (q || F) return R;
+  return T ? V : null;
 }
 function getOwner() {
-  return B;
+  return V;
 }
 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];
+  if (!V) return e;
+  if (!V.Ne) V.Ne = e;
+  else if (Array.isArray(V.Ne)) V.Ne.push(e);
+  else V.Ne = [V.Ne, e];
   return e;
 }
 function isDisposed(e) {
   return !!(e.m & (u | o));
 }
 function createOwner(e) {
-  const t = B;
+  const t = V;
   const n = e?.transparent ?? false;
   const r = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
@@ -998,7 +1002,7 @@ function createOwner(e) {
     Ee: null,
     ke: null,
     Ne: null,
-    B: t?.B ?? A,
+    V: t?.V ?? A,
     Ie: t?.Ie || _,
     je: 0,
     Ae: null,
@@ -1027,15 +1031,15 @@ 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;
+  const i = e.Re;
+  if (r !== null) r.Re = i;
+  else t.Te = 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);
+      t.R && !t.Qe && !(t.m & o) && unobserved(t);
     }
   }
   return n;
@@ -1061,9 +1065,9 @@ function link(e, t) {
       return;
     }
   }
-  const o = e.Re;
+  const o = e.Te;
   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 });
+  const u = (t.Ce = e.Te = { L: e, k: t, N: i, Re: o, P: null });
   if (n !== null) n.N = u;
   else t.A = u;
   if (o !== null) o.P = u;
@@ -1083,15 +1087,15 @@ function isValidLink(e, t) {
 }
 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 +1105,7 @@ function ownerInSnapshotScope(e) {
   return false;
 }
 function setSnapshotCapture(e) {
-  M = e;
+  B = e;
   if (e && !G) G = new Set();
 }
 function markSnapshotScope(e) {
@@ -1119,7 +1123,7 @@ function releaseSubtree(e) {
       t = t.ke;
       continue;
     }
-    if (t.T) {
+    if (t.R) {
       const e = t;
       e.he = false;
       if (e.m & c) {
@@ -1141,7 +1145,7 @@ function clearSnapshots() {
     }
     G = null;
   }
-  M = false;
+  B = false;
 }
 function recompute(t, n = false) {
   const i = t.D;
@@ -1161,22 +1165,22 @@ function recompute(t, n = false) {
   const s = !!(t.m & f);
   const u = t.ee !== undefined && t.ee !== S;
   const l = !!(t.ge & a);
-  const p = B;
-  B = t;
+  const p = V;
+  V = t;
   t.Ce = 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,8 +1188,8 @@ 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;
@@ -1201,9 +1205,9 @@ 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;
@@ -1236,7 +1240,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 +1249,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) {
@@ -1261,16 +1265,16 @@ 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),
+    id: r?.id ?? (i ? V?.id : V?.id != null ? getNextChildId(V) : undefined),
     Le: i || undefined,
     xe: r?.equals != null ? r.equals : isEqual,
     le: !!r?.pureWrite,
     He: r?.unobserved,
     Ne: null,
-    B: B?.B ?? A,
-    Ie: B?.Ie ?? _,
+    V: V?.V ?? A,
+    Ie: V?.Ie ?? _,
     je: 0,
-    T: t,
+    R: t,
     $: n,
     o: 0,
     C: null,
@@ -1279,8 +1283,8 @@ function computed(t, n, r) {
     A: null,
     Ce: null,
     O: null,
-    Re: null,
-    i: B,
+    Te: null,
+    i: V,
     ke: null,
     Ee: null,
     m: r?.lazy ? l : e,
@@ -1293,31 +1297,31 @@ function computed(t, n, r) {
     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.Ee;
     if (e === null) {
-      B.Ee = s;
+      V.Ee = s;
     } else {
       s.ke = e;
-      B.Ee = s;
+      V.Ee = s;
     }
   }
   if (o) s.o = o.o + 1;
-  if (M && ownerInSnapshotScope(B)) s.he = true;
+  if (B && ownerInSnapshotScope(V)) s.he = true;
   if (I) {
     const e = signal(undefined, { equals: false, pureWrite: true });
-    const t = I.factory(s.T, () => {
+    const t = I.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);
@@ -1333,14 +1337,14 @@ function signal(e, t, n = null) {
     He: t?.unobserved,
     $: e,
     O: null,
-    Re: null,
+    Te: 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 +1364,35 @@ function isEqual(e, t) {
   return e === t;
 }
 function untrack(e, t) {
-  if (!I && !R && true) return e();
-  const n = R;
-  R = false;
+  if (!I && !T && true) return e();
+  const n = T;
+  T = false;
   try {
     if (I) return I.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;
       }
@@ -1410,18 +1414,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 +1440,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 +1478,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.$
@@ -1485,7 +1492,7 @@ function setSignal(e, t) {
   if (typeof t === "function") t = t(i);
   const s = !e.xe || !e.xe(i, t) || !!(e.ge & p);
   if (!s) {
-    if (n && r && e.T) {
+    if (n && r && e.R) {
       insertSubs(e, true);
       schedule();
     }
@@ -1516,26 +1523,26 @@ 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;
@@ -1558,9 +1565,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);
@@ -1577,17 +1584,17 @@ function updatePendingSignal(e) {
 }
 function getLatestValueComputed(e) {
   if (!e.Pe) {
-    const t = V;
-    V = false;
+    const t = F;
+    F = false;
     const n = q;
     q = false;
-    const r = B;
-    B = null;
+    const r = V;
+    V = null;
     e.Pe = optimisticComputed(() => read(e));
     e.Pe.ye = e;
-    B = r;
+    V = r;
     q = n;
-    V = t;
+    F = t;
   }
   return e.Pe;
 }
@@ -1601,12 +1608,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) {
@@ -1673,15 +1680,15 @@ 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) => {
@@ -1689,11 +1696,11 @@ function effect(e, t, n, r, i) {
     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,36 +1709,39 @@ 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);
+    this.Ge = this.Me(this.$, this.Ve);
   } 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(
     () => {
@@ -1744,18 +1754,18 @@ function trackedEffect(e, t) {
   );
   n.Ge = undefined;
   n.Ke = true;
-  n.V = true;
+  n.F = true;
   n.D = y;
   n.ve = (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) {
@@ -2247,7 +2257,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);
@@ -2903,7 +2913,7 @@ function boundaryComputed(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;
@@ -2911,9 +2921,9 @@ function boundaryComputed(e, t) {
   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);