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

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

@@ -1,8 +1,10 @@
-import { CONFIG_AUTO_DISPOSE, STATUS_PENDING, NOT_PENDING, CONFIG_OPTIMISTIC, CONFIG_HELD_TRUTH, unwrapOverride } from "../../core/constants.js";
+import { CONFIG_AUTO_DISPOSE, STATUS_PENDING, STATUS_UNINITIALIZED, NOT_PENDING, CONFIG_OPTIMISTIC, CONFIG_HELD_TRUTH, unwrapOverride } from "../../core/constants.js";
 
 import { computed, setSignal, isEqual } from "../../core/core.js";
 
-import { activeTransition, GlobalQueue, runAsTransitionBatch, globalQueue, currentTransition } from "../../core/scheduler.js";
+import { getOwner } from "../../core/owner.js";
+
+import { activeTransition, GlobalQueue, currentTransition, globalQueue, createTransition, runAsTransitionBatch } from "../../core/scheduler.js";
 
 import "../../core/invariants.js";
 
@@ -18,9 +20,7 @@ import { runProjectionComputedNext } from "./projection.js";
 
 import { wrapNext, runAuthoritative, storeSetterNext, hasActiveOverride, unwrapValue, targetsEqual, getNode, getHasNode, getKeySetNode, bumpDeep, stagedTruthPB, authoritativeRead } from "./store.js";
 
-import { patchHooks, rowHooks } from "./patch-hooks.js";
-
-import { sameKey, buildIdentityRowOps } from "./reconcile.js";
+import { sameKey } from "./reconcile.js";
 
 import { setOptHooks } from "./target.js";
 
@@ -55,7 +55,7 @@ import { setOptHooks } from "./target.js";
  * staged values to converge (normal speculation). Resolves merges first:
  * merge unions optimistic nodes/stores into the target. */ function transitionHoldsOptimism(e) {
     const t = currentTransition(e);
-    return t.sn !== true && (t.ze.length !== 0 || t.En.size !== 0);
+    return t.sn !== true && (t.Xe.length !== 0 || t.En.size !== 0);
 }
 
 let blockedInstalled = false;
@@ -76,29 +76,20 @@ function installNextBlockedHalf() {
     // Scheduler flush tails call _clearOptimisticStores whenever tracked
     // stores exist; next has no layer to clear — reverts are engine-native —
     // so the hook only empties the batch set.
-        if (!GlobalQueue.qt) {
-        GlobalQueue.qt = e => {
-            // Patch channel (revert site): engine-native reverts flip node values
-            // back to committed; patched records need a forced DOM re-apply from
-            // the post-revert view. Emission only — next keeps no layer to clear.
+        if (!GlobalQueue.Wt) {
+        GlobalQueue.Wt = e => {
             for (const t of e) {
                 const e = t?.[$TARGET];
                 const n = e?.fam?.overlaid;
                 if (n !== undefined) {
                     for (const e of n) {
-                        if (e.pc !== null && e.pc.p !== null) patchHooks.emitPatchOptimistic(e, null, null);
-                        // Row-ops resync (family increment 2): reverts flip node values
-                        // back engine-natively; a driven list must rebuild retention by
-                        // row identity against the post-revert view (resolved from the
-                        // target at drain — overrides are gone by then).
-                                                if (e.pc !== null && e.pc.ro !== null) rowHooks.emitRowOpsOptimistic(e, null, null);
                         // Keyset resync (classic channel twin): the keyset node's own
                         // revert can compare EQUAL (a landing's bump matched the
                         // tentative bump) while the arrangement underneath changed —
                         // mapArray/ownKeys subscribers must re-read the post-revert
                         // view. Authoritative bump: never re-arm the node we are
                         // clearing.
-                                                if (e.k !== null) runAuthoritative(() => setSignal(e.k, e => e + 1));
+                        if (e.k !== null) runAuthoritative(() => setSignal(e.k, e => e + 1));
                     }
                 }
             }
@@ -108,14 +99,22 @@ function installNextBlockedHalf() {
     const e = GlobalQueue.dn;
     GlobalQueue.dn = t => {
         for (const e of t.En) {
-            const t = e?.[$TARGET];
-            const n = t?.fam?.node;
+            const n = e?.[$TARGET];
+            const i = n?.fam;
+            const r = i?.node;
             // The hold exists to keep optimistic state alive until the store's own
             // truth lands (#2951). Once the family carries NO live overrides (a
             // landing consumed them, or they never existed), a pending firewall is
             // no reason to park the transaction — blocking then leaks it forever
             // when the in-flight question is never answered (undisposed fixtures).
-                        if (n != null && n.S & STATUS_PENDING && familyHasLiveOverrides(t.fam)) return true;
+                        if (r == null || !(r.S & STATUS_PENDING)) continue;
+            // Ownership is declared (#3146): only the flight's OWN transaction
+            // parks on the flight (the #2951 anchor routed the bare write there).
+            // A transaction that merely brushed the store never waits for truth
+            // it does not carry.
+                        const o = i.ft != null ? liveTransition(i.ft) : null;
+            if (o !== null && o !== currentTransition(t)) continue;
+            if (familyHasLiveOverrides(i)) return true;
         }
         return e(t);
     };
@@ -129,10 +128,10 @@ function familyHasLiveOverrides(e) {
             if (t === null) continue;
             for (const e of Reflect.ownKeys(t)) {
                 const n = t[e];
-                if (n.o?.Oe !== undefined && n.o?.Oe !== NOT_PENDING) return true;
+                if (n.o?.Pe !== undefined && n.o?.Pe !== NOT_PENDING) return true;
             }
         }
-        if (e.k !== null && e.k.o?.Oe !== undefined && e.k.o?.Oe !== NOT_PENDING) return true;
+        if (e.k !== null && e.k.o?.Pe !== undefined && e.k.o?.Pe !== NOT_PENDING) return true;
     }
     t.clear();
  // nothing live — drop the bookkeeping
@@ -145,34 +144,55 @@ function createOptimisticStoreNext(e, t, n) {
     installOptimisticEngine();
     installNextBlockedHalf();
     const i = typeof e === "function";
-    if (!i && n === undefined) n = t;
+    const r = i ? n : t;
     const o = i ? t : e;
-    const r = {
+    const s = {
         map: new WeakMap,
         node: null,
-        shallow: !!n?.shallow,
+        shallow: !!r?.shallow,
         opt: true
     };
-    const s = wrapNext(o, null, null, r);
-    r.px = s;
+    const l = wrapNext(o, null, null, s);
+    s.px = l;
     // Same key resolution the projection channels use ("id" default) — replay's
     // satisfaction rule reads it off the family.
-        const l = n?.key === undefined ? "id" : n.key;
-    r.key = typeof l === "function" ? l : l === null ? null : e => isWrappable(e) ? e[l] : undefined;
-    if (r.shallow) {
-        s[$TARGET].s = true;
+        const u = r?.key === undefined ? "id" : r.key;
+    s.key = typeof u === "function" ? u : u === null ? null : e => isWrappable(e) ? e[u] : undefined;
+    if (s.shallow) {
+        l[$TARGET].s = true;
         markRawIngest(o);
     }
     if (i) {
         const t = e;
+        // #3146: an async settle event belongs to the flight's OWN transaction.
+        // A live declared one re-enters (a merge if the generic settle path
+        // already entered a graph-stamped stranger — the landing supersedes any
+        // recompute deriving from that stranger's world); a dead one renews (per
+        // A18(1) each arrival reveals on its own schedule, so per-yield
+        // transactions die with their commit and the next settle event opens the
+        // flight's next one — still declared, never anonymous). An UNDECLARED
+        // flight (loading window) keeps the ambient reveal (#2933: the loading
+        // rail is transaction-invisible).
+                const enterFlightTransition = () => {
+            const e = s.ft;
+            if (e == null) return;
+            let t = liveTransition(e);
+            if (t === null) s.ft = t = createTransition();
+            s.node.Ae = t;
+            globalQueue.initTransition(t);
+        };
         // Landing router (#3164 fold ruling): while a transaction retains
         // optimistic edits on this family, truth landings stage INTO it and
         // reveal atomically at settle; with no retainer they commit immediately
         // under the authoritative posture (async commits land outside the
-        // computed's sync body, so the posture is re-applied here).
+        // computed's sync body, so the posture is re-applied here) — inside the
+        // flight-owned transaction (#3146). Sync commits (the derive's body,
+        // owner is the firewall itself) reveal with their own recompute's flush.
                 const wrapCommit = (e, t) => {
-            const n = retainingTransition(r);
-            if (n === null) runAuthoritative(e); else stageLanding(r, n, t);
+            const n = retainingTransition(s);
+            if (n !== null) return void stageLanding(s, n, t);
+            if (getOwner() !== s.node) enterFlightTransition();
+            runAuthoritative(e);
         };
         // Draft writes (the derive mutating its draft, sync body and post-await
         // continuations alike) are the same truth channel per-operation: bind
@@ -181,28 +201,74 @@ function createOptimisticStoreNext(e, t, n) {
         // batch; the write-override eager-commit branch in notifyWrites yields
         // to any active transaction).
                 const aroundDraftWrite = e => {
-            const t = retainingTransition(r);
+            const t = retainingTransition(s);
             if (t === null) e(); else runFolded(t, e);
         };
-        let i;
-        if (n?.seedLoadingValue) i = {
+        // Flight declaration (#3146): a recompute that registered a truth-flight
+        // OWNS its transaction. The ask's transaction is recorded on the family
+        // (created by the flight's own pending throw when none was ambient, the
+        // causing write's/refresh's when one was — graph-driven causality) and
+        // the firewall is stamped so every settle path resolves the flight's
+        // transaction by construction, not by whatever last brushed the node.
+        // When the ask took none (a dead stale stamp — the previous flight's,
+        // cleared nowhere — bare-returns the pre-throw entry), the flight opens
+        // its own here, same activation point as the pre-throw's creation: the
+        // ambient batch (the causing write, same-tick bare optimism) adopts into
+        // it exactly as it would have there, and the pending notification that
+        // follows this unwind registers observers against it. The flight
+        // also registers as its own async reporter: the transaction lives
+        // exactly as long as the question is unanswered, observed or not — the
+        // #2951 refetch-hold no longer depends on a tracked observer having
+        // happened to register one. Loading-window flights declare nothing
+        // (#2933: the loading rail is transaction-invisible); a sync run clears
+        // the declaration.
+                const declareFlight = e => {
+            if (e.o?.Ie == null) {
+                if (!e.Ne) s.ft = null;
+                return;
+            }
+            // First flight (#3146 carve-out): nothing has ever committed, so there
+            // is no truth to keep on screen and no optimistic state to protect. An
+            // uninitialized ask suspends its readers into their Loading boundary
+            // exactly like a plain derived store's first flight — declaring a
+            // transaction here instead held the ROOT MOUNT (render()'s scheduled
+            // insert rides transitions) until the fetch landed, so the boundary's
+            // fallback never showed and the whole page stayed blank. The loading
+            // window (#2933) already declares nothing for the same reason; once
+            // the first truth lands, every refetch flight declares as before.
+                        if (e.Ne || e.S & STATUS_UNINITIALIZED) return;
+            let t = activeTransition;
+            if (t === null) globalQueue.initTransition(t = createTransition());
+            s.ft = t;
+            e.Ae = t;
+            let n = t._e.get(e);
+            if (n === undefined) t._e.set(e, n = new Set);
+            n.add(e);
+        };
+        let n;
+        if (r?.seedLoadingValue) n = {
             loadingValue: undefined
         };
-        const o = computed(() => {
-            runAuthoritative(() => runProjectionComputedNext(s, t, n?.key === undefined ? "id" : n.key, wrapCommit, aroundDraftWrite));
-        }, i);
-        o.T &= ~CONFIG_AUTO_DISPOSE;
-        r.node = o;
+        const i = computed(() => {
+            const e = getOwner();
+            try {
+                runAuthoritative(() => runProjectionComputedNext(l, t, r?.key === undefined ? "id" : r.key, wrapCommit, aroundDraftWrite));
+            } finally {
+                declareFlight(e);
+            }
+        }, n);
+        i.T &= ~CONFIG_AUTO_DISPOSE;
+        s.node = i;
     }
-    return [ s, e => {
+    return [ l, e => {
         // Retention ledger (#3164): record the owning transaction so landings
         // know to fold. Captured at entry — the action machinery has the
         // transaction ambient while user code runs; a bare write with no
         // transaction retains nothing (it rides the flight's own transition
         // per #2951 and dies with it).
         const t = activeTransition;
-        storeSetterNext(s, e);
-        if (t !== null) (r.rt ??= new Set).add(t);
+        storeSetterNext(l, e);
+        if (t !== null) (s.rt ??= new Set).add(t);
     } ];
 }
 
@@ -254,7 +320,7 @@ function createOptimisticStoreNext(e, t, n) {
  * stay unarmed — the override is their display and its revert their
  * notification, A17). */ function runFolded(e, t) {
     runAsTransitionBatch(e, t);
-    const n = e.Lt;
+    const n = e.Mt;
     for (let t = 0; t < n.length; t++) {
         const i = n[t];
         i.Ae = e;
@@ -274,15 +340,15 @@ function createOptimisticStoreNext(e, t, n) {
         if (n !== null) {
             // Occurrence-aware key queues (parity with the adoption window):
             // duplicate keys match per occurrence, each current row consumed once.
-            let o = null;
-            const r = e.length;
-            for (let t = 0; t < r; t++) {
+            let r = null;
+            const o = e.length;
+            for (let t = 0; t < o; t++) {
                 const i = unwrapValue(e[t]);
                 if (!isWrappable(i)) continue;
-                const r = n(i);
-                if (r === undefined) continue;
-                const s = (o ??= new Map).get(r);
-                if (s === undefined) o.set(r, [ i ]); else s.push(i);
+                const o = n(i);
+                if (o === undefined) continue;
+                const s = (r ??= new Map).get(o);
+                if (s === undefined) r.set(o, [ i ]); else s.push(i);
             }
             // Echo adoption: an optimistic structural add whose key the landing
             // confirms must keep its raw (and so its proxy — list drivers keep the
@@ -297,42 +363,42 @@ function createOptimisticStoreNext(e, t, n) {
                 for (const e of Reflect.ownKeys(s)) {
                     const t = s[e];
                     if (!hasActiveOverride(t)) continue;
-                    const i = unwrapValue(unwrapOverride(t.o.Oe));
+                    const i = unwrapValue(unwrapOverride(t.o.Pe));
                     if (!isWrappable(i)) continue;
-                    const r = n(i);
-                    if (r === undefined) continue;
-                    const l = (o ??= new Map).get(r);
-                    if (l === undefined) o.set(r, [ i ]); else l.push(i);
+                    const o = n(i);
+                    if (o === undefined) continue;
+                    const l = (r ??= new Map).get(o);
+                    if (l === undefined) r.set(o, [ i ]); else l.push(i);
                 }
             }
-            for (let r = 0; r < i; r++) {
-                const i = t[r];
+            for (let o = 0; o < i; o++) {
+                const i = t[o];
                 let s;
-                if (isWrappable(i) && o !== null) {
+                if (isWrappable(i) && r !== null) {
                     const e = n(i);
                     if (e !== undefined) {
-                        for (const [t, n] of o) {
+                        for (const [t, n] of r) {
                             if (!sameKey(t, e)) continue;
                             s = n.shift();
-                            if (n.length === 0) o.delete(t);
+                            if (n.length === 0) r.delete(t);
                             break;
                         }
                     }
                 }
                 if (s !== undefined) {
-                    if (unwrapValue(e[r]) !== s) e[r] = s;
-                    stagedApply(e[r], i, n);
+                    if (unwrapValue(e[o]) !== s) e[o] = s;
+                    stagedApply(e[o], i, n);
                 } else {
-                    const t = unwrapValue(e[r]);
-                    if (!isEqual(t, i) && !targetsEqual(t, i)) e[r] = i;
+                    const t = unwrapValue(e[o]);
+                    if (!isEqual(t, i) && !targetsEqual(t, i)) e[o] = i;
                 }
             }
         } else {
-            for (let o = 0; o < i; o++) {
-                const i = t[o];
-                const r = unwrapValue(e[o]);
-                if (r === i) continue;
-                if (isWrappable(i) && isWrappable(r) && Array.isArray(i) === Array.isArray(r)) stagedApply(e[o], i, n); else if (!isEqual(r, i) && !targetsEqual(r, i)) e[o] = i;
+            for (let r = 0; r < i; r++) {
+                const i = t[r];
+                const o = unwrapValue(e[r]);
+                if (o === i) continue;
+                if (isWrappable(i) && isWrappable(o) && Array.isArray(i) === Array.isArray(o)) stagedApply(e[r], i, n); else if (!isEqual(o, i) && !targetsEqual(o, i)) e[r] = i;
             }
         }
         if (e.length !== i) e.length = i;
@@ -340,25 +406,25 @@ function createOptimisticStoreNext(e, t, n) {
     }
     // Object merge; also the degenerate root-kind-change shape (arrays accept
     // keyed writes/deletes, so a wholesale restatement still lands staged).
-        for (const o of Reflect.ownKeys(t)) {
-        if (i && o === "length") continue;
-        const r = t[o];
-        const s = unwrapValue(e[o]);
-        if (s === r) continue;
-        if (isWrappable(r) && isWrappable(s) && Array.isArray(r) === Array.isArray(s)) {
+        for (const r of Reflect.ownKeys(t)) {
+        if (i && r === "length") continue;
+        const o = t[r];
+        const s = unwrapValue(e[r]);
+        if (s === o) continue;
+        if (isWrappable(o) && isWrappable(s) && Array.isArray(o) === Array.isArray(s)) {
             // Different-keyed entities never merge (tentative-channel parity):
             // the incoming object replaces the slot wholesale.
             if (n !== null) {
                 const t = n(s);
-                const i = n(r);
+                const i = n(o);
                 if (t !== undefined && i !== undefined && !sameKey(t, i)) {
-                    e[o] = r;
+                    e[r] = o;
                     continue;
                 }
             }
-            stagedApply(e[o], r, n);
-        } else if (!isEqual(s, r) && !targetsEqual(s, r)) {
-            e[o] = r;
+            stagedApply(e[r], o, n);
+        } else if (!isEqual(s, o) && !targetsEqual(s, o)) {
+            e[r] = o;
         }
     }
     for (const n of Reflect.ownKeys(e)) {
@@ -373,71 +439,61 @@ function createOptimisticStoreNext(e, t, n) {
  * overrides — the same view the draft was seeded from) and emit engine writes
  * for exactly the changed keys. Visible-view diffing keeps no-op writes from
  * entangling lanes (RUL-10 / opt R38). */ function notifyOptimisticWrites(e, t) {
-    // A bare write while the store's own truth is in flight rides THAT
-    // transaction (#2951, legacy parity): entangle the firewall's transition so
-    // the override survives until the refetch settles instead of flash-reverting
+    // A bare write while the store's own truth is in flight rides the FLIGHT'S
+    // OWN transaction (#2951 via the #3146 declaration): entangle it so the
+    // override survives until the refetch settles instead of flash-reverting
     // at plain flush end. The blocked-check store-half keeps that transaction
-    // from settling while the firewall is pending.
-    const n = e.fam?.node;
-    if (n?.Ae) globalQueue.initTransition(n.Ae);
-    const i = e.v;
-    // Patch channel (override-application site): the draft IS the intended
-    // visible state; prev is the view before these overrides apply. Bypasses
-    // the transition stash — optimism is visible in flight.
-        if (e.pc !== null && e.pc.p !== null) patchHooks.emitPatchOptimistic(e, t, optimisticView(e, i));
-    // Row-ops channel (family increment 2): optimistic STRUCTURE on an array
-    // rides node overrides — it never enters the reconcile walk — so a driven
-    // list must get its structural ops here, lane-timed. Identity diff of the
-    // pre-write optimistic view against the draft; aligned writes emit nothing.
-        if (e.pc !== null && e.pc.ro !== null && Array.isArray(t)) {
-        const n = optimisticView(e, i);
-        if (Array.isArray(n)) {
-            const i = buildIdentityRowOps(n, t);
-            if (i !== null) rowHooks.emitRowOpsOptimistic(e, t, i);
-        }
+    // from settling while the firewall is pending. Declared ownership replaces
+    // the old circumstantial route through the firewall's `_transition` stamp,
+    // which was whatever last brushed the node.
+    const n = e.fam?.ft;
+    if (n != null) {
+        const e = liveTransition(n);
+        if (e !== null) globalQueue.initTransition(e);
     }
+    const i = e.v;
     const visible = (t, n) => {
         const i = e.n?.[t];
-        return i !== undefined && hasActiveOverride(i) ? unwrapOverride(i.o?.Oe) : n;
+        return i !== undefined && hasActiveOverride(i) ? unwrapOverride(i.o?.Pe) : n;
     };
     const visiblePresent = t => {
         const n = e.h?.[t];
-        return n !== undefined && hasActiveOverride(n) ? !!unwrapOverride(n.o?.Oe) : t in i;
+        return n !== undefined && hasActiveOverride(n) ? !!unwrapOverride(n.o?.Pe) : t in i;
     };
-    let o = false;
-    const r = Array.isArray(t);
+    let r = false;
+    const o = Array.isArray(t);
     for (const n of Reflect.ownKeys(t)) {
-        if (r && n === "length") continue;
+        if (o && n === "length") continue;
         const s = unwrapValue(t[n]);
         if (!visiblePresent(n)) {
             // Optimistic add: value node + presence node + membership bump.
             setSignal(getNode(e, n, i[n]), () => s);
             setSignal(getHasNode(e, n, n in i), true);
-            o = true;
+            r = true;
         } else {
             const t = visible(n, i[n]);
             if (!isEqual(t, s) && !targetsEqual(t, s)) {
                 setSignal(getNode(e, n, t), () => s);
-                if (r) o = true;
+                if (o) r = true;
             }
         }
     }
     for (const n of Reflect.ownKeys(i)) {
-        if (r && n === "length") continue;
+        if (o && n === "length") continue;
         if (n in t || !visiblePresent(n)) continue;
         // Optimistic delete: node reads undefined, presence flips, membership bumps.
                 setSignal(getNode(e, n, i[n]), () => undefined);
         setSignal(getHasNode(e, n, true), false);
-        o = true;
+        r = true;
     }
-    if (r) {
+    if (o) {
         const n = visible("length", i.length);
         if (n !== t.length) {
             setSignal(getNode(e, "length", n), () => t.length);
-            o = true;
+            r = true;
         }
     }
-    if (o) setSignal(getKeySetNode(e), e => e + 1);
+    if (r) setSignal(getKeySetNode(e), e => e + 1);
     // Deep-witness: optimistic value writes notify deep() subscribers too
     // (structural ones already ride the key-set bump above).
         bumpDeep(e);
@@ -467,19 +523,19 @@ function createOptimisticStoreNext(e, t, n) {
         for (const e of Reflect.ownKeys(i)) {
             const n = i[e];
             if (!hasActiveOverride(n)) continue;
-            const o = unwrapOverride(n.o?.Oe);
+            const r = unwrapOverride(n.o?.Pe);
             if (e === "length" && Array.isArray(t)) {
-                if (t.length !== o) ensure().length = o;
-            } else if (!isEqual(t[e], o)) ensure()[e] = o;
+                if (t.length !== r) ensure().length = r;
+            } else if (!isEqual(t[e], r)) ensure()[e] = r;
         }
     }
-    const o = e.h;
-    if (o !== null) {
-        for (const e of Reflect.ownKeys(o)) {
-            const i = o[e];
+    const r = e.h;
+    if (r !== null) {
+        for (const e of Reflect.ownKeys(r)) {
+            const i = r[e];
             if (!hasActiveOverride(i)) continue;
-            const r = !!unwrapOverride(i.o?.Oe);
-            if (!r && e in (n ?? t)) delete ensure()[e];
+            const o = !!unwrapOverride(i.o?.Pe);
+            if (!o && e in (n ?? t)) delete ensure()[e];
         }
     }
     return n ?? t;
@@ -487,35 +543,39 @@ function createOptimisticStoreNext(e, t, n) {
 
 function applyTentative(e, t, n) {
     const i = e.pb ?? e.v;
-    const o = optimisticView(e, i);
-    const r = e.fam.map;
+    const r = optimisticView(e, i);
+    const o = e.fam.map;
     const s = Array.isArray(t);
-    if (Array.isArray(o) !== s) return;
+    if (Array.isArray(r) !== s) return;
  // kind change at root: flat overrides below
         const l = [];
-    const u = s ? [ ...t ] : shallowWithSymbols(t);
+    let u;
+    if (s) u = [ ...t ]; else {
+        u = {};
+        for (const e of Reflect.ownKeys(t)) u[e] = t[e];
+    }
     const match = (e, t) => {
         if (!isWrappable(e) || !isWrappable(t)) return null;
         if (rawValuesUsed && (isRawValue(e) || isRawValue(t))) return null;
         if (Array.isArray(e) !== Array.isArray(t)) return null;
         if (n) {
             const i = n(e);
-            const o = n(t);
+            const r = n(t);
             // SameValueZero (re-audit 3, P1-3): parity with the plain reconcile
             // channel — NaN keys are self-equal.
-                        if (i !== undefined && o !== undefined && !sameKey(i, o)) return null;
+                        if (i !== undefined && r !== undefined && !sameKey(i, r)) return null;
         }
-        return r.get(unwrapValue(e)) ?? null;
+        return o.get(unwrapValue(e)) ?? null;
     };
     if (s) {
-        const e = o;
+        const e = r;
         let i = null;
-        for (let o = 0; o < t.length; o++) {
-            const r = t[o];
-            if (!isWrappable(r)) continue;
+        for (let r = 0; r < t.length; r++) {
+            const o = t[r];
+            if (!isWrappable(o)) continue;
             let s;
             if (n) {
-                const t = n(r);
+                const t = n(o);
                 if (t !== undefined) {
                     if (i === null) {
                         // Occurrence-aware index queues (re-audit 3, P1-3): parity with
@@ -523,40 +583,40 @@ function applyTentative(e, t, n) {
                         // occurrence, each view row consumed once.
                         i = new Map;
                         for (let t = 0; t < e.length; t++) {
-                            const o = unwrapValue(e[t]);
-                            if (isWrappable(o)) {
-                                const e = n(o);
+                            const r = unwrapValue(e[t]);
+                            if (isWrappable(r)) {
+                                const e = n(r);
                                 if (e === undefined) continue;
-                                const r = i.get(e);
-                                if (r === undefined) i.set(e, t); else if (Array.isArray(r)) r.push(t); else i.set(e, [ r, t ]);
+                                const o = i.get(e);
+                                if (o === undefined) i.set(e, t); else if (Array.isArray(o)) o.push(t); else i.set(e, [ o, t ]);
                             }
                         }
                     }
-                    const o = i.get(t);
-                    if (o === undefined) s = undefined; else if (Array.isArray(o)) {
-                        s = unwrapValue(e[o.shift()]);
-                        if (o.length === 1) i.set(t, o[0]);
+                    const r = i.get(t);
+                    if (r === undefined) s = undefined; else if (Array.isArray(r)) {
+                        s = unwrapValue(e[r.shift()]);
+                        if (r.length === 1) i.set(t, r[0]);
                     } else {
-                        s = unwrapValue(e[o]);
+                        s = unwrapValue(e[r]);
                         i.delete(t);
                     }
-                } else s = unwrapValue(e[o]);
-            } else s = unwrapValue(e[o]);
-            const a = match(s, r);
+                } else s = unwrapValue(e[r]);
+            } else s = unwrapValue(e[r]);
+            const a = match(s, o);
             if (a !== null) {
                 // Keep the existing row in the slot (identity preserved); recurse.
-                u[o] = unwrapValue(s);
-                l.push([ a, r ]);
+                u[r] = unwrapValue(s);
+                l.push([ a, o ]);
             }
         }
     } else {
         for (const e of Reflect.ownKeys(t)) {
-            const n = unwrapValue(o[e]);
+            const n = unwrapValue(r[e]);
             const i = t[e];
-            const r = match(n, i);
-            if (r !== null) {
+            const o = match(n, i);
+            if (o !== null) {
                 u[e] = n;
-                l.push([ r, i ]);
+                l.push([ o, i ]);
             }
         }
     }
@@ -569,10 +629,4 @@ function applyTentative(e, t, n) {
     for (let e = 0; e < l.length; e++) applyTentative(l[e][0], unwrapValue(l[e][1]), n);
 }
 
-function shallowWithSymbols(e) {
-    const t = {};
-    for (const n of Reflect.ownKeys(e)) t[n] = e[n];
-    return t;
-}
-
 export { createOptimisticStoreNext, notifyOptimisticWrites, optimisticView, transitionHoldsOptimism };

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

@@ -12,11 +12,11 @@ import "../../core/effect.js";
 
 import { CONFIG_AUTO_DISPOSE } from "../../core/constants.js";
 
-import { $TARGET, markRawIngest, STORE_VALUE, setWriteOverride } from "../store.js";
+import { $TARGET, STORE_VALUE, markRawIngest, setWriteOverride } from "../store.js";
 
 import { reconcileNextState } from "./reconcile.js";
 
-import { wrapNext, storeSetterNext } from "./store.js";
+import { storeSetterNext, wrapNext } from "./store.js";
 
 /**
  * Store rewrite — projections (§7/§7b): a projection is a computed store.