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

package/dist/observe/core/async.js

@@ -14,7 +14,7 @@ import { enqueueSub } from "./heap.js";
 
 import { cleanup } from "./owner.js";
 
-import { question, MAINLINE_QUESTION, passLane, joinFuture, clock, schedule, flush, liveTx, holdNode, globalQueue, txOf, GlobalQueue, queuePendingNode } from "./scheduler.js";
+import { question, MAINLINE_QUESTION, passLane, joinFuture, clock, schedule, flush, globalQueue, txOf, GlobalQueue, queuePendingNode } from "./scheduler.js";
 
 // The lazily-created Set is the ONE container for pending sources. Its
 // predecessor — a singular slot promoted to a Set on the second source —
@@ -46,7 +46,7 @@ function clearPendingSources(e) {
 // (pending sources propagate the origin node, so this covers any depth).
 // Also guards branch-local recovery: another dependency may still need the source.
 function retryReaches(e, t) {
-    for (let n = e._; n; n = n.p) {
+    for (let n = e.G; n; n = n._) {
         const e = n.I;
         if (e === t || e.m?.Se?.has(t)) return true;
     }
@@ -60,32 +60,32 @@ function retryReaches(e, t) {
  * with NO read-visible pending status and no downstream propagation. Commit
  * #0 keeps serving.
  */ function parkLoadingWindow(e, t) {
-    ext(e).Ie = true;
+    ext(e).de = true;
     if (t.source) addPendingSource(e, t.source);
     // A settled error is the node's answer ("the error stays the answer until
     // this retry can actually run") — the park must not replace it: reads
     // throw `_error` while STATUS_ERROR is set, and overwriting it here leaks
     // a pending-class NotReadyError from a read-invisible park (#2989).
-        if (!(e.G & STATUS_ERROR)) setPendingError(e, t.source, t);
+        if (!(e.S & STATUS_ERROR)) setPendingError(e, t.source, t);
 }
 
 function setPendingError(e, t, n) {
     if (!t) {
-        if (e.m !== null) e.m.v = null;
+        if (e.m !== null) e.m.F = null;
         return;
     }
     if (n instanceof NotReadyError && n.source === t) {
-        ext(e).v = n;
+        ext(e).F = n;
         return;
     }
-    const r = e.m?.v;
+    const r = e.m?.F;
     if (!(r instanceof NotReadyError) || r.source !== t) {
-        ext(e).v = new NotReadyError(t);
+        ext(e).F = new NotReadyError(t);
     }
 }
 
 function forEachDependent(e, t) {
-    for (let n = e.t; n !== null; n = n.l) t(n.o, n);
+    for (let n = e.t; n !== null; n = n.o) t(n.l, n);
 }
 
 // Queue a node to re-run on the next flush (used both when a pending source
@@ -99,7 +99,7 @@ function forEachDependent(e, t) {
 // callbacks handle their own release (settleAutodispose in handleAsync); this
 // covers derivatively-pending dependents, which have no callbacks of their own.
 function releaseIfSettledUnobserved(e) {
-    e.re && e.u & CONFIG_AUTO_DISPOSE && !e.t && !(e.R & REACTIVE_ZOMBIE) && !(e.G & STATUS_PENDING) && unobserved(e);
+    e.ee && e.i & CONFIG_AUTO_DISPOSE && !e.t && !(e.R & REACTIVE_ZOMBIE) && !(e.S & STATUS_PENDING) && unobserved(e);
 }
 
 // Error-path sweep: notifyStatus(STATUS_ERROR) clears dependents' pending
@@ -112,7 +112,7 @@ function releaseSettledDependents(e) {
     const visit = e => {
         if (n.has(e)) return;
         n.add(e);
-        if (!e.t && e.u & CONFIG_AUTO_DISPOSE) (t ??= []).push(e);
+        if (!e.t && e.i & CONFIG_AUTO_DISPOSE) (t ??= []).push(e);
         forEachDependent(e, visit);
     };
     forEachDependent(e, visit);
@@ -140,7 +140,7 @@ function settleErroredDependents(e, t) {
     const visit = e => {
         if (r.has(e)) return;
         r.add(e);
-        if (e.m?.v === t) {
+        if (e.m?.F === t) {
             enqueueSub(e);
             n = true;
         }
@@ -175,35 +175,35 @@ function settlePendingSource(e, t = e) {
         // when the source went pending, `propagateStatus`), and a landing
         // equal to the committed value notifies nobody — the source settling
         // is its verdict changing: it runs again.
-        return f.u & CONFIG_VERDICT && enqueueSub(f);
+        return f.i & CONFIG_VERDICT && enqueueSub(f);
         o.add(f);
-        f.Ne = clock;
+        f.Ie = clock;
         const u = f.m?.Se?.values().next().value;
         // STATUS_ERROR + pending sources only coexist via an errored loading
         // window's park (notifyStatus(STATUS_ERROR) clears pending sources
         // otherwise): the settled error stays the answer through the settle —
         // nulling it here would have reads throw `null` until the re-enqueued
         // retry lands, or lose it entirely if that retry parks again (#2989).
-                const i = f.G & STATUS_ERROR;
+                const s = f.S & STATUS_ERROR;
         if (u) {
-            if (!i) setPendingError(f, u);
+            if (!s) setPendingError(f, u);
         } else {
-            f.G &= ~STATUS_PENDING;
-            if (!i) setPendingError(f);
+            f.S &= ~STATUS_PENDING;
+            if (!s) setPendingError(f);
             // L2: a landing resumes the transaction waiting on it (maintainer: "it
             // resumes the sync frame") — a held reader's re-pass over the landed
             // value is that transaction's work, and the flush that carries it
             // parks into it.
-                        if (f.u & CONFIG_HELD) joinFuture(txOf(f));
-            if (f.m?.Ie) {
+                        if (f.i & CONFIG_HELD) joinFuture(txOf(f));
+            if (f.m?.de) {
                 enqueueSub(f);
                 n = true;
             }
-            if (f.m !== null) f.m.Ie = false;
+            if (f.m !== null) f.m.de = false;
             // Fully settled with nobody watching: release candidate (#2934). Checked
             // again at release time — deferred so unobserved() can't unlink subs
             // lists this walk is still iterating.
-                        if (!f.t && f.u & CONFIG_AUTO_DISPOSE) (r ??= []).push(f);
+                        if (!f.t && f.i & CONFIG_AUTO_DISPOSE) (r ??= []).push(f);
         }
         forEachDependent(f, settle);
     };
@@ -220,9 +220,9 @@ function isThenable(e) {
 }
 
 /** Fire and clear a node's iterator-flight cancellation hook (#3122). */ function releaseFlightTeardown(e) {
-    const t = e.m?.Te;
+    const t = e.m?.Ne;
     if (t != null) {
-        e.m.Te = null;
+        e.m.Ne = null;
         t();
     }
 }
@@ -242,9 +242,9 @@ r) {
         });
     }
     if (!f && !o) {
-        if (e.m !== null) e.m.De = null;
+        if (e.m !== null) e.m.Te = null;
         // A sync landing is the first real answer for a loadingValue node.
-                e._e = false;
+                e.De = false;
         return t;
     }
     // Flight replacement relies on recompute's supersede release for iterator
@@ -252,10 +252,10 @@ r) {
     // self-registration — runs during a recompute of `el`, which has already
     // fired _flightTeardown. A future non-recompute registration path must
     // release it here before overwriting _inFlight.
-        ext(e).De = t;
+        ext(e).Te = t;
     // The question this flight answers (A18 provenance, lanes.ts): the action
     // whose slice asked it; mainline is always the current question.
-        e.m.Oe = question || MAINLINE_QUESTION;
+        e.m._e = question || MAINLINE_QUESTION;
     // The run that asked this flight read every input without throwing: an
     // input still in flight was masked for it (an active override, A17), so
     // pending state those inputs propagated onto the node earlier does not
@@ -271,17 +271,17 @@ r) {
         if (attrHooks !== null) attrHooks.flightStart(e, t);
     let u;
     const handleError = n => {
-        if (e.m?.De !== t) return;
+        if (e.m?.Te !== t) return;
         // NotReadyError from rejected promises should be treated as pending, not error
                 let o = n instanceof NotReadyError;
-        if (o && e._e) {
+        if (o && e.De) {
             // Loading window: the flight died waiting on an unready source. Keep
             // serving commit #0 — same parking as recompute's catch for sync
             // dependency throws. The dead flight is released so the clock-gated
             // error-retry pull (updateIfNecessary) can also re-ask.
-            if (e.m !== null) e.m.De = null;
+            if (e.m !== null) e.m.Te = null;
             parkLoadingWindow(e, n);
-            e.Ne = clock;
+            e.Ie = clock;
             return;
         }
         notifyStatus(e, o ? STATUS_PENDING : STATUS_ERROR, n);
@@ -289,7 +289,7 @@ r) {
         // rejected flight will never settle its self entry, so transfer ownership
         // after notifyStatus has propagated the replacement source.
                 if (o) settlePendingSource(e);
-        e.Ne = clock;
+        e.Ie = clock;
         // A real error settles derivatively-pending dependents (notifyStatus
         // cleared their pending sources), so stranded lazy ones release here —
         // the error twin of settlePendingSource's release (#2934).
@@ -297,12 +297,12 @@ r) {
         r?.(n, o);
     };
     const asyncWrite = (r, o) => {
-        if (e.m?.De !== t) return;
+        if (e.m?.Te !== t) return;
         // If the node was dirtied by a newer write (optimistic override or regular),
         // skip this stale async result — the upcoming flush will recompute the node
         // with the new value, creating a fresh Promise that supersedes this one.
                 if (e.R & REACTIVE_DIRTY) return;
-        const f = !!(e.G & STATUS_UNINITIALIZED);
+        const f = !!(e.S & STATUS_UNINITIALIZED);
         landStatus(e);
         // Attribution hook: lets the engine snapshot state before the landing
         // branches, so it can tell whether the plain path's setSignal committed a
@@ -316,14 +316,21 @@ r) {
                 return;
             }
             if (f) landStatus(e, true);
+            // Attribution hook: this path landed through the setter (derived
+            // stores, projections), which does not go through setSignal, so the
+            // plain branch's asyncEnd never ran and the flight stayed open — the
+            // next flight counted a committed answer as abandoned (#3947).
+            // direct=true: asyncEnd finalizes either way and stamps an async write
+            // only if the commit moved `_value`/`_time` or parked `_pendingValue`.
+            // A store setter does not move this node's `_value`, so no stamp is
+            // recorded and waterfall chaining through derived stores stays
+            // unmeasured. Outside the try (#2883 — see attribution-hooks.ts).
+                        if (attrHooks !== null) attrHooks.asyncEnd(e, undefined, r, true);
         } else {
             // CARVE 2: the override-covered landing (hold + A18 supersession) and the
             // lane-routed landing (derived override, lane effect queue) went with
-            // the optimistic engine; every landing is the plain setSignal. A first
-            // answer born into a hold still live lands into it (A29, #3800).
-            let t = e.m.Re;
-            e.m.Re = null;
-            if (f && t && (t = liveTx(t))) holdNode(e, t);
+            // the optimistic engine; every landing is the plain setSignal. A node
+            // already held stages its answer into that hold (`setSignal`).
             try {
                 setSignal(e, () => r);
             } catch (t) {
@@ -342,8 +349,8 @@ r) {
         // (`_pendingValue` set inside setSignal) is not — commitPendingNode closes
         // the window when the flush commits it, so no one-frame pulse can leak to
         // observers between the landing and its commit (#2990).
-                if (e.Ae === NOT_PENDING) {
-            e._e = false;
+                if (e.Oe === NOT_PENDING) {
+            e.De = false;
             // The landing published: the dependency tail the flight's pass left
             // linked goes now (A30, #3410). A staged landing has not replaced the
             // committed frame yet; `commitPendingNode` trims it.
@@ -362,7 +369,7 @@ r) {
     // Returns whether the node released, so the iterator branch can stop
     // pulling values instead of pumping an unobserved stream forever (#2935).
         const settleAutodispose = () => {
-        if (e.u & CONFIG_AUTO_DISPOSE && !e.t && !(e.G & STATUS_PENDING)) {
+        if (e.i & CONFIG_AUTO_DISPOSE && !e.t && !(e.S & STATUS_PENDING)) {
             unobserved(e);
             return true;
         }
@@ -382,11 +389,11 @@ r) {
         const consumeIterator = (n, r) => {
         const o = n[Symbol.asyncIterator]();
         let f = false;
-        let i = false;
-        let s = !r;
+        let s = false;
+        let i = !r;
         const close = () => {
-            if (i) return;
-            i = true;
+            if (s) return;
+            s = true;
             try {
                 const e = o.return?.();
                 if (isThenable(e)) e.then(undefined, () => {});
@@ -396,7 +403,7 @@ r) {
         // Flight-identity cancellation (#3122): the registration above is the
         // owner-death backstop; the teardown slot fires at the _inFlight release
         // sites so supersede stops this stream immediately.
-                ext(e).Te = close;
+                ext(e).Ne = close;
         // Release check before each next pull: an unobserved lazy node must tear
         // down (its close above runs via disposal, closing the iterator) instead
         // of pumping the stream forever with zero subscribers (#2935).
@@ -422,17 +429,17 @@ r) {
                 // stash: it must write through the async path or the value is
                 // silently dropped. (The deferred posture never has a caller, so
                 // initialRead starts false there and everything writes through.)
-                if (c && s) {
+                if (c && i) {
                     n = r;
                     l = true;
-                    if (r.done) i = true;
-                } else if (e.m?.De !== t) {
+                    if (r.done) s = true;
+                } else if (e.m?.Te !== t) {
                     return;
                 } else if (!r.done) {
                     f = true;
                     asyncWrite(r.value, iterateOrRelease);
                 } else {
-                    i = true;
+                    s = true;
                     if (f) {
                         schedule();
                         flush();
@@ -443,11 +450,11 @@ r) {
                     settleAutodispose();
                 }
             }, n => {
-                if (c && s) {
+                if (c && i) {
                     r = n;
                     a = true;
-                } else if (e.m?.De === t) {
-                    i = true;
+                } else if (e.m?.Te === t) {
+                    s = true;
                     handleError(n);
                     settleAutodispose();
                 }
@@ -455,9 +462,9 @@ r) {
             c = false;
             if (a) {
                 // Match the promise branch, but only rethrow during the initial read.
-                i = true;
+                s = true;
                 handleError(r);
-                if (s) throw r;
+                if (i) throw r;
                 return true;
             }
             if (l && !n.done) {
@@ -469,13 +476,13 @@ r) {
         };
         const l = iterate();
         // Later iterate() calls run from asyncWrite, where rethrowing would be unhandled.
-                s = false;
+                i = false;
         return f || l;
     };
     // Landed-synchronously verdict for a LIVE iterator drain; null when no live
     // drain ran (plain promise flight, or a deferred flatten). Drives the
     // shared NotReady/loading tail below.
-        let i = null;
+        let s = null;
     // Flatten one async level: a thenable that RESOLVES to an AsyncIterable —
     // the shape every async stub returning a stream produces — consumes as the
     // stream itself rather than settling on the iterable object. One level
@@ -490,7 +497,7 @@ r) {
         }
         if (!n) return false;
         const r = consumeIterator(e, t);
-        if (!t) i = r;
+        if (!t) s = r;
         return true;
     };
     if (f) {
@@ -502,13 +509,13 @@ r) {
         // have put it. Only a flight that actually flattens becomes
         // disposal-bearing.
                 const registerDeferredClose = t => {
-            if (!e.Pe) e.Pe = t; else if (Array.isArray(e.Pe)) e.Pe.push(t); else e.Pe = [ e.Pe, t ];
+            if (!e.Re) e.Re = t; else if (Array.isArray(e.Re)) e.Re.push(t); else e.Re = [ e.Re, t ];
         };
         t.then(r => {
             if (f) {
                 u = r;
                 n = true;
-            } else if (e.m?.De === t && !(e.R & REACTIVE_DISPOSED) && flattenIfIterable(r, registerDeferredClose)) ; else {
+            } else if (e.m?.Te === t && !(e.R & REACTIVE_DISPOSED) && flattenIfIterable(r, registerDeferredClose)) ; else {
                 asyncWrite(r);
                 settleAutodispose();
             }
@@ -533,35 +540,35 @@ r) {
             // work on a loadingValue node is loading-class (invisible to
             // boundaries); the flight itself is already registered in _inFlight and
             // lands through asyncWrite.
-            if (e._e) return e.pe;
+            if (e.De) return e.Ae;
             throw new NotReadyError(context);
         } else if (!flattenIfIterable(u)) {
             // Synchronously-resolved promise: the first real answer landed.
-            e._e = false;
+            e.De = false;
         }
         // A sync-resolved promise holding an AsyncIterable flattened LIVE (we
         // are still inside the synchronous read): full initial-drain semantics
         // apply and the shared tail below settles the verdict.
         }
     if (o) flattenIfIterable(t);
-    if (i !== null) {
-        if (!i) {
+    if (s !== null) {
+        if (!s) {
             // Loading window: serve commit #0 (see the promise branch above).
-            if (e._e) return e.pe;
+            if (e.De) return e.Ae;
             throw new NotReadyError(context);
         }
         // A sync first yield (or immediate empty completion) is the first real
         // answer; async yields clear inside asyncWrite.
-                e._e = false;
+                e.De = false;
     }
     return u;
 }
 
 function clearStatus(e, t = false) {
     if (e.m?.Se) clearPendingSources(e);
-    if (e.m?.Ie) if (e.m !== null) e.m.Ie = false;
-    e.G = t ? 0 : e.G & STATUS_UNINITIALIZED;
-    if (e.m?.v) setPendingError(e);
+    if (e.m?.de) if (e.m !== null) e.m.de = false;
+    e.S = t ? 0 : e.S & STATUS_UNINITIALIZED;
+    if (e.m?.F) setPendingError(e);
     const n = statusNotifierOf(e);
     if (n) n.call(e);
 }
@@ -594,8 +601,8 @@ function clearStatus(e, t = false) {
     const n = e.m?.Se;
     // (The full clear below drops the set whether or not self was retired first.)
         if (n && (n.delete(e), n.size)) {
-        e.m.Ie = false;
-        if (t) e.G = STATUS_PENDING;
+        e.m.de = false;
+        if (t) e.S = STATUS_PENDING;
         setPendingError(e, n.values().next().value);
     } else clearStatus(e, t);
 }
@@ -608,14 +615,14 @@ function notifyStatus(e, t, n, r) {
         {
         if (t === STATUS_PENDING && o) {
             addPendingSource(e, o);
-            e.G = STATUS_PENDING | e.G & STATUS_UNINITIALIZED;
+            e.S = STATUS_PENDING | e.S & STATUS_UNINITIALIZED;
             // Preserve the current source on this propagation so readers park on
             // the distinct pending source.
                         setPendingError(e, o, n);
         } else {
             clearPendingSources(e);
-            e.G = t | (t !== STATUS_ERROR ? e.G & STATUS_UNINITIALIZED : 0);
-            ext(e).v = n;
+            e.S = t | (t !== STATUS_ERROR ? e.S & STATUS_UNINITIALIZED : 0);
+            ext(e).F = n;
         }
     }
     // Lanes: a written guess is an optimistic boundary (A17 — "the optimistic
@@ -624,7 +631,7 @@ function notifyStatus(e, t, n, r) {
     // transition's to wait on — the frame it was asked in holds (A17: "a
     // transition whose optimistic node is still pending on its own fetch is
     // not complete"), through the node itself (`blocked`).
-        if (t === STATUS_PENDING && e.u & CONFIG_GUESS) {
+        if (t === STATUS_PENDING && e.i & CONFIG_GUESS) {
         if (passLane === null) joinFuture(null);
         return;
     }
@@ -645,7 +652,7 @@ function notifyStatus(e, t, n, r) {
  * (store/projection.ts `wakeFamily`), exactly as a memo's would reach its. */ function propagateStatus(e, t, n, r) {
     const o = t === STATUS_PENDING && n instanceof NotReadyError ? n.source : undefined;
     forEachDependent(e, (r, f) => {
-        r.Ne = clock;
+        r.Ie = clock;
         // A pending mark on a kept-tail link re-derives the subscriber instead of
         // marking it (A30, #3494 review; fuzzer latest-1 #2141; #3519 review).
         // Past `_depsTail` lie the committed frame's deps, kept by A30 because
@@ -665,7 +672,7 @@ function notifyStatus(e, t, n, r) {
         // Inheriting the error would make a probe's reader errored. A boundary's
         // output (CONFIG_REDERIVE, boundaries.ts) the same: content or fallback
         // is its pass's call.
-                if (r.u & (CONFIG_REDERIVE | CONFIG_VERDICT) || t === STATUS_PENDING && f.Ue !== r.he) {
+                if (r.i & (CONFIG_REDERIVE | CONFIG_VERDICT) || t === STATUS_PENDING && f.Pe !== r.pe) {
             enqueueSub(r);
             schedule();
             return;
@@ -678,24 +685,24 @@ function notifyStatus(e, t, n, r) {
         // shape: the unmount it stages makes the observer a zombie whose say is
         // moot for this transaction, A15 #3463).
                 if (t === STATUS_PENDING && o && r.m?.Se?.has(o)) {
-            if (passLane === null && (r.u & (CONFIG_HELD | CONFIG_OVERRIDE)) === CONFIG_HELD && globalQueue.ee) joinFuture(txOf(r));
+            if (passLane === null && (r.i & (CONFIG_HELD | CONFIG_OVERRIDE)) === CONFIG_HELD && globalQueue.X) joinFuture(txOf(r));
             return;
         }
-        if (t === STATUS_PENDING && o || t !== STATUS_PENDING && (r.m?.v !== n || r.m?.Se)) {
+        if (t === STATUS_PENDING && o || t !== STATUS_PENDING && (r.m?.F !== n || r.m?.Se)) {
             // The marked subscriber is queued for the commit sweep so its status
             // bookkeeping (loading window, uninitialized clear) runs with the flush
             // — with the lane, when the pass propagating is the lane's work and
             // the dependent's pending is the lane's own flight (`laneStage`).
             {
                 // (No answer: a pending propagation leaves a written guess a guess.)
-                if (passLane !== null) GlobalQueue.M(r, passLane, true, e); else {
+                if (passLane !== null) GlobalQueue.W(r, passLane, true, e); else {
                     queuePendingNode(r);
                     // A15 (#3443): pending propagates onto a held memo without
                     // recomputing it, and the propagation itself enters the memo's
                     // transaction — the flight flows into a memo that transaction
                     // holds, so the write that started it is held with it. A render
                     // effect's membership is its pass's (`notify`), never sticky.
-                                        if (t === STATUS_PENDING && (r.u & (CONFIG_HELD | CONFIG_OVERRIDE)) === CONFIG_HELD && !r.i) joinFuture(txOf(r));
+                                        if (t === STATUS_PENDING && (r.i & (CONFIG_HELD | CONFIG_OVERRIDE)) === CONFIG_HELD && !r.u) joinFuture(txOf(r));
                 }
             }
             notifyStatus(r, t, n);

package/dist/observe/core/attribution-queries.js

@@ -36,7 +36,7 @@ import { $REFRESH } from "./constants.js";
  */ function subscriptions(n) {
     const t = nodeOf(n);
     const o = [];
-    for (let n = t?._ ?? null; n !== null; n = n.p) o.push(nodeName(n.I));
+    for (let n = t?.G ?? null; n !== null; n = n._) o.push(nodeName(n.I));
     return o;
 }