Skip to content

Commit

Permalink
feat(app): app.runWithContext() (#7451)
Browse files Browse the repository at this point in the history
  • Loading branch information
posva authored Apr 5, 2023
1 parent 2a9e379 commit 869f3fb
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 4 deletions.
16 changes: 16 additions & 0 deletions packages/runtime-core/__tests__/apiCreateApp.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,22 @@ describe('api: createApp', () => {
expect(`App already provides property with key "bar".`).toHaveBeenWarned()
})

test('runWithContext', () => {
const app = createApp({
setup() {
provide('foo', 'should not be seen')
return () => h('div')
}
})
app.provide('foo', 1)

expect(app.runWithContext(() => inject('foo'))).toBe(1)

// ensure the context is restored
inject('foo')
expect('inject() can only be used inside setup').toHaveBeenWarned()
})

test('component', () => {
const Root = {
// local override
Expand Down
23 changes: 23 additions & 0 deletions packages/runtime-core/src/apiCreateApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ export interface App<HostElement = any> {
unmount(): void
provide<T>(key: InjectionKey<T> | string, value: T): this

/**
* Runs a function with the app as active instance. This allows using of `inject()` within the function to get access
* to variables provided via `app.provide()`.
*
* @param fn - function to run with the app as active instance
*/
runWithContext<T>(fn: () => T): T

// internal, but we need to expose these for the server-renderer and devtools
_uid: number
_component: ConcreteComponent
Expand Down Expand Up @@ -370,6 +378,15 @@ export function createAppAPI<HostElement>(
context.provides[key as string | symbol] = value

return app
},

runWithContext(fn) {
currentApp = app
try {
return fn()
} finally {
currentApp = null
}
}
})

Expand All @@ -380,3 +397,9 @@ export function createAppAPI<HostElement>(
return app
}
}

/**
* @internal Used to identify the current app when using `inject()` within
* `app.runWithContext()`.
*/
export let currentApp: App<unknown> | null = null
12 changes: 8 additions & 4 deletions packages/runtime-core/src/apiInject.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { isFunction } from '@vue/shared'
import { currentInstance } from './component'
import { currentRenderingInstance } from './componentRenderContext'
import { currentApp } from './apiCreateApp'
import { warn } from './warning'

export interface InjectionKey<T> extends Symbol {}
Expand Down Expand Up @@ -46,21 +47,24 @@ export function inject(
// fallback to `currentRenderingInstance` so that this can be called in
// a functional component
const instance = currentInstance || currentRenderingInstance
if (instance) {

// also support looking up from app-level provides w/ `app.runWithContext()`
if (instance || currentApp) {
// #2400
// to support `app.use` plugins,
// fallback to appContext's `provides` if the instance is at root
const provides =
instance.parent == null
const provides = instance
? instance.parent == null
? instance.vnode.appContext && instance.vnode.appContext.provides
: instance.parent.provides
: currentApp!._context.provides

if (provides && (key as string | symbol) in provides) {
// TS doesn't allow symbol as index type
return provides[key as string]
} else if (arguments.length > 1) {
return treatDefaultAsFactory && isFunction(defaultValue)
? defaultValue.call(instance.proxy)
? defaultValue.call(instance && instance.proxy)
: defaultValue
} else if (__DEV__) {
warn(`injection "${String(key)}" not found.`)
Expand Down

0 comments on commit 869f3fb

Please sign in to comment.