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

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

@@ -8,13 +8,11 @@ import "../../core/verdict.js";
 
 import "../../core/effect.js";
 
-import { patchHooks, rowHooks } from "./patch-hooks.js";
-
 import { $TARGET, markRawIngest, isWrappable, rawValuesUsed, isRawValue, getWriteOverride } 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
@@ -35,28 +33,28 @@ import { storeNextLookup, optHooks, ownedRaw } from "./target.js";
  *   key mismatch detaches (fresh proxy on next read, recon-snap R18);
  *   keyless items fall back positional; null/primitive slots are legal
  *   members (R11). Kind changes replace wholesale (R10).
- */ function reconcileNextState(e, n, t, o = false) {
-    if (n == null) throw new Error("");
-    const l = n?.[$TARGET];
-    if (l === undefined || l.px !== n) throw new Error("");
+ */ 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("");
     // 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 i = t === null ? null : typeof t === "string" ? e => e?.[t] : t;
+        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
     // flow with no re-derive (#2941). The adoption diff still notifies THIS
     // store's existing subscribers of the swap.
-        if (o && e !== n && e?.[$TARGET] !== undefined) {
-        const n = l.pb ?? l.v;
-        if (n === e) return;
+        if (o && e !== t && e?.[$TARGET] !== undefined) {
+        const t = f.pb ?? f.v;
+        if (t === e) return;
  // already chained to this store
-                adoptPB(l, e);
+                adoptPB(f, e);
         return;
     }
-    const u = unwrapValue(e);
+    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
@@ -64,17 +62,19 @@ import { storeNextLookup, optHooks, ownedRaw } from "./target.js";
         // 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 = l.pb ?? l.v;
-        const n = i(e);
-        if (n !== undefined && !sameKey(i(u), n)) {
+        const e = f.pb ?? f.v;
+        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.
-                        (l.fam?.map ?? storeNextLookup).delete(l.pb ?? l.v);
-            adoptPB(l, u);
+                        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;
         }
     }
@@ -83,107 +83,95 @@ 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 (l.fam?.opt === true && !projectionWriteActive && !getWriteOverride()) {
-        optHooks.applyTentative(l, u, i);
+        if (f.fam?.opt === true && !projectionWriteActive && !getWriteOverride()) {
+        optHooks.applyTentative(f, l, i);
         return;
     }
-    applyAdopt(l, u, i, o);
+    applyAdopt(f, l, i, o);
 }
 
-function applyAdopt(e, n, t, o = false) {
-    const l = e.pb ?? e.v;
+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 (n === l && !ownedRaw.has(l)) return;
+        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 u = i?.opt === true ? optHooks.optimisticView(e, l) : l;
-    const f = Array.isArray(n);
+        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 s = i === null;
-    const r = e.s === true;
-    const c = e.v;
-    adoptPB(e, n, s);
-    // Patch channel (adoption site): this record transitioned — queue its
-    // patches with the pre-adopt prev. No bubbling walk: the adoption walk
-    // visits parents before children, so ancestors emitted already. EAGER
-    // only — family targets' visibility moment is their fold commit
-    // (drainFolds emits there; emitting here too would double-fire).
-        if (patchHooks !== null && s && e.pc !== null && e.pc.p !== null) {
-        // Accessor demotion at the ADOPTION seam is DEV-ONLY (prod principle:
-        // explicitly-odd input must not cost correct-input prod — the
-        // per-adoption scan was ~12% of dbmon's tick since adoptPB resets the
-        // verdict every adoption). Dev demotes AND warns; prod emits directly,
-        // so a getter adoptee's OUTSIDE deps (signals) won't re-apply in prod —
-        // caught loudly during development instead. Registration-time admission
-        // (patchableRaw) keeps its full one-time scan in both modes.
-        {
-            patchHooks.emitPatchLocal(e, n, c);
-        }
-    }
+    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 (r) markRawIngest(n);
-    if (Array.isArray(u) !== f) {
-        if (s) notifyFold(e, c, n);
+        if (u) markRawIngest(t);
+    if (Array.isArray(l) !== r) {
+        if (s) notifyFold(e, a, t);
         return;
     }
-    if (f) {
-        const l = u;
-        const f = n;
+    if (r) {
+        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 = s ? e.n : null;
-        let p = 0;
-        if (t && !r) {
+                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 u = l.length;
-            const s = f.length;
-            let r = false;
-            let d = 0;
-            for (const y = Math.min(u, s); d < y; d++) {
-                const u = f[d];
-                const s = l[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 (s !== u && !(s !== null && typeof s === "object" && u !== null && typeof u === "object" && sameKey(t(s), t(u)))) 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 ((s !== u || u !== null && typeof u === "object" && ownedRaw.has(u)) && u !== null && typeof u === "object") descend(unwrapValue(s), u, t, i, o);
-                if (e.dk !== null && !r && !(u !== null && typeof u === "object" ? targetsEqual(s, u) : isEqual(s, u))) {
+                                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);
-                    r = 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], u, c, n);
+                        d++;
+                        notifyKeyValue(e, p, a[p], l, a, t);
                     }
                 }
             }
-            if (e.dk !== null && !r && d < f.length) bumpDeep(e);
-            const y = d;
+            if (e.dk !== null && !u && p < r.length) bumpDeep(e);
+            const y = p;
  // misalignment point (== nlen on aligned ticks)
                         let w = null;
-            for (;d < f.length; d++) {
-                const e = f[d];
+            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 n = t(e);
-                    let u;
-                    if (n !== undefined) {
+                    const t = n(e);
+                    let l;
+                    if (t !== undefined) {
                         if (w === null) {
                             // Occurrence-aware (re-audit 2, P1-5): duplicate keys queue
                             // their prev INDICES (rows can themselves be arrays, so index
@@ -197,112 +185,67 @@ function applyAdopt(e, n, t, o = false) {
                             // 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 < l.length; e++) {
-                                const n = unwrapValue(l[e]);
-                                if (n !== null && typeof n === "object") {
-                                    const o = t(n);
+                                                        for (let e = y; e < f.length; e++) {
+                                const t = unwrapValue(f[e]);
+                                if (t !== null && typeof t === "object") {
+                                    const o = n(t);
                                     if (o === undefined) continue;
-                                    const l = w.get(o);
-                                    if (l === undefined) w.set(o, e); else if (Array.isArray(l)) l.push(e); else w.set(o, [ l, e ]);
+                                    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 ]);
                                 }
                             }
                         }
-                        const e = w.get(n);
-                        if (e === undefined) u = undefined; else if (Array.isArray(e)) {
-                            u = unwrapValue(l[e.shift()]);
-                            if (e.length === 1) w.set(n, e[0]);
+                        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 {
-                            u = unwrapValue(l[e]);
-                            w.delete(n);
+                            l = unwrapValue(f[e]);
+                            w.delete(t);
                         }
                     } else {
-                        u = unwrapValue(l[d]);
+                        l = unwrapValue(f[p]);
  // keyless item: positional fallback
                                         }
-                    descend(u, e, t, i, 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, n, false);
+                        d++;
+                        notifyKeyDiff(e, p, a, t, false);
                     }
                 }
             }
-            // Row ops (PR-B): emit structural ops ONLY when structure changed —
-            // aligned value ticks pay nothing. Built after the walk so retained
-            // rows' value patches queue first (adds bind at op-apply).
-                        if (rowHooks !== null && e.pc !== null && e.pc.ro !== null && (y < s || u !== s)) buildAndEmitRowOps(e, l, f, y, t);
         } else {
-            const u = Math.min(l.length, f.length);
-            const s = f.length;
-            let d = false;
-            const y = rowHooks !== null && e.pc !== null ? e.pc.sp : null;
-            // Row ops for shallow/positional lists: track the key-aligned prefix
-            // (keyed) so aligned value ticks emit nothing; keyless lists emit only
-            // on length change (append/truncate). Slot-patch consumers need the
-            // alignment tracking too (aligned = value tick, misaligned = ops).
-                        const w = rowHooks !== null && e.pc !== null ? e.pc.ro : null;
-            let b = t !== null && (w !== null || y !== null);
-            let m = 0;
-            for (let w = 0; w < s; w++) {
-                const s = f[w];
-                if (b && w < u) {
-                    const e = l[w];
-                    if (e !== null && typeof e === "object" && s !== null && typeof s === "object" && 
-                    // SameValueZero (self-sweep): strict === here broke slot
-                    // alignment on NaN keys while buildRowOps retained the row —
-                    // retained DOM with suppressed value ticks (the round-1 NaN
-                    // staleness, in the shallow branch).
-                    sameKey(t(e), t(s))) m++; else b = false;
-                }
-                // Slot-patch dispatch (shallow): a KEY-ALIGNED slot whose value was
-                // replaced by reference is a value tick — emit through the queue.
-                // Misaligned/appended slots are STRUCTURE (row ops rebuild or move
-                // them; new rows initial-apply at bind), so they emit nothing here.
-                // Keyless positional lists treat same-index replacement as the value
-                // tick for indices below the common length.
-                // `i < dlen` is load-bearing for BOTH modes: an appended position
-                // past a fully-aligned prefix (vacuously aligned when prev is empty)
-                // has no previous slot — emitting a slot tick for it races the row
-                // ops that CREATE the row (the slot queue applies first, indexing a
-                // row that does not exist yet). Equivalence-matrix finding:
-                // clear-then-refill and pure appends crashed the driver.
-                                if (y !== null && w < u && (t === null || b)) {
-                    const n = l[w];
-                    if (n !== s) rowHooks.emitSlotPatch(e, w, s, n);
-                }
-                if (!r && w < u && s !== null && typeof s === "object") descend(unwrapValue(l[w]), s, t, i, o);
-                if (e.dk !== null && !d && !(s !== null && typeof s === "object" ? targetsEqual(l[w], s) : isEqual(l[w], s))) {
+            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[w];
+                if (c !== null) {
+                    const e = c[y];
                     if (e !== undefined) {
-                        p++;
-                        notifyKeyDiff(e, w, c, n, false);
+                        d++;
+                        notifyKeyDiff(e, y, a, t, false);
                     }
                 }
             }
-            if (w !== null) {
-                const n = l.length;
-                if (t !== null) {
-                    if (m < s || n !== s) buildAndEmitRowOps(e, l, f, m, t);
-                } else if (n !== s) {
-                    buildAndEmitRowOps(e, l, f, u, null);
-                }
-            }
         }
         if (s) {
-            if (a !== null && p < e.nc) {
-                for (const e of Reflect.ownKeys(a)) {
+            if (c !== null && d < e.nc) {
+                for (const e of Reflect.ownKeys(c)) {
                     // visited indexes are < nextRows.length; everything else sweeps
-                    const t = typeof e === "string" ? +e : NaN;
-                    if (!(t >= 0 && t < f.length)) notifyKeyDiff(a[e], e, c, n, false);
+                    const n = typeof e === "string" ? +e : NaN;
+                    if (!(n >= 0 && n < r.length)) notifyKeyDiff(c[e], e, a, t, false);
                 }
             }
-            notifyFoldTail(e, c, n);
+            notifyFoldTail(e, a, t);
         }
         return;
     } else {
@@ -312,68 +255,62 @@ function applyAdopt(e, n, t, 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.
-        // PROTOTYPE compiled-patch fast path: a pure-patch record (no nodes,
-        // no presence/key-set/deep subscribers, no family) adopts and hands the
-        // (next, prev) pair to its compiled patch — no per-key walk at all.
-        if (e.pc !== null && e.pc.p !== null && s && e.n === null && e.h === null && e.k === null && e.dk === null && i === null) {
-            // Adoption already ran at applyAdopt entry; emission was queued there.
-            return;
-        }
-        const l = s ? e.n : null;
-        let f = 0;
-        let a = false;
+        const f = s ? e.n : null;
+        let r = 0;
+        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 s in n) {
-            const p = n[s];
-            const d = c[s];
-            const y = p !== null && typeof p === "object";
-            if (d === p && (!y || !ownedRaw.has(p)) && (l === null || l[s] === undefined || !hasAccessorFlag(l[s]))) {
-                if (l !== null && l[s] !== undefined) f++;
+                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 && !r) descend(unwrapValue(u[s]), p, t, i, 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 (l !== null) {
-                const e = l[s];
+            if (f !== null) {
+                const e = f[s];
                 if (e !== undefined) {
-                    f++;
-                    notifyKeyValue(e, s, d, p, c, n);
+                    r++;
+                    notifyKeyValue(e, s, p, d, a, t);
                 }
             }
         }
-        const p = Object.getOwnPropertySymbols(n);
-        for (let e = 0; e < p.length; e++) {
-            const s = p[e];
-            const a = n[s];
-            if (!r && a !== null && typeof a === "object") descend(unwrapValue(u[s]), a, t, i, o);
-            if (l !== null) {
-                const e = l[s];
+        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[s];
                 if (e !== undefined) {
-                    f++;
-                    notifyKeyValue(e, s, c[s], a, c, n);
+                    r++;
+                    notifyKeyValue(e, s, a[s], c, a, t);
                 }
             }
         }
         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 (l !== null && f < e.nc) {
-                for (const e of Reflect.ownKeys(l)) {
-                    if (!hasOwnP.call(n, e)) notifyKeyDiff(l[e], e, c, n, false);
+            if (f !== null && r < e.nc) {
+                for (const e of Reflect.ownKeys(f)) {
+                    if (!hasOwnP.call(t, e)) notifyKeyDiff(f[e], e, a, t, false);
                 }
             }
-            notifyFoldTail(e, c, n);
+            notifyFoldTail(e, a, t);
         }
         return;
     }
@@ -383,123 +320,41 @@ 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
- * assignment/permutation — is a visibility transition for the list container
- * just like a reconcile walk, and drivers consuming registerRowOps must see
- * it. Setter mutations move the SAME row objects around, so RAW IDENTITY is
- * the key. Aligned arrays (value-only folds) emit nothing. */ const identityKey = e => unwrapValue(e);
-
 /** Key equality for EVERY key comparison in this module (re-audit 2, P1-5):
- * SameValueZero, matching the Map-based matchers (buildRowOps, the adoption
- * window) — NaN keys are equal to themselves, so aligned NaN rows stay
- * aligned in the prefix walk instead of forever misaligning. Adoption and
- * row ops MUST agree on key equality or retained DOM rows go stale. */ function sameKey(e, n) {
-    return e === n || e !== e && n !== n;
-}
-
-function emitSetterRowOps(e, n, t) {
-    const o = buildIdentityRowOps(n, t);
-    if (o !== null) rowHooks.emitRowOps(e, t, o);
-}
-
-/** Identity-keyed structural diff, returned rather than emitted: shared by
- * the setter channel (regular queue) and the OPTIMISTIC write channel (lane
- * queue) — same retention semantics, different dispatch timing. Returns
- * null when the lists are identity-aligned (no structure changed). */ function buildIdentityRowOps(e, n) {
-    let t = 0;
-    const o = e.length < n.length ? e.length : n.length;
-    while (t < o && unwrapValue(e[t]) === unwrapValue(n[t])) t++;
-    if (t === e.length && t === n.length) return null;
-    return buildRowOps(e, n, t, identityKey);
-}
-
-/** Shared row-ops builder (keyed deep branch + shallow/positional branch):
- * key-matches the misaligned window into { prefix, sources, removed }.
- * `keyFn === null` degrades to positional ops (append/truncate only). */ function buildAndEmitRowOps(e, n, t, o, l) {
-    rowHooks.emitRowOps(e, t, buildRowOps(n, t, o, l));
-}
-
-function buildRowOps(e, n, t, o) {
-    const l = e.length;
-    const i = n.length;
-    const u = new Array(i - t);
-    // Occurrence-aware matching (re-audit): duplicate keys queue their old
-    // indices and each is consumed ONCE — first-wins reuse would hand the same
-    // source (and its one DOM row) to multiple next positions. The no-dup fast
-    // shape stays a bare number; collisions upgrade to a queue.
-        let f = null;
-    if (o !== null && t < l) {
-        f = new Map;
-        for (let n = t; n < l; n++) {
-            const t = unwrapValue(e[n]);
-            if (t !== null && typeof t === "object") {
-                const e = o(t);
-                if (e === undefined) continue;
-                const l = f.get(e);
-                if (l === undefined) f.set(e, n); else if (Array.isArray(l)) l.push(n); else f.set(e, [ l, n ]);
-            }
-        }
-    }
-    const s = f !== null ? new Set : null;
-    for (let e = t; e < i; e++) {
-        const l = n[e];
-        let i = -1;
-        if (l !== null && typeof l === "object" && f !== null) {
-            const e = o(l);
-            if (e !== undefined) {
-                const n = f.get(e);
-                if (n !== undefined) {
-                    if (Array.isArray(n)) {
-                        i = n.shift();
-                        if (n.length === 1) f.set(e, n[0]);
-                    } else {
-                        i = n;
-                        f.delete(e);
-                    }
-                    s.add(i);
-                }
-            }
-        }
-        u[e - t] = i;
-    }
-    const r = [];
-    for (let n = t; n < l; n++) {
-        if (s === null || !s.has(n)) r.push(unwrapValue(e[n]));
-    }
-    return {
-        prefix: t,
-        sources: u,
-        removed: r
-    };
+ * 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, n, t, o, l = false) {
-    if (e === null || typeof e !== "object" || n === null || typeof n !== "object") return;
+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 i = (o?.map ?? storeNextLookup).get(e);
+        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
     // into (R42); the parent's slot notification covers the change.
-        if (!isWrappable(n)) return;
-    if (rawValuesUsed && isRawValue(n)) return;
-    n = unwrapValue(n);
+        if (!isWrappable(t)) return;
+    if (rawValuesUsed && isRawValue(t)) return;
+    t = unwrapValue(t);
     // Kind change replaces wholesale, never merges (R10): a target's carrier
     // class (array vs object) is fixed at creation, so the slot detaches and a
     // fresh proxy of the right kind wraps the incoming value on next read.
-        if (Array.isArray(e) !== Array.isArray(n)) return;
-    if (t) {
-        const o = t(e);
-        const l = t(n);
+        if (Array.isArray(e) !== Array.isArray(t)) return;
+    if (n) {
+        const o = n(e);
+        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.
         // 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 && l !== undefined && !sameKey(o, l)) return;
+                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`) —
@@ -511,8 +366,8 @@ function descend(e, n, t, o, l = 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 (!l && t !== null && !i.d) return;
-    applyAdopt(i, n, t, l);
+        if (!f && n !== null && !i.d) return;
+    applyAdopt(i, t, n, f);
 }
 
-export { buildIdentityRowOps, emitSetterRowOps, reconcileNextState, sameKey };
+export { reconcileNextState, sameKey };