feat(reactivity): sync alien-signals 0.4.10

vuejs · Dec 25, 2024 · 2b596f9 · 2b596f9
1 parent 1a24410
commit 2b596f9
Show file tree

Hide file tree

Showing 4 changed files with 133 additions and 89 deletions.
diff --git a/packages/reactivity/src/computed.ts b/packages/reactivity/src/computed.ts
@@ -19,6 +19,7 @@ import {
   checkDirty,
   endTrack,
   link,
+  shallowPropagate,
   startTrack,
 } from './system'
 import { warn } from './warning'
@@ -59,7 +60,6 @@ export class ComputedRefImpl<T = any> implements IComputed {
    * @internal
    */
   _value: T | undefined = undefined
-  version = 0
 
   // Dependency
   subs: Link | undefined = undefined
@@ -134,7 +134,12 @@ export class ComputedRefImpl<T = any> implements IComputed {
 
   get value(): T {
     if (this._dirty) {
-      this.update()
+      if (this.update()) {
+        const subs = this.subs
+        if (subs !== undefined) {
+          shallowPropagate(subs)
+        }
+      }
     }
     if (activeTrackId) {
       if (this.lastTrackedId !== activeTrackId) {
@@ -146,7 +151,7 @@ export class ComputedRefImpl<T = any> implements IComputed {
           })
         }
         this.lastTrackedId = activeTrackId
-        link(this, activeSub!).version = this.version
+        link(this, activeSub!)
       }
     } else if (activeEffectScope !== undefined) {
       if (this.lastTrackedId !== activeEffectScope.trackId) {
@@ -169,20 +174,18 @@ export class ComputedRefImpl<T = any> implements IComputed {
     const prevTrackId = activeTrackId
     setActiveSub(this, nextTrackId())
     startTrack(this)
-    const oldValue = this._value
-    let newValue: T
     try {
-      newValue = this.fn(oldValue)
+      const oldValue = this._value
+      const newValue = this.fn(oldValue)
+      if (hasChanged(oldValue, newValue)) {
+        this._value = newValue
+        return true
+      }
+      return false
     } finally {
       setActiveSub(prevSub, prevTrackId)
       endTrack(this)
     }
-    if (hasChanged(oldValue, newValue)) {
-      this._value = newValue
-      this.version++
-      return true
-    }
-    return false
   }
 }
 

diff --git a/packages/reactivity/src/debug.ts b/packages/reactivity/src/debug.ts
@@ -62,23 +62,22 @@ export function setupOnTrigger(target: { new (...args: any[]): any }): void {
 }
 
 function setupFlagsHandler(target: Subscriber): void {
-  // @ts-expect-error
-  target._flags = target.flags
+  ;(target as any)._flags = target.flags
   Object.defineProperty(target, 'flags', {
     get() {
-      // @ts-expect-error
-      return target._flags
+      return (target as any)._flags
     },
     set(value) {
       if (
-        // @ts-expect-error
-        !(target._flags >> SubscriberFlags.DirtyFlagsIndex) &&
-        !!(value >> SubscriberFlags.DirtyFlagsIndex)
+        !(
+          (target as any)._flags &
+          (SubscriberFlags.ToCheckDirty | SubscriberFlags.Dirty)
+        ) &&
+        !!(value & (SubscriberFlags.ToCheckDirty | SubscriberFlags.Dirty))
       ) {
         onTrigger(this)
       }
-      // @ts-expect-error
-      target._flags = value
+      ;(target as any)._flags = value
     },
   })
 }
diff --git a/packages/reactivity/src/effect.ts b/packages/reactivity/src/effect.ts
@@ -47,10 +47,10 @@ export enum EffectFlags {
   /**
    * ReactiveEffect only
    */
-  ALLOW_RECURSE = 1 << 2,
-  PAUSED = 1 << 3,
-  NOTIFIED = 1 << 4,
-  STOP = 1 << 5,
+  ALLOW_RECURSE = 1 << 5,
+  PAUSED = 1 << 6,
+  NOTIFIED = 1 << 7,
+  STOP = 1 << 8,
 }
 
 export class ReactiveEffect<T = any> implements IEffect, ReactiveEffectOptions {
@@ -137,10 +137,10 @@ export class ReactiveEffect<T = any> implements IEffect, ReactiveEffectOptions {
       setActiveSub(prevSub, prevTrackId)
       endTrack(this)
       if (
-        this.flags & SubscriberFlags.CanPropagate &&
+        this.flags & SubscriberFlags.Recursed &&
         this.flags & EffectFlags.ALLOW_RECURSE
       ) {
-        this.flags &= ~SubscriberFlags.CanPropagate
+        this.flags &= ~SubscriberFlags.Recursed
         this.notify()
       }
     }