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

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

@@ -1,6 +1,6 @@
 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 { computed, hasActiveOverride, setSignal, isEqual, visibleOverride } from "../../core/core.js";
 
 import { getOwner } from "../../core/owner.js";
 
@@ -18,7 +18,7 @@ import { $TARGET, markRawIngest, setNextOptimisticViewResolver, isWrappable, raw
 
 import { runProjectionComputedNext } from "./projection.js";
 
-import { wrapNext, runAuthoritative, storeSetterNext, hasActiveOverride, unwrapValue, targetsEqual, heldMaskView, getNode, getHasNode, getKeySetNode, bumpDeep, stagedTruthPB, authoritativeRead } from "./store.js";
+import { wrapNext, runAuthoritative, storeSetterNext, unwrapValue, targetsEqual, heldMaskView, getNode, getHasNode, getKeySetNode, bumpDeep, stagedTruthPB, authoritativeRead } from "./store.js";
 
 import { sameKey } from "./reconcile.js";
 
@@ -55,7 +55,7 @@ import { setOptHooks, $OWNER, lookupTarget } 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.ft !== true && (t.it.length !== 0 || t.En.size !== 0);
+    return t.Tt !== true && (t.rt.length !== 0 || t.dn.size !== 0);
 }
 
 let blockedInstalled = false;
@@ -72,12 +72,15 @@ function installNextBlockedHalf() {
         applyTentative: applyTentative,
         retainsOptimism: transitionHoldsOptimism
     });
-    setNextOptimisticViewResolver((e, t) => optimisticView(e, t));
+    // The affects() declaration walk is a WRITER channel (A28 (5)): tagging a
+    // parent covers the record as the writer sees it, this tick's optimistic
+    // writes included — the draft view, not the reader view.
+        setNextOptimisticViewResolver((e, t) => optimisticView(e, t, true));
     // 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.ni) {
-        GlobalQueue.ni = e => {
+        if (!GlobalQueue.Cn) {
+        GlobalQueue.Cn = e => {
             for (const t of e) {
                 const e = t?.[$TARGET];
                 const n = e?.fam?.overlaid;
@@ -96,24 +99,24 @@ function installNextBlockedHalf() {
             e.clear();
         };
     }
-    const e = GlobalQueue.cn;
-    GlobalQueue.cn = t => {
-        for (const e of t.En) {
+    const e = GlobalQueue.Nn;
+    GlobalQueue.Nn = t => {
+        for (const e of t.dn) {
             const n = e?.[$TARGET];
             const i = n?.fam;
-            const o = i?.node;
+            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 (o == null || !(o.S & STATUS_PENDING)) continue;
+                        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 r = i.ft != null ? liveTransition(i.ft) : null;
-            if (r !== null && r !== currentTransition(t)) continue;
+                        const o = i.ft != null ? liveTransition(i.ft) : null;
+            if (o !== null && o !== currentTransition(t)) continue;
             if (familyHasLiveOverrides(i)) return true;
         }
         return e(t);
@@ -128,10 +131,10 @@ function familyHasLiveOverrides(e) {
             if (t === null) continue;
             for (const e of Reflect.ownKeys(t)) {
                 const n = t[e];
-                if (n.o?.be !== undefined && n.o?.be !== NOT_PENDING) return true;
+                if (n.o?.Ce !== undefined && n.o?.Ce !== NOT_PENDING) return true;
             }
         }
-        if (e.k !== null && e.k.o?.be !== undefined && e.k.o?.be !== NOT_PENDING) return true;
+        if (e.k !== null && e.k.o?.Ce !== undefined && e.k.o?.Ce !== NOT_PENDING) return true;
     }
     t.clear();
  // nothing live — drop the bookkeeping
@@ -144,23 +147,23 @@ function createOptimisticStoreNext(e, t, n) {
     installOptimisticEngine();
     installNextBlockedHalf();
     const i = typeof e === "function";
-    const o = i ? n : t;
-    const r = i ? t : e;
+    const r = i ? n : t;
+    const o = i ? t : e;
     const s = {
         map: new WeakMap,
         node: null,
-        shallow: !!o?.shallow,
+        shallow: !!r?.shallow,
         opt: true
     };
-    const l = wrapNext(r, null, null, 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 u = o?.key === undefined ? "id" : o.key;
+        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(r);
+        markRawIngest(o);
     }
     if (i) {
         const t = e;
@@ -178,7 +181,7 @@ function createOptimisticStoreNext(e, t, n) {
             if (e == null) return;
             let t = liveTransition(e);
             if (t === null) s.ft = t = createTransition();
-            s.node.ge = t;
+            s.node.Ge = t;
             globalQueue.initTransition(t);
         };
         // Landing router (#3164 fold ruling): while a transaction retains
@@ -223,8 +226,8 @@ function createOptimisticStoreNext(e, t, n) {
         // (#2933: the loading rail is transaction-invisible); a sync run clears
         // the declaration.
                 const declareFlight = e => {
-            if (e.o?.Pe == null) {
-                if (!e.Ae) s.ft = null;
+            if (e.o?.Re == null) {
+                if (!e.ge) s.ft = null;
                 return;
             }
             // First flight (#3146 carve-out): nothing has ever committed, so there
@@ -236,23 +239,23 @@ function createOptimisticStoreNext(e, t, n) {
             // 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.Ae || e.S & STATUS_UNINITIALIZED) return;
+                        if (e.ge || e.S & STATUS_UNINITIALIZED) return;
             let t = activeTransition;
             if (t === null) globalQueue.initTransition(t = createTransition());
             s.ft = t;
-            e.ge = t;
-            let n = t.Re.get(e);
-            if (n === undefined) t.Re.set(e, n = new Set);
+            e.Ge = t;
+            let n = t.oe.get(e);
+            if (n === undefined) t.oe.set(e, n = new Set);
             n.add(e);
         };
         let n;
-        if (o?.seedLoadingValue) n = {
+        if (r?.seedLoadingValue) n = {
             loadingValue: undefined
         };
         const i = computed(() => {
             const e = getOwner();
             try {
-                runAuthoritative(() => runProjectionComputedNext(l, t, o?.key === undefined ? "id" : o.key, wrapCommit, aroundDraftWrite));
+                runAuthoritative(() => runProjectionComputedNext(l, t, r?.key === undefined ? "id" : r.key, wrapCommit, aroundDraftWrite));
             } finally {
                 declareFlight(e);
             }
@@ -274,8 +277,8 @@ function createOptimisticStoreNext(e, t, n) {
 
 /** Resolve a retained transition through its merge chain (`_done` holds the
  * merge target while merged, `true` once settled). Null = dead. */ function liveTransition(e) {
-    while (typeof e.ft === "object") e = e.ft;
-    return e.ft === true ? null : e;
+    while (typeof e.Tt === "object") e = e.Tt;
+    return e.Tt === true ? null : e;
 }
 
 /** The transaction truth landings fold into: the first live member of the
@@ -320,10 +323,10 @@ 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.$t;
+    const n = e.Ot;
     for (let t = 0; t < n.length; t++) {
         const i = n[t];
-        i.ge = e;
+        i.Ge = e;
         if (i.T & CONFIG_OPTIMISTIC && !hasActiveOverride(i)) i.T |= CONFIG_HELD_TRUTH;
     }
 }
@@ -340,15 +343,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
@@ -363,42 +366,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.be));
+                    const i = unwrapValue(unwrapOverride(t.o.Ce));
                     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;
@@ -406,25 +409,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" || o === $OWNER) 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" || r === $OWNER) 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)) {
@@ -468,46 +471,46 @@ function createOptimisticStoreNext(e, t, n) {
     // churned for the life of the action and snapped back at settle (#3323).
         const visible = (t, n) => {
         const i = e.n?.[t];
-        return unwrapValue(i !== undefined && hasActiveOverride(i) ? unwrapOverride(i.o?.be) : n);
+        return unwrapValue(i !== undefined && hasActiveOverride(i) ? unwrapOverride(i.o?.Ce) : n);
     };
     const visiblePresent = t => {
         const n = e.h?.[t];
-        return n !== undefined && hasActiveOverride(n) ? !!unwrapOverride(n.o?.be) : t in i;
+        return n !== undefined && hasActiveOverride(n) ? !!unwrapOverride(n.o?.Ce) : 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" || n === $OWNER) continue;
+        if (o && n === "length" || n === $OWNER) 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" || n === $OWNER) continue;
+        if (o && n === "length" || n === $OWNER) 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);
@@ -518,7 +521,7 @@ function createOptimisticStoreNext(e, t, n) {
         e.pb = stagedTruthPB.get(e) ?? null;
     if (e.pb !== null) stagedTruthPB.delete(e);
     (e.fam.overlaid ??= new Set).add(e);
-    GlobalQueue.Nn?.(e.fam.px ?? e.px);
+    GlobalQueue.Dn?.(e.fam.px ?? e.px);
 }
 
 /** Optimistic-view composition for snapshot/deep (O1: snapshot is the CURRENT
@@ -526,18 +529,20 @@ function createOptimisticStoreNext(e, t, n) {
  * RUL-12). Returns `src` untouched when no override is active on `t`.
  * Authoritative-view reads (until()'s predicate) skip composition entirely:
  * the predicate observes authoritative truth, never the caller's tentative
- * overlay. (Write-side emission callers never run under such a compute.) */ function optimisticView(e, t) {
+ * overlay. (Write-side emission callers never run under such a compute.) */ function optimisticView(e, t, n = false) {
     if (e.fam?.opt !== true || authoritativeRead()) return t;
-    let n = null;
-    const ensure = () => n ??= Array.isArray(t) ? [ ...t ] : {
+    let i = null;
+    const ensure = () => i ??= Array.isArray(t) ? [ ...t ] : {
         ...t
     };
-    const i = e.n;
-    if (i !== null) {
-        for (const e of Reflect.ownKeys(i)) {
-            const n = i[e];
-            if (!hasActiveOverride(n)) continue;
-            const o = unwrapOverride(n.o?.be);
+    const r = e.n;
+    if (r !== null) {
+        for (const e of Reflect.ownKeys(r)) {
+            const i = r[e];
+            // A28 (5): readers see an optimistic write once a flush carried it;
+            // the draft (writer channel) composes on it now.
+                        if (!(n ? hasActiveOverride(i) : visibleOverride(i))) continue;
+            const o = unwrapOverride(i.o?.Ce);
             if (e === "length" && Array.isArray(t)) {
                 if (t.length !== o) ensure().length = o;
             } else if (!isEqual(t[e], o)) ensure()[e] = o;
@@ -546,21 +551,23 @@ function createOptimisticStoreNext(e, t, n) {
     const o = e.h;
     if (o !== null) {
         for (const e of Reflect.ownKeys(o)) {
-            const i = o[e];
-            if (!hasActiveOverride(i)) continue;
-            const r = !!unwrapOverride(i.o?.be);
-            if (!r && e in (n ?? t)) delete ensure()[e];
+            const r = o[e];
+            // A28 (5): readers see an optimistic write once a flush carried it;
+            // the draft (writer channel) composes on it now.
+                        if (!(n ? hasActiveOverride(r) : visibleOverride(r))) continue;
+            const s = !!unwrapOverride(r.o?.Ce);
+            if (!s && e in (i ?? t)) delete ensure()[e];
         }
     }
-    return n ?? t;
+    return i ?? t;
 }
 
 function applyTentative(e, t, n) {
     const i = e.pb ?? e.v;
-    const o = optimisticView(e, i);
-    const r = e.fam;
+    const r = optimisticView(e, i);
+    const o = e.fam;
     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 = [];
     let u;
@@ -574,22 +581,22 @@ function applyTentative(e, t, n) {
         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 lookupTarget(unwrapValue(e), r) ?? null;
+        return lookupTarget(unwrapValue(e), o) ?? 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
@@ -597,41 +604,41 @@ 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)) {
             if (e === $OWNER) continue;
-            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 ]);
             }
         }
     }

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

@@ -55,22 +55,23 @@ import { storeSetterNext, wrapNext } from "./store.js";
  * Save/restore projectionWriteActive, never hard-reset: the draft can be
  * driven from inside an enclosing authoritative-write scope (next-store
  * optimistic derives), and a hard `false` would clobber it mid-derive.
- */ function wrapDraft(e, t, r) {
+ */ function wrapDraft(e, t, r, i) {
     const write = e => r ? r(e) : e();
-    const i = {
-        get(i, o) {
-            let n;
-            const c = projectionWriteActive;
+    const o = {
+        get(o, n) {
+            let c;
+            const s = projectionWriteActive;
             setWriteOverride(true);
             setProjectionWriteActive(true);
             try {
-                n = e[o];
+                c = e[n];
             } finally {
                 setWriteOverride(false);
-                setProjectionWriteActive(c);
+                setProjectionWriteActive(s);
             }
-            if (o === $TARGET) return n;
-            return typeof n === "object" && n !== null ? wrapDraft(n, t, r) : n;
+            // A shallow store's leaves are raw by contract (#3498): no draft proxy
+            // over them, so identity holds and a frozen leaf is never trapped.
+                        return !i && typeof c === "object" && c !== null && n !== $TARGET ? wrapDraft(c, t, r) : c;
         },
         has(t, r) {
             let i;
@@ -160,7 +161,7 @@ import { storeSetterNext, wrapNext } from "./store.js";
         }
     };
     // Matching-kind dummy so Array.isArray(draft) answers like the store.
-        return new Proxy(Array.isArray(e) ? [] : {}, i);
+        return new Proxy(Array.isArray(e) ? [] : {}, o);
 }
 
 function createProjectionNextInternal(e, t, r) {
@@ -207,30 +208,40 @@ function createProjectionNext(e, t, r) {
     } ];
 }
 
+// A detached copy of projection state: the root container alone for a shallow
+// store — its leaves are raw references by contract and stay so (#3498) — the
+// whole tree otherwise.
+function cloneState(e, t) {
+    return t ? Array.isArray(e) ? e.slice() : {
+        ...e
+    } : JSON.parse(JSON.stringify(e));
+}
+
 function runProjectionComputedNext(e, t, r, i, o) {
     const n = getOwner();
-    let c = false;
-    let s;
+    const c = e[$TARGET];
+    let s = false;
+    let u;
     // Open loading window (seedLoadingValue): the observable store IS commit #0
     // for the whole first flight — the derive works a detached shadow of the
     // seed so draft writes cannot tear through to readers (#2988). Every commit
     // point reconciles the shadow through the normal commit path.
-        const u = n.Ae ? JSON.parse(JSON.stringify(e[$TARGET][STORE_VALUE])) : null;
-    const l = wrapDraft(e, () => !c || n.o?.Pe === s, o);
-    storeSetterNext(l, o => {
-        s = t(u ?? o);
-        c = true;
+        const l = n.ge ? cloneState(c[STORE_VALUE], c.s) : null;
+    const a = wrapDraft(e, () => !s || n.o?.Re === u, o, c.s);
+    storeSetterNext(a, o => {
+        u = t(l ?? o);
+        s = true;
         const commit = t => {
             // Shadow run: commit a detached snapshot, never the shadow itself
             // (adoption takes the value by identity — handing it the live shadow
             // would fuse the draft to the observable store).
-            if (u && (t === undefined || t === u)) t = JSON.parse(JSON.stringify(u));
+            if (l && (t === undefined || t === l)) t = cloneState(l, c.s);
             if (t === o || t === undefined) return;
             const write = () => storeSetterNext(e, e => reconcileNextState(t, e, r, true), false);
             i ? i(write, t) : write();
         };
-        const l = handleAsync(n, s, commit);
-        if (!n.Ae) commit(l);
+        const a = handleAsync(n, u, commit);
+        if (!n.ge) commit(a);
     }, false);
     return n;
 }