root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix(runtime-core): correct type inference for PascalCase emits (#11579) 

fix vuejs/language-tools#4269
This commit is contained in:
山吹色御守 2024-08-15 17:49:43 +08:00 committed by GitHub
parent 7d700c215d
commit d7d0371e74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages-private/dts-test/defineComponent.test-d.tsx
View File

@ -906,12 +906,15 @@ describe('emits', () => {
emits: { emits: {
click: (n: number) => typeof n === 'number', click: (n: number) => typeof n === 'number',
input: (b: string) => b.length > 1, input: (b: string) => b.length > 1,
Focus: (f: boolean) => !!f,
}, },
setup(props, { emit }) { setup(props, { emit }) {
expectType<((n: number) => boolean) | undefined>(props.onClick) expectType<((n: number) => boolean) | undefined>(props.onClick)
expectType<((b: string) => boolean) | undefined>(props.onInput) expectType<((b: string) => boolean) | undefined>(props.onInput)
expectType<((f: boolean) => boolean) | undefined>(props.onFocus)
emit('click', 1) emit('click', 1)
emit('input', 'foo') emit('input', 'foo')
emit('Focus', true)
// @ts-expect-error // @ts-expect-error
emit('nope') emit('nope')
// @ts-expect-error // @ts-expect-error
@ -922,6 +925,10 @@ describe('emits', () => {
emit('input') emit('input')
// @ts-expect-error // @ts-expect-error
emit('input', 1) emit('input', 1)
// @ts-expect-error
emit('focus')
// @ts-expect-error
emit('focus', true)
}, },
created() { created() {
this.$emit('click', 1) this.$emit('click', 1)
@ -936,6 +943,10 @@ describe('emits', () => {
this.$emit('input') this.$emit('input')
// @ts-expect-error // @ts-expect-error
this.$emit('input', 1) this.$emit('input', 1)
// @ts-expect-error
this.$emit('focus')
// @ts-expect-error
this.$emit('focus', true)
}, },
mounted() { mounted() {
// #3599 // #3599
@ -954,6 +965,10 @@ describe('emits', () => {
this.$emit('input') this.$emit('input')
// @ts-expect-error // @ts-expect-error
this.$emit('input', 1) this.$emit('input', 1)
// @ts-expect-error
this.$emit('focus')
// @ts-expect-error
this.$emit('focus', true)
}) })
}, },
}) })

16
packages/runtime-core/src/componentEmits.ts
View File

@ -47,15 +47,13 @@ export type EmitsToProps<T extends EmitsOptions | ComponentTypeEmits> =
} }
: T extends ObjectEmitsOptions : T extends ObjectEmitsOptions
? { ? {
[K in `on${Capitalize<string & keyof T>}`]?: K extends `on${infer C}` [K in string & keyof T as `on${Capitalize<K>}`]?: (
? ( ...args: T[K] extends (...args: infer P) => any
...args: T[Uncapitalize<C>] extends (...args: infer P) => any ? P
? P : T[K] extends null
: T[Uncapitalize<C>] extends null ? any[]
? any[] : never
: never ) => any
) => any
: never
} }
: {} : {}