From: Evan You <yyx990803@gmail.com>
Date: Tue, 2 May 2023 13:35:28 +0000 (+0800)
Subject: fix(types): retain compatibility for provide() usage with explicit type parameter
X-Git-Tag: v3.3.0-beta.4~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=038cd830d5b34b47d7e7e1c61f0973d27cd8b915;p=thirdparty%2Fvuejs%2Fcore.git

fix(types): retain compatibility for provide() usage with explicit type parameter
---

diff --git a/packages/dts-test/inject.test-d.ts b/packages/dts-test/inject.test-d.ts
index f0522f2545..e611f900de 100644
--- a/packages/dts-test/inject.test-d.ts
+++ b/packages/dts-test/inject.test-d.ts
@@ -1,6 +1,7 @@
 import { provide, inject, ref, Ref, InjectionKey } from 'vue'
 import { expectType } from './utils'
 
+// non-symbol keys
 provide('foo', 123)
 provide(123, 123)
 
@@ -9,6 +10,8 @@ const key: InjectionKey<number> = Symbol()
 provide(key, 1)
 // @ts-expect-error
 provide(key, 'foo')
+// @ts-expect-error
+provide(key, null)
 
 expectType<number | undefined>(inject(key))
 expectType<number>(inject(key, 1))
@@ -27,3 +30,13 @@ const injectionKeyRef = Symbol('key') as InjectionKey<Ref<Cube>>
 
 // @ts-expect-error
 provide(injectionKeyRef, ref({}))
+
+// naive-ui: explicit provide type parameter
+provide<Cube>('cube', { size: 123 })
+provide<Cube>(123, { size: 123 })
+provide<Cube>(injectionKeyRef, { size: 123 })
+
+// @ts-expect-error
+provide<Cube>('cube', { size: 'foo' })
+// @ts-expect-error
+provide<Cube>(123, { size: 'foo' })
diff --git a/packages/runtime-core/src/apiInject.ts b/packages/runtime-core/src/apiInject.ts
index 9b76591493..bbf925102d 100644
--- a/packages/runtime-core/src/apiInject.ts
+++ b/packages/runtime-core/src/apiInject.ts
@@ -6,9 +6,9 @@ import { warn } from './warning'
 
 export interface InjectionKey<T> extends Symbol {}
 
-export function provide<T extends InjectionKey<any>>(
-  key: T | string | number,
-  value: T extends InjectionKey<infer V> ? V : any
+export function provide<T, K = InjectionKey<T> | string | number>(
+  key: K,
+  value: K extends InjectionKey<infer V> ? V : T
 ) {
   if (!currentInstance) {
     if (__DEV__) {