theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(types): ensure correct type for toRef and toRefs on existing refs

Browse Source
This commit is contained in:
Evan You
2020-10-27 18:50:34 -04:00
parent 9c23ddf9c5
commit 8e20375372
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/reactivity/src/ref.ts
View File

@@ -20,7 +20,8 @@ export interface Ref<T = any> {
_shallow?: boolean
}
export type ToRefs<T = any> = { [K in keyof T]: Ref<T[K]> }
export type ToRef<T> = T extends Ref ? T : Ref<UnwrapRef<T>>
export type ToRefs<T = any> = { [K in keyof T]: ToRef<T[K]> }
const convert = <T extends unknown>(val: T): T =>
isObject(val) ? reactive(val) : val
@@ -30,9 +31,7 @@ export function isRef(r: any): r is Ref {
return Boolean(r && r.__v_isRef === true)
}
export function ref<T extends object>(
value: T
): T extends Ref ? T : Ref<UnwrapRef<T>>
export function ref<T extends object>(value: T): ToRef<T>
export function ref<T>(value: T): Ref<UnwrapRef<T>>
export function ref<T = any>(): Ref<T | undefined>
export function ref(value?: unknown) {
@@ -171,7 +170,7 @@ class ObjectRefImpl<T extends object, K extends keyof T> {
export function toRef<T extends object, K extends keyof T>(
object: T,
key: K
): Ref<T[K]> {
): ToRef<T[K]> {
return isRef(object[key])
? object[key]
: (new ObjectRefImpl(object, key) as any)