From 28bf8db23c1f2e725051ab453d5e4e84cf74ea86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Ole=C5=9B?= <piotrek.oles@gmail.com>
Date: Mon, 18 Oct 2021 22:05:50 +0200
Subject: [PATCH] fix: support "setup" attribute in <script> tag in vue 3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In Vue 3, when <script> tag has "setup" attribute, SFC parser assignes
script block to a separate field called "scriptSetup"

✅ Closes: #665
---
 .../extension/vue/TypeScriptVueExtension.ts                   | 4 ++--
 .../extension/vue/types/vue__compiler-sfc.ts                  | 1 +
 test/e2e/fixtures/implementation/typescript-vue.fixture       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/typescript-reporter/extension/vue/TypeScriptVueExtension.ts b/src/typescript-reporter/extension/vue/TypeScriptVueExtension.ts
index fd217449..a90beced 100644
--- a/src/typescript-reporter/extension/vue/TypeScriptVueExtension.ts
+++ b/src/typescript-reporter/extension/vue/TypeScriptVueExtension.ts
@@ -112,8 +112,8 @@ function createTypeScriptVueExtension(
     } else if (isVueTemplateCompilerV3(compiler)) {
       const parsed = compiler.parse(vueSourceText);
 
-      if (parsed.descriptor && parsed.descriptor.script) {
-        const scriptV3 = parsed.descriptor.script;
+      if (parsed.descriptor && (parsed.descriptor.script || parsed.descriptor.scriptSetup)) {
+        const scriptV3 = (parsed.descriptor.script || parsed.descriptor.scriptSetup)!;
 
         // map newer version of SFCScriptBlock to the generic one
         script = {
diff --git a/src/typescript-reporter/extension/vue/types/vue__compiler-sfc.ts b/src/typescript-reporter/extension/vue/types/vue__compiler-sfc.ts
index eada888d..5a933576 100644
--- a/src/typescript-reporter/extension/vue/types/vue__compiler-sfc.ts
+++ b/src/typescript-reporter/extension/vue/types/vue__compiler-sfc.ts
@@ -23,6 +23,7 @@ interface SFCDescriptor {
   filename: string;
   template: SFCBlock | null;
   script: SFCBlock | null;
+  scriptSetup: SFCBlock | null;
   styles: SFCBlock[];
   customBlocks: SFCBlock[];
 }
diff --git a/test/e2e/fixtures/implementation/typescript-vue.fixture b/test/e2e/fixtures/implementation/typescript-vue.fixture
index b38a3c30..7a77e187 100644
--- a/test/e2e/fixtures/implementation/typescript-vue.fixture
+++ b/test/e2e/fixtures/implementation/typescript-vue.fixture
@@ -92,7 +92,7 @@ h1 {
   </p>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import User, { getUserName } from '@/model/User';
 
 export default {