@solidjs/signals 2.0.0-beta.16 → 2.0.0-beta.18

package/dist/prod.js

@@ -12,6 +12,9 @@ class StatusError extends Error {
     this.source = e;
   }
 }
+function unwrapStatusError(e) {
+  return e instanceof StatusError ? e.cause : e;
+}
 class NoOwnerError extends Error {
   constructor() {
     super("");
@@ -34,6 +37,7 @@ const REACTIVE_OPTIMISTIC_DIRTY = 1 << 7;
 const REACTIVE_SNAPSHOT_STALE = 1 << 8;
 const REACTIVE_LAZY = 1 << 9;
 const REACTIVE_MANUAL_WRITE = 1 << 10;
+const REACTIVE_REASK = 1 << 11;
 const CONFIG_OWNED_WRITE = 1 << 0;
 const CONFIG_NO_SNAPSHOT = 1 << 1;
 const CONFIG_TRANSPARENT = 1 << 2;
@@ -110,7 +114,7 @@ function resolveTransition(e) {
   return resolveLane(e)?.T ?? e.T;
 }
 function hasActiveOverride(e) {
-  return !!(e.O !== undefined && e.O !== NOT_PENDING);
+  return !!(e.p !== undefined && e.p !== NOT_PENDING);
 }
 function assignOrMergeLane(e, t) {
   const n = findLane(t);
@@ -134,8 +138,8 @@ function assignOrMergeLane(e, t) {
   e.i = t;
 }
 const transitions = new Set();
-const dirtyQueue = { p: new Array(2e3).fill(undefined), R: false, I: 0, h: 0 };
-const zombieQueue = { p: new Array(2e3).fill(undefined), R: false, I: 0, h: 0 };
+const dirtyQueue = { O: new Array(2e3).fill(undefined), R: false, I: 0, A: 0 };
+const zombieQueue = { O: new Array(2e3).fill(undefined), R: false, I: 0, A: 0 };
 let clock = 0;
 let activeTransition = null;
 let scheduled = false;
@@ -152,23 +156,25 @@ function canUseSimpleSyncFlush(e) {
   return (
     transitions.size === 0 &&
     activeLanes.size === 0 &&
-    e.A.length === 0 &&
+    e.h.length === 0 &&
     e.N.length === 0 &&
-    e.C.size === 0 &&
+    e.C.length === 0 &&
+    e.P.size === 0 &&
     transientStoreNodes.size === 0
   );
 }
 function sweepTransientStoreNodes() {
   if (transientStoreNodes.size === 0) return;
   for (const e of transientStoreNodes) {
-    if (e.P !== null) {
+    if (e.D !== null) {
       transientStoreNodes.delete(e);
       continue;
     }
-    if (e.D !== NOT_PENDING) continue;
-    if (e.O !== undefined && e.O !== NOT_PENDING) continue;
+    if (e.m !== NOT_PENDING) continue;
+    if (e.p !== undefined && e.p !== NOT_PENDING) continue;
+    if (e.L) continue;
     transientStoreNodes.delete(e);
-    e.m?.();
+    e.V?.();
   }
 }
 function enforceLoadingBoundary(e) {}
@@ -186,18 +192,18 @@ function runLaneEffects(e) {
   }
 }
 function queueStashedOptimisticEffects(e) {
-  for (let t = e.P; t !== null; t = t.L) {
-    const e = t.U;
-    if (!e.V) continue;
-    if (e.V === EFFECT_TRACKED) {
-      if (!e.G) {
-        e.G = true;
-        e.F.enqueue(EFFECT_USER, e.k);
+  for (let t = e.D; t !== null; t = t.U) {
+    const e = t.k;
+    if (!e.G) continue;
+    if (e.G === EFFECT_TRACKED) {
+      if (!e.F) {
+        e.F = true;
+        e.W.enqueue(EFFECT_USER, e.M);
       }
       continue;
     }
-    const n = e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (n.I > e.H) n.I = e.H;
+    const n = e.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (n.I > e.$) n.I = e.$;
     insertIntoHeap(e, n);
   }
 }
@@ -205,34 +211,38 @@ function setProjectionWriteActive(e) {
   projectionWriteActive = e;
 }
 function mergeTransitionState(e, t) {
-  t.M = e;
-  e.j.push(...t.j);
+  t.j = e;
+  e.K.push(...t.K);
   for (const n of activeLanes) if (n.T === t) n.T = e;
   e.N.push(...t.N);
-  for (const n of t.C) e.C.add(n);
-  for (const [n, i] of t.$) {
-    let t = e.$.get(n);
-    if (!t) e.$.set(n, (t = new Set()));
+  if (t.C.length) {
+    e.C.push(...t.C);
+    t.C.length = 0;
+  }
+  for (const n of t.P) e.P.add(n);
+  for (const [n, i] of t.Y) {
+    let t = e.Y.get(n);
+    if (!t) e.Y.set(n, (t = new Set()));
     for (const e of i) t.add(e);
   }
-  for (const n of t.K) e.K.add(n);
+  for (const n of t.Z) e.Z.add(n);
 }
 function resolveOptimisticNodes(e) {
   const t = e.length;
   for (let n = 0; n < t; n++) {
     const t = e[n];
     t.i = undefined;
-    if (!(t.Y & STATUS_PENDING)) t.Y &= ~STATUS_UNINITIALIZED;
-    const i = t.O;
-    t.O = NOT_PENDING;
-    if (i !== NOT_PENDING && t.Z !== i) insertSubs(t, true);
+    if (!(t.q & STATUS_PENDING)) t.q &= ~STATUS_UNINITIALIZED;
+    const i = t.p;
+    t.p = NOT_PENDING;
+    if (i !== NOT_PENDING && t.B !== i) insertSubs(t, true);
     t.T = null;
   }
   for (let n = 0; n < t; n++) {
     const t = e[n];
-    if (t.B || t.q) snapCompanionsToState(t);
+    if (t.X || t.J) snapCompanionsToState(t);
     const i = t.t;
-    if (i && (i.B === t || i.q === t)) snapCompanionsToState(i);
+    if (i && (i.X === t || i.J === t)) snapCompanionsToState(i);
   }
   e.splice(0, t);
 }
@@ -259,7 +269,7 @@ function schedule() {
   }
   if (scheduled) return;
   scheduled = true;
-  if (!syncDepth && !globalQueue.X && !projectionWriteActive) queueMicrotask(flush);
+  if (!syncDepth && !globalQueue.ee && !projectionWriteActive) queueMicrotask(flush);
 }
 function haltReactivity() {
   if (halted) return;
@@ -277,32 +287,32 @@ function resetErrorHalt() {
   haltNotified = false;
 }
 class Queue {
-  J = null;
-  ee = [[], []];
-  A = [];
+  te = null;
+  ne = [[], []];
+  h = [];
   created = clock;
   addChild(e) {
-    this.A.push(e);
-    e.J = this;
+    this.h.push(e);
+    e.te = this;
   }
   removeChild(e) {
-    const t = this.A.indexOf(e);
+    const t = this.h.indexOf(e);
     if (t >= 0) {
-      this.A.splice(t, 1);
-      e.J = null;
+      this.h.splice(t, 1);
+      e.te = null;
     }
   }
   notify(e, t, n, i) {
-    if (this.J) return this.J.notify(e, t, n, i);
+    if (this.te) return this.te.notify(e, t, n, i);
     return false;
   }
   run(e) {
-    if (this.ee[e - 1].length) {
-      const t = this.ee[e - 1];
-      this.ee[e - 1] = [];
+    if (this.ne[e - 1].length) {
+      const t = this.ne[e - 1];
+      this.ne[e - 1] = [];
       runQueue(t, e);
     }
-    for (let t = 0; t < this.A.length; t++) this.A[t].run?.(e);
+    for (let t = 0; t < this.h.length; t++) this.h[t].run?.(e);
   }
   enqueue(e, t) {
     if (e) {
@@ -310,72 +320,77 @@ class Queue {
         const n = findLane(currentOptimisticLane);
         n.l[e - 1].push(t);
       } else {
-        this.ee[e - 1].push(t);
+        this.ne[e - 1].push(t);
       }
     }
     schedule();
   }
   stashQueues(e) {
-    e.ee[0].push(...this.ee[0]);
-    e.ee[1].push(...this.ee[1]);
-    this.ee = [[], []];
-    for (let t = 0; t < this.A.length; t++) {
-      let n = this.A[t];
-      let i = e.A[t];
+    e.ne[0].push(...this.ne[0]);
+    e.ne[1].push(...this.ne[1]);
+    this.ne = [[], []];
+    for (let t = 0; t < this.h.length; t++) {
+      let n = this.h[t];
+      let i = e.h[t];
       if (!i) {
-        i = { ee: [[], []], A: [] };
-        e.A[t] = i;
+        i = { ne: [[], []], h: [] };
+        e.h[t] = i;
       }
       n.stashQueues(i);
     }
   }
   restoreQueues(e) {
-    this.ee[0].push(...e.ee[0]);
-    this.ee[1].push(...e.ee[1]);
-    for (let t = 0; t < e.A.length; t++) {
-      const n = e.A[t];
-      let i = this.A[t];
+    this.ne[0].push(...e.ne[0]);
+    this.ne[1].push(...e.ne[1]);
+    for (let t = 0; t < e.h.length; t++) {
+      const n = e.h[t];
+      let i = this.h[t];
       if (i) i.restoreQueues(n);
     }
   }
 }
 class GlobalQueue extends Queue {
-  X = false;
-  te = null;
-  ne = [];
+  ee = false;
+  ie = null;
+  re = [];
   N = [];
-  C = new Set();
-  static ie;
-  static re;
+  C = [];
+  P = new Set();
+  static se;
   static oe;
-  static se = null;
+  static ue;
+  static ce = null;
+  static ae = null;
+  static le = null;
+  static fe = null;
   flush() {
-    if (this.X) return;
-    this.X = true;
+    if (this.ee) return;
+    this.ee = true;
     try {
       if (false);
-      runHeap(dirtyQueue, GlobalQueue.ie);
+      runHeap(dirtyQueue, GlobalQueue.se);
       if (activeTransition) {
         const e = transitionComplete(activeTransition);
         if (!e) {
           const e = activeTransition;
-          runHeap(zombieQueue, GlobalQueue.ie);
-          this.te = null;
-          this.ne = [];
+          runHeap(zombieQueue, GlobalQueue.se);
+          this.ie = null;
+          this.re = [];
           this.N = [];
-          this.C = new Set();
+          this.C = [];
+          this.P = new Set();
           runLaneEffects(EFFECT_RENDER);
           runLaneEffects(EFFECT_USER);
-          this.stashQueues(e.ue);
+          this.stashQueues(e.Ee);
           clock++;
-          scheduled = dirtyQueue.h >= dirtyQueue.I;
-          reassignPendingTransition(e.ne);
+          scheduled = dirtyQueue.A >= dirtyQueue.I;
+          reassignPendingTransition(e.re);
           activeTransition = null;
-          if (!e.j.length && !e.$.size && e.N.length) {
+          if (!e.K.length && !e.Y.size && e.N.length) {
             stashedOptimisticReads = new Set();
             for (let t = 0; t < e.N.length; t++) {
               const n = e.N[t];
-              if (n.ce || n.le & CONFIG_OWNED_WRITE) continue;
+              if (n.de || n.Se & CONFIG_OWNED_WRITE) continue;
               stashedOptimisticReads.add(n);
               queueStashedOptimisticEffects(n);
             }
@@ -387,27 +402,27 @@ class GlobalQueue extends Queue {
           }
           return;
         }
-        this.ne !== activeTransition.ne && this.ne.push(...activeTransition.ne);
-        this.restoreQueues(activeTransition.ue);
+        this.re !== activeTransition.re && this.re.push(...activeTransition.re);
+        this.restoreQueues(activeTransition.Ee);
         transitions.delete(activeTransition);
         const t = activeTransition;
         activeTransition = null;
-        reassignPendingTransition(this.ne);
+        reassignPendingTransition(this.re);
         finalizePureQueue(t);
       } else {
         if (canUseSimpleSyncFlush(this)) {
           commitPendingNodes();
-          if (dirtyQueue.h >= dirtyQueue.I) {
-            runHeap(dirtyQueue, GlobalQueue.ie);
+          if (dirtyQueue.A >= dirtyQueue.I) {
+            runHeap(dirtyQueue, GlobalQueue.se);
             commitPendingNodes();
           }
         } else {
-          if (transitions.size) runHeap(zombieQueue, GlobalQueue.ie);
+          if (transitions.size) runHeap(zombieQueue, GlobalQueue.se);
           finalizePureQueue();
         }
       }
       clock++;
-      scheduled = dirtyQueue.h >= dirtyQueue.I;
+      scheduled = dirtyQueue.A >= dirtyQueue.I;
       activeLanes.size && runLaneEffects(EFFECT_RENDER);
       this.run(EFFECT_RENDER);
       activeLanes.size && runLaneEffects(EFFECT_USER);
@@ -422,17 +437,17 @@ class GlobalQueue extends Queue {
       );
       if (false);
     } finally {
-      this.X = false;
+      this.ee = false;
     }
   }
   notify(e, t, n, i) {
     if (t & STATUS_PENDING) {
       if (n & STATUS_PENDING) {
-        const t = i !== undefined ? i : e.ae;
+        const t = i !== undefined ? i : e.Te;
         if (activeTransition && t) {
           const n = t.source;
-          let i = activeTransition.$.get(n);
-          if (!i) activeTransition.$.set(n, (i = new Set()));
+          let i = activeTransition.Y.get(n);
+          if (!i) activeTransition.Y.set(n, (i = new Set()));
           const r = i.size;
           i.add(e);
           if (i.size !== r) schedule();
@@ -445,18 +460,19 @@ class GlobalQueue extends Queue {
   initTransition(e) {
     if (e) e = currentTransition(e);
     if (e && e === activeTransition) return;
-    if (!e && activeTransition && activeTransition.fe === clock) return;
+    if (!e && activeTransition && activeTransition._e === clock) return;
     if (!activeTransition) {
       activeTransition = e ?? {
-        fe: clock,
-        ne: [],
-        $: new Map(),
+        _e: clock,
+        re: [],
+        Y: new Map(),
         N: [],
-        C: new Set(),
-        j: [],
-        ue: { ee: [[], []], A: [] },
-        M: false,
-        K: new Set()
+        C: [],
+        P: new Set(),
+        K: [],
+        Ee: { ne: [[], []], h: [] },
+        j: false,
+        Z: new Set()
       };
     } else if (e) {
       const t = activeTransition;
@@ -465,19 +481,19 @@ class GlobalQueue extends Queue {
       activeTransition = e;
     }
     transitions.add(activeTransition);
-    activeTransition.fe = clock;
-    if (this.te !== null) {
-      this.te.T = activeTransition;
-      activeTransition.ne.push(this.te);
-      this.te = null;
-    }
-    if (this.ne !== activeTransition.ne) {
-      for (let e = 0; e < this.ne.length; e++) {
-        const t = this.ne[e];
+    activeTransition._e = clock;
+    if (this.ie !== null) {
+      this.ie.T = activeTransition;
+      activeTransition.re.push(this.ie);
+      this.ie = null;
+    }
+    if (this.re !== activeTransition.re) {
+      for (let e = 0; e < this.re.length; e++) {
+        const t = this.re[e];
         t.T = activeTransition;
-        activeTransition.ne.push(t);
+        activeTransition.re.push(t);
       }
-      this.ne = activeTransition.ne;
+      this.re = activeTransition.re;
     }
     if (this.N !== activeTransition.N) {
       for (let e = 0; e < this.N.length; e++) {
@@ -487,84 +503,94 @@ class GlobalQueue extends Queue {
       }
       this.N = activeTransition.N;
     }
+    if (this.C !== activeTransition.C) {
+      activeTransition.C.push(...this.C);
+      this.C = activeTransition.C;
+    }
     for (const e of activeLanes) {
       if (!e.T) e.T = activeTransition;
     }
-    if (this.C !== activeTransition.C) {
-      for (const e of this.C) activeTransition.C.add(e);
-      this.C = activeTransition.C;
+    if (this.P !== activeTransition.P) {
+      for (const e of this.P) activeTransition.P.add(e);
+      this.P = activeTransition.P;
     }
   }
 }
 function queuePendingNode(e) {
   if (activeTransition) {
-    globalQueue.ne.push(e);
+    globalQueue.re.push(e);
     return;
   }
-  if (globalQueue.te === null && globalQueue.ne.length === 0) {
-    globalQueue.te = e;
+  if (globalQueue.ie === null && globalQueue.re.length === 0) {
+    globalQueue.ie = e;
     return;
   }
-  if (globalQueue.te !== null) {
-    globalQueue.ne.push(globalQueue.te);
-    globalQueue.te = null;
+  if (globalQueue.ie !== null) {
+    globalQueue.re.push(globalQueue.ie);
+    globalQueue.ie = null;
   }
-  globalQueue.ne.push(e);
+  globalQueue.re.push(e);
+}
+let reaskArmed = false;
+function armReaskClear() {
+  reaskArmed = true;
 }
 function insertSubs(e, t = false) {
   const n = e.i || currentOptimisticLane;
-  const i = e.Ee !== undefined;
-  for (let r = e.P; r !== null; r = r.L) {
-    if (i && r.U.le & CONFIG_IN_SNAPSHOT_SCOPE) {
-      r.U.W |= REACTIVE_SNAPSHOT_STALE;
+  const i = e.pe !== undefined;
+  const r = reaskArmed;
+  for (let s = e.D; s !== null; s = s.U) {
+    if (r) s.k.H &= ~REACTIVE_REASK;
+    if (i && s.k.Se & CONFIG_IN_SNAPSHOT_SCOPE) {
+      s.k.H |= REACTIVE_SNAPSHOT_STALE;
       continue;
     }
     if (t && n) {
-      r.U.W |= REACTIVE_OPTIMISTIC_DIRTY;
-      assignOrMergeLane(r.U, n);
+      s.k.H |= REACTIVE_OPTIMISTIC_DIRTY;
+      assignOrMergeLane(s.k, n);
     } else if (t) {
-      r.U.W |= REACTIVE_OPTIMISTIC_DIRTY;
-      r.U.i = undefined;
-    }
-    const e = r.U;
-    if (e.V === EFFECT_TRACKED) {
-      if (!e.G) {
-        e.G = true;
-        e.F.enqueue(EFFECT_USER, e.k);
+      s.k.H |= REACTIVE_OPTIMISTIC_DIRTY;
+      s.k.i = undefined;
+    }
+    const e = s.k;
+    if (e.G === EFFECT_TRACKED) {
+      if (!e.F) {
+        e.F = true;
+        e.W.enqueue(EFFECT_USER, e.M);
       }
       continue;
     }
-    const o = r.U.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (o.I > r.U.H) o.I = r.U.H;
-    insertIntoHeap(r.U, o);
+    const o = s.k.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (o.I > s.k.$) o.I = s.k.$;
+    insertIntoHeap(s.k, o);
   }
 }
 function commitPendingNode(e) {
   const t = e;
-  if (!t.ce) {
-    if (e.D !== NOT_PENDING) {
-      e.Z = e.D;
-      e.D = NOT_PENDING;
+  if (!t.de) {
+    if (e.m !== NOT_PENDING) {
+      e.B = e.m;
+      e.m = NOT_PENDING;
     }
-    if (e.B || e.q) snapCompanionsToState(e);
+    if (e.X || e.J) snapCompanionsToState(e);
     return;
   }
-  if (e.D !== NOT_PENDING) {
-    e.Z = e.D;
-    e.D = NOT_PENDING;
-    if (e.V && e.V !== EFFECT_TRACKED) e.G = true;
+  if (e.m !== NOT_PENDING) {
+    e.B = e.m;
+    e.m = NOT_PENDING;
+    if (e.G && e.G !== EFFECT_TRACKED) e.F = true;
   }
-  t.W &= ~REACTIVE_MANUAL_WRITE;
-  if (!(t.Y & STATUS_PENDING)) t.Y &= ~STATUS_UNINITIALIZED;
-  if (t.de !== null || t.Se !== null) GlobalQueue.re(t, false, true);
-  if (e.B || e.q) snapCompanionsToState(e);
+  t.H &= ~REACTIVE_MANUAL_WRITE;
+  if (!(t.q & STATUS_PENDING)) t.q &= ~STATUS_UNINITIALIZED;
+  if (t.Oe !== null || t.Re !== null) GlobalQueue.oe(t, false, true);
+  if (e.X || e.J) snapCompanionsToState(e);
 }
 function commitPendingNodes() {
-  if (globalQueue.te !== null) {
-    commitPendingNode(globalQueue.te);
-    globalQueue.te = null;
+  if (globalQueue.ie !== null) {
+    commitPendingNode(globalQueue.ie);
+    globalQueue.ie = null;
   }
-  const e = globalQueue.ne;
+  const e = globalQueue.re;
   for (let t = 0; t < e.length; t++) {
     commitPendingNode(e[t]);
   }
@@ -573,32 +599,33 @@ function commitPendingNodes() {
 function finalizePureQueue(e = null, t = false) {
   const n = !t;
   if (n) commitPendingNodes();
-  if (!t && globalQueue.A.length) checkBoundaryChildren(globalQueue);
-  const i = dirtyQueue.h >= dirtyQueue.I;
-  if (i) runHeap(dirtyQueue, GlobalQueue.ie);
+  if (!t && globalQueue.h.length) checkBoundaryChildren(globalQueue);
+  const i = dirtyQueue.A >= dirtyQueue.I;
+  if (i) runHeap(dirtyQueue, GlobalQueue.se);
   if (n) {
     if (i) commitPendingNodes();
     resolveOptimisticNodes(e ? e.N : globalQueue.N);
-    if (e && e.K.size) {
-      for (const t of e.K) {
-        if (t.W & REACTIVE_DISPOSED) continue;
-        if (t.V === EFFECT_TRACKED) {
-          if (!t.G) {
-            t.G = true;
-            t.F.enqueue(EFFECT_USER, t.k);
+    if (e && e.Z.size) {
+      for (const t of e.Z) {
+        if (t.H & REACTIVE_DISPOSED) continue;
+        if (t.G === EFFECT_TRACKED) {
+          if (!t.F) {
+            t.F = true;
+            t.W.enqueue(EFFECT_USER, t.M);
           }
           continue;
         }
-        const e = t.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-        if (e.I > t.H) e.I = t.H;
+        const e = t.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+        if (e.I > t.$) e.I = t.$;
         insertIntoHeap(t, e);
       }
-      e.K.clear();
+      e.Z.clear();
     }
-    const t = e ? e.C : globalQueue.C;
-    if (GlobalQueue.se && t.size) {
+    releaseAffectsMarks(e ? e.C : globalQueue.C);
+    const t = e ? e.P : globalQueue.P;
+    if (GlobalQueue.ce && t.size) {
       for (const e of t) {
-        GlobalQueue.se(e);
+        GlobalQueue.ce(e);
       }
       t.clear();
       schedule();
@@ -608,15 +635,41 @@ function finalizePureQueue(e = null, t = false) {
   }
 }
 function checkBoundaryChildren(e) {
-  for (const t of e.A) {
+  for (const t of e.h) {
     t.checkSources?.();
     checkBoundaryChildren(t);
   }
 }
 function trackOptimisticStore(e) {
-  globalQueue.C.add(e);
+  globalQueue.P.add(e);
+  schedule();
+}
+let activeAffectsMarks = 0;
+function markAffects(e) {
+  e.L = (e.L || 0) + 1;
+  activeAffectsMarks++;
+  if (e.L === 1) updatePendingSignal(e);
+}
+function registerAffectsMark(e) {
+  markAffects(e);
+  globalQueue.C.push(e);
+  GlobalQueue.le?.(e);
   schedule();
 }
+function releaseAffectsMark(e) {
+  activeAffectsMarks--;
+  e.L--;
+  if (!e.L) {
+    GlobalQueue.fe?.(e);
+    snapCompanionsToState(e);
+    GlobalQueue.ae?.(e);
+  }
+}
+function releaseAffectsMarks(e) {
+  if (!e.length) return;
+  for (let t = 0; t < e.length; t++) releaseAffectsMark(e[t]);
+  e.length = 0;
+}
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
     e[t].T = activeTransition;
@@ -636,7 +689,7 @@ function flush(e) {
       }
     }
   }
-  if (globalQueue.X) {
+  if (globalQueue.ee) {
     return;
   }
   if (halted) return;
@@ -648,22 +701,22 @@ function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function reporterBlocksSource(e, t) {
-  if (e.W & (REACTIVE_ZOMBIE | REACTIVE_DISPOSED)) return false;
-  if (e.Te === t || e._e?.has(t)) return true;
-  for (let n = e.Oe; n; n = n.pe) {
-    let e = n.Re;
+  if (e.H & (REACTIVE_ZOMBIE | REACTIVE_DISPOSED)) return false;
+  if (e.Ie === t || e.Ae?.has(t)) return true;
+  for (let n = e.he; n; n = n.Ne) {
+    let e = n.Ce;
     while (e) {
-      if (e === t || e.Ie === t) return true;
+      if (e === t || e.ye === t) return true;
       e = e.t;
     }
   }
-  return !!(e.Y & STATUS_PENDING && e.ae instanceof NotReadyError && e.ae.source === t);
+  return !!(e.q & STATUS_PENDING && e.Te instanceof NotReadyError && e.Te.source === t);
 }
 function transitionComplete(e) {
-  if (e.M) return true;
-  if (e.j.length) return false;
+  if (e.j) return true;
+  if (e.K.length) return false;
   let t = true;
-  for (const [n, i] of e.$) {
+  for (const [n, i] of e.Y) {
     let r = false;
     for (const e of i) {
       if (reporterBlocksSource(e, n)) {
@@ -672,8 +725,8 @@ function transitionComplete(e) {
       }
       i.delete(e);
     }
-    if (!r) e.$.delete(n);
-    else if (n.Y & STATUS_PENDING && n.ae?.source === n) {
+    if (!r) e.Y.delete(n);
+    else if (n.q & STATUS_PENDING && n.Te?.source === n) {
       t = false;
       break;
     }
@@ -683,20 +736,21 @@ function transitionComplete(e) {
       const i = e.N[n];
       if (
         hasActiveOverride(i) &&
-        "Y" in i &&
-        i.Y & STATUS_PENDING &&
-        i.ae instanceof NotReadyError
+        "q" in i &&
+        i.q & STATUS_PENDING &&
+        i.Te instanceof NotReadyError &&
+        !i.Te.source?.ge
       ) {
         t = false;
         break;
       }
     }
   }
-  t && (e.M = true);
+  t && (e.j = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.M && typeof e.M === "object") e = e.M;
+  while (e.j && typeof e.j === "object") e = e.j;
   return e;
 }
 function setActiveTransition(e) {
@@ -712,177 +766,177 @@ function runInTransition(e, t) {
   }
 }
 function actualInsertIntoHeap(e, t) {
-  const n = (e.J?.he ? e.J.Ae?.H : e.J?.H) ?? -1;
-  if (n >= e.H) e.H = n + 1;
-  const i = e.H;
-  const r = t.p[i];
-  if (r === undefined) t.p[i] = e;
+  const n = (e.te?.Pe ? e.te.De?.$ : e.te?.$) ?? -1;
+  if (n >= e.$) e.$ = n + 1;
+  const i = e.$;
+  const r = t.O[i];
+  if (r === undefined) t.O[i] = e;
   else {
-    const t = r.Ne;
-    t.Ce = e;
-    e.Ne = t;
-    r.Ne = e;
+    const t = r.be;
+    t.me = e;
+    e.be = t;
+    r.be = e;
   }
-  if (i > t.h) t.h = i;
+  if (i > t.A) t.A = i;
 }
 function insertIntoHeap(e, t) {
-  let n = e.W;
+  let n = e.H;
   if (n & (REACTIVE_IN_HEAP | REACTIVE_RECOMPUTING_DEPS | REACTIVE_MANUAL_WRITE)) return;
   if (n & REACTIVE_CHECK) {
-    e.W = (n & -4) | REACTIVE_DIRTY | REACTIVE_IN_HEAP;
-  } else e.W = n | REACTIVE_IN_HEAP;
+    e.H = (n & -4) | REACTIVE_DIRTY | REACTIVE_IN_HEAP;
+  } else e.H = n | REACTIVE_IN_HEAP;
   if (!(n & REACTIVE_IN_HEAP_HEIGHT)) actualInsertIntoHeap(e, t);
 }
 function insertIntoHeapHeight(e, t) {
-  let n = e.W;
+  let n = e.H;
   if (
     n &
     (REACTIVE_IN_HEAP | REACTIVE_RECOMPUTING_DEPS | REACTIVE_IN_HEAP_HEIGHT | REACTIVE_MANUAL_WRITE)
   )
     return;
-  e.W = n | REACTIVE_IN_HEAP_HEIGHT;
+  e.H = n | REACTIVE_IN_HEAP_HEIGHT;
   actualInsertIntoHeap(e, t);
 }
 function deleteFromHeap(e, t) {
-  const n = e.W;
+  const n = e.H;
   if (!(n & (REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT))) return;
-  e.W = n & -25;
-  const i = e.H;
-  if (e.Ne === e) t.p[i] = undefined;
+  e.H = n & -25;
+  const i = e.$;
+  if (e.be === e) t.O[i] = undefined;
   else {
-    const n = e.Ce;
-    const r = t.p[i];
-    const o = n ?? r;
-    if (e === r) t.p[i] = n;
-    else e.Ne.Ce = n;
-    o.Ne = e.Ne;
+    const n = e.me;
+    const r = t.O[i];
+    const s = n ?? r;
+    if (e === r) t.O[i] = n;
+    else e.be.me = n;
+    s.be = e.be;
   }
-  e.Ne = e;
-  e.Ce = undefined;
+  e.be = e;
+  e.me = undefined;
 }
 function markHeap(e) {
   if (e.R) return;
   e.R = true;
-  for (let t = 0; t <= e.h; t++) {
-    for (let n = e.p[t]; n !== undefined; n = n.Ce) {
-      if (n.W & REACTIVE_IN_HEAP) markNode(n);
+  for (let t = 0; t <= e.A; t++) {
+    for (let n = e.O[t]; n !== undefined; n = n.me) {
+      if (n.H & REACTIVE_IN_HEAP) markNode(n);
     }
   }
 }
 function markNode(e, t = REACTIVE_DIRTY) {
-  const n = e.W;
+  const n = e.H;
   if ((n & (REACTIVE_CHECK | REACTIVE_DIRTY)) >= t) return;
-  e.W = (n & -4) | t;
-  for (let t = e.P; t !== null; t = t.L) {
-    markNode(t.U, REACTIVE_CHECK);
-  }
-  if (e.ye !== null) {
-    for (let t = e.ye; t !== null; t = t.Pe) {
-      for (let e = t.P; e !== null; e = e.L) {
-        markNode(e.U, REACTIVE_CHECK);
+  e.H = (n & -4) | t;
+  for (let t = e.D; t !== null; t = t.U) {
+    markNode(t.k, REACTIVE_CHECK);
+  }
+  if (e.ve !== null) {
+    for (let t = e.ve; t !== null; t = t.we) {
+      for (let e = t.D; e !== null; e = e.U) {
+        markNode(e.k, REACTIVE_CHECK);
       }
     }
   }
 }
 function runHeap(e, t) {
   e.R = false;
-  for (e.I = 0; e.I <= e.h; e.I++) {
-    let n = e.p[e.I];
+  for (e.I = 0; e.I <= e.A; e.I++) {
+    let n = e.O[e.I];
     while (n !== undefined) {
-      if (n.W & REACTIVE_IN_HEAP) t(n);
+      if (n.H & REACTIVE_IN_HEAP) t(n);
       else adjustHeight(n, e);
-      n = e.p[e.I];
+      n = e.O[e.I];
     }
   }
-  e.h = 0;
+  e.A = 0;
 }
 function adjustHeight(e, t) {
   deleteFromHeap(e, t);
-  let n = e.H;
-  for (let t = e.Oe; t; t = t.pe) {
-    const e = t.Re;
-    const i = e.Ie || e;
-    if (i.ce && i.H >= n) n = i.H + 1;
+  let n = e.$;
+  for (let t = e.he; t; t = t.Ne) {
+    const e = t.Ce;
+    const i = e.ye || e;
+    if (i.de && i.$ >= n) n = i.$ + 1;
   }
-  if (e.H !== n) {
-    e.H = n;
-    for (let t = e.P; t !== null; t = t.L) {
-      insertIntoHeapHeight(t.U, t.U.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  if (e.$ !== n) {
+    e.$ = n;
+    for (let t = e.D; t !== null; t = t.U) {
+      insertIntoHeapHeight(t.k, t.k.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     }
   }
 }
 const PENDING_OWNER = {};
 function markDisposal(e) {
-  let t = e.ge;
+  let t = e.Le;
   while (t) {
-    const e = t.W;
-    t.W = e | REACTIVE_ZOMBIE;
+    const e = t.H;
+    t.H = e | REACTIVE_ZOMBIE;
     if (e & (REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT)) {
       deleteFromHeap(t, e & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
       if (e & REACTIVE_IN_HEAP) insertIntoHeap(t, zombieQueue);
       else insertIntoHeapHeight(t, zombieQueue);
     }
     markDisposal(t);
-    t = t.De;
+    t = t.Ve;
   }
 }
 function dispose(e) {
-  let t = e.Oe;
+  let t = e.he;
   while (t !== null) {
     t = unlinkSubs(t);
   }
-  e.Oe = null;
-  e.me = null;
+  e.he = null;
+  e.Ue = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
-  const i = e.W;
+  const i = e.H;
   if (i & REACTIVE_DISPOSED) return;
   if (t) {
-    e.W = i | REACTIVE_DISPOSED;
+    e.H = i | REACTIVE_DISPOSED;
     const t = e;
-    if (t.B || t.q) snapCompanionsToState(t);
+    if (t.X || t.J) snapCompanionsToState(t);
   }
-  if (t && e.ce) e.be = null;
-  let r = n ? e.de : e.ge;
+  if (t && e.de) e.ke = null;
+  let r = n ? e.Oe : e.Le;
   while (r) {
-    const e = r.De;
-    if (r.Oe) {
+    const e = r.Ve;
+    if (r.he) {
       const e = r;
-      deleteFromHeap(e, e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-      let t = e.Oe;
+      deleteFromHeap(e, e.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+      let t = e.he;
       do {
         t = unlinkSubs(t);
       } while (t !== null);
-      e.Oe = null;
-      e.me = null;
+      e.he = null;
+      e.Ue = null;
     }
     disposeChildren(r, true);
     r = e;
   }
   if (n) {
-    e.de = null;
+    e.Oe = null;
   } else {
-    e.ge = null;
-    e.ve = 0;
+    e.Le = null;
+    e.Ge = 0;
   }
-  if (t && !n && !(i & REACTIVE_ZOMBIE) && e.J !== null && !(e.J.W & REACTIVE_DISPOSED)) {
-    const t = e.we;
-    const n = e.De;
-    if (t !== null) t.De = n;
-    else e.J.ge = n;
-    if (n !== null) n.we = t;
-    e.we = null;
+  if (t && !n && !(i & REACTIVE_ZOMBIE) && e.te !== null && !(e.te.H & REACTIVE_DISPOSED)) {
+    const t = e.Fe;
+    const n = e.Ve;
+    if (t !== null) t.Ve = n;
+    else e.te.Le = n;
+    if (n !== null) n.Fe = t;
+    e.Fe = null;
   }
   runDisposal(e, n);
-  if (t && e.Le) {
-    const t = e.Le;
-    e.Le = undefined;
+  if (t && e.We) {
+    const t = e.We;
+    e.We = undefined;
     t();
   }
 }
 function runDisposal(e, t) {
-  let n = t ? e.Se : e.Ue;
+  let n = t ? e.Re : e.Me;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -892,12 +946,12 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.Se = null) : (e.Ue = null);
+  t ? (e.Re = null) : (e.Me = null);
 }
 function childId(e, t) {
   let n = e;
-  while (n.le & CONFIG_TRANSPARENT && n.J) n = n.J;
-  if (n.id != null) return formatId(n.id, t ? n.ve++ : n.ve);
+  while (n.Se & CONFIG_TRANSPARENT && n.te) n = n.te;
+  if (n.id != null) return formatId(n.id, t ? n.Ge++ : n.Ge);
   throw new Error("Cannot get child id from owner without an id");
 }
 function getNextChildId(e) {
@@ -920,13 +974,13 @@ function getOwner() {
 }
 function cleanup(e) {
   if (!context) return e;
-  if (!context.Ue) context.Ue = e;
-  else if (Array.isArray(context.Ue)) context.Ue.push(e);
-  else context.Ue = [context.Ue, e];
+  if (!context.Me) context.Me = e;
+  else if (Array.isArray(context.Me)) context.Me.push(e);
+  else context.Me = [context.Me, e];
   return e;
 }
 function isDisposed(e) {
-  return !!(e.W & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE));
+  return !!(e.H & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE));
 }
 function disposeRootSelf(e = true) {
   disposeChildren(this, e);
@@ -936,29 +990,29 @@ function createOwner(e) {
   const n = e?.transparent ?? false;
   const i = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    le: n ? CONFIG_TRANSPARENT : 0,
-    he: true,
-    Ae: t?.he ? t.Ae : t,
-    ge: null,
-    De: null,
-    we: null,
-    Ue: null,
-    F: t?.F ?? globalQueue,
-    Ve: t?.Ve || defaultContext,
-    ve: 0,
-    Se: null,
-    de: null,
-    J: t,
+    Se: n ? CONFIG_TRANSPARENT : 0,
+    Pe: true,
+    De: t?.Pe ? t.De : t,
+    Le: null,
+    Ve: null,
+    Fe: null,
+    Me: null,
+    W: t?.W ?? globalQueue,
+    He: t?.He || defaultContext,
+    Ge: 0,
+    Re: null,
+    Oe: null,
+    te: t,
     dispose: disposeRootSelf
   };
   if (t) {
-    const e = t.ge;
+    const e = t.Le;
     if (e === null) {
-      t.ge = i;
+      t.Le = i;
     } else {
-      i.De = e;
-      e.we = i;
-      t.ge = i;
+      i.Ve = e;
+      e.Fe = i;
+      t.Le = i;
     }
   }
   return i;
@@ -968,164 +1022,165 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(() => n.dispose()));
 }
 function unlinkSubs(e) {
-  const t = e.Re;
-  const n = e.pe;
-  const i = e.L;
-  const r = e.Ge;
-  if (i !== null) i.Ge = r;
-  else t.Fe = r;
-  if (r !== null) r.L = i;
+  const t = e.Ce;
+  const n = e.Ne;
+  const i = e.U;
+  const r = e.Qe;
+  if (i !== null) i.Qe = r;
+  else t.xe = r;
+  if (r !== null) r.U = i;
   else {
-    t.P = i;
+    t.D = i;
     if (i === null) {
-      t.m?.();
+      t.V?.();
       const e = t;
-      e.ce && e.le & CONFIG_AUTO_DISPOSE && !(e.W & REACTIVE_ZOMBIE) && unobserved(e);
+      e.de && e.Se & CONFIG_AUTO_DISPOSE && !(e.H & REACTIVE_ZOMBIE) && unobserved(e);
     }
   }
   return n;
 }
 function trimStaleDeps(e) {
-  const t = e.me;
-  let n = t !== null ? t.pe : e.Oe;
+  const t = e.Ue;
+  let n = t !== null ? t.Ne : e.he;
   if (n !== null) {
     do {
       n = unlinkSubs(n);
     } while (n !== null);
-    if (t !== null) t.pe = null;
-    else e.Oe = null;
+    if (t !== null) t.Ne = null;
+    else e.he = null;
   }
 }
 function unobserved(e) {
-  deleteFromHeap(e, e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-  let t = e.Oe;
+  deleteFromHeap(e, e.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  let t = e.he;
   while (t !== null) {
     t = unlinkSubs(t);
   }
-  e.Oe = null;
-  e.me = null;
+  e.he = null;
+  e.Ue = null;
   disposeChildren(e, true);
 }
 function link(e, t, n = false) {
-  const i = t.me;
-  if (i !== null && i.Re === e) {
-    i.ke = n;
+  const i = t.Ue;
+  if (i !== null && i.Ce === e) {
+    i.$e = n;
     return;
   }
   let r = null;
-  const o = t.W & REACTIVE_RECOMPUTING_DEPS;
-  if (o) {
-    r = i !== null ? i.pe : t.Oe;
-    if (r !== null && r.Re === e) {
-      r.We = t.He;
-      t.me = r;
-      r.ke = n;
+  const s = t.H & REACTIVE_RECOMPUTING_DEPS;
+  if (s) {
+    r = i !== null ? i.Ne : t.he;
+    if (r !== null && r.Ce === e) {
+      r.je = t.Ke;
+      t.Ue = r;
+      r.$e = n;
       return;
     }
   }
-  const s = e.Fe;
-  if (s !== null && s.U === t && (!o || s.We === t.He)) {
-    s.ke = n;
+  const o = e.xe;
+  if (o !== null && o.k === t && (!s || o.je === t.Ke)) {
+    o.$e = n;
     return;
   }
-  const u = (t.me = e.Fe = { Re: e, U: t, pe: r, Ge: s, L: null, We: t.He, ke: n });
-  if (i !== null) i.pe = u;
-  else t.Oe = u;
-  if (s !== null) s.L = u;
-  else e.P = u;
+  const u = (t.Ue = e.xe = { Ce: e, k: t, Ne: r, Qe: o, U: null, je: t.Ke, $e: n });
+  if (i !== null) i.Ne = u;
+  else t.he = u;
+  if (o !== null) o.U = u;
+  else e.D = u;
 }
 function addPendingSource(e, t) {
-  if (e.Te === t || e._e?.has(t)) return false;
-  if (!e.Te) {
-    e.Te = t;
+  if (e.Ie === t || e.Ae?.has(t)) return false;
+  if (!e.Ie) {
+    e.Ie = t;
     return true;
   }
-  if (!e._e) {
-    e._e = new Set([e.Te, t]);
+  if (!e.Ae) {
+    e.Ae = new Set([e.Ie, t]);
   } else {
-    e._e.add(t);
+    e.Ae.add(t);
   }
-  e.Te = undefined;
+  e.Ie = undefined;
   return true;
 }
 function removePendingSource(e, t) {
-  if (e.Te) {
-    if (e.Te !== t) return false;
-    e.Te = undefined;
+  if (e.Ie) {
+    if (e.Ie !== t) return false;
+    e.Ie = undefined;
     return true;
   }
-  if (!e._e?.delete(t)) return false;
-  if (e._e.size === 1) {
-    e.Te = e._e.values().next().value;
-    e._e = undefined;
-  } else if (e._e.size === 0) {
-    e._e = undefined;
+  if (!e.Ae?.delete(t)) return false;
+  if (e.Ae.size === 1) {
+    e.Ie = e.Ae.values().next().value;
+    e.Ae = undefined;
+  } else if (e.Ae.size === 0) {
+    e.Ae = undefined;
   }
   return true;
 }
 function clearPendingSources(e) {
-  e.Te = undefined;
-  e._e?.clear();
-  e._e = undefined;
+  e.Ie = undefined;
+  e.Ae?.clear();
+  e.Ae = undefined;
 }
 function setPendingError(e, t, n) {
   if (!t) {
-    e.ae = null;
+    e.Te = null;
     return;
   }
   if (n instanceof NotReadyError && n.source === t) {
-    e.ae = n;
+    e.Te = n;
     return;
   }
-  const i = e.ae;
+  const i = e.Te;
   if (!(i instanceof NotReadyError) || i.source !== t) {
-    e.ae = new NotReadyError(t);
+    e.Te = new NotReadyError(t);
   }
 }
 function forEachDependent(e, t) {
-  for (let n = e.P; n !== null; n = n.L) t(n.U, n);
-  for (let n = e.ye; n !== null; n = n.Pe) {
-    for (let e = n.P; e !== null; e = e.L) t(e.U, e);
+  for (let n = e.D; n !== null; n = n.U) t(n.k, n);
+  for (let n = e.ve ?? null; n !== null; n = n.we) {
+    for (let e = n.D; e !== null; e = e.U) t(e.k, e);
   }
 }
 function enqueueForRerun(e) {
-  if (e.V === EFFECT_TRACKED) {
+  if (e.G === EFFECT_TRACKED) {
     const t = e;
-    if (!t.G) {
-      t.G = true;
-      t.F.enqueue(EFFECT_USER, t.k);
+    if (!t.F) {
+      t.F = true;
+      t.W.enqueue(EFFECT_USER, t.M);
     }
   } else {
-    const t = e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (t.I > e.H) t.I = e.H;
+    const t = e.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (t.I > e.$) t.I = e.$;
     insertIntoHeap(e, t);
   }
 }
-function settlePendingSource(e) {
-  let t = false;
-  const n = new Set();
-  const settle = i => {
-    if (n.has(i) || !removePendingSource(i, e)) return;
-    n.add(i);
-    i.fe = clock;
-    const r = i.Te ?? i._e?.values().next().value;
-    if (r) {
-      setPendingError(i, r);
-      updatePendingSignal(i);
+function settlePendingSource(e, t = e, n = false) {
+  let i = false;
+  const r = new Set();
+  const s = n ? snapCompanionsToState : updatePendingSignal;
+  const settle = e => {
+    if (r.has(e) || !removePendingSource(e, t)) return;
+    r.add(e);
+    e._e = clock;
+    const n = e.Ie ?? e.Ae?.values().next().value;
+    if (n) {
+      setPendingError(e, n);
+      s(e);
     } else {
-      i.Y &= ~STATUS_PENDING;
-      setPendingError(i);
-      updatePendingSignal(i);
-      if (i.Me) {
-        enqueueForRerun(i);
-        t = true;
+      e.q &= ~STATUS_PENDING;
+      setPendingError(e);
+      s(e);
+      if (e.Ye) {
+        enqueueForRerun(e);
+        i = true;
       }
-      i.Me = false;
+      e.Ye = false;
     }
-    forEachDependent(i, settle);
+    forEachDependent(e, settle);
   };
   forEachDependent(e, settle);
-  if (t) schedule();
+  if (i) schedule();
 }
 function isThenable(e) {
   return e != null && typeof e === "object" && typeof e.then === "function";
@@ -1140,43 +1195,43 @@ function handleAsync(e, t, n) {
     });
   }
   if (!r && !i) {
-    e.be = null;
+    e.ke = null;
     return t;
   }
-  e.be = t;
-  let o;
+  e.ke = t;
+  let s;
   const handleError = n => {
-    if (e.be !== t) return;
+    if (e.ke !== t) return;
     globalQueue.initTransition(resolveTransition(e));
     notifyStatus(e, n instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR, n);
-    e.fe = clock;
+    e._e = clock;
   };
   const asyncWrite = (i, r) => {
-    if (e.be !== t) return;
-    if (e.W & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
+    if (e.ke !== t) return;
+    if (e.H & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
     globalQueue.initTransition(resolveTransition(e));
-    const o = !!(e.Y & STATUS_UNINITIALIZED);
+    const s = !!(e.q & STATUS_UNINITIALIZED);
     trimStaleDeps(e);
     clearStatus(e);
-    const s = resolveLane(e);
-    if (s) s.u.delete(e);
+    const o = resolveLane(e);
+    if (o) o.u.delete(e);
     if (n) {
       n(i);
-      if (o) clearStatus(e, true);
-    } else if (e.O !== undefined) {
-      if (e.D === NOT_PENDING) queuePendingNode(e);
-      e.D = i;
+      if (s) clearStatus(e, true);
+    } else if (e.p !== undefined) {
+      if (e.m === NOT_PENDING) queuePendingNode(e);
+      e.m = i;
       syncCompanions(e, i);
       if (!hasActiveOverride(e)) insertSubs(e);
-      e.fe = clock;
-    } else if (s) {
-      const t = e.V;
-      const n = e.Z;
-      const r = e.xe;
+      e._e = clock;
+    } else if (o) {
+      const t = e.G;
+      const n = e.B;
+      const r = e.Ze;
       try {
-        if ((!t && o) || !r || !r(i, n)) {
-          e.Z = i;
-          e.fe = clock;
+        if ((!t && s) || !r || !r(i, n)) {
+          e.B = i;
+          e._e = clock;
           syncCompanions(e, i);
           insertSubs(e, true);
         }
@@ -1199,22 +1254,22 @@ function handleAsync(e, t, n) {
     let n = false,
       i = false,
       r,
-      s = true;
+      o = true;
     t.then(
       e => {
-        if (s) {
-          o = e;
+        if (o) {
+          s = e;
           n = true;
         } else asyncWrite(e);
       },
       e => {
-        if (s) {
+        if (o) {
           r = e;
           i = true;
         } else handleError(e);
       }
     );
-    s = false;
+    o = false;
     if (i) {
       handleError(r);
       throw r;
@@ -1227,6 +1282,7 @@ function handleAsync(e, t, n) {
     const n = t[Symbol.asyncIterator]();
     let i = false;
     let r = false;
+    let o = true;
     cleanup(() => {
       if (r) return;
       r = true;
@@ -1236,108 +1292,169 @@ function handleAsync(e, t, n) {
       } catch {}
     });
     const iterate = () => {
-      let s,
-        u = false,
-        c = true;
+      let u,
+        c,
+        a = false,
+        l = false,
+        f = true;
       n.next().then(
         n => {
-          if (c) {
-            s = n;
-            u = true;
+          if (f) {
+            u = n;
+            a = true;
             if (n.done) r = true;
-          } else if (e.be !== t) {
+          } else if (e.ke !== t) {
             return;
-          } else if (!n.done) asyncWrite(n.value, iterate);
-          else {
+          } else if (!n.done) {
+            i = true;
+            asyncWrite(n.value, iterate);
+          } else {
             r = true;
-            schedule();
-            flush();
+            if (i) {
+              schedule();
+              flush();
+            } else {
+              asyncWrite(undefined);
+            }
           }
         },
         n => {
-          if (!c && e.be === t) {
+          if (f) {
+            c = n;
+            l = true;
+          } else if (e.ke === t) {
             r = true;
             handleError(n);
           }
         }
       );
-      c = false;
-      if (u && !s.done) {
-        o = s.value;
+      f = false;
+      if (l) {
+        r = true;
+        handleError(c);
+        if (o) throw c;
+        return true;
+      }
+      if (a && !u.done) {
+        s = u.value;
         i = true;
         return iterate();
       }
-      return u && s.done;
+      return a && u.done;
     };
-    const s = iterate();
-    if (!i && !s) {
+    const u = iterate();
+    o = false;
+    if (!i && !u) {
       globalQueue.initTransition(resolveTransition(e));
       throw new NotReadyError(context);
     }
   }
-  return o;
+  return s;
 }
 function clearStatus(e, t = false) {
-  if (e.Te || e._e) clearPendingSources(e);
-  if (e.Me) e.Me = false;
-  e.Y = t ? 0 : e.Y & STATUS_UNINITIALIZED;
-  if (e.ae) setPendingError(e);
-  if (e.B || e.q) updatePendingSignal(e);
-  if (e.ye) updateChildCompanions(e);
-  if (e.Qe) e.Qe();
+  if (e.Ie || e.Ae) clearPendingSources(e);
+  if (e.Ye) e.Ye = false;
+  e.qe = false;
+  e.q = t ? 0 : e.q & STATUS_UNINITIALIZED;
+  if (e.Te) setPendingError(e);
+  if (e.X || e.J) updatePendingSignal(e);
+  if (e.ve) updateChildCompanions(e);
+  if (e.Be) e.Be();
 }
 function notifyStatus(e, t, n, i, r) {
   if (t === STATUS_ERROR && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
-  const o = t === STATUS_PENDING && n instanceof NotReadyError ? n.source : undefined;
-  const s = o === e;
-  const u = t === STATUS_PENDING && e.O !== undefined && !s;
+  const s = t === STATUS_PENDING && n instanceof NotReadyError ? n.source : undefined;
+  const o = s === e;
+  const u = t === STATUS_PENDING && e.p !== undefined && !o;
   const c = u && hasActiveOverride(e);
   if (!i) {
-    if (t === STATUS_PENDING && o) {
-      addPendingSource(e, o);
-      e.Y = STATUS_PENDING | (e.Y & STATUS_UNINITIALIZED);
-      setPendingError(e, o, n);
+    if (t === STATUS_PENDING && s) {
+      addPendingSource(e, s);
+      e.q = STATUS_PENDING | (e.q & STATUS_UNINITIALIZED);
+      setPendingError(e, s, n);
     } else {
       clearPendingSources(e);
-      e.Y = t | (t !== STATUS_ERROR ? e.Y & STATUS_UNINITIALIZED : 0);
-      e.ae = n;
+      e.q = t | (t !== STATUS_ERROR ? e.q & STATUS_UNINITIALIZED : 0);
+      e.Te = n;
     }
     updatePendingSignal(e);
-    if (e.ye) updateChildCompanions(e);
+    if (e.ve) updateChildCompanions(e);
   }
   if (r && !i) {
     assignOrMergeLane(e, r);
   }
-  const l = i || c;
-  const a = i || u ? undefined : r;
-  if (e.Qe) {
+  const a = i || c;
+  const l = i || u ? undefined : r;
+  if (e.Be) {
     if (i && t === STATUS_PENDING) {
       return;
     }
-    if (l) {
-      e.Qe(t, n);
+    if (a) {
+      e.Be(t, n);
     } else {
-      e.Qe();
+      e.Be();
     }
     return;
   }
   forEachDependent(e, (e, i) => {
-    e.fe = clock;
+    e._e = clock;
     if (
-      (t === STATUS_PENDING && o && e.Te !== o && !e._e?.has(o)) ||
-      (t !== STATUS_PENDING && (e.ae !== n || e.Te || e._e))
+      (t === STATUS_PENDING && s && e.Ie !== s && !e.Ae?.has(s)) ||
+      (t !== STATUS_PENDING && (e.Te !== n || e.Ie || e.Ae))
     ) {
-      if (i.ke && t !== STATUS_PENDING && !(n instanceof NotReadyError)) {
+      if (i.$e && t !== STATUS_PENDING && !(n instanceof NotReadyError)) {
         enqueueForRerun(e);
         schedule();
         return;
       }
-      if (!l && !e.T) queuePendingNode(e);
-      notifyStatus(e, t, n, l, a);
+      if (!a && !e.T) queuePendingNode(e);
+      notifyStatus(e, t, n, a, l);
     }
   });
 }
+function getAffectsSentinel(e) {
+  return (e.ze ??= {
+    Xe: undefined,
+    ge: e,
+    H: 0,
+    q: 0,
+    qe: false,
+    Te: undefined,
+    D: null,
+    he: null
+  });
+}
+function propagateAffectsMark(e) {
+  if (!e.D && !e.ve) return;
+  const t = getAffectsSentinel(e);
+  const n = new NotReadyError(t);
+  forEachDependent(e, e => {
+    if (e.Ie !== t && !e.Ae?.has(t)) {
+      if (!e.T) queuePendingNode(e);
+      notifyStatus(e, STATUS_PENDING, n);
+    }
+  });
+}
+function applyAffectsReads(e, t) {
+  let n = false;
+  for (let i = 0; i < t.length; i++) {
+    const r = t[i];
+    if (!r.L) continue;
+    const s = getAffectsSentinel(r);
+    if (addPendingSource(e, s)) {
+      e.q |= STATUS_PENDING;
+      setPendingError(e, s);
+      n = true;
+    }
+  }
+  if (n) updatePendingSignal(e);
+}
+GlobalQueue.le = propagateAffectsMark;
+GlobalQueue.fe = e => {
+  const t = e.ze;
+  if (t) settlePendingSource(e, t, true);
+};
 let externalSourceConfig = null;
 function enableExternalSource(e) {
   const { factory: t, untrack: n = e => e() } = e;
@@ -1346,11 +1463,11 @@ function enableExternalSource(e) {
     externalSourceConfig = {
       factory: (n, i) => {
         const r = e(n, i);
-        const o = t(e => r.track(e), i);
+        const s = t(e => r.track(e), i);
         return {
-          track: e => o.track(e),
+          track: e => s.track(e),
           dispose() {
-            o.dispose();
+            s.dispose();
             r.dispose();
           }
         };
@@ -1361,8 +1478,8 @@ function enableExternalSource(e) {
     externalSourceConfig = { factory: t, untrack: n };
   }
 }
-GlobalQueue.ie = recompute;
-GlobalQueue.re = disposeChildren;
+GlobalQueue.se = recompute;
+GlobalQueue.oe = disposeChildren;
 let tracking = false;
 let stale = false;
 let pendingCheckActive = false;
@@ -1370,12 +1487,13 @@ let latestReadActive = false;
 let context = null;
 let currentOptimisticLane = null;
 let pendingProbe = null;
+let affectsReads = null;
 let snapshotCaptureActive = false;
 let snapshotSources = null;
 function ownerInSnapshotScope(e) {
   while (e) {
-    if (e.je) return true;
-    e = e.J;
+    if (e.Je) return true;
+    e = e.te;
   }
   return false;
 }
@@ -1384,38 +1502,38 @@ function setSnapshotCapture(e) {
   if (e && !snapshotSources) snapshotSources = new Set();
 }
 function markSnapshotScope(e) {
-  e.je = true;
+  e.Je = true;
 }
 function releaseSnapshotScope(e) {
-  e.je = false;
+  e.Je = false;
   releaseSubtree(e);
   schedule();
 }
 function releaseSubtree(e) {
-  let t = e.ge;
+  let t = e.Le;
   while (t) {
-    if (t.je) {
-      t = t.De;
+    if (t.Je) {
+      t = t.Ve;
       continue;
     }
-    if (t.ce) {
+    if (t.de) {
       const e = t;
-      e.le &= ~CONFIG_IN_SNAPSHOT_SCOPE;
-      if (e.W & REACTIVE_SNAPSHOT_STALE) {
-        e.W &= ~REACTIVE_SNAPSHOT_STALE;
-        e.W |= REACTIVE_DIRTY;
-        if (dirtyQueue.I > e.H) dirtyQueue.I = e.H;
+      e.Se &= ~CONFIG_IN_SNAPSHOT_SCOPE;
+      if (e.H & REACTIVE_SNAPSHOT_STALE) {
+        e.H &= ~REACTIVE_SNAPSHOT_STALE;
+        e.H |= REACTIVE_DIRTY;
+        if (dirtyQueue.I > e.$) dirtyQueue.I = e.$;
         insertIntoHeap(e, dirtyQueue);
       }
     }
     releaseSubtree(t);
-    t = t.De;
+    t = t.Ve;
   }
 }
 function clearSnapshots() {
   if (snapshotSources) {
     for (const e of snapshotSources) {
-      delete e.Ee;
+      delete e.pe;
       delete e[STORE_SNAPSHOT_PROPS];
     }
     snapshotSources = null;
@@ -1423,69 +1541,73 @@ function clearSnapshots() {
   snapshotCaptureActive = false;
 }
 function recompute(e, t = false) {
-  const n = e.V;
+  const n = e.G;
   if (!t) {
     if (e.T && (!n || activeTransition) && activeTransition !== e.T)
       globalQueue.initTransition(e.T);
-    deleteFromHeap(e, e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-    e.be = null;
+    deleteFromHeap(e, e.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+    e.ke = null;
     if (e.T || n === EFFECT_TRACKED) disposeChildren(e);
-    else if (e.ge !== null || e.Ue !== null) {
+    else if (e.Le !== null || e.Me !== null) {
       markDisposal(e);
-      e.Se = e.Ue;
-      e.de = e.ge;
-      e.Ue = null;
-      e.ge = null;
-      e.ve = 0;
+      e.Re = e.Me;
+      e.Oe = e.Le;
+      e.Me = null;
+      e.Le = null;
+      e.Ge = 0;
     } else;
   }
-  let i = !!(e.W & REACTIVE_OPTIMISTIC_DIRTY);
-  const r = e.O !== undefined && e.O !== NOT_PENDING;
-  !!(e.Y & STATUS_PENDING);
-  const o = !!(e.Y & STATUS_UNINITIALIZED);
-  const s = context;
+  let i = !!(e.H & REACTIVE_OPTIMISTIC_DIRTY);
+  const r = e.p !== undefined && e.p !== NOT_PENDING;
+  const s = !!(e.q & STATUS_PENDING);
+  const o = !!(e.q & STATUS_UNINITIALIZED);
+  const u = !!(e.H & REACTIVE_REASK) && !(s && !e.qe);
+  const c = context;
   context = e;
-  e.me = null;
-  e.He++;
-  e.W = REACTIVE_RECOMPUTING_DEPS;
-  e.fe = clock;
-  let u = e.D === NOT_PENDING ? e.Z : e.D;
-  let c = e.H;
-  let l = tracking;
-  let a = currentOptimisticLane;
+  e.Ue = null;
+  e.Ke++;
+  e.H = REACTIVE_RECOMPUTING_DEPS;
+  e._e = clock;
+  let a = e.m === NOT_PENDING ? e.B : e.m;
+  let l = e.$;
+  let f = tracking;
+  const E = affectsReads;
+  affectsReads = null;
+  let d = null;
+  let S = currentOptimisticLane;
   tracking = true;
   if (i) {
     const t = resolveLane(e);
     if (t) currentOptimisticLane = t;
   } else if (activeTransition && !t && activeTransition.N.length) {
-    for (let t = e.Oe; t; t = t.pe) {
-      const n = t.Re;
-      if (n.W & REACTIVE_OPTIMISTIC_DIRTY) {
+    for (let t = e.he; t; t = t.Ne) {
+      const n = t.Ce;
+      if (n.H & REACTIVE_OPTIMISTIC_DIRTY) {
         const t = resolveLane(n);
         if (t) {
           i = true;
           currentOptimisticLane = t;
-          e.W |= REACTIVE_OPTIMISTIC_DIRTY;
+          e.H |= REACTIVE_OPTIMISTIC_DIRTY;
           assignOrMergeLane(e, t);
           break;
         }
       }
     }
   }
-  const f = n && n !== EFFECT_USER;
-  const E = stale;
-  if (f) stale = true;
+  const T = n && n !== EFFECT_USER;
+  const _ = stale;
+  if (T) stale = true;
   try {
-    if (!false && e.le & CONFIG_SYNC) {
-      u = e.ce(u);
-      e.be = null;
+    if (!false && e.Se & CONFIG_SYNC) {
+      a = e.de(a);
+      e.ke = null;
     } else {
-      const t = e.be;
-      const n = e.ce(u);
+      const t = e.ke;
+      const n = e.de(a);
       const i = typeof n === "object" && n !== null;
-      const r = e.be !== t;
-      u = r || !i ? n : handleAsync(e, n);
-      if (!r && !i) e.be = null;
+      const r = e.ke !== t;
+      a = r || !i ? n : handleAsync(e, n);
+      if (!r && !i) e.ke = null;
     }
     clearStatus(e, t);
     if (e.i) {
@@ -1504,7 +1626,12 @@ function recompute(e, t = false) {
         updatePendingSignal(t.o);
       }
     }
-    if (t instanceof NotReadyError) e.Me = true;
+    let n = false;
+    if (t instanceof NotReadyError) {
+      e.Ye = true;
+      n = s && e.qe !== u;
+      e.qe = u;
+    }
     notifyStatus(
       e,
       t instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR,
@@ -1512,230 +1639,236 @@ function recompute(e, t = false) {
       undefined,
       t instanceof NotReadyError ? e.i : undefined
     );
+    if (n) repollDownstreamVerdicts(e);
   } finally {
-    tracking = l;
-    if (f) stale = E;
-    e.W = REACTIVE_NONE | (t ? e.W & REACTIVE_SNAPSHOT_STALE : 0);
-    context = s;
+    tracking = f;
+    if (T) stale = _;
+    e.H = REACTIVE_NONE | (t ? e.H & REACTIVE_SNAPSHOT_STALE : 0);
+    context = c;
+    d = affectsReads;
+    affectsReads = E;
   }
-  if (!e.ae) {
+  if (!e.Te) {
     trimStaleDeps(e);
-    const s = r ? e.O : e.D === NOT_PENDING ? e.Z : e.D;
-    let l = false;
+    const s = r ? e.p : e.m === NOT_PENDING ? e.B : e.m;
+    let u = false;
     try {
-      l = (!n && o) || !e.xe || !e.xe(s, u);
+      u = (!n && o) || !e.Ze || !e.Ze(s, a);
     } catch (t) {
       notifyStatus(e, STATUS_ERROR, t);
     }
-    if (n && l) {
-      e.G = !e.ae;
-      if (!t) e.F.enqueue(n, (e.$e ??= GlobalQueue.oe.bind(null, e)));
+    if (n && u) {
+      e.F = !e.Te;
+      if (!t) e.W.enqueue(n, (e.et ??= GlobalQueue.ue.bind(null, e)));
     }
-    if (e.ae);
-    else if (l) {
-      const o = r ? e.O : undefined;
+    if (e.Te);
+    else if (u) {
+      const s = r ? e.p : undefined;
       if (t || (n && activeTransition !== e.T) || i) {
-        e.Z = u;
+        e.B = a;
         if (r && i) {
-          e.O = u;
-          e.D = NOT_PENDING;
+          e.p = a;
+          e.m = NOT_PENDING;
         }
       } else {
-        e.D = u;
-        if (activeTransition || e.T) syncCompanions(e, u);
+        e.m = a;
+        if (activeTransition || e.T) syncCompanions(e, a);
       }
-      if (!r || i || e.O !== o) insertSubs(e, i || r);
+      if (!r || i || e.p !== s) insertSubs(e, i || r);
     } else if (r) {
-      if (e.D === NOT_PENDING) queuePendingNode(e);
-      e.D = u;
-    } else if (e.H != c) {
-      for (let t = e.P; t !== null; t = t.L) {
-        insertIntoHeapHeight(t.U, t.U.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+      if (e.m === NOT_PENDING) queuePendingNode(e);
+      e.m = a;
+    } else if (e.$ != l) {
+      for (let t = e.D; t !== null; t = t.U) {
+        insertIntoHeapHeight(t.k, t.k.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
       }
     }
   }
-  currentOptimisticLane = a;
-  const d =
-    e.D !== NOT_PENDING ||
-    e.de !== null ||
-    e.Se !== null ||
-    !!(e.Y & (STATUS_PENDING | STATUS_UNINITIALIZED));
-  d && (!t || e.Y & STATUS_PENDING) && (!e.T || r) && queuePendingNode(e);
+  currentOptimisticLane = S;
+  if (d) applyAffectsReads(e, d);
+  const p =
+    e.m !== NOT_PENDING ||
+    e.Oe !== null ||
+    e.Re !== null ||
+    !!(e.q & (STATUS_PENDING | STATUS_UNINITIALIZED));
+  p && (!t || e.q & STATUS_PENDING) && (!e.T || r) && queuePendingNode(e);
   e.T && n && activeTransition !== e.T && runInTransition(e.T, () => recompute(e));
 }
 function updateIfNecessary(e) {
-  if (e.W & REACTIVE_CHECK) {
-    for (let t = e.Oe; t; t = t.pe) {
-      const n = t.Re;
-      const i = n.Ie || n;
-      if (i.ce) {
+  if (e.H & REACTIVE_CHECK) {
+    for (let t = e.he; t; t = t.Ne) {
+      const n = t.Ce;
+      const i = n.ye || n;
+      if (i.de) {
         updateIfNecessary(i);
       }
-      if (e.W & REACTIVE_DIRTY) {
+      if (e.H & REACTIVE_DIRTY) {
         break;
       }
     }
   }
-  if (e.W & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.ae && e.fe < clock && !e.be)) {
+  if (e.H & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.Te && e._e < clock && !e.ke)) {
     recompute(e);
   }
-  e.W = e.W & (REACTIVE_SNAPSHOT_STALE | REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT);
+  e.H = e.H & (REACTIVE_SNAPSHOT_STALE | REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT);
 }
 function computed(e, t) {
   const n = t?.transparent ?? false;
   const i = {
     id: t?.id ?? (n ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
-    le:
+    Se:
       (n ? CONFIG_TRANSPARENT : 0) |
       (t?.ownedWrite ? CONFIG_OWNED_WRITE : 0) |
       (!context || t?.lazy ? CONFIG_AUTO_DISPOSE : 0) |
       (t?.sync ? CONFIG_SYNC : 0) |
-      (t?.Ke ? CONFIG_NO_SNAPSHOT : 0) |
+      (t?.tt ? CONFIG_NO_SNAPSHOT : 0) |
       (snapshotCaptureActive && ownerInSnapshotScope(context) ? CONFIG_IN_SNAPSHOT_SCOPE : 0),
-    xe: t?.equals != null ? t.equals : isEqual,
-    m: t?.unobserved,
+    Ze: t?.equals != null ? t.equals : isEqual,
+    V: t?.unobserved,
+    Me: null,
+    W: context?.W ?? globalQueue,
+    He: context?.He ?? defaultContext,
+    Ge: 0,
+    de: e,
+    B: undefined,
+    $: 0,
+    ve: null,
+    me: undefined,
+    be: null,
+    he: null,
     Ue: null,
-    F: context?.F ?? globalQueue,
-    Ve: context?.Ve ?? defaultContext,
-    ve: 0,
-    ce: e,
-    Z: undefined,
-    H: 0,
-    ye: null,
-    Ce: undefined,
-    Ne: null,
-    Oe: null,
-    me: null,
-    He: 0,
-    P: null,
+    Ke: 0,
+    D: null,
+    xe: null,
+    te: context,
+    Ve: null,
     Fe: null,
-    J: context,
-    De: null,
-    we: null,
-    ge: null,
-    W: t?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
-    Y: STATUS_UNINITIALIZED,
-    fe: clock,
-    D: NOT_PENDING,
-    Se: null,
-    de: null,
-    be: null,
-    T: null
+    Le: null,
+    H: t?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
+    q: STATUS_UNINITIALIZED,
+    _e: clock,
+    m: NOT_PENDING,
+    Re: null,
+    Oe: null,
+    ke: null,
+    T: null,
+    qe: false
   };
   setupComputedNode(i, t);
   return i;
 }
-function createEffectNode(e, t, n, i, r, o) {
-  const s = o?.transparent ?? false;
+function createEffectNode(e, t, n, i, r, s) {
+  const o = s?.transparent ?? false;
   const u = {
-    id: o?.id ?? (s ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
-    le:
-      (s ? CONFIG_TRANSPARENT : 0) |
-      (o?.ownedWrite ? CONFIG_OWNED_WRITE : 0) |
-      (o?.sync ? CONFIG_SYNC : 0) |
+    id: s?.id ?? (o ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
+    Se:
+      (o ? CONFIG_TRANSPARENT : 0) |
+      (s?.ownedWrite ? CONFIG_OWNED_WRITE : 0) |
+      (s?.sync ? CONFIG_SYNC : 0) |
       (snapshotCaptureActive && ownerInSnapshotScope(context) ? CONFIG_IN_SNAPSHOT_SCOPE : 0),
-    xe: false,
-    m: o?.unobserved,
+    Ze: false,
+    V: s?.unobserved,
+    Me: null,
+    W: context?.W ?? globalQueue,
+    He: context?.He ?? defaultContext,
+    Ge: 0,
+    de: e,
+    B: undefined,
+    $: 0,
+    ve: null,
+    me: undefined,
+    be: null,
+    he: null,
     Ue: null,
-    F: context?.F ?? globalQueue,
-    Ve: context?.Ve ?? defaultContext,
-    ve: 0,
-    ce: e,
-    Z: undefined,
-    H: 0,
-    ye: null,
-    Ce: undefined,
-    Ne: null,
-    Oe: null,
-    me: null,
-    He: 0,
-    P: null,
+    Ke: 0,
+    D: null,
+    xe: null,
+    te: context,
+    Ve: null,
     Fe: null,
-    J: context,
-    De: null,
-    we: null,
-    ge: null,
-    W: REACTIVE_LAZY,
-    Y: STATUS_UNINITIALIZED,
-    fe: clock,
-    D: NOT_PENDING,
-    Se: null,
-    de: null,
-    be: null,
+    Le: null,
+    H: REACTIVE_LAZY,
+    q: STATUS_UNINITIALIZED,
+    _e: clock,
+    m: NOT_PENDING,
+    Re: null,
+    Oe: null,
+    ke: null,
     T: null,
-    G: false,
-    Ye: undefined,
-    Ze: t,
-    Be: n,
-    Le: undefined,
-    V: i,
-    Qe: r
+    qe: false,
+    F: false,
+    nt: undefined,
+    it: t,
+    rt: n,
+    We: undefined,
+    G: i,
+    Be: r
   };
   setupComputedNode(u, lazyOptions);
   return u;
 }
 const lazyOptions = { lazy: true };
 function setupComputedNode(e, t) {
-  e.Ne = e;
-  const n = context?.he ? context.Ae : context;
+  e.be = e;
+  const n = context?.Pe ? context.De : context;
   if (context) {
-    const t = context.ge;
+    const t = context.Le;
     if (t === null) {
-      context.ge = e;
+      context.Le = e;
     } else {
-      e.De = t;
-      t.we = e;
-      context.ge = e;
+      e.Ve = t;
+      t.Fe = e;
+      context.Le = e;
     }
   }
-  if (n) e.H = n.H + 1;
+  if (n) e.$ = n.$ + 1;
   if (externalSourceConfig) {
     const t = signal(undefined, { equals: false, ownedWrite: true });
-    const n = externalSourceConfig.factory(e.ce, () => {
+    const n = externalSourceConfig.factory(e.de, () => {
       setSignal(t, undefined);
     });
     cleanup(() => n.dispose());
-    e.ce = e => {
+    e.de = e => {
       read(t);
       return n.track(e);
     };
   }
   !t?.lazy && recompute(e, true);
   if (snapshotCaptureActive && !t?.lazy) {
-    if (!(e.Y & STATUS_PENDING) && !(e.le & CONFIG_NO_SNAPSHOT)) {
-      e.Ee = e.Z === undefined ? NO_SNAPSHOT : e.Z;
+    if (!(e.q & STATUS_PENDING) && !(e.Se & CONFIG_NO_SNAPSHOT)) {
+      e.pe = e.B === undefined ? NO_SNAPSHOT : e.B;
       snapshotSources.add(e);
     }
   }
 }
 function signal(e, t, n = null) {
   const i = {
-    xe: t?.equals != null ? t.equals : isEqual,
-    le: (t?.ownedWrite ? CONFIG_OWNED_WRITE : 0) | (t?.Ke ? CONFIG_NO_SNAPSHOT : 0),
-    m: t?.unobserved,
-    Z: e,
-    P: null,
-    Fe: null,
-    fe: clock,
-    Ie: n,
-    Pe: n?.ye || null,
-    D: NOT_PENDING
+    Ze: t?.equals != null ? t.equals : isEqual,
+    Se: (t?.ownedWrite ? CONFIG_OWNED_WRITE : 0) | (t?.tt ? CONFIG_NO_SNAPSHOT : 0),
+    V: t?.unobserved,
+    B: e,
+    D: null,
+    xe: null,
+    _e: clock,
+    ye: n,
+    we: n?.ve || null,
+    m: NOT_PENDING
   };
-  n && (n.ye = i);
-  if (snapshotCaptureActive && !(i.le & CONFIG_NO_SNAPSHOT) && !((n?.Y ?? 0) & STATUS_PENDING)) {
-    i.Ee = e === undefined ? NO_SNAPSHOT : e;
+  n && (n.ve = i);
+  if (snapshotCaptureActive && !(i.Se & CONFIG_NO_SNAPSHOT) && !((n?.q ?? 0) & STATUS_PENDING)) {
+    i.pe = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources.add(i);
   }
   return i;
 }
 function optimisticSignal(e, t) {
   const n = signal(e, t);
-  n.O = NOT_PENDING;
+  n.p = NOT_PENDING;
   return n;
 }
 function optimisticComputed(e, t) {
   const n = computed(e, t);
-  n.O = NOT_PENDING;
+  n.p = NOT_PENDING;
   return n;
 }
 function isEqual(e, t) {
@@ -1753,10 +1886,10 @@ function untrack(e, t) {
   }
 }
 function prepareComputed(e, t) {
-  if (e.W & REACTIVE_LAZY) {
-    e.W &= ~REACTIVE_LAZY;
+  if (e.H & REACTIVE_LAZY) {
+    e.H &= ~REACTIVE_LAZY;
     recompute(e, true);
-  } else if (e.W & REACTIVE_DISPOSED) {
+  } else if (e.H & REACTIVE_DISPOSED) {
     recompute(e, true);
   } else if (t) {
     updateIfNecessary(e);
@@ -1767,17 +1900,17 @@ function read(e) {
     const t = getLatestValueComputed(e);
     const n = latestReadActive;
     latestReadActive = false;
-    const i = e.O !== undefined && e.O !== NOT_PENDING ? e.O : e.Z;
+    const i = e.p !== undefined && e.p !== NOT_PENDING ? e.p : e.B;
     let r;
     try {
       r = read(t);
     } catch (t) {
-      if (t instanceof NotReadyError && (!context || !(e.Y & STATUS_UNINITIALIZED))) return i;
+      if (t instanceof NotReadyError && (!context || !(e.q & STATUS_UNINITIALIZED))) return i;
       throw t;
     } finally {
       latestReadActive = n;
     }
-    if (t.Y & STATUS_PENDING) return i;
+    if (t.q & STATUS_PENDING) return i;
     if (stale && currentOptimisticLane && t.i) {
       const e = findLane(t.i);
       const n = findLane(currentOptimisticLane);
@@ -1788,133 +1921,137 @@ function read(e) {
     return r;
   }
   let t = context;
-  if (t?.he) t = t.Ae;
+  if (t?.Pe) t = t.De;
   const n = e;
-  const i = e.Ie;
+  const i = e.ye;
   const r = i || e;
   if (pendingCheckActive) {
     pendingCheckActive = false;
-    if (typeof n.ce === "function") prepareComputed(e, true);
-    if (t && r.Y & STATUS_PENDING && r.Y & STATUS_UNINITIALIZED) {
+    if (typeof n.de === "function") prepareComputed(e, true);
+    if (t && r.q & STATUS_PENDING && r.q & STATUS_UNINITIALIZED) {
       if (tracking && e !== t) link(e, t);
       pendingCheckActive = true;
-      throw r.ae;
+      throw r.Te;
     }
     collectPendingSources(e);
     if (i) collectPendingSources(i);
     pendingCheckActive = true;
-  } else if (typeof n.ce === "function") {
+  } else if (typeof n.de === "function") {
     prepareComputed(e, false);
   }
   if (
-    !n.ce &&
+    !n.de &&
     r === e &&
-    e.O === undefined &&
-    e.Ee === undefined &&
+    e.p === undefined &&
+    e.pe === undefined &&
     activeTransition === null &&
     currentOptimisticLane === null &&
     !snapshotCaptureActive &&
     true
   ) {
-    if (t && tracking) link(e, t);
-    return !t || e.D === NOT_PENDING ? e.Z : e.D;
+    if (t && tracking) {
+      link(e, t);
+      if (activeAffectsMarks !== 0 && e.L && !pendingCheckActive) (affectsReads ??= []).push(e);
+    }
+    return !t || e.m === NOT_PENDING ? e.B : e.m;
   }
   if (t && tracking) {
     link(e, t, pendingCheckActive);
-    if (r.ce) {
-      const n = e.W & REACTIVE_ZOMBIE;
-      if (r.H >= (n ? zombieQueue.I : dirtyQueue.I)) {
+    if (activeAffectsMarks !== 0 && e.L && !pendingCheckActive) (affectsReads ??= []).push(e);
+    if (r.de) {
+      const n = e.H & REACTIVE_ZOMBIE;
+      if (r.$ >= (n ? zombieQueue.I : dirtyQueue.I)) {
         markNode(t);
         markHeap(n ? zombieQueue : dirtyQueue);
         updateIfNecessary(r);
       }
-      const i = r.H;
-      if (i >= t.H && e.J !== t) {
-        t.H = i + 1;
+      const i = r.$;
+      if (i >= t.$ && e.te !== t) {
+        t.$ = i + 1;
       }
     }
   }
-  if (r.Y & STATUS_PENDING) {
+  if (r.q & STATUS_PENDING) {
     if (t && !(stale && r.T && activeTransition !== r.T)) {
       if (currentOptimisticLane) {
         const n = r.i;
         const i = findLane(currentOptimisticLane);
         if (n && findLane(n) === i && !hasActiveOverride(r)) {
           if (!tracking && e !== t) link(e, t);
-          throw r.ae;
+          throw r.Te;
         }
       } else {
         if (!tracking && e !== t) link(e, t);
-        throw r.ae;
+        throw r.Te;
       }
-    } else if (t && r !== e && r.Y & STATUS_UNINITIALIZED) {
+    } else if (t && r !== e && r.q & STATUS_UNINITIALIZED) {
       if (!tracking && e !== t) link(e, t);
-      throw r.ae;
-    } else if (!t && r.Y & STATUS_UNINITIALIZED) {
-      throw r.ae;
+      throw r.Te;
+    } else if (!t && r.q & STATUS_UNINITIALIZED) {
+      throw r.Te;
     }
   }
-  if (e.ce && e.Y & STATUS_ERROR) {
-    if (tracking && !pendingCheckActive && e.fe < clock) {
+  if (e.de && e.q & STATUS_ERROR) {
+    if (tracking && !pendingCheckActive && e._e < clock) {
       recompute(e);
       return read(e);
-    } else throw e.ae;
+    } else throw e.Te;
   }
-  if (snapshotCaptureActive && t && t.le & CONFIG_IN_SNAPSHOT_SCOPE) {
-    const n = e.Ee;
+  if (snapshotCaptureActive && t && t.Se & CONFIG_IN_SNAPSHOT_SCOPE) {
+    const n = e.pe;
     if (n !== undefined) {
       const i = n === NO_SNAPSHOT ? undefined : n;
-      const r = e.D !== NOT_PENDING ? e.D : e.Z;
-      if (r !== i) t.W |= REACTIVE_SNAPSHOT_STALE;
+      const r = e.m !== NOT_PENDING ? e.m : e.B;
+      if (r !== i) t.H |= REACTIVE_SNAPSHOT_STALE;
       return i;
     }
   }
-  if (e.O !== undefined && e.O !== NOT_PENDING) {
-    if (t && stale && shouldReadStashedOptimisticValue(e)) return e.Z;
-    return e.O;
+  if (e.p !== undefined && e.p !== NOT_PENDING) {
+    if (t && stale && shouldReadStashedOptimisticValue(e)) return e.B;
+    return e.p;
   }
   if (
     activeTransition !== null &&
     currentOptimisticLane !== null &&
     !latestReadActive &&
-    e.D !== NOT_PENDING &&
-    (r === e || !!(r.W & REACTIVE_MANUAL_WRITE)) &&
-    !e.ce &&
+    e.m !== NOT_PENDING &&
+    (r === e || !!(r.H & REACTIVE_MANUAL_WRITE)) &&
+    !e.de &&
     t
   ) {
-    activeTransition.K.add(t);
-    return e.Z;
+    activeTransition.Z.add(t);
+    return e.B;
   }
-  const o =
+  const s =
     !t ||
     (currentOptimisticLane !== null &&
-      (e.O !== undefined || e.i || (r === e && stale && t.t !== e) || !!(r.Y & STATUS_PENDING))) ||
-    e.D === NOT_PENDING ||
+      (e.p !== undefined || e.i || (r === e && stale && t.t !== e) || !!(r.q & STATUS_PENDING))) ||
+    e.m === NOT_PENDING ||
     (stale && e.T && activeTransition !== e.T)
-      ? e.Z
-      : e.D;
-  if (pendingCheckActive && pendingProbe !== null && e.D !== NOT_PENDING && o === e.D)
+      ? e.B
+      : e.m;
+  if (pendingCheckActive && pendingProbe !== null && e.m !== NOT_PENDING && s === e.m)
     pendingProbe.freshReads.add(e);
   if (
     !t &&
     r === e &&
-    typeof n.ce === "function" &&
-    e.le & CONFIG_AUTO_DISPOSE &&
-    !(r.Y & STATUS_PENDING) &&
-    !e.P
+    typeof n.de === "function" &&
+    e.Se & CONFIG_AUTO_DISPOSE &&
+    !(r.q & STATUS_PENDING) &&
+    !e.D
   ) {
     unobserved(e);
   }
-  return o;
+  return s;
 }
 function setSignal(e, t) {
   if (e.T && activeTransition !== e.T) globalQueue.initTransition(e.T);
-  const n = e.O !== undefined && !projectionWriteActive;
-  const i = e.O !== undefined && e.O !== NOT_PENDING;
-  const r = n ? (i ? e.O : e.Z) : e.D === NOT_PENDING ? e.Z : e.D;
+  const n = e.p !== undefined && !projectionWriteActive;
+  const i = e.p !== undefined && e.p !== NOT_PENDING;
+  const r = n ? (i ? e.p : e.B) : e.m === NOT_PENDING ? e.B : e.m;
   if (typeof t === "function") t = t(r);
-  const o = !!(e.Y & STATUS_UNINITIALIZED) || !e.xe || !e.xe(r, t);
-  if (!o) {
+  const s = !!(e.q & STATUS_UNINITIALIZED) || !e.Ze || !e.Ze(r, t);
+  if (!s) {
     if (n && i) {
       const t = resolveTransition(e);
       if (t && activeTransition !== t) globalQueue.initTransition(t);
@@ -1922,29 +2059,29 @@ function setSignal(e, t) {
     return t;
   }
   if (n) {
-    const n = e.O === NOT_PENDING;
+    const n = e.p === NOT_PENDING;
     if (!n) globalQueue.initTransition(resolveTransition(e));
     if (n) globalQueue.N.push(e);
     const i = getOrCreateLane(e);
     e.i = i;
-    e.O = t;
+    e.p = t;
   } else {
-    if (e.D === NOT_PENDING) queuePendingNode(e);
-    e.D = t;
+    if (e.m === NOT_PENDING) queuePendingNode(e);
+    e.m = t;
   }
   syncCompanions(e, t);
-  e.fe = clock;
+  e._e = clock;
   insertSubs(e, n);
   schedule();
   return t;
 }
 function suppressComputedRecompute(e) {
-  deleteFromHeap(e, e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-  if (!(e.W & REACTIVE_MANUAL_WRITE) && e.D === NOT_PENDING) {
+  deleteFromHeap(e, e.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  if (!(e.H & REACTIVE_MANUAL_WRITE) && e.m === NOT_PENDING) {
     queuePendingNode(e);
     schedule();
   }
-  e.W = (e.W & -4) | REACTIVE_MANUAL_WRITE;
+  e.H = (e.H & -4) | REACTIVE_MANUAL_WRITE;
 }
 function setMemo(e, t) {
   const n = setSignal(e, t);
@@ -1964,75 +2101,107 @@ function runWithOwner(e, t) {
   }
 }
 function getPendingSignal(e) {
-  if (!e.B) {
-    e.B = optimisticSignal(false, { ownedWrite: true });
-    e.B.t = e;
-    if (computePendingState(e)) setSignal(e.B, true);
+  if (!e.X) {
+    e.X = optimisticSignal(false, { ownedWrite: true });
+    e.X.t = e;
+    if (computePendingState(e)) setSignal(e.X, true);
   }
-  return e.B;
+  return e.X;
 }
 function collectPendingSources(e) {
   if (!pendingProbe) return;
   pendingProbe.sources.add(e);
-  const t = e.Ie || e;
+  const t = e.ye || e;
   if (t !== e) pendingProbe.sources.add(t);
 }
+function witnessAffects(e) {
+  pendingProbe?.sources.add(e);
+}
+function quietPending(e) {
+  if (e.Ae) {
+    for (const t of e.Ae) if (!t.qe) return false;
+    return true;
+  }
+  if (e.Ie) return e.Ie.qe;
+  return e.qe;
+}
+function newQuestionInFlight(e) {
+  return !!(e.q & STATUS_PENDING) && !(e.q & STATUS_UNINITIALIZED) && !quietPending(e);
+}
 function computePendingState(e) {
   const t = e;
-  if (t.W & REACTIVE_DISPOSED) return false;
-  const n = e.Ie;
-  if ((n || t).qe) return false;
+  if (t.H & REACTIVE_DISPOSED) return false;
+  if (e.L) return true;
+  const n = e.ye;
   if (e.t) {
     const t = e.t;
-    if (hasActiveOverride(t)) return false;
-    const n = t.Ie || t;
-    if (n.qe) return false;
-    return !!(n.Y & STATUS_PENDING && !(n.Y & STATUS_UNINITIALIZED));
+    if (t.L) return true;
+    const n = t.ye || t;
+    return newQuestionInFlight(n);
+  }
+  if (n && e.m !== NOT_PENDING && !hasActiveOverride(e)) {
+    return (
+      !!(n.H & REACTIVE_MANUAL_WRITE) ||
+      (!n.ke && !(n.q & STATUS_PENDING)) ||
+      (!!(n.q & STATUS_PENDING) && quietPending(n))
+    );
   }
-  if (hasActiveOverride(e)) return false;
-  if (n && e.D !== NOT_PENDING) {
-    return !!(n.W & REACTIVE_MANUAL_WRITE) || (!n.be && !(n.Y & STATUS_PENDING));
+  if (e.m !== NOT_PENDING && !(t.q & STATUS_UNINITIALIZED)) {
+    if (hasActiveOverride(e)) return !e.Ze || !e.Ze(e.m, e.p);
+    return true;
   }
-  if (e.D !== NOT_PENDING && !(t.Y & STATUS_UNINITIALIZED)) return true;
-  return !!(t.Y & STATUS_PENDING && !(t.Y & STATUS_UNINITIALIZED));
+  return newQuestionInFlight(t);
 }
 function syncCompanions(e, t) {
-  if (e.B) updatePendingSignal(e);
-  if (e.q) setSignal(e.q, t);
+  if (e.X) updatePendingSignal(e);
+  if (e.J) setSignal(e.J, t);
 }
 function updatePendingSignal(e) {
-  if (e.B) {
-    setSignal(e.B, computePendingState(e));
+  if (e.X) {
+    setSignal(e.X, computePendingState(e));
   }
-  if (e.q) updatePendingSignal(e.q);
+  if (e.J) updatePendingSignal(e.J);
 }
 function updateChildCompanions(e) {
-  for (let t = e.ye; t !== null; t = t.Pe) {
-    if (t.B || t.q) updatePendingSignal(t);
+  for (let t = e.ve; t !== null; t = t.we) {
+    if (t.X || t.J) updatePendingSignal(t);
   }
 }
+function repollDownstreamVerdicts(e) {
+  const t = new Set();
+  const visit = e => {
+    if (t.has(e)) return;
+    t.add(e);
+    if (e.X || e.J) updatePendingSignal(e);
+    for (let t = e.D; t !== null; t = t.U) visit(t.k);
+    for (let t = e.ve ?? null; t !== null; t = t.we) {
+      visit(t);
+    }
+  };
+  visit(e);
+}
 function snapCompanionsToState(e) {
-  const t = e.B;
-  if (t && (t.O === undefined || t.O === NOT_PENDING)) {
+  const t = e.X;
+  if (t && (t.p === undefined || t.p === NOT_PENDING)) {
     const n = computePendingState(e);
-    if (t.Z !== n || t.D !== NOT_PENDING) {
-      t.Z = n;
-      t.D = NOT_PENDING;
-      t.fe = clock;
+    if (t.B !== n || t.m !== NOT_PENDING) {
+      t.B = n;
+      t.m = NOT_PENDING;
+      t._e = clock;
       insertSubs(t);
       schedule();
     }
   }
-  const n = e.q;
-  if (n && !(n.W & REACTIVE_DISPOSED)) {
+  const n = e.J;
+  if (n && !(n.H & REACTIVE_DISPOSED)) {
     if (
-      (n.O === undefined || n.O === NOT_PENDING) &&
-      n.D === NOT_PENDING &&
-      !Object.is(n.Z, e.Z) &&
-      !(n.W & (REACTIVE_DIRTY | REACTIVE_CHECK))
+      (n.p === undefined || n.p === NOT_PENDING) &&
+      n.m === NOT_PENDING &&
+      !Object.is(n.B, e.B) &&
+      !(n.H & (REACTIVE_DIRTY | REACTIVE_CHECK))
     ) {
-      n.W |= REACTIVE_DIRTY;
-      insertIntoHeap(n, n.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+      n.H |= REACTIVE_DIRTY;
+      insertIntoHeap(n, n.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
       insertSubs(n);
       schedule();
     }
@@ -2040,20 +2209,20 @@ function snapCompanionsToState(e) {
   }
 }
 function getLatestValueComputed(e) {
-  if (!e.q) {
+  if (!e.J) {
     const t = latestReadActive;
     latestReadActive = false;
     const n = pendingCheckActive;
     pendingCheckActive = false;
     const i = context;
     context = null;
-    e.q = optimisticComputed(() => read(e));
-    e.q.t = e;
+    e.J = optimisticComputed(() => read(e));
+    e.J.t = e;
     context = i;
     pendingCheckActive = n;
     latestReadActive = t;
   }
-  return e.q;
+  return e.J;
 }
 function staleValues(e, t = true) {
   const n = stale;
@@ -2095,8 +2264,9 @@ function isPending(e) {
   } catch (e) {
     collectPending();
     if (e instanceof NotReadyError) {
-      if (i.found && !(e.source?.Y & STATUS_UNINITIALIZED)) return true;
-      if (context) throw e;
+      const t = !!(e.source?.q & STATUS_UNINITIALIZED);
+      if (i.found && !t) return true;
+      if (context && t) throw e;
     }
     return i.found;
   } finally {
@@ -2109,9 +2279,13 @@ function refresh(e) {
   if (!t) {
     return;
   }
-  if (typeof t.ce === "function" && !(t.W & (REACTIVE_DISPOSED | REACTIVE_MANUAL_WRITE))) {
-    t.W = (t.W & ~REACTIVE_CHECK) | REACTIVE_DIRTY;
-    insertIntoHeap(t, t.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  if (typeof t.de === "function" && !(t.H & (REACTIVE_DISPOSED | REACTIVE_MANUAL_WRITE))) {
+    if (!(t.H & (REACTIVE_DIRTY | REACTIVE_CHECK | REACTIVE_IN_HEAP))) {
+      t.H |= REACTIVE_REASK;
+      armReaskClear();
+    }
+    t.H = (t.H & ~REACTIVE_CHECK) | REACTIVE_DIRTY;
+    insertIntoHeap(t, t.H & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     schedule();
   }
 }
@@ -2122,7 +2296,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.Ve[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.He[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -2132,119 +2306,119 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.Ve = { ...n.Ve, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.He = { ...n.He, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.Ve[e.id]);
+  return !isUndefined(t?.He[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
 }
 function effect(e, t, n, i) {
   const r = !!i?.user;
-  const o = createEffectNode(e, t, n, r ? EFFECT_USER : EFFECT_RENDER, notifyEffectStatus, i);
-  recompute(o, true);
+  const s = createEffectNode(e, t, n, r ? EFFECT_USER : EFFECT_RENDER, notifyEffectStatus, i);
+  recompute(s, true);
   !i?.defer &&
-    (o.V === EFFECT_USER || i?.schedule ? o.F.enqueue(o.V, runEffect.bind(null, o)) : runEffect(o));
+    (s.G === EFFECT_USER || i?.schedule ? s.W.enqueue(s.G, runEffect.bind(null, s)) : runEffect(s));
 }
 function notifyEffectStatus(e, t) {
-  const n = e !== undefined ? e : this.Y;
-  const i = t !== undefined ? t : this.ae;
+  const n = e !== undefined ? e : this.q;
+  const i = t !== undefined ? t : this.Te;
   if (n & STATUS_ERROR) {
-    this.F.notify(this, STATUS_PENDING, 0);
-    if (this.V === EFFECT_USER) {
-      if (this.Y & STATUS_ERROR) {
-        this.G = true;
-        this.F.enqueue(this.V, (this.$e ??= runEffect.bind(null, this)));
+    this.W.notify(this, STATUS_PENDING, 0);
+    if (this.G === EFFECT_USER) {
+      if (this.q & STATUS_ERROR) {
+        this.F = true;
+        this.W.enqueue(this.G, (this.et ??= runEffect.bind(null, this)));
       }
       return;
     }
-    if (!this.F.notify(this, STATUS_ERROR, STATUS_ERROR)) {
+    if (!this.W.notify(this, STATUS_ERROR, STATUS_ERROR)) {
       haltReactivity();
       throw i;
     }
-  } else if (this.V === EFFECT_RENDER) {
-    this.F.notify(this, STATUS_PENDING | STATUS_ERROR, n, i);
+  } else if (this.G === EFFECT_RENDER) {
+    this.W.notify(this, STATUS_PENDING | STATUS_ERROR, n, i);
   }
 }
 function runEffect(e) {
-  if (!e.G || e.W & REACTIVE_DISPOSED) return;
-  if (e.Y & STATUS_ERROR && e.V === EFFECT_USER) {
-    const t = e.ae instanceof StatusError ? (e.ae.cause ?? e.ae) : e.ae;
-    e.Ye = e.Z;
-    e.G = false;
+  if (!e.F || e.H & REACTIVE_DISPOSED) return;
+  if (e.q & STATUS_ERROR && e.G === EFFECT_USER) {
+    const t = unwrapStatusError(e.Te);
+    e.nt = e.B;
+    e.F = false;
     try {
-      e.Be
-        ? e.Be(t, () => {
-            const t = e.Le;
-            e.Le = undefined;
+      e.rt
+        ? e.rt(t, () => {
+            const t = e.We;
+            e.We = undefined;
             t?.();
           })
         : console.error(t);
     } catch (t) {
-      if (!e.F.notify(e, STATUS_ERROR, STATUS_ERROR)) {
+      if (!e.W.notify(e, STATUS_ERROR, STATUS_ERROR)) {
         haltReactivity();
         throw t;
       }
     }
     return;
   }
-  const t = e.Le;
-  e.Le = undefined;
+  const t = e.We;
+  e.We = undefined;
   try {
     t?.();
-    const n = e.Ze(e.Z, e.Ye);
+    const n = e.it(e.B, e.nt);
     if (false && n !== undefined && typeof n !== "function");
-    e.Le = n;
+    e.We = n;
   } catch (t) {
-    e.ae = new StatusError(e, t);
-    e.Y |= STATUS_ERROR;
-    if (!e.F.notify(e, STATUS_ERROR, STATUS_ERROR)) {
+    e.Te = new StatusError(e, t);
+    e.q |= STATUS_ERROR;
+    if (!e.W.notify(e, STATUS_ERROR, STATUS_ERROR)) {
       haltReactivity();
       throw t;
     }
   } finally {
-    e.Ye = e.Z;
-    e.G = false;
+    e.nt = e.B;
+    e.F = false;
   }
 }
-GlobalQueue.oe = runEffect;
+GlobalQueue.ue = runEffect;
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.G || n.W & REACTIVE_DISPOSED) return;
+    if (!n.F || n.H & REACTIVE_DISPOSED) return;
     try {
-      n.G = false;
+      n.F = false;
       recompute(n);
     } finally {
     }
   };
   const n = computed(
     () => {
-      const t = n.Le;
-      n.Le = undefined;
+      const t = n.We;
+      n.We = undefined;
       t?.();
       const i = staleValues(e);
-      n.Le = i;
+      n.We = i;
     },
     { ...t, lazy: true }
   );
-  n.Le = undefined;
-  n.le = (n.le & ~CONFIG_AUTO_DISPOSE) | CONFIG_CHILDREN_FORBIDDEN;
-  n.G = true;
-  n.V = EFFECT_TRACKED;
-  n.Qe = (e, t) => {
-    const i = e !== undefined ? e : n.Y;
+  n.We = undefined;
+  n.Se = (n.Se & ~CONFIG_AUTO_DISPOSE) | CONFIG_CHILDREN_FORBIDDEN;
+  n.F = true;
+  n.G = EFFECT_TRACKED;
+  n.Be = (e, t) => {
+    const i = e !== undefined ? e : n.q;
     if (i & STATUS_ERROR) {
-      n.F.notify(n, STATUS_PENDING, 0);
-      const e = t !== undefined ? t : n.ae;
-      if (!n.F.notify(n, STATUS_ERROR, STATUS_ERROR)) {
+      n.W.notify(n, STATUS_PENDING, 0);
+      const e = t !== undefined ? t : n.Te;
+      if (!n.W.notify(n, STATUS_ERROR, STATUS_ERROR)) {
         haltReactivity();
         throw e;
       }
     }
   };
-  n.k = run;
-  n.F.enqueue(EFFECT_USER, run);
+  n.M = run;
+  n.W.enqueue(EFFECT_USER, run);
 }
 function restoreTransition(e, t) {
   globalQueue.initTransition(e);
@@ -2257,34 +2431,34 @@ function action(e) {
     new Promise((n, i) => {
       const r = e(...t);
       globalQueue.initTransition();
-      let o = activeTransition;
-      o.j.push(r);
-      const done = (e, t) => {
-        o = currentTransition(o);
-        const s = o.j.indexOf(r);
-        if (s >= 0) o.j.splice(s, 1);
-        setActiveTransition(o);
+      let s = activeTransition;
+      s.K.push(r);
+      const done = (e, t, o = false) => {
+        s = currentTransition(s);
+        const u = s.K.indexOf(r);
+        if (u >= 0) s.K.splice(u, 1);
+        setActiveTransition(s);
         schedule();
-        t ? i(t) : n(e);
+        o ? i(t) : n(e);
       };
       const step = (e, t) => {
         let n;
         try {
           n = t ? r.throw(e) : r.next(e);
         } catch (e) {
-          return done(undefined, e);
+          return done(undefined, e, true);
         }
-        if (isThenable(n)) return void n.then(run, e => done(undefined, e));
+        if (isThenable(n)) return void n.then(run, e => done(undefined, e, true));
         run(n);
       };
       const run = e => {
         if (e.done) return done(e.value);
         if (isThenable(e.value))
           return void e.value.then(
-            e => restoreTransition(o, () => step(e)),
-            e => restoreTransition(o, () => step(e, true))
+            e => restoreTransition(s, () => step(e)),
+            e => restoreTransition(s, () => step(e, true))
           );
-        restoreTransition(o, () => step(e.value));
+        restoreTransition(s, () => step(e.value));
       };
       step();
     });
@@ -2300,7 +2474,7 @@ function accessor(e) {
 function createSignal(e, t) {
   if (typeof e === "function") {
     const n = computed(e, t);
-    n.le &= ~CONFIG_AUTO_DISPOSE;
+    n.Se &= ~CONFIG_AUTO_DISPOSE;
     return [accessor(n), setMemo.bind(null, n)];
   }
   const n = signal(e, t);
@@ -2322,11 +2496,17 @@ function createReaction(e, t) {
   let n = undefined;
   cleanup(() => n?.());
   const i = getOwner();
-  return r => {
+  let r;
+  return s => {
+    if (r) {
+      dispose(r);
+      r = undefined;
+    }
     runWithOwner(i, () => {
       effect(
-        () => (r(), getOwner()),
+        () => (s(), (r = getOwner())),
         t => {
+          r = undefined;
           n?.();
           const i = (e.effect || e)?.();
           if (false && i !== undefined && typeof i !== "function");
@@ -2360,7 +2540,7 @@ function resolve(e) {
 function createOptimistic(e, t) {
   if (typeof e === "function") {
     const n = optimisticComputed(e, t);
-    n.le &= ~CONFIG_AUTO_DISPOSE;
+    n.Se &= ~CONFIG_AUTO_DISPOSE;
     return [accessor(n), setSignal.bind(null, n)];
   }
   const n = optimisticSignal(e, t);
@@ -2368,7 +2548,7 @@ function createOptimistic(e, t) {
 }
 function onSettled(e) {
   const t = getOwner();
-  t && !(t.le & CONFIG_CHILDREN_FORBIDDEN)
+  t && !(t.Se & CONFIG_CHILDREN_FORBIDDEN)
     ? createTrackedEffect(() => untrack(e), undefined)
     : globalQueue.enqueue(EFFECT_USER, () => {
         e();
@@ -2400,11 +2580,11 @@ function addEnumSymbols(e, t, n) {
 function getAllKeys(e, t, n) {
   const i = getKeys(e, t);
   const r = Object.keys(n);
-  const o = e[$TARGET]
+  const s = e[$TARGET]
     ? untrack(() => Object.getOwnPropertySymbols(e))
     : Object.getOwnPropertySymbols(e);
-  const s = Object.getOwnPropertySymbols(n);
-  if (o.length === 0 && s.length === 0) {
+  const o = Object.getOwnPropertySymbols(n);
+  if (s.length === 0 && o.length === 0) {
     if (i.length === r.length) {
       let e = true;
       for (let t = 0; t < i.length; t++) {
@@ -2420,14 +2600,14 @@ function getAllKeys(e, t, n) {
     return Array.from(e);
   }
   const u = new Set(i);
-  addEnumSymbols(e, o, u);
+  addEnumSymbols(e, s, u);
   if (t) {
     for (const e of Reflect.ownKeys(t)) {
       t[e] === $DELETED ? u.delete(e) : u.add(e);
     }
   }
   for (let e = 0; e < r.length; e++) u.add(r[e]);
-  addEnumSymbols(n, s, u);
+  addEnumSymbols(n, o, u);
   return Array.from(u);
 }
 function wrapValue(e, t) {
@@ -2458,9 +2638,9 @@ function syncArrayNodeMembership(e, t) {
 }
 function applyArrayItem(e, t, n, i, r) {
   if (isWrappable(e) && isWrappable(t)) {
-    const o = wrap(t, n);
-    i && setSignal(i, o);
-    applyState(e, o, r);
+    const s = wrap(t, n);
+    i && setSignal(i, s);
+    applyState(e, s, r);
   } else i && setSignal(i, wrapValue(e, n));
 }
 function applyState(e, t, n) {
@@ -2480,45 +2660,45 @@ function applyStateFast(e, t, n) {
   (t[STORE_LOOKUP] || storeLookup).set(e, t[$PROXY]);
   t[STORE_VALUE] = e;
   if (Array.isArray(i)) {
-    let o = false;
-    const s = i.length;
-    if (e.length && s && isWrappable(e[0]) && n(e[0]) != null) {
-      let u, c, l, a, f, E, d, S;
-      for (l = 0, a = Math.min(s, e.length); l < a && keyedMatch((E = i[l]), e[l], n); l++) {
-        isWrappable(E) && isWrappable(e[l]) && applyState(e[l], wrap(E, t), n);
+    let s = false;
+    const o = i.length;
+    if (e.length && o && isWrappable(e[0]) && n(e[0]) != null) {
+      let u, c, a, l, f, E, d, S;
+      for (a = 0, l = Math.min(o, e.length); a < l && keyedMatch((E = i[a]), e[a], n); a++) {
+        isWrappable(E) && isWrappable(e[a]) && applyState(e[a], wrap(E, t), n);
       }
       const T = new Array(e.length),
         _ = new Map();
       for (
-        a = s - 1, f = e.length - 1;
-        a >= l && f >= l && keyedMatch((E = i[a]), e[f], n);
-        a--, f--
+        l = o - 1, f = e.length - 1;
+        l >= a && f >= a && keyedMatch((E = i[l]), e[f], n);
+        l--, f--
       ) {
         T[f] = E;
       }
-      if (l > f || l > a) {
-        for (c = l; c <= f; c++) {
-          o = true;
+      if (a > f || a > l) {
+        for (c = a; c <= f; c++) {
+          s = true;
           r?.[c] && setSignal(r[c], wrapValue(e[c], t));
         }
         for (; c < e.length; c++) {
-          o = true;
+          s = true;
           applyArrayItem(e[c], T[c], t, r?.[c], n);
         }
         syncArrayNodeMembership(t, e);
-        (o || s !== e.length) && notifySelf(t);
-        s !== e.length && r?.length && setSignal(r.length, e.length);
+        (s || o !== e.length) && notifySelf(t);
+        o !== e.length && r?.length && setSignal(r.length, e.length);
         return;
       }
       d = new Array(f + 1);
-      for (c = f; c >= l; c--) {
+      for (c = f; c >= a; c--) {
         E = e[c];
         S = itemKey(E, n);
         u = _.get(S);
         d[c] = u === undefined ? -1 : u;
         _.set(S, c);
       }
-      for (u = l; u <= a; u++) {
+      for (u = a; u <= l; u++) {
         E = i[u];
         S = itemKey(E, n);
         c = _.get(S);
@@ -2528,155 +2708,155 @@ function applyStateFast(e, t, n) {
           _.set(S, c);
         }
       }
-      for (c = l; c < e.length; c++) {
+      for (c = a; c < e.length; c++) {
         if (c in T) {
           applyArrayItem(e[c], T[c], t, r?.[c], n);
         } else r?.[c] && setSignal(r[c], wrapValue(e[c], t));
       }
-      if (l < e.length) o = true;
+      if (a < e.length) s = true;
     } else if (e.length) {
-      for (let s = 0, u = e.length; s < u; s++) {
-        const u = i[s];
-        if (isWrappable(u) && isWrappable(e[s])) applyState(e[s], wrap(u, t), n);
+      for (let o = 0, u = e.length; o < u; o++) {
+        const u = i[o];
+        if (isWrappable(u) && isWrappable(e[o])) applyState(e[o], wrap(u, t), n);
         else {
-          if (u !== e[s]) o = true;
-          r?.[s] && setSignal(r[s], wrapValue(e[s], t));
+          if (u !== e[o]) s = true;
+          r?.[o] && setSignal(r[o], wrapValue(e[o], t));
         }
       }
     }
     syncArrayNodeMembership(t, e);
-    if (s !== e.length) {
-      o = true;
+    if (o !== e.length) {
+      s = true;
       r?.length && setSignal(r.length, e.length);
     }
-    o && notifySelf(t);
+    s && notifySelf(t);
     return;
   }
-  let o = t[STORE_NODE];
-  if (o) {
-    const r = o[$TRACK];
-    const s = r ? getAllKeys(i, undefined, e) : nodeKeys(o);
-    for (let u = 0, c = s.length; u < c; u++) {
-      const c = s[u];
-      const l = o[c];
-      const a = unwrap(i[c]);
+  let s = t[STORE_NODE];
+  if (s) {
+    const r = s[$TRACK];
+    const o = r ? getAllKeys(i, undefined, e) : nodeKeys(s);
+    for (let u = 0, c = o.length; u < c; u++) {
+      const c = o[u];
+      const a = s[c];
+      const l = unwrap(i[c]);
       let f = unwrap(e[c]);
-      if (a === f) continue;
+      if (l === f) continue;
       if (
-        !a ||
-        !isWrappable(a) ||
+        !l ||
+        !isWrappable(l) ||
         !isWrappable(f) ||
-        Array.isArray(a) !== Array.isArray(f) ||
-        (n(a) != null && n(a) !== n(f))
+        Array.isArray(l) !== Array.isArray(f) ||
+        (n(l) != null && n(l) !== n(f))
       ) {
         r && setSignal(r, void 0);
-        l && setSignal(l, isWrappable(f) ? wrap(f, t) : f);
-      } else applyState(f, wrap(a, t), n);
+        a && setSignal(a, isWrappable(f) ? wrap(f, t) : f);
+      } else applyState(f, wrap(l, t), n);
     }
   }
-  if ((o = t[STORE_HAS])) {
-    const t = nodeKeys(o);
+  if ((s = t[STORE_HAS])) {
+    const t = nodeKeys(s);
     for (let n = 0, i = t.length; n < i; n++) {
       const i = t[n];
-      setSignal(o[i], i in e);
+      setSignal(s[i], i in e);
     }
   }
 }
 function applyStateSlow(e, t, n) {
   const i = t[STORE_VALUE];
   const r = t[STORE_OVERRIDE];
-  const o = t[STORE_OPTIMISTIC_OVERRIDE];
-  let s = t[STORE_NODE];
+  const s = t[STORE_OPTIMISTIC_OVERRIDE];
+  let o = t[STORE_NODE];
   (t[STORE_LOOKUP] || storeLookup).set(e, t[$PROXY]);
   t[STORE_VALUE] = e;
   t[STORE_OVERRIDE] = undefined;
   if (Array.isArray(i)) {
     let u = false;
-    const c = getOverrideValue(i, r, "length", o);
+    const c = getOverrideValue(i, r, "length", s);
     if (e.length && c && isWrappable(e[0]) && n(e[0]) != null) {
-      let l, a, f, E, d, S, T, _;
+      let a, l, f, E, d, S, T, _;
       for (
         f = 0, E = Math.min(c, e.length);
-        f < E && keyedMatch((S = getOverrideValue(i, r, f, o)), e[f], n);
+        f < E && keyedMatch((S = getOverrideValue(i, r, f, s)), e[f], n);
         f++
       ) {
         isWrappable(S) && isWrappable(e[f]) && applyState(e[f], wrap(S, t), n);
       }
-      const O = new Array(e.length),
-        p = new Map();
+      const p = new Array(e.length),
+        O = new Map();
       for (
         E = c - 1, d = e.length - 1;
-        E >= f && d >= f && keyedMatch((S = getOverrideValue(i, r, E, o)), e[d], n);
+        E >= f && d >= f && keyedMatch((S = getOverrideValue(i, r, E, s)), e[d], n);
         E--, d--
       ) {
-        O[d] = S;
+        p[d] = S;
       }
       if (f > d || f > E) {
-        for (a = f; a <= d; a++) {
+        for (l = f; l <= d; l++) {
           u = true;
-          s?.[a] && setSignal(s[a], wrapValue(e[a], t));
+          o?.[l] && setSignal(o[l], wrapValue(e[l], t));
         }
-        for (; a < e.length; a++) {
+        for (; l < e.length; l++) {
           u = true;
-          applyArrayItem(e[a], O[a], t, s?.[a], n);
+          applyArrayItem(e[l], p[l], t, o?.[l], n);
         }
         const i = e.length;
         syncArrayNodeMembership(t, e);
         (u || c !== i) && notifySelf(t);
-        c !== i && s?.length && setSignal(s.length, i);
+        c !== i && o?.length && setSignal(o.length, i);
         return;
       }
       T = new Array(d + 1);
-      for (a = d; a >= f; a--) {
-        S = e[a];
+      for (l = d; l >= f; l--) {
+        S = e[l];
         _ = itemKey(S, n);
-        l = p.get(_);
-        T[a] = l === undefined ? -1 : l;
-        p.set(_, a);
+        a = O.get(_);
+        T[l] = a === undefined ? -1 : a;
+        O.set(_, l);
       }
-      for (l = f; l <= E; l++) {
-        S = getOverrideValue(i, r, l, o);
+      for (a = f; a <= E; a++) {
+        S = getOverrideValue(i, r, a, s);
         _ = itemKey(S, n);
-        a = p.get(_);
-        if (a !== undefined && a !== -1) {
-          O[a] = S;
-          a = T[a];
-          p.set(_, a);
+        l = O.get(_);
+        if (l !== undefined && l !== -1) {
+          p[l] = S;
+          l = T[l];
+          O.set(_, l);
         }
       }
-      for (a = f; a < e.length; a++) {
-        if (a in O) {
-          applyArrayItem(e[a], O[a], t, s?.[a], n);
-        } else s?.[a] && setSignal(s[a], wrapValue(e[a], t));
+      for (l = f; l < e.length; l++) {
+        if (l in p) {
+          applyArrayItem(e[l], p[l], t, o?.[l], n);
+        } else o?.[l] && setSignal(o[l], wrapValue(e[l], t));
       }
       if (f < e.length) u = true;
     } else if (e.length) {
-      for (let c = 0, l = e.length; c < l; c++) {
-        const l = getOverrideValue(i, r, c, o);
-        if (isWrappable(l) && isWrappable(e[c])) applyState(e[c], wrap(l, t), n);
+      for (let c = 0, a = e.length; c < a; c++) {
+        const a = getOverrideValue(i, r, c, s);
+        if (isWrappable(a) && isWrappable(e[c])) applyState(e[c], wrap(a, t), n);
         else {
-          if (l !== e[c]) u = true;
-          s?.[c] && setSignal(s[c], wrapValue(e[c], t));
+          if (a !== e[c]) u = true;
+          o?.[c] && setSignal(o[c], wrapValue(e[c], t));
         }
       }
     }
-    const l = e.length;
+    const a = e.length;
     syncArrayNodeMembership(t, e);
-    if (c !== l) {
+    if (c !== a) {
       u = true;
-      s?.length && setSignal(s.length, l);
+      o?.length && setSignal(o.length, a);
     }
     u && notifySelf(t);
     return;
   }
-  if (s) {
-    const u = s[$TRACK];
-    const c = u ? getAllKeys(i, r, e) : nodeKeys(s);
-    for (let l = 0, a = c.length; l < a; l++) {
-      const a = c[l];
-      const f = s[a];
-      const E = unwrap(getOverrideValue(i, r, a, o));
-      let d = unwrap(e[a]);
+  if (o) {
+    const u = o[$TRACK];
+    const c = u ? getAllKeys(i, r, e) : nodeKeys(o);
+    for (let a = 0, l = c.length; a < l; a++) {
+      const l = c[a];
+      const f = o[l];
+      const E = unwrap(getOverrideValue(i, r, l, s));
+      let d = unwrap(e[l]);
       if (E === d) continue;
       if (
         !E ||
@@ -2690,11 +2870,11 @@ function applyStateSlow(e, t, n) {
       } else applyState(d, wrap(E, t), n);
     }
   }
-  if ((s = t[STORE_HAS])) {
-    const t = nodeKeys(s);
+  if ((o = t[STORE_HAS])) {
+    const t = nodeKeys(o);
     for (let n = 0, i = t.length; n < i; n++) {
       const i = t[n];
-      setSignal(s[i], i in e);
+      setSignal(o[i], i in e);
     }
   }
 }
@@ -2728,36 +2908,36 @@ function createProjectionInternal(e, t, n) {
     r.set(e, t);
     return t;
   };
-  const o = wrapProjection(t);
+  const s = wrapProjection(t);
   i = computed(() => {
     if (!i) i = getOwner();
-    runProjectionComputed(o, e, n?.key || "id");
+    runProjectionComputed(s, e, n?.key || "id");
   }, undefined);
-  i.le &= ~CONFIG_AUTO_DISPOSE;
-  return { store: o, node: i };
+  i.Se &= ~CONFIG_AUTO_DISPOSE;
+  return { store: s, node: i };
 }
 function createProjection(e, t, n) {
   return createProjectionInternal(e, t, n).store;
 }
 function runProjectionComputed(e, t, n, i, r) {
-  const o = getOwner();
-  let s = false;
+  const s = getOwner();
+  let o = false;
   let u;
   const c = new Proxy(
     e,
-    createWriteTraps(() => !s || o.be === u, r)
+    createWriteTraps(() => !o || s.ke === u, r)
   );
   storeSetter(c, r => {
     u = t(r);
-    s = true;
+    o = true;
     const commit = t => {
       if (t === r || t === undefined) return;
       const write = () => storeSetter(e, reconcile(t, n));
       i ? i(write) : write();
     };
-    commit(handleAsync(o, u, commit));
+    commit(handleAsync(s, u, commit));
   });
-  return o;
+  return s;
 }
 function createWriteTraps(e, t) {
   const n = {
@@ -2818,7 +2998,8 @@ function createWriteTraps(e, t) {
 const $TRACK = Symbol(0),
   $TARGET = Symbol(0),
   $PROXY = Symbol(0),
-  $DELETED = Symbol(0);
+  $DELETED = Symbol(0),
+  $AFFECTS = Symbol(0);
 const STORE_VALUE = "v",
   STORE_OVERRIDE = "o",
   STORE_OPTIMISTIC_OVERRIDE = "x",
@@ -2828,8 +3009,7 @@ const STORE_VALUE = "v",
   STORE_WRAP = "w",
   STORE_LOOKUP = "l",
   STORE_FIREWALL = "f",
-  STORE_OPTIMISTIC = "p",
-  STORE_MASKED = "m";
+  STORE_OPTIMISTIC = "p";
 const STORE_SELF_PENDING = Symbol(0);
 function createStoreProxy(e, t = storeTraps, n) {
   let i;
@@ -2873,17 +3053,17 @@ function unwrapStoreValue(e, t, n) {
   if (!r) return i[STORE_VALUE];
   if (!t) t = new Map();
   if (t.has(e)) return t.get(e);
-  const o = i[STORE_VALUE];
-  const s = Array.isArray(o);
-  const u = s ? [] : Object.create(Object.getPrototypeOf(o));
+  const s = i[STORE_VALUE];
+  const o = Array.isArray(s);
+  const u = o ? [] : Object.create(Object.getPrototypeOf(s));
   t.set(e, u);
   n = i[STORE_LOOKUP] ?? storeLookup;
-  for (const e of getKeys(o, r)) {
-    if (s && e === "length") continue;
-    const i = e in r ? r[e] : o[e];
+  for (const e of getKeys(s, r)) {
+    if (o && e === "length") continue;
+    const i = e in r ? r[e] : s[e];
     if (i !== $DELETED) u[e] = unwrapStoreValue(i, t, n);
   }
-  if (s) u.length = r.length ?? o.length;
+  if (o) u.length = r.length ?? s.length;
   return u;
 }
 function isPrototypePollutionKey$1(e) {
@@ -2900,7 +3080,7 @@ function getOverlayLayer(e, t) {
   return undefined;
 }
 function visibleNodeValue(e) {
-  return e.O !== undefined && e.O !== NOT_PENDING ? e.O : e.D !== NOT_PENDING ? e.D : e.Z;
+  return e.p !== undefined && e.p !== NOT_PENDING ? e.p : e.m !== NOT_PENDING ? e.m : e.B;
 }
 function hasOwnStoreProperty(e, t) {
   const n = getOverlayLayer(e, t);
@@ -2921,52 +3101,146 @@ function getNodes(e, t) {
   if (!n) e[t] = n = Object.create(null);
   return n;
 }
-function getNode(e, t, n, i, r = isEqual, o, s) {
-  if (e[t]) return e[t];
-  const u = signal(
-    n,
+function getNode(e, t, n, i, r = isEqual, s) {
+  if (t[n]) return t[n];
+  const o = signal(
+    i,
     {
       equals: r,
       unobserved() {
-        if (e[t] === u) {
-          delete e[t];
-          if (typeof t === "symbol" && t !== $TRACK && symbolKeyedRecords.has(e)) {
-            const t = Object.getOwnPropertySymbols(e);
+        if (t[n] === o) {
+          delete t[n];
+          if (
+            typeof n === "symbol" &&
+            n !== $TRACK &&
+            n !== $AFFECTS &&
+            symbolKeyedRecords.has(t)
+          ) {
+            const e = Object.getOwnPropertySymbols(t);
             let n = false;
-            for (let e = 0, i = t.length; e < i; e++) {
-              if (t[e] !== $TRACK) {
+            for (let t = 0, i = e.length; t < i; t++) {
+              if (e[t] !== $TRACK && e[t] !== $AFFECTS) {
                 n = true;
                 break;
               }
             }
-            if (!n) symbolKeyedRecords.delete(e);
+            if (!n) symbolKeyedRecords.delete(t);
           }
         }
       }
     },
-    i
+    e[STORE_FIREWALL]
   );
-  if (o) {
-    u.O = NOT_PENDING;
+  if (e[STORE_OPTIMISTIC]) {
+    o.p = NOT_PENDING;
+  }
+  if (s && n in s) {
+    const e = s[n];
+    o.pe = e === undefined ? NO_SNAPSHOT : e;
+    snapshotSources?.add(o);
+  }
+  if (typeof n === "symbol" && n !== $TRACK && n !== $AFFECTS) symbolKeyedRecords.add(t);
+  if (n !== $AFFECTS && affectsScopes.size) inheritAffectsMarks(o, e[STORE_VALUE]);
+  return (t[n] = o);
+}
+function inheritAffectsMarks(e, t) {
+  for (const [n, i] of affectsScopes) {
+    if (n.L && i.scope.has(t)) {
+      markAffects(e);
+      i.inherited.push(e);
+    }
+  }
+}
+const affectsScopes = new Map();
+function walkAffectsScope(e, t, n, i, r) {
+  if (!isWrappable(e)) return;
+  const s = e[$TARGET] || (i ?? storeLookup).get(e)?.[$TARGET];
+  const o = s ? s[STORE_VALUE] : e;
+  if (r.has(o)) return;
+  r.add(o);
+  t.scope.add(o);
+  let u;
+  if (s) {
+    collectRecordNodes(s[STORE_NODE], n);
+    collectRecordNodes(s[STORE_HAS], n);
+    u = mergedOverlay(s);
+    i = s[STORE_LOOKUP] ?? i;
   }
-  if (s && t in s) {
-    const e = s[t];
-    u.Ee = e === undefined ? NO_SNAPSHOT : e;
-    snapshotSources?.add(u);
+  if (Array.isArray(o)) {
+    const e = u?.length ?? o.length;
+    for (let s = 0; s < e; s++) {
+      const e = u && s in u ? u[s] : o[s];
+      if (e !== $DELETED) walkAffectsScope(e, t, n, i, r);
+    }
+  } else {
+    const e = getKeys(o, u);
+    for (let s = 0, c = e.length; s < c; s++) {
+      const c = getPropertyDescriptor(o, u, e[s]);
+      if (!c || c.get) continue;
+      walkAffectsScope(c.value, t, n, i, r);
+    }
+  }
+}
+function collectRecordNodes(e, t) {
+  if (!e) return;
+  for (const n of Object.keys(e)) t.push(e[n]);
+  const n = Object.getOwnPropertySymbols(e);
+  for (let i = 0, r = n.length; i < r; i++) {
+    if (n[i] !== $AFFECTS) t.push(e[n[i]]);
+  }
+}
+function witnessAffectsMark(e) {
+  const t = e[STORE_NODE]?.[$AFFECTS];
+  if (t?.L) witnessAffects(t);
+  if (affectsScopes.size) {
+    const n = e[STORE_VALUE];
+    for (const [e, i] of affectsScopes) {
+      if (e !== t && e.L && i.scope.has(n)) witnessAffects(e);
+    }
   }
-  if (typeof t === "symbol" && t !== $TRACK) symbolKeyedRecords.add(e);
-  return (e[t] = u);
+}
+function getStoreAffectsNodes(e, t) {
+  const n = getNodes(e, STORE_NODE);
+  if (t === undefined) {
+    const t = getNode(e, n, $AFFECTS, undefined, false);
+    GlobalQueue.ae ||= e => {
+      const t = affectsScopes.get(e);
+      if (!t) return;
+      affectsScopes.delete(e);
+      for (let e = 0; e < t.inherited.length; e++) releaseAffectsMark(t.inherited[e]);
+    };
+    let i = affectsScopes.get(t);
+    if (!i) affectsScopes.set(t, (i = { scope: new Set(), inherited: [] }));
+    const r = [t];
+    walkAffectsScope(e[$PROXY], i, r, e[STORE_LOOKUP], new Set());
+    return r;
+  }
+  if (n[t]) return [n[t]];
+  const i = getOverlayLayer(e, t);
+  const r = i ? i[t] : e[STORE_VALUE][t];
+  const s = r === $DELETED ? undefined : r;
+  return [upsertStoreNode(e, n, t, s, e[STORE_SNAPSHOT_PROPS])];
 }
 function trackSelf(e, t = $TRACK) {
-  getObserver() &&
-    read(
-      getNode(getNodes(e, STORE_NODE), t, undefined, e[STORE_FIREWALL], false, e[STORE_OPTIMISTIC])
-    );
+  if (!getObserver()) return;
+  read(getNode(e, getNodes(e, STORE_NODE), t, undefined, false));
+  if (
+    t === $TRACK &&
+    !e[STORE_OVERRIDE] &&
+    !e[STORE_OPTIMISTIC_OVERRIDE] &&
+    e[STORE_VALUE][$TARGET]
+  )
+    e[STORE_VALUE][$TRACK];
 }
 function notifySelf(e) {
   const t = e[STORE_NODE]?.[$TRACK];
   t && setSignal(t, e[STORE_OPTIMISTIC] && !projectionWriteActive ? STORE_SELF_PENDING : undefined);
 }
+function mergedOverlay(e) {
+  const t = e[STORE_OVERRIDE];
+  const n = e[STORE_OPTIMISTIC_OVERRIDE];
+  return t && n ? { ...t, ...n } : (n ?? t);
+}
 function getKeys(e, t, n = true) {
   const i = e[$TARGET]
     ? untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)))
@@ -2975,8 +3249,8 @@ function getKeys(e, t, n = true) {
       : Reflect.ownKeys(e);
   if (!t) return i;
   const r = new Set(i);
-  const o = Reflect.ownKeys(t);
-  for (const e of o) {
+  const s = Reflect.ownKeys(t);
+  for (const e of s) {
     if (t[e] !== $DELETED) r.add(e);
     else r.delete(e);
   }
@@ -2995,17 +3269,6 @@ function getPropertyDescriptor(e, t, n) {
   }
   return Reflect.getOwnPropertyDescriptor(e, n);
 }
-function maskStoreTarget(e, t) {
-  const n = e[STORE_FIREWALL];
-  if (!n) return;
-  if (!!e[STORE_MASKED] === t) return;
-  e[STORE_MASKED] = t;
-  const i = (n.qe = (n.qe || 0) + (t ? 1 : -1));
-  if ((t && i === 1) || (!t && i === 0)) {
-    updatePendingSignal(n);
-    updateChildCompanions(n);
-  }
-}
 function prepareStoreWrite(e, t, n) {
   if (e[STORE_OPTIMISTIC]) {
     const t = e[STORE_FIREWALL];
@@ -3018,7 +3281,7 @@ function prepareStoreWrite(e, t, n) {
   if (
     snapshotCaptureActive &&
     typeof n !== "symbol" &&
-    !((e[STORE_FIREWALL]?.Y ?? 0) & STATUS_PENDING)
+    !((e[STORE_FIREWALL]?.q ?? 0) & STATUS_PENDING)
   ) {
     if (!e[STORE_SNAPSHOT_PROPS]) {
       e[STORE_SNAPSHOT_PROPS] = Object.create(null);
@@ -3028,51 +3291,50 @@ function prepareStoreWrite(e, t, n) {
       e[STORE_SNAPSHOT_PROPS][n] = r;
     }
   }
-  const o = e[STORE_OPTIMISTIC] && !projectionWriteActive;
-  const s = o ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
-  return { base: r, overrideKey: s, state: i };
+  const s = e[STORE_OPTIMISTIC] && !projectionWriteActive;
+  const o = s ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
+  return { base: r, overrideKey: o, state: i };
 }
 function armOptimisticStoreWrite(e, t) {
   if (e[STORE_OPTIMISTIC] && !projectionWriteActive) {
     trackOptimisticStore(t);
-    maskStoreTarget(e, true);
   }
 }
 function upsertStoreNode(e, t, n, i, r) {
   if (t[n]) return t[n];
-  const o = isWrappable(i) ? wrap(i, e) : i;
-  const s = getNode(t, n, o, e[STORE_FIREWALL], isEqual, e[STORE_OPTIMISTIC], r);
-  registerTransientStoreNode(s);
-  return s;
+  const s = isWrappable(i) ? wrap(i, e) : i;
+  const o = getNode(e, t, n, s, isEqual, r);
+  registerTransientStoreNode(o);
+  return o;
 }
-function notifyStoreProperty(e, t, n, i, r, o) {
-  const s = projectionWriteActive || e[STORE_OPTIMISTIC];
+function notifyStoreProperty(e, t, n, i, r, s) {
+  const o = projectionWriteActive || e[STORE_OPTIMISTIC];
   const u = n !== "delete";
   const c = e[STORE_HAS]?.[t];
   if (c) {
     setSignal(c, u);
-  } else if (!s && n !== "invalidate" && o !== u) {
-    const n = upsertStoreNode(e, getNodes(e, STORE_HAS), t, o);
+  } else if (!o && n !== "invalidate" && s !== u) {
+    const n = upsertStoreNode(e, getNodes(e, STORE_HAS), t, s);
     setSignal(n, u);
   }
-  const l = getNodes(e, STORE_NODE);
+  const a = getNodes(e, STORE_NODE);
   if (n === "set") {
-    if (l[t]) {
-      setSignal(l[t], () => (isWrappable(i) ? wrap(i, e) : i));
-    } else if (!s) {
-      const n = upsertStoreNode(e, l, t, r, e[STORE_SNAPSHOT_PROPS]);
+    if (a[t]) {
+      setSignal(a[t], () => (isWrappable(i) ? wrap(i, e) : i));
+    } else if (!o) {
+      const n = upsertStoreNode(e, a, t, r, e[STORE_SNAPSHOT_PROPS]);
       setSignal(n, () => (isWrappable(i) ? wrap(i, e) : i));
     }
   } else if (n === "invalidate") {
-    if (l[t]) {
-      setSignal(l[t], {});
-      delete l[t];
+    if (a[t]) {
+      setSignal(a[t], {});
+      delete a[t];
     }
   } else {
-    if (l[t]) {
-      setSignal(l[t], undefined);
-    } else if (!s) {
-      const n = upsertStoreNode(e, l, t, r, e[STORE_SNAPSHOT_PROPS]);
+    if (a[t]) {
+      setSignal(a[t], undefined);
+    } else if (!o) {
+      const n = upsertStoreNode(e, a, t, r, e[STORE_SNAPSHOT_PROPS]);
       setSignal(n, undefined);
     }
   }
@@ -3084,73 +3346,66 @@ const storeTraps = {
     if (t === $TARGET) return e;
     if (t === $PROXY) return n;
     if (t === $REFRESH) return e[STORE_FIREWALL];
+    if (pendingCheckActive) witnessAffectsMark(e);
     if (t === $TRACK) {
       trackSelf(e);
       return n;
     }
     const i = getObserver() === e[STORE_FIREWALL];
     const r = getNodes(e, STORE_NODE);
-    const o = i ? undefined : r[t];
-    const s = e[STORE_VALUE];
+    const s = i ? undefined : r[t];
+    const o = e[STORE_VALUE];
     if (
-      !o &&
+      !s &&
       !e[STORE_OVERRIDE] &&
       !e[STORE_OPTIMISTIC_OVERRIDE] &&
       !e[STORE_CUSTOM_PROTO] &&
       !e[STORE_OPTIMISTIC] &&
       !e[STORE_SNAPSHOT_PROPS] &&
-      !s[$TARGET] &&
-      !(t in s) &&
+      !o[$TARGET] &&
+      !(t in o) &&
       getObserver() &&
       !i &&
       !writeOnly(n)
     ) {
-      return read(getNode(r, t, undefined, e[STORE_FIREWALL]));
+      return read(getNode(e, r, t, undefined));
     }
     const u = getOverlayLayer(e, t);
     const c = !!u;
-    const l = !!e[STORE_VALUE][$TARGET];
-    const a = u ?? e[STORE_VALUE];
-    if (!o) {
-      const i = Object.getOwnPropertyDescriptor(a, t);
+    const a = !!e[STORE_VALUE][$TARGET];
+    const l = u ?? e[STORE_VALUE];
+    if (!s) {
+      const i = Object.getOwnPropertyDescriptor(l, t);
       if (i && i.get) return i.get.call(n);
       if (!i && !c && e[STORE_CUSTOM_PROTO]) {
-        const e = unwrapStoreValue(a);
+        const e = unwrapStoreValue(l);
         if (hasInheritedAccessor(e, t)) {
-          return Reflect.get(a, t, n);
+          return Reflect.get(l, t, n);
         }
       }
     }
     if (writeOnly(n)) {
       if (isPrototypePollutionKey$1(t) && !hasOwnStoreProperty(e, t)) return undefined;
-      let n = o && (c || !l) ? visibleNodeValue(o) : a[t];
+      let n = s && (c || !a) ? visibleNodeValue(s) : l[t];
       n === $DELETED && (n = undefined);
       if (!isWrappable(n)) return n;
       const i = wrap(n, e);
       Writing?.add(i);
       return i;
     }
-    let f = o ? (c || !l ? read(r[t]) : (read(r[t]), a[t])) : a[t];
+    let f = s ? (c || !a ? read(r[t]) : (read(r[t]), l[t])) : l[t];
     f === $DELETED && (f = undefined);
-    if (!o) {
-      if (!c && typeof f === "function" && !Object.prototype.hasOwnProperty.call(a, t)) {
+    if (!s) {
+      if (!c && typeof f === "function" && !Object.prototype.hasOwnProperty.call(l, t)) {
         let t;
         return !Array.isArray(e[STORE_VALUE]) &&
           (t = Object.getPrototypeOf(e[STORE_VALUE])) &&
           t !== Object.prototype
-          ? f.bind(a)
+          ? f.bind(l)
           : f;
       } else if (getObserver() && !i) {
         return read(
-          getNode(
-            r,
-            t,
-            isWrappable(f) ? wrap(f, e) : f,
-            e[STORE_FIREWALL],
-            isEqual,
-            e[STORE_OPTIMISTIC],
-            e[STORE_SNAPSHOT_PROPS]
-          )
+          getNode(e, r, t, isWrappable(f) ? wrap(f, e) : f, isEqual, e[STORE_SNAPSHOT_PROPS])
         );
       }
     }
@@ -3158,13 +3413,14 @@ const storeTraps = {
   },
   has(e, t) {
     if (t === $PROXY || t === $TRACK || t === "__proto__") return true;
+    if (pendingCheckActive) witnessAffectsMark(e);
     const n = getOverlayLayer(e, t);
     const i = n ? n[t] !== $DELETED : t in e[STORE_VALUE];
     if (writeOnly(e[$PROXY]) || getObserver() === e[STORE_FIREWALL]) return i;
     const r = getNodes(e, STORE_HAS);
     if (r[t]) return read(r[t]);
     if (getObserver()) {
-      return read(getNode(r, t, i, e[STORE_FIREWALL], isEqual, e[STORE_OPTIMISTIC]));
+      return read(getNode(e, r, t, i));
     }
     return i;
   },
@@ -3173,47 +3429,49 @@ const storeTraps = {
     const i = e[$PROXY];
     if (writeOnly(i)) {
       untrack(() => {
-        const { base: r, overrideKey: o, state: s } = prepareStoreWrite(e, i, t);
+        const { base: r, overrideKey: s, state: o } = prepareStoreWrite(e, i, t);
         const u = getOverlayLayer(e, t);
         const c = u ? u[t] : r;
-        const l = u ? u[t] !== $DELETED : t in e[STORE_VALUE];
-        const a = unwrapStoreValue(n);
-        const f = Array.isArray(s) && t !== "length" && typeof t !== "symbol";
-        const E = f ? parseInt(t) + 1 : 0;
-        const d = f && (getOverlayLayer(e, "length") ?? s).length;
-        const S = f && E > d ? E : undefined;
-        if (c === a && S === undefined) return true;
+        const a = u ? u[t] !== $DELETED : t in e[STORE_VALUE];
+        const l = unwrapStoreValue(n);
+        const f = typeof t === "string" ? Number(t) : -1;
+        const E =
+          Array.isArray(o) && Number.isInteger(f) && f >= 0 && f < 4294967295 && String(f) === t;
+        const d = E ? f + 1 : 0;
+        const S = E && (getOverlayLayer(e, "length") ?? o).length;
+        const T = E && d > S ? d : undefined;
+        if (c === l && T === undefined) return true;
         armOptimisticStoreWrite(e, i);
-        if (a !== undefined && a === r && S === undefined) delete e[o]?.[t];
+        if (l !== undefined && l === r && T === undefined) delete e[s]?.[t];
         else {
-          const n = e[o] || (e[o] = Object.create(null));
-          n[t] = a;
-          if (S !== undefined) n.length = S;
+          const n = e[s] || (e[s] = Object.create(null));
+          n[t] = l;
+          if (T !== undefined) n.length = T;
         }
-        notifyStoreProperty(e, t, "set", a, c, l);
+        notifyStoreProperty(e, t, "set", l, c, a);
         if (
-          Array.isArray(s) &&
+          Array.isArray(o) &&
           t === "length" &&
-          typeof a === "number" &&
+          typeof l === "number" &&
           typeof c === "number" &&
-          a < c
+          l < c
         ) {
-          const t = e[o] || (e[o] = Object.create(null));
-          for (let n = a; n < c; n++) {
+          const t = e[s] || (e[s] = Object.create(null));
+          for (let n = l; n < c; n++) {
             if (t[n] === $DELETED) continue;
-            const i = n in t ? t[n] : s[n];
-            if (!(n in t) && !(n in s)) continue;
+            const i = n in t ? t[n] : o[n];
+            if (!(n in t) && !(n in o)) continue;
             t[n] = $DELETED;
             notifyStoreProperty(e, n, "delete", undefined, i, true);
           }
         }
-        if (Array.isArray(s) && t !== "length" && S !== undefined) {
+        if (Array.isArray(o) && t !== "length" && T !== undefined) {
           const t = getNodes(e, STORE_NODE);
           if (t.length) {
-            setSignal(t.length, S);
+            setSignal(t.length, T);
           } else if (!projectionWriteActive && !e[STORE_OPTIMISTIC]) {
-            const n = upsertStoreNode(e, t, "length", d, e[STORE_SNAPSHOT_PROPS]);
-            setSignal(n, S);
+            const n = upsertStoreNode(e, t, "length", S, e[STORE_SNAPSHOT_PROPS]);
+            setSignal(n, T);
           }
         }
         if (false);
@@ -3226,10 +3484,10 @@ const storeTraps = {
     const i = e[$PROXY];
     if (writeOnly(i)) {
       untrack(() => {
-        const { base: r, overrideKey: o } = prepareStoreWrite(e, i, t);
+        const { base: r, overrideKey: s } = prepareStoreWrite(e, i, t);
         armOptimisticStoreWrite(e, i);
-        const s = "value" in n ? { ...n, value: unwrapStoreValue(n.value) } : n;
-        Object.defineProperty(e[o] || (e[o] = Object.create(null)), t, s);
+        const o = "value" in n ? { ...n, value: unwrapStoreValue(n.value) } : n;
+        Object.defineProperty(e[s] || (e[s] = Object.create(null)), t, o);
         notifyStoreProperty(e, t, "invalidate");
         if (false);
       });
@@ -3245,7 +3503,7 @@ const storeTraps = {
         const n = e[STORE_OPTIMISTIC] && !projectionWriteActive;
         const i = n ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
         const r = getOverlayLayer(e, t);
-        const o = r ? r[t] : e[STORE_VALUE][t];
+        const s = r ? r[t] : e[STORE_VALUE][t];
         if (t in e[STORE_VALUE] || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE])) {
           armOptimisticStoreWrite(e, e[$PROXY]);
           (e[i] || (e[i] = Object.create(null)))[t] = $DELETED;
@@ -3253,12 +3511,13 @@ const storeTraps = {
           armOptimisticStoreWrite(e, e[$PROXY]);
           delete e[i][t];
         } else return true;
-        notifyStoreProperty(e, t, "delete", undefined, o, true);
+        notifyStoreProperty(e, t, "delete", undefined, s, true);
       });
     }
     return true;
   },
   ownKeys(e) {
+    if (pendingCheckActive) witnessAffectsMark(e);
     if (getObserver() !== e[STORE_FIREWALL]) trackSelf(e);
     let t = getKeys(e[STORE_VALUE], e[STORE_OVERRIDE], false);
     if (e[STORE_OPTIMISTIC_OVERRIDE]) {
@@ -3337,25 +3596,35 @@ function createStore(e, t, n) {
       : e => storeSetter(r, e)
   ];
 }
+function affects(e, t) {
+  const n = e?.[$TARGET];
+  if (n) {
+    const e = getStoreAffectsNodes(n, t);
+    for (let t = 0; t < e.length; t++) registerAffectsMark(e[t]);
+    return;
+  }
+  const i = e?.[$REFRESH];
+  if (i) {
+    registerAffectsMark(i);
+    return;
+  }
+}
 function createOptimisticStore(e, t, n) {
-  GlobalQueue.se ||= clearOptimisticStore;
+  GlobalQueue.ce ||= clearOptimisticStore;
   const i = typeof e === "function";
   const r = i ? t : e;
-  const o = i ? e : undefined;
-  const { store: s } = createOptimisticProjectionInternal(o, r, n);
-  return [s, e => storeSetter(s, e)];
+  const s = i ? e : undefined;
+  const { store: o } = createOptimisticProjectionInternal(s, r, n);
+  return [o, e => storeSetter(o, e)];
 }
 function clearOptimisticStore(e) {
   const t = e[$TARGET];
-  if (!t) return;
-  maskStoreTarget(t, false);
-  if (!t[STORE_OPTIMISTIC_OVERRIDE]) return;
+  if (!t?.[STORE_OPTIMISTIC_OVERRIDE]) return;
   clearOptimisticOverride(t);
 }
 function clearOptimisticOverride(e) {
   const t = e[STORE_OPTIMISTIC_OVERRIDE];
   if (!t) return;
-  maskStoreTarget(e, false);
   const n = e[STORE_NODE];
   delete e[STORE_OPTIMISTIC_OVERRIDE];
   const i = projectionWriteActive;
@@ -3367,14 +3636,14 @@ function clearOptimisticOverride(e) {
           const t = n[i];
           t.i = undefined;
           const r = getOverlayLayer(e, i);
-          const o = r ? r[i] : e[STORE_VALUE][i];
-          const s = o === $DELETED ? undefined : o;
-          const u = isWrappable(s) ? wrap(s, e) : s;
+          const s = r ? r[i] : e[STORE_VALUE][i];
+          const o = s === $DELETED ? undefined : s;
+          const u = isWrappable(o) ? wrap(o, e) : o;
           const c = visibleNodeValue(t);
-          t.O = NOT_PENDING;
-          t.D = NOT_PENDING;
-          t.Z = u;
-          if (!t.xe || !t.xe(c, u)) {
+          t.p = NOT_PENDING;
+          t.m = NOT_PENDING;
+          t.B = u;
+          if (!t.Ze || !t.Ze(c, u)) {
             insertSubs(t, true);
             schedule();
           }
@@ -3410,10 +3679,10 @@ function createOptimisticProjectionInternal(e, t, n) {
     r.set(e, t);
     return t;
   };
-  const o = wrapProjection(t);
+  const s = wrapProjection(t);
   if (e) {
     const clearProjectionOverride = () => {
-      const e = o[$TARGET];
+      const e = s[$TARGET];
       if (e?.[STORE_OPTIMISTIC_OVERRIDE]) clearOptimisticOverride(e);
     };
     const wrapCommit = e => {
@@ -3429,14 +3698,14 @@ function createOptimisticProjectionInternal(e, t, n) {
     i = computed(() => {
       setProjectionWriteActive(true);
       try {
-        runProjectionComputed(o, e, n?.key || "id", wrapCommit, clearProjectionOverride);
+        runProjectionComputed(s, e, n?.key || "id", wrapCommit, clearProjectionOverride);
       } finally {
         setProjectionWriteActive(false);
       }
     }, undefined);
-    i.le &= ~CONFIG_AUTO_DISPOSE;
+    i.Se &= ~CONFIG_AUTO_DISPOSE;
   }
-  return { store: o, node: i };
+  return { store: s, node: i };
 }
 const DELETE = Symbol(0);
 function isPrototypePollutionKey(e) {
@@ -3447,9 +3716,9 @@ function updatePath(e, t, n = 0) {
     r = e;
   if (n < t.length - 1) {
     i = t[n];
-    const o = typeof i;
-    const s = Array.isArray(e);
-    if (o === "string" && isPrototypePollutionKey(i)) return;
+    const s = typeof i;
+    const o = Array.isArray(e);
+    if (s === "string" && isPrototypePollutionKey(i)) return;
     if (Array.isArray(i)) {
       for (let r = 0; r < i.length; r++) {
         t[n] = i[r];
@@ -3457,7 +3726,7 @@ function updatePath(e, t, n = 0) {
       }
       t[n] = i;
       return;
-    } else if (s && o === "function") {
+    } else if (o && s === "function") {
       for (let r = 0; r < e.length; r++) {
         if (i(e[r], r)) {
           t[n] = r;
@@ -3466,9 +3735,9 @@ function updatePath(e, t, n = 0) {
       }
       t[n] = i;
       return;
-    } else if (s && o === "object") {
-      const { from: r = 0, to: o = e.length - 1, by: s = 1 } = i;
-      for (let i = r; i <= o; i += s) {
+    } else if (o && s === "object") {
+      const { from: r = 0, to: s = e.length - 1, by: o = 1 } = i;
+      for (let i = r; i <= s; i += o) {
         t[n] = i;
         updatePath(e, t, n);
       }
@@ -3480,26 +3749,26 @@ function updatePath(e, t, n = 0) {
     }
     r = e[i];
   }
-  let o = t[t.length - 1];
-  if (typeof o === "function") {
-    o = o(r);
-    if (o === r) return;
+  let s = t[t.length - 1];
+  if (typeof s === "function") {
+    s = s(r);
+    if (s === r) return;
   }
-  if (i === undefined && o == undefined) return;
-  if (o === DELETE) {
+  if (i === undefined && s == undefined) return;
+  if (s === DELETE) {
     delete e[i];
-  } else if (i === undefined || (isWrappable(r) && isWrappable(o) && !Array.isArray(o))) {
+  } else if (i === undefined || (isWrappable(r) && isWrappable(s) && !Array.isArray(s))) {
     const t = i !== undefined ? e[i] : e;
-    const n = ownEnumerableKeys(o);
+    const n = ownEnumerableKeys(s);
     for (let e = 0; e < n.length; e++) {
       const i = n[e];
       if (typeof i === "string" && isPrototypePollutionKey(i)) continue;
-      const r = Object.getOwnPropertyDescriptor(o, i);
+      const r = Object.getOwnPropertyDescriptor(s, i);
       if (r.get || r.set) Object.defineProperty(t, i, r);
       else t[i] = r.value;
     }
   } else {
-    e[i] = o;
+    e[i] = s;
   }
 }
 const storePath = Object.assign(
@@ -3510,67 +3779,65 @@ const storePath = Object.assign(
   },
   { DELETE: DELETE }
 );
-function mergedOverlay(e) {
-  const t = e[STORE_OVERRIDE];
-  const n = e[STORE_OPTIMISTIC_OVERRIDE];
-  return t && n ? { ...t, ...n } : (n ?? t);
-}
 function snapshotImpl(e, t, n, i) {
-  let r, o, s, u, c, l;
+  let r, s, o, u, c, a;
   if (!isWrappable(e)) return e;
   if (n && n.has(e)) return n.get(e);
   if (!n) n = new Map();
   if ((r = e[$TARGET] || i?.get(e)?.[$TARGET])) {
-    if (t) trackSelf(r, $TRACK);
-    s = mergedOverlay(r);
-    o = Array.isArray(r[STORE_VALUE]);
+    if (t) {
+      trackSelf(r, $TRACK);
+      if (pendingCheckActive) witnessAffectsMark(r);
+    }
+    o = mergedOverlay(r);
+    s = Array.isArray(r[STORE_VALUE]);
     n.set(
       e,
-      s ? (u = o ? [] : Object.create(Object.getPrototypeOf(r[STORE_VALUE]))) : r[STORE_VALUE]
+      o ? (u = s ? [] : Object.create(Object.getPrototypeOf(r[STORE_VALUE]))) : r[STORE_VALUE]
     );
     e = r[STORE_VALUE];
     i = r[STORE_LOOKUP] ?? storeLookup;
   } else {
-    o = Array.isArray(e);
+    s = Array.isArray(e);
     n.set(e, e);
   }
-  if (o) {
-    const o = s?.length ?? e.length;
-    for (let a = 0; a < o; a++) {
-      l = s && a in s ? s[a] : e[a];
-      if (l === $DELETED) continue;
-      if (t && isWrappable(l)) wrap(l, r);
-      if ((c = snapshotImpl(l, t, n, i)) !== l || u) {
+  if (s) {
+    const s = o?.length ?? e.length;
+    for (let l = 0; l < s; l++) {
+      a = o && l in o ? o[l] : e[l];
+      if (a === $DELETED) continue;
+      if (t && isWrappable(a)) wrap(a, r);
+      if ((c = snapshotImpl(a, t, n, i)) !== a || u) {
         if (!u) n.set(e, (u = [...e]));
-        u[a] = c;
+        u[l] = c;
       }
     }
-    if (u) u.length = o;
-  } else if (!s) {
-    const o = getKeys(e, undefined);
-    for (let s = 0, a = o.length; s < a; s++) {
-      const a = o[s];
-      const f = Object.getOwnPropertyDescriptor(e, a);
+    if (u) u.length = s;
+  } else if (!o) {
+    const s = getKeys(e, undefined);
+    for (let o = 0, l = s.length; o < l; o++) {
+      const l = s[o];
+      const f = Object.getOwnPropertyDescriptor(e, l);
       if (f.get) continue;
-      l = f.value;
-      if (t && isWrappable(l)) wrap(l, r);
-      if ((c = snapshotImpl(l, t, n, i)) !== l || u) {
+      a = f.value;
+      if (t && isWrappable(a)) wrap(a, r);
+      if ((c = snapshotImpl(a, t, n, i)) !== a || u) {
         if (!u) {
           u = Object.create(Object.getPrototypeOf(e));
           Object.assign(u, e);
         }
-        u[a] = c;
+        u[l] = c;
       }
     }
   } else {
-    const o = getKeys(e, s);
-    for (let a = 0, f = o.length; a < f; a++) {
-      let f = o[a];
-      const E = getPropertyDescriptor(e, s, f);
+    const s = getKeys(e, o);
+    for (let l = 0, f = s.length; l < f; l++) {
+      let f = s[l];
+      const E = getPropertyDescriptor(e, o, f);
       if (E.get) continue;
-      l = f in s ? s[f] : e[f];
-      if (t && isWrappable(l)) wrap(l, r);
-      if ((c = snapshotImpl(l, t, n, i)) !== e[f] || u) {
+      a = f in o ? o[f] : e[f];
+      if (t && isWrappable(a)) wrap(a, r);
+      if ((c = snapshotImpl(a, t, n, i)) !== e[f] || u) {
         if (!u) {
           u = Object.create(Object.getPrototypeOf(e));
           Object.assign(u, e);
@@ -3627,9 +3894,9 @@ function merge(...e) {
   for (let i = 0; i < e.length; i++) {
     const r = e[i];
     t = t || (!!r && $PROXY in r);
-    const o = !!r && r[$SOURCES];
-    if (o) {
-      for (let e = 0; e < o.length; e++) n.push(o[e]);
+    const s = !!r && r[$SOURCES];
+    if (s) {
+      for (let e = 0; e < s.length; e++) n.push(s[e]);
     } else n.push(typeof r === "function" ? ((t = true), createMemo(r)) : r);
   }
   if (SUPPORTS_PROXY && t) {
@@ -3662,35 +3929,35 @@ function merge(...e) {
   }
   const i = Object.create(null);
   let r = false;
-  let o = n.length - 1;
-  for (let e = o; e >= 0; e--) {
+  let s = n.length - 1;
+  for (let e = s; e >= 0; e--) {
     const t = n[e];
     if (!t) {
-      e === o && o--;
+      e === s && s--;
       continue;
     }
-    const s = Object.getOwnPropertyNames(t);
-    for (let n = s.length - 1; n >= 0; n--) {
-      const u = s[n];
+    const o = Object.getOwnPropertyNames(t);
+    for (let n = o.length - 1; n >= 0; n--) {
+      const u = o[n];
       if (u === "__proto__" || u === "constructor") continue;
       if (!i[u]) {
-        r = r || e !== o;
+        r = r || e !== s;
         const n = Object.getOwnPropertyDescriptor(t, u);
         i[u] = n.get ? { enumerable: true, configurable: true, get: n.get.bind(t) } : n;
       }
     }
   }
-  if (!r) return n[o];
-  const s = {};
+  if (!r) return n[s];
+  const o = {};
   const u = Object.keys(i);
   for (let e = u.length - 1; e >= 0; e--) {
     const t = u[e],
       n = i[t];
-    if (n.get) Object.defineProperty(s, t, n);
-    else s[t] = n.value;
+    if (n.get) Object.defineProperty(o, t, n);
+    else o[t] = n.value;
   }
-  s[$SOURCES] = n;
-  return s;
+  o[$SOURCES] = n;
+  return o;
 }
 function omit(e, ...t) {
   if (SUPPORTS_PROXY && $PROXY in e) {
@@ -3712,12 +3979,12 @@ function omit(e, ...t) {
   const n = {};
   const i = Object.getOwnPropertyNames(e);
   const r = t.length > 4 && i.length > t.length ? new Set(t) : undefined;
-  for (const o of i) {
-    if (r ? !r.has(o) : !t.includes(o)) {
-      const t = Object.getOwnPropertyDescriptor(e, o);
+  for (const s of i) {
+    if (r ? !r.has(s) : !t.includes(s)) {
+      const t = Object.getOwnPropertyDescriptor(e, s);
       !t.get && !t.set && t.enumerable && t.writable && t.configurable
-        ? (n[o] = t.value)
-        : Object.defineProperty(n, o, t);
+        ? (n[s] = t.value)
+        : Object.defineProperty(n, s, t);
     }
   }
   return n;
@@ -3725,252 +3992,252 @@ function omit(e, ...t) {
 function mapArray(e, t, n) {
   const i = typeof n?.keyed === "function" ? n.keyed : undefined;
   const r = t.length > 1;
-  const o = t;
-  const s = {
-    ze: createOwner(),
-    Xe: 0,
-    Je: e,
-    et: [],
-    tt: o,
-    nt: [],
-    it: [],
-    rt: i,
-    ot: i || n?.keyed === false ? [] : undefined,
-    st: r && n?.keyed !== false ? [] : undefined,
-    ut: n?.keyed === false,
-    ct: n?.fallback
+  const s = t;
+  const o = {
+    st: createOwner(),
+    ot: 0,
+    ut: e,
+    ct: [],
+    lt: s,
+    ft: [],
+    Et: [],
+    dt: i,
+    St: i || n?.keyed === false ? [] : undefined,
+    Tt: r && n?.keyed !== false ? [] : undefined,
+    _t: n?.keyed === false,
+    Ot: n?.fallback
   };
-  const u = computed(updateKeyedMap.bind(s));
-  s.ze.Ae = u;
-  u.le &= ~CONFIG_AUTO_DISPOSE;
+  const u = computed(updateKeyedMap.bind(o));
+  o.st.De = u;
+  u.Se &= ~CONFIG_AUTO_DISPOSE;
   return accessor(u);
 }
 const pureOptions = { ownedWrite: true };
 function updateKeyedMap() {
-  const e = this.Je() || [],
+  const e = this.ut() || [],
     t = e.length;
   e[$TRACK];
-  runWithOwner(this.ze, () => {
+  runWithOwner(this.st, () => {
     let n,
       i,
-      r = this.ot
-        ? this.ut
+      r = this.St
+        ? this._t
           ? () => {
-              this.ot[i] = signal(e[i], pureOptions);
-              return this.tt(accessor(this.ot[i]), i);
+              this.St[i] = signal(e[i], pureOptions);
+              return this.lt(accessor(this.St[i]), i);
             }
           : () => {
-              this.ot[i] = signal(e[i], pureOptions);
-              this.st && (this.st[i] = signal(i, pureOptions));
-              return this.tt(accessor(this.ot[i]), this.st ? accessor(this.st[i]) : undefined);
+              this.St[i] = signal(e[i], pureOptions);
+              this.Tt && (this.Tt[i] = signal(i, pureOptions));
+              return this.lt(accessor(this.St[i]), this.Tt ? accessor(this.Tt[i]) : undefined);
             }
-        : this.st
+        : this.Tt
           ? () => {
               const t = e[i];
-              this.st[i] = signal(i, pureOptions);
-              return this.tt(t, accessor(this.st[i]));
+              this.Tt[i] = signal(i, pureOptions);
+              return this.lt(t, accessor(this.Tt[i]));
             }
           : () => {
               const t = e[i];
-              return this.tt(t);
+              return this.lt(t);
             };
     if (t === 0) {
-      if (this.Xe !== 0) {
-        this.ze.dispose(false);
-        this.it = [];
-        this.et = [];
-        this.nt = [];
-        this.Xe = 0;
-        this.ot && (this.ot = []);
-        this.st && (this.st = []);
+      if (this.ot !== 0) {
+        this.st.dispose(false);
+        this.Et = [];
+        this.ct = [];
+        this.ft = [];
+        this.ot = 0;
+        this.St && (this.St = []);
+        this.Tt && (this.Tt = []);
       }
-      if (this.ct && !this.nt[0]) {
-        this.nt[0] = runWithOwner((this.it[0] = createOwner()), this.ct);
+      if (this.Ot && !this.ft[0]) {
+        this.ft[0] = runWithOwner((this.Et[0] = createOwner()), this.Ot);
       }
-    } else if (this.Xe === 0) {
-      if (this.it[0]) this.it[0].dispose();
-      this.nt = new Array(t);
+    } else if (this.ot === 0) {
+      if (this.Et[0]) this.Et[0].dispose();
+      this.ft = new Array(t);
       for (i = 0; i < t; i++) {
-        this.et[i] = e[i];
-        this.nt[i] = runWithOwner((this.it[i] = createOwner()), r);
+        this.ct[i] = e[i];
+        this.ft[i] = runWithOwner((this.Et[i] = createOwner()), r);
       }
-      this.Xe = t;
+      this.ot = t;
     } else {
-      let o,
-        s,
+      let s,
+        o,
         u,
         c,
-        l,
         a,
+        l,
         f,
         E = new Array(t),
         d = new Array(t),
-        S = this.ot ? new Array(t) : undefined,
-        T = this.st ? new Array(t) : undefined;
+        S = this.St ? new Array(t) : undefined,
+        T = this.Tt ? new Array(t) : undefined;
       for (
-        o = 0, s = Math.min(this.Xe, t);
-        o < s && (this.et[o] === e[o] || (this.ot && compare(this.rt, this.et[o], e[o])));
-        o++
+        s = 0, o = Math.min(this.ot, t);
+        s < o && (this.ct[s] === e[s] || (this.St && compare(this.dt, this.ct[s], e[s])));
+        s++
       ) {
-        if (this.ot) setSignal(this.ot[o], e[o]);
+        if (this.St) setSignal(this.St[s], e[s]);
       }
       for (
-        s = this.Xe - 1, u = t - 1;
-        s >= o &&
-        u >= o &&
-        (this.et[s] === e[u] || (this.ot && compare(this.rt, this.et[s], e[u])));
-        s--, u--
+        o = this.ot - 1, u = t - 1;
+        o >= s &&
+        u >= s &&
+        (this.ct[o] === e[u] || (this.St && compare(this.dt, this.ct[o], e[u])));
+        o--, u--
       ) {
-        E[u] = this.nt[s];
-        d[u] = this.it[s];
-        S && (S[u] = this.ot[s]);
-        T && (T[u] = this.st[s]);
+        E[u] = this.ft[o];
+        d[u] = this.Et[o];
+        S && (S[u] = this.St[o]);
+        T && (T[u] = this.Tt[o]);
       }
-      a = new Map();
+      l = new Map();
       f = new Array(u + 1);
-      for (i = u; i >= o; i--) {
+      for (i = u; i >= s; i--) {
         c = e[i];
-        l = this.rt ? this.rt(c) : c;
-        n = a.get(l);
+        a = this.dt ? this.dt(c) : c;
+        n = l.get(a);
         f[i] = n === undefined ? -1 : n;
-        a.set(l, i);
+        l.set(a, i);
       }
-      for (n = o; n <= s; n++) {
-        c = this.et[n];
-        l = this.rt ? this.rt(c) : c;
-        i = a.get(l);
+      for (n = s; n <= o; n++) {
+        c = this.ct[n];
+        a = this.dt ? this.dt(c) : c;
+        i = l.get(a);
         if (i !== undefined && i !== -1) {
-          E[i] = this.nt[n];
-          d[i] = this.it[n];
-          S && (S[i] = this.ot[n]);
-          T && (T[i] = this.st[n]);
+          E[i] = this.ft[n];
+          d[i] = this.Et[n];
+          S && (S[i] = this.St[n]);
+          T && (T[i] = this.Tt[n]);
           i = f[i];
-          a.set(l, i);
-        } else this.it[n].dispose();
+          l.set(a, i);
+        } else this.Et[n].dispose();
       }
-      for (i = o; i < t; i++) {
+      for (i = s; i < t; i++) {
         if (i in E) {
-          this.nt[i] = E[i];
-          this.it[i] = d[i];
+          this.ft[i] = E[i];
+          this.Et[i] = d[i];
           if (S) {
-            this.ot[i] = S[i];
-            setSignal(this.ot[i], e[i]);
+            this.St[i] = S[i];
+            setSignal(this.St[i], e[i]);
           }
           if (T) {
-            this.st[i] = T[i];
-            setSignal(this.st[i], i);
+            this.Tt[i] = T[i];
+            setSignal(this.Tt[i], i);
           }
         } else {
-          this.nt[i] = runWithOwner((this.it[i] = createOwner()), r);
+          this.ft[i] = runWithOwner((this.Et[i] = createOwner()), r);
         }
       }
-      this.nt = this.nt.slice(0, (this.Xe = t));
-      this.et = e.slice(0);
+      this.ft = this.ft.slice(0, (this.ot = t));
+      this.ct = e.slice(0);
     }
   });
-  return this.nt;
+  return this.ft;
 }
 function repeat(e, t, n) {
   const i = t;
   const r = computed(
     updateRepeat.bind({
-      ze: createOwner(),
-      Xe: 0,
-      lt: 0,
-      ft: e,
-      tt: i,
-      it: [],
-      nt: [],
-      Et: n?.from,
-      ct: n?.fallback
+      st: createOwner(),
+      ot: 0,
+      Rt: 0,
+      It: e,
+      lt: i,
+      Et: [],
+      ft: [],
+      At: n?.from,
+      Ot: n?.fallback
     })
   );
-  r.le &= ~CONFIG_AUTO_DISPOSE;
+  r.Se &= ~CONFIG_AUTO_DISPOSE;
   return accessor(r);
 }
 function updateRepeat() {
-  const e = this.ft();
-  const t = this.Et?.() || 0;
-  runWithOwner(this.ze, () => {
+  const e = this.It();
+  const t = this.At?.() || 0;
+  runWithOwner(this.st, () => {
     if (e === 0) {
-      if (this.Xe !== 0) {
-        this.ze.dispose(false);
-        this.it = [];
-        this.nt = [];
-        this.Xe = 0;
-        this.lt = 0;
+      if (this.ot !== 0) {
+        this.st.dispose(false);
+        this.Et = [];
+        this.ft = [];
+        this.ot = 0;
+        this.Rt = 0;
       }
-      if (this.ct && !this.nt[0]) {
-        this.nt[0] = runWithOwner((this.it[0] = createOwner()), this.ct);
+      if (this.Ot && !this.ft[0]) {
+        this.ft[0] = runWithOwner((this.Et[0] = createOwner()), this.Ot);
       }
       return;
     }
     const n = t + e;
-    const i = this.lt + this.Xe;
-    if (this.Xe === 0 && this.it[0]) this.it[0].dispose();
-    if (t >= i || n <= this.lt) {
-      for (let e = 0; e < this.Xe; e++) this.it[e].dispose();
-      this.it = new Array(e);
-      this.nt = new Array(e);
+    const i = this.Rt + this.ot;
+    if (this.ot === 0 && this.Et[0]) this.Et[0].dispose();
+    if (t >= i || n <= this.Rt) {
+      for (let e = 0; e < this.ot; e++) this.Et[e].dispose();
+      this.Et = new Array(e);
+      this.ft = new Array(e);
       for (let n = 0; n < e; n++)
-        this.nt[n] = runWithOwner((this.it[n] = createOwner()), () => this.tt(t + n));
-      this.lt = t;
-      this.Xe = e;
+        this.ft[n] = runWithOwner((this.Et[n] = createOwner()), () => this.lt(t + n));
+      this.Rt = t;
+      this.ot = e;
       return;
     }
-    for (let e = n; e < i; e++) this.it[e - this.lt].dispose();
-    if (this.lt < t) {
-      const e = t - this.lt;
-      for (let t = 0; t < e && t < this.Xe; t++) this.it[t].dispose();
-      this.it.splice(0, e);
-      this.nt.splice(0, e);
-    } else if (this.lt > t) {
-      let n = i - this.lt - 1;
-      let r = this.lt - t;
-      this.it.length = this.nt.length = e;
+    for (let e = n; e < i; e++) this.Et[e - this.Rt].dispose();
+    if (this.Rt < t) {
+      const e = t - this.Rt;
+      for (let t = 0; t < e && t < this.ot; t++) this.Et[t].dispose();
+      this.Et.splice(0, e);
+      this.ft.splice(0, e);
+    } else if (this.Rt > t) {
+      let n = i - this.Rt - 1;
+      let r = this.Rt - t;
+      this.Et.length = this.ft.length = e;
       while (n >= r) {
-        this.it[n] = this.it[n - r];
-        this.nt[n] = this.nt[n - r];
+        this.Et[n] = this.Et[n - r];
+        this.ft[n] = this.ft[n - r];
         n--;
       }
       for (let e = 0; e < r; e++) {
-        this.nt[e] = runWithOwner((this.it[e] = createOwner()), () => this.tt(e + t));
+        this.ft[e] = runWithOwner((this.Et[e] = createOwner()), () => this.lt(e + t));
       }
     }
     for (let e = i; e < n; e++) {
-      this.nt[e - t] = runWithOwner((this.it[e - t] = createOwner()), () => this.tt(e));
+      this.ft[e - t] = runWithOwner((this.Et[e - t] = createOwner()), () => this.lt(e));
     }
-    this.nt = this.nt.slice(0, e);
-    this.lt = t;
-    this.Xe = e;
+    this.ft = this.ft.slice(0, e);
+    this.Rt = t;
+    this.ot = e;
   });
-  return this.nt;
+  return this.ft;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
 }
 function boundaryComputed(e, t) {
   const n = computed(e, { lazy: true });
-  n.Qe = (e, t) => {
-    const i = e !== undefined ? e : n.Y;
-    const r = t !== undefined ? t : n.ae;
-    n.Y &= ~n.dt;
-    n.F.notify(n, STATUS_PENDING | STATUS_ERROR, i, r);
-    const o = i & ~n.dt & (STATUS_PENDING | STATUS_ERROR);
-    if (o) {
-      n.Y &= ~o;
-      if (n.ae === r && !(n.Y & (STATUS_PENDING | STATUS_ERROR))) n.ae = undefined;
+  n.Be = (e, t) => {
+    const i = e !== undefined ? e : n.q;
+    const r = t !== undefined ? t : n.Te;
+    n.q &= ~n.ht;
+    n.W.notify(n, STATUS_PENDING | STATUS_ERROR, i, r);
+    const s = i & ~n.ht & (STATUS_PENDING | STATUS_ERROR);
+    if (s) {
+      n.q &= ~s;
+      if (n.Te === r && !(n.q & (STATUS_PENDING | STATUS_ERROR))) n.Te = undefined;
     }
   };
-  n.dt = t;
-  n.le &= ~CONFIG_AUTO_DISPOSE;
+  n.ht = t;
+  n.Se &= ~CONFIG_AUTO_DISPOSE;
   recompute(n, true);
   return n;
 }
 function createBoundChildren(e, t, n, i) {
-  const r = e.F;
-  r.addChild((e.F = n));
-  cleanup(() => r.removeChild(e.F));
+  const r = e.W;
+  r.addChild((e.W = n));
+  cleanup(() => r.removeChild(e.W));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => flatten(read(e)), i);
@@ -3985,52 +4252,52 @@ function isRevealController(e) {
   return e instanceof RevealController;
 }
 function isSlotReady(e) {
-  return isRevealController(e) ? e.isReady() : e.St.size === 0 && !e.Tt;
+  return isRevealController(e) ? e.isReady() : e.Nt.size === 0 && !e.Ct;
 }
 function isSlotMinimallyReady(e) {
   return isRevealController(e) ? e.isMinimallyReady() : isSlotReady(e);
 }
 function setSlotState(e, t, n, i) {
-  setSignal(e._t, n);
-  setSignal(e.Ot, i);
+  setSignal(e.yt, n);
+  setSignal(e.gt, i);
   if (isRevealController(e)) {
-    if (!n && e.Rt === t) e.Rt = undefined;
+    if (!n && e.Pt === t) e.Pt = undefined;
     return e.evaluate(n, i);
   }
-  if (!n && e.It === t && e.ht) e.It = undefined;
+  if (!n && e.Dt === t && e.bt) e.Dt = undefined;
 }
 class RevealController {
-  At;
-  Nt;
-  Ct = [];
-  Rt;
-  _t = signal(false, { ownedWrite: true, Ke: true });
-  Ot = signal(false, { ownedWrite: true, Ke: true });
-  yt = true;
-  Pt = true;
-  gt = false;
+  vt;
+  wt;
+  Lt = [];
+  Pt;
+  yt = signal(false, { ownedWrite: true, tt: true });
+  gt = signal(false, { ownedWrite: true, tt: true });
+  Vt = true;
+  Ut = true;
+  kt = false;
   constructor(e, t) {
-    this.At = e;
-    this.Nt = t;
+    this.vt = e;
+    this.wt = t;
   }
-  Dt(e) {
-    for (let t = 0; t < this.Ct.length; t++) {
-      const n = this.Ct[t];
-      if ((isRevealController(n) ? n.Rt : n.It) !== this) continue;
+  Gt(e) {
+    for (let t = 0; t < this.Lt.length; t++) {
+      const n = this.Lt[t];
+      if ((isRevealController(n) ? n.Pt : n.Dt) !== this) continue;
       if (e(n) === false) return false;
     }
     return true;
   }
   isReady() {
-    return this.Dt(isSlotReady);
+    return this.Gt(isSlotReady);
   }
   isMinimallyReady() {
-    const e = untrack(this.At);
-    if (e === "together") return this.isReady();
+    const e = untrack(this.vt);
+    if (e === "together") return this.Gt(isSlotMinimallyReady);
     if (e === "natural") {
       let e = false;
       let t = false;
-      this.Dt(n => {
+      this.Gt(n => {
         e = true;
         if (isSlotMinimallyReady(n)) {
           t = true;
@@ -4040,58 +4307,58 @@ class RevealController {
       return !e || t;
     }
     let t = true;
-    this.Dt(e => {
+    this.Gt(e => {
       t = isSlotMinimallyReady(e);
       return false;
     });
     return t;
   }
   register(e) {
-    if (this.Ct.includes(e)) return;
-    this.Ct.push(e);
-    const t = untrack(this.At);
-    (setSignal(e._t, true), setSignal(e.Ot, t === "sequential" ? !!untrack(this.Nt) : false));
+    if (this.Lt.includes(e)) return;
+    this.Lt.push(e);
+    const t = untrack(this.vt);
+    (setSignal(e.yt, true), setSignal(e.gt, t === "sequential" ? !!untrack(this.wt) : false));
     untrack(() => this.evaluate());
   }
   unregister(e) {
-    const t = this.Ct.indexOf(e);
-    if (t >= 0) this.Ct.splice(t, 1);
+    const t = this.Lt.indexOf(e);
+    if (t >= 0) this.Lt.splice(t, 1);
     untrack(() => this.evaluate());
   }
   evaluate(e, t) {
-    if (this.gt) return;
-    this.gt = true;
-    const n = this.yt;
-    const i = this.Pt;
+    if (this.kt) return;
+    this.kt = true;
+    const n = this.Vt;
+    const i = this.Ut;
     try {
-      const n = e ?? read(this._t),
-        i = untrack(this.At),
-        r = i === "sequential" && !!untrack(this.Nt),
-        o = t ?? r;
+      const n = e ?? read(this.yt),
+        i = untrack(this.vt),
+        r = i === "sequential" && !!untrack(this.wt),
+        s = t ?? r;
       if (n) {
-        this.Dt(e => setSlotState(e, this, true, o));
+        this.Gt(e => setSlotState(e, this, true, s));
       } else if (i === "natural") {
-        this.Dt(e => {
+        this.Gt(e => {
           if (isRevealController(e)) {
-            setSignal(e.Ot, false);
-            setSignal(e._t, false);
+            setSignal(e.gt, false);
+            setSignal(e.yt, false);
             e.evaluate(false, false);
           } else {
             setSlotState(e, this, !isSlotReady(e), false);
           }
         });
       } else if (i === "together") {
-        const e = this.Dt(isSlotMinimallyReady);
-        this.Dt(t => setSlotState(t, this, !e, false));
+        const e = this.Gt(isSlotMinimallyReady);
+        this.Gt(t => setSlotState(t, this, !e, false));
       } else {
         let e = false;
-        this.Dt(t => {
+        this.Gt(t => {
           if (e) return setSlotState(t, this, true, r);
           if (isSlotReady(t)) return setSlotState(t, this, false, false);
           e = true;
           if (isRevealController(t)) {
-            setSignal(t.Ot, false);
-            setSignal(t._t, false);
+            setSignal(t.gt, false);
+            setSignal(t.yt, false);
             t.evaluate(false, false);
           } else {
             setSlotState(t, this, true, false);
@@ -4099,128 +4366,125 @@ class RevealController {
         });
       }
     } finally {
-      this.yt = this.isReady();
-      this.Pt = this.isMinimallyReady();
-      this.gt = false;
+      this.Vt = this.isReady();
+      this.Ut = this.isMinimallyReady();
+      this.kt = false;
     }
-    if (this.Rt && (n !== this.yt || i !== this.Pt)) this.Rt.evaluate();
+    if (this.Pt && (n !== this.Vt || i !== this.Ut)) this.Pt.evaluate();
   }
 }
 class CollectionQueue extends Queue {
-  bt;
-  St = new Set();
-  vt;
-  Tt = true;
-  _t = signal(false, { ownedWrite: true, Ke: true });
-  ae;
-  Ot = signal(false, { ownedWrite: true, Ke: true });
-  It;
-  ht = false;
-  wt;
-  Lt = ON_INIT;
+  Ft;
+  Nt = new Set();
+  Wt;
+  Ct = true;
+  yt = signal(false, { ownedWrite: true, tt: true });
+  Te;
+  gt = signal(false, { ownedWrite: true, tt: true });
+  Dt;
+  bt = false;
+  Mt;
+  Ht = ON_INIT;
   constructor(e) {
     super();
-    this.bt = e;
+    this.Ft = e;
   }
   run(e) {
-    if (!e || (read(this._t) && (!_revealUsed || read(this.Ot)))) return;
+    if (!e || (read(this.yt) && (!_revealUsed || read(this.gt)))) return;
     return super.run(e);
   }
   notify(e, t, n, i) {
-    if (!(t & this.bt)) return super.notify(e, t, n, i);
-    if (this.ht && this.wt) {
+    if (!(t & this.Ft)) return super.notify(e, t, n, i);
+    if (this.bt && this.Mt) {
       const e = untrack(() => {
         try {
-          return this.wt();
+          return this.Mt();
         } catch {
           return ON_INIT;
         }
       });
-      if (e !== this.Lt) {
-        this.Lt = e;
-        this.ht = false;
-        this.St.clear();
+      if (e !== this.Ht) {
+        this.Ht = e;
+        this.bt = false;
+        this.Nt.clear();
       }
     }
-    if (this.bt & STATUS_PENDING && n & STATUS_ERROR) {
-      return super.notify(e, STATUS_ERROR, n, i);
-    }
-    if (this.bt & STATUS_PENDING && this.ht) return super.notify(e, t, n, i);
-    if (n & this.bt) {
-      this.Tt = true;
-      const t = i?.source || e.ae?.source;
+    if (this.Ft & STATUS_PENDING && this.bt) return super.notify(e, t, n, i);
+    if (n & this.Ft) {
+      this.Ct = true;
+      const t = i?.source || e.Te?.source;
       if (t) {
-        const e = this.St.size === 0;
-        this.St.add(t);
-        if (e) setSignal(this._t, true);
-        if (this.bt & STATUS_ERROR) {
-          setSignal(this.ae, t.ae?.cause ?? t.ae);
+        const e = this.Nt.size === 0;
+        this.Nt.add(t);
+        if (e) setSignal(this.yt, true);
+        if (this.Ft & STATUS_ERROR) {
+          setSignal(this.Te, unwrapStatusError(t.Te));
         }
       }
     }
-    t &= ~this.bt;
+    t &= ~this.Ft;
     return t ? super.notify(e, t, n, i) : true;
   }
   checkSources() {
-    for (const e of this.St) {
+    for (const e of this.Nt) {
       if (
-        e.W & REACTIVE_DISPOSED ||
-        (!(e.Y & this.bt) && !(this.bt & STATUS_ERROR && e.Y & STATUS_PENDING))
+        e.H & REACTIVE_DISPOSED ||
+        (!(e.q & this.Ft) && !(this.Ft & STATUS_ERROR && e.q & STATUS_PENDING))
       )
-        this.St.delete(e);
+        this.Nt.delete(e);
     }
-    if (!this.St.size) {
-      if (this.bt & STATUS_PENDING && this.Tt && !this.ht && this.vt) {
-        this.Tt = !!(this.vt.Y & this.bt);
+    if (!this.Nt.size) {
+      if (this.Ft & STATUS_PENDING && this.Ct && !this.bt && this.Wt) {
+        this.Ct = !!(this.Wt.q & this.Ft);
       } else {
-        this.Tt = false;
+        this.Ct = false;
       }
-      if (!this.Tt) {
-        setSignal(this._t, false);
-        if (this.wt) {
+      if (!this.Ct) {
+        setSignal(this.yt, false);
+        if (this.Mt) {
           try {
-            this.Lt = untrack(() => this.wt());
+            this.Ht = untrack(() => this.Mt());
           } catch {}
         }
       }
     }
-    if (_revealUsed) this.It?.evaluate();
+    if (_revealUsed) this.Dt?.evaluate();
   }
 }
 function createCollectionBoundary(e, t, n, i) {
   const r = createOwner();
   if (_revealUsed) setContext(RevealControllerContext, null, r);
-  const o = new CollectionQueue(e);
-  if (e === STATUS_ERROR) o.ae = signal(undefined, { ownedWrite: true, Ke: true });
-  if (i) o.wt = i;
-  const s = (o.vt = createBoundChildren(r, t, o, e));
+  const s = new CollectionQueue(e);
+  if (e === STATUS_ERROR) s.Te = signal(undefined, { ownedWrite: true, tt: true });
+  if (i) s.Mt = i;
+  const o = (s.Wt = createBoundChildren(r, t, s, e));
   untrack(() => {
     let t = false;
     try {
-      read(s);
+      read(o);
     } catch (e) {
       if (e instanceof NotReadyError) t = true;
       else throw e;
     }
-    o.Tt = t || !!(s.Y & e) || s.ae instanceof NotReadyError;
+    s.Ct = t || !!(o.q & e) || o.Te instanceof NotReadyError;
   });
   const u = _revealUsed && e === STATUS_PENDING ? getContext(RevealControllerContext) : null;
   if (u) {
-    o.It = u;
-    u.register(o);
-    cleanup(() => u.unregister(o));
+    s.Dt = u;
+    u.register(s);
+    cleanup(() => u.unregister(s));
   }
   return accessor(
     computed(
       () => {
-        if (!read(o._t)) {
-          const e = read(s);
-          if (!untrack(() => read(o._t))) return ((o.ht = true), e);
+        if (!read(s.yt)) {
+          const e = read(o);
+          if (!untrack(() => read(s.yt))) return ((s.bt = true), e);
         }
-        if (_revealUsed && read(o.Ot)) return undefined;
-        return n(o);
+        if (_revealUsed && read(s.gt)) return undefined;
+        return n(s);
       },
-      { Ke: true }
+      { tt: true }
     )
   );
 }
@@ -4229,8 +4493,8 @@ function createLoadingBoundary(e, t, n) {
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(STATUS_ERROR, e, e =>
-    t(accessor(e.ae), () => {
-      for (const t of e.St) recompute(t);
+    t(accessor(e.Te), () => {
+      for (const t of e.Nt) recompute(t);
       schedule();
     })
   );
@@ -4240,20 +4504,20 @@ function createRevealOrder(e, t) {
   const n = createOwner();
   const i = getContext(RevealControllerContext);
   const r = t?.order || SEQUENTIAL_ACCESSOR,
-    o = t?.collapsed || FALSE_ACCESSOR;
-  const s = new RevealController(r, o);
-  setContext(RevealControllerContext, s, n);
+    s = t?.collapsed || FALSE_ACCESSOR;
+  const o = new RevealController(r, s);
+  setContext(RevealControllerContext, o, n);
   return runWithOwner(n, () => {
     const t = e();
     computed(() => {
       r();
-      o();
-      s.evaluate();
+      s();
+      o.evaluate();
     });
     if (i) {
-      s.Rt = i;
-      i.register(s);
-      cleanup(() => i.unregister(s));
+      o.Pt = i;
+      i.register(o);
+      cleanup(() => i.unregister(o));
     }
     return t;
   });
@@ -4282,9 +4546,9 @@ function flatten(e, t) {
 function flattenArray(e, t = [], n) {
   let i = null;
   let r = false;
-  for (let o = 0; o < e.length; o++) {
+  for (let s = 0; s < e.length; s++) {
     try {
-      let i = e[o];
+      let i = e[s];
       if (typeof i === "function" && !i.length) {
         if (n?.doNotUnwrap) {
           t.push(i);
@@ -4319,6 +4583,7 @@ export {
   NotReadyError,
   SUPPORTS_PROXY,
   action,
+  affects,
   clearSnapshots,
   createContext,
   createEffect,