Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(types): simplify ExtractPropTypes to avoid props JSDocs being removed #5166

Merged
merged 3 commits into from
Dec 25, 2021
Merged

feat(types): simplify ExtractPropTypes to avoid props JSDocs being removed #5166

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d78b6d2
feat(types): fix renaming not working for props
johnsoncodehk Dec 24, 2021
c2db1d4
feat(types): avoid props JSDocs being removed
johnsoncodehk Dec 24, 2021
e5c9c8f
feat(types): fix `LooseRequired` not working
johnsoncodehk Dec 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions packages/runtime-core/src/componentProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,13 @@ type InferPropType<T> = [T] extends [null]
: V
: T

export type ExtractPropTypes<O> = O extends object
? { [K in keyof O]?: unknown } & // This is needed to keep the relation between the option prop and the props, allowing to use ctrl+click to navigate to the prop options. see: #3656
{ [K in RequiredKeys<O>]: InferPropType<O[K]> } &
{ [K in OptionalKeys<O>]?: InferPropType<O[K]> }
: { [K in string]: any }
export type ExtractPropTypes<O> = {
// use `keyof Pick<O, RequiredKeys<O>>` instead of `RequiredKeys<O>` to support IDE features
[K in keyof Pick<O, RequiredKeys<O>>]: InferPropType<O[K]>
} & {
// use `keyof Pick<O, OptionalKeys<O>>` instead of `OptionalKeys<O>` to support IDE features
[K in keyof Pick<O, OptionalKeys<O>>]?: InferPropType<O[K]>
}

const enum BooleanFlags {
shouldCast,
Expand Down