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

types(reactivity): handle primitive + object intersection types in UnwrapRef (#614)

Browse Source
This commit is contained in:
IU 2020-01-17 06:47:47 +08:00 committed by Evan You
parent 2f6ec45d10
commit 2b4d0d6501
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,11 @@ function toProxyRef<T extends object, K extends keyof T>(
type UnwrapArray<T> = { [P in keyof T]: UnwrapRef<T[P]> }
// corner case when use narrows type
// Ex. type RelativePath = string & { __brand: unknown }
// RelativePath extends object -> true
type BaseTypes = string | number | boolean
// Recursively unwraps nested value bindings.
export type UnwrapRef<T> = {
cRef: T extends ComputedRef<infer V> ? UnwrapRef<V> : T
@ -97,6 +102,6 @@ export type UnwrapRef<T> = {
? 'ref'
: T extends Array<any>
? 'array'
: T extends Function | CollectionTypes
: T extends Function | CollectionTypes | BaseTypes
? 'ref' // bail out on types that shouldn't be unwrapped
: T extends object ? 'object' : 'ref']

6
test-dts/defineComponent.test-d.tsx
View File

@ -12,6 +12,8 @@ describe('with object props', () => {
ddd: string[]
}
type GT = string & { __brand: unknown }
const MyComponent = defineComponent({
props: {
a: Number,
@ -57,6 +59,9 @@ describe('with object props', () => {
c: ref(1),
d: {
e: ref('hi')
},
f: {
g: ref('hello' as GT)
}
}
},
@ -88,6 +93,7 @@ describe('with object props', () => {
// assert setup context unwrapping
expectType<number>(this.c)
expectType<string>(this.d.e)
expectType<GT>(this.f.g)
// setup context properties should be mutable
this.c = 2