|
1 | 1 | /* eslint-disable */
|
2 |
| -// Ported from https://github.com/stackblitz/alien-signals/blob/v1.0.7/src/system.ts |
| 2 | +// Ported from https://github.com/stackblitz/alien-signals/blob/4962714dadd133cee16060eb4eb99b90e9e6052d/src/system.ts |
3 | 3 | import type { ComputedRefImpl as Computed } from './computed.js'
|
4 | 4 | import type { ReactiveEffect as Effect } from './effect.js'
|
5 | 5 |
|
@@ -82,23 +82,33 @@ export function propagate(current: Link): void {
|
82 | 82 | const sub = current.sub
|
83 | 83 | const subFlags = sub.flags
|
84 | 84 |
|
| 85 | + let shouldNotify = false |
| 86 | + |
85 | 87 | if (
|
86 |
| - (!( |
| 88 | + !( |
87 | 89 | subFlags &
|
88 | 90 | (SubscriberFlags.Tracking |
|
89 | 91 | SubscriberFlags.Recursed |
|
90 | 92 | SubscriberFlags.Propagated)
|
91 |
| - ) && |
92 |
| - ((sub.flags = subFlags | targetFlag), true)) || |
93 |
| - (subFlags & SubscriberFlags.Recursed && |
94 |
| - !(subFlags & SubscriberFlags.Tracking) && |
95 |
| - ((sub.flags = (subFlags & ~SubscriberFlags.Recursed) | targetFlag), |
96 |
| - true)) || |
97 |
| - (!(subFlags & SubscriberFlags.Propagated) && |
98 |
| - isValidLink(current, sub) && |
99 |
| - ((sub.flags = subFlags | SubscriberFlags.Recursed | targetFlag), |
100 |
| - (sub as Dependency).subs !== undefined)) |
| 93 | + ) |
| 94 | + ) { |
| 95 | + sub.flags = subFlags | targetFlag |
| 96 | + shouldNotify = true |
| 97 | + } else if ( |
| 98 | + subFlags & SubscriberFlags.Recursed && |
| 99 | + !(subFlags & SubscriberFlags.Tracking) |
| 100 | + ) { |
| 101 | + sub.flags = (subFlags & ~SubscriberFlags.Recursed) | targetFlag |
| 102 | + shouldNotify = true |
| 103 | + } else if ( |
| 104 | + !(subFlags & SubscriberFlags.Propagated) && |
| 105 | + isValidLink(current, sub) |
101 | 106 | ) {
|
| 107 | + sub.flags = subFlags | SubscriberFlags.Recursed | targetFlag |
| 108 | + shouldNotify = (sub as Dependency).subs !== undefined |
| 109 | + } |
| 110 | + |
| 111 | + if (shouldNotify) { |
102 | 112 | const subSubs = (sub as Dependency).subs
|
103 | 113 | if (subSubs !== undefined) {
|
104 | 114 | current = subSubs
|
@@ -200,18 +210,15 @@ export function processComputedUpdate(
|
200 | 210 | computed: Computed,
|
201 | 211 | flags: SubscriberFlags,
|
202 | 212 | ): void {
|
203 |
| - if ( |
204 |
| - flags & SubscriberFlags.Dirty || |
205 |
| - (checkDirty(computed.deps!) |
206 |
| - ? true |
207 |
| - : ((computed.flags = flags & ~SubscriberFlags.PendingComputed), false)) |
208 |
| - ) { |
| 213 | + if (flags & SubscriberFlags.Dirty || checkDirty(computed.deps!)) { |
209 | 214 | if (computed.update()) {
|
210 | 215 | const subs = computed.subs
|
211 | 216 | if (subs !== undefined) {
|
212 | 217 | shallowPropagate(subs)
|
213 | 218 | }
|
214 | 219 | }
|
| 220 | + } else { |
| 221 | + computed.flags = flags & ~SubscriberFlags.PendingComputed |
215 | 222 | }
|
216 | 223 | }
|
217 | 224 |
|
|
0 commit comments