Skip to content

Commit e1905a9

Browse files
committed
chore: remove unused arg for ExtractPropTypes
1 parent a072d50 commit e1905a9

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

packages/runtime-core/src/componentProps.ts

+6-16
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,11 @@ type PropMethod<T, TConstructor = any> = T extends (...args: any) => any // if i
6363
? { new (): TConstructor; (): T; readonly prototype: TConstructor } // Create Function like constructor
6464
: never
6565

66-
type RequiredKeys<T, MakeDefaultRequired> = {
67-
[K in keyof T]: T[K] extends
68-
| { required: true }
69-
| (MakeDefaultRequired extends true ? { default: any } : never)
70-
? K
71-
: never
66+
type RequiredKeys<T> = {
67+
[K in keyof T]: T[K] extends { required: true } | { default: any } ? K : never
7268
}[keyof T]
7369

74-
type OptionalKeys<T, MakeDefaultRequired> = Exclude<
75-
keyof T,
76-
RequiredKeys<T, MakeDefaultRequired>
77-
>
70+
type OptionalKeys<T> = Exclude<keyof T, RequiredKeys<T>>
7871

7972
type DefaultKeys<T> = {
8073
[K in keyof T]: T[K] extends { default: any } ? K : never
@@ -90,12 +83,9 @@ type InferPropType<T> = T extends null
9083
? boolean
9184
: T extends Prop<infer V, infer D> ? (unknown extends V ? D : V) : T
9285

93-
export type ExtractPropTypes<
94-
O,
95-
MakeDefaultRequired extends boolean = true
96-
> = O extends object
97-
? { [K in RequiredKeys<O, MakeDefaultRequired>]: InferPropType<O[K]> } &
98-
{ [K in OptionalKeys<O, MakeDefaultRequired>]?: InferPropType<O[K]> }
86+
export type ExtractPropTypes<O> = O extends object
87+
? { [K in RequiredKeys<O>]: InferPropType<O[K]> } &
88+
{ [K in OptionalKeys<O>]?: InferPropType<O[K]> }
9989
: { [K in string]: any }
10090

10191
const enum BooleanFlags {

packages/runtime-core/src/index.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export {
4141
} from './apiLifecycle'
4242
export { provide, inject } from './apiInject'
4343
export { nextTick } from './scheduler'
44-
export { defineComponent, DefineComponent } from './apiDefineComponent'
44+
export { defineComponent } from './apiDefineComponent'
4545
export { defineAsyncComponent } from './apiAsyncComponent'
4646

4747
// Advanced API ----------------------------------------------------------------
@@ -166,6 +166,7 @@ export {
166166
ComponentCustomProps,
167167
AllowedComponentProps
168168
} from './component'
169+
export { DefineComponent } from './apiDefineComponent'
169170
export {
170171
ComponentOptions,
171172
ComponentOptionsMixin,
@@ -198,7 +199,8 @@ export {
198199
PropType,
199200
ComponentPropsOptions,
200201
ComponentObjectPropsOptions,
201-
ExtractPropTypes
202+
ExtractPropTypes,
203+
ExtractDefaultPropTypes
202204
} from './componentProps'
203205
export {
204206
Directive,

0 commit comments

Comments
 (0)