@solidjs/signals 2.0.0-rc.0 → 2.0.0-rc.2

package/dist/prod/core/verdict.js

@@ -1,20 +1,20 @@
-import { NOT_PENDING, REACTIVE_DISPOSED, REACTIVE_DIRTY, REACTIVE_CHECK, unwrapOverride, REACTIVE_ZOMBIE, STATUS_UNINITIALIZED, STATUS_PENDING, REACTIVE_MANUAL_WRITE, STATUS_ERROR, REACTIVE_RECOMPUTING_DEPS } from "./constants.js";
+import { NOT_PENDING, REACTIVE_DISPOSED, REACTIVE_DIRTY, REACTIVE_CHECK, unwrapOverride, REACTIVE_ZOMBIE, STATUS_UNINITIALIZED, STATUS_PENDING, REACTIVE_OPTIMISTIC_DIRTY, REACTIVE_MANUAL_WRITE, CONFIG_HAS_COMPANIONS, CONFIG_CHILD_COMPANIONS, STATUS_ERROR, REACTIVE_RECOMPUTING_DEPS } from "./constants.js";
 
-import { setSignal, prepareComputed, read, context, stale, currentOptimisticLane, tracking, setLatestReadActive, setContextInternal, optimisticComputed, setPendingCheckActive, latestReadActive, optimisticSignal, pendingCheckActive } from "./core.js";
+import { setSignal, prepareComputed, read, context, stale, currentOptimisticLane, tracking, ext, setLatestReadActive, setContextInternal, optimisticComputed, setPendingCheckActive, latestReadActive, optimisticSignal, pendingCheckActive } from "./core.js";
 
 import { NotReadyError } from "./error.js";
 
 import { link } from "./graph.js";
 
-import { insertIntoHeap, queueFor, markHeap } from "./heap.js";
+import { insertIntoHeap, queueFor, markHeap, enqueueSub } from "./heap.js";
 
 import "./invariants.js";
 
-import { findLane, hasActiveOverride } from "./lanes.js";
+import { findLane, hasActiveOverride, assignOrMergeLane } from "./lanes.js";
 
 import { installOptimisticEngine } from "./optimistic.js";
 
-import { GlobalQueue, clock, insertSubs, schedule, activeTransition, activeAffectsMarks } from "./scheduler.js";
+import { GlobalQueue, insertSubs, schedule, activeTransition, currentTransition, activeAffectsMarks } from "./scheduler.js";
 
 /**
  * The isPending()/latest() verdict layer, moved out of core.ts. Importing this
@@ -28,19 +28,45 @@ installOptimisticEngine();
 
 let pendingProbe = null;
 
+/**
+ * Probes whose verdict was suppressed by the fresh-read pairing rule while
+ * the held write's fate was still undecided (see recordFreshRead /
+ * wakeSuppressedProbes): held node → the wrapper computeds that probed it.
+ * Entries die with the hold — the commit/revert snap clears them.
+ */ const suppressedProbes = new Map;
+
 /**
  * Get or create the pending signal for a node (lazy).
  * Used by isPending() to track pending state reactively.
- */ function getPendingSignal(e) {
-    if (!e.ge) {
+ */
+/** #3038: register a companion-carrying firewall child on its firewall's
+ * companion set and arm the post-recompute snap (CONFIG_CHILD_COMPANIONS is
+ * the one-load gate at the call sites). The snap then iterates exactly the
+ * children someone asked verdicts of — O(companions) — never the full
+ * `_child` chain, which carries one node per materialized leaf (the
+ * O(all-leaves-ever-read)-per-update pathology). Entries are permanent like
+ * the companions themselves; a store with no leaf-level isPending()/latest()
+ * reads never allocates the set or pays the walk. */ function markFirewallChildCompanions(e) {
+    const t = e.lt;
+    if (!t) return;
+    t.T |= CONFIG_CHILD_COMPANIONS;
+    (ext(t).Nt ??= new Set).add(e);
+}
+
+function getPendingSignal(e) {
+    let t = e.o?.Ge;
+    if (!t) {
         // Start false, write true if pending - ensures reversion returns to false
-        e.ge = optimisticSignal(false, {
+        t = optimisticSignal(false, {
             ownedWrite: true
         });
-        e.ge.nn = e;
-        if (computePendingState(e)) setSignal(e.ge, true);
+        ext(e).Ge = t;
+        e.T |= CONFIG_HAS_COMPANIONS;
+        markFirewallChildCompanions(e);
+        ext(t).It = e;
+        if (computePendingState(e)) setSignal(t, true);
     }
-    return e.ge;
+    return t;
 }
 
 function collectPendingSources(e) {
@@ -70,7 +96,7 @@ function collectPendingSources(e) {
  * (`_pendingObserver`) are skipped so an `isPending` wrapper memo never
  * inherits the coverage it reports on.
  */ function markWalk(e, t) {
-    if (e.t) return true;
+    if (e.o?.t) return true;
     // A real error outranks an inherited mark (A16/A24c): an errored node
     // answers probes with its error, not a coverage verdict, and coverage does
     // not flow through it — matching the rails' behavior, where propagation
@@ -86,10 +112,10 @@ function collectPendingSources(e) {
     // pass's dependency set — walking past it would read dropped deps and
     // latch a stale verdict on the companion.
         const i = e;
-    const r = i.se & REACTIVE_RECOMPUTING_DEPS ? i.Ye : undefined;
+    const r = i.ie & REACTIVE_RECOMPUTING_DEPS ? i.Ye : undefined;
     if (r !== null) {
-        for (let e = i.tt ?? null; e !== null; e = e.nt) {
-            if (!e.Ge && markWalk(e.it, t)) return true;
+        for (let e = i.nt ?? null; e !== null; e = e.it) {
+            if (!e.me && markWalk(e.ut, t)) return true;
             if (e === r) break;
         }
     }
@@ -101,11 +127,11 @@ function collectPendingSources(e) {
 }
 
 function quietPending(e) {
-    if (e.oe) {
-        for (const t of e.oe) if (!t.he) return false;
+    if (e.o?.le) {
+        for (const t of e.o.le) if (!t.o?.pe) return false;
         return true;
     }
-    return e.he;
+    return e.o?.pe ?? false;
 }
 
 // NOTE: a loadingValue node's open loading window (_loading) is verdict-quiet
@@ -121,47 +147,47 @@ function newQuestionInFlight(e) {
 
 function computePendingState(e) {
     const t = e;
-    if (t.se & REACTIVE_DISPOSED) return false;
+    if (t.ie & REACTIVE_DISPOSED) return false;
     // Mark coverage is transitive by dep-graph reachability: a latest() shadow
     // reaches its owner (and a store leaf its firewall) through its own deps,
     // so the one walk covers direct marks, derivation, and companion chains.
         if (markCovered(e)) return true;
     const n = e.lt;
-    if (e.nn) {
-        const t = e.nn;
+    if (e.o?.It) {
+        const t = e.o?.It;
         const n = t.lt || t;
         return newQuestionInFlight(n);
     }
-    if (n && e.De !== NOT_PENDING && !hasActiveOverride(e)) {
-        return !!(n.se & REACTIVE_MANUAL_WRITE) || !n.Te && !(n.S & STATUS_PENDING) || !!(n.S & STATUS_PENDING) && quietPending(n);
+    if (n && e.Pe !== NOT_PENDING && !hasActiveOverride(e)) {
+        return !!(n.ie & REACTIVE_MANUAL_WRITE) || !n.o?.Ee && !(n.S & STATUS_PENDING) || !!(n.S & STATUS_PENDING) && quietPending(n);
     }
     // `!comp._loading`: a hold created while the loading window is still open is
     // the window's own landing in flight to its commit — verdict-quiet like the
     // rest of the window (the UNINITIALIZED check suppresses exactly this frame
     // for windowless first loads; born-committed nodes need their own gate, #2990).
-        if (e.De !== NOT_PENDING && !(t.S & STATUS_UNINITIALIZED) && !t.Ee) {
-        if (hasActiveOverride(e)) return !e.be || !e.be(e.De, unwrapOverride(e._e));
+        if (e.Pe !== NOT_PENDING && !(t.S & STATUS_UNINITIALIZED) && !t.Ie) {
+        if (hasActiveOverride(e)) return !e.Ue || !e.Ue(e.Pe, unwrapOverride(e.o?.De));
         return true;
     }
     return newQuestionInFlight(t);
 }
 
 function syncCompanions(e, t) {
-    if (e.ge) updatePendingSignal(e);
-    if (e.pe) setSignal(e.pe, t);
+    if (e.o?.Ge) updatePendingSignal(e);
+    if (e.o?.ge) setSignal(e.o?.ge, t);
 }
 
 function updatePendingSignal(e) {
-    if (e.ge) {
-        setSignal(e.ge, computePendingState(e));
+    if (e.o?.Ge) {
+        setSignal(e.o?.Ge, computePendingState(e));
     }
-    if (e.pe) updatePendingSignal(e.pe);
+    if (e.o?.ge) updatePendingSignal(e.o?.ge);
 }
 
 function updateChildCompanions(e) {
-    for (let t = e.u; t !== null; t = t.ae) {
-        if (t.ge || t.pe) updatePendingSignal(t);
-    }
+    const t = e.o?.Nt;
+    if (t === undefined) return;
+    for (const e of t) updatePendingSignal(e);
 }
 
 /**
@@ -178,31 +204,65 @@ function updateChildCompanions(e) {
     const visit = e => {
         if (i.has(e)) return;
         i.add(e);
-        if (e.ge || e.pe) n(e);
-        for (let t = e.o; t !== null; t = t.le) visit(t.fe);
-        for (let t = e.u ?? null; t !== null; t = t.ae) {
+        if (e.o?.Ge || e.o?.ge) n(e);
+        for (let t = e.u; t !== null; t = t.fe) visit(t.ae);
+        for (let t = e.o?.l ?? null; t !== null; t = t.ce) {
             visit(t);
         }
     };
     visit(e);
 }
 
+/**
+ * The correction half of the provisional fresh-read suppression (see
+ * collectPending): fired from the sanctioned async-registration site
+ * (GlobalQueue.notify) when a transaction gains an in-flight async blocker.
+ * Every probe that returned "not pending" purely because it read a held
+ * value belonging to that transaction re-runs — its re-probe now sees the
+ * live blocker through heldAwaitingAsync and lands the true verdict. The
+ * wake mirrors a companion write's own notification (optimistic-dirty on the
+ * companion's lane) so the corrected verdict commits and flushes immediately
+ * instead of being held with the transaction it reports on.
+ */ function wakeSuppressedProbes(e) {
+    if (suppressedProbes.size === 0) return;
+    let t = false;
+    for (const [n, i] of suppressedProbes) {
+        const r = n._e;
+        const s = r ? currentTransition(r) : null;
+        if (!s) {
+            suppressedProbes.delete(n);
+            continue;
+        }
+        if (s !== e) continue;
+        suppressedProbes.delete(n);
+        const o = n.o?.Ge?.o?.Be;
+        for (const e of i) {
+            if (e.ie & REACTIVE_DISPOSED) continue;
+            e.ie |= REACTIVE_OPTIMISTIC_DIRTY;
+            if (o) assignOrMergeLane(e, o); else if (e.o !== null) e.o.Be = undefined;
+            enqueueSub(e);
+            t = true;
+        }
+    }
+    if (t) schedule();
+}
+
 function snapCompanionsToState(e) {
-    const t = e.ge;
-    if (t && (t._e === undefined || t._e === NOT_PENDING)) {
+    suppressedProbes.size !== 0 && suppressedProbes.delete(e);
+    const t = e.o?.Ge;
+    if (t && (t.o?.De === undefined || t.o?.De === NOT_PENDING)) {
         const n = computePendingState(e);
-        if (t.Ue !== n || t.De !== NOT_PENDING) {
-            t.Ue = n;
-            t.De = NOT_PENDING;
-            t.de = clock;
+        if (t.be !== n || t.Pe !== NOT_PENDING) {
+            t.be = n;
+            t.Pe = NOT_PENDING;
             insertSubs(t);
             schedule();
         }
     }
-    const n = e.pe;
-    if (n && !(n.se & REACTIVE_DISPOSED)) {
-        if ((n._e === undefined || n._e === NOT_PENDING) && n.De === NOT_PENDING && !Object.is(n.Ue, e.Ue) && !(n.se & (REACTIVE_DIRTY | REACTIVE_CHECK))) {
-            n.se |= REACTIVE_DIRTY;
+    const n = e.o?.ge;
+    if (n && !(n.ie & REACTIVE_DISPOSED)) {
+        if ((n.o?.De === undefined || n.o?.De === NOT_PENDING) && n.Pe === NOT_PENDING && !Object.is(n.be, e.be) && !(n.ie & (REACTIVE_DIRTY | REACTIVE_CHECK))) {
+            n.ie |= REACTIVE_DIRTY;
             insertIntoHeap(n, queueFor(n));
             insertSubs(n);
             schedule();
@@ -212,29 +272,38 @@ function snapCompanionsToState(e) {
 }
 
 function getLatestValueComputed(e) {
-    if (!e.pe) {
-        const t = latestReadActive;
+    let t = e.o?.ge;
+    if (!t) {
+        const n = latestReadActive;
         setLatestReadActive(false);
-        const n = pendingCheckActive;
+        const i = pendingCheckActive;
         setPendingCheckActive(false);
-        const i = context;
+        const r = context;
         setContextInternal(null);
  // Detach from owner so it isn't disposed with effects
-                e.pe = optimisticComputed(() => read(e));
-        e.pe.nn = e;
+                t = optimisticComputed(() => read(e));
+        ext(e).ge = t;
+        e.T |= CONFIG_HAS_COMPANIONS;
+        markFirewallChildCompanions(e);
+        ext(t).It = e;
  // Parent-child lane relationship
-                setContextInternal(i);
-        setPendingCheckActive(n);
-        setLatestReadActive(t);
+        // Backfill an in-flight write (mirrors getPendingSignal): the companion is
+        // created lazily, possibly after the write was processed — syncCompanions
+        // only pushes into companions that already exist, so the first latest()
+        // read inside a held transition showed the committed value (#3041).
+                if (e.Pe !== NOT_PENDING && !hasActiveOverride(e)) setSignal(t, e.Pe);
+        setContextInternal(r);
+        setPendingCheckActive(i);
+        setLatestReadActive(n);
     }
-    return e.pe;
+    return t;
 }
 
 /** The latest()-mode read path, installed as GlobalQueue._latestRead. */ function latestRead(e) {
     const t = getLatestValueComputed(e);
     const n = latestReadActive;
     setLatestReadActive(false);
-    const i = e._e !== undefined && e._e !== NOT_PENDING ? unwrapOverride(e._e) : e.Ue;
+    const i = e.o?.De !== undefined && e.o?.De !== NOT_PENDING ? unwrapOverride(e.o?.De) : e.be;
     let r;
     try {
         // An untracked latest() read has no reading context, so read() never
@@ -243,7 +312,7 @@ function getLatestValueComputed(e) {
         // until the flush (#2922). Mirror the tracked-read pull here: mark the
         // queued staleness through the graph, then bring the shadow up to date.
         const e = queueFor(t);
-        if (t.xe >= e.Ve && !(t.se & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE))) {
+        if (t.Le >= e.xe && !(t.ie & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE))) {
             markHeap(e);
             prepareComputed(t, true);
         }
@@ -255,8 +324,8 @@ function getLatestValueComputed(e) {
         setLatestReadActive(n);
     }
     if (t.S & STATUS_PENDING) return i;
-    if (stale && currentOptimisticLane && t.Ke) {
-        const e = findLane(t.Ke);
+    if (stale && currentOptimisticLane && t.o?.Be) {
+        const e = findLane(t.o?.Be);
         const n = findLane(currentOptimisticLane);
         if (e !== n && e.Ae.size > 0) {
             return i;
@@ -266,33 +335,54 @@ function getLatestValueComputed(e) {
     // speculative value in _pendingValue; a contextless read() only surfaces
     // _value. Overrides stay authoritative (A17), and stale readers keep the
     // other transition's committed view, matching read()'s own selection.
-        if (t.De !== NOT_PENDING && !hasActiveOverride(t) && !(stale && t.Ne && activeTransition !== t.Ne)) return t.De;
+        if (t.Pe !== NOT_PENDING && !hasActiveOverride(t) && !(stale && t._e && activeTransition !== t._e)) return t.Pe;
     return r;
 }
 
 /** The isPending()-probe read path, installed as GlobalQueue._pendingCheck. */ function pendingCheckRead(e, t, n, i) {
     setPendingCheckActive(false);
-    if (typeof e.ce === "function") prepareComputed(e, true);
+    if (typeof e.Se === "function") prepareComputed(e, true);
     const r = n.S;
     if (t && r & STATUS_PENDING && r & STATUS_UNINITIALIZED) {
         if (tracking && e !== t) link(e, t);
         setPendingCheckActive(true);
-        throw n._;
+        throw n.o?._;
     }
     collectPendingSources(e);
     if (i) collectPendingSources(i);
     setPendingCheckActive(true);
 }
 
+/**
+ * A held node whose transaction still has an async question in flight. The
+ * probe's fresh-read pairing rule (#2831 — "a reader that sees the fresh
+ * value must not also be told it is pending") only applies to LANDED answers
+ * awaiting reveal; while the answer is still computing, the fresh value the
+ * reader saw is an input, and pending remains the truth for every reader
+ * (#3028).
+ */ function heldAwaitingAsync(e) {
+    const t = e._e;
+    const n = t ? currentTransition(t) : null;
+    if (!n || n.an) return false;
+    for (const [e, t] of n.Ne) {
+        if (t.size && e.S & STATUS_PENDING && e.o?._?.source === e) return true;
+    }
+    return false;
+}
+
 function recordFreshRead(e, t) {
-    if (pendingProbe !== null && e.De !== NOT_PENDING && t === e.De) pendingProbe.freshReads.add(e);
+    if (pendingProbe !== null && e.Pe !== NOT_PENDING && t === e.Pe) {
+        if (heldAwaitingAsync(e)) return;
+        pendingProbe.freshReads.add(e);
+    }
 }
 
 function applyReask(e, t) {
     const n = !!(e.S & STATUS_PENDING);
-    const i = t && !(n && !e.he);
-    const r = n && e.he !== i;
-    e.he = i;
+    const i = t && !(n && !e.o?.pe);
+    const r = n && (e.o?.pe ?? false) !== i;
+    // Allocation-free for the quiet case: false is the extension default.
+        if (i) ext(e).pe = true; else if (e.o !== null) e.o.pe = false;
     return r;
 }
 
@@ -313,17 +403,32 @@ function isPending(e) {
     const i = pendingProbe = {
         found: false,
         sources: new Set,
-        freshReads: new Set
+        freshReads: new Set,
+        suppressed: []
     };
     const collectPending = () => {
         setPendingCheckActive(false);
         try {
             i.sources.forEach(e => {
-                if (read(getPendingSignal(e)) && !i.freshReads.has(e)) i.found = true;
+                if (read(getPendingSignal(e))) {
+                    if (!i.freshReads.has(e)) i.found = true; else i.suppressed.push(e);
+                }
             });
         } finally {
             setPendingCheckActive(true);
         }
+        // A "not pending" verdict that exists only because this reader saw the
+        // fresh held value is provisional: if the write turns out NOT to commit
+        // this flush (a downstream async pends and holds it), the suppression was
+        // wrong and the wrapper must re-ask (#3028). Remember who to wake — the
+        // async registration (GlobalQueue.notify) triggers wakeSuppressedProbes.
+                if (!i.found && i.suppressed.length && context && typeof context.Se === "function") {
+            for (const e of i.suppressed) {
+                let t = suppressedProbes.get(e);
+                if (!t) suppressedProbes.set(e, t = new Set);
+                t.add(context);
+            }
+        }
     };
     try {
         e();
@@ -346,24 +451,26 @@ function isPending(e) {
 // Hook installation (same late-binding pattern as GlobalQueue._update /
 // _propagateAffects): core call sites fire these behind the same guards the
 // direct calls used, so behavior is identical once this module loads.
-GlobalQueue.Pe = syncCompanions;
+GlobalQueue.Oe = syncCompanions;
 
-GlobalQueue.Se = updatePendingSignal;
+GlobalQueue.de = updatePendingSignal;
 
-GlobalQueue.Oe = updateChildCompanions;
+GlobalQueue.ye = updateChildCompanions;
 
 GlobalQueue.un = snapCompanionsToState;
 
-GlobalQueue.At = latestRead;
+GlobalQueue.Pt = latestRead;
+
+GlobalQueue.Dt = pendingCheckRead;
 
-GlobalQueue.Ct = pendingCheckRead;
+GlobalQueue.Ht = recordFreshRead;
 
-GlobalQueue.ht = recordFreshRead;
+GlobalQueue.Je = applyReask;
 
-GlobalQueue.Be = applyReask;
+GlobalQueue.p = repollDownstreamVerdicts;
 
-GlobalQueue.k = repollDownstreamVerdicts;
+GlobalQueue.Bt = witnessAffects;
 
-GlobalQueue.Lt = witnessAffects;
+GlobalQueue.wt = wakeSuppressedProbes;
 
 export { isPending, latest };

package/dist/prod/index.js

@@ -26,19 +26,19 @@ export { affects } from "./affects.js";
 
 export { mapArray, repeat } from "./map.js";
 
-export { $PROXY, $TARGET, $TRACK, createStore, isWrappable } from "./store/store.js";
+export { createStore, deep, reconcile, snapshot } from "./store/index.js";
 
-export { createProjection } from "./store/projection.js";
+export { createErrorBoundary, createLoadingBoundary, createRevealOrder, flatten } from "./boundaries.js";
 
-export { createOptimisticStore } from "./store/optimistic.js";
+export { $PROXY, $TARGET, $TRACK, isWrappable } from "./store/store.js";
 
-export { reconcile } from "./store/reconcile.js";
+export { createOptimisticStoreNext as createOptimisticStore } from "./store/next/optimistic.js";
 
-export { storePath } from "./store/storePath.js";
+export { createProjectionNext as createProjection } from "./store/next/projection.js";
 
-export { deep, merge, omit, snapshot } from "./store/utils.js";
+export { merge, omit } from "./store/utils.js";
 
-export { createErrorBoundary, createLoadingBoundary, createRevealOrder, flatten } from "./boundaries.js";
+export { storePath } from "./store/storePath.js";
 
 const DEV = undefined;