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

package/dist/observe/core/attribution.js

@@ -1,6 +1,6 @@
 import { setAttributionHooks } from "./attribution-hooks.js";
 
-import { NOT_PENDING, CONFIG_PLUMBING, CONFIG_OVERRIDE, CONFIG_GUESS, CONFIG_VERDICT } from "./constants.js";
+import { NOT_PENDING, CONFIG_PLUMBING, CONFIG_KEY_BAG, CONFIG_OVERRIDE, CONFIG_GUESS, CONFIG_VERDICT } from "./constants.js";
 
 import { OBSERVE, liveRootOwners, emitDiagnostic, ownerPath, reportDiagnostic, isSuppressed, anyExcluded, isExcluded, GRAPH_SIZE_WARN_AT, noteFanOut } from "./dev.js";
 
@@ -670,14 +670,14 @@ const HOT_FANOUT_FIRST_MILESTONE = 5;
     const s = now();
     if (i.be === undefined || s - i.be > o.windowMs) {
         i.be = s;
-        i.Oe = 0;
-        i.Fe = false;
+        i._e = 0;
+        i.Oe = false;
     }
-    i.Oe = (i.Oe ?? 0) + n;
-    if (i.Fe || i.Oe < o.budgetMs) return;
-    i.Fe = true;
+    i._e = (i._e ?? 0) + n;
+    if (i.Oe || i._e < o.budgetMs) return;
+    i.Oe = true;
     const r = t.map(e => `"${e.name}" (${e.kind})`).join(", ");
-    const a = `[HOT_SCOPE_TIME] ${nodeKind(e)} "${nodeName(e)}" spent ` + `${i.Oe.toFixed(1)}ms of compute inside one ${o.windowMs}ms window ` + `(budget ${o.budgetMs}ms). Latest cause: ${r || "(untracked pull)"}`;
+    const a = `[HOT_SCOPE_TIME] ${nodeKind(e)} "${nodeName(e)}" spent ` + `${i._e.toFixed(1)}ms of compute inside one ${o.windowMs}ms window ` + `(budget ${o.budgetMs}ms). Latest cause: ${r || "(untracked pull)"}`;
     reportDiagnostic(emitDiagnostic({
         code: "HOT_SCOPE_TIME",
         kind: "perf",
@@ -685,7 +685,7 @@ const HOT_FANOUT_FIRST_MILESTONE = 5;
         message: a,
         nodeName: nodeName(e),
         data: {
-            spentMs: i.Oe,
+            spentMs: i._e,
             budgetMs: o.budgetMs,
             windowMs: o.windowMs,
             causes: t.map(e => e.name)
@@ -710,8 +710,8 @@ const HOT_FANOUT_FIRST_MILESTONE = 5;
     // This runs on every re-run: fields on the node (one property read each,
     // like hotRuns) and the run's own `at` — no clock read, no map lookup.
         const a = e;
-    if (a._e === undefined || n - a._e > r.windowMs) {
-        a._e = n;
+    if (a.Fe === undefined || n - a.Fe > r.windowMs) {
+        a.Fe = n;
         a.Ae = 0;
         a.Re = 0;
         a.Le = 0;
@@ -907,6 +907,8 @@ function shallowEquivalent(e, n) {
     // typeof guard: an explicit `unstableMemos: undefined` in enable() options
     // clobbers the default through the spread — treat any non-number as off.
         if (typeof o !== "number") return;
+    // merge()'s function-source memo: a key bag no user configures (#4256).
+        if (e.l & CONFIG_KEY_BAG) return;
     const i = e;
     if (n === t || // paranoia: changed runs should never hit this
     !isPlainShape(n) || !isPlainShape(t) || !shallowEquivalent(n, t)) {
@@ -1069,7 +1071,7 @@ const copyReported = new WeakSet;
     // An apply half that takes no argument cannot be copying its compute
     // output: a match is coincidence (`createEffect(open, () =>
     // setFlipped(measure()))`).
-        if (s !== undefined && t !== undefined && t === s.node.Ie && (s.node.Ge?.length ?? 1)) {
+        if (s !== undefined && t !== undefined && t === s.node.le && (s.node.Ge?.length ?? 1)) {
         copyWrites.add(n);
         o.Ue = o.qe === r ? (o.Ue ?? 0) + 1 : 1;
         o.qe = r;
@@ -1078,7 +1080,7 @@ const copyReported = new WeakSet;
 }
 
 /** The effect's source whose current value the compute output is, if any (the prop-to-state port). */ function passthroughSource(e) {
-    for (let n = e.C; n !== null; n = n.G) if (n.S.Ie === e.Ie) return nodeName(n.S);
+    for (let n = e.C; n !== null; n = n.G) if (n.S.le === e.le) return nodeName(n.S);
     return undefined;
 }
 
@@ -1452,8 +1454,8 @@ function checkWaterfall(e, n, t) {
     }
     if (i < 2) return;
     const r = e;
-    if ((r.xe ?? 0) >= i) return;
-    r.xe = i;
+    if ((r.Ke ?? 0) >= i) return;
+    r.Ke = i;
     const a = [ ...n.slice(n.length - (i - 1)), {
         name: nodeName(e),
         ms: t
@@ -1516,7 +1518,7 @@ function acknowledge(e, n, t, o) {
     const t = {
         left: HOLD_CENSUS_CAP
     };
-    const o = GlobalQueue.Ke?.(e);
+    const o = GlobalQueue.xe?.(e);
     if (o !== undefined) for (const e of o) acknowledge(n, "optimistic", nodeName(e), reachesEffect(e, t));
     if (e.I !== null) for (const o of e.I) acknowledge(n, "affects", nodeName(o), reachesEffect(o, t));
 }
@@ -1632,7 +1634,7 @@ function trackHoldSettled(e) {
     let i;
     let s;
     let r = -Infinity;
-    for (const n of e.je) {
+    for (const n of e.Ye) {
         if (typeof n.X === "function" || isCompanion(n)) continue;
         const e = n.ge;
         if (e === undefined || e.kind !== "write") continue;
@@ -1661,7 +1663,7 @@ function trackHoldSettled(e) {
         return;
     }
     censusRegistrations(e, n);
-    censusCompanions([ ...e.je, ...n.blockers ], n);
+    censusCompanions([ ...e.Ye, ...n.blockers ], n);
     const a = now();
     // The hold began no later than its first parked flush; an interaction stamp
     // reaches further back (dispatch). A node rewritten mid-hold keeps only its
@@ -1822,7 +1824,7 @@ function checkLongHold(e, n) {
     if (!options.optimisticReverts || isCompanion(e)) return;
     // Method call, as every commit path does: store slot nodes share one
     // comparator that reads `this._host` (#3687).
-        const i = e.Ye;
+        const i = e.je;
     if (i && i.call(e, n, t)) return;
     const s = nodeName(e);
     // The two values are user data: quoted only under `values: "full"`; the
@@ -2283,7 +2285,7 @@ function closeNavigation(e) {
 
 /** holdStart: `t`'s staged writes are parked — their navigations settle with `t`. */ function markNavigationsHeld(e) {
     if (openNavs.size === 0) return;
-    for (const n of e.je) {
+    for (const n of e.Ye) {
         const e = n.ge?.origin;
         if (e?.kind !== "navigation") continue;
         const t = navStates.get(e);
@@ -2293,7 +2295,7 @@ function closeNavigation(e) {
 
 /** transitionSettled: `t` commits — the navigations whose writes it staged are done. */ function settleNavigations(e, n) {
     if (openNavs.size === 0) return;
-    for (const t of e.je) {
+    for (const t of e.Ye) {
         const e = t.ge?.origin;
         if (e?.kind !== "navigation") continue;
         const o = navStates.get(e);
@@ -2615,7 +2617,7 @@ function openInteraction(e, n, t) {
 
 /** holdStart: `t` parked writes — the interactions that performed them wait for `t`. */ function markInteractionsHeld(e) {
     if (openInteractions.size === 0) return;
-    for (const n of e.je) {
+    for (const n of e.Ye) {
         const t = openInteractionOf(n.ge?.origin);
         if (t !== undefined) {
             t.heldIn.add(e);
@@ -2703,7 +2705,7 @@ const engineHooks = {
             prevDeps: n || !wantsRerun() ? null : captureDeps(e),
             // Mirror recompute's own prev-value resolution: an earlier run in the
             // same flush may still be holding in _pendingValue.
-            prevValue: e.ue !== NOT_PENDING ? e.ue : e.Ie,
+            prevValue: e.ie !== NOT_PENDING ? e.ie : e.le,
             // A create run inherits the interaction of whatever is building it: the
             // enclosing recompute (a parent's fn creating children) or, at the top
             // of the recompute stack, the effect callback / handler frame.
@@ -2730,7 +2732,7 @@ const engineHooks = {
         // exempt — a side-effect-only compute's work IS its effect phase, and
         // identity of `undefined` proves nothing.
                 if (t && r.causes !== null && e.i) {
-            const n = e.ue !== NOT_PENDING ? e.ue : e.Ie;
+            const n = e.ie !== NOT_PENDING ? e.ie : e.le;
             if (n !== undefined && n === r.prevValue) t = false;
         }
         // Unstable-output check: memos only, non-create, plain runs with a
@@ -2738,12 +2740,12 @@ const engineHooks = {
         // plain-flush memo commits and in `_value` for direct ones. Overlay runs
         // are excluded — an optimistic re-derive legitimately produces fresh
         // equivalents while the lane settles.
-                if (r.causes !== null && t && !o && !i && !e.i) checkUnstableOutput(e, r.prevValue, e.ue !== NOT_PENDING ? e.ue : e.Ie);
+                if (r.causes !== null && t && !o && !i && !e.i) checkUnstableOutput(e, r.prevValue, e.ie !== NOT_PENDING ? e.ie : e.le);
         // The same exemption for memos: a run that committed `undefined` did its
         // work as a side effect (a projection's draft writes or reconcile, a
         // write from inside a memo), so core's `undefined === undefined` gate
         // proves nothing. Reported as changed, so no consumer counts it as waste.
-                if (!t && (e.ue !== NOT_PENDING ? e.ue : e.Ie) === undefined) t = true;
+                if (!t && (e.ie !== NOT_PENDING ? e.ie : e.le) === undefined) t = true;
         if (r.causes !== null) recordRerun(e, r, {
             selfMs: c,
             totalMs: a
@@ -2786,8 +2788,8 @@ const engineHooks = {
     },
     asyncStart(e) {
         asyncStartSeq = e.ge?.seq ?? 0;
-        asyncStartTime = e.ie;
-        asyncStartValue = e.Ie;
+        asyncStartTime = e.ae;
+        asyncStartValue = e.le;
     },
     asyncEnd(e, n, t, o) {
         if (o) {
@@ -2797,7 +2799,7 @@ const engineHooks = {
             // (or `_time`, for a same-reference commit under `equals: false`), and
             // a transition hold parks the value in `_pendingValue`. A landing the
             // equality gate swallowed moves none of them and must leave no stamp.
-            const o = e.Ie !== asyncStartValue || e.ie !== asyncStartTime || e.ue === t;
+            const o = e.le !== asyncStartValue || e.ae !== asyncStartTime || e.ie === t;
             if (o) stampWrite(e, "async", n === undefined ? NO_VALUES : n, t);
             // Flight over either way — an equality-swallowed landing still spent
             // the wall time (finalizeFlight only chains through a fresh stamp).

package/dist/observe/core/constants.js

@@ -203,6 +203,22 @@ const CONFIG_HAS_SNAPSHOT = 1 << 9;
  * owns stay fully observed.
  * Set from the internal `_plumbing` option at creation; never set in prod. */ const CONFIG_PLUMBING = 1 << 25;
 
+/** Observe tiers only: the memo `merge()` creates for a function source — a
+ * key bag readers consume key by key, built by the framework (a compiled
+ * component spread) with options no user can reach. The attribution engine's
+ * UNSTABLE_MEMO_OUTPUT skips it: a fresh-but-equal bag is the idiom
+ * (`{...(on() ? { a } : {})}`), and the advice (`equals`) cannot be applied
+ * (#4256). Set through `_extraConfig` by observe builds only. */ const CONFIG_KEY_BAG = 1 << 28;
+
+/** The frame (rule 3, D-3): a render effect (set at creation, as
+ * `EFFECT_RENDER << 23` — keep the two in step), and a boundary's tree and
+ * output (boundaries.ts) — structure between the content and the render
+ * effect that shows it, not a user derivation of the content. Outside a
+ * hold's own flush it reads that hold's values as committed and is
+ * re-derived at its landing, and a re-pass of it publishes mainline: it
+ * joins nothing, so two mounts under one boundary made in separate flushes
+ * keep their holds apart (D-4, S-5 rows 1′–3′, #4283). */ const CONFIG_FRAME = 1 << 23;
+
 const STATUS_NONE = 0;
 
 const STATUS_PENDING = 1 << 0;
@@ -211,6 +227,10 @@ const STATUS_ERROR = 1 << 1;
 
 const STATUS_UNINITIALIZED = 1 << 2;
 
+/** An error that answered a node's first read (no value has ever landed):
+ * the error, not UNINITIALIZED, is its status while shown, but a re-ask
+ * makes it uninitialized-pending again — it still has no value (#4244). */ const STATUS_NO_VALUE = 1 << 3;
+
 /** `catchHook`'s answer when the catcher is a boundary re-armed by
  * `on` (truthy, as any catch): what it collects is its own, not the hold's. */ const CAUGHT_REARMED = 2;
 
@@ -236,4 +256,6 @@ const defaultContext = {};
  * @internal
  */ const $REFRESH = Symbol("refresh");
 
-export { $REFRESH, CAUGHT_REARMED, CONFIG_AUTHORITATIVE, CONFIG_AUTO_DISPOSE, CONFIG_CHILDREN_FORBIDDEN, CONFIG_FRESH_READ, CONFIG_GUESS, CONFIG_HAS_SNAPSHOT, CONFIG_HELD, CONFIG_HELD_FRAME, CONFIG_INPUTS_PUBLISHED, CONFIG_IN_SNAPSHOT_SCOPE, CONFIG_LAGS, CONFIG_MANUAL_WRITE, CONFIG_NO_SNAPSHOT, CONFIG_OVERRIDE, CONFIG_OWNED_WRITE, CONFIG_PLUMBING, CONFIG_PROMOTED, CONFIG_REDERIVE, CONFIG_SLOT_NODE, CONFIG_STAGED, CONFIG_STAGED_ERROR, CONFIG_SYNC, CONFIG_TRANSPARENT, CONFIG_VERDICT, EFFECT_RENDER, EFFECT_TRACKED, EFFECT_USER, NOT_PENDING, NO_SNAPSHOT, REACTIVE_CHECK, REACTIVE_DIRTY, REACTIVE_DISPOSED, REACTIVE_FRAME_READ, REACTIVE_IN_HEAP, REACTIVE_IN_HEAP_HEIGHT, REACTIVE_JOINED, REACTIVE_LANE_DIRTY, REACTIVE_LANE_READ, REACTIVE_LAZY, REACTIVE_MANUAL_WRITE, REACTIVE_MISSED_WAKE, REACTIVE_NONE, REACTIVE_PROBED, REACTIVE_PROBE_UNANSWERED, REACTIVE_REASK, REACTIVE_RECOMPUTING_DEPS, REACTIVE_SCREEN_READ, REACTIVE_SNAPSHOT_STALE, REACTIVE_STAGED_READ, REACTIVE_ZOMBIE, STATUS_ERROR, STATUS_NONE, STATUS_PENDING, STATUS_UNINITIALIZED, SUPPORTS_PROXY, defaultContext };
+const NewSet = Set;
+
+export { $REFRESH, CAUGHT_REARMED, CONFIG_AUTHORITATIVE, CONFIG_AUTO_DISPOSE, CONFIG_CHILDREN_FORBIDDEN, CONFIG_FRAME, CONFIG_FRESH_READ, CONFIG_GUESS, CONFIG_HAS_SNAPSHOT, CONFIG_HELD, CONFIG_HELD_FRAME, CONFIG_INPUTS_PUBLISHED, CONFIG_IN_SNAPSHOT_SCOPE, CONFIG_KEY_BAG, CONFIG_LAGS, CONFIG_MANUAL_WRITE, CONFIG_NO_SNAPSHOT, CONFIG_OVERRIDE, CONFIG_OWNED_WRITE, CONFIG_PLUMBING, CONFIG_PROMOTED, CONFIG_REDERIVE, CONFIG_SLOT_NODE, CONFIG_STAGED, CONFIG_STAGED_ERROR, CONFIG_SYNC, CONFIG_TRANSPARENT, CONFIG_VERDICT, EFFECT_RENDER, EFFECT_TRACKED, EFFECT_USER, NOT_PENDING, NO_SNAPSHOT, NewSet, REACTIVE_CHECK, REACTIVE_DIRTY, REACTIVE_DISPOSED, REACTIVE_FRAME_READ, REACTIVE_IN_HEAP, REACTIVE_IN_HEAP_HEIGHT, REACTIVE_JOINED, REACTIVE_LANE_DIRTY, REACTIVE_LANE_READ, REACTIVE_LAZY, REACTIVE_MANUAL_WRITE, REACTIVE_MISSED_WAKE, REACTIVE_NONE, REACTIVE_PROBED, REACTIVE_PROBE_UNANSWERED, REACTIVE_REASK, REACTIVE_RECOMPUTING_DEPS, REACTIVE_SCREEN_READ, REACTIVE_SNAPSHOT_STALE, REACTIVE_STAGED_READ, REACTIVE_ZOMBIE, STATUS_ERROR, STATUS_NONE, STATUS_NO_VALUE, STATUS_PENDING, STATUS_UNINITIALIZED, SUPPORTS_PROXY, defaultContext };