@solidjs/signals 2.0.0-rc.6 → 2.0.0-rc.7

package/dist/prod/core/dev.js

@@ -1,3 +1,5 @@
+import "./core.js";
+
 const DEV = undefined;
 
 export { DEV };

package/dist/prod/core/effect.js

@@ -4,7 +4,9 @@ import { setEffectStatusNotify, ext, createEffectNode, recompute, computed, stal
 
 import { unwrapStatusError, StatusError } from "./error.js";
 
-import { GlobalQueue, haltReactivity } from "./scheduler.js";
+import { enqueueSub } from "./heap.js";
+
+import { GlobalQueue, haltReactivity, schedule } from "./scheduler.js";
 
 /**
  * Effects are the leaf nodes of our reactive graph. When their sources change, they are
@@ -12,9 +14,9 @@ import { GlobalQueue, haltReactivity } from "./scheduler.js";
  * sources and recompute
  */ function effect(t, e, E, f) {
     const r = !!f?.user;
-    const R = createEffectNode(t, e, E, r ? EFFECT_USER : EFFECT_RENDER, f);
-    recompute(R, true);
-    !f?.defer && (R.ge === EFFECT_USER || f?.schedule ? R.C.enqueue(R.ge, runEffect.bind(null, R)) : runEffect(R));
+    const n = createEffectNode(t, e, E, r ? EFFECT_USER : EFFECT_RENDER, f);
+    recompute(n, true);
+    !f?.defer && (n.ge === EFFECT_USER || f?.schedule ? n.C.enqueue(n.ge, runEffect.bind(null, n)) : runEffect(n));
 }
 
 function notifyEffectStatus(t, e) {
@@ -34,8 +36,8 @@ function notifyEffectStatus(t, e) {
             // `status` arg without node-state writes) don't queue: the status
             // re-propagates unblocked at commit.
             if (this.S & STATUS_ERROR) {
-                this.tt = true;
-                this.C.enqueue(this.ge, this.nt ??= runEffect.bind(null, this));
+                this.He = true;
+                this.C.enqueue(this.ge, this.it ??= runEffect.bind(null, this));
             }
             return;
         }
@@ -49,7 +51,7 @@ function notifyEffectStatus(t, e) {
 }
 
 function runEffect(t) {
-    if (!t.tt || t.ie & REACTIVE_DISPOSED) return;
+    if (!t.He || t.ie & REACTIVE_DISPOSED) return;
     // Error arm (#2840), user effects only: a compute-phase error that is still
     // the node's settled state at effect time runs the bundle's error handler in
     // this same imperative, writable scope. Unwrap the StatusError used for
@@ -62,12 +64,12 @@ function runEffect(t) {
     // same flush must not be hijacked by a later-arriving error status.
         if (t.S & STATUS_ERROR && t.ge === EFFECT_USER) {
         const e = unwrapStatusError(t.o?._);
-        t.At = t.be;
-        t.tt = false;
+        t.Ot = t.be;
+        t.He = false;
         try {
-            t.Ct ? t.Ct(e, () => {
-                const e = t.Rt;
-                t.Rt = undefined;
+            t.Rt ? t.Rt(e, () => {
+                const e = t.Gt;
+                t.Gt = undefined;
                 e?.();
             }) : console.error(e);
         } catch (e) {
@@ -78,14 +80,14 @@ function runEffect(t) {
         }
         return;
     }
-    const e = t.Rt;
-    t.Rt = undefined;
+    const e = t.Gt;
+    t.Gt = undefined;
     try {
         e?.();
-        const E = t.Ot(t.be, t.At);
+        const E = t.Ct(t.be, t.Ot);
         if (false && E !== undefined && typeof E !== "function") ;
         // The final cleanup is invoked by disposeChildren at true disposal.
-                t.Rt = E;
+                t.Gt = E;
     } catch (e) {
         ext(t)._ = new StatusError(t, e);
         t.S |= STATUS_ERROR;
@@ -94,12 +96,12 @@ function runEffect(t) {
             throw e;
         }
     } finally {
-        t.At = t.be;
-        t.tt = false;
+        t.Ot = t.be;
+        t.He = false;
     }
 }
 
-GlobalQueue.it = runEffect;
+GlobalQueue.ut = runEffect;
 
 /**
  * Internal tracked effect - bypasses heap, goes directly to effect queue.
@@ -107,31 +109,38 @@ GlobalQueue.it = runEffect;
  * Uses stale reads.
  */ function trackedEffect(t, e) {
     const run = () => {
-        if (!E.tt || E.ie & REACTIVE_DISPOSED) return;
+        // `_modified` is NOT redundant with the heap: the heap dedups within a
+        // pass, but a held transition's passes each enqueue `_run` into the same
+        // user queue, and this gate is what collapses them into one run at commit.
+        if (!E.He || E.ie & REACTIVE_DISPOSED) return;
         try {
-            E.tt = false;
+            E.He = false;
             recompute(E);
         } finally {}
     };
     const E = computed(() => {
-        const e = E.Rt;
-        E.Rt = undefined;
+        const e = E.Gt;
+        E.Gt = undefined;
         e?.();
         const f = staleValues(t);
-        E.Rt = f;
+        E.Gt = f;
     }, {
         ...e,
         lazy: true
     });
-    E.Rt = undefined;
+    E.Gt = undefined;
     E.T = E.T & ~CONFIG_AUTO_DISPOSE | CONFIG_CHILDREN_FORBIDDEN;
-    E.tt = true;
+    E.He = true;
     E.ge = EFFECT_TRACKED;
     // Status dispatch rides the SHARED notifier (statusNotifierOf keys off
     // _type): its error arm is behavior-identical to the closure that used to
     // live here, without the per-node NodeExtension allocation.
-        E.yt = run;
-    E.C.enqueue(EFFECT_USER, run);
+        E.Ve = run;
+    // The first run rides the heap like every wake (GlobalQueue._update), so a
+    // tracked effect created inside a render-effect callback runs after that
+    // pass's staged writes commit, not before.
+        enqueueSub(E);
+    schedule();
 }
 
 // Install the shared effect status notifier (statusNotifierOf serves it to

package/dist/prod/core/external.js

@@ -64,8 +64,8 @@ function externalUntrack(e) {
 // removed on reset) so core's null checks stay equivalent to the old
 // `externalSourceConfig` truthiness checks.
 function syncExternalHooks() {
-    GlobalQueue.Pt = externalSourceConfig ? wireExternalSource : null;
-    GlobalQueue.ht = externalSourceConfig ? externalUntrack : null;
+    GlobalQueue.Ft = externalSourceConfig ? wireExternalSource : null;
+    GlobalQueue.gt = externalSourceConfig ? externalUntrack : null;
 }
 
 function enableExternalSource(e) {

package/dist/prod/core/graph.js

@@ -1,4 +1,6 @@
-import { CONFIG_AUTO_DISPOSE, STATUS_PENDING, REACTIVE_DISPOSED, REACTIVE_ZOMBIE, REACTIVE_RECOMPUTING_DEPS } from "./constants.js";
+import { CONFIG_AUTO_DISPOSE, STATUS_PENDING, REACTIVE_DISPOSED, REACTIVE_ZOMBIE, CONFIG_SLOT_NODE, REACTIVE_RECOMPUTING_DEPS } from "./constants.js";
+
+import { slotUnobservedHook } from "./core.js";
 
 import { deleteFromHeap, queueFor } from "./heap.js";
 
@@ -8,15 +10,17 @@ import { bumpNotifyEpoch } from "./scheduler.js";
 
 // https://github.com/stackblitz/alien-signals/blob/v2.0.3/src/system.ts#L100
 function unlinkSubs(e) {
-    const n = e.ot;
-    const l = e.lt;
+    const n = e.st;
+    const l = e.ot;
     const o = e.ae;
-    const u = e.en;
-    if (o !== null) o.en = u; else n._t = u;
-    if (u !== null) u.ae = o; else {
+    const s = e.en;
+    if (o !== null) o.en = s; else n.ft = s;
+    if (s !== null) s.ae = o; else {
         n.u = o;
         if (o === null) {
-            n.o?.Et?.();
+            // Slot nodes (store leaves) dispatch to the ONE shared hook — no
+            // per-node unobserved closure, no NodeExtension to hold it.
+            if (n.T & CONFIG_SLOT_NODE) slotUnobservedHook(n); else n.o?.Nt?.();
             // No more subscribers; only tear down if CONFIG_AUTO_DISPOSE is set.
             // A pending node is exempt: its in-flight async work (or the
             // transition holding it) is an observer — tearing down would orphan
@@ -31,13 +35,13 @@ function unlinkSubs(e) {
 }
 
 function trimStaleDeps(e) {
-    const n = e.je;
-    let l = n !== null ? n.lt : e.ut;
+    const n = e.Be;
+    let l = n !== null ? n.ot : e.lt;
     if (l !== null) {
         do {
             l = unlinkSubs(l);
         } while (l !== null);
-        if (n !== null) n.lt = null; else e.ut = null;
+        if (n !== null) n.ot = null; else e.lt = null;
     }
 }
 
@@ -46,13 +50,13 @@ function trimStaleDeps(e) {
 // and skipping early also avoids adding one (hidden-class churn) via the
 // null-out below.
 function clearDeps(e) {
-    let n = e.ut;
+    let n = e.lt;
     if (!n) return;
     do {
         n = unlinkSubs(n);
     } while (n !== null);
-    e.ut = null;
-    e.je = null;
+    e.lt = null;
+    e.Be = null;
 }
 
 function unobserved(e) {
@@ -104,20 +108,20 @@ function link(e, n, l = false) {
     // not relabel the value dependency as probe-only — the value read is what
     // real-error propagation and affects() coverage key off, regardless of
     // read order within the computation.
-    const o = n.je;
-    if (o !== null && o.ot === e) {
+    const o = n.Be;
+    if (o !== null && o.st === e) {
         o.ve &&= l;
         return;
     }
-    let u = null;
+    let s = null;
     const t = n.ie & REACTIVE_RECOMPUTING_DEPS;
     if (t) {
-        u = o !== null ? o.lt : n.ut;
-        if (u !== null && u.ot === e) {
-            u.Ft = n.Ke;
-            n.je = u;
+        s = o !== null ? o.ot : n.lt;
+        if (s !== null && s.st === e) {
+            s.vt = n.ze;
+            n.Be = s;
             // First touch of this pass: the previous pass's label is stale.
-                        u.ve = l;
+                        s.ve = l;
             return;
         }
     }
@@ -126,24 +130,24 @@ function link(e, n, l = false) {
     // [deps.._depsTail] prefix — the O(1) equivalent of scanning the dep list
     // (the old alien-signals `isValidLink` walk, O(n²) when a computation
     // re-reads earlier deps non-consecutively, e.g. store leaf reads).
-        const s = e._t;
-    if (s !== null && s.ce === n && (!t || s.Ft === n.Ke)) {
+        const r = e.ft;
+    if (r !== null && r.ce === n && (!t || r.vt === n.ze)) {
         // Gen-matched during a recompute = repeat touch this pass (AND); outside
         // a recompute there is no pass boundary, so the latest read labels it.
-        if (t) s.ve &&= l; else s.ve = l;
+        if (t) r.ve &&= l; else r.ve = l;
         return;
     }
-    const r = n.je = e._t = {
-        ot: e,
+    const u = n.Be = e.ft = {
+        st: e,
         ce: n,
-        lt: u,
-        en: s,
+        ot: s,
+        en: r,
         ae: null,
-        Ft: n.Ke,
+        vt: n.ze,
         ve: l
     };
-    if (o !== null) o.lt = r; else n.ut = r;
-    if (s !== null) s.ae = r; else e.u = r;
+    if (o !== null) o.ot = u; else n.lt = u;
+    if (r !== null) r.ae = u; else e.u = u;
     // New subscriber edge: staged-rewrite skips (§12d) must not miss it.
         bumpNotifyEpoch();
 }

package/dist/prod/core/heap.js

@@ -1,6 +1,6 @@
 import "./core.js";
 
-import { REACTIVE_IN_HEAP, REACTIVE_IN_HEAP_HEIGHT, EFFECT_TRACKED, EFFECT_USER, REACTIVE_ZOMBIE, REACTIVE_RECOMPUTING_DEPS, REACTIVE_MANUAL_WRITE, REACTIVE_CHECK, REACTIVE_DIRTY, CONFIG_FW_CHILDREN } from "./constants.js";
+import { REACTIVE_IN_HEAP, REACTIVE_IN_HEAP_HEIGHT, REACTIVE_ZOMBIE, REACTIVE_RECOMPUTING_DEPS, REACTIVE_MANUAL_WRITE, REACTIVE_CHECK, REACTIVE_DIRTY, CONFIG_FW_CHILDREN } from "./constants.js";
 
 import { zombieQueue, dirtyQueue } from "./scheduler.js";
 
@@ -9,35 +9,29 @@ import { zombieQueue, dirtyQueue } from "./scheduler.js";
 }
 
 /**
- * Schedule one subscriber to re-run on the next flush: tracked effects bypass
- * the heap and go directly to their effect queue; everything else is inserted
- * into its own (zombie-flag-routed) heap with the `_min` cursor pulled down.
+ * Schedule one subscriber to re-run on the next flush: inserted into its own
+ * (zombie-flag-routed) heap with the `_min` cursor pulled down. Tracked
+ * effects ride the heap too — the heap visit is their (empty) compute phase,
+ * which hands the callback to the user queue once the pass has committed
+ * (see GlobalQueue._update, #3291).
  */ function enqueueSub(e) {
-    if (e.ge === EFFECT_TRACKED) {
-        const E = e;
-        if (!E.tt) {
-            E.tt = true;
-            E.C.enqueue(EFFECT_USER, E.yt);
-        }
-        return;
-    }
     const E = queueFor(e);
-    if (E.Qe > e.Me) E.Qe = e.Me;
+    if (E.Me > e.qe) E.Me = e.qe;
     insertIntoHeap(e, E);
 }
 
 function actualInsertIntoHeap(e, E) {
-    const t = (e.ke?.Gt ? e.ke.Dt?.Me : e.ke?.Me) ?? -1;
-    if (t >= e.Me) e.Me = t + 1;
-    const n = e.Me;
-    const I = E.eE[n];
-    if (I === undefined) E.eE[n] = e; else {
-        const E = I.ct;
-        E.rt = e;
+    const t = (e.Le?.Dt ? e.Le.Pt?.qe : e.Le?.qe) ?? -1;
+    if (t >= e.qe) e.qe = t + 1;
+    const I = e.qe;
+    const n = E.eE[I];
+    if (n === undefined) E.eE[I] = e; else {
+        const E = n.ct;
+        E._t = e;
         e.ct = E;
-        I.ct = e;
+        n.ct = e;
     }
-    if (n > E.EE) E.EE = n;
+    if (I > E.EE) E.EE = I;
 }
 
 function insertIntoHeap(e, E) {
@@ -71,23 +65,23 @@ function deleteFromHeap(e, E) {
     const t = e.ie;
     if (!(t & (REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT))) return;
     e.ie = t & -25;
-    const n = e.Me;
-    if (e.ct === e) E.eE[n] = undefined; else {
-        const t = e.rt;
-        const I = E.eE[n];
-        const o = t ?? I;
-        if (e === I) E.eE[n] = t; else e.ct.rt = t;
+    const I = e.qe;
+    if (e.ct === e) E.eE[I] = undefined; else {
+        const t = e._t;
+        const n = E.eE[I];
+        const o = t ?? n;
+        if (e === n) E.eE[I] = t; else e.ct._t = t;
         o.ct = e.ct;
     }
     e.ct = e;
-    e.rt = undefined;
+    e._t = undefined;
 }
 
 function markHeap(e) {
     if (e.tE) return;
     e.tE = true;
     for (let E = 0; E <= e.EE; E++) {
-        for (let t = e.eE[E]; t !== undefined; t = t.rt) {
+        for (let t = e.eE[E]; t !== undefined; t = t._t) {
             if (t.ie & REACTIVE_IN_HEAP) markNode(t);
         }
     }
@@ -114,11 +108,11 @@ function markNode(e, E = REACTIVE_DIRTY) {
 
 function runHeap(e, E) {
     e.tE = false;
-    for (e.Qe = 0; e.Qe <= e.EE; e.Qe++) {
-        let t = e.eE[e.Qe];
+    for (e.Me = 0; e.Me <= e.EE; e.Me++) {
+        let t = e.eE[e.Me];
         while (t !== undefined) {
             if (t.ie & REACTIVE_IN_HEAP) E(t); else adjustHeight(t, e);
-            t = e.eE[e.Qe];
+            t = e.eE[e.Me];
         }
     }
     e.EE = 0;
@@ -126,14 +120,14 @@ function runHeap(e, E) {
 
 function adjustHeight(e, E) {
     deleteFromHeap(e, E);
-    let t = e.Me;
-    for (let E = e.ut; E; E = E.lt) {
-        const e = E.ot;
-        const n = e.st || e;
-        if (n.oe && n.Me >= t) t = n.Me + 1;
+    let t = e.qe;
+    for (let E = e.lt; E; E = E.ot) {
+        const e = E.st;
+        const I = e.rt || e;
+        if (I.oe && I.qe >= t) t = I.qe + 1;
     }
-    if (e.Me !== t) {
-        e.Me = t;
+    if (e.qe !== t) {
+        e.qe = t;
         for (let E = e.u; E !== null; E = E.ae) {
             // Route each subscriber by its own zombie flag, mirroring the
             // post-recompute height-adjust path. Inserting into the running `heap`

package/dist/prod/core/lanes.js

@@ -20,9 +20,9 @@ const activeLanes = new Set;
     }
     // Detect parent lane: _parentSource chains from pendingSignal → pendingValueComputed → original.
     // The child lane should not merge with the parent lane.
-        const i = n.o?.Tt;
-    const t = i?.o?.Je;
-    const r = t ? findLane(t) : null;
+        const t = n.o?.St;
+    const i = t?.o?.$e;
+    const r = i ? findLane(i) : null;
     e = {
         nn: n,
         Oe: new Set,
@@ -46,12 +46,12 @@ const activeLanes = new Set;
 
 function adoptCompanionLane(n, e) {
     if (!n) return;
-    const i = signalLanes.get(n);
-    if (!i) return;
-    const t = findLane(i);
+    const t = signalLanes.get(n);
+    if (!t) return;
+    const i = findLane(t);
     // Only the companion's own unmerged root is safely re-parentable: a root
     // that absorbed other lanes carries work that is not a child of this owner.
-        if (t !== e && t.nn === n && !t.an) t.an = e;
+        if (i !== e && i.nn === n && !i.an) i.an = e;
 }
 
 /**
@@ -61,6 +61,20 @@ function adoptCompanionLane(n, e) {
     return n;
 }
 
+/**
+ * Is the lane held? `_pendingAsync` records the async the lane OWNS (derived
+ * under it); the transaction's reporter map records the async a render effect
+ * OBSERVED pending with no boundary taking it (INV-3, the one registration
+ * site). A hold needs both — the same rule the transaction itself uses, so a
+ * memo nobody renders, or one a fallback-showing boundary caught, cannot tear
+ * a frame and holds nothing (#3289). An orphan lane has no observation record
+ * and never holds.
+ */ function laneHeld(n) {
+    const e = n.Ae;
+    if (e) for (const t of n.Oe) if (currentTransition(e)._e.has(t)) return true;
+    return false;
+}
+
 /**
  * Merge two lanes when their dependency graphs overlap.
  */ function mergeLanes(n, e) {
@@ -71,7 +85,7 @@ function adoptCompanionLane(n, e) {
     // Move (not copy) the merged lane's work: after the merge all routing goes
     // through findLane() to the root, so anything left behind here is dead —
     // and anything *added* here later is a routing bug (INV-5).
-        for (const i of e.Oe) n.Oe.add(i);
+        for (const t of e.Oe) n.Oe.add(t);
     e.Oe.clear();
     n.tn[0].push(...e.tn[0]);
     n.tn[1].push(...e.tn[1]);
@@ -83,11 +97,11 @@ function adoptCompanionLane(n, e) {
 /**
  * Resolve a node's lane: follow union-find chain, verify active, clear if stale.
  */ function resolveLane(n) {
-    const e = n.o?.Je;
+    const e = n.o?.$e;
     if (!e) return undefined;
-    const i = findLane(e);
-    if (activeLanes.has(i)) return i;
-    if (n.o !== null) n.o.Je = undefined;
+    const t = findLane(e);
+    if (activeLanes.has(t)) return t;
+    if (n.o !== null) n.o.$e = undefined;
     return undefined;
 }
 
@@ -97,10 +111,10 @@ function resolveTransition(n) {
     // transactions (#2912) — the merged root's _transition would hand this
     // node's override to whichever action wrote last through the shared
     // reader. Chase merge chains; a dead owner settled through another path.
-    if (hasActiveOverride(n) && n.o?.Nt) {
-        const e = ext(n).Nt = currentTransition(n.o?.Nt);
+    if (hasActiveOverride(n) && n.o?.Tt) {
+        const e = ext(n).Tt = currentTransition(n.o?.Tt);
         if (e.sn !== true) return e;
-        if (n.o !== null) n.o.Nt = null;
+        if (n.o !== null) n.o.Tt = null;
     }
     return resolveLane(n)?.Ae ?? n.Ae;
 }
@@ -116,32 +130,32 @@ function resolveTransition(n) {
  * Assign or merge a lane onto a node. At convergence points (node already has
  * a different active lane), merge unless the node has an active override.
  */ function assignOrMergeLane(n, e) {
-    const i = findLane(e);
-    const t = n.o?.Je;
-    if (t) {
+    const t = findLane(e);
+    const i = n.o?.$e;
+    if (i) {
         // If the subscriber's lane was merged into another lane, it's stale —
         // replace it with the new source lane instead of following the merge chain
         // (which would incorrectly merge the new lane into the old group)
-        if (t.rn) {
-            ext(n).Je = e;
+        if (i.rn) {
+            ext(n).$e = e;
             n.T |= CONFIG_HAS_LANE;
             return;
         }
-        const r = findLane(t);
+        const r = findLane(i);
         if (activeLanes.has(r)) {
-            if (r !== i && !hasActiveOverride(n)) {
+            if (r !== t && !hasActiveOverride(n)) {
                 // Parent-child lanes stay independent so isPending resolves without
                 // waiting for the parent's async. The child keeps ownership.
-                if (i.an && findLane(i.an) === r) {
-                    ext(n).Je = e;
+                if (t.an && findLane(t.an) === r) {
+                    ext(n).$e = e;
                     n.T |= CONFIG_HAS_LANE;
-                } else if (r.an && findLane(r.an) === i) ; else mergeLanes(i, r);
+                } else if (r.an && findLane(r.an) === t) ; else mergeLanes(t, r);
             }
             return;
         }
     }
-    ext(n).Je = e;
+    ext(n).$e = e;
     n.T |= CONFIG_HAS_LANE;
 }
 
-export { activeLanes, assignOrMergeLane, findLane, getOrCreateLane, hasActiveOverride, mergeLanes, resolveLane, resolveTransition, signalLanes };
+export { activeLanes, assignOrMergeLane, findLane, getOrCreateLane, hasActiveOverride, laneHeld, mergeLanes, resolveLane, resolveTransition, signalLanes };