fix(compiler-sfc): support resolve extends interface for defineEmits (#8470)

edison1105 · web-flow · commit 9e1b74bcd5fa · 2023-11-10T16:00:04.000+08:00
close #8465
diff --git a/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap b/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap
@@ -81,6 +81,24 @@ return { emit }
 })"
 `;
 
+exports[`defineEmits > w/ type (interface w/ extends) 1`] = `
+"import { defineComponent as _defineComponent } from 'vue'
+interface Base { (e: 'foo'): void }
+    interface Emits extends Base { (e: 'bar'): void }
+    
+export default /*#__PURE__*/_defineComponent({
+  emits: [\\"bar\\", \\"foo\\"],
+  setup(__props, { expose: __expose, emit: __emit }) {
+  __expose();
+
+    const emit = __emit
+    
+return { emit }
+}
+
+})"
+`;
+
 exports[`defineEmits > w/ type (interface) 1`] = `
 "import { defineComponent as _defineComponent } from 'vue'
 interface Emits { (e: 'foo' | 'bar'): void }
diff --git a/packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts b/packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts
@@ -80,6 +80,18 @@ const emit = defineEmits(['a', 'b'])
     expect(content).toMatch(`emits: ["foo", "bar"]`)
   })
 
+  test('w/ type (interface w/ extends)', () => {
+    const { content } = compile(`
+    <script setup lang="ts">
+    interface Base { (e: 'foo'): void }
+    interface Emits extends Base { (e: 'bar'): void }
+    const emit = defineEmits<Emits>()
+    </script>
+    `)
+    assertCode(content)
+    expect(content).toMatch(`emits: ["bar", "foo"]`)
+  })
+
   test('w/ type (exported interface)', () => {
     const { content } = compile(`
     <script setup lang="ts">
diff --git a/packages/compiler-sfc/src/script/resolveType.ts b/packages/compiler-sfc/src/script/resolveType.ts
@@ -334,12 +334,15 @@ function resolveInterfaceMembers(
         continue
       }
       try {
-        const { props } = resolveTypeElements(ctx, ext, scope)
+        const { props, calls } = resolveTypeElements(ctx, ext, scope)
         for (const key in props) {
           if (!hasOwn(base.props, key)) {
             base.props[key] = props[key]
           }
         }
+        if (calls) {
+          ;(base.calls || (base.calls = [])).push(...calls)
+        }
       } catch (e) {
         ctx.error(
           `Failed to resolve extends base type.\nIf this previously worked in 3.2, ` +

Original file line number	Diff line number	Diff line change
`@@ -334,12 +334,15 @@ function resolveInterfaceMembers(`
`334`	`334`	`continue`
`335`	`335`	`}`
`336`	`336`	`try {`
`337`		`- const { props } = resolveTypeElements(ctx, ext, scope)`
	`337`	`+ const { props, calls } = resolveTypeElements(ctx, ext, scope)`
`338`	`338`	`for (const key in props) {`
`339`	`339`	`if (!hasOwn(base.props, key)) {`
`340`	`340`	`base.props[key] = props[key]`
`341`	`341`	`}`
`342`	`342`	`}`
	`343`	`+ if (calls) {`
	`344`	`+ ;(base.calls \|\| (base.calls = [])).push(...calls)`
	`345`	`+ }`
`343`	`346`	`} catch (e) {`
`344`	`347`	`ctx.error(`
`345`	`348`	`Failed to resolve extends base type.\nIf this previously worked in 3.2, ` +