@@ -248,7 +248,16 @@ setSlotUnobserved((node: any): void => {
248248 }
249249} ) ;
250250
251- export function getNode ( target : StoreNextTarget , key : PropertyKey , current : any ) : Signal < any > {
251+ export function getNode (
252+ target : StoreNextTarget ,
253+ key : PropertyKey ,
254+ current : any ,
255+ // First-read dedupe (create-floor slice 2): the get trap probes
256+ // accessor-ness right before creating the node — pass the verdict through
257+ // so creation skips the second descriptor scan. -1 = unknown (other
258+ // callers), 0/1 = probed.
259+ accKnown : - 1 | 0 | 1 = - 1
260+ ) : Signal < any > {
252261 const nodes = ( target . n ??= Object . create ( null ) ) ;
253262 let node : Signal < any > | undefined = nodes [ key ] ;
254263 if ( node === undefined ) {
@@ -270,7 +279,7 @@ export function getNode(target: StoreNextTarget, key: PropertyKey, current: any)
270279 // Accessor-ness resolved ONCE per node (no per-object descriptor
271280 // scan on reads): accessor keys serve through Reflect.get with the
272281 // proxy receiver.
273- isOwnAccessor ( target . pb ?? target . v , key ) ,
282+ accKnown === - 1 ? isOwnAccessor ( target . pb ?? target . v , key ) : accKnown === 1 ,
274283 ( target . fam ?. node as any ) ?? undefined
275284 ) ) ;
276285 // Attribution-only: name store property nodes by path segment so
@@ -1392,7 +1401,8 @@ function serveDataKey(
13921401 key : PropertyKey ,
13931402 backingValue : any ,
13941403 src : Record < PropertyKey , any > ,
1395- node ?: Signal < any >
1404+ node ?: Signal < any > ,
1405+ accKnown : - 1 | 0 | 1 = - 1
13961406) : any {
13971407 const chained = target . ch && src === target . v ;
13981408 let v = backingValue ;
@@ -1441,7 +1451,9 @@ function serveDataKey(
14411451 v = nodeValue ( node , backingValue ) ;
14421452 }
14431453 } else if ( getObserver ( ) !== null ) {
1444- readNode ( getNode ( target , key , backingValue ) ) ;
1454+ // First tracked read: create + link, and let the wrap-cache branch
1455+ // below populate px/pxv so read #2 skips wrapNext (slice 2).
1456+ readNode ( ( node = getNode ( target , key , backingValue , accKnown ) ) ) ;
14451457 }
14461458 }
14471459 // Shallow stores serve data raw; store-proxy slots get boundary wrappers.
@@ -1546,8 +1558,11 @@ const traps: ProxyHandler<StoreNextTarget> = {
15461558 // tracked read of a present data key — the dbmon/uibench effect re-read
15471559 // shape. Skips serveDataKey's frame, the FORCE compare (only accessor
15481560 // keys ever hold the sentinel), and isWrappable for primitives.
1561+ // ONE node-map lookup serves this block and the accessor probe below
1562+ // (nothing between them creates nodes).
1563+ const node0 = target . n ?. [ key as any ] ;
15491564 if ( target . ch === false && writeScopes === null ) {
1550- const nodeH = target . n ?. [ key as any ] ;
1565+ const nodeH = node0 ;
15511566 if ( nodeH !== undefined && ( nodeH as any ) . acc !== true && getObserver ( ) !== null ) {
15521567 let nv = readNodeFast ( nodeH ) ;
15531568 if ( nv === READ_SLOW ) nv = readNode ( nodeH ) ;
@@ -1601,15 +1616,21 @@ const traps: ProxyHandler<StoreNextTarget> = {
16011616 // absent-key/accessor subscriptions for every store read during any
16021617 // derive, leaving nested projections permanently dependency-less when
16031618 // their sources hadn't materialized yet (#3037).
1604- const node0 = target . n ?. [ key as any ] ;
1619+ // First-read dedupe (create-floor slice 2): remember the probe verdict —
1620+ // node creation downstream reuses it instead of re-scanning the
1621+ // descriptor, but only when the probed object IS the one getNode would
1622+ // scan (pb ?? v).
1623+ let accProbe : - 1 | 0 | 1 = - 1 ;
16051624 {
1606- const acc =
1607- node0 !== undefined
1608- ? ( node0 as any ) . acc === true
1609- : ! inDraft ( target ) && getObserver ( ) !== null && isOwnAccessor ( src , key ) ;
1625+ let acc : boolean ;
1626+ if ( node0 !== undefined ) acc = ( node0 as any ) . acc === true ;
1627+ else if ( ! inDraft ( target ) && getObserver ( ) !== null ) {
1628+ acc = isOwnAccessor ( src , key ) ;
1629+ if ( src === ( target . pb ?? target . v ) ) accProbe = acc ? 1 : 0 ;
1630+ } else acc = false ;
16101631 if ( acc ) {
16111632 if ( ! inDraft ( target ) && getObserver ( ) !== null )
1612- readNode ( node0 ?? getNode ( target , key , undefined ) ) ;
1633+ readNode ( node0 ?? getNode ( target , key , undefined , accProbe ) ) ;
16131634 const v = Reflect . get ( src , key , receiver ) ;
16141635 if ( target . s ) return serveShallow ( target , key , v ) ;
16151636 return isWrappable ( v ) ? draftServe ( target , wrapNext ( v , target , key ) ) : v ;
@@ -1639,7 +1660,7 @@ const traps: ProxyHandler<StoreNextTarget> = {
16391660 // Reading a currently-absent own key subscribes to it (R12) — for any
16401661 // target OUTSIDE its own draft scope, even mid-setter (#3037, above).
16411662 if ( v === undefined && ! inDraft ( target ) ) {
1642- if ( getObserver ( ) !== null ) readNode ( getNode ( target , key , undefined ) ) ;
1663+ if ( getObserver ( ) !== null ) readNode ( getNode ( target , key , undefined , accProbe ) ) ;
16431664 const node = target . n ?. [ key ] ;
16441665 if ( node ) {
16451666 const nv = nodeValue ( node , undefined ) ;
@@ -1668,7 +1689,7 @@ const traps: ProxyHandler<StoreNextTarget> = {
16681689 ! ( viewOvl && hasOwn . call ( target . v , key ) )
16691690 )
16701691 return v ; // proto method
1671- return serveDataKey ( target , key , v , src , node0 ) ;
1692+ return serveDataKey ( target , key , v , src , node0 , accProbe ) ;
16721693 } ,
16731694
16741695 has ( target , key ) {
0 commit comments