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

package/dist/observe/core/lanes.js

@@ -461,12 +461,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
@@ -475,33 +484,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 (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.It && t & STATUS_UNINITIALIZED) throw new NotReadyError(null);
+        if (t.ln || !s && u & STATUS_PENDING) {
+            if (!s && !t.It && 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);
 }
 
@@ -626,10 +635,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)) {
+        // 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;
         }

package/dist/observe/core/owner.js

@@ -8,7 +8,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`
@@ -37,17 +37,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.Nt !== null || e.T.ft !== null)) disposeChildren(e, false, true);
+        if (n && !r && e.T !== null && (e.T.Nt !== null || e.T.ft !== null)) disposeChildren(e, false, true);
     if (n) {
-        e.R = i | REACTIVE_DISPOSED;
+        e.R = t | REACTIVE_DISPOSED;
         if (e._parent === null && e.Pt) unregisterRoot(e);
     }
     if (n && e.X) {
@@ -56,12 +80,12 @@ 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?.Je != null || i & REACTIVE_FRAME_READ) schedule();
+                if (e.m & STATUS_PENDING && e.T?.Je != null || t & REACTIVE_FRAME_READ) schedule();
     }
-    let r = t ? e.T.Nt : e.ze;
-    if (t) e.T.Nt = null; else e.ze = null;
-    while (r) {
-        const e = r;
+    let l = r ? e.T.Nt : e.ze;
+    if (r) e.T.Nt = null; else e.ze = null;
+    while (l) {
+        const e = l;
         // 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.
@@ -83,42 +107,42 @@ function disposeChildren(e, n = false, t) {
         // on the fresh head and survives. Pointing each drained child's prev at
         // itself routes its later splice onto the detached chain, never the head,
         // and keeps the dev owner-chain-head invariant honest for those children.
-                r.Ct = r;
-        disposeChildren(r, true);
+                l.Ct = l;
+        disposeChildren(l, true);
         // Read after, not before: a sibling this disposal made dormant spliced
         // itself out of the detached chain, and a cleanup may then have linked
         // it at the fresh head, which rewrote the `_nextSibling` a pre-read
         // would still be holding.
-                r = r.Xe;
+                l = l.Xe;
     }
-    if (!t) e.ct = 0;
+    if (!r) e.ct = 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.Ct;
-        const t = e.Xe;
-        if (n !== null) n.Xe = t; else e._parent.ze = t;
-        if (t !== null) t.Ct = n;
+        const r = e.Xe;
+        if (n !== null) n.Xe = r; else e._parent.ze = r;
+        if (r !== null) r.Ct = n;
         e.Ct = 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.kt) {
         const n = e.kt;
         e.kt = undefined;
-        n();
+        runCleanup(n);
     }
 }
 
 function linkChild(e, n) {
-    const t = e.ze;
+    const r = e.ze;
     n.Ct = null;
-    n.Xe = t;
-    if (t !== null) t.Ct = n;
+    n.Xe = r;
+    if (r !== null) r.Ct = n;
     e.ze = n;
 }
 
@@ -129,27 +153,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.ft : e.rt;
-    if (!t) return;
+    const r = n ? e.T.ft : e.rt;
+    if (!r) return;
     if (n) e.T.ft = null; else e.rt = 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.ct++ : t.ct);
+    let r = e;
+    while (r.l & CONFIG_TRANSPARENT && r._parent) r = r._parent;
+    if (r.id != null) return formatId(r.id, n ? r.ct++ : r.ct);
     throw new Error("");
 }
 
@@ -166,8 +189,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);
 }
 
 /**
@@ -180,8 +203,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;
 }
 
 /**
@@ -256,6 +279,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();
 }
 
 /**
@@ -267,15 +293,15 @@ 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
@@ -295,8 +321,8 @@ function disposeRootSelf(e = true) {
         _name: undefined,
         _loc: undefined
     };
-    if (n) linkChild(n, i); else registerRoot(i);
-    return i;
+    if (n) linkChild(n, t); else registerRoot(t);
+    return t;
 }
 
 /**
@@ -334,11 +360,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 };