Fix more tests [skip ci]

Author: johnsoncodehk

packages/reactivity/__tests__/effectScope.spec.ts

@@ -187,7 +187,7 @@ describe('reactivity/effect/scope', () => {
 
     expect('[Vue warn] cannot run an inactive effect scope.').toHaveBeenWarned()
 
-    expect(getDepCount(scope)).toBe(0)
+    expect(getDepCount(scope)).toBe(1)
 
     counter.num = 7
     expect(dummy).toBe(0)

packages/reactivity/src/effectScope.ts

@@ -70,8 +70,8 @@ export class EffectScope implements Subscriber {
       if (this.pauseLevel >= PauseLevels.Paused) {
         this.pauseLevel = PauseLevels.None
         if (this.scopes) {
-          for (const scope of this.scopes) {
-            scope.resume()
+          for (let i = 0, l = this.scopes.length; i < l; i++) {
+            this.scopes[i].resume()
           }
         }
         let dep = this.deps
@@ -122,17 +122,13 @@ export class EffectScope implements Subscriber {
         ;(dep.dep as ReactiveEffect).stop()
         dep = dep.nextDep
       }
-      if (this.deps !== undefined) {
-        Subscriber.clearTrack(this.deps)
-        this.deps = undefined
-        this.depsTail = undefined
-      }
-      for (const cleanup of this.cleanups) {
-        cleanup()
+      let i, l
+      for (i = 0, l = this.cleanups.length; i < l; i++) {
+        this.cleanups[i]()
       }
       if (this.scopes) {
-        for (const scope of this.scopes) {
-          scope.stop(true)
+        for (i = 0, l = this.scopes.length; i < l; i++) {
+          this.scopes[i].stop(true)
         }
       }
       // nested scope, dereference from parent to avoid memory leaks

packages/reactivity/src/ref.ts

@@ -124,8 +124,12 @@ class RefImpl<T = any> implements Dependency {
     this[ReactiveFlags.IS_SHALLOW] = isShallow
   }
 
+  get dep() {
+    return this
+  }
+
   get value() {
-    track(this)
+    trackRef(this)
     return this._value
   }
 
@@ -183,14 +187,14 @@ class RefImpl<T = any> implements Dependency {
  */
 export function triggerRef(ref: Ref): void {
   // ref may be an instance of ObjectRefImpl
-  if ((ref as unknown as Dependency).subs !== undefined) {
+  if ((ref as unknown as RefImpl).dep?.subs !== undefined) {
     startBatch()
-    Dependency.propagate((ref as unknown as Dependency).subs!)
+    Dependency.propagate((ref as unknown as RefImpl).dep!.subs!)
     endBatch()
   }
 }
 
-function track(dep: Dependency) {
+function trackRef(dep: Dependency) {
   const activeTrackId = System.activeTrackId
   if (activeTrackId !== 0 && dep.subsTail?.trackId !== activeTrackId) {
     if (__DEV__) {
@@ -306,13 +310,17 @@ class CustomRefImpl<T> implements Dependency {
 
   constructor(factory: CustomRefFactory<T>) {
     const { get, set } = factory(
-      () => track(this),
+      () => trackRef(this),
       () => triggerRef(this as unknown as Ref),
     )
     this._get = get
     this._set = set
   }
 
+  get dep() {
+    return this
+  }
+
   get value() {
     return (this._value = this._get())
   }
@@ -356,7 +364,7 @@ export function toRefs<T extends object>(object: T): ToRefs<T> {
   return ret
 }
 
-class ObjectRefImpl<T extends object, K extends keyof T> implements Dependency {
+class ObjectRefImpl<T extends object, K extends keyof T> {
   // Dependency
   subs = undefined
   subsTail = undefined

packages/runtime-core/__tests__/apiSetupHelpers.spec.ts

@@ -1,7 +1,7 @@
 import {
   type ComputedRefImpl,
   type ReactiveEffectRunner,
-  effect
+  effect,
 } from '@vue/reactivity'
 import {
   type ComponentInternalInstance,
@@ -454,7 +454,7 @@ describe('SFC <script setup> helpers', () => {
 
       await ready
       expect(e!.effect.active).toBeTruthy()
-      expect(c!.trackId > 0).toBeTruthy()
+      expect(c!.trackId > 0).toBeFalsy()
 
       app.unmount()
       expect(e!.effect.active).toBeFalsy()