@solidjs/signals 0.13.6 → 0.13.7

package/dist/prod.js

@@ -619,39 +619,230 @@ function assignOrMergeLane(e, t) {
   }
   e.q = t;
 }
+function unlinkSubs(e) {
+  const t = e.m;
+  const n = e.D;
+  const i = e.p;
+  const r = e.Ie;
+  if (i !== null) i.Ie = r;
+  else t.pe = r;
+  if (r !== null) r.p = i;
+  else {
+    t.I = i;
+    if (i === null) {
+      t.he?.();
+      t.L && !t.Ae && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
+    }
+  }
+  return n;
+}
+function unobserved(e) {
+  deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  let t = e.C;
+  while (t !== null) {
+    t = unlinkSubs(t);
+  }
+  e.C = null;
+  disposeChildren(e, true);
+}
+function link(e, t) {
+  const n = t.Ne;
+  if (n !== null && n.m === e) return;
+  let i = null;
+  const r = t.O & REACTIVE_RECOMPUTING_DEPS;
+  if (r) {
+    i = n !== null ? n.D : t.C;
+    if (i !== null && i.m === e) {
+      t.Ne = i;
+      return;
+    }
+  }
+  const s = e.pe;
+  if (s !== null && s.h === t && (!r || isValidLink(s, t))) return;
+  const o = (t.Ne = e.pe = { m: e, h: t, D: i, Ie: s, p: null });
+  if (n !== null) n.D = o;
+  else t.C = o;
+  if (s !== null) s.p = o;
+  else e.I = o;
+}
+function isValidLink(e, t) {
+  const n = t.Ne;
+  if (n !== null) {
+    let i = t.C;
+    do {
+      if (i === e) return true;
+      if (i === n) break;
+      i = i.D;
+    } while (i !== null);
+  }
+  return false;
+}
+const PENDING_OWNER = {};
+function markDisposal(e) {
+  let t = e.ge;
+  while (t) {
+    t.O |= REACTIVE_ZOMBIE;
+    if (t.O & REACTIVE_IN_HEAP) {
+      deleteFromHeap(t, dirtyQueue);
+      insertIntoHeap(t, zombieQueue);
+    }
+    markDisposal(t);
+    t = t.Pe;
+  }
+}
+function dispose(e) {
+  let t = e.C || null;
+  do {
+    t = unlinkSubs(t);
+  } while (t !== null);
+  e.C = null;
+  e.Ne = null;
+  disposeChildren(e, true);
+}
+function disposeChildren(e, t = false, n) {
+  if (e.O & REACTIVE_DISPOSED) return;
+  if (t) e.O = REACTIVE_DISPOSED;
+  if (t && e.L) e.Ce = null;
+  let i = n ? e.De : e.ge;
+  while (i) {
+    const e = i.Pe;
+    if (i.C) {
+      const e = i;
+      deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+      let t = e.C;
+      do {
+        t = unlinkSubs(t);
+      } while (t !== null);
+      e.C = null;
+      e.Ne = null;
+    }
+    disposeChildren(i, true);
+    i = e;
+  }
+  if (n) {
+    e.De = null;
+  } else {
+    e.ge = null;
+    e.ye = 0;
+  }
+  runDisposal(e, n);
+}
+function runDisposal(e, t) {
+  let n = t ? e.me : e.ve;
+  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.me = null) : (e.ve = null);
+}
+function childId(e, t) {
+  let n = e;
+  while (n.we && n.i) n = n.i;
+  if (n.id != null) return formatId(n.id, t ? n.ye++ : n.ye);
+  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),
+    i = n.length - 1;
+  return e + (i ? String.fromCharCode(64 + i) : "") + n;
+}
+function getObserver() {
+  if (pendingCheckActive || latestReadActive) return PENDING_OWNER;
+  return tracking ? context : null;
+}
+function getOwner() {
+  return context;
+}
+function cleanup(e) {
+  if (!context) return e;
+  if (!context.ve) context.ve = e;
+  else if (Array.isArray(context.ve)) context.ve.push(e);
+  else context.ve = [context.ve, e];
+  return e;
+}
+function isDisposed(e) {
+  return !!(e.O & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE));
+}
+function createOwner(e) {
+  const t = context;
+  const n = e?.transparent ?? false;
+  const i = {
+    id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
+    we: n || undefined,
+    t: true,
+    u: t?.t ? t.u : t,
+    ge: null,
+    Pe: null,
+    ve: null,
+    F: t?.F ?? globalQueue,
+    be: t?.be || defaultContext,
+    ye: 0,
+    me: null,
+    De: null,
+    i: t,
+    dispose(e = true) {
+      disposeChildren(i, e);
+    }
+  };
+  if (t) {
+    const e = t.ge;
+    if (e === null) {
+      t.ge = i;
+    } else {
+      i.Pe = e;
+      t.ge = i;
+    }
+  }
+  return i;
+}
+function createRoot(e, t) {
+  const n = createOwner(t);
+  return runWithOwner(n, () => e(n.dispose));
+}
 function addPendingSource(e, t) {
-  if (e.Ie === t || e.pe?.has(t)) return false;
-  if (!e.Ie) {
-    e.Ie = t;
+  if (e.Ve === t || e.Le?.has(t)) return false;
+  if (!e.Ve) {
+    e.Ve = t;
     return true;
   }
-  if (!e.pe) {
-    e.pe = new Set([e.Ie, t]);
+  if (!e.Le) {
+    e.Le = new Set([e.Ve, t]);
   } else {
-    e.pe.add(t);
+    e.Le.add(t);
   }
-  e.Ie = undefined;
+  e.Ve = undefined;
   return true;
 }
 function removePendingSource(e, t) {
-  if (e.Ie) {
-    if (e.Ie !== t) return false;
-    e.Ie = undefined;
+  if (e.Ve) {
+    if (e.Ve !== t) return false;
+    e.Ve = undefined;
     return true;
   }
-  if (!e.pe?.delete(t)) return false;
-  if (e.pe.size === 1) {
-    e.Ie = e.pe.values().next().value;
-    e.pe = undefined;
-  } else if (e.pe.size === 0) {
-    e.pe = undefined;
+  if (!e.Le?.delete(t)) return false;
+  if (e.Le.size === 1) {
+    e.Ve = e.Le.values().next().value;
+    e.Le = undefined;
+  } else if (e.Le.size === 0) {
+    e.Le = undefined;
   }
   return true;
 }
 function clearPendingSources(e) {
-  e.Ie = undefined;
-  e.pe?.clear();
-  e.pe = undefined;
+  e.Ve = undefined;
+  e.Le?.clear();
+  e.Le = undefined;
 }
 function setPendingError(e, t, n) {
   if (!t) {
@@ -680,7 +871,7 @@ function settlePendingSource(e) {
     if (n.has(i) || !removePendingSource(i, e)) return;
     n.add(i);
     i.Ee = clock;
-    const r = i.Ie ?? i.pe?.values().next().value;
+    const r = i.Ve ?? i.Le?.values().next().value;
     if (r) {
       setPendingError(i, r);
       updatePendingSignal(i);
@@ -688,7 +879,7 @@ function settlePendingSource(e) {
       i.Se &= ~STATUS_PENDING;
       setPendingError(i);
       updatePendingSignal(i);
-      if (i.he) {
+      if (i.Ue) {
         if (i.W === EFFECT_TRACKED) {
           const e = i;
           if (!e.H) {
@@ -702,7 +893,7 @@ function settlePendingSource(e) {
         }
         t = true;
       }
-      i.he = false;
+      i.Ue = false;
     }
     forEachDependent(i, settle);
   };
@@ -714,19 +905,19 @@ function handleAsync(e, t, n) {
   const r = i && untrack(() => t[Symbol.asyncIterator]);
   const s = !r && i && untrack(() => typeof t.then === "function");
   if (!s && !r) {
-    e.Ae = null;
+    e.Ce = null;
     return t;
   }
-  e.Ae = t;
+  e.Ce = t;
   let o;
   const handleError = n => {
-    if (e.Ae !== t) return;
+    if (e.Ce !== t) return;
     globalQueue.initTransition(resolveTransition(e));
     notifyStatus(e, n instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR, n);
     e.Ee = clock;
   };
   const asyncWrite = (i, r) => {
-    if (e.Ae !== t) return;
+    if (e.Ce !== t) return;
     if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
     globalQueue.initTransition(resolveTransition(e));
     clearStatus(e);
@@ -742,12 +933,12 @@ function handleAsync(e, t, n) {
       e.Ee = clock;
     } else if (s) {
       const t = e.J;
-      const n = e.Ne;
+      const n = e.ke;
       if (!n || !n(i, t)) {
         e.J = i;
         e.Ee = clock;
-        if (e.Pe) {
-          setSignal(e.Pe, i);
+        if (e.Ge) {
+          setSignal(e.Ge, i);
         }
         insertSubs(e, true);
       }
@@ -782,35 +973,53 @@ function handleAsync(e, t, n) {
   if (r) {
     const n = t[Symbol.asyncIterator]();
     let i = false;
+    let r = false;
+    cleanup(() => {
+      if (r) return;
+      r = true;
+      try {
+        const e = n.return?.();
+        if (e && typeof e.then === "function") {
+          e.then(undefined, () => {});
+        }
+      } catch {}
+    });
     const iterate = () => {
-      let e,
-        t = false,
-        r = true;
+      let s,
+        u = false,
+        c = true;
       n.next().then(
         n => {
-          if (r) {
-            e = n;
-            t = true;
+          if (c) {
+            s = n;
+            u = true;
+            if (n.done) r = true;
+          } else if (e.Ce !== t) {
+            return;
           } else if (!n.done) asyncWrite(n.value, iterate);
           else {
+            r = true;
             schedule();
             flush();
           }
         },
-        e => {
-          if (!r) handleError(e);
+        n => {
+          if (!c && e.Ce === t) {
+            r = true;
+            handleError(n);
+          }
         }
       );
-      r = false;
-      if (t && !e.done) {
-        o = e.value;
+      c = false;
+      if (u && !s.done) {
+        o = s.value;
         i = true;
         return iterate();
       }
-      return t && e.done;
+      return u && s.done;
     };
-    const r = iterate();
-    if (!i && !r) {
+    const s = iterate();
+    if (!i && !s) {
       globalQueue.initTransition(resolveTransition(e));
       throw new NotReadyError(context);
     }
@@ -819,11 +1028,11 @@ function handleAsync(e, t, n) {
 }
 function clearStatus(e, t = false) {
   clearPendingSources(e);
-  e.he = false;
+  e.Ue = false;
   e.Se = t ? 0 : e.Se & STATUS_UNINITIALIZED;
   setPendingError(e);
   updatePendingSignal(e);
-  e.ge?.();
+  e.xe?.();
 }
 function notifyStatus(e, t, n, i, r) {
   if (t === STATUS_ERROR && !(n instanceof StatusError) && !(n instanceof NotReadyError))
@@ -849,22 +1058,22 @@ function notifyStatus(e, t, n, i, r) {
   }
   const a = i || c;
   const f = i || u ? undefined : r;
-  if (e.ge) {
+  if (e.xe) {
     if (i && t === STATUS_PENDING) {
       return;
     }
     if (a) {
-      e.ge(t, n);
+      e.xe(t, n);
     } else {
-      e.ge();
+      e.xe();
     }
     return;
   }
   forEachDependent(e, e => {
     e.Ee = clock;
     if (
-      (t === STATUS_PENDING && s && e.Ie !== s && !e.pe?.has(s)) ||
-      (t !== STATUS_PENDING && (e.le !== n || e.Ie || e.pe))
+      (t === STATUS_PENDING && s && e.Ve !== s && !e.Le?.has(s)) ||
+      (t !== STATUS_PENDING && (e.le !== n || e.Ve || e.Le))
     ) {
       if (!a && !e.K) globalQueue.se.push(e);
       notifyStatus(e, t, n, a, f);
@@ -894,196 +1103,6 @@ function enableExternalSource(e) {
     externalSourceConfig = { factory: t, untrack: n };
   }
 }
-const PENDING_OWNER = {};
-function markDisposal(e) {
-  let t = e.Ce;
-  while (t) {
-    t.O |= REACTIVE_ZOMBIE;
-    if (t.O & REACTIVE_IN_HEAP) {
-      deleteFromHeap(t, dirtyQueue);
-      insertIntoHeap(t, zombieQueue);
-    }
-    markDisposal(t);
-    t = t.De;
-  }
-}
-function dispose(e) {
-  let t = e.C || null;
-  do {
-    t = unlinkSubs(t);
-  } while (t !== null);
-  e.C = null;
-  e.ye = null;
-  disposeChildren(e, true);
-}
-function disposeChildren(e, t = false, n) {
-  if (e.O & REACTIVE_DISPOSED) return;
-  if (t) e.O = REACTIVE_DISPOSED;
-  let i = n ? e.me : e.Ce;
-  while (i) {
-    const e = i.De;
-    if (i.C) {
-      const e = i;
-      deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-      let t = e.C;
-      do {
-        t = unlinkSubs(t);
-      } while (t !== null);
-      e.C = null;
-      e.ye = null;
-    }
-    disposeChildren(i, true);
-    i = e;
-  }
-  if (n) {
-    e.me = null;
-  } else {
-    e.Ce = null;
-    e.ve = 0;
-  }
-  runDisposal(e, n);
-}
-function runDisposal(e, t) {
-  let n = t ? e.we : e.be;
-  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.be = null);
-}
-function childId(e, t) {
-  let n = e;
-  while (n.Ve && n.i) n = n.i;
-  if (n.id != null) return formatId(n.id, t ? n.ve++ : n.ve);
-  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),
-    i = n.length - 1;
-  return e + (i ? String.fromCharCode(64 + i) : "") + n;
-}
-function getObserver() {
-  if (pendingCheckActive || latestReadActive) return PENDING_OWNER;
-  return tracking ? context : null;
-}
-function getOwner() {
-  return context;
-}
-function cleanup(e) {
-  if (!context) return e;
-  if (!context.be) context.be = e;
-  else if (Array.isArray(context.be)) context.be.push(e);
-  else context.be = [context.be, e];
-  return e;
-}
-function isDisposed(e) {
-  return !!(e.O & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE));
-}
-function createOwner(e) {
-  const t = context;
-  const n = e?.transparent ?? false;
-  const i = {
-    id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    Ve: n || undefined,
-    t: true,
-    u: t?.t ? t.u : t,
-    Ce: null,
-    De: null,
-    be: null,
-    F: t?.F ?? globalQueue,
-    Le: t?.Le || defaultContext,
-    ve: 0,
-    we: null,
-    me: null,
-    i: t,
-    dispose(e = true) {
-      disposeChildren(i, e);
-    }
-  };
-  if (t) {
-    const e = t.Ce;
-    if (e === null) {
-      t.Ce = i;
-    } else {
-      i.De = e;
-      t.Ce = i;
-    }
-  }
-  return i;
-}
-function createRoot(e, t) {
-  const n = createOwner(t);
-  return runWithOwner(n, () => e(n.dispose));
-}
-function unlinkSubs(e) {
-  const t = e.m;
-  const n = e.D;
-  const i = e.p;
-  const r = e.Ue;
-  if (i !== null) i.Ue = r;
-  else t.ke = r;
-  if (r !== null) r.p = i;
-  else {
-    t.I = i;
-    if (i === null) {
-      t.Ge?.();
-      t.L && !t.xe && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
-    }
-  }
-  return n;
-}
-function unobserved(e) {
-  deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-  let t = e.C;
-  while (t !== null) {
-    t = unlinkSubs(t);
-  }
-  e.C = null;
-  disposeChildren(e, true);
-}
-function link(e, t) {
-  const n = t.ye;
-  if (n !== null && n.m === e) return;
-  let i = null;
-  const r = t.O & REACTIVE_RECOMPUTING_DEPS;
-  if (r) {
-    i = n !== null ? n.D : t.C;
-    if (i !== null && i.m === e) {
-      t.ye = i;
-      return;
-    }
-  }
-  const s = e.ke;
-  if (s !== null && s.h === t && (!r || isValidLink(s, t))) return;
-  const o = (t.ye = e.ke = { m: e, h: t, D: i, Ue: s, p: null });
-  if (n !== null) n.D = o;
-  else t.C = o;
-  if (s !== null) s.p = o;
-  else e.I = o;
-}
-function isValidLink(e, t) {
-  const n = t.ye;
-  if (n !== null) {
-    let i = t.C;
-    do {
-      if (i === e) return true;
-      if (i === n) break;
-      i = i.D;
-    } while (i !== null);
-  }
-  return false;
-}
 GlobalQueue.oe = recompute;
 GlobalQueue.ue = disposeChildren;
 let tracking = false;
@@ -1116,10 +1135,10 @@ function releaseSnapshotScope(e) {
   schedule();
 }
 function releaseSubtree(e) {
-  let t = e.Ce;
+  let t = e.ge;
   while (t) {
     if (t.We) {
-      t = t.De;
+      t = t.Pe;
       continue;
     }
     if (t.L) {
@@ -1133,7 +1152,7 @@ function releaseSubtree(e) {
       }
     }
     releaseSubtree(t);
-    t = t.De;
+    t = t.Pe;
   }
 }
 function clearSnapshots() {
@@ -1152,14 +1171,15 @@ function recompute(e, t = false) {
     if (e.K && (!n || activeTransition) && activeTransition !== e.K)
       globalQueue.initTransition(e.K);
     deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+    e.Ce = null;
     if (e.K || n === EFFECT_TRACKED) disposeChildren(e);
     else {
       markDisposal(e);
-      e.we = e.be;
-      e.me = e.Ce;
-      e.be = null;
-      e.Ce = null;
-      e.ve = 0;
+      e.me = e.ve;
+      e.De = e.ge;
+      e.ve = null;
+      e.ge = null;
+      e.ye = 0;
     }
   }
   const i = !!(e.O & REACTIVE_OPTIMISTIC_DIRTY);
@@ -1167,7 +1187,7 @@ function recompute(e, t = false) {
   const s = !!(e.Se & STATUS_PENDING);
   const o = context;
   context = e;
-  e.ye = null;
+  e.Ne = null;
   e.O = REACTIVE_RECOMPUTING_DEPS;
   e.Ee = clock;
   let u = e.X === NOT_PENDING ? e.J : e.X;
@@ -1196,7 +1216,7 @@ function recompute(e, t = false) {
         updatePendingSignal(t.te);
       }
     }
-    if (t instanceof NotReadyError) e.he = true;
+    if (t instanceof NotReadyError) e.Ue = true;
     notifyStatus(
       e,
       t instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR,
@@ -1210,7 +1230,7 @@ function recompute(e, t = false) {
     context = o;
   }
   if (!e.le) {
-    const o = e.ye;
+    const o = e.Ne;
     let a = o !== null ? o.D : e.C;
     if (a !== null) {
       do {
@@ -1220,7 +1240,7 @@ function recompute(e, t = false) {
       else e.C = null;
     }
     const f = r ? e.ee : e.X === NOT_PENDING ? e.J : e.X;
-    const l = !e.Ne || !e.Ne(f, u);
+    const l = !e.ke || !e.ke(f, u);
     if (l) {
       const o = r ? e.ee : undefined;
       if (t || (n && activeTransition !== e.K) || i) {
@@ -1257,7 +1277,7 @@ function updateIfNecessary(e) {
       }
     }
   }
-  if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.le && e.Ee < clock && !e.Ae)) {
+  if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.le && e.Ee < clock && !e.Ce)) {
     recompute(e);
   }
   e.O = REACTIVE_NONE | (e.O & REACTIVE_SNAPSHOT_STALE);
@@ -1266,14 +1286,14 @@ function computed(e, t, n) {
   const i = n?.transparent ?? false;
   const r = {
     id: n?.id ?? (i ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
-    Ve: i || undefined,
-    Ne: n?.equals != null ? n.equals : isEqual,
+    we: i || undefined,
+    ke: n?.equals != null ? n.equals : isEqual,
     fe: !!n?.pureWrite,
-    Ge: n?.unobserved,
-    be: null,
+    he: n?.unobserved,
+    ve: null,
     F: context?.F ?? globalQueue,
-    Le: context?.Le ?? defaultContext,
-    ve: 0,
+    be: context?.be ?? defaultContext,
+    ye: 0,
     L: e,
     J: t,
     o: 0,
@@ -1281,30 +1301,30 @@ function computed(e, t, n) {
     S: undefined,
     T: null,
     C: null,
-    ye: null,
+    Ne: null,
     I: null,
-    ke: null,
+    pe: null,
     i: context,
-    De: null,
-    Ce: null,
+    Pe: null,
+    ge: null,
     O: n?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
     Se: STATUS_UNINITIALIZED,
     Ee: clock,
     X: NOT_PENDING,
-    we: null,
     me: null,
-    Ae: null,
+    De: null,
+    Ce: null,
     K: null
   };
   r.T = r;
   const s = context?.t ? context.u : context;
   if (context) {
-    const e = context.Ce;
+    const e = context.ge;
     if (e === null) {
-      context.Ce = r;
+      context.ge = r;
     } else {
-      r.De = e;
-      context.Ce = r;
+      r.Pe = e;
+      context.ge = r;
     }
   }
   if (s) r.o = s.o + 1;
@@ -1331,13 +1351,13 @@ function computed(e, t, n) {
 }
 function signal(e, t, n = null) {
   const i = {
-    Ne: t?.equals != null ? t.equals : isEqual,
+    ke: t?.equals != null ? t.equals : isEqual,
     fe: !!t?.pureWrite,
     He: !!t?.He,
-    Ge: t?.unobserved,
+    he: t?.unobserved,
     J: e,
     I: null,
-    ke: null,
+    pe: null,
     Ee: clock,
     V: n,
     N: n?.A || null,
@@ -1404,9 +1424,14 @@ function read(e) {
     const n = pendingCheckActive;
     pendingCheckActive = false;
     if (t && e.ee !== undefined) {
-      if (e.ee !== NOT_PENDING && (t.Ae || !!(t.Se & STATUS_PENDING))) {
+      if (e.ee !== NOT_PENDING && (t.Ce || !!(t.Se & STATUS_PENDING))) {
         foundPending = true;
       }
+      let n = context;
+      if (n?.t) n = n.u;
+      if (n && tracking) link(e, n);
+      read(getPendingSignal(e));
+      read(getPendingSignal(t));
     } else {
       if (read(getPendingSignal(e))) foundPending = true;
       if (t && read(getPendingSignal(t))) foundPending = true;
@@ -1491,7 +1516,7 @@ function setSignal(e, t) {
   const i = e.ee !== undefined && e.ee !== NOT_PENDING;
   const r = n ? (i ? e.ee : e.J) : e.X === NOT_PENDING ? e.J : e.X;
   if (typeof t === "function") t = t(r);
-  const s = !e.Ne || !e.Ne(r, t) || !!(e.Se & STATUS_UNINITIALIZED);
+  const s = !e.ke || !e.ke(r, t) || !!(e.Se & STATUS_UNINITIALIZED);
   if (!s) {
     if (n && i && e.L) {
       insertSubs(e, true);
@@ -1515,8 +1540,8 @@ function setSignal(e, t) {
     e.X = t;
   }
   updatePendingSignal(e);
-  if (e.Pe) {
-    setSignal(e.Pe, t);
+  if (e.Ge) {
+    setSignal(e.Ge, t);
   }
   e.Ee = clock;
   insertSubs(e, n);
@@ -1549,7 +1574,7 @@ function computePendingState(e) {
   const t = e;
   const n = e.V;
   if (n && e.X !== NOT_PENDING) {
-    return !n.Ae && !(n.Se & STATUS_PENDING);
+    return !n.Ce && !(n.Se & STATUS_PENDING);
   }
   if (e.ee !== undefined && e.ee !== NOT_PENDING) {
     if (t.Se & STATUS_PENDING && !(t.Se & STATUS_UNINITIALIZED)) return true;
@@ -1584,20 +1609,20 @@ function updatePendingSignal(e) {
   }
 }
 function getLatestValueComputed(e) {
-  if (!e.Pe) {
+  if (!e.Ge) {
     const t = latestReadActive;
     latestReadActive = false;
     const n = pendingCheckActive;
     pendingCheckActive = false;
     const i = context;
     context = null;
-    e.Pe = optimisticComputed(() => read(e));
-    e.Pe.Re = e;
+    e.Ge = optimisticComputed(() => read(e));
+    e.Ge.Re = e;
     context = i;
     pendingCheckActive = n;
     latestReadActive = t;
   }
-  return e.Pe;
+  return e.Ge;
 }
 function staleValues(e, t = true) {
   const n = stale;
@@ -1658,7 +1683,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.be[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1668,10 +1693,10 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.Le = { ...n.Le, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.be = { ...n.be, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.Le[e.id]);
+  return !isUndefined(t?.be[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
@@ -1692,7 +1717,7 @@ function effect(e, t, n, i, r) {
   o.$e = n;
   o.je = undefined;
   o.W = r?.render ? EFFECT_RENDER : EFFECT_USER;
-  o.ge = (e, t) => {
+  o.xe = (e, t) => {
     const n = e !== undefined ? e : o.Se;
     const i = t !== undefined ? t : o.le;
     if (n & STATUS_ERROR) {
@@ -1725,7 +1750,9 @@ function runEffect() {
   this.je?.();
   this.je = undefined;
   try {
-    this.je = this.Me(this.J, this.Fe);
+    const e = this.Me(this.J, this.Fe);
+    if (false && e !== undefined && typeof e !== "function");
+    this.je = e;
   } catch (e) {
     this.le = new StatusError(this, e);
     this.Se |= STATUS_ERROR;
@@ -1748,7 +1775,8 @@ function trackedEffect(e, t) {
     () => {
       n.je?.();
       n.je = undefined;
-      n.je = staleValues(e) || undefined;
+      const t = staleValues(e);
+      n.je = t;
     },
     undefined,
     { ...t, lazy: true }
@@ -1757,7 +1785,7 @@ function trackedEffect(e, t) {
   n.Ke = true;
   n.H = true;
   n.W = EFFECT_TRACKED;
-  n.ge = (e, t) => {
+  n.xe = (e, t) => {
     const i = e !== undefined ? e : n.Se;
     if (i & STATUS_ERROR) {
       n.F.notify(n, STATUS_PENDING, 0);
@@ -1852,7 +1880,9 @@ function createReaction(e, t) {
         () => (r(), getOwner()),
         t => {
           n?.();
-          n = (e.effect || e)?.();
+          const i = (e.effect || e)?.();
+          if (false && i !== undefined && typeof i !== "function");
+          n = i;
           dispose(t);
         },
         e.error,
@@ -1884,7 +1914,7 @@ function createOptimistic(e, t, n) {
 function onSettled(e) {
   const t = getOwner();
   t && !t.Ke
-    ? createTrackedEffect(() => untrack(e))
+    ? createTrackedEffect(() => untrack(e), undefined)
     : globalQueue.enqueue(EFFECT_USER, () => {
         const t = e();
         t?.();
@@ -2053,7 +2083,7 @@ function createProjectionInternal(e, t = {}, n) {
     let r;
     const o = new Proxy(
       s,
-      createWriteTraps(() => !i || t.Ae === r)
+      createWriteTraps(() => !i || t.Ce === r)
     );
     storeSetter(o, o => {
       r = e(o);
@@ -2064,7 +2094,7 @@ function createProjectionInternal(e, t = {}, n) {
       u !== o && u !== undefined && reconcile(u, n?.key || "id")(s);
     });
   });
-  i.xe = true;
+  i.Ae = true;
   return { store: s, node: i };
 }
 function createProjection(e, t = {}, n) {
@@ -2488,7 +2518,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
       let r;
       const o = new Proxy(
         s,
-        createWriteTraps(() => !i || t.Ae === r)
+        createWriteTraps(() => !i || t.Ce === r)
       );
       setProjectionWriteActive(true);
       try {
@@ -2509,7 +2539,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
         setProjectionWriteActive(false);
       }
     });
-    i.xe = true;
+    i.Ae = true;
   }
   return { store: s, node: i };
 }
@@ -2966,14 +2996,14 @@ function compare(e, t, n) {
 }
 function boundaryComputed(e, t) {
   const n = computed(e, undefined, { lazy: true });
-  n.ge = (e, t) => {
+  n.xe = (e, t) => {
     const i = e !== undefined ? e : n.Se;
     const r = t !== undefined ? t : n.le;
     n.Se &= ~n.ut;
     n.F.notify(n, n.ut, i, r);
   };
   n.ut = t;
-  n.xe = true;
+  n.Ae = true;
   recompute(n, true);
   return n;
 }