Skip to content

Commit b01e079

Browse files
committed
fix(compiler-sfc): support resolve extends interface for defineEmits
1 parent a95e612 commit b01e079

File tree

3 files changed

+38
-1
lines changed

3 files changed

+38
-1
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,24 @@ export default /*#__PURE__*/_defineComponent({
7575
7676
7777
78+
return { emit }
79+
}
80+
81+
})"
82+
`;
83+
84+
exports[`defineEmits > w/ type (interface w/ entends) 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 }) {
92+
__expose();
93+
94+
95+
7896
return { emit }
7997
}
8098

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,18 @@ const emit = defineEmits(['a', 'b'])
7878
expect(content).toMatch(`emits: ["foo", "bar"]`)
7979
})
8080

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

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,19 @@ 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+
if (!base.calls) {
345+
base.calls = calls
346+
} else {
347+
base.calls.push(...calls)
348+
}
349+
}
343350
} catch (e) {
344351
ctx.error(
345352
`Failed to resolve extends base type.\nIf this previously worked in 3.2, ` +

0 commit comments

Comments
 (0)