Skip to content

Commit 9e1b74b

Browse files
authored
fix(compiler-sfc): support resolve extends interface for defineEmits (#8470)
close #8465
1 parent 2424013 commit 9e1b74b

File tree

3 files changed

+34
-1
lines changed

3 files changed

+34
-1
lines changed

packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap

+18
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,24 @@ return { emit }
8181
})"
8282
`;
8383

84+
exports[`defineEmits > w/ type (interface w/ extends) 1`] = `
85+
"import { defineComponent as _defineComponent } from 'vue'
86+
interface Base { (e: 'foo'): void }
87+
interface Emits extends Base { (e: 'bar'): void }
88+
89+
export default /*#__PURE__*/_defineComponent({
90+
emits: [\\"bar\\", \\"foo\\"],
91+
setup(__props, { expose: __expose, emit: __emit }) {
92+
__expose();
93+
94+
const emit = __emit
95+
96+
return { emit }
97+
}
98+
99+
})"
100+
`;
101+
84102
exports[`defineEmits > w/ type (interface) 1`] = `
85103
"import { defineComponent as _defineComponent } from 'vue'
86104
interface Emits { (e: 'foo' | 'bar'): void }

packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts

+12
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,18 @@ const emit = defineEmits(['a', 'b'])
8080
expect(content).toMatch(`emits: ["foo", "bar"]`)
8181
})
8282

83+
test('w/ type (interface w/ extends)', () => {
84+
const { content } = compile(`
85+
<script setup lang="ts">
86+
interface Base { (e: 'foo'): void }
87+
interface Emits extends Base { (e: 'bar'): void }
88+
const emit = defineEmits<Emits>()
89+
</script>
90+
`)
91+
assertCode(content)
92+
expect(content).toMatch(`emits: ["bar", "foo"]`)
93+
})
94+
8395
test('w/ type (exported interface)', () => {
8496
const { content } = compile(`
8597
<script setup lang="ts">

packages/compiler-sfc/src/script/resolveType.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,15 @@ function resolveInterfaceMembers(
334334
continue
335335
}
336336
try {
337-
const { props } = resolveTypeElements(ctx, ext, scope)
337+
const { props, calls } = resolveTypeElements(ctx, ext, scope)
338338
for (const key in props) {
339339
if (!hasOwn(base.props, key)) {
340340
base.props[key] = props[key]
341341
}
342342
}
343+
if (calls) {
344+
;(base.calls || (base.calls = [])).push(...calls)
345+
}
343346
} catch (e) {
344347
ctx.error(
345348
`Failed to resolve extends base type.\nIf this previously worked in 3.2, ` +

0 commit comments

Comments
 (0)