]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
fix(types): fix provide type checking for ref value
authorEvan You <yyx990803@gmail.com>
Mon, 1 May 2023 03:26:47 +0000 (11:26 +0800)
committerEvan You <yyx990803@gmail.com>
Mon, 1 May 2023 03:27:05 +0000 (11:27 +0800)
fix #8201

packages/dts-test/inject.test-d.ts
packages/runtime-core/src/apiInject.ts

index c34485a61dc02344b45a2f50e9cf4cc45ed9fdd5..f0522f2545105916dfe71c979e93110e97f7372e 100644 (file)
@@ -1,6 +1,9 @@
-import { provide, inject, InjectionKey } from 'vue'
+import { provide, inject, ref, Ref, InjectionKey } from 'vue'
 import { expectType } from './utils'
 
+provide('foo', 123)
+provide(123, 123)
+
 const key: InjectionKey<number> = Symbol()
 
 provide(key, 1)
@@ -14,3 +17,13 @@ expectType<number>(inject(key, () => 1, true /* treatDefaultAsFactory */))
 expectType<() => number>(inject('foo', () => 1))
 expectType<() => number>(inject('foo', () => 1, false))
 expectType<number>(inject('foo', () => 1, true))
+
+// #8201
+type Cube = {
+  size: number
+}
+
+const injectionKeyRef = Symbol('key') as InjectionKey<Ref<Cube>>
+
+// @ts-expect-error
+provide(injectionKeyRef, ref({}))
index 4559c1b702f2e3492d39493c1a4a7f1844d9310a..9b76591493739224d0be1ba2651ad3bee1749874 100644 (file)
@@ -6,7 +6,10 @@ import { warn } from './warning'
 
 export interface InjectionKey<T> extends Symbol {}
 
-export function provide<T>(key: InjectionKey<T> | string | number, value: T) {
+export function provide<T extends InjectionKey<any>>(
+  key: T | string | number,
+  value: T extends InjectionKey<infer V> ? V : any
+) {
   if (!currentInstance) {
     if (__DEV__) {
       warn(`provide() can only be used inside setup().`)