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

fix(types): incorrect type inference of array (#4578)

Browse Source
This commit is contained in:
Amour1688 2021-09-22 00:41:10 +08:00 committed by GitHub
parent 58b1fa5ed1
commit 140f089917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/runtime-core/src/apiDefineComponent.ts
View File

@ -41,7 +41,11 @@ export type DefineComponent<
E extends EmitsOptions = {},
EE extends string = string,
PP = PublicProps,
Props = Readonly<ExtractPropTypes<PropsOrPropOptions>> &
Props = Readonly<
PropsOrPropOptions extends ComponentPropsOptions
? ExtractPropTypes<PropsOrPropOptions>
: PropsOrPropOptions
> &
({} extends E ? {} : EmitsToProps<E>),
Defaults = ExtractDefaultPropTypes<PropsOrPropOptions>
> = ComponentPublicInstanceConstructor<

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

@ -333,35 +333,31 @@ describe('with object props', () => {
})
})
// describe('type inference w/ optional props declaration', () => {
// const MyComponent = defineComponent({
// setup(_props: { msg: string }) {
// return {
// a: 1
// }
// },
// render() {
// expectType<string>(this.$props.msg)
// // props should be readonly
// expectError((this.$props.msg = 'foo'))
// // should not expose on `this`
// expectError(this.msg)
// expectType<number>(this.a)
// return null
// }
// })
describe('type inference w/ optional props declaration', () => {
const MyComponent = defineComponent<{ a: string[]; msg: string }>({
setup(props) {
expectType<string>(props.msg)
expectType<string[]>(props.a)
return {
b: 1
}
}
})
// expectType<JSX.Element>(<MyComponent msg="foo" />)
// expectError(<MyComponent />)
// expectError(<MyComponent msg={1} />)
// })
expectType<JSX.Element>(<MyComponent msg="1" a={['1']} />)
// @ts-expect-error
expectError(<MyComponent />)
// @ts-expect-error
expectError(<MyComponent msg="1" />)
})
// describe('type inference w/ direct setup function', () => {
// const MyComponent = defineComponent((_props: { msg: string }) => {})
// expectType<JSX.Element>(<MyComponent msg="foo" />)
// expectError(<MyComponent />)
// expectError(<MyComponent msg={1} />)
// })
describe('type inference w/ direct setup function', () => {
const MyComponent = defineComponent((_props: { msg: string }) => {})
expectType<JSX.Element>(<MyComponent msg="foo" />)
// @ts-expect-error
expectError(<MyComponent />)
expectError(<MyComponent msg="1" />)
})
describe('type inference w/ array props declaration', () => {
const MyComponent = defineComponent({