@solidjs/signals 2.0.0-rc.1 → 2.0.0-rc.2

package/dist/prod/core/owner.js

@@ -1,8 +1,8 @@
-import { REACTIVE_DISPOSED, REACTIVE_IN_HEAP, REACTIVE_IN_HEAP_HEIGHT, REACTIVE_ZOMBIE, CONFIG_TRANSPARENT, defaultContext } from "./constants.js";
+import { REACTIVE_DISPOSED, REACTIVE_ZOMBIE, REACTIVE_IN_HEAP, REACTIVE_IN_HEAP_HEIGHT, CONFIG_TRANSPARENT, defaultContext, CONFIG_AUTO_DISPOSE } from "./constants.js";
 
 import { context, runWithOwner, pendingCheckActive, latestReadActive, tracking } from "./core.js";
 
-import { unlinkSubs } from "./graph.js";
+import { clearDeps, unobserved } from "./graph.js";
 
 import { deleteFromHeap, queueFor, insertIntoHeap, insertIntoHeapHeight } from "./heap.js";
 
@@ -12,118 +12,120 @@ const PENDING_OWNER = {};
 
  // Dummy owner to trigger store's read() path
 function markDisposal(e) {
-    let n = e.ke;
-    while (n) {
-        const e = n.se;
-        n.se = e | REACTIVE_ZOMBIE;
+    let t = e.ke;
+    while (t) {
+        const e = t.ie;
+        t.ie = e | REACTIVE_ZOMBIE;
         // migrate height-adjust entries too, not just recompute entries: every
         // `deleteFromHeap` call site picks the queue from the zombie flag, so a
         // node left physically linked in `dirtyQueue` after being zombified gets
         // unlinked from the wrong queue on dispose, corrupting the bucket and
         // livelocking the next `runHeap` that reaches it (#2759)
                 if (e & (REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT)) {
-            deleteFromHeap(n, e & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-            if (e & REACTIVE_IN_HEAP) insertIntoHeap(n, zombieQueue); else insertIntoHeapHeight(n, zombieQueue);
+            deleteFromHeap(t, e & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+            if (e & REACTIVE_IN_HEAP) insertIntoHeap(t, zombieQueue); else insertIntoHeapHeight(t, zombieQueue);
         }
-        markDisposal(n);
-        n = n.He;
+        markDisposal(t);
+        t = t.Ve;
     }
 }
 
 function dispose(e) {
-    // Leave every scheduler heap on disposal (mirrors `unobserved`): a node
-    // still queued here would be recomputed by the next flush, and recompute()
-    // rewriting `_flags` would clear REACTIVE_DISPOSED — resurrecting it (#2983).
-    deleteFromHeap(e, queueFor(e));
-    let n = e.tt;
-    while (n !== null) {
-        n = unlinkSubs(n);
-    }
-    e.tt = null;
-    e.Ye = null;
-    disposeChildren(e, true);
+    // Direct disposal is death, not dormancy: strip the observation lifecycle
+    // so a later read freezes at the last committed value instead of
+    // reawakening the node (#3024). The teardown itself (heap removal — a node
+    // left queued would be recomputed and resurrected by the next flush (#2983)
+    // — dep unlinking, child disposal) is exactly unobserved()'s body; only
+    // this flag distinguishes death from dormancy.
+    e.T &= ~CONFIG_AUTO_DISPOSE;
+    unobserved(e);
 }
 
-function disposeChildren(e, n = false, t) {
-    const i = e.se;
+function disposeChildren(e, t = false, n) {
+    const i = e.ie;
     if (i & REACTIVE_DISPOSED) return;
-    if (n) {
-        e.se = i | REACTIVE_DISPOSED;
+    if (t) {
+        e.ie = i | REACTIVE_DISPOSED;
         // Companions are created detached and outlive their owner, but a verdict
         // must not: a disposed source can never settle, so an isPending companion
         // latched `true` here would hold a spinner forever (INV-9, the PR #2845
         // edge). Snap runs after the DISPOSED flag is set so the oracle reads
         // false, and notifies subscribers still watching the companion.
-                const n = e;
-        if (n.Oe || n.ge) GlobalQueue.un(n);
+                const t = e;
+        if (t.o?.Ge || t.o?.ge) GlobalQueue.un(t);
     }
-    if (n && e.ce) e.Te = null;
-    let l = t ? e.We : e.ke;
-    while (l) {
-        const e = l.He;
-        const n = l;
+    if (t && e.Se && e.o !== null) e.o.Ee = null;
+    let o = n ? e.o?.qe ?? null : e.ke;
+    while (o) {
+        const e = o.Ve;
+        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
+        // last committed value instead of reawakening in a torn-down tree.
+        // Runs before the recursion so already-dormant children (whose
+        // disposeChildren call early-returns on REACTIVE_DISPOSED) die too.
+        // Only unobserved()'s own node keeps its dormancy — it is never in
+        // this loop; its children are rebuilt fresh on reawaken.
+                t.T &= ~CONFIG_AUTO_DISPOSE;
         // Heap removal must not be gated on `_deps`: a dependency-free
         // computation queued by refresh() has a null dep list but still sits in
         // the dirty heap, and left there the post-disposal flush recomputes it —
         // recompute() rewriting `_flags` clears REACTIVE_DISPOSED and the node
         // comes back to life (post-unmount runs, leaked cleanups, #2983).
-                if (n.se & (REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT)) deleteFromHeap(n, queueFor(n));
-        if (n.tt) {
-            let e = n.tt;
-            do {
-                e = unlinkSubs(e);
-            } while (e !== null);
-            n.tt = null;
-            n.Ye = null;
-        }
-        disposeChildren(l, true);
-        l = e;
+        // deleteFromHeap self-guards on the in-heap flags (and tolerates plain
+        // Owners, whose _flags is undefined), so no gate here.
+                deleteFromHeap(t, queueFor(t));
+        clearDeps(t);
+        disposeChildren(o, true);
+        o = e;
     }
-    if (t) {
-        e.We = null;
+    if (n) {
+        if (e.o !== null) e.o.qe = null;
     } else {
         e.ke = null;
-        e.qe = 0;
+        e.Me = 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 (n && !t && !(i & REACTIVE_ZOMBIE) && e.Fe !== null && !(e.Fe.se & REACTIVE_DISPOSED)) {
-        const n = e.ct;
-        const t = e.He;
-        if (n !== null) n.He = t; else e.Fe.ke = t;
-        if (t !== null) t.ct = n;
+        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;
     }
-    runDisposal(e, t);
+    runDisposal(e, n);
     // Final effect-returned cleanup fires at true disposal, after `_disposal`
     // to mirror rerun ordering (compute-phase teardown first, cleanup last).
-        if (n && e.Nt) {
-        const n = e.Nt;
-        e.Nt = undefined;
-        n();
+        if (t && e.At) {
+        const t = e.At;
+        e.At = undefined;
+        t();
     }
 }
 
-function runDisposal(e, n) {
-    let t = n ? e.Qe : e.he;
-    if (!t) return;
-    if (Array.isArray(t)) {
-        for (let e = 0; e < t.length; e++) {
-            const n = t[e];
-            n.call(n);
+function runDisposal(e, t) {
+    let n = t ? e.o?.We : e.he;
+    if (!n) return;
+    if (Array.isArray(n)) {
+        for (let e = 0; e < n.length; e++) {
+            const t = n[e];
+            t.call(t);
         }
     } else {
-        t.call(t);
+        n.call(n);
     }
-    n ? e.Qe = null : e.he = null;
+    if (t) {
+        if (e.o !== null) e.o.We = null;
+    } else e.he = null;
 }
 
-function childId(e, n) {
-    let t = e;
-    while (t.T & CONFIG_TRANSPARENT && t.Fe) t = t.Fe;
-    if (t.id != null) return formatId(t.id, n ? t.qe++ : t.qe);
+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);
     throw new Error("");
 }
 
@@ -140,8 +142,8 @@ function childId(e, n) {
  * The id a freshly-created node inherits: an explicit `options.id` wins;
  * transparent nodes share their parent's id; otherwise the parent's next
  * child id is consumed (or `undefined` outside an id-carrying tree).
- */ function inheritId(e, n, t) {
-    return e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined);
+ */ function inheritId(e, t, n) {
+    return e?.id ?? (t ? n?.id : n?.id != null ? getNextChildId(n) : undefined);
 }
 
 /**
@@ -153,9 +155,9 @@ function childId(e, n) {
     return childId(e, false);
 }
 
-function formatId(e, n) {
-    const t = n.toString(36), i = t.length - 1;
-    return e + (i ? String.fromCharCode(64 + i) : "") + t;
+function formatId(e, t) {
+    const n = t.toString(36), i = n.length - 1;
+    return e + (i ? String.fromCharCode(64 + i) : "") + n;
 }
 
 /**
@@ -224,7 +226,7 @@ function formatId(e, n) {
  * }
  * ```
  */ function isDisposed(e) {
-    return !!(e.se & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE));
+    return !!(e.ie & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE));
 }
 
 function disposeRootSelf(e = true) {
@@ -239,33 +241,32 @@ function disposeRootSelf(e = true) {
  *
  * @internal
  */ function createOwner(e) {
-    const n = context;
-    const t = e?.transparent ?? false;
+    const t = context;
+    const n = e?.transparent ?? false;
     const i = {
-        id: inheritId(e, t, n),
-        T: t ? CONFIG_TRANSPARENT : 0,
-        Tt: true,
-        It: n?.Tt ? n.It : n,
+        id: inheritId(e, n, t),
+        T: n ? CONFIG_TRANSPARENT : 0,
+        Ct: true,
+        Ot: t?.Ct ? t.Ot : t,
         ke: null,
-        He: null,
+        Ve: null,
         ct: null,
         he: null,
-        C: n?.C ?? globalQueue,
-        we: n?.we || defaultContext,
-        qe: 0,
-        Qe: null,
-        We: null,
-        Fe: n,
+        C: t?.C ?? globalQueue,
+        we: t?.we || defaultContext,
+        Me: 0,
+        o: null,
+        ve: t,
         dispose: disposeRootSelf
     };
-    if (n) {
-        const e = n.ke;
+    if (t) {
+        const e = t.ke;
         if (e === null) {
-            n.ke = i;
+            t.ke = i;
         } else {
-            i.He = e;
+            i.Ve = e;
             e.ct = i;
-            n.ke = i;
+            t.ke = i;
         }
     }
     return i;
@@ -294,9 +295,9 @@ function disposeRootSelf(e = true) {
  * ```
  *
  * @description https://docs.solidjs.com/reference/reactive-utilities/create-root
- */ function createRoot(e, n) {
-    const t = createOwner(n);
-    return runWithOwner(t, () => e(() => t.dispose()));
+ */ function createRoot(e, t) {
+    const n = createOwner(t);
+    return runWithOwner(n, () => e(() => n.dispose()));
 }
 
 export { cleanup, createOwner, createRoot, dispose, disposeChildren, getNextChildId, getObserver, getOwner, inheritId, isDisposed, markDisposal, peekNextChildId };