Sync v1.0.0

packages/reactivity/__tests__/computed.spec.ts

@@ -468,10 +468,10 @@ describe('reactivity/computed', () => {
 
     c2.value
     expect(
-      c1.flags & (SubscriberFlags.Dirty | SubscriberFlags.CheckRequired),
+      c1.flags & (SubscriberFlags.Dirty | SubscriberFlags.PendingComputed),
     ).toBe(0)
     expect(
-      c2.flags & (SubscriberFlags.Dirty | SubscriberFlags.CheckRequired),
+      c2.flags & (SubscriberFlags.Dirty | SubscriberFlags.PendingComputed),
     ).toBe(0)
   })
 

packages/reactivity/src/computed.ts

@@ -14,11 +14,11 @@ import {
   type Link,
   type Subscriber,
   SubscriberFlags,
-  endTrack,
-  isDirty,
+  endTracking,
   link,
   processComputedUpdate,
-  startTrack,
+  startTracking,
+  updateDirtyFlag,
 } from './system'
 import { warn } from './warning'
 
@@ -66,7 +66,7 @@ export class ComputedRefImpl<T = any> implements Dependency, Subscriber {
   // Subscriber
   deps: Link | undefined = undefined
   depsTail: Link | undefined = undefined
-  flags: SubscriberFlags = SubscriberFlags.Dirty
+  flags: SubscriberFlags = SubscriberFlags.Computed | SubscriberFlags.Dirty
 
   /**
    * @internal
@@ -89,13 +89,21 @@ export class ComputedRefImpl<T = any> implements Dependency, Subscriber {
   }
   // for backwards compat
   get _dirty(): boolean {
-    return isDirty(this, this.flags)
+    const flags = this.flags
+    if (
+      flags & SubscriberFlags.Dirty ||
+      (flags & SubscriberFlags.PendingComputed &&
+        updateDirtyFlag(this, this.flags))
+    ) {
+      return true
+    }
+    return false
   }
   set _dirty(v: boolean) {
     if (v) {
       this.flags |= SubscriberFlags.Dirty
     } else {
-      this.flags &= ~(SubscriberFlags.Dirty | SubscriberFlags.CheckRequired)
+      this.flags &= ~(SubscriberFlags.Dirty | SubscriberFlags.PendingComputed)
     }
   }
 
@@ -148,7 +156,7 @@ export class ComputedRefImpl<T = any> implements Dependency, Subscriber {
   update(): boolean {
     const prevSub = activeSub
     setActiveSub(this)
-    startTrack(this)
+    startTracking(this)
     try {
       const oldValue = this._value
       const newValue = this.fn(oldValue)
@@ -159,7 +167,7 @@ export class ComputedRefImpl<T = any> implements Dependency, Subscriber {
       return false
     } finally {
       setActiveSub(prevSub)
-      endTrack(this)
+      endTracking(this)
     }
   }
 }

packages/reactivity/src/debug.ts

@@ -71,9 +71,9 @@ function setupFlagsHandler(target: Subscriber): void {
       if (
         !(
           (target as any)._flags &
-          (SubscriberFlags.CheckRequired | SubscriberFlags.Dirty)
+          (SubscriberFlags.PendingComputed | SubscriberFlags.Dirty)
         ) &&
-        !!(value & (SubscriberFlags.CheckRequired | SubscriberFlags.Dirty))
+        !!(value & (SubscriberFlags.PendingComputed | SubscriberFlags.Dirty))
       ) {
         onTrigger(this)
       }

packages/reactivity/src/effect.ts

@@ -6,9 +6,9 @@ import {
   type Link,
   type Subscriber,
   SubscriberFlags,
-  endTrack,
-  isDirty,
-  startTrack,
+  endTracking,
+  startTracking,
+  updateDirtyFlag,
 } from './system'
 import { warn } from './warning'
 
@@ -46,17 +46,17 @@ export enum EffectFlags {
   /**
    * ReactiveEffect only
    */
-  ALLOW_RECURSE = 1 << 6,
-  PAUSED = 1 << 7,
-  NOTIFIED = 1 << 8,
-  STOP = 1 << 9,
+  ALLOW_RECURSE = 1 << 7,
+  PAUSED = 1 << 8,
+  NOTIFIED = 1 << 9,
+  STOP = 1 << 10,
 }
 
 export class ReactiveEffect<T = any> implements ReactiveEffectOptions {
   // Subscriber
   deps: Link | undefined = undefined
   depsTail: Link | undefined = undefined
-  flags: number = 0
+  flags: number = SubscriberFlags.Effect
 
   /**
    * @internal
@@ -119,7 +119,7 @@ export class ReactiveEffect<T = any> implements ReactiveEffectOptions {
     cleanupEffect(this)
     const prevSub = activeSub
     setActiveSub(this)
-    startTrack(this)
+    startTracking(this)
 
     try {
       return this.fn()
@@ -131,7 +131,7 @@ export class ReactiveEffect<T = any> implements ReactiveEffectOptions {
         )
       }
       setActiveSub(prevSub)
-      endTrack(this)
+      endTracking(this)
       if (
         this.flags & SubscriberFlags.Recursed &&
         this.flags & EffectFlags.ALLOW_RECURSE
@@ -144,16 +144,23 @@ export class ReactiveEffect<T = any> implements ReactiveEffectOptions {
 
   stop(): void {
     if (this.active) {
-      startTrack(this)
-      endTrack(this)
+      startTracking(this)
+      endTracking(this)
       cleanupEffect(this)
       this.onStop && this.onStop()
       this.flags |= EffectFlags.STOP
     }
   }
 
   get dirty(): boolean {
-    return isDirty(this, this.flags)
+    const flags = this.flags
+    if (
+      flags & SubscriberFlags.Dirty ||
+      (flags & SubscriberFlags.PendingComputed && updateDirtyFlag(this, flags))
+    ) {
+      return true
+    }
+    return false
   }
 }
 

packages/reactivity/src/effectScope.ts

@@ -2,9 +2,8 @@ import { EffectFlags, type ReactiveEffect } from './effect'
 import {
   type Link,
   type Subscriber,
-  SubscriberFlags,
-  endTrack,
-  startTrack,
+  endTracking,
+  startTracking,
 } from './system'
 import { warn } from './warning'
 
@@ -14,7 +13,7 @@ export class EffectScope implements Subscriber {
   // Subscriber: In order to collect orphans computeds
   deps: Link | undefined = undefined
   depsTail: Link | undefined = undefined
-  flags: number = SubscriberFlags.None
+  flags: number = 0
 
   /**
    * @internal
@@ -122,8 +121,8 @@ export class EffectScope implements Subscriber {
   stop(fromParent?: boolean): void {
     if (this.active) {
       this.flags |= EffectFlags.STOP
-      startTrack(this)
-      endTrack(this)
+      startTracking(this)
+      endTracking(this)
       let i, l
       for (i = 0, l = this.effects.length; i < l; i++) {
         this.effects[i].stop()