@@ -10,13 +10,12 @@ import {
1010import {
1111 activeTransition ,
1212 clock ,
13- dirty ,
13+ dirtyQueue ,
1414 flush ,
1515 globalQueue ,
16- pending ,
16+ pendingQueue ,
1717 Queue ,
1818 schedule ,
19- transitionComplete ,
2019 type IQueue ,
2120 type Transition
2221} from "./scheduler.js" ;
@@ -54,6 +53,7 @@ export interface RawSignal<T> {
5453 _time : number ;
5554 _pendingValue : T | typeof NOT_PENDING ;
5655 _pendingCheck ?: Signal < boolean > & { _set : ( v : boolean ) => void } ;
56+ _pendingSignal ?: Signal < T > & { _set : ( v : T ) => void } ;
5757 _transition ?: Transition ;
5858}
5959
@@ -97,12 +97,13 @@ Queue._update = recompute;
9797Queue . _dispose = disposeChildren ;
9898let tracking = true ;
9999let stale = false ;
100- let staleCheck : null | { _value : boolean } = null ;
100+ let pendingValueCheck = false ;
101+ let pendingCheck : null | { _value : boolean } = null ;
101102let context : Owner | null = null ;
102103const defaultContext = { } ;
103104
104105function recompute ( el : Computed < any > , create : boolean = false ) : void {
105- deleteFromHeap ( el , el . _flags & ReactiveFlags . Zombie ? pending : dirty ) ;
106+ deleteFromHeap ( el , el . _flags & ReactiveFlags . Zombie ? pendingQueue : dirtyQueue ) ;
106107 if ( el . _pendingValue !== NOT_PENDING || el . _pendingFirstChild || el . _pendingDisposal )
107108 disposeChildren ( el ) ;
108109 else {
@@ -122,6 +123,7 @@ function recompute(el: Computed<any>, create: boolean = false): void {
122123 let oldHeight = el . _height ;
123124 el . _time = clock ;
124125 let prevStatusFlags = el . _statusFlags ;
126+ let prevError = el . _error ;
125127 clearStatusFlags ( el ) ;
126128 try {
127129 value = el . _fn ( value ) ;
@@ -151,23 +153,24 @@ function recompute(el: Computed<any>, create: boolean = false): void {
151153 const valueChanged =
152154 ! el . _equals ||
153155 ! el . _equals ( el . _pendingValue === NOT_PENDING ? el . _value : el . _pendingValue , value ) ;
154- const statusFlagsChanged = el . _statusFlags !== prevStatusFlags ;
156+ const statusFlagsChanged = el . _statusFlags !== prevStatusFlags || el . _error !== prevError ;
155157
156158 if ( valueChanged || statusFlagsChanged ) {
157159 if ( valueChanged ) {
158- if ( create || ( el as any ) . _type ) el . _value = value ;
160+ if ( create || ( el as any ) . _optimistic || ( el as any ) . _type ) el . _value = value ;
159161 else {
160162 if ( el . _pendingValue === NOT_PENDING ) globalQueue . _pendingNodes . push ( el ) ;
161163 el . _pendingValue = value ;
162164 }
165+ if ( el . _pendingSignal ) el . _pendingSignal . _set ( value ) ;
163166 }
164167
165168 for ( let s = el . _subs ; s !== null ; s = s . _nextSub ) {
166- insertIntoHeap ( s . _sub , s . _sub . _flags & ReactiveFlags . Zombie ? pending : dirty ) ;
169+ insertIntoHeap ( s . _sub , s . _sub . _flags & ReactiveFlags . Zombie ? pendingQueue : dirtyQueue ) ;
167170 }
168171 } else if ( el . _height != oldHeight ) {
169172 for ( let s = el . _subs ; s !== null ; s = s . _nextSub ) {
170- insertIntoHeapHeight ( s . _sub , s . _sub . _flags & ReactiveFlags . Zombie ? pending : dirty ) ;
173+ insertIntoHeapHeight ( s . _sub , s . _sub . _flags & ReactiveFlags . Zombie ? pendingQueue : dirtyQueue ) ;
171174 }
172175 }
173176}
@@ -291,8 +294,8 @@ function markDisposal(el: Owner): void {
291294 ( child as Computed < unknown > ) . _flags |= ReactiveFlags . Zombie ;
292295 const inHeap = ( child as Computed < unknown > ) . _flags & ReactiveFlags . InHeap ;
293296 if ( inHeap ) {
294- deleteFromHeap ( child as Computed < unknown > , dirty ) ;
295- insertIntoHeap ( child as Computed < unknown > , pending ) ;
297+ deleteFromHeap ( child as Computed < unknown > , dirtyQueue ) ;
298+ insertIntoHeap ( child as Computed < unknown > , pendingQueue ) ;
296299 }
297300 markDisposal ( child ) ;
298301 child = child . _nextSibling ;
@@ -305,7 +308,7 @@ function disposeChildren(node: Owner, zombie?: boolean): void {
305308 const nextChild = child . _nextSibling ;
306309 if ( ( child as Computed < unknown > ) . _deps ) {
307310 const n = child as Computed < unknown > ;
308- deleteFromHeap ( n , n . _flags & ReactiveFlags . Zombie ? pending : dirty ) ;
311+ deleteFromHeap ( n , n . _flags & ReactiveFlags . Zombie ? pendingQueue : dirtyQueue ) ;
309312 let toRemove = n . _deps ;
310313 do {
311314 toRemove = unlinkSubs ( toRemove ! ) ;
@@ -348,7 +351,7 @@ function withOptions<T>(obj: T, options?: SignalOptions<any> & { _internal?: any
348351 ( obj as any ) . _equals = options ?. equals !== undefined ? options . equals : isEqual ;
349352 ( obj as any ) . _pureWrite = ! ! options ?. pureWrite ;
350353 ( obj as any ) . _unobserved = options ?. unobserved ;
351- if ( options ?. _internal ) Object . assign ( ( obj as any ) , options . _internal ) ;
354+ if ( options ?. _internal ) Object . assign ( obj as any , options . _internal ) ;
352355 return obj as T & {
353356 _id ?: string ;
354357 _name ?: string ;
@@ -428,7 +431,7 @@ export function computed<T>(
428431 recompute ( self , true ) ;
429432 } else {
430433 self . _height = parent . _height + 1 ;
431- insertIntoHeap ( self , dirty ) ;
434+ insertIntoHeap ( self , dirtyQueue ) ;
432435 }
433436 }
434437 } else {
@@ -572,9 +575,9 @@ export function read<T>(el: Signal<T> | Computed<T>): T {
572575 const owner = ( "_owner" in el ? el . _owner : el ) as Computed < any > ;
573576 if ( "_fn" in owner ) {
574577 const isZombie = ( el as Computed < unknown > ) . _flags & ReactiveFlags . Zombie ;
575- if ( owner . _height >= ( isZombie ? pending . _min : dirty . _min ) ) {
578+ if ( owner . _height >= ( isZombie ? pendingQueue . _min : dirtyQueue . _min ) ) {
576579 markNode ( c as Computed < any > ) ;
577- markHeap ( isZombie ? pending : dirty ) ;
580+ markHeap ( isZombie ? pendingQueue : dirtyQueue ) ;
578581 updateIfNecessary ( owner ) ;
579582 }
580583 const height = owner . _height ;
@@ -583,21 +586,39 @@ export function read<T>(el: Signal<T> | Computed<T>): T {
583586 }
584587 }
585588 }
586- if ( staleCheck ) {
589+ if ( pendingCheck ) {
587590 if ( ! el . _pendingCheck ) {
588- el . _pendingCheck = signal < boolean > ( ( el . _statusFlags & StatusFlags . Pending ) !== 0 || ! ! el . _transition || false ) as Signal < boolean > & { _set : ( v : boolean ) => void } ;
591+ el . _pendingCheck = signal < boolean > (
592+ ( el . _statusFlags & StatusFlags . Pending ) !== 0 || ! ! el . _transition || false
593+ ) as Signal < boolean > & { _set : ( v : boolean ) => void } ;
594+ ( el . _pendingCheck as any ) . _optimistic = true ;
589595 el . _pendingCheck . _set = v => setSignal ( el . _pendingCheck ! , v ) ;
590596 }
591- const prev = staleCheck ;
592- staleCheck = null ;
597+ const prev = pendingCheck ;
598+ pendingCheck = null ;
593599 prev . _value = read ( el . _pendingCheck ) || prev . _value ;
594- staleCheck = prev ;
600+ pendingCheck = prev ;
601+ }
602+ if ( pendingValueCheck ) {
603+ if ( ! el . _pendingSignal ) {
604+ el . _pendingSignal = signal < T > (
605+ el . _pendingValue === NOT_PENDING ? el . _value : ( el . _pendingValue as T )
606+ ) as Signal < T > & { _set : ( v : T ) => void } ;
607+ ( el . _pendingSignal as any ) . _optimistic = true ;
608+ el . _pendingSignal . _set = v => queueMicrotask ( ( ) => queueMicrotask ( ( ) => setSignal ( el . _pendingSignal ! , v ) ) ) ;
609+ }
610+ pendingValueCheck = false ;
611+ try {
612+ return read ( el . _pendingSignal ) ;
613+ } finally {
614+ pendingValueCheck = true ;
615+ }
595616 }
596617 if ( el . _statusFlags & StatusFlags . Pending ) {
597618 if ( ( c && ! stale ) || el . _statusFlags & StatusFlags . Uninitialized ) throw el . _error ;
598- else if ( c && stale && ! staleCheck ) {
619+ else if ( c && stale && ! pendingCheck ) {
599620 setStatusFlags (
600- ( c as Computed < any > ) ,
621+ c as Computed < any > ,
601622 ( c as Computed < any > ) . _statusFlags | 1 /* Pending */ ,
602623 el . _error as Error
603624 ) ;
@@ -613,10 +634,8 @@ export function read<T>(el: Signal<T> | Computed<T>): T {
613634 }
614635 }
615636 return ! c ||
616- ( stale &&
617- ( el . _transition || activeTransition ?. pendingNodes . includes ( el ) ) &&
618- ! transitionComplete ( el . _transition || activeTransition ! ) ) ||
619- el . _pendingValue === NOT_PENDING
637+ el . _pendingValue === NOT_PENDING ||
638+ ( stale && ! pendingCheck && el . _transition && activeTransition !== el . _transition )
620639 ? el . _value
621640 : ( el . _pendingValue as T ) ;
622641}
@@ -627,17 +646,23 @@ export function setSignal<T>(el: Signal<T> | Computed<T>, v: T | ((prev: T) => T
627646 el . _pendingValue === NOT_PENDING ? el . _value : ( el . _pendingValue as T )
628647 ) ;
629648 }
630- const valueChanged = el . _pendingValue === NOT_PENDING ? el . _value !== v : el . _pendingValue !== v ;
649+ const valueChanged =
650+ ! el . _equals ||
651+ ! el . _equals ( el . _pendingValue === NOT_PENDING ? el . _value : ( el . _pendingValue as T ) , v ) ;
631652 if ( ! valueChanged && ! el . _statusFlags ) return ;
632653 if ( valueChanged ) {
633- if ( el . _pendingValue === NOT_PENDING ) globalQueue . _pendingNodes . push ( el ) ;
634- el . _pendingValue = v ;
654+ if ( ( el as any ) . _optimistic ) el . _value = v ;
655+ else {
656+ if ( el . _pendingValue === NOT_PENDING ) globalQueue . _pendingNodes . push ( el ) ;
657+ el . _pendingValue = v ;
658+ }
659+ if ( el . _pendingSignal ) el . _pendingSignal . _set ( v ) ;
635660 }
636661 clearStatusFlags ( el ) ;
637662 el . _time = clock ;
638663
639664 for ( let link = el . _subs ; link !== null ; link = link . _nextSub ) {
640- insertIntoHeap ( link . _sub , link . _sub . _flags & ReactiveFlags . Zombie ? pending : dirty ) ;
665+ insertIntoHeap ( link . _sub , link . _sub . _flags & ReactiveFlags . Zombie ? pendingQueue : dirtyQueue ) ;
641666 }
642667 if ( el . _subs ) schedule ( ) ;
643668}
@@ -722,10 +747,6 @@ export function runWithOwner<T>(owner: Owner | null, fn: () => T): T {
722747 }
723748}
724749
725- export function latest < T > ( fn : ( ) => T ) : T {
726- return staleValues ( fn , false ) ;
727- }
728-
729750export function staleValues < T > ( fn : ( ) => T , set = true ) : T {
730751 const prevStale = stale ;
731752 stale = set ;
@@ -736,19 +757,29 @@ export function staleValues<T>(fn: () => T, set = true): T {
736757 }
737758}
738759
760+ export function pending < T > ( fn : ( ) => T ) : T {
761+ const prevLatest = pendingValueCheck ;
762+ pendingValueCheck = true ;
763+ try {
764+ return staleValues ( fn , false ) ;
765+ } finally {
766+ pendingValueCheck = prevLatest ;
767+ }
768+ }
769+
739770export function isPending ( fn : ( ) => any ) : boolean ;
740771export function isPending ( fn : ( ) => any , loadingValue : boolean ) : boolean ;
741772export function isPending ( fn : ( ) => any , loadingValue ?: boolean ) : boolean {
742- const current = staleCheck ;
743- staleCheck = { _value : false } ;
773+ const current = pendingCheck ;
774+ pendingCheck = { _value : false } ;
744775 try {
745776 staleValues ( fn ) ;
746- return staleCheck . _value ;
777+ return pendingCheck . _value ;
747778 } catch ( err ) {
748779 if ( ! ( err instanceof NotReadyError ) ) return false ;
749780 if ( loadingValue !== undefined ) return loadingValue ! ;
750781 throw err ;
751782 } finally {
752- staleCheck = current ;
783+ pendingCheck = current ;
753784 }
754785}
0 commit comments