Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: implement effectScope api #762

Merged
merged 2 commits into from
Jul 16, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat: implement effectScope api
  • Loading branch information
antfu committed Jul 15, 2021
commit 529f7f85d324719e448cab286cd065335dce4a75
5 changes: 3 additions & 2 deletions src/apis/computed.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { getVueConstructor, getCurrentInstance } from '../runtimeContext'
import { getVueConstructor } from '../runtimeContext'
import { createRef, Ref } from '../reactivity'
import {
warn,
noopFn,
defineComponentInstance,
getVueInternalClasses,
} from '../utils'
import { getCurrentScopeVM } from './effectScope'

export interface ComputedRef<T = any> extends WritableComputedRef<T> {
readonly value: T
Expand All @@ -31,7 +32,7 @@ export function computed<T>(
export function computed<T>(
getterOrOptions: ComputedGetter<T> | WritableComputedOptions<T>
): ComputedRef<T> | WritableComputedRef<T> {
const vm = getCurrentInstance()?.proxy
const vm = getCurrentScopeVM()
let getter: ComputedGetter<T>
let setter: ComputedSetter<T> | undefined

Expand Down
105 changes: 105 additions & 0 deletions src/apis/effectScope.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
import {
getCurrentInstance,
getVueConstructor,
withCurrentInstanceTrackingDisabled,
} from '../runtimeContext'
import { defineComponentInstance } from '../utils'
import { warn } from './warn'

let activeEffectScope: EffectScope | undefined
const effectScopeStack: EffectScope[] = []

export class EffectScope {
active = true
effects: EffectScope[] = []
cleanups: (() => void)[] = []

/**
* @internal
**/
vm: Vue

constructor(detached = false) {
let vm: Vue = undefined!
withCurrentInstanceTrackingDisabled(() => {
vm = defineComponentInstance(getVueConstructor())
})
this.vm = vm
if (!detached) {
recordEffectScope(this)
}
}

run<T>(fn: () => T): T | undefined {
if (this.active) {
try {
this.on()
return fn()
} finally {
this.off()
}
} else if (__DEV__) {
warn(`cannot run an inactive effect scope.`)
}
return
}

on() {
if (this.active) {
effectScopeStack.push(this)
activeEffectScope = this
}
}

off() {
if (this.active) {
effectScopeStack.pop()
activeEffectScope = effectScopeStack[effectScopeStack.length - 1]
}
}

stop() {
if (this.active) {
this.vm.$destroy()
this.effects.forEach((e) => e.stop())
this.cleanups.forEach((cleanup) => cleanup())
this.active = false
}
}
}

export function recordEffectScope(
effect: EffectScope,
scope?: EffectScope | null
) {
scope = scope || activeEffectScope
if (scope && scope.active) {
scope.effects.push(effect)
}
}

export function effectScope(detached?: boolean) {
return new EffectScope(detached)
}

export function getCurrentScope() {
return activeEffectScope
}

export function onScopeDispose(fn: () => void) {
if (activeEffectScope) {
activeEffectScope.cleanups.push(fn)
} else if (__DEV__) {
warn(
`onDispose() is called when there is no active effect scope ` +
` to be associated with.`
)
}
}

/**
* @internal
**/
export function getCurrentScopeVM() {
return getCurrentScope()?.vm || getCurrentInstance()?.proxy
}
19 changes: 18 additions & 1 deletion src/apis/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
export * from '../reactivity'
export * from './lifecycle'
export {
onBeforeMount,
onMounted,
onBeforeUpdate,
onUpdated,
onBeforeUnmount,
onUnmounted,
onErrorCaptured,
onActivated,
onDeactivated,
onServerPrefetch,
} from './lifecycle'
export * from './watch'
export * from './computed'
export * from './inject'
Expand All @@ -8,3 +19,9 @@ export { App, createApp } from './createApp'
export { nextTick } from './nextTick'
export { createElement as h } from './createElement'
export { warn } from './warn'
export {
effectScope,
EffectScope,
getCurrentScope,
onScopeDispose,
} from './effectScope'
5 changes: 3 additions & 2 deletions src/apis/watch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ import {
isMap,
} from '../utils'
import { defineComponentInstance } from '../utils/helper'
import { getCurrentInstance, getVueConstructor } from '../runtimeContext'
import { getVueConstructor } from '../runtimeContext'
import {
WatcherPreFlushQueueKey,
WatcherPostFlushQueueKey,
} from '../utils/symbols'
import { ComputedRef } from './computed'
import { getCurrentScopeVM } from './effectScope'

export type WatchEffect = (onInvalidate: InvalidateCbRegistrator) => void

Expand Down Expand Up @@ -110,7 +111,7 @@ function getWatchEffectOption(options?: Partial<WatchOptions>): WatchOptions {
}

function getWatcherVM() {
let vm = getCurrentInstance()?.proxy
let vm = getCurrentScopeVM()
if (!vm) {
if (!fallbackVM) {
fallbackVM = defineComponentInstance(getVueConstructor())
Expand Down
20 changes: 18 additions & 2 deletions src/runtimeContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ try {

let vueConstructor: VueConstructor | null = null
let currentInstance: ComponentInstance | null = null
let currentInstanceTracking = true

const PluginInstalledFlag = '__composition_api_installed__'

Expand Down Expand Up @@ -71,7 +72,22 @@ export function setVueConstructor(Vue: VueConstructor) {
})
}

/**
* For `effectScope` to create instance without populate the current instance
* @internal
**/
export function withCurrentInstanceTrackingDisabled(fn: () => void) {
const prev = currentInstanceTracking
currentInstanceTracking = false
try {
fn()
} finally {
currentInstanceTracking = prev
}
}

export function setCurrentInstance(vm: ComponentInstance | null) {
if (!currentInstanceTracking) return
// currentInstance?.$scopedSlots
currentInstance = vm
}
Expand Down Expand Up @@ -168,7 +184,7 @@ function toVue3ComponentInstance(
return instanceMapCache.get(vue2Instance)!
}

const instance: ComponentInternalInstance = ({
const instance: ComponentInternalInstance = {
proxy: vue2Instance,
update: vue2Instance.$forceUpdate,
uid: vue2Instance._uid,
Expand All @@ -178,7 +194,7 @@ function toVue3ComponentInstance(

parent: null,
root: null as any,
} as unknown) as ComponentInternalInstance
} as unknown as ComponentInternalInstance

// map vm.$props =
const instanceProps = [
Expand Down
Loading