feat: support inject key types (#986)

vuejs · Aug 15, 2023 · 599423c · 599423c
1 parent 06357e7
commit 599423c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/apis/inject.ts b/src/apis/inject.ts
@@ -17,10 +17,8 @@ function resolveInject(
 ): any {
   let source = vm
   while (source) {
-    // @ts-ignore
-    if (source._provided && hasOwn(source._provided, provideKey)) {
-      //@ts-ignore
-      return source._provided[provideKey]
+    if (source._provided && hasOwn(source._provided, provideKey as PropertyKey)) {
+      return source._provided[provideKey as PropertyKey]
     }
     source = source.$parent
   }
@@ -29,7 +27,7 @@ function resolveInject(
 }
 
 export function provide<T>(key: InjectionKey<T> | string, value: T): void {
-  const vm: any = getCurrentInstanceForFn('provide')?.proxy
+  const vm = getCurrentInstanceForFn('provide')?.proxy
   if (!vm) return
 
   if (!vm._provided) {

diff --git a/src/env.d.ts b/src/env.d.ts
@@ -13,6 +13,7 @@ declare module 'vue/types/vue' {
     readonly _uid: number
     readonly _data: Record<string, any>
     _watchers: VueWatcher[]
+    _provided: Record<PropertyKey, any>
     __composition_api_state__?: VfaState
   }
 

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -36,7 +36,7 @@ export function def(obj: Object, key: string, val: any, enumerable?: boolean) {
   })
 }
 
-export function hasOwn(obj: Object, key: string): boolean {
+export function hasOwn(obj: Object, key: PropertyKey): boolean {
   return Object.hasOwnProperty.call(obj, key)
 }