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

package/dist/prod/core/lanes.js

@@ -119,7 +119,7 @@ function applyGuesses(e) {
             // value re-asked renews the question; nothing to notify.
             u = !t.xe || !t.xe(laneValueOf(t), l);
             if (!(t.l & CONFIG_GUESS)) {
-                t.se = NOT_PENDING;
+                t.ue = NOT_PENDING;
                 t.l |= CONFIG_GUESS;
             }
             t.T.v = l;
@@ -264,7 +264,7 @@ function unlink(e) {
     }
     if (!e.i) {
         if (!(e.l & CONFIG_OVERRIDE)) {
-            e.se = NOT_PENDING;
+            e.ue = NOT_PENDING;
             e.l = e.l & -1048833 | CONFIG_OVERRIDE;
             ext(e);
         }
@@ -321,7 +321,7 @@ function supersede(e, n, s) {
         // A confirmation is silent (A17); only truth readers are told.
                 GlobalQueue.sn?.(t);
     }
-    e.se = n;
+    e.ue = n;
     joinFuture(l);
 }
 
@@ -365,7 +365,7 @@ function supersede(e, n, s) {
             // of its flight observes it (#3648, #3651; #3305's commit beneath a
             // flight).
             u.Re = null;
-            if (!i && !r) l.se = f;
+            if (!i && !r) l.ue = f;
             commitPendingNode(l);
             if (!i) {
                 if (l.R & (REACTIVE_IN_HEAP | REACTIVE_DIRTY | REACTIVE_CHECK) || l.m & STATUS_PENDING) l.l |= CONFIG_INPUTS_PUBLISHED;
@@ -376,7 +376,7 @@ function supersede(e, n, s) {
             // else the value it covered — is the parent's to land, and its readers
             // re-derive from it there. What the screen showed stays the screen
             // until then (A18 (c)).
-            if (l.se === NOT_PENDING) l.se = covered(l);
+            if (l.ue === NOT_PENDING) l.ue = covered(l);
             if (e.ke) l.Ie = o;
             holdNode(l, n);
             insertSubs(l);
@@ -390,7 +390,7 @@ function supersede(e, n, s) {
             // it: an input's truth equal to its committed value is silent).
             u.Re = null;
             if (!i) {
-                if (E !== NOT_PENDING && e.ke) l.se = E;
+                if (E !== NOT_PENDING && e.ke) l.ue = E;
                 if (l.m & STATUS_PENDING) {
                     u.Se = null;
                     enqueueSub(l);
@@ -435,12 +435,21 @@ function supersede(e, n, s) {
  * lane's latest. NOT_PENDING falls through: lane work's read of a pending
  * member throws like any. */ function laneRead(e, n) {
     const s = n.l & CONFIG_GUESS;
+    const t = txOf(n);
+    // A lane a correction folded under (D-34): store/optimistic.ts reads it.
+    // Before the authoritative arm: an `until` outside the lane reads the
+    // same truth there, and joins the hold it folded into — its posture over
+    // a foreign hold (D-31), which the truth read alone would not take.
+        const l = e !== null && t.folded;
+    if (l) {
+        const s = l(e, n);
+        if (s !== NOT_PENDING) return s;
+    }
     if (e !== null && e.l & CONFIG_AUTHORITATIVE) return GlobalQueue.rn(n);
-    const t = n.m;
+    const u = n.m;
     // An errored member's lane value predates its error; the error is the answer (#4106).
-        if (!s && t & STATUS_ERROR) return NOT_PENDING;
+        if (!s && u & STATUS_ERROR) return NOT_PENDING;
     if (e === null) return laneValueOf(n);
-    const l = txOf(n);
     if (!tracking || e.l & CONFIG_CHILDREN_FORBIDDEN) {
         // An untracked read inside lane work derives from the lane like a
         // tracked one, minus the subscription — `untrack` is about
@@ -449,33 +458,33 @@ function supersede(e, n, s) {
         // lanes read by one pass link, as for tracked reads). Outside lane
         // work, the screen.
         if (passLane === null || e.l & CONFIG_CHILDREN_FORBIDDEN) return display(n);
-        enterLane(l, e);
-        if (!s && t & STATUS_PENDING) return NOT_PENDING;
+        enterLane(t, e);
+        if (!s && u & STATUS_PENDING) return NOT_PENDING;
         return laneValueOf(n);
     }
-    if (e.i === EFFECT_RENDER && (passLane === null || !sameLane(passLane, l))) {
+    if (e.i === EFFECT_RENDER && (passLane === null || !sameLane(passLane, t))) {
         if (!s) {
             // A flight whose value has never shown: nothing to show — the leaf
             // waits on it, and its own frame holds (A15, #3334), not the lane's
             // parent. The landing lands the frame: its own pass (the flush
             // joined its transaction) reads the answer it waited on — the lane's
             // staging, revealed at this seam.
-            if (t & STATUS_PENDING && n.T.v === NOT_PENDING) return NOT_PENDING;
-            if (n.se !== NOT_PENDING && e.l & CONFIG_HELD && flushTransaction !== null && resolveTx(flushTransaction) === txOf(e)) return n.se;
+            if (u & STATUS_PENDING && n.T.v === NOT_PENDING) return NOT_PENDING;
+            if (n.ue !== NOT_PENDING && e.l & CONFIG_HELD && flushTransaction !== null && resolveTx(flushTransaction) === txOf(e)) return n.ue;
         }
-        if (l.ln || !s && t & STATUS_PENDING) {
-            if (!s && !l.ke && t & STATUS_UNINITIALIZED) throw new NotReadyError(null);
+        if (t.ln || !s && u & STATUS_PENDING) {
+            if (!s && !t.ke && u & STATUS_UNINITIALIZED) throw new NotReadyError(null);
             // Re-derived at the reveal; once per pass (the pass may also be a stale
             // reader of a transaction, REACTIVE_FRAME_READ — both reruns apply).
                         if (!(e.R & REACTIVE_SCREEN_READ)) {
                 e.R |= REACTIVE_FRAME_READ | REACTIVE_SCREEN_READ;
-                l.En.push(e);
+                t.En.push(e);
             }
             return display(n);
         }
     }
-    enterLane(l, e);
-    if (!s && t & STATUS_PENDING) return NOT_PENDING;
+    enterLane(t, e);
+    if (!s && u & STATUS_PENDING) return NOT_PENDING;
     return laneValueOf(n);
 }
 
@@ -520,7 +529,7 @@ function supersede(e, n, s) {
                 for (let e = 0; e < t.tn.length && lanes.indexOf(t) !== -1; e++) {
             const n = t.tn[e];
             if (n.l & CONFIG_GUESS && n.T.Re === t) {
-                const e = n.se !== NOT_PENDING ? n.se : covered(n);
+                const e = n.ue !== NOT_PENDING ? n.ue : covered(n);
                 supersede(n, e, !n.xe || !n.xe(n.T.v, e));
             }
         }
@@ -546,9 +555,9 @@ function laneSeam(e, n) {
         }
         const t = s.T;
         if (t.Re !== e) continue;
-        if (!(s.l & CONFIG_GUESS) && !s.i && s.se !== NOT_PENDING) {
-            t.v = s.se;
-            s.se = NOT_PENDING;
+        if (!(s.l & CONFIG_GUESS) && !s.i && s.ue !== NOT_PENDING) {
+            t.v = s.ue;
+            s.ue = NOT_PENDING;
         }
         // The frame this pass built is the screen's now; the one it replaced
         // goes (as `commitPendingNode` retires a committed pass's).
@@ -598,10 +607,12 @@ function laneSeam(e, n) {
         // question is the one being asked (`question`: a slice's, a derive's
         // continuation's — the flight's); unstamped writes and mainline are
         // current.
-        if (stale(e, question)) {
-            e.se = n;
+        // A store re-bases a keyed arrangement guess over an older truth, and
+        // folds a current one beneath it (D-34): true.
+        const s = stale(e, question);
+        if (GlobalQueue.an?.(e, n, s) || s) {
+            e.ue = n;
             e.l |= CONFIG_HELD;
-            GlobalQueue.an?.(e, n);
             schedule();
             return n;
         }
@@ -609,7 +620,7 @@ function laneSeam(e, n) {
     } else {
         const s = txOf(e);
         if (e.xe && e.xe(laneValueOf(e), n)) return n;
-        if (s.ke) e.se = n; else e.T.v = n;
+        if (s.ke) e.ue = n; else e.T.v = n;
         if (e.X !== undefined) e.ie = clock;
         insertSubs(e);
         laneDirty(e, s);
@@ -632,7 +643,7 @@ function laneSeam(e, n) {
  * A24). The guess's own question answering supersedes as usual. */ function laneOutcome(e, n, s) {
     if (s) return true;
     if (stale(e, answered(e))) {
-        e.se = n;
+        e.ue = n;
         e.l |= CONFIG_HELD;
         return true;
     }

package/dist/prod/core/owner.js

@@ -6,7 +6,7 @@ import { unobserved, clearDeps } from "./graph.js";
 
 import { deleteFromHeap } from "./heap.js";
 
-import { schedule, dirtyQueue } from "./scheduler.js";
+import { globalQueue, schedule, dirtyQueue } from "./scheduler.js";
 
 // L2 (step 2): the parked frame. A pass parks the previous frame's children
 // and `_disposal` list on `_x._pendingFirstChild` / `_x._pendingDisposal`
@@ -35,17 +35,41 @@ function dispose(e) {
     unobserved(e);
 }
 
-function disposeChildren(e, n = false, t) {
-    const i = e.R;
-    if (i & REACTIVE_DISPOSED) return;
+// The first error a cleanup threw, boxed so a thrown `undefined` still
+// counts. A throwing cleanup stops neither its siblings nor the rest of the
+// tree: every cleanup runs. The error is rethrown once the teardown is over:
+// by a root's dispose call outside a flush (`disposeRootSelf`), otherwise when
+// the flush ends (`flush`; `runCleanup` schedules one), so a flush is never
+// left half-applied. A halt drops it: the error that halted is the one
+// reported, and a stale one must not surface from a later, unrelated dispose.
+let cleanupError;
+
+/** Runs a cleanup or `unobserved` hook; a throw is collected, not raised. @internal */ function runCleanup(e) {
+    try {
+        e();
+    } catch (e) {
+        cleanupError ||= [ e ];
+        schedule();
+    }
+}
+
+/** Rethrows the error `runCleanup` collected, once; `drop` discards it. @internal */ function rethrowCleanupError(e) {
+    const n = cleanupError;
+    cleanupError = undefined;
+    if (n && !e) throw n[0];
+}
+
+function disposeChildren(e, n = false, r) {
+    const t = e.R;
+    if (t & REACTIVE_DISPOSED) return;
     // A parked frame dies with its owner (#3024): the commit that would retire
     // it never comes once the node is DISPOSED, so it drains here or its
     // cleanups never run and it stays subscribed, rerunning in a torn-down
     // tree (#3561). Death only (`self`): a re-pass leaves the frame reacting
     // until the commit.
-        if (n && !t && e.T !== null && (e.T.Ue !== null || e.T.me !== null)) disposeChildren(e, false, true);
+        if (n && !r && e.T !== null && (e.T.Ue !== null || e.T.me !== null)) disposeChildren(e, false, true);
     if (n) {
-        e.R = i | REACTIVE_DISPOSED;
+        e.R = t | REACTIVE_DISPOSED;
     }
     if (n && e.X) {
         if (e.T !== null) e.T.Se = null;
@@ -53,10 +77,10 @@ function disposeChildren(e, n = false, t) {
         // flight's — a transaction's or a lane's (its `_x._transaction`) — or a
         // stale reader's (REACTIVE_FRAME_READ — a frame that derived from one).
         // Nothing else re-examines a dead node, so make sure a seam comes.
-                if (e.m & STATUS_PENDING && e.T?.Re != null || i & REACTIVE_FRAME_READ) schedule();
+                if (e.m & STATUS_PENDING && e.T?.Re != null || t & REACTIVE_FRAME_READ) schedule();
     }
-    let l = t ? e.T.Ue : e.De;
-    if (t) e.T.Ue = null; else e.De = null;
+    let l = r ? e.T.Ue : e.De;
+    if (r) e.T.Ue = null; else e.De = null;
     while (l) {
         const e = l;
         // Owner teardown is death regardless of the child's own lifecycle
@@ -88,34 +112,34 @@ function disposeChildren(e, n = false, t) {
         // would still be holding.
                 l = l.pe;
     }
-    if (!t) e.ye = 0;
+    if (!r) e.ye = 0;
     // O(1) splice out of parent's chain on individual dispose. Skipped during
     // batch dispose (parent already disposed) and for a zombie (it sits on the
     // parent's parked frame, drained whole by the commit). We leave
     // node._nextSibling intact so outer walks that already advanced past us
     // still reach later siblings.
-        if (n && !t && !(i & REACTIVE_ZOMBIE) && e._parent !== null && !(e._parent.R & REACTIVE_DISPOSED)) {
+        if (n && !r && !(t & REACTIVE_ZOMBIE) && e._parent !== null && !(e._parent.R & REACTIVE_DISPOSED)) {
         const n = e.Ze;
-        const t = e.pe;
-        if (n !== null) n.pe = t; else e._parent.De = t;
-        if (t !== null) t.Ze = n;
+        const r = e.pe;
+        if (n !== null) n.pe = r; else e._parent.De = r;
+        if (r !== null) r.Ze = n;
         e.Ze = null;
     }
-    runDisposal(e, t);
+    runDisposal(e, r);
     // Final effect-returned cleanup fires at true disposal, after `_disposal`
     // to mirror rerun ordering (compute-phase teardown first, cleanup last).
         if (n && e.Je) {
         const n = e.Je;
         e.Je = undefined;
-        n();
+        runCleanup(n);
     }
 }
 
 function linkChild(e, n) {
-    const t = e.De;
+    const r = e.De;
     n.Ze = null;
-    n.pe = t;
-    if (t !== null) t.Ze = n;
+    n.pe = r;
+    if (r !== null) r.Ze = n;
     e.De = n;
 }
 
@@ -126,27 +150,26 @@ function runDisposal(e, n) {
     // walk ran every entry a second time. Detached, the re-entrant drain finds
     // nothing. The same shape latched a throwing cleanup: the list survived the
     // throw and every later drain re-ran and re-threw it.
-    const t = n ? e.T.me : e.He;
-    if (!t) return;
+    const r = n ? e.T.me : e.He;
+    if (!r) return;
     if (n) e.T.me = null; else e.He = null;
-    if (Array.isArray(t)) {
+    if (Array.isArray(r)) {
         // Unwind order (#3572, restores 1.x #1562): later registrations run
         // before earlier ones. Children have already been disposed by the caller,
         // so with LIFO a body that registers cleanup before creating its children
         // tears down after them — the same order a per-component owner gives.
-        for (let e = t.length - 1; e >= 0; e--) {
-            const n = t[e];
-            n.call(n);
+        for (let e = r.length - 1; e >= 0; e--) {
+            runCleanup(r[e]);
         }
     } else {
-        t.call(t);
+        runCleanup(r);
     }
 }
 
 function childId(e, n) {
-    let t = e;
-    while (t.l & CONFIG_TRANSPARENT && t._parent) t = t._parent;
-    if (t.id != null) return formatId(t.id, n ? t.ye++ : t.ye);
+    let r = e;
+    while (r.l & CONFIG_TRANSPARENT && r._parent) r = r._parent;
+    if (r.id != null) return formatId(r.id, n ? r.ye++ : r.ye);
     throw new Error("");
 }
 
@@ -163,8 +186,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, n, r) {
+    return e?.id ?? (n ? r?.id : r?.id != null ? getNextChildId(r) : undefined);
 }
 
 /**
@@ -177,8 +200,8 @@ function childId(e, n) {
 }
 
 function formatId(e, n) {
-    const t = n.toString(36), i = t.length - 1;
-    return e + (i ? String.fromCharCode(64 + i) : "") + t;
+    const r = n.toString(36), t = r.length - 1;
+    return e + (t ? String.fromCharCode(64 + t) : "") + r;
 }
 
 /**
@@ -253,6 +276,9 @@ function formatId(e, n) {
 
 function disposeRootSelf(e = true) {
     disposeChildren(this, e);
+    // Outside a flush the dispose call rethrows; inside one, the flush does.
+    // Kept out of `disposeChildren`, whose hot path it slows.
+        if (cleanupError && !globalQueue.q) rethrowCleanupError();
 }
 
 /**
@@ -264,22 +290,22 @@ function disposeRootSelf(e = true) {
  * @internal
  */ function createOwner(e) {
     const n = context;
-    const t = e?.transparent ?? false;
+    const r = e?.transparent ?? false;
     // Prod and observe boilerplates (see core.ts computed()). The observe
     // literal carries the `_name` and `_loc` slots the rendering layer fills
     // with the component label and JSX site (`owner._name = "<App>"`,
     // `owner._loc = "src/App.tsx:3:5"`) — slots, so labelling a root is a
     // plain store rather than a shape fork between labelled and plain roots.
-        const i = {
-        id: inheritId(e, t, n),
-        l: t ? CONFIG_TRANSPARENT : 0,
+        const t = {
+        id: inheritId(e, r, n),
+        l: r ? CONFIG_TRANSPARENT : 0,
         // Present from birth: disposeChildren marks death here on roots too, and
         // a first store of a missing property is a shape transition plus a
         // properties-store allocation per root — on a 100×4 table teardown that
         // was 12 KB and most of disposal's time (2026-10-17).
         R: REACTIVE_NONE,
-        je: true,
-        Ye: n?.je ? n.Ye : n,
+        Qe: true,
+        Ye: n?.Qe ? n.Ye : n,
         De: null,
         pe: null,
         Ze: null,
@@ -290,8 +316,8 @@ function disposeRootSelf(e = true) {
         _parent: n,
         dispose: disposeRootSelf
     };
-    if (n) linkChild(n, i);
-    return i;
+    if (n) linkChild(n, t);
+    return t;
 }
 
 /**
@@ -329,11 +355,11 @@ function disposeRootSelf(e = true) {
  *
  * @description https://v2.solidjs.com/reference/solid-js/advanced/owner-introspection/create-root
  */ function createRoot(e, n) {
-    const t = createOwner(n);
+    const r = createOwner(n);
     // A bound function, not an arrow: an arrow would share this scope, which
     // holds `init`, so keeping `dispose` would keep `init` and all it closes
     // over alive (#4095).
-        return runWithOwner(t, () => e(disposeRootSelf.bind(t, true)));
+        return runWithOwner(r, () => e(disposeRootSelf.bind(r, true)));
 }
 
-export { cleanup, createOwner, createRoot, dispose, disposeChildren, getNextChildId, getObserver, getOwner, inheritId, isDisposed, linkChild, markDisposal, peekNextChildId };
+export { cleanup, createOwner, createRoot, dispose, disposeChildren, getNextChildId, getObserver, getOwner, inheritId, isDisposed, linkChild, markDisposal, peekNextChildId, rethrowCleanupError, runCleanup };