feat(reactivity): sync alien-signals 0.4.5

vuejs · Dec 17, 2024 · 1a24410 · 1a24410
1 parent f7d95ce
commit 1a24410
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 29 deletions.
diff --git a/packages/reactivity/__tests__/computed.spec.ts b/packages/reactivity/__tests__/computed.spec.ts
@@ -467,8 +467,12 @@ describe('reactivity/computed', () => {
     const c2 = computed(() => c1.value) as unknown as ComputedRefImpl
 
     c2.value
-    expect(c1.flags & SubscriberFlags.Dirtys).toBe(0)
-    expect(c2.flags & SubscriberFlags.Dirtys).toBe(0)
+    expect(
+      c1.flags & (SubscriberFlags.Dirty | SubscriberFlags.ToCheckDirty),
+    ).toBe(0)
+    expect(
+      c2.flags & (SubscriberFlags.Dirty | SubscriberFlags.ToCheckDirty),
+    ).toBe(0)
   })
 
   it('should chained computeds dirtyLevel update with first computed effect', () => {

diff --git a/packages/reactivity/src/computed.ts b/packages/reactivity/src/computed.ts
@@ -110,7 +110,7 @@ export class ComputedRefImpl<T = any> implements IComputed {
     if (v) {
       this.flags |= SubscriberFlags.Dirty
     } else {
-      this.flags &= ~SubscriberFlags.Dirtys
+      this.flags &= ~(SubscriberFlags.Dirty | SubscriberFlags.ToCheckDirty)
     }
   }
 
@@ -136,21 +136,22 @@ export class ComputedRefImpl<T = any> implements IComputed {
     if (this._dirty) {
       this.update()
     }
-    if (activeTrackId !== 0 && this.lastTrackedId !== activeTrackId) {
-      if (__DEV__) {
-        onTrack(activeSub!, {
-          target: this,
-          type: TrackOpTypes.GET,
-          key: 'value',
-        })
+    if (activeTrackId) {
+      if (this.lastTrackedId !== activeTrackId) {
+        if (__DEV__) {
+          onTrack(activeSub!, {
+            target: this,
+            type: TrackOpTypes.GET,
+            key: 'value',
+          })
+        }
+        this.lastTrackedId = activeTrackId
+        link(this, activeSub!).version = this.version
+      }
+    } else if (activeEffectScope !== undefined) {
+      if (this.lastTrackedId !== activeEffectScope.trackId) {
+        link(this, activeEffectScope)
       }
-      this.lastTrackedId = activeTrackId
-      link(this, activeSub!).version = this.version
-    } else if (
-      activeEffectScope !== undefined &&
-      this.lastTrackedId !== activeEffectScope.trackId
-    ) {
-      link(this, activeEffectScope)
     }
     return this._value!
   }

diff --git a/packages/reactivity/src/effectScope.ts b/packages/reactivity/src/effectScope.ts
@@ -93,12 +93,12 @@ export class EffectScope implements Subscriber {
 
   run<T>(fn: () => T): T | undefined {
     if (this.active) {
-      const currentEffectScope = activeEffectScope
+      const prevEffectScope = activeEffectScope
       try {
         activeEffectScope = this
         return fn()
       } finally {
-        activeEffectScope = currentEffectScope
+        activeEffectScope = prevEffectScope
       }
     } else if (__DEV__) {
       warn(`cannot run an inactive effect scope.`)

diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts
@@ -196,7 +196,7 @@ export function triggerRef(ref: Ref): void {
 }
 
 function trackRef(dep: Dependency) {
-  if (activeTrackId !== 0 && dep.lastTrackedId !== activeTrackId) {
+  if (activeTrackId && dep.lastTrackedId !== activeTrackId) {
     if (__DEV__) {
       onTrack(activeSub!, {
         target: dep,

diff --git a/packages/reactivity/src/system.ts b/packages/reactivity/src/system.ts
@@ -1,4 +1,4 @@
-// Ported from https://github.com/stackblitz/alien-signals/blob/v0.4.4/src/system.ts
+// Ported from https://github.com/stackblitz/alien-signals/blob/v0.4.5/src/system.ts
 
 export interface IEffect extends Subscriber {
   nextNotify: IEffect | undefined
@@ -42,7 +42,6 @@ export enum SubscriberFlags {
   // 2~5 are using in EffectFlags
   ToCheckDirty = 1 << 6,
   Dirty = 1 << 7,
-  Dirtys = SubscriberFlags.ToCheckDirty | SubscriberFlags.Dirty,
 
   DirtyFlagsIndex = 6,
 }
@@ -278,7 +277,7 @@ export function checkDirty(deps: Link): boolean {
               continue
             }
           } else {
-            sub.flags &= ~SubscriberFlags.Dirtys
+            sub.flags &= ~SubscriberFlags.ToCheckDirty
           }
           deps = prevLink.nextDep!
           if (deps !== undefined) {
@@ -297,7 +296,12 @@ export function checkDirty(deps: Link): boolean {
 export function startTrack(sub: Subscriber): void {
   sub.depsTail = undefined
   sub.flags =
-    (sub.flags & ~(SubscriberFlags.CanPropagate | SubscriberFlags.Dirtys)) |
+    (sub.flags &
+      ~(
+        SubscriberFlags.CanPropagate |
+        SubscriberFlags.ToCheckDirty |
+        SubscriberFlags.Dirty
+      )) |
     SubscriberFlags.Tracking
 }
 
@@ -347,11 +351,8 @@ function clearTrack(link: Link): void {
     linkPool = link
 
     if (dep.subs === undefined && 'deps' in dep) {
-      if ('notify' in dep) {
-        dep.flags &= ~SubscriberFlags.Dirtys
-      } else {
-        dep.flags |= SubscriberFlags.Dirty
-      }
+      // dep is never be IEffect in Vue
+      dep.flags |= SubscriberFlags.Dirty
       const depDeps = dep.deps
       if (depDeps !== undefined) {
         link = depDeps