Skip to content

Commit 038cd83

Browse files
committed
fix(types): retain compatibility for provide() usage with explicit type parameter
1 parent d40d4a3 commit 038cd83

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

packages/dts-test/inject.test-d.ts

+13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { provide, inject, ref, Ref, InjectionKey } from 'vue'
22
import { expectType } from './utils'
33

4+
// non-symbol keys
45
provide('foo', 123)
56
provide(123, 123)
67

@@ -9,6 +10,8 @@ const key: InjectionKey<number> = Symbol()
910
provide(key, 1)
1011
// @ts-expect-error
1112
provide(key, 'foo')
13+
// @ts-expect-error
14+
provide(key, null)
1215

1316
expectType<number | undefined>(inject(key))
1417
expectType<number>(inject(key, 1))
@@ -27,3 +30,13 @@ const injectionKeyRef = Symbol('key') as InjectionKey<Ref<Cube>>
2730

2831
// @ts-expect-error
2932
provide(injectionKeyRef, ref({}))
33+
34+
// naive-ui: explicit provide type parameter
35+
provide<Cube>('cube', { size: 123 })
36+
provide<Cube>(123, { size: 123 })
37+
provide<Cube>(injectionKeyRef, { size: 123 })
38+
39+
// @ts-expect-error
40+
provide<Cube>('cube', { size: 'foo' })
41+
// @ts-expect-error
42+
provide<Cube>(123, { size: 'foo' })

packages/runtime-core/src/apiInject.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import { warn } from './warning'
66

77
export interface InjectionKey<T> extends Symbol {}
88

9-
export function provide<T extends InjectionKey<any>>(
10-
key: T | string | number,
11-
value: T extends InjectionKey<infer V> ? V : any
9+
export function provide<T, K = InjectionKey<T> | string | number>(
10+
key: K,
11+
value: K extends InjectionKey<infer V> ? V : T
1212
) {
1313
if (!currentInstance) {
1414
if (__DEV__) {

0 commit comments

Comments
 (0)