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

package/dist/prod/boundaries.js

@@ -1,4 +1,4 @@
-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 { STATUS_PENDING, STATUS_ERROR, CONFIG_REDERIVE, CONFIG_HELD, CONFIG_FRAME, STATUS_UNINITIALIZED, 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,7 +12,7 @@ import { enqueueSub } from "./core/heap.js";
 
 import { createOwner, getOwner, cleanup, dispose } from "./core/owner.js";
 
-import { globalQueue, haltReactivityAt, haltReactivity, passLane, joinFuture, GlobalQueue, flushTransaction, heldUnder, setPassLane, txOf, unhold, laneStageHook, schedule, installBoundaryHooks } from "./core/scheduler.js";
+import { globalQueue, haltReactivityAt, haltReactivity, schedule, passLane, joinFuture, GlobalQueue, flushTransaction, heldUnder, setPassLane, txOf, unhold, laneStageHook, installBoundaryHooks } from "./core/scheduler.js";
 
 import { flatten } from "./flatten.js";
 
@@ -65,6 +65,9 @@ import { accessor } from "./signals.js";
  * slot of (reveal.ts); a boundary clears it for its content — only direct
  * children are slots. */ const REVEAL = Symbol("");
 
+// Every call site checks the hooks themselves first (not only the slot or
+// controller, which are never set without them): a build that does not
+// import `createRevealOrder` folds the reveal-order arms away.
 let revealHooks = null;
 
 function setRevealHooks(e) {
@@ -78,33 +81,33 @@ 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.D || e.h;
 
-/** A reader `b` waits on: recorded for its `on`, and `b` visited at the seam. */ function record(e, n) {
-    e.U.add(n);
+/** A reader `b` waits on: recorded for its `on`, and `b` visited at the seam. */ function record(e, r) {
+    e.F.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.T?.F;
-        n = r?.source ?? n;
-        const t = unwrapStatusError(r);
-        setSignal(e.F, t);
-        reportClientError(t, e.L, n);
+        n ??= r.T?.U;
+        r = n?.source ?? r;
+        const o = unwrapStatusError(n);
+        setSignal(e.U, o);
+        reportClientError(o, e.H, r);
     }
-    record(e, n);
+    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.H) redraw(e);
-    if (e.V !== null) revealHooks.P(e.V);
+        if (!e.L) redraw(e);
+    if (revealHooks && e.v !== null) revealHooks.V(e.v);
 }
 
 /** A re-armed boundary found something pending: fresh again, and the swap
@@ -113,10 +116,10 @@ const boundaryOf = e => e.A[BOUNDARY];
  * transaction holding its pending content, which would entangle that
  * transaction with the arming frame's (#3540 `on: () => latest(dep)`). */ function flip(e) {
     e.D = false;
-    e.v = e.B;
-    const n = e.j;
-    if (!e.v && n.l & CONFIG_HELD && txOf(n) !== flushTransaction) unhold(n);
-    if (e.v !== null && e.j !== null) laneStageHook(e.j, e.v, true, false);
+    e.P = e.B;
+    const r = e.j;
+    if (!e.P && r.l & CONFIG_HELD && txOf(r) !== flushTransaction) unhold(r);
+    if (laneStageHook && e.P !== null && e.j !== null) laneStageHook(e.j, e.P, true, false);
 }
 
 function redraw(e) {
@@ -128,8 +131,8 @@ function redraw(e) {
 
 /** `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
@@ -137,31 +140,31 @@ 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; n = n._parent) if (!(e.m & unsettled(n)) && n.U.delete(e) && n.U.size === 0) {
-            if (n.H) redraw(n);
-            if (n.V !== null) revealHooks.P(n.V);
+        if (collecting.size !== 0) for (let r = boundaryOf(e); r; r = r._parent) if (!(e.m & unsettled(r)) && r.F.delete(e) && r.F.size === 0) {
+            if (r.L) redraw(r);
+            if (revealHooks && r.v !== null) revealHooks.V(r.v);
         }
         return false;
     }
-    for (let t = boundaryOf(e); t; t = t._parent) {
-        if (!(t.i & n)) continue;
-        if (isCollecting(t)) {
-            caught(t, e, r);
-            return t.h ? CAUGHT_REARMED : true;
+    for (let o = boundaryOf(e); o; o = o._parent) {
+        if (!(o.i & r)) continue;
+        if (isCollecting(o)) {
+            caught(o, e, n);
+            return o.h ? CAUGHT_REARMED : true;
         }
-        record(t, e);
+        record(o, e);
     }
     return false;
 }
 
 /** The nearest loading boundary that would catch `node` was re-armed this
  * flush. */ function armedOver(e) {
-    for (let n = boundaryOf(e); n; n = n._parent) if (n.i & STATUS_PENDING && isCollecting(n)) return n.h;
+    for (let r = boundaryOf(e); r; r = r._parent) if (r.i & STATUS_PENDING && isCollecting(r)) return r.h;
 }
 
 /** The nearest boundary on `r`'s chain showing its fallback, if any
  * (`hiddenHook`: `r` is behind a fallback). */ function hiddenBy(e) {
-    for (let n = boundaryOf(e); n; n = n._parent) if (n.H) return n;
+    for (let r = boundaryOf(e); r; r = r._parent) if (r.L) return r;
     return undefined;
 }
 
@@ -176,21 +179,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.Z ??= new Set).add(e);
+    const r = hiddenBy(e);
+    if (r === undefined) return false;
+    (r.M ??= 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.Z === null) return;
-    for (const n of e.Z) {
-        const e = n.i;
-        globalQueue.enqueue(e === EFFECT_TRACKED ? EFFECT_USER : e, e === EFFECT_TRACKED ? n.M : n.W ??= GlobalQueue.K.bind(null, n));
+    if (e.M === null) return;
+    for (const r of e.M) {
+        const e = r.i;
+        globalQueue.enqueue(e === EFFECT_TRACKED ? EFFECT_USER : e, e === EFFECT_TRACKED ? r.Z : r.W ??= GlobalQueue.K.bind(null, r));
     }
-    e.Z = null;
+    e.M = null;
 }
 
 /** Drop the readers that settled or died. Settled: a loading reader no
@@ -200,11 +203,11 @@ 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.U) {
-        if (t.R & REACTIVE_DISPOSED) e.U.delete(t); else if (!(t.m & r)) {
-            if ((t !== e.Y || e.h) && (t.l & (CONFIG_HELD | CONFIG_OVERRIDE)) === CONFIG_HELD) {
+function prune(e, r) {
+    const n = unsettled(e);
+    for (const o of e.F) {
+        if (o.R & REACTIVE_DISPOSED) e.F.delete(o); else if (!(o.m & n)) {
+            if ((o !== e.Y || e.h) && (o.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
@@ -212,13 +215,13 @@ function prune(e, n) {
                 // 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 (!n || !e.D) continue;
-                joinFuture(txOf(t));
+                if (!r || !e.D) continue;
+                joinFuture(txOf(o));
             }
-            e.U.delete(t);
+            e.F.delete(o);
         }
     }
-    return e.U.size;
+    return e.F.size;
 }
 
 /** Reveal order: a slot is ready when its content can show — it has shown
@@ -231,24 +234,24 @@ function prune(e, n) {
  * 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.j.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);
-        const r = e.j;
-        if (e.h && !e.D && r.l & CONFIG_HELD && [ ...e.U ].every(e => !(e.m & STATUS_PENDING) && e.l & CONFIG_HELD && txOf(e) === txOf(r))) {
-            e.U.clear();
+        const n = e.j;
+        if (e.h && !e.D && n.l & CONFIG_HELD && [ ...e.F ].every(e => !(e.m & STATUS_PENDING) && e.l & CONFIG_HELD && txOf(e) === txOf(n))) {
+            e.F.clear();
             e.D = true;
         }
         e.h = false;
-        if (e.U.size === 0) {
+        if (e.F.size === 0) {
             collecting.delete(e);
-            if (e.H) redraw(e);
-            if (e.V !== null) revealHooks.P(e.V);
+            if (e.L) redraw(e);
+            if (revealHooks && e.v !== null) revealHooks.V(e.v);
         }
     }
 }
@@ -262,7 +265,7 @@ function prune(e, n) {
         // 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.H && e.v === null && e.B === null && passLane !== null) {
+        if (e.L && e.P === 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,
@@ -274,27 +277,29 @@ function prune(e, n) {
         return;
     }
     e.h = true;
+    // The swap is the change's work: the output joins it (D-13, #3540).
+        e.j.l &= ~CONFIG_FRAME;
     // 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.q && getOwner().l & CONFIG_VERDICT) {
+        let r = passLane;
+    if (r === null && globalQueue.q && getOwner().l & CONFIG_VERDICT) {
         joinFuture(null);
-        n = GlobalQueue.J(flushTransaction);
+        r = GlobalQueue.J(flushTransaction);
     }
-    e.B = n;
+    e.B = r;
     collecting.add(e);
-    const r = e.U.size;
-    heldUnder(e.L, flushTransaction, n => record(e, n));
-    for (const n of e.U) {
-        if (e.U.size !== r || n.m & STATUS_PENDING && !(n.R & REACTIVE_DISPOSED)) {
+    const n = e.F.size;
+    heldUnder(e.H, flushTransaction, r => record(e, r));
+    for (const r of e.F) {
+        if (e.F.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 n = e._parent; n !== null; n = n._parent) for (const r of e.U) n.U.delete(r);
+            for (let r = e._parent; r !== null; r = r._parent) for (const n of e.F) r.F.delete(n);
             flip(e);
             redraw(e);
             return;
@@ -305,47 +310,47 @@ 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.U ]) if (n.X !== undefined && !(n.R & REACTIVE_DISPOSED)) recompute(n);
+    for (const r of [ ...e.F ]) if (r.X !== undefined && !(r.R & REACTIVE_DISPOSED)) recompute(r);
     schedule();
 }
 
-function createBoundary(e, n, r, t) {
-    const o = createOwner();
+function createBoundary(e, r, n, o) {
+    const t = createOwner();
     const l = {
         i: e,
-        _parent: boundaryOf(o) ?? null,
-        L: o,
+        _parent: boundaryOf(t) ?? null,
+        H: t,
         Y: null,
         j: null,
-        U: new Set,
+        F: new Set,
         D: false,
         h: false,
         B: null,
+        P: null,
+        L: false,
+        M: null,
         v: null,
-        H: false,
-        Z: null,
-        V: null,
         $: false,
         ee: false,
-        F: e === STATUS_ERROR ? signal(undefined, ERROR_SIGNAL) : null,
-        ne: r,
-        re: null
+        U: e === STATUS_ERROR ? signal(undefined, ERROR_SIGNAL) : null,
+        re: n,
+        ne: null
     };
-    const u = e === STATUS_PENDING ? o.A[REVEAL] : null;
+    const u = e === STATUS_PENDING ? t.A[REVEAL] : null;
     if (getOwner()) cleanup(() => {
         collecting.delete(l);
-        if (u) revealHooks.te(u, l);
+        if (revealHooks && u) revealHooks.oe(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.
     // A source of it going pending re-runs it (CONFIG_REDERIVE) rather than
     // marking it: the pass catches the NotReady — it is a notification, it
     // does not suspend the parent — and re-arms.
-        if (t) {
+        if (o) {
         let e = false;
-        runWithOwner(o, () => computed(() => {
+        runWithOwner(t, () => computed(() => {
             try {
-                t();
+                o();
             } catch (e) {
                 if (!(e instanceof NotReadyError)) {
                     if (!globalQueue.notify(getOwner(), STATUS_ERROR, STATUS_ERROR, e)) {
@@ -359,15 +364,15 @@ function createBoundary(e, n, r, t) {
         })).l |= CONFIG_REDERIVE;
     }
     const a = {
-        ...o.A,
+        ...t.A,
         [BOUNDARY]: l
     };
     if (revealHooks !== null) a[REVEAL] = null;
-    o.A = a;
-    const i = runWithOwner(o, () => {
-        const e = false ? computed(n, {
+    t.A = a;
+    const i = runWithOwner(t, () => {
+        const e = false ? computed(r, {
             name: "children"
-        }) : computed(n);
+        }) : computed(r);
         return false ? computed(() => flatten(read(e)), {
             name: "boundary"
         }) : computed(() => flatten(read(e)));
@@ -375,23 +380,30 @@ function createBoundary(e, n, r, t) {
     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.oe(u, l);
+        if (revealHooks && u) revealHooks.te(u, l);
     const f = computed(() => {
+        // Structure, not a derivation of its content (CONFIG_FRAME, #4283): it
+        // reads a hold it is not part of as the screen, as the render effect
+        // flattening the same children without a boundary would. Not while a
+        // re-arm's swap is the change's work (`arm`), until that swap commits
+        // (D-13, #3540).
+        const r = getOwner();
+        if (!l.h && !(r.l & CONFIG_HELD)) r.l |= CONFIG_FRAME;
         // 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.$) {
+                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.V !== null) revealHooks.P(l.V);
+            link(i, r);
+            if (revealHooks && l.v !== null) revealHooks.V(l.v);
             if (l.$) {
                 if (l.ee) {
-                    l.H = true;
+                    l.L = true;
                     return undefined;
                 }
                 return fallback(l);
@@ -406,7 +418,7 @@ function createBoundary(e, n, r, t) {
         // once clean.
                 const n = i.m & (STATUS_PENDING | STATUS_ERROR);
         if (n !== 0) {
-            link(i, getOwner());
+            link(i, r);
             if (n & e) {
                 if (isCollecting(l)) {
                     caught(l, i, undefined);
@@ -418,7 +430,7 @@ function createBoundary(e, n, r, t) {
             }
             // A pending passes an error boundary by (A6); an error, a loading
             // one; a loading boundary showing content forwards its pending.
-                        throw i.T.F;
+                        throw i.T.U;
         }
         if (isCollecting(l)) {
             // A29's boundary exemption (#3540): a boundary MOUNTED over a held
@@ -432,19 +444,18 @@ function createBoundary(e, n, r, t) {
             // enters: the outside sees its committed value until the landing,
             // which reveals the content — a fallback staged earlier is replaced
             // ahead of the commit and never shown.
-            const e = getOwner();
-            if (l.U.size !== 0 && e.m & STATUS_UNINITIALIZED && !(e.l & CONFIG_HELD)) return fallback(l);
+            if (l.F.size !== 0 && r.m & STATUS_UNINITIALIZED && !(r.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 o;
         try {
-            r = read(i);
-        } catch (n) {
-            if (n instanceof NotReadyError ? e === STATUS_PENDING : e === STATUS_ERROR) {
+            o = 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
@@ -452,43 +463,53 @@ function createBoundary(e, n, r, t) {
                                 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.U.size !== 0) return fallback(l);
+                if (isCollecting(l) && l.F.size !== 0) return fallback(l);
         l.D = true;
-        l.H = 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.re;
-        if (t !== null) globalQueue.enqueue(EFFECT_RENDER, () => {
-            if (!l.H && l.re === t) {
+        // fallback before then finds it still built and keeps it. A fallback
+        // the screen does not show (a swap staged with a held frame, replaced
+        // before it commits) dies now: what it reads holds nothing (S-22 row
+        // 3′, #4268).
+                const t = l.ne;
+        const drop = () => {
+            if (!l.L && l.ne === t) {
+                // A fallback that threw (a rethrow the boundary does not
+                // handle) is what an enclosing boundary waits on: it died, and
+                // the seam of another round drops it there (#4270).
+                if (t.m & STATUS_ERROR) schedule();
                 dispose(t);
-                l.re = null;
+                l.ne = null;
             }
-        });
+        };
+        if (t !== null) l.j.le !== t.le ? drop() : globalQueue.enqueue(EFFECT_RENDER, drop);
         release(l);
         // Shown: the slot leaves its reveal order (a later re-arm gates nobody
         // else; the frontier moves on).
-                if (l.V !== null) {
-            const e = l.V;
-            l.V = null;
-            revealHooks.P(e);
+                if (revealHooks && l.v !== null) {
+            const e = l.v;
+            l.v = null;
+            revealHooks.V(e);
         }
-        return r;
+        return o;
     }, 
     // 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.
     {
-        le: true
+        ue: true
     });
     f.l |= CONFIG_REDERIVE;
+    // The tree is structure too (the output's pass marks the output).
+        i.l |= CONFIG_FRAME;
     l.j = f;
     return accessor(f);
 }
@@ -497,12 +518,12 @@ 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.v !== null) {
-        setPassLane(e.v);
+    if (e.P !== null) {
+        setPassLane(e.P);
         e.j.R |= REACTIVE_LANE_READ;
-        e.v = null;
+        e.P = null;
     }
-    e.H = true;
+    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
@@ -514,18 +535,18 @@ function fallback(e) {
     // 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.re === null) {
-        const n = getOwner();
-        e.re = runWithOwner(n._parent, () => computed(() => e.ne(e), {
-            id: n.id
+        if (e.ne === null) {
+        const r = getOwner();
+        e.ne = runWithOwner(r._parent, () => computed(() => e.re(e), {
+            id: r.id
         }));
     }
-    return read(e.re);
+    return read(e.ne);
 }
 
 const ERROR_SIGNAL = {
     ownedWrite: true,
-    le: true
+    ue: true
 };
 
 /**
@@ -569,8 +590,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);
 }
 
 /**
@@ -595,12 +616,12 @@ const ERROR_SIGNAL = {
  *   ) as unknown as JSX.Element;
  * }
  * ```
- */ function createErrorBoundary(e, n) {
-    return createBoundary(STATUS_ERROR, e, e => n(accessor(e.F), () => reset(e)));
+ */ function createErrorBoundary(e, r) {
+    return createBoundary(STATUS_ERROR, e, e => r(accessor(e.U), () => 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.
-installBoundaryHooks(catchStatus, (e, n) => !n && (e.m & STATUS_UNINITIALIZED ? catchStatus(e, STATUS_PENDING) : armedOver(e)), hiddenBy, boundarySeam, 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 };

package/dist/prod/core/action.js

@@ -66,6 +66,14 @@ import { joinFuture, newTransaction, enterAction, exitAction, resolveTx, schedul
  * yield until(() => todos.some(t => t.id === saved.id));
  * ```
  *
+ * The same holds inside an async helper the action yields
+ * (`yield (async () => { ... })()`): everything after its first `await` runs
+ * outside the transaction. An `await refresh(x)` or `await until(...)` there
+ * waits for this action's commit, which waits on the helper, so it hangs
+ * whenever `x` re-ran during the action (#4263) and works otherwise. Call
+ * `refresh(x)` in the generator once the helper returns; `yield` it only when
+ * the action needs the fresh value.
+ *
  * (For the same reason, don't call `flush()` inside an action body — it
  * cannot reveal the held writes and is refused.)
  *