@solidjs/signals 2.0.0-rc.1 → 2.0.0-rc.11

package/dist/prod/store/next/reconcile.js

@@ -10,9 +10,9 @@ import "../../core/effect.js";
 
 import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue, getWriteOverride } from "../store.js";
 
-import { adoptPB, unwrapValue, notifyFold, targetsEqual, bumpDeep, notifyKeyValue, notifyKeyDiff, notifyFoldTail, hasAccessorFlag } from "./store.js";
+import { materializePB, adoptPB, unwrapValue, notifyFold, targetsEqual, bumpDeep, notifyKeyValue, notifyKeyDiff, notifyFoldTail, hasAccessorFlag } from "./store.js";
 
-import { storeNextLookup, optHooks, ownedRaw } from "./target.js";
+import { isOwned, $OWNER, storeNextLookup, optHooks, lookupTarget } from "./target.js";
 
 /**
  * Store rewrite — reconcile, the adoption channel (INTERNALS-STORE-STATE.md
@@ -37,7 +37,11 @@ import { storeNextLookup, optHooks, ownedRaw } from "./target.js";
     if (t == null) throw new Error("");
     const f = t?.[$TARGET];
     if (f === undefined || f.px !== t) throw new Error("");
-    let l = n === null ? null : typeof n === "string" ? e => e?.[n] : n;
+    // Reconcile's diff walks need a REAL pending container — a prototype
+    // overlay (#3044) materializes to the clone path first (edge: reconcile
+    // inside a setter that already wrote this target).
+        if (f.ovl) materializePB(f);
+    let i = n === null ? null : typeof n === "string" ? e => e?.[n] : n;
     // §7b chained backing: a projection derive returning a LIVE store proxy
     // adopts the proxy itself as the backing — reads flow through the inner
     // store's traps, so consumers subscribe to the inner graph and updates
@@ -50,8 +54,8 @@ import { storeNextLookup, optHooks, ownedRaw } from "./target.js";
                 adoptPB(f, e);
         return;
     }
-    const i = unwrapValue(e);
-    if (l) {
+    const l = unwrapValue(e);
+    if (i) {
         // Root identity precondition — checked before ANY mutation, so a throwing
         // reconcile is atomic by construction (RUL-12 ruling). Projections
         // (replace=true) relax it: a root entity change merges in place — the
@@ -59,16 +63,18 @@ import { storeNextLookup, optHooks, ownedRaw } from "./target.js";
         // key-matched across the entity change (proj R7: keyFn drops to
         // positional so old-entity subtrees never merge into the new entity's).
         const e = f.pb ?? f.v;
-        const t = l(e);
-        if (t !== undefined && l(i) !== t) {
+        const t = i(e);
+        if (t !== undefined && !sameKey(i(l), t)) {
             if (!o) throw new Error("");
             // Entity change: wholesale swap. The root proxy is stable for life
             // (proj R5) but NOTHING below survives — children are never matched
             // across an entity change even when their own keys align (proj R7).
             // Displaced-raw unregistration (proj R10): the outgoing raw stops
             // resolving to this proxy; re-handed later it wraps fresh.
-                        (f.fam?.map ?? storeNextLookup).delete(f.pb ?? f.v);
-            adoptPB(f, i);
+                        const e = f.pb ?? f.v;
+            if (isOwned(e)) delete e[$OWNER]; // disown: wraps fresh if re-handed
+             else (f.fam?.map ?? storeNextLookup).delete(e);
+            adoptPB(f, l);
             return;
         }
     }
@@ -78,141 +84,168 @@ import { storeNextLookup, optHooks, ownedRaw } from "./target.js";
     // touched. Key-matched rows keep proxy identity by descending into the
     // existing child targets instead of overriding their parent slots.
         if (f.fam?.opt === true && !projectionWriteActive && !getWriteOverride()) {
-        optHooks.applyTentative(f, i, l);
+        optHooks.applyTentative(f, l, i);
         return;
     }
-    applyAdopt(f, i, l, o);
+    applyAdopt(f, l, i, o);
 }
 
 function applyAdopt(e, t, n, o = false) {
     const f = e.pb ?? e.v;
     // The sound identity skip (O7): same reference AND we never diverged it.
-        if (t === f && !ownedRaw.has(f)) return;
-    const l = e.fam;
+        if (t === f && !isOwned(f)) return;
+    const i = e.fam;
     // §6b (R28): the diff's previous-arrangement baseline is the LANE VIEW —
     // optimistic rows must be visible to key matching so a landing carrying the
     // same key recycles their proxies. Raw `prev` keeps the identity/ownership
     // roles above; only matching reads the view.
-        const i = l?.opt === true ? optHooks.optimisticView(e, f) : f;
+        const l = i?.opt === true ? optHooks.optimisticView(e, f) : f;
     const r = Array.isArray(t);
     // Plain stores notify inline AFTER the descent (child registrations feed
     // the fold diff's identity-preservation check); projections keep deferred
     // folds (downstream holds can form later in the flush).
-        const u = l === null;
-    const s = e.s === true;
-    const c = e.v;
-    adoptPB(e, t, u);
+        const s = i === null;
+    const u = e.s === true;
+    // Node-notify base is the view the nodes were last told (#3296): a draft
+    // preceding this reconcile already moved them to its pending backing at
+    // setter exit (prev, materialized above), so diffing incoming against the
+    // committed backing would skip a key the draft changed and the reconcile
+    // restores — the node would commit the superseded draft value.
+        const a = f;
+    adoptPB(e, t, s);
     // Shallow adoption: records are slot values — sticky raw-mark the incoming
     // set (R41) and never descend; slot notification is the positional diff.
-        if (s) markRawIngest(t);
-    if (Array.isArray(i) !== r) {
-        if (u) notifyFold(e, c, t);
+        if (u) markRawIngest(t);
+    if (Array.isArray(l) !== r) {
+        if (s) notifyFold(e, a, t);
         return;
     }
     if (r) {
-        const f = i;
+        const f = l;
         const r = t;
         // Fused array walk (eager mode): per-index notification rides the same
         // loop as the descent (descend first — targetsEqual needs the child's
         // re-registration, R9). Length, trailing removed indexes, and any other
         // unvisited node keys land in the counted sweep below.
-                const a = u ? e.n : null;
-        let p = 0;
-        if (n && !s) {
+                const c = s ? e.n : null;
+        let d = 0;
+        if (n && !u) {
             // Positional-prefix fast path (legacy keyedMatch-walk parity): while
             // rows key-match in place — the steady-state polling shape — descend
             // directly with zero staging. The prevByKey map is built only for the
             // misaligned remainder, and never at all on aligned ticks.
-            const i = f.length;
-            const u = r.length;
-            let s = false;
-            let d = 0;
-            for (const y = Math.min(i, u); d < y; d++) {
-                const i = r[d];
-                const u = f[d];
+            const l = f.length;
+            const s = r.length;
+            let u = false;
+            let p = 0;
+            for (const y = Math.min(l, s); p < y; p++) {
+                const l = r[p];
+                const s = f[p];
                 // Routing heuristic only (aligned vs keyed remainder) — both routes
                 // notify identically and descend() is the one authoritative
                 // validator, so bare typeof gates suffice here; full isWrappable
                 // per row was the walk's dominant residual cost.
-                                if (u !== i && !(u !== null && typeof u === "object" && i !== null && typeof i === "object" && n(u) === n(i))) break;
+                                if (s !== l && !(s !== null && typeof s === "object" && l !== null && typeof l === "object" && sameKey(n(s), n(l)))) break;
  // misaligned: fall to the keyed remainder below
                 // Identity skip inline (FINDING-1 guard), then descend the pair.
-                                if ((u !== i || i !== null && typeof i === "object" && ownedRaw.has(i)) && i !== null && typeof i === "object") descend(unwrapValue(u), i, n, l, o);
-                if (e.dk !== null && !s && !(i !== null && typeof i === "object" ? targetsEqual(u, i) : isEqual(u, i))) {
+                                if ((s !== l || l !== null && typeof l === "object" && isOwned(l)) && l !== null && typeof l === "object") descend(unwrapValue(s), l, n, i, o);
+                if (e.dk !== null && !u && !(l !== null && typeof l === "object" ? targetsEqual(s, l) : isEqual(s, l))) {
                     bumpDeep(e);
-                    s = true;
+                    u = true;
                 }
-                if (a !== null) {
-                    const e = a[d];
+                if (c !== null) {
+                    const e = c[p];
                     if (e !== undefined) {
-                        p++;
-                        notifyKeyValue(e, d, c[d], i, c, t);
+                        d++;
+                        notifyKeyValue(e, p, a[p], l, a, t);
                     }
                 }
             }
-            if (e.dk !== null && !s && d < r.length) bumpDeep(e);
-            let y = null;
-            for (;d < r.length; d++) {
-                const e = r[d];
+            if (e.dk !== null && !u && p < r.length) bumpDeep(e);
+            const y = p;
+ // misalignment point (== nlen on aligned ticks)
+                        let w = null;
+            for (;p < r.length; p++) {
+                const e = r[p];
                 // typeof gates route; descend validates (same contract as the prefix).
                                 if (e !== null && typeof e === "object") {
                     const t = n(e);
-                    let i;
+                    let l;
                     if (t !== undefined) {
-                        if (y === null) {
-                            y = new Map;
-                            for (let e = 0; e < f.length; e++) {
+                        if (w === null) {
+                            // Occurrence-aware (re-audit 2, P1-5): duplicate keys queue
+                            // their prev INDICES (rows can themselves be arrays, so index
+                            // queues are the unambiguous encoding — same as buildRowOps)
+                            // and each is consumed ONCE. First-wins would adopt two next
+                            // rows into the SAME prev target while row ops retain two
+                            // separate DOM rows (the second one stale).
+                            w = new Map;
+                            // From structStart, not 0 (re-audit 3, P1-2): prefix-aligned
+                            // rows already adopted their incoming counterparts — re-offering
+                            // them here let a duplicate key adopt a prefix row AGAIN while
+                            // row ops (which correctly window from structStart) retained
+                            // the later occurrence's DOM row against a never-adopted target.
+                                                        for (let e = y; e < f.length; e++) {
                                 const t = unwrapValue(f[e]);
                                 if (t !== null && typeof t === "object") {
-                                    const e = n(t);
-                                    if (e !== undefined && !y.has(e)) y.set(e, t);
+                                    const o = n(t);
+                                    if (o === undefined) continue;
+                                    const f = w.get(o);
+                                    if (f === undefined) w.set(o, e); else if (Array.isArray(f)) f.push(e); else w.set(o, [ f, e ]);
                                 }
                             }
                         }
-                        i = y.get(t);
+                        const e = w.get(t);
+                        if (e === undefined) l = undefined; else if (Array.isArray(e)) {
+                            l = unwrapValue(f[e.shift()]);
+                            if (e.length === 1) w.set(t, e[0]);
+                        } else {
+                            l = unwrapValue(f[e]);
+                            w.delete(t);
+                        }
                     } else {
-                        i = unwrapValue(f[d]);
+                        l = unwrapValue(f[p]);
  // keyless item: positional fallback
                                         }
-                    descend(i, e, n, l, o);
+                    descend(l, e, n, i, o);
                 }
-                if (a !== null) {
-                    const e = a[d];
+                if (c !== null) {
+                    const e = c[p];
                     if (e !== undefined) {
-                        p++;
-                        notifyKeyDiff(e, d, c, t, false);
+                        d++;
+                        notifyKeyDiff(e, p, a, t, false);
                     }
                 }
             }
         } else {
-            const i = Math.min(f.length, r.length);
-            const u = r.length;
-            let d = false;
-            for (let y = 0; y < u; y++) {
-                const u = r[y];
-                if (!s && y < i && u !== null && typeof u === "object") descend(unwrapValue(f[y]), u, n, l, o);
-                if (e.dk !== null && !d && !(u !== null && typeof u === "object" ? targetsEqual(f[y], u) : isEqual(f[y], u))) {
+            const l = Math.min(f.length, r.length);
+            const s = r.length;
+            let p = false;
+            for (let y = 0; y < s; y++) {
+                const s = r[y];
+                if (!u && y < l && s !== null && typeof s === "object") descend(unwrapValue(f[y]), s, n, i, o);
+                if (e.dk !== null && !p && !(s !== null && typeof s === "object" ? targetsEqual(f[y], s) : isEqual(f[y], s))) {
                     bumpDeep(e);
-                    d = true;
+                    p = true;
                 }
-                if (a !== null) {
-                    const e = a[y];
+                if (c !== null) {
+                    const e = c[y];
                     if (e !== undefined) {
-                        p++;
-                        notifyKeyDiff(e, y, c, t, false);
+                        d++;
+                        notifyKeyDiff(e, y, a, t, false);
                     }
                 }
             }
         }
-        if (u) {
-            if (a !== null && p < e.nc) {
-                for (const e of Reflect.ownKeys(a)) {
+        if (s) {
+            if (c !== null && d < e.nc) {
+                for (const e of Reflect.ownKeys(c)) {
                     // visited indexes are < nextRows.length; everything else sweeps
                     const n = typeof e === "string" ? +e : NaN;
-                    if (!(n >= 0 && n < r.length)) notifyKeyDiff(a[e], e, c, t, false);
+                    if (!(n >= 0 && n < r.length)) notifyKeyDiff(c[e], e, a, t, false);
                 }
             }
-            notifyFoldTail(e, c, t);
+            notifyFoldTail(e, a, t);
         }
         return;
     } else {
@@ -222,61 +255,62 @@ function applyAdopt(e, t, n, o = false) {
         // slots must not notify, R9). This replaces the notifyFold re-walk that
         // doubled dbmon's diff cost. for-in covers own enumerable string keys
         // with no key-array allocation; symbols get a pass only when present.
-        const f = u ? e.n : null;
+        const f = s ? e.n : null;
         let r = 0;
-        let a = false;
+        let c = false;
         // The per-key body is inlined on purpose (legacy applyStateFast parity:
         // an extracted helper costs a call per key on the hottest object-diff
         // site). Reference-identical values early-continue BEFORE any other
         // work — sound only with the ownership guard (FINDING-1: an owned
         // backing is setter-diverged and must still diff).
-                for (const u in t) {
-            const p = t[u];
-            const d = c[u];
-            const y = p !== null && typeof p === "object";
-            if (d === p && (!y || !ownedRaw.has(p)) && (f === null || f[u] === undefined || !hasAccessorFlag(f[u]))) {
-                if (f !== null && f[u] !== undefined) r++;
+                for (const s in t) {
+            const d = t[s];
+            const p = a[s];
+            const y = d !== null && typeof d === "object";
+            if (p === d && (!y || !isOwned(d)) && (f === null || f[s] === undefined || !hasAccessorFlag(f[s]))) {
+                if (f !== null && f[s] !== undefined) r++;
                 continue;
             }
-            if (y && !s) descend(unwrapValue(i[u]), p, n, l, o);
+            if (y && !u) descend(unwrapValue(l[s]), d, n, i, o);
             // Deep-witness (dk): value changes must notify even with NO per-key
             // node — deep() subscribes one node per record. Checked after descend
             // so in-place adoptions (same logical slot) don't bump; child records
             // carry their own witness. One flag + null check when unused.
-                        if (e.dk !== null && !a && !(y ? targetsEqual(d, p) : isEqual(d, p))) {
+                        if (e.dk !== null && !c && !(y ? targetsEqual(p, d) : isEqual(p, d))) {
                 bumpDeep(e);
-                a = true;
+                c = true;
             }
             if (f !== null) {
-                const e = f[u];
+                const e = f[s];
                 if (e !== undefined) {
                     r++;
-                    notifyKeyValue(e, u, d, p, c, t);
+                    notifyKeyValue(e, s, p, d, a, t);
                 }
             }
         }
-        const p = Object.getOwnPropertySymbols(t);
-        for (let e = 0; e < p.length; e++) {
-            const u = p[e];
-            const a = t[u];
-            if (!s && a !== null && typeof a === "object") descend(unwrapValue(i[u]), a, n, l, o);
+        const d = Object.getOwnPropertySymbols(t);
+        for (let e = 0; e < d.length; e++) {
+            const s = d[e];
+            if (s === $OWNER) continue;
+            const c = t[s];
+            if (!u && c !== null && typeof c === "object") descend(unwrapValue(l[s]), c, n, i, o);
             if (f !== null) {
-                const e = f[u];
+                const e = f[s];
                 if (e !== undefined) {
                     r++;
-                    notifyKeyValue(e, u, c[u], a, c, t);
+                    notifyKeyValue(e, s, a[s], c, a, t);
                 }
             }
         }
-        if (u) {
+        if (s) {
             // Deleted-key nodes (in the map but absent from incoming) — counted
             // fast-out: when every node was visited, skip the sweep entirely.
             if (f !== null && r < e.nc) {
                 for (const e of Reflect.ownKeys(f)) {
-                    if (!hasOwnP.call(t, e)) notifyKeyDiff(f[e], e, c, t, false);
+                    if (!hasOwnP.call(t, e)) notifyKeyDiff(f[e], e, a, t, false);
                 }
             }
-            notifyFoldTail(e, c, t);
+            notifyFoldTail(e, a, t);
         }
         return;
     }
@@ -284,14 +318,23 @@ function applyAdopt(e, t, n, o = false) {
 
 const hasOwnP = Object.prototype.hasOwnProperty;
 
+/** Setter-channel row ops (the fold site calls this for array targets with
+ * ops consumers): structural mutation through the setter — push/splice/index
+/** Key equality for EVERY key comparison in this module (re-audit 2, P1-5):
+ * SameValueZero, matching the adoption window's Map-based matcher — NaN keys
+ * are equal to themselves, so aligned NaN rows stay aligned in the prefix
+ * walk instead of forever misaligning. */ function sameKey(e, t) {
+    return e === t || e !== e && t !== t;
+}
+
 function descend(e, t, n, o, f = false) {
     if (e === null || typeof e !== "object" || t === null || typeof t !== "object") return;
     // Lookup FIRST: a hit implies pv was wrappable and never raw-marked (only
     // wrappables acquire targets; rawValues never wrap) — one WeakMap get
     // replaces isWrappable(pv) + isRawValue(pv), and a miss prunes untracked
     // subtrees before any further checks.
-        const l = (o?.map ?? storeNextLookup).get(e);
-    if (l === undefined) return;
+        const i = lookupTarget(e, o);
+    if (i === undefined) return;
  // nothing proxied below this pair
     // The NEW side still validates fully: a frozen/platform/markRaw'd incoming
     // value is a leaf for reconcile — replaced by reference, never recursed
@@ -308,7 +351,10 @@ function descend(e, t, n, o, f = false) {
         const f = n(t);
         // Key mismatch detaches: the slot takes the new entity; the old proxy
         // keeps its (old) backing and a fresh proxy wraps the new value on read.
-                if (o !== undefined && f !== undefined && o !== f) return;
+        // SameValueZero (re-audit 2, P1-5): NaN keys are self-equal — strict
+        // inequality detached every NaN-keyed slot on every tick while the
+        // Map-based row-ops matcher retained its DOM row (stale forever).
+                if (o !== undefined && f !== undefined && !sameKey(o, f)) return;
     }
     // Reachability pruning (§6d) is MODE-dependent, both pinned:
     // - keyed matching descends only where subscriptions exist at/below (`d`) —
@@ -320,8 +366,8 @@ function descend(e, t, n, o, f = false) {
     // UNCONDITIONALLY (proj R6: the slot keeps its proxy without needing a
     // subscriber below); plain keyed reconcile detaches unobserved captures
     // (recon-snap R18 — staleness is the pinned pruning contract).
-        if (!f && n !== null && !l.d) return;
-    applyAdopt(l, t, n, f);
+        if (!f && n !== null && !i.d) return;
+    applyAdopt(i, t, n, f);
 }
 
-export { reconcileNextState };
+export { reconcileNextState, sameKey };