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

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

Merged
merged 1 commit into from Sep 21, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/runtime-core/src/apiDefineComponent.ts
View file
Open in desktop
Expand Up @@ -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<
Expand Down
54 changes: 25 additions & 29 deletions test-dts/defineComponent.test-d.tsx
View file
Open in desktop
Expand Up @@ -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
// }
// })

// 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" />)
// expectError(<MyComponent />)
// expectError(<MyComponent msg={1} />)
// })
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="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" />)
// @ts-expect-error
expectError(<MyComponent />)
expectError(<MyComponent msg="1" />)
})

describe('type inference w/ array props declaration', () => {
const MyComponent = defineComponent({
Expand Down