@solidjs/signals 2.0.0-rc.3 → 2.0.0-rc.5

package/dist/prod/core/lanes.js

@@ -1,4 +1,4 @@
-import { NOT_PENDING, CONFIG_HAS_LANE } from "./constants.js";
+import { CONFIG_HAS_LANE, NOT_PENDING } from "./constants.js";
 
 import { ext } from "./core.js";
 
@@ -20,16 +20,16 @@ const activeLanes = new Set;
     }
     // Detect parent lane: _parentSource chains from pendingSignal → pendingValueComputed → original.
     // The child lane should not merge with the parent lane.
-        const i = n.o?.It;
-    const t = i?.o?.Be;
+        const i = n.o?.Tt;
+    const t = i?.o?.Je;
     const r = t ? findLane(t) : null;
     e = {
         nn: n,
-        Ae: new Set,
-        en: [ [], [] ],
-        tn: null,
-        _e: activeTransition,
-        rn: r
+        De: new Set,
+        tn: [ [], [] ],
+        rn: null,
+        Ae: activeTransition,
+        an: r
     };
     signalLanes.set(n, e);
     activeLanes.add(e);
@@ -39,8 +39,8 @@ const activeLanes = new Set;
     // parent-child is a property of the nodes, not of write order — otherwise
     // the owner's write merges the companion's subscribers into this lane and
     // their effects wait on its async instead of flushing immediately.
-        adoptCompanionLane(n.o?.Ge, e);
-    adoptCompanionLane(n.o?.ge, e);
+        adoptCompanionLane(n.o?.ye, e);
+    adoptCompanionLane(n.o?.Ce, e);
     return e;
 }
 
@@ -51,13 +51,13 @@ function adoptCompanionLane(n, e) {
     const t = findLane(i);
     // Only the companion's own unmerged root is safely re-parentable: a root
     // that absorbed other lanes carries work that is not a child of this owner.
-        if (t !== e && t.nn === n && !t.rn) t.rn = e;
+        if (t !== e && t.nn === n && !t.an) t.an = e;
 }
 
 /**
  * Union-find: find the root lane.
  */ function findLane(n) {
-    while (n.tn) n = n.tn;
+    while (n.rn) n = n.rn;
     return n;
 }
 
@@ -67,27 +67,27 @@ function adoptCompanionLane(n, e) {
     n = findLane(n);
     e = findLane(e);
     if (n === e) return n;
-    e.tn = n;
+    e.rn = n;
     // Move (not copy) the merged lane's work: after the merge all routing goes
     // through findLane() to the root, so anything left behind here is dead —
     // and anything *added* here later is a routing bug (INV-5).
-        for (const i of e.Ae) n.Ae.add(i);
-    e.Ae.clear();
-    n.en[0].push(...e.en[0]);
-    n.en[1].push(...e.en[1]);
-    e.en[0].length = 0;
-    e.en[1].length = 0;
+        for (const i of e.De) n.De.add(i);
+    e.De.clear();
+    n.tn[0].push(...e.tn[0]);
+    n.tn[1].push(...e.tn[1]);
+    e.tn[0].length = 0;
+    e.tn[1].length = 0;
     return n;
 }
 
 /**
  * Resolve a node's lane: follow union-find chain, verify active, clear if stale.
  */ function resolveLane(n) {
-    const e = n.o?.Be;
+    const e = n.o?.Je;
     if (!e) return undefined;
     const i = findLane(e);
     if (activeLanes.has(i)) return i;
-    if (n.o !== null) n.o.Be = undefined;
+    if (n.o !== null) n.o.Je = undefined;
     return undefined;
 }
 
@@ -97,19 +97,19 @@ function resolveTransition(n) {
     // transactions (#2912) — the merged root's _transition would hand this
     // node's override to whichever action wrote last through the shared
     // reader. Chase merge chains; a dead owner settled through another path.
-    if (hasActiveOverride(n) && n.o?.Et) {
-        const e = ext(n).Et = currentTransition(n.o?.Et);
-        if (e.an !== true) return e;
-        if (n.o !== null) n.o.Et = null;
+    if (hasActiveOverride(n) && n.o?.Nt) {
+        const e = ext(n).Nt = currentTransition(n.o?.Nt);
+        if (e.sn !== true) return e;
+        if (n.o !== null) n.o.Nt = null;
     }
-    return resolveLane(n)?._e ?? n._e;
+    return resolveLane(n)?.Ae ?? n.Ae;
 }
 
 /**
  * Check if a node has an active optimistic override.
  */ function hasActiveOverride(n) {
     const e = n.o;
-    return e !== null && e.De !== undefined && e.De !== NOT_PENDING;
+    return e !== null && e.Oe !== undefined && e.Oe !== NOT_PENDING;
 }
 
 /**
@@ -117,13 +117,13 @@ function resolveTransition(n) {
  * a different active lane), merge unless the node has an active override.
  */ function assignOrMergeLane(n, e) {
     const i = findLane(e);
-    const t = n.o?.Be;
+    const t = n.o?.Je;
     if (t) {
         // If the subscriber's lane was merged into another lane, it's stale —
         // replace it with the new source lane instead of following the merge chain
         // (which would incorrectly merge the new lane into the old group)
-        if (t.tn) {
-            ext(n).Be = e;
+        if (t.rn) {
+            ext(n).Je = e;
             n.T |= CONFIG_HAS_LANE;
             return;
         }
@@ -132,15 +132,15 @@ function resolveTransition(n) {
             if (r !== i && !hasActiveOverride(n)) {
                 // Parent-child lanes stay independent so isPending resolves without
                 // waiting for the parent's async. The child keeps ownership.
-                if (i.rn && findLane(i.rn) === r) {
-                    ext(n).Be = e;
+                if (i.an && findLane(i.an) === r) {
+                    ext(n).Je = e;
                     n.T |= CONFIG_HAS_LANE;
-                } else if (r.rn && findLane(r.rn) === i) ; else mergeLanes(i, r);
+                } else if (r.an && findLane(r.an) === i) ; else mergeLanes(i, r);
             }
             return;
         }
     }
-    ext(n).Be = e;
+    ext(n).Je = e;
     n.T |= CONFIG_HAS_LANE;
 }
 

package/dist/prod/core/optimistic.js

@@ -1,4 +1,4 @@
-import { NOT_PENDING, unwrapOverride, STATUS_UNINITIALIZED, REACTIVE_DIRTY, REACTIVE_CHECK, CONFIG_HAS_LANE, OVERRIDE_UNDEFINED, STATUS_PENDING, REACTIVE_MANUAL_WRITE, REACTIVE_OPTIMISTIC_DIRTY, EFFECT_RENDER, EFFECT_USER } from "./constants.js";
+import { NOT_PENDING, unwrapOverride, STATUS_UNINITIALIZED, REACTIVE_DIRTY, REACTIVE_CHECK, CONFIG_HAS_LANE, OVERRIDE_UNDEFINED, STATUS_PENDING, EFFECT_RENDER, REACTIVE_MANUAL_WRITE, REACTIVE_OPTIMISTIC_DIRTY, EFFECT_USER } from "./constants.js";
 
 import { ext, latestReadActive, currentOptimisticLane, stale } from "./core.js";
 
@@ -24,8 +24,8 @@ import { GlobalQueue, activeTransition, globalQueue, clock, insertSubs, schedule
  * once the gate holds — the same late-binding contract as verdict.ts.
  */
 /** The optimistic half of setSignal, fired when `_overrideValue !== undefined`. */ function optimisticWrite(e, n) {
-    const t = e.o?.De !== NOT_PENDING;
-    const i = t ? unwrapOverride(e.o?.De) : e.be;
+    const t = e.o?.Oe !== NOT_PENDING;
+    const i = t ? unwrapOverride(e.o?.Oe) : e.be;
     if (typeof n === "function") n = n(i);
     const u = !!(e.S & STATUS_UNINITIALIZED) || 
     // A dirty node's _value is stale (its queued recompute hasn't run — e.g.
@@ -34,7 +34,7 @@ import { GlobalQueue, activeTransition, globalQueue, clock, insertSubs, schedule
     // push returning the shadow to that stale value was dropped, the snap
     // recompute then committed the parent's old value, and the banner showed
     // the previous transition's target (#3041 follow-up).
-    !!((e.ie ?? 0) & (REACTIVE_DIRTY | REACTIVE_CHECK)) || !e.Ue || !e.Ue(i, n);
+    !!((e.ie ?? 0) & (REACTIVE_DIRTY | REACTIVE_CHECK)) || !e.ge || !e.ge(i, n);
     if (!u) {
         // Same-value write with an active override still entangles the current
         // action's transition — the hold must outlast all overlapping actions.
@@ -48,22 +48,22 @@ import { GlobalQueue, activeTransition, globalQueue, clock, insertSubs, schedule
     // No revert target is stashed: while the override is active every reader
     // sees it (A17), so authoritative arrivals commit silently into _value and
     // reverting is just dropping the override — _value is already correct.
-     else globalQueue.k.Ke.push(e);
+     else globalQueue.m.ze.push(e);
     // Stamp ownership on the node (post-merge, so entangled writers share the
     // joint root). resolveTransition prefers this over the lane's _transition,
     // which a shared subscriber can merge across transactions (#2912).
-        ext(e).Et = activeTransition;
+        ext(e).Nt = activeTransition;
     const l = getOrCreateLane(e);
-    ext(e).Be = l;
+    ext(e).Je = l;
     e.T |= CONFIG_HAS_LANE;
     // Literal undefined must not land raw: the slot doubles as the optimistic
     // brand, and erasing it makes the write invisible and routes follow-up
     // writes off the optimistic path into permanent commits (#2898).
-        ext(e).De = n === undefined ? OVERRIDE_UNDEFINED : n;
+        ext(e).Oe = n === undefined ? OVERRIDE_UNDEFINED : n;
     // syncCompanions only pokes _pendingSignal/_latestValueComputed — with
     // neither companion present the call is a guaranteed no-op.
-        (e.o?.Ge !== undefined || e.o?.ge !== undefined) && GlobalQueue.Oe !== null && GlobalQueue.Oe(e, n);
-    if (e.Se !== undefined) e.Te = clock;
+        (e.o?.ye !== undefined || e.o?.Ce !== undefined) && GlobalQueue.Re !== null && GlobalQueue.Re(e, n);
+    if (e.oe !== undefined) e.Te = clock;
  // §12e: computed-only slot
         insertSubs(e, true);
     schedule();
@@ -75,8 +75,8 @@ import { GlobalQueue, activeTransition, globalQueue, clock, insertSubs, schedule
  * while one of its optimistic nodes holds an active override that is still
  * pending on real (non-affects-sentinel) async.
  */ function transitionBlocked(e) {
-    for (let n = 0; n < e.Ke.length; n++) {
-        const t = e.Ke[n];
+    for (let n = 0; n < e.ze.length; n++) {
+        const t = e.ze[n];
         if (hasActiveOverride(t) && "S" in t && t.S & STATUS_PENDING && t.o?._ instanceof NotReadyError) {
             return true;
         }
@@ -91,25 +91,25 @@ function resolveOptimisticNodes(e) {
     const n = e.length;
     for (let t = 0; t < n; t++) {
         const n = e[t];
-        if (n.o !== null) n.o.Be = undefined;
+        if (n.o !== null) n.o.Je = undefined;
         // Revert is a pure drop: there is no revert target to commit —
         // override-covered authoritative values hold in _pendingValue and
         // elevate on their OWN transition's schedule (A18 as re-ruled 2026-07-07).
                 if (!(n.S & STATUS_PENDING)) n.S &= ~STATUS_UNINITIALIZED;
-        const i = n.o?.De;
-        ext(n).De = NOT_PENDING;
+        const i = n.o?.Oe;
+        ext(n).Oe = NOT_PENDING;
         if (i !== NOT_PENDING && n.be !== unwrapOverride(i)) insertSubs(n, true);
-        n._e = null;
-        if (n.o !== null) n.o.Et = null;
+        n.Ae = null;
+        if (n.o !== null) n.o.Nt = null;
     }
     // Settlement checkpoint (#2838): companions caught in this batch (or owned
     // by a node in it) re-derive from committed state, so verdicts survive the
     // transition that produced them (A19 — pending is a property of the data).
         for (let t = 0; t < n; t++) {
         const n = e[t];
-        if (n.o?.Ge || n.o?.ge) GlobalQueue.un(n);
-        const i = n.o?.It;
-        if (i && (i.o?.Ge === n || i.o?.ge === n)) GlobalQueue.un(i);
+        if (n.o?.ye || n.o?.Ce) GlobalQueue.un(n);
+        const i = n.o?.Tt;
+        if (i && (i.o?.ye === n || i.o?.Ce === n)) GlobalQueue.un(i);
     }
     e.splice(0, n);
 }
@@ -122,27 +122,30 @@ function runQueue(e, n) {
  * Run effects from all lanes that are ready (no pending async).
  */ function runLaneEffects(e) {
     for (const n of activeLanes) {
-        if (n.tn || n.Ae.size > 0) continue;
-        const t = n.en[e - 1];
+        if (n.rn || n.De.size > 0) continue;
+        const t = n.tn[e - 1];
         if (t.length) {
-            n.en[e - 1] = [];
+            n.tn[e - 1] = [];
             runQueue(t, e);
         }
     }
+    // Optimistic patch applications ride the same visibility slot as lane
+    // effects (in-flight DOM updates); no-op unless patches registered.
+        if (e === EFFECT_RENDER) GlobalQueue.ln?.();
 }
 
 function cleanupCompletedLanes(e) {
     for (const n of activeLanes) {
-        const t = e ? n._e === e : !n._e;
+        const t = e ? n.Ae === e : !n.Ae;
         if (!t) continue;
-        if (!n.tn) {
-            if (n.en[0].length) runQueue(n.en[0], EFFECT_RENDER);
-            if (n.en[1].length) runQueue(n.en[1], EFFECT_USER);
+        if (!n.rn) {
+            if (n.tn[0].length) runQueue(n.tn[0], EFFECT_RENDER);
+            if (n.tn[1].length) runQueue(n.tn[1], EFFECT_USER);
         }
-        if (n.nn.o?.Be === n) if (n.nn.o !== null) n.nn.o.Be = undefined;
-        n.Ae.clear();
-        n.en[0].length = 0;
-        n.en[1].length = 0;
+        if (n.nn.o?.Je === n) if (n.nn.o !== null) n.nn.o.Je = undefined;
+        n.De.clear();
+        n.tn[0].length = 0;
+        n.tn[1].length = 0;
         activeLanes.delete(n);
         signalLanes.delete(n.nn);
     }
@@ -152,7 +155,7 @@ function cleanupCompletedLanes(e) {
     // Per-lane suspension: only throw if in same lane as pending async
     // AND the node doesn't have an active override (overrides are the visible value,
     // downstream in the lane should read the override, not throw)
-    const n = e.o?.Be;
+    const n = e.o?.Je;
     if (!n) return false;
     return findLane(n) === findLane(currentOptimisticLane) && !hasActiveOverride(e);
 }
@@ -162,10 +165,10 @@ function cleanupCompletedLanes(e) {
  * that reads a pending mid-transition write sees the committed value; the sub
  * is recorded for replay at commit.
  */ function gatedRead(e, n, t) {
-    if (latestReadActive || e.Pe === NOT_PENDING || e.Se || n !== e && !(n.ie & REACTIVE_MANUAL_WRITE)) {
+    if (latestReadActive || e.Pe === NOT_PENDING || e.oe || n !== e && !(n.ie & REACTIVE_MANUAL_WRITE)) {
         return false;
     }
-    activeTransition.ln.add(t);
+    activeTransition.cn.add(t);
     return true;
 }
 
@@ -173,7 +176,7 @@ function cleanupCompletedLanes(e) {
  * read()'s value selection under a lane: return the committed `_value` for
  * optimistic/lane-assigned signals, stale-mode reads, and pending owners.
  */ function laneReadsCommitted(e, n, t) {
-    if (e.o?.De !== undefined || !!e.o?.Be || !!(n.S & STATUS_PENDING)) {
+    if (e.o?.Oe !== undefined || !!e.o?.Je || !!(n.S & STATUS_PENDING)) {
         // The committed view hides a staged in-flight value that will promote
         // silently (commitPendingNode never re-notifies). gatedRead records plain
         // signals for replay at commit; async memos are excluded from it by the
@@ -182,10 +185,10 @@ function cleanupCompletedLanes(e) {
         // committed value to a reader that never re-ran after the landing, so a
         // pending-gated branch stayed one value behind permanently (#3041
         // follow-up). Record the reader under the same replay contract.
-        if (e.Pe !== NOT_PENDING) (activeTransition ?? globalQueue.k).ln.add(t);
+        if (e.Pe !== NOT_PENDING) (activeTransition ?? globalQueue.m).cn.add(t);
         return true;
     }
-    if (n === e && stale && t.o?.It !== e) {
+    if (n === e && stale && t.o?.Tt !== e) {
         // The committed view can hide a staged write (a lane member — even just
         // an isPending companion flip — puts the reader "under a lane"). The
         // staged value commits with no re-delivery (commitPendingNode never
@@ -197,7 +200,7 @@ function cleanupCompletedLanes(e) {
         // into the transaction (#3041 follow-up: a pending-gated branch that
         // first read its async source during the landing flush stayed one value
         // behind permanently); with none, into the ambient batch.
-        if (e.Pe !== NOT_PENDING) (activeTransition ?? globalQueue.k).ln.add(t);
+        if (e.Pe !== NOT_PENDING) (activeTransition ?? globalQueue.m).cn.add(t);
         return true;
     }
     return false;
@@ -220,14 +223,14 @@ function cleanupCompletedLanes(e) {
         // recompute() runs plain: the value stages and commits with the flush.
         // (el's own override slot excludes companions themselves; a lane merged
         // into a real optimistic lane resolves to a non-companion source.)
-                if (!globalQueue.sn && !activeTransition && !n._e && n.nn.o?.It !== undefined && e.o?.De === undefined) {
-            if (e.o !== null) e.o.Be = undefined;
+                if (!globalQueue.fn && !activeTransition && !n.Ae && n.nn.o?.Tt !== undefined && e.o?.Oe === undefined) {
+            if (e.o !== null) e.o.Je = undefined;
             return false;
         }
         return n;
     }
-    for (let n = e.nt; n; n = n.it) {
-        const t = n.ut;
+    for (let n = e.ut; n; n = n.lt) {
+        const t = n.ot;
         if (t.ie & REACTIVE_OPTIMISTIC_DIRTY) {
             const n = resolveLane(t);
             if (n) {
@@ -243,8 +246,8 @@ function cleanupCompletedLanes(e) {
 /** recompute()'s catch path: track pending async in the current lane. */ function laneAsyncPending(e) {
     const n = findLane(currentOptimisticLane);
     if (n.nn !== e) {
-        n.Ae.add(e);
-        ext(e).Be = n;
+        n.De.add(e);
+        ext(e).Je = n;
         e.T |= CONFIG_HAS_LANE;
         GlobalQueue.de !== null && GlobalQueue.de(n.nn);
     }
@@ -253,14 +256,14 @@ function cleanupCompletedLanes(e) {
 /** recompute()'s success path: the node's async settled, clear it from its lane. */ function laneAsyncSettled(e) {
     const n = resolveLane(e);
     if (n) {
-        n.Ae.delete(e);
+        n.De.delete(e);
         GlobalQueue.de !== null && GlobalQueue.de(n.nn);
     }
 }
 
 function trackOptimisticStore(e) {
     // After initTransition, globalQueue._batch IS activeTransition (same reference)
-    globalQueue.k.cn.add(e);
+    globalQueue.m.En.add(e);
     schedule();
 }
 
@@ -269,19 +272,19 @@ function trackOptimisticStore(e) {
  * create optimistic state (verdict.ts at module top level, createOptimistic
  * and createOptimisticStore at first call) BEFORE any optimistic node exists.
  */ function installOptimisticEngine() {
-    if (GlobalQueue.vt !== null) return;
-    GlobalQueue.vt = optimisticWrite;
-    GlobalQueue.fn = resolveOptimisticNodes;
-    GlobalQueue.En = transitionBlocked;
-    GlobalQueue.Tn = cleanupCompletedLanes;
-    GlobalQueue.dn = runLaneEffects;
-    GlobalQueue.Ft = gatedRead;
-    GlobalQueue.ht = laneSuspends;
-    GlobalQueue.gt = laneReadsCommitted;
-    GlobalQueue.je = recomputeLane;
+    if (GlobalQueue.xt !== null) return;
+    GlobalQueue.xt = optimisticWrite;
+    GlobalQueue.Tn = resolveOptimisticNodes;
+    GlobalQueue.dn = transitionBlocked;
+    GlobalQueue.In = cleanupCompletedLanes;
+    GlobalQueue.Nn = runLaneEffects;
+    GlobalQueue.vt = gatedRead;
+    GlobalQueue.Vt = laneSuspends;
+    GlobalQueue.bt = laneReadsCommitted;
+    GlobalQueue.Be = recomputeLane;
     GlobalQueue.$e = laneAsyncPending;
-    GlobalQueue.ze = laneAsyncSettled;
-    GlobalQueue.In = trackOptimisticStore;
+    GlobalQueue.Xe = laneAsyncSettled;
+    GlobalQueue._n = trackOptimisticStore;
 }
 
 export { installOptimisticEngine };

package/dist/prod/core/owner.js

@@ -1,4 +1,4 @@
-import { REACTIVE_DISPOSED, REACTIVE_ZOMBIE, REACTIVE_IN_HEAP, REACTIVE_IN_HEAP_HEIGHT, CONFIG_TRANSPARENT, defaultContext, CONFIG_AUTO_DISPOSE } from "./constants.js";
+import { REACTIVE_DISPOSED, CONFIG_AUTO_DISPOSE, REACTIVE_ZOMBIE, REACTIVE_IN_HEAP, REACTIVE_IN_HEAP_HEIGHT, CONFIG_TRANSPARENT, defaultContext } from "./constants.js";
 
 import { context, runWithOwner, pendingCheckActive, latestReadActive, tracking } from "./core.js";
 
@@ -12,7 +12,7 @@ const PENDING_OWNER = {};
 
  // Dummy owner to trigger store's read() path
 function markDisposal(e) {
-    let t = e.ke;
+    let t = e.xe;
     while (t) {
         const e = t.ie;
         t.ie = e | REACTIVE_ZOMBIE;
@@ -26,7 +26,7 @@ function markDisposal(e) {
             if (e & REACTIVE_IN_HEAP) insertIntoHeap(t, zombieQueue); else insertIntoHeapHeight(t, zombieQueue);
         }
         markDisposal(t);
-        t = t.Ve;
+        t = t.Le;
     }
 }
 
@@ -52,12 +52,12 @@ function disposeChildren(e, t = false, n) {
         // edge). Snap runs after the DISPOSED flag is set so the oracle reads
         // false, and notifies subscribers still watching the companion.
                 const t = e;
-        if (t.o?.Ge || t.o?.ge) GlobalQueue.un(t);
+        if (t.o?.ye || t.o?.Ce) GlobalQueue.un(t);
     }
-    if (t && e.Se && e.o !== null) e.o.Ee = null;
-    let o = n ? e.o?.qe ?? null : e.ke;
+    if (t && e.oe && e.o !== null) e.o.Ie = null;
+    let o = n ? e.o?.Ye ?? null : e.xe;
     while (o) {
-        const e = o.Ve;
+        const e = o.Le;
         const t = o;
         // Owner teardown is death regardless of the child's own lifecycle
         // (#3024): strip AUTO_DISPOSE so a post-disposal read freezes at the
@@ -80,34 +80,34 @@ function disposeChildren(e, t = false, n) {
         o = e;
     }
     if (n) {
-        if (e.o !== null) e.o.qe = null;
+        if (e.o !== null) e.o.Ye = null;
     } else {
-        e.ke = null;
-        e.Me = 0;
+        e.xe = null;
+        e.Ze = 0;
     }
     // O(1) splice out of parent's chain on individual dispose. Skipped during
     // batch dispose (parent already disposed) and zombie disposal (node sits on
     // parent's _pendingFirstChild). We leave node._nextSibling intact so outer
     // walks that already advanced past us still reach later siblings.
-        if (t && !n && !(i & REACTIVE_ZOMBIE) && e.ve !== null && !(e.ve.ie & REACTIVE_DISPOSED)) {
-        const t = e.ct;
-        const n = e.Ve;
-        if (t !== null) t.Ve = n; else e.ve.ke = n;
-        if (n !== null) n.ct = t;
-        e.ct = null;
+        if (t && !n && !(i & REACTIVE_ZOMBIE) && e.ke !== null && !(e.ke.ie & REACTIVE_DISPOSED)) {
+        const t = e.ft;
+        const n = e.Le;
+        if (t !== null) t.Le = n; else e.ke.xe = n;
+        if (n !== null) n.ft = t;
+        e.ft = null;
     }
     runDisposal(e, n);
     // Final effect-returned cleanup fires at true disposal, after `_disposal`
     // to mirror rerun ordering (compute-phase teardown first, cleanup last).
-        if (t && e.At) {
-        const t = e.At;
-        e.At = undefined;
+        if (t && e.Rt) {
+        const t = e.Rt;
+        e.Rt = undefined;
         t();
     }
 }
 
 function runDisposal(e, t) {
-    let n = t ? e.o?.We : e.he;
+    let n = t ? e.o?.qe : e.pe;
     if (!n) return;
     if (Array.isArray(n)) {
         for (let e = 0; e < n.length; e++) {
@@ -118,14 +118,14 @@ function runDisposal(e, t) {
         n.call(n);
     }
     if (t) {
-        if (e.o !== null) e.o.We = null;
-    } else e.he = null;
+        if (e.o !== null) e.o.qe = null;
+    } else e.pe = null;
 }
 
 function childId(e, t) {
     let n = e;
-    while (n.T & CONFIG_TRANSPARENT && n.ve) n = n.ve;
-    if (n.id != null) return formatId(n.id, t ? n.Me++ : n.Me);
+    while (n.T & CONFIG_TRANSPARENT && n.ke) n = n.ke;
+    if (n.id != null) return formatId(n.id, t ? n.Ze++ : n.Ze);
     throw new Error("");
 }
 
@@ -206,7 +206,7 @@ function formatId(e, t) {
  * checks. `cleanup()` is the unchecked primitive used by internals.
  */ function cleanup(e) {
     if (!context) return e;
-    if (!context.he) context.he = e; else if (Array.isArray(context.he)) context.he.push(e); else context.he = [ context.he, e ];
+    if (!context.pe) context.pe = e; else if (Array.isArray(context.pe)) context.pe.push(e); else context.pe = [ context.pe, e ];
     return e;
 }
 
@@ -246,27 +246,27 @@ function disposeRootSelf(e = true) {
     const i = {
         id: inheritId(e, n, t),
         T: n ? CONFIG_TRANSPARENT : 0,
-        Ct: true,
-        Ot: t?.Ct ? t.Ot : t,
-        ke: null,
-        Ve: null,
-        ct: null,
-        he: null,
+        Gt: true,
+        Dt: t?.Gt ? t.Dt : t,
+        xe: null,
+        Le: null,
+        ft: null,
+        pe: null,
         C: t?.C ?? globalQueue,
         we: t?.we || defaultContext,
-        Me: 0,
+        Ze: 0,
         o: null,
-        ve: t,
+        ke: t,
         dispose: disposeRootSelf
     };
     if (t) {
-        const e = t.ke;
+        const e = t.xe;
         if (e === null) {
-            t.ke = i;
+            t.xe = i;
         } else {
-            i.Ve = e;
-            e.ct = i;
-            t.ke = i;
+            i.Le = e;
+            e.ft = i;
+            t.xe = i;
         }
     }
     return i;