From b01e0792baf447bf28abe3b4081fd52c2b0f523d Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Thu, 1 Jun 2023 08:53:56 +0800
Subject: [PATCH 1/7] fix(compiler-sfc): support resolve extends interface for
 defineEmits

---
 .../__snapshots__/defineEmits.spec.ts.snap     | 18 ++++++++++++++++++
 .../compileScript/defineEmits.spec.ts          | 12 ++++++++++++
 .../compiler-sfc/src/script/resolveType.ts     |  9 ++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap b/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap
index a8bd930fbbc..1d0f8464307 100644
--- a/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap
@@ -75,6 +75,24 @@ export default /*#__PURE__*/_defineComponent({
 
     
     
+return { emit }
+}
+
+})"
+`;
+
+exports[`defineEmits > w/ type (interface w/ entends) 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 }) {
+  __expose();
+
+    
+    
 return { emit }
 }
 
diff --git a/packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts b/packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts
index c5d2900a4e7..2fc8923f879 100644
--- a/packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts
@@ -78,6 +78,18 @@ const emit = defineEmits(['a', 'b'])
     expect(content).toMatch(`emits: ["foo", "bar"]`)
   })
 
+  test('w/ type (interface w/ entends)', () => {
+    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
index d30150a82d5..e9fd5299db8 100644
--- a/packages/compiler-sfc/src/script/resolveType.ts
+++ b/packages/compiler-sfc/src/script/resolveType.ts
@@ -334,12 +334,19 @@ 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) {
+          if (!base.calls) {
+            base.calls = calls
+          } else {
+            base.calls.push(...calls)
+          }
+        }
       } catch (e) {
         ctx.error(
           `Failed to resolve extends base type.\nIf this previously worked in 3.2, ` +

From 3896ddb860e2a9c545c45c9a7e7c397e9d84139e Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Tue, 13 Jun 2023 16:19:21 +0800
Subject: [PATCH 2/7] chore: improve code

---
 packages/compiler-sfc/src/script/resolveType.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/compiler-sfc/src/script/resolveType.ts b/packages/compiler-sfc/src/script/resolveType.ts
index e9fd5299db8..b43bf79a68d 100644
--- a/packages/compiler-sfc/src/script/resolveType.ts
+++ b/packages/compiler-sfc/src/script/resolveType.ts
@@ -294,7 +294,7 @@ function mergeElements(
       }
     }
     if (calls) {
-      ;(res.calls || (res.calls = [])).push(...calls)
+      ;(res.calls ||= []).push(...calls)
     }
   }
   return res
@@ -341,11 +341,7 @@ function resolveInterfaceMembers(
           }
         }
         if (calls) {
-          if (!base.calls) {
-            base.calls = calls
-          } else {
-            base.calls.push(...calls)
-          }
+          ;(base.calls ||= []).push(...calls)
         }
       } catch (e) {
         ctx.error(

From 560bb4393981b91d849e1ad40b59def3758b32b9 Mon Sep 17 00:00:00 2001
From: edison1105 <daiwei521@126.com>
Date: Mon, 30 Oct 2023 21:49:39 +0800
Subject: [PATCH 3/7] test: update snap

---
 .../compileScript/__snapshots__/defineEmits.spec.ts.snap      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap b/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap
index 6460c7b3916..299691ae8f2 100644
--- a/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap
@@ -88,10 +88,10 @@ interface Base { (e: 'foo'): void }
     
 export default /*#__PURE__*/_defineComponent({
   emits: [\\"bar\\", \\"foo\\"],
-  setup(__props, { expose: __expose, emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
   __expose();
 
-    
+    const emit = __emit
     
 return { emit }
 }

From 83f22022fb071bf4f25da7e37d3070ff4c54b20d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 10 Nov 2023 15:44:35 +0800
Subject: [PATCH 4/7] Update
 packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts

---
 .../compiler-sfc/__tests__/compileScript/defineEmits.spec.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts b/packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts
index 9989868faa2..0d1a41e0f2b 100644
--- a/packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts
@@ -80,7 +80,7 @@ const emit = defineEmits(['a', 'b'])
     expect(content).toMatch(`emits: ["foo", "bar"]`)
   })
 
-  test('w/ type (interface w/ entends)', () => {
+  test('w/ type (interface w/ extends)', () => {
     const { content } = compile(`
     <script setup lang="ts">
     interface Base { (e: 'foo'): void }

From 3c38213b6d8da7a33cce6f1d4100cd3067a63d61 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 10 Nov 2023 15:52:08 +0800
Subject: [PATCH 5/7] Update packages/compiler-sfc/src/script/resolveType.ts

---
 packages/compiler-sfc/src/script/resolveType.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/src/script/resolveType.ts b/packages/compiler-sfc/src/script/resolveType.ts
index 06bb3d38a74..ba4b9b8efd0 100644
--- a/packages/compiler-sfc/src/script/resolveType.ts
+++ b/packages/compiler-sfc/src/script/resolveType.ts
@@ -294,7 +294,7 @@ function mergeElements(
       }
     }
     if (calls) {
-      ;(res.calls ||= []).push(...calls)
+      ;(res.calls || (res.calls = [])).push(...calls)
     }
   }
   return res

From d32a35f165e26d2b24250c98c57573c0762447db Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 10 Nov 2023 15:52:13 +0800
Subject: [PATCH 6/7] Update packages/compiler-sfc/src/script/resolveType.ts

---
 packages/compiler-sfc/src/script/resolveType.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/src/script/resolveType.ts b/packages/compiler-sfc/src/script/resolveType.ts
index ba4b9b8efd0..7f2e96cd815 100644
--- a/packages/compiler-sfc/src/script/resolveType.ts
+++ b/packages/compiler-sfc/src/script/resolveType.ts
@@ -341,7 +341,7 @@ function resolveInterfaceMembers(
           }
         }
         if (calls) {
-          ;(base.calls ||= []).push(...calls)
+          ;(base.calls || (base.calls = [])).push(...calls)
         }
       } catch (e) {
         ctx.error(

From 45c7d0c3ebac43aad72c4b7a19c58d4c74cca5f7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 10 Nov 2023 15:55:05 +0800
Subject: [PATCH 7/7] chore: snapshot

---
 .../compileScript/__snapshots__/defineEmits.spec.ts.snap        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap b/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap
index 299691ae8f2..78a9834d288 100644
--- a/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineEmits.spec.ts.snap
@@ -81,7 +81,7 @@ return { emit }
 })"
 `;
 
-exports[`defineEmits > w/ type (interface w/ entends) 1`] = `
+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 }