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

package/dist/observe/boundaries.js

@@ -1,4 +1,4 @@
-import { STATUS_PENDING, STATUS_ERROR, CONFIG_REDERIVE, REACTIVE_DISPOSED, STATUS_UNINITIALIZED, CONFIG_HELD, REACTIVE_ZOMBIE, CONFIG_VERDICT, REACTIVE_LANE_READ, CONFIG_OVERRIDE, EFFECT_USER, EFFECT_TRACKED } from "./core/constants.js";
+import { STATUS_PENDING, STATUS_ERROR, CONFIG_REDERIVE, STATUS_UNINITIALIZED, CONFIG_HELD, EFFECT_RENDER, CONFIG_VERDICT, REACTIVE_DISPOSED, REACTIVE_LANE_READ, CONFIG_OVERRIDE, EFFECT_USER, EFFECT_TRACKED, REACTIVE_ZOMBIE, CAUGHT_REARMED } from "./core/constants.js";
 
 import { signal, runWithOwner, computed, read, setSignal, recompute } from "./core/core.js";
 
@@ -12,9 +12,9 @@ import { link } from "./core/graph.js";
 
 import { enqueueSub } from "./core/heap.js";
 
-import { createOwner, getOwner, cleanup } from "./core/owner.js";
+import { createOwner, getOwner, cleanup, dispose } from "./core/owner.js";
 
-import { globalQueue, haltReactivity, passLane, joinFuture, GlobalQueue, flushTransaction, schedule, setPassLane, passTx, resolveTx, txOf } from "./core/scheduler.js";
+import { globalQueue, haltReactivity, passLane, joinFuture, GlobalQueue, flushTransaction, heldUnder, setPassLane, passTx, resolveTx, schedule, txOf, unhold, laneStageHook, installBoundaryHooks } from "./core/scheduler.js";
 
 import { attrHooks } from "./core/attribution-hooks.js";
 
@@ -44,7 +44,7 @@ import { accessor } from "./signals.js";
  * the root holds the frame as for any reader. The tree's own status takes
  * the same route from the output's pass (`read(tree)` throws it).
  *
- * The hold (`blocked`, scheduler.ts) asks `hidden`: a reader behind a
+ * The hold (`blocked`, scheduler.ts) asks `hiddenBy`: a reader behind a
  * fallback — any boundary on its chain whose last pass chose the fallback —
  * is not on screen and holds nothing. An error boundary flipping to its
  * fallback is the same as a loading one resetting: every reader under it
@@ -77,34 +77,38 @@ function setRevealHooks(e) {
 
 /** Boundaries with readers to sweep (or an arm to resolve) at the seam. */ const collecting = new Set;
 
-const boundaryOf = e => e.U[BOUNDARY];
+const boundaryOf = e => e.A[BOUNDARY];
 
 /** Catches what reaches it: an error boundary always; a loading one until it
- * has shown content, or while re-armed. */ const isCollecting = e => e.i === STATUS_ERROR || !e.k || e.L;
+ * has shown content, or while re-armed. */ const isCollecting = e => e.i === STATUS_ERROR || !e.D || e.h;
+
+/** A reader `b` waits on: recorded for its `on`, and `b` visited at the seam. */ function record(e, r) {
+    e.U.add(r);
+    collecting.add(e);
+}
 
 /** The reader goes to the fallback: recorded, and the output re-derives
  * (a no-op while the output's own pass is running — its post-check
- * decides). */ function caught(e, n, r) {
+ * decides). */ function caught(e, r, n) {
     if (e.i === STATUS_ERROR) {
         // An error boundary waits on what THREW (`StatusError.source`), not on
         // the reader that saw it: the reader recovers the moment a refetch
         // starts (its boundary catches the pending), while the error is settled
         // only when its source is neither errored nor in flight. `reset` re-runs
         // the same node.
-        r ??= n.m?.v;
-        n = r?.source ?? n;
-        const t = unwrapStatusError(r);
-        setSignal(e.v, t);
-        reportClientError(t, e.H, n);
+        n ??= r.T?.F;
+        r = n?.source ?? r;
+        const t = unwrapStatusError(n);
+        setSignal(e.F, t);
+        reportClientError(t, e.H, r);
     }
-    e.V.add(n);
-    collecting.add(e);
-    if (e.L) flip(e);
+    record(e, r);
+    if (e.h) flip(e);
     // Already showing the fallback: one more reader to wait on changes
     // nothing on screen. The fallback is instantiated once per show — a later
     // error reaches it through the `error` accessor, which is why it is one.
-        if (!e.P) redraw(e);
-    if (e.B !== null) revealHooks.j(e.B);
+        if (!e.L) redraw(e);
+    if (e.v !== null) revealHooks.P(e.v);
 }
 
 /** A re-armed boundary found something pending: fresh again, and the swap
@@ -112,22 +116,24 @@ const boundaryOf = e => e.U[BOUNDARY];
  * the lane's work from its next pass's head — not a re-pass of the
  * transaction holding its pending content, which would entangle that
  * transaction with the arming frame's (#3540 `on: () => latest(dep)`). */ function flip(e) {
-    e.k = false;
-    e.Z = e.W;
-    if (e.Z !== null && e.K !== null) GlobalQueue.M(e.K, e.Z, true, false);
+    e.D = false;
+    e.V = e.B;
+    const r = e.j;
+    if (!e.V && r.l & CONFIG_HELD && txOf(r) !== flushTransaction) unhold(r);
+    if (e.V !== null && e.j !== null) laneStageHook(e.j, e.V, true, false);
 }
 
 function redraw(e) {
-    if (e.K !== null && !(e.K.R & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE))) {
-        enqueueSub(e.K);
+    if (e.j !== null && !(e.j.R & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE))) {
+        enqueueSub(e.j);
         schedule();
     }
 }
 
-/** GlobalQueue._catch: status from a frame reader, nearest boundary first.
+/** `catchHook` (scheduler.ts): status from a frame reader, nearest boundary first.
  * A loading boundary on the way records a pending reader whether or not it
- * catches it (its `on` may collect it later). */ function catchStatus(e, n, r) {
-    if (n === 0) {
+ * catches it (its `on` may collect it later). */ function catchStatus(e, r, n) {
+    if (r === 0) {
         // A status cleared. Judged by the node's status now, against each
         // boundary's own rule (`unsettled`) — the error path clears pending
         // first and the node is still errored then. The last reader a fallback
@@ -135,34 +141,35 @@ function redraw(e) {
         // held reader's landing has joined its transaction, so the content
         // lands with its run, not a round after). Others still waiting: nothing
         // on screen changes, the fallback stays as it is.
-        if (collecting.size !== 0) for (let n = boundaryOf(e); n !== undefined; n = n._parent ?? undefined) if (!(e.G & unsettled(n)) && n.V.delete(e) && n.V.size === 0) {
-            if (n.P) redraw(n);
-            if (n.B !== null) revealHooks.j(n.B);
+        if (collecting.size !== 0) for (let r = boundaryOf(e); r; r = r._parent) if (!(e.m & unsettled(r)) && r.U.delete(e) && r.U.size === 0) {
+            if (r.L) redraw(r);
+            if (r.v !== null) revealHooks.P(r.v);
         }
         return false;
     }
-    for (let t = boundaryOf(e); t !== undefined; t = t._parent ?? undefined) {
-        if (!(t.i & n)) continue;
+    for (let t = boundaryOf(e); t; t = t._parent) {
+        if (!(t.i & r)) continue;
         if (isCollecting(t)) {
-            caught(t, e, r);
-            return true;
+            caught(t, e, n);
+            return t.h ? CAUGHT_REARMED : true;
         }
-        t.V.add(e);
-        collecting.add(t);
+        record(t, e);
     }
     return false;
 }
 
-/** The nearest boundary on `r`'s chain showing its fallback, if any. */ function hiddenBy(e) {
-    for (let n = boundaryOf(e); n !== undefined; n = n._parent ?? undefined) if (n.P) return n;
-    return undefined;
+/** The nearest loading boundary that would catch `node` was re-armed this
+ * flush. */ function armedOver(e) {
+    for (let r = boundaryOf(e); r; r = r._parent) if (r.i & STATUS_PENDING && isCollecting(r)) return r.h;
 }
 
-/** GlobalQueue._hidden: behind a fallback. */ function hidden(e) {
-    return hiddenBy(e) !== undefined;
+/** The nearest boundary on `r`'s chain showing its fallback, if any
+ * (`hiddenHook`: `r` is behind a fallback). */ function hiddenBy(e) {
+    for (let r = boundaryOf(e); r; r = r._parent) if (r.L) return r;
+    return undefined;
 }
 
-/** GlobalQueue._heldRun: a queued run behind a fallback waits for the reveal
+/** `heldRunHook` (scheduler.ts): a queued run behind a fallback waits for the reveal
  * (maintainer, 2026-10-02: the queue is held, the synchronous first render
  * goes through). A user effect's, which would read a DOM that is not
  * attached ("many depend on reading the DOM, something that can't happen
@@ -173,21 +180,21 @@ function redraw(e) {
  * synchronous on creation and never comes here. The run's `_modified` stays
  * set; the reveal re-queues it by type (`release`), and a boundary above
  * still showing its fallback holds it again then. */ function heldRun(e) {
-    const n = hiddenBy(e);
-    if (n === undefined) return false;
-    (n.Y ??= new Set).add(e);
+    const r = hiddenBy(e);
+    if (r === undefined) return false;
+    (r.Z ??= new Set).add(e);
     return true;
 }
 
 /** The reveal: the runs held behind the fallback are this flush's, each in
  * its own phase — render updates with the frame that attaches the content,
  * user effects after it. */ function release(e) {
-    if (e.Y === null) return;
-    for (const n of e.Y) {
-        const e = n.i;
-        globalQueue.enqueue(e === EFFECT_TRACKED ? EFFECT_USER : e, e === EFFECT_TRACKED ? n.q : n.J ??= GlobalQueue.X.bind(null, n));
+    if (e.Z === null) return;
+    for (const r of e.Z) {
+        const e = r.i;
+        globalQueue.enqueue(e === EFFECT_TRACKED ? EFFECT_USER : e, e === EFFECT_TRACKED ? r.M : r.W ??= GlobalQueue.K.bind(null, r));
     }
-    e.Y = null;
+    e.Z = null;
 }
 
 /** Drop the readers that settled or died. Settled: a loading reader no
@@ -197,70 +204,70 @@ function redraw(e) {
  * it and enters the transaction itself (its committed value shows until the
  * landing). */ const unsettled = e => e.i === STATUS_ERROR ? STATUS_ERROR | STATUS_PENDING : STATUS_PENDING;
 
-function prune(e, n) {
-    const r = unsettled(e);
-    for (const t of e.V) {
-        if (t.R & REACTIVE_DISPOSED) e.V.delete(t); else if (!(t.G & r)) {
-            if (t !== e.$ && (t.u & (CONFIG_HELD | CONFIG_OVERRIDE)) === CONFIG_HELD) {
+function prune(e, r) {
+    const n = unsettled(e);
+    for (const t of e.U) {
+        if (t.R & REACTIVE_DISPOSED) e.U.delete(t); else if (!(t.m & n)) {
+            if ((t !== e.Y || e.h) && (t.l & (CONFIG_HELD | CONFIG_OVERRIDE)) === CONFIG_HELD) {
                 // Landed, held: the content is that transaction's — the output's
                 // pass enters it and the reveal lands with the reader's run. The
                 // seam, past its park decision, waits for the commit instead. (A
-                // lane's reader reveals with the lane, this round.)
-                if (!n) continue;
+                // lane's reader reveals with the lane, this round.) A boundary that
+                // has not shown content catches it instead: the fallback stays until
+                // the reader is committed (#3540: what a fresh boundary catches holds
+                // nothing outside it).
+                if (!r || !e.D) continue;
                 joinFuture(txOf(t));
             }
-            e.V.delete(t);
+            e.U.delete(t);
         }
     }
-    return e.V.size;
+    return e.U.size;
 }
 
 /** Reveal order: a slot is ready when its content can show — it has shown
  * content, or nothing under it is unready (the tree neither pending nor
  * born held, no reader waited on). */ function ready(e) {
-    return e.k || !(e.$.G & STATUS_PENDING) && !(e.$.u & CONFIG_HELD && (e.K === null || e.K.G & STATUS_UNINITIALIZED)) && prune(e, false) === 0;
+    return e.D || !(e.Y.m & STATUS_PENDING) && !(e.Y.l & CONFIG_HELD && (e.j === null || e.j.m & STATUS_UNINITIALIZED)) && prune(e, false) === 0;
 }
 
-/** GlobalQueue._boundarySeam, end of the seam: readers that settled, died,
+/** `boundarySeamHook` (scheduler.ts), end of the seam: readers that settled, died,
  * or landed and committed are dropped; a fallback with none left reveals
  * next round. An arm resolves: nothing collected, nothing happened. */ function boundarySeam() {
     for (const e of collecting) {
-        const n = e.K.R;
-        if (n & REACTIVE_DISPOSED) {
+        const r = e.j.R;
+        if (r & REACTIVE_DISPOSED) {
             collecting.delete(e);
             continue;
         }
         // A parked frame's boundary (zombie) keeps its state for its revival.
-                if (n & REACTIVE_ZOMBIE) continue;
+                if (r & REACTIVE_ZOMBIE) continue;
         prune(e, false);
-        e.L = false;
-        if (e.V.size === 0) {
+        const n = e.j;
+        if (e.h && !e.D && n.l & CONFIG_HELD && [ ...e.U ].every(e => !(e.m & STATUS_PENDING) && e.l & CONFIG_HELD && txOf(e) === txOf(n))) {
+            e.U.clear();
+            e.D = true;
+        }
+        e.h = false;
+        if (e.U.size === 0) {
             collecting.delete(e);
-            if (e.P) redraw(e);
-            if (e.B !== null) revealHooks.j(e.B);
+            if (e.L) redraw(e);
+            if (e.v !== null) revealHooks.P(e.v);
         }
     }
 }
 
-/** The `on` pass is a verdict's: it probed itself (CONFIG_VERDICT), or it
- * read a memo that did (#3528's `createMemo(() => isPending(m2))`) — its
- * swap is display-ahead either way. */ function verdictDerived(e) {
-    if (e.u & CONFIG_VERDICT) return true;
-    for (let n = e._; n !== null; n = n.p) if (n.I.u & CONFIG_VERDICT) return true;
-    return false;
-}
-
 /** `on` changed after the mount: fresh again if anything under it is
  * pending now; collecting for the rest of the flush either way. */ function arm(e) {
-    if (!e.k) {
+    if (!e.D) {
         // Already re-armed and on its fallback, as the frame's work — and the
         // `on` pass arms again as lane work: its verdict was provisional (a
         // memo of `isPending(m2)` is a watcher until the flush parks, then the
         // holder's verdict lane's — verdict.ts), and the swap it asked for is
         // display-ahead after all (#3528). Re-home the swap: the output re-runs
         // as the lane's, shown now beside the held frame.
-        if (e.P && e.Z === null && e.W === null && passLane !== null) {
-            e.W = passLane;
+        if (e.L && e.V === null && e.B === null && passLane !== null) {
+            e.B = passLane;
             // The swap the frame's pass staged (held with the frame) is void: the
             // lane's pass stages it anew (`flip` lists the output in the lane,
             // which voids its staging), as a watcher's provisional value is
@@ -270,20 +277,28 @@ function prune(e, n) {
         }
         return;
     }
-    e.L = true;
-    // A verdict read in `on` (`isPending`) whose frame has no transaction
-    // yet: the swap is still display-ahead — the frame gets one now (it lands
+    e.h = true;
+    // A verdict read in `on` (`isPending`, or a memo of one — #3528's
+    // `createMemo(() => isPending(m2))`: the mark carries, core.ts `read`)
+    // whose frame has no transaction yet: the swap is still display-ahead — the frame gets one now (it lands
     // at this very seam if nothing holds it), and the swap is its verdict
     // lane's work, shown ahead of the frame's own runs (#3528).
-        let n = passLane;
-    if (n === null && globalQueue.ee && verdictDerived(getOwner())) {
+        let r = passLane;
+    if (r === null && globalQueue.q && getOwner().l & CONFIG_VERDICT) {
         joinFuture(null);
-        n = GlobalQueue.ne(flushTransaction);
+        r = GlobalQueue.J(flushTransaction);
     }
-    e.W = n;
+    e.B = r;
     collecting.add(e);
-    for (const n of e.V) {
-        if (n.G & STATUS_PENDING && !(n.R & REACTIVE_DISPOSED)) {
+    const n = e.U.size;
+    heldUnder(e.H, flushTransaction, r => record(e, r));
+    for (const r of e.U) {
+        if (e.U.size !== n || r.m & STATUS_PENDING && !(r.R & REACTIVE_DISPOSED)) {
+            // What it collects was forwarded through it to the boundaries above
+            // too (`catchStatus` records a reader in every boundary on the way).
+            // It is this boundary's alone now (B5, the nearest catcher): an outer
+            // re-armed by the same tick does not wait for it (D-14, U-4).
+            for (let r = e._parent; r !== null; r = r._parent) for (const n of e.U) r.U.delete(n);
             flip(e);
             redraw(e);
             return;
@@ -294,35 +309,36 @@ function prune(e, n) {
 /** The error boundary's `reset`: re-run what threw (a comparator throw
  * names a signal — nothing to re-run). */ function reset(e) {
     // A snapshot: a source failing again is caught — and re-added — mid-walk.
-    for (const n of [ ...e.V ]) if (n.re !== undefined && !(n.R & REACTIVE_DISPOSED)) recompute(n);
+    for (const r of [ ...e.U ]) if (r.X !== undefined && !(r.R & REACTIVE_DISPOSED)) recompute(r);
     schedule();
 }
 
-function createBoundary(e, n, r, t) {
+function createBoundary(e, r, n, t) {
     const o = createOwner();
     const l = {
         i: e,
         _parent: boundaryOf(o) ?? null,
         H: o,
-        $: null,
-        K: null,
-        V: new Set,
-        k: false,
-        L: false,
-        W: null,
-        Z: null,
-        P: false,
         Y: null,
+        j: null,
+        U: new Set,
+        D: false,
+        h: false,
         B: null,
-        te: false,
-        oe: false,
-        v: e === STATUS_ERROR ? signal(undefined, ERROR_SIGNAL) : null,
-        le: r
+        V: null,
+        L: false,
+        Z: null,
+        v: null,
+        $: false,
+        ee: false,
+        F: e === STATUS_ERROR ? signal(undefined, ERROR_SIGNAL) : null,
+        re: n,
+        ne: null
     };
-    const u = e === STATUS_PENDING ? o.U[REVEAL] : null;
+    const u = e === STATUS_PENDING ? o.A[REVEAL] : null;
     if (getOwner()) cleanup(() => {
         collecting.delete(l);
-        if (u) revealHooks.ue(u, l);
+        if (u) revealHooks.te(u, l);
     });
     // The `on` dependencies live OUTSIDE the boundary, as the condition of a
     // `<Show>` wrapping it would: created before the owner's context names it.
@@ -344,42 +360,42 @@ function createBoundary(e, n, r, t) {
                 }
             }
             if (e) arm(l); else e = true;
-        })).u |= CONFIG_REDERIVE;
+        })).l |= CONFIG_REDERIVE;
     }
     const a = {
-        ...o.U,
+        ...o.A,
         [BOUNDARY]: l
     };
     if (revealHooks !== null) a[REVEAL] = null;
-    o.U = a;
+    o.A = a;
     const i = runWithOwner(o, () => {
-        const e = true ? computed(n, {
+        const e = true ? computed(r, {
             name: "children"
-        }) : computed(n);
+        }) : computed(r);
         return true ? computed(() => flatten(read(e)), {
             name: "boundary"
         }) : computed(() => flatten(read(e)));
     });
-    l.$ = i;
+    l.Y = i;
     // A slot of the reveal order in its context (reveal.ts): gated until the
     // controller releases it — before the output's first pass.
-        if (u) revealHooks.ae(u, l);
-    const f = computed(() => {
+        if (u) revealHooks.oe(u, l);
+    const s = computed(() => {
         // Reveal order (reveal.ts): a gated slot shows its fallback — or, in a
         // collapsed tail, nothing — whatever its content's state; the
         // controller is told the pass ran (its readiness may have changed) and
         // releases it in turn.
-        if (l.te) {
+        if (l.$) {
             // Linked without being read: the tree settling (or changing)
             // re-derives this pass, which is how the controller hears of it.
             // It may release this very slot (the frontier whose content just
             // settled): the pass goes on to show it — the redraw it asks for is
             // refused mid-pass and not needed.
             link(i, getOwner());
-            if (l.B !== null) revealHooks.j(l.B);
-            if (l.te) {
-                if (l.oe) {
-                    l.P = true;
+            if (l.v !== null) revealHooks.P(l.v);
+            if (l.$) {
+                if (l.ee) {
+                    l.L = true;
                     return undefined;
                 }
                 return fallback(l);
@@ -392,22 +408,21 @@ function createBoundary(e, n, r, t) {
         // display-ahead `on` causes is the lane's, and must still be the
         // fallback. Linked, so its recovery re-derives this pass; read again
         // once clean.
-                const n = i.G & (STATUS_PENDING | STATUS_ERROR);
-        if (n !== 0) {
+                const r = i.m & (STATUS_PENDING | STATUS_ERROR);
+        if (r !== 0) {
             link(i, getOwner());
-            if (n & e) {
+            if (r & e) {
                 if (isCollecting(l)) {
                     caught(l, i, undefined);
                     return fallback(l);
                 }
                 // Forwarded: a loading boundary showing content keeps it and
                 // holds the frame like any reader (recorded for its `on`).
-                                l.V.add(i);
-                collecting.add(l);
+                                record(l, i);
             }
             // A pending passes an error boundary by (A6); an error, a loading
             // one; a loading boundary showing content forwards its pending.
-                        throw i.m.v;
+                        throw i.T.F;
         }
         if (isCollecting(l)) {
             // A29's boundary exemption (#3540): a boundary MOUNTED over a held
@@ -422,82 +437,111 @@ function createBoundary(e, n, r, t) {
             // which reveals the content — a fallback staged earlier is replaced
             // ahead of the commit and never shown.
             const e = getOwner();
-            if (l.V.size !== 0 && e.G & STATUS_UNINITIALIZED && !(e.u & CONFIG_HELD)) return fallback(l);
+            if (l.U.size !== 0 && e.m & STATUS_UNINITIALIZED && !(e.l & CONFIG_HELD)) return fallback(l);
             // Readers under it still unready: the fallback, the tree untouched.
             // The seam re-derives this pass when they settle.
                         if (prune(l, true) !== 0) return fallback(l);
         }
-        let r;
+        let n;
         try {
-            r = read(i);
-        } catch (n) {
-            if (n instanceof NotReadyError ? e === STATUS_PENDING : e === STATUS_ERROR) {
+            n = read(i);
+        } catch (r) {
+            if (r instanceof NotReadyError ? e === STATUS_PENDING : e === STATUS_ERROR) {
                 if (isCollecting(l)) {
-                    caught(l, i, n);
+                    caught(l, i, r);
                     return fallback(l);
                 }
                 // Forwarded: a loading boundary showing content keeps it and
                 // holds the frame like any reader (recorded for its `on`).
-                                l.V.add(i);
-                collecting.add(l);
+                                record(l, i);
             }
             // A pending passes an error boundary by (A6).
-                        throw n;
+                        throw r;
         }
         // Readers under it still unready (caught before, or while the read
         // ran the content at a mount): the fallback.
-                if (isCollecting(l) && l.V.size !== 0) return fallback(l);
-        l.k = true;
+                if (isCollecting(l) && l.U.size !== 0) return fallback(l);
+        l.D = true;
         // Observe: the fallback stops showing (a hide before its commit means
         // it never displayed — the engine knows the swap it was staged with).
-                if (l.P && l.i & STATUS_PENDING && attrHooks !== null) attrHooks.boundaryFallback(l, l.$, false);
-        l.P = false;
+                if (l.L && l.i & STATUS_PENDING && attrHooks !== null) attrHooks.boundaryFallback(l, l.Y, false);
+        l.L = false;
+        // The fallback dies when the content that replaces it is on screen —
+        // with this flush's commits when the pass is the frame's, at the
+        // landing when the frame parks (the run is held with it, as the old
+        // children of a held pass are) — not now: a held swap keeps the
+        // fallback on screen, live, until it commits. A pass back to the
+        // fallback before then finds it still built and keeps it.
+                const t = l.ne;
+        if (t !== null) globalQueue.enqueue(EFFECT_RENDER, () => {
+            if (!l.L && l.ne === t) {
+                dispose(t);
+                l.ne = null;
+            }
+        });
         release(l);
         // Shown: the slot leaves its reveal order (a later re-arm gates nobody
         // else; the frontier moves on).
-                if (l.B !== null) {
-            const e = l.B;
-            l.B = null;
-            revealHooks.j(e);
+                if (l.v !== null) {
+            const e = l.v;
+            l.v = null;
+            revealHooks.P(e);
         }
-        return r;
+        return n;
     }, 
     // Boundary structure, not a user source: its value is fallback-or-content
     // and legitimately swaps mid-hydration (resume), so it must never be
     // frozen by snapshot capture.
     {
         name: "value",
-        ie: true
+        le: true
     });
-    f.u |= CONFIG_REDERIVE;
-    l.K = f;
-    return accessor(f);
+    s.l |= CONFIG_REDERIVE;
+    l.j = s;
+    return accessor(s);
 }
 
 function fallback(e) {
     // The swap a display-ahead re-arm asked for: this pass is the lane's — a
     // lane read by construction (REACTIVE_LANE_READ: `recompute`'s tail keeps
     // the pass in the lane).
-    if (e.Z !== null) {
-        setPassLane(e.Z);
-        e.K.R |= REACTIVE_LANE_READ;
-        e.Z = null;
+    if (e.V !== null) {
+        setPassLane(e.V);
+        e.j.R |= REACTIVE_LANE_READ;
+        e.V = null;
     }
     // Observe: a loading boundary starts showing its fallback — the swap lands
     // with the frame's transaction, or this drain commits it (lane work, or no
     // transaction). A mount's synchronous first show has no drain of its own:
     // one is scheduled so the engine's display instant (`flushEnd`) comes.
-        if (!e.P && e.i & STATUS_PENDING && attrHooks !== null) {
-        attrHooks.boundaryFallback(e, e.$, true, passLane !== null ? null : flushTransaction !== null ? resolveTx(flushTransaction) : passTx);
-        if (!globalQueue.ee) schedule();
+        if (!e.L && e.i & STATUS_PENDING && attrHooks !== null) {
+        attrHooks.boundaryFallback(e, e.Y, true, passLane !== null ? null : flushTransaction !== null ? resolveTx(flushTransaction) : passTx);
+        if (!globalQueue.q) schedule();
     }
-    e.P = true;
-    return e.le(e);
+    e.L = true;
+    // Built in its own scope, like `Show`'s function child, once per show
+    // (D-39: the fallback is the display until a new answer replaces the
+    // error): a re-derive of the output while it shows — a second reader
+    // caught, the same error propagated again through a sibling's re-run, a
+    // retry pending after `reset()`, a later error — keeps the built
+    // fallback, its DOM and focus with it (#3991). A later error reaches it
+    // through the error accessor; only a fallback reading the accessor at its
+    // top level is rebuilt by it. Created beside the output — in its owner,
+    // outside the boundary, as the output is: its errors and runs are the
+    // enclosing boundary's — with the output's id, so what it builds gets the
+    // ids a build under the output would; disposed once content is on screen.
+        if (e.ne === null) {
+        const r = getOwner();
+        e.ne = runWithOwner(r._parent, () => computed(() => e.re(e), {
+            id: r.id
+        }));
+    }
+    return read(e.ne);
 }
 
 const ERROR_SIGNAL = {
     ownedWrite: true,
-    ie: true
+    le: true
 };
 
 /**
@@ -541,8 +585,8 @@ const ERROR_SIGNAL = {
  *   ) as unknown as JSX.Element;
  * }
  * ```
- */ function createLoadingBoundary(e, n, r) {
-    return createBoundary(STATUS_PENDING, e, () => n(), r?.on);
+ */ function createLoadingBoundary(e, r, n) {
+    return createBoundary(STATUS_PENDING, e, () => r(), n?.on);
 }
 
 /**
@@ -567,20 +611,12 @@ const ERROR_SIGNAL = {
  *   ) as unknown as JSX.Element;
  * }
  * ```
- */ function createErrorBoundary(e, n) {
-    return createBoundary(STATUS_ERROR, e, e => n(accessor(e.v), () => reset(e)));
+ */ function createErrorBoundary(e, r) {
+    return createBoundary(STATUS_ERROR, e, e => r(accessor(e.F), () => reset(e)));
 }
 
 // Installed at module evaluation — present exactly when something imports a
 // boundary. An app without one pays the three null checks and nothing else.
-GlobalQueue.fe = catchStatus;
-
-GlobalQueue.ce = e => e.G & STATUS_UNINITIALIZED && catchStatus(e, STATUS_PENDING);
-
-GlobalQueue.se = hidden;
-
-GlobalQueue.Ee = boundarySeam;
-
-GlobalQueue.de = heldRun;
+installBoundaryHooks(catchStatus, (e, r) => !r && (e.m & STATUS_UNINITIALIZED ? catchStatus(e, STATUS_PENDING) : armedOver(e)), hiddenBy, boundarySeam, heldRun);
 
 export { REVEAL, createErrorBoundary, createLoadingBoundary, prune, ready, redraw, revealHooks, setRevealHooks };