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

fix(types): extract the correct props type for the DateConstructor (#2676)

Browse Source
This commit is contained in:
HcySunYang 2021-02-06 02:56:23 +08:00 committed by GitHub
parent 288ae0a8d9
commit 48f0d2944f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/runtime-core/src/componentProps.ts
View File

@ -97,6 +97,8 @@ type InferPropType<T> = T extends null
? Record<string, any> ? Record<string, any>
: T extends BooleanConstructor | { type: BooleanConstructor } : T extends BooleanConstructor | { type: BooleanConstructor }
? boolean ? boolean
: T extends DateConstructor | { type: DateConstructor }
? Date
: T extends Prop<infer V, infer D> ? (unknown extends V ? D : V) : T : T extends Prop<infer V, infer D> ? (unknown extends V ? D : V) : T
export type ExtractPropTypes<O> = O extends object export type ExtractPropTypes<O> = O extends object

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

@ -34,6 +34,7 @@ describe('with object props', () => {
ggg: 'foo' | 'bar' ggg: 'foo' | 'bar'
ffff: (a: number, b: string) => { a: boolean } ffff: (a: number, b: string) => { a: boolean }
validated?: string validated?: string
date?: Date
} }
type GT = string & { __brand: unknown } type GT = string & { __brand: unknown }
@ -103,7 +104,8 @@ describe('with object props', () => {
type: String, type: String,
// validator requires explicit annotation // validator requires explicit annotation
validator: (val: unknown) => val !== '' validator: (val: unknown) => val !== ''
} },
date: Date
}, },
setup(props) { setup(props) {
// type assertion. See https://github.com/SamVerschueren/tsd // type assertion. See https://github.com/SamVerschueren/tsd
@ -125,6 +127,7 @@ describe('with object props', () => {
expectType<ExpectedProps['ggg']>(props.ggg) expectType<ExpectedProps['ggg']>(props.ggg)
expectType<ExpectedProps['ffff']>(props.ffff) expectType<ExpectedProps['ffff']>(props.ffff)
expectType<ExpectedProps['validated']>(props.validated) expectType<ExpectedProps['validated']>(props.validated)
expectType<ExpectedProps['date']>(props.date)
// @ts-expect-error props should be readonly // @ts-expect-error props should be readonly
expectError((props.a = 1)) expectError((props.a = 1))