fix(types/effectScope): re-expose active as readonly property (#6187)

close#6186

Author: webfansplz

packages/reactivity/__tests__/effectScope.spec.ts

@@ -26,6 +26,14 @@ describe('reactivity/effect/scope', () =>{
 expect(newEffectScope().run(()=>1)).toBe(1)
 })
 
+it('should work w/ active property',()=>{
+constscope=newEffectScope()
+scope.run(()=>1)
+expect(scope.active).toBe(true)
+scope.stop()
+expect(scope.active).toBe(false)
+})
+
 it('should collect the effects',()=>{
 constscope=newEffectScope()
 scope.run(()=>{

packages/reactivity/src/effectScope.ts

@@ -7,7 +7,7 @@ export class EffectScope{
 /**
  * @internal
  */
-active=true
+private_active=true
 /**
  * @internal
  */
@@ -44,8 +44,12 @@ export class EffectScope{
 }
 }
 
+getactive(){
+returnthis._active
+}
+
 run<T>(fn: ()=>T): T|undefined{
-if(this.active){
+if(this._active){
 constcurrentEffectScope=activeEffectScope
 try{
 activeEffectScope=this
@@ -75,7 +79,7 @@ export class EffectScope{
 }
 
 stop(fromParent?: boolean){
-if(this.active){
+if(this._active){
 leti,l
 for(i=0,l=this.effects.length;i<l;i++){
 this.effects[i].stop()
@@ -98,7 +102,7 @@ export class EffectScope{
 }
 }
 this.parent=undefined
-this.active=false
+this._active=false
 }
 }
 }

test-dts/reactivity.test-d.ts

@@ -1,73 +1,73 @@
-import{
-ref,
-readonly,
-shallowReadonly,
-describe,
-expectError,
-expectType,
-Ref,
-reactive,
-markRaw
-}from'./index'
-
-describe('should support DeepReadonly',()=>{
-constr=readonly({obj: {k: 'v'}})
-// @ts-expect-error
-expectError((r.obj={}))
-// @ts-expect-error
-expectError((r.obj.k='x'))
-})
-
-// #4180
-describe('readonly ref',()=>{
-constr=readonly(ref({count: 1}))
-expectType<Ref>(r)
-})
-
-describe('should support markRaw',()=>{
-classTest<T>{
-item={}asRef<T>
-}
-consttest=newTest<number>()
-constplain={
-ref: ref(1)
-}
-
-constr=reactive({
-class: {
-raw: markRaw(test),
-reactive: test
-},
-plain: {
-raw: markRaw(plain),
-reactive: plain
-}
-})
-
-expectType<Test<number>>(r.class.raw)
-// @ts-expect-error it should unwrap
-expectType<Test<number>>(r.class.reactive)
-
-expectType<Ref<number>>(r.plain.raw.ref)
-// @ts-expect-error it should unwrap
-expectType<Ref<number>>(r.plain.reactive.ref)
-})
-
-describe('shallowReadonly ref unwrap',()=>{
-constr=shallowReadonly({count: {n: ref(1)}})
-// @ts-expect-error
-r.count=2
-expectType<Ref>(r.count.n)
-r.count.n.value=123
-})
-
-// #3819
-describe('should unwrap tuple correctly',()=>{
-constreadonlyTuple=[ref(0)]asconst
-constreactiveReadonlyTuple=reactive(readonlyTuple)
-expectType<Ref<number>>(reactiveReadonlyTuple[0])
-
-consttuple: [Ref<number>]=[ref(0)]
-constreactiveTuple=reactive(tuple)
-expectType<Ref<number>>(reactiveTuple[0])
-})
+import{
+ref,
+readonly,
+shallowReadonly,
+describe,
+expectError,
+expectType,
+Ref,
+reactive,
+markRaw
+}from'./index'
+
+describe('should support DeepReadonly',()=>{
+constr=readonly({obj: {k: 'v'}})
+// @ts-expect-error
+expectError((r.obj={}))
+// @ts-expect-error
+expectError((r.obj.k='x'))
+})
+
+// #4180
+describe('readonly ref',()=>{
+constr=readonly(ref({count: 1}))
+expectType<Ref>(r)
+})
+
+describe('should support markRaw',()=>{
+classTest<T>{
+item={}asRef<T>
+}
+consttest=newTest<number>()
+constplain={
+ref: ref(1)
+}
+
+constr=reactive({
+class: {
+raw: markRaw(test),
+reactive: test
+},
+plain: {
+raw: markRaw(plain),
+reactive: plain
+}
+})
+
+expectType<Test<number>>(r.class.raw)
+// @ts-expect-error it should unwrap
+expectType<Test<number>>(r.class.reactive)
+
+expectType<Ref<number>>(r.plain.raw.ref)
+// @ts-expect-error it should unwrap
+expectType<Ref<number>>(r.plain.reactive.ref)
+})
+
+describe('shallowReadonly ref unwrap',()=>{
+constr=shallowReadonly({count: {n: ref(1)}})
+// @ts-expect-error
+r.count=2
+expectType<Ref>(r.count.n)
+r.count.n.value=123
+})
+
+// #3819
+describe('should unwrap tuple correctly',()=>{
+constreadonlyTuple=[ref(0)]asconst
+constreactiveReadonlyTuple=reactive(readonlyTuple)
+expectType<Ref<number>>(reactiveReadonlyTuple[0])
+
+consttuple: [Ref<number>]=[ref(0)]
+constreactiveTuple=reactive(tuple)
+expectType<Ref<number>>(reactiveTuple[0])
+})