From 9c8f114c2eec123decec14a208e9de9a173bece6 Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Fri, 29 Apr 2022 15:46:53 +0800
Subject: [PATCH 1/5] fix(compiler-sfc): support resolve type declaration from
 normal script

fix(compiler-sfc): support resolve type declaration from normal script

fix(compiler-sfc): support resolve type declaration from normal script

update test case
---
 .../__snapshots__/compileScript.spec.ts.snap  | 24 +++++++++++++++++
 .../__tests__/compileScript.spec.ts           | 16 ++++++++++++
 packages/compiler-sfc/src/compileScript.ts    | 26 +++++++++++++------
 3 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index de223bf91d8..70b7e0c732a 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -1445,6 +1445,30 @@ const props = __props as { foo: string, bar?: number, baz: boolean, qux(): numbe
 
       
       
+return { props }
+}
+
+})"
+`;
+
+exports[`SFC compile <script setup> with TypeScript withDefaults + normal script 1`] = `
+"import { defineComponent as _defineComponent } from 'vue'
+
+        interface Props {
+          a?: string;
+        }
+      
+export default /*#__PURE__*/_defineComponent({
+  props: {
+    a: { type: String, required: false, default: \\"a\\" }
+  },
+  setup(__props: any, { expose }) {
+  expose();
+
+const props = __props as { a: string }
+
+        
+      
 return { props }
 }
 
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index 17c97745e32..287e98b03b0 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -954,6 +954,22 @@ const emit = defineEmits(['a', 'b'])
       )
     })
 
+    test('withDefaults + normal script', () => {
+      const { content } = compile(`
+      <script lang="ts">
+        interface Props {
+          a?: string;
+        }
+      </script>
+      <script setup lang="ts">
+        const props = withDefaults(defineProps<Props>(), {
+          a: "a",
+        });
+      </script>
+      `)
+      assertCode(content)
+    })
+
     test('defineEmits w/ type', () => {
       const { content } = compile(`
       <script setup lang="ts">
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index f70faeaf02b..2ab5a25d60a 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -277,6 +277,8 @@ export function compileScript(
     | TSInterfaceBody
     | undefined
   let emitsTypeDeclRaw: Node | undefined
+  // propsTypeDecl or emitsTypeDecl decl from normal script
+  let isTypeDeclFromNormalScript = false
   let emitIdentifier: string | undefined
   let hasAwait = false
   let hasInlinedSsrRenderFn = false
@@ -554,12 +556,20 @@ export function compileScript(
           return isQualifiedType(node.declaration)
         }
       }
-      const body = scriptAst
-        ? [...scriptSetupAst.body, ...scriptAst.body]
-        : scriptSetupAst.body
-      for (const node of body) {
+      
+      if (scriptAst) {
+        for (const node of scriptAst.body) {
+          const qualified = isQualifiedType(node)
+          if (qualified) {
+            isTypeDeclFromNormalScript = true
+            return qualified
+          }
+        }
+      }
+      for (const node of scriptSetupAst.body) {
         const qualified = isQualifiedType(node)
         if (qualified) {
+          isTypeDeclFromNormalScript = false
           return qualified
         }
       }
@@ -740,7 +750,7 @@ export function compileScript(
   }
 
   function genSetupPropsType(node: TSTypeLiteral | TSInterfaceBody) {
-    const scriptSetupSource = scriptSetup!.content
+    const scriptSource = isTypeDeclFromNormalScript ? script!.content : scriptSetup!.content
     if (hasStaticWithDefaults()) {
       // if withDefaults() is used, we need to remove the optional flags
       // on props that have default values
@@ -761,20 +771,20 @@ export function compileScript(
             res +=
               m.key.name +
               (m.type === 'TSMethodSignature' ? '()' : '') +
-              scriptSetupSource.slice(
+              scriptSource.slice(
                 m.typeAnnotation.start!,
                 m.typeAnnotation.end!
               ) +
               ', '
           } else {
             res +=
-              scriptSetupSource.slice(m.start!, m.typeAnnotation.end!) + `, `
+              scriptSource.slice(m.start!, m.typeAnnotation.end!) + `, `
           }
         }
       }
       return (res.length ? res.slice(0, -2) : res) + ` }`
     } else {
-      return scriptSetupSource.slice(node.start!, node.end!)
+      return scriptSource.slice(node.start!, node.end!)
     }
   }
 

From ee9a9a65d66b1ccb022abf7ca1855fdd1a595bdf Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Fri, 29 Apr 2022 21:02:33 +0800
Subject: [PATCH 2/5] feat(compiler-sfc): defineEmits w/ type from normal
 script

---
 .../__snapshots__/compileScript.spec.ts.snap  | 48 +++++++++++++------
 .../__tests__/compileScript.spec.ts           | 47 +++++++++++-------
 packages/compiler-sfc/src/compileScript.ts    | 14 +++---
 3 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 70b7e0c732a..712c5073f92 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -1166,6 +1166,24 @@ export default /*#__PURE__*/_defineComponent({
 
       
       
+return { emit }
+}
+
+})"
+`;
+
+exports[`SFC compile <script setup> with TypeScript defineEmits w/ type from normal script 1`] = `
+"import { defineComponent as _defineComponent } from 'vue'
+
+        export interface Emits { (e: 'foo' | 'bar'): void }
+      
+export default /*#__PURE__*/_defineComponent({
+  emits: [\\"foo\\", \\"bar\\"],
+  setup(__props, { expose, emit }: { emit: ({ (e: 'foo' | 'bar'): void }), expose: any, slots: any, attrs: any }) {
+  expose();
+
+      
+      
 return { emit }
 }
 
@@ -1428,22 +1446,23 @@ return { props, defaults }
 })"
 `;
 
-exports[`SFC compile <script setup> with TypeScript withDefaults (static) 1`] = `
+exports[`SFC compile <script setup> with TypeScript withDefaults (static) + normal script 1`] = `
 "import { defineComponent as _defineComponent } from 'vue'
 
+        interface Props {
+          a?: string;
+        }
+      
 export default /*#__PURE__*/_defineComponent({
   props: {
-    foo: { type: String, required: false, default: 'hi' },
-    bar: { type: Number, required: false },
-    baz: { type: Boolean, required: true },
-    qux: { type: Function, required: false, default() { return 1 } }
+    a: { type: String, required: false, default: \\"a\\" }
   },
   setup(__props: any, { expose }) {
   expose();
 
-const props = __props as { foo: string, bar?: number, baz: boolean, qux(): number }
+const props = __props as { a: string }
 
-      
+        
       
 return { props }
 }
@@ -1451,23 +1470,22 @@ return { props }
 })"
 `;
 
-exports[`SFC compile <script setup> with TypeScript withDefaults + normal script 1`] = `
+exports[`SFC compile <script setup> with TypeScript withDefaults (static) 1`] = `
 "import { defineComponent as _defineComponent } from 'vue'
 
-        interface Props {
-          a?: string;
-        }
-      
 export default /*#__PURE__*/_defineComponent({
   props: {
-    a: { type: String, required: false, default: \\"a\\" }
+    foo: { type: String, required: false, default: 'hi' },
+    bar: { type: Number, required: false },
+    baz: { type: Boolean, required: true },
+    qux: { type: Function, required: false, default() { return 1 } }
   },
   setup(__props: any, { expose }) {
   expose();
 
-const props = __props as { a: string }
+const props = __props as { foo: string, bar?: number, baz: boolean, qux(): number }
 
-        
+      
       
 return { props }
 }
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index 287e98b03b0..076e5cc2bcc 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -931,6 +931,22 @@ const emit = defineEmits(['a', 'b'])
       })
     })
 
+    test('withDefaults (static) + normal script', () => {
+      const { content } = compile(`
+      <script lang="ts">
+        interface Props {
+          a?: string;
+        }
+      </script>
+      <script setup lang="ts">
+        const props = withDefaults(defineProps<Props>(), {
+          a: "a",
+        });
+      </script>
+      `)
+      assertCode(content)
+    })
+
     test('withDefaults (dynamic)', () => {
       const { content } = compile(`
       <script setup lang="ts">
@@ -954,22 +970,6 @@ const emit = defineEmits(['a', 'b'])
       )
     })
 
-    test('withDefaults + normal script', () => {
-      const { content } = compile(`
-      <script lang="ts">
-        interface Props {
-          a?: string;
-        }
-      </script>
-      <script setup lang="ts">
-        const props = withDefaults(defineProps<Props>(), {
-          a: "a",
-        });
-      </script>
-      `)
-      assertCode(content)
-    })
-
     test('defineEmits w/ type', () => {
       const { content } = compile(`
       <script setup lang="ts">
@@ -1028,6 +1028,21 @@ const emit = defineEmits(['a', 'b'])
       expect(content).toMatch(`emits: ["foo", "bar"]`)
     })
 
+    
+    test('defineEmits w/ type from normal script', () => {
+      const { content } = compile(`
+      <script lang="ts">
+        export interface Emits { (e: 'foo' | 'bar'): void }
+      </script>
+      <script setup lang="ts">
+      const emit = defineEmits<Emits>()
+      </script>
+      `)
+      assertCode(content)
+      expect(content).toMatch(`emit: ({ (e: 'foo' | 'bar'): void }),`)
+      expect(content).toMatch(`emits: ["foo", "bar"]`)
+    })
+
     test('defineEmits w/ type (type alias)', () => {
       const { content } = compile(`
       <script setup lang="ts">
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 2ab5a25d60a..41335960888 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -277,7 +277,7 @@ export function compileScript(
     | TSInterfaceBody
     | undefined
   let emitsTypeDeclRaw: Node | undefined
-  // propsTypeDecl or emitsTypeDecl decl from normal script
+  // propsTypeDecl/emitsTypeDecl declared from normal script
   let isTypeDeclFromNormalScript = false
   let emitIdentifier: string | undefined
   let hasAwait = false
@@ -556,7 +556,7 @@ export function compileScript(
           return isQualifiedType(node.declaration)
         }
       }
-      
+
       if (scriptAst) {
         for (const node of scriptAst.body) {
           const qualified = isQualifiedType(node)
@@ -750,7 +750,9 @@ export function compileScript(
   }
 
   function genSetupPropsType(node: TSTypeLiteral | TSInterfaceBody) {
-    const scriptSource = isTypeDeclFromNormalScript ? script!.content : scriptSetup!.content
+    const scriptSource = isTypeDeclFromNormalScript
+      ? script!.content
+      : scriptSetup!.content
     if (hasStaticWithDefaults()) {
       // if withDefaults() is used, we need to remove the optional flags
       // on props that have default values
@@ -777,8 +779,7 @@ export function compileScript(
               ) +
               ', '
           } else {
-            res +=
-              scriptSource.slice(m.start!, m.typeAnnotation.end!) + `, `
+            res += scriptSource.slice(m.start!, m.typeAnnotation.end!) + `, `
           }
         }
       }
@@ -1277,7 +1278,8 @@ export function compileScript(
   if (destructureElements.length) {
     args += `, { ${destructureElements.join(', ')} }`
     if (emitsTypeDecl) {
-      args += `: { emit: (${scriptSetup.content.slice(
+      const content = isTypeDeclFromNormalScript ? script!.content: scriptSetup.content
+      args += `: { emit: (${content.slice(
         emitsTypeDecl.start!,
         emitsTypeDecl.end!
       )}), expose: any, slots: any, attrs: any }`

From 2f9be26539e34ac39da8414d1734f8d9849f1737 Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Fri, 29 Apr 2022 22:10:21 +0800
Subject: [PATCH 3/5] chore: improve code

---
 packages/compiler-sfc/src/compileScript.ts | 50 ++++++++++------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 41335960888..454c73a0875 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -128,6 +128,12 @@ export interface ImportBinding {
   isUsedInTemplate: boolean
 }
 
+type FromNormalScript = { __fromNormalScript?: boolean }
+
+type PropsDeclType = (TSTypeLiteral | TSInterfaceBody) & FromNormalScript
+
+type EmitsDescType = (TSFunctionType | TSTypeLiteral | TSInterfaceBody) & FromNormalScript
+
 /**
  * Compile `<script setup>`
  * It requires the whole SFC descriptor because we need to handle and merge
@@ -267,18 +273,12 @@ export function compileScript(
   let propsRuntimeDefaults: ObjectExpression | undefined
   let propsDestructureDecl: Node | undefined
   let propsDestructureRestId: string | undefined
-  let propsTypeDecl: TSTypeLiteral | TSInterfaceBody | undefined
+  let propsTypeDecl: PropsDeclType | undefined
   let propsTypeDeclRaw: Node | undefined
   let propsIdentifier: string | undefined
   let emitsRuntimeDecl: Node | undefined
-  let emitsTypeDecl:
-    | TSFunctionType
-    | TSTypeLiteral
-    | TSInterfaceBody
-    | undefined
+  let emitsTypeDecl: EmitsDescType | undefined
   let emitsTypeDeclRaw: Node | undefined
-  // propsTypeDecl/emitsTypeDecl declared from normal script
-  let isTypeDeclFromNormalScript = false
   let emitIdentifier: string | undefined
   let hasAwait = false
   let hasInlinedSsrRenderFn = false
@@ -388,7 +388,7 @@ export function compileScript(
       propsTypeDecl = resolveQualifiedType(
         propsTypeDeclRaw,
         node => node.type === 'TSTypeLiteral'
-      ) as TSTypeLiteral | TSInterfaceBody | undefined
+      ) as PropsDeclType | undefined
 
       if (!propsTypeDecl) {
         error(
@@ -510,7 +510,7 @@ export function compileScript(
       emitsTypeDecl = resolveQualifiedType(
         emitsTypeDeclRaw,
         node => node.type === 'TSFunctionType' || node.type === 'TSTypeLiteral'
-      ) as TSFunctionType | TSTypeLiteral | TSInterfaceBody | undefined
+      ) as EmitsDescType | undefined
 
       if (!emitsTypeDecl) {
         error(
@@ -531,7 +531,7 @@ export function compileScript(
   function resolveQualifiedType(
     node: Node,
     qualifier: (node: Node) => boolean
-  ) {
+  ): (Node & FromNormalScript)| undefined {
     if (qualifier(node)) {
       return node
     }
@@ -557,20 +557,16 @@ export function compileScript(
         }
       }
 
-      if (scriptAst) {
-        for (const node of scriptAst.body) {
-          const qualified = isQualifiedType(node)
-          if (qualified) {
-            isTypeDeclFromNormalScript = true
-            return qualified
-          }
-        }
-      }
-      for (const node of scriptSetupAst.body) {
-        const qualified = isQualifiedType(node)
+      const body = scriptAst
+        ? [...scriptSetupAst.body, ...scriptAst.body]
+        : scriptSetupAst.body
+      
+      for (let i = 0; i < body.length; i++) {
+        const qualified = isQualifiedType(body[i])
         if (qualified) {
-          isTypeDeclFromNormalScript = false
-          return qualified
+          ;(qualified as Node & FromNormalScript).__fromNormalScript =
+            scriptAst && i >= scriptSetupAst.body.length
+          return qualified 
         }
       }
     }
@@ -749,8 +745,8 @@ export function compileScript(
     }
   }
 
-  function genSetupPropsType(node: TSTypeLiteral | TSInterfaceBody) {
-    const scriptSource = isTypeDeclFromNormalScript
+  function genSetupPropsType(node: PropsDeclType) {
+    const scriptSource = node.__fromNormalScript
       ? script!.content
       : scriptSetup!.content
     if (hasStaticWithDefaults()) {
@@ -1278,7 +1274,7 @@ export function compileScript(
   if (destructureElements.length) {
     args += `, { ${destructureElements.join(', ')} }`
     if (emitsTypeDecl) {
-      const content = isTypeDeclFromNormalScript ? script!.content: scriptSetup.content
+      const content = emitsTypeDecl.__fromNormalScript ? script!.content : scriptSetup.content
       args += `: { emit: (${content.slice(
         emitsTypeDecl.start!,
         emitsTypeDecl.end!

From 66352d552607eba83b89612876e87096ec0d4ed2 Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Fri, 29 Apr 2022 22:11:39 +0800
Subject: [PATCH 4/5] fix typo

---
 packages/compiler-sfc/src/compileScript.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 454c73a0875..f21ca954560 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -132,7 +132,7 @@ type FromNormalScript = { __fromNormalScript?: boolean }
 
 type PropsDeclType = (TSTypeLiteral | TSInterfaceBody) & FromNormalScript
 
-type EmitsDescType = (TSFunctionType | TSTypeLiteral | TSInterfaceBody) & FromNormalScript
+type EmitsDeclType = (TSFunctionType | TSTypeLiteral | TSInterfaceBody) & FromNormalScript
 
 /**
  * Compile `<script setup>`
@@ -277,7 +277,7 @@ export function compileScript(
   let propsTypeDeclRaw: Node | undefined
   let propsIdentifier: string | undefined
   let emitsRuntimeDecl: Node | undefined
-  let emitsTypeDecl: EmitsDescType | undefined
+  let emitsTypeDecl: EmitsDeclType | undefined
   let emitsTypeDeclRaw: Node | undefined
   let emitIdentifier: string | undefined
   let hasAwait = false
@@ -510,7 +510,7 @@ export function compileScript(
       emitsTypeDecl = resolveQualifiedType(
         emitsTypeDeclRaw,
         node => node.type === 'TSFunctionType' || node.type === 'TSTypeLiteral'
-      ) as EmitsDescType | undefined
+      ) as EmitsDeclType | undefined
 
       if (!emitsTypeDecl) {
         error(

From 72f8bc2b6081fda99d913e8fcaf988bc614ff892 Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Wed, 18 Jan 2023 15:52:14 +0800
Subject: [PATCH 5/5] chore: rebase

---
 .../__snapshots__/compileScript.spec.ts.snap   |  6 +++---
 packages/compiler-sfc/src/compileScript.ts     | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 697fbe4db78..6517b132c8d 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -1458,7 +1458,7 @@ exports[`SFC compile <script setup> with TypeScript defineEmits w/ type from nor
         export interface Emits { (e: 'foo' | 'bar'): void }
       
 export default /*#__PURE__*/_defineComponent({
-  emits: [\\"foo\\", \\"bar\\"],
+  emits: ["foo", "bar"],
   setup(__props, { expose, emit }: { emit: ({ (e: 'foo' | 'bar'): void }), expose: any, slots: any, attrs: any }) {
   expose();
 
@@ -1791,12 +1791,12 @@ exports[`SFC compile <script setup> with TypeScript withDefaults (static) + norm
       
 export default /*#__PURE__*/_defineComponent({
   props: {
-    a: { type: String, required: false, default: \\"a\\" }
+    a: { type: String, required: false, default: "a" }
   },
   setup(__props: any, { expose }) {
   expose();
 
-const props = __props as { a: string }
+const props = __props as { a: string };
 
         
       
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 99b59b56ed8..322f89b0805 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -136,11 +136,11 @@ export interface ImportBinding {
   isUsedInTemplate: boolean
 }
 
-type FromNormalScript = { __fromNormalScript?: boolean }
-
-type PropsDeclType = (TSTypeLiteral | TSInterfaceBody) & FromNormalScript
-
-type EmitsDeclType = (TSFunctionType | TSTypeLiteral | TSInterfaceBody) & FromNormalScript
+type FromNormalScript<T> = T & { __fromNormalScript?: boolean | null }
+type PropsDeclType = FromNormalScript<TSTypeLiteral | TSInterfaceBody>
+type EmitsDeclType = FromNormalScript<
+  TSFunctionType | TSTypeLiteral | TSInterfaceBody
+>
 
 /**
  * Compile `<script setup>`
@@ -669,7 +669,7 @@ export function compileScript(
   function resolveQualifiedType(
     node: Node,
     qualifier: (node: Node) => boolean
-  ): (Node & FromNormalScript)| undefined {
+  ): Node | undefined {
     if (qualifier(node)) {
       return node
     }
@@ -693,7 +693,7 @@ export function compileScript(
             filterExtendsType(extendsTypes, bodies)
             qualified.body = bodies
           }
-          ;(qualified as Node & FromNormalScript).__fromNormalScript =
+          ;(qualified as FromNormalScript<Node>).__fromNormalScript =
             scriptAst && i >= scriptSetupAst.body.length
           return qualified
         }
@@ -1486,7 +1486,9 @@ export function compileScript(
   if (destructureElements.length) {
     args += `, { ${destructureElements.join(', ')} }`
     if (emitsTypeDecl) {
-      const content = emitsTypeDecl.__fromNormalScript ? script!.content : scriptSetup.content
+      const content = emitsTypeDecl.__fromNormalScript
+        ? script!.content
+        : scriptSetup.content
       args += `: { emit: (${content.slice(
         emitsTypeDecl.start!,
         emitsTypeDecl.end!