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

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

@@ -10,7 +10,7 @@ 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";
 
@@ -35,40 +35,44 @@ import { storeNextLookup, optHooks, ownedRaw } from "./target.js";
  *   members (R11). Kind changes replace wholesale (R10).
  */ function reconcileNextState(e, t, n, o = false) {
     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;
+    const l = t?.[$TARGET];
+    if (l === undefined || l.px !== t) throw new Error("");
+    // 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 (l.ovl) materializePB(l);
+    let f = 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
     // flow with no re-derive (#2941). The adoption diff still notifies THIS
     // store's existing subscribers of the swap.
         if (o && e !== t && e?.[$TARGET] !== undefined) {
-        const t = f.pb ?? f.v;
+        const t = l.pb ?? l.v;
         if (t === e) return;
  // already chained to this store
-                adoptPB(f, e);
+                adoptPB(l, e);
         return;
     }
     const i = unwrapValue(e);
-    if (l) {
+    if (f) {
         // 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
         // root proxy is stable for life (proj R5/R11) — and children are NOT
         // 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 e = l.pb ?? l.v;
+        const t = f(e);
+        if (t !== undefined && f(i) !== 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);
+                        (l.fam?.map ?? storeNextLookup).delete(l.pb ?? l.v);
+            adoptPB(l, i);
             return;
         }
     }
@@ -77,59 +81,59 @@ import { storeNextLookup, optHooks, ownedRaw } from "./target.js";
     // armed nodes (reverting with their transaction); committed raw is never
     // 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);
+        if (l.fam?.opt === true && !projectionWriteActive && !getWriteOverride()) {
+        optHooks.applyTentative(l, i, f);
         return;
     }
-    applyAdopt(f, i, l, o);
+    applyAdopt(l, i, f, o);
 }
 
 function applyAdopt(e, t, n, o = false) {
-    const f = e.pb ?? e.v;
+    const l = 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 === l && !ownedRaw.has(l)) return;
+    const f = 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 i = f?.opt === true ? optHooks.optimisticView(e, l) : l;
     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 u = f === null;
     const s = e.s === true;
-    const c = e.v;
+    const a = e.v;
     adoptPB(e, t, u);
     // 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) notifyFold(e, a, t);
         return;
     }
     if (r) {
-        const f = i;
+        const l = i;
         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;
+                const c = u ? e.n : null;
         let p = 0;
         if (n && !s) {
             // 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 i = l.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 u = l[d];
                 // 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
@@ -137,16 +141,16 @@ function applyAdopt(e, t, n, o = false) {
                                 if (u !== i && !(u !== null && typeof u === "object" && i !== null && typeof i === "object" && n(u) === n(i))) 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 ((u !== i || i !== null && typeof i === "object" && ownedRaw.has(i)) && i !== null && typeof i === "object") descend(unwrapValue(u), i, n, f, o);
                 if (e.dk !== null && !s && !(i !== null && typeof i === "object" ? targetsEqual(u, i) : isEqual(u, i))) {
                     bumpDeep(e);
                     s = true;
                 }
-                if (a !== null) {
-                    const e = a[d];
+                if (c !== null) {
+                    const e = c[d];
                     if (e !== undefined) {
                         p++;
-                        notifyKeyValue(e, d, c[d], i, c, t);
+                        notifyKeyValue(e, d, a[d], i, a, t);
                     }
                 }
             }
@@ -161,8 +165,8 @@ function applyAdopt(e, t, n, o = false) {
                     if (t !== undefined) {
                         if (y === null) {
                             y = new Map;
-                            for (let e = 0; e < f.length; e++) {
-                                const t = unwrapValue(f[e]);
+                            for (let e = 0; e < l.length; e++) {
+                                const t = unwrapValue(l[e]);
                                 if (t !== null && typeof t === "object") {
                                     const e = n(t);
                                     if (e !== undefined && !y.has(e)) y.set(e, t);
@@ -171,48 +175,48 @@ function applyAdopt(e, t, n, o = false) {
                         }
                         i = y.get(t);
                     } else {
-                        i = unwrapValue(f[d]);
+                        i = unwrapValue(l[d]);
  // keyless item: positional fallback
                                         }
-                    descend(i, e, n, l, o);
+                    descend(i, e, n, f, o);
                 }
-                if (a !== null) {
-                    const e = a[d];
+                if (c !== null) {
+                    const e = c[d];
                     if (e !== undefined) {
                         p++;
-                        notifyKeyDiff(e, d, c, t, false);
+                        notifyKeyDiff(e, d, a, t, false);
                     }
                 }
             }
         } else {
-            const i = Math.min(f.length, r.length);
+            const i = Math.min(l.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))) {
+                if (!s && y < i && u !== null && typeof u === "object") descend(unwrapValue(l[y]), u, n, f, o);
+                if (e.dk !== null && !d && !(u !== null && typeof u === "object" ? targetsEqual(l[y], u) : isEqual(l[y], u))) {
                     bumpDeep(e);
                     d = 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);
+                        notifyKeyDiff(e, y, a, t, false);
                     }
                 }
             }
         }
         if (u) {
-            if (a !== null && p < e.nc) {
-                for (const e of Reflect.ownKeys(a)) {
+            if (c !== null && p < 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,9 +226,9 @@ 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 l = u ? 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
@@ -232,51 +236,51 @@ function applyAdopt(e, t, n, o = false) {
         // backing is setter-diverged and must still diff).
                 for (const u in t) {
             const p = t[u];
-            const d = c[u];
+            const d = a[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++;
+            if (d === p && (!y || !ownedRaw.has(p)) && (l === null || l[u] === undefined || !hasAccessorFlag(l[u]))) {
+                if (l !== null && l[u] !== undefined) r++;
                 continue;
             }
-            if (y && !s) descend(unwrapValue(i[u]), p, n, l, o);
+            if (y && !s) descend(unwrapValue(i[u]), p, n, f, 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(d, p) : isEqual(d, p))) {
                 bumpDeep(e);
-                a = true;
+                c = true;
             }
-            if (f !== null) {
-                const e = f[u];
+            if (l !== null) {
+                const e = l[u];
                 if (e !== undefined) {
                     r++;
-                    notifyKeyValue(e, u, d, p, c, t);
+                    notifyKeyValue(e, u, d, p, 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);
-            if (f !== null) {
-                const e = f[u];
+            const c = t[u];
+            if (!s && c !== null && typeof c === "object") descend(unwrapValue(i[u]), c, n, f, o);
+            if (l !== null) {
+                const e = l[u];
                 if (e !== undefined) {
                     r++;
-                    notifyKeyValue(e, u, c[u], a, c, t);
+                    notifyKeyValue(e, u, a[u], c, a, t);
                 }
             }
         }
         if (u) {
             // 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 (l !== null && r < e.nc) {
+                for (const e of Reflect.ownKeys(l)) {
+                    if (!hasOwnP.call(t, e)) notifyKeyDiff(l[e], e, a, t, false);
                 }
             }
-            notifyFoldTail(e, c, t);
+            notifyFoldTail(e, a, t);
         }
         return;
     }
@@ -284,14 +288,14 @@ function applyAdopt(e, t, n, o = false) {
 
 const hasOwnP = Object.prototype.hasOwnProperty;
 
-function descend(e, t, n, o, f = false) {
+function descend(e, t, n, o, l = 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 f = (o?.map ?? storeNextLookup).get(e);
+    if (f === 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
@@ -305,10 +309,10 @@ function descend(e, t, n, o, f = false) {
         if (Array.isArray(e) !== Array.isArray(t)) return;
     if (n) {
         const o = n(e);
-        const f = n(t);
+        const l = 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;
+                if (o !== undefined && l !== undefined && o !== l) return;
     }
     // Reachability pruning (§6d) is MODE-dependent, both pinned:
     // - keyed matching descends only where subscriptions exist at/below (`d`) —
@@ -320,8 +324,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 (!l && n !== null && !f.d) return;
+    applyAdopt(f, t, n, l);
 }
 
 export { reconcileNextState };