root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity

fix(types): improve defineProps return type with generic arguments

This commit is contained in:
Evan You 2023-04-05 17:18:11 +08:00
parent b2c874e3b9
commit 91a931ae87
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/runtime-core/src/apiSetupHelpers.ts
View File

@ -76,7 +76,7 @@ export function defineProps<
PP extends ComponentObjectPropsOptions = ComponentObjectPropsOptions
>(props: PP): Prettify<Readonly<ExtractPropTypes<PP>>>
// overload 3: typed-based declaration
export function defineProps<TypeProps>(): ResolveProps<TypeProps>
export function defineProps<TypeProps>(): DefineProps<TypeProps>
// implementation
export function defineProps() {
if (__DEV__) {
@ -85,13 +85,9 @@ export function defineProps() {
return null as any
}
type ResolveProps<T, BooleanKeys extends keyof T = BooleanKey<T>> = Prettify<
Readonly<
T & {
[K in BooleanKeys]-?: boolean
}
>
>
type DefineProps<T> = Readonly<T> & {
readonly [K in BooleanKey<T>]-?: boolean
}
type BooleanKey<T, K extends keyof T = keyof T> = K extends any
? [T[K]] extends [boolean | undefined]