chore: rebase

vuejs · Jan 18, 2023 · 72f8bc2 · 72f8bc2
1 parent d261c02
commit 72f8bc2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git 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
@@ -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!