From ea93f60beb06064a9ad41f7896de2816e5de8028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ya=C3=ABl=20Guilloux?= <yael.guilloux@gmail.com>
Date: Wed, 13 Sep 2023 17:11:22 +0200
Subject: [PATCH 1/3] test(lang-ts): add initial tests & fixtures

---
 test/fixtures/lang-ts.vue | 22 ++++++++++++++++++++++
 test/index.js             | 30 ++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 test/fixtures/lang-ts.vue

diff --git a/test/fixtures/lang-ts.vue b/test/fixtures/lang-ts.vue
new file mode 100644
index 00000000..bfc16bc1
--- /dev/null
+++ b/test/fixtures/lang-ts.vue
@@ -0,0 +1,22 @@
+<template>
+  <div>
+  </div>
+</template>
+
+<script setup lang="ts">
+let test =       'hello-world'
+</script>
+
+<style lang="ts">
+      const testStyle = {
+  backgroundColor: 'red',
+     color: 'blue'
+}
+</style>
+
+<custom lang="ts">
+   const testi18n = {
+  en: 'hello World',
+  de: 'Hallo Welt'
+}
+</custom>
diff --git a/test/index.js b/test/index.js
index 8f8c9a19..64c97729 100644
--- a/test/index.js
+++ b/test/index.js
@@ -539,6 +539,36 @@ describe("Basic tests", () => {
         })
     })
 
+    describe("About fixtures/lang-ts", () => {
+        it.only('Should parse lang="ts" blocks as script blocks', () => {
+            const ast = parse(
+                [
+                    "<template><div></div></template>",
+                    '<script lang="ts">const test = "test"</script>',
+                    '<style lang="ts">const testStyle = {}</style>',
+                    '<custom lang="ts">const testCustom = {}</custom>',
+                ].join("\n"),
+            )
+            const body = ast
+        })
+        it.only('Should treat lang="ts" blocks as script tags', async () => {
+            const cli = new ESLint({
+                cwd: FIXTURE_DIR,
+                overrideConfig: {
+                    env: { browser: true, node: true },
+                    parser: PARSER_PATH,
+                    parserOptions: {
+                        ...BABEL_PARSER_OPTIONS,
+                        sourceType: "module",
+                        ecmaVersion: 2017,
+                    },
+                },
+                useEslintrc: false,
+            })
+            const report = await cli.lintFiles(["lang-ts.vue"])
+        })
+    })
+
     describe("About unexpected-null-character errors", () => {
         it("should keep NULL in DATA state.", () => {
             const ast = parse("<template>\u0000</template>")

From 99a550de6a799624ac0d7800ea2161b23b54c47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ya=C3=ABl=20Guilloux?= <yael.guilloux@gmail.com>
Date: Wed, 13 Sep 2023 17:11:39 +0200
Subject: [PATCH 2/3] feat(lang-ts): try supporting all lang="ts" blocks as
 scripts elements

---
 src/common/ast-utils.ts   | 11 +++++++++--
 src/index.ts              |  4 ++--
 src/script-setup/index.ts | 36 +++++++++++++++++++++---------------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/common/ast-utils.ts b/src/common/ast-utils.ts
index e87b8365..2ea8da72 100644
--- a/src/common/ast-utils.ts
+++ b/src/common/ast-utils.ts
@@ -14,7 +14,10 @@ import type {
  * @returns `true` if the node is a `<script>` element.
  */
 export function isScriptElement(node: VNode): node is VElement {
-    return node.type === "VElement" && node.name === "script"
+    return (
+        node.type === "VElement" &&
+        (node.name === "script" || getLang(node) === "ts")
+    )
 }
 
 /**
@@ -44,7 +47,11 @@ export function isTemplateElement(node: VNode): node is VElement {
  * @returns `true` if the node is a `<style>` element.
  */
 export function isStyleElement(node: VNode): node is VElement {
-    return node.type === "VElement" && node.name === "style"
+    return (
+        node.type === "VElement" &&
+        node.name === "style" &&
+        !(getLang(node) !== "ts")
+    )
 }
 
 /**
diff --git a/src/index.ts b/src/index.ts
index 20a067fd..ac9859c6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -131,12 +131,12 @@ function parseAsSFC(code: string, options: ParserOptions) {
             parser: scriptParser,
         })
     } else if (
-        scripts.length === 2 &&
+        scripts.length >= 2 &&
         (scriptSetup = scripts.find(isScriptSetupElement))
     ) {
         result = parseScriptSetupElements(
             scriptSetup,
-            scripts.find((e) => e !== scriptSetup)!,
+            scripts.filter((e) => e !== scriptSetup)!,
             code,
             new LinesAndColumns(tokenizer.lineTerminators),
             {
diff --git a/src/script-setup/index.ts b/src/script-setup/index.ts
index e820bdcf..4a4a6b52 100644
--- a/src/script-setup/index.ts
+++ b/src/script-setup/index.ts
@@ -206,7 +206,7 @@ function parseScript(
  */
 export function parseScriptSetupElements(
     scriptSetupElement: VElement,
-    scriptElement: VElement,
+    scriptElements: VElement[],
     sfcCode: string,
     linesAndColumns: LinesAndColumns,
     originalParserOptions: ParserOptions,
@@ -216,7 +216,7 @@ export function parseScriptSetupElements(
     )
     const scriptSetupModuleCodeBlocks = getScriptSetupModuleCodeBlocks(
         scriptSetupElement,
-        scriptElement,
+        scriptElements,
         sfcCode,
         linesAndColumns,
         parserOptions,
@@ -283,7 +283,7 @@ export function parseScriptSetupElements(
 
     // Adjust AST and tokens
     if (result.ast.tokens != null) {
-        for (const node of [scriptSetupElement, scriptElement]) {
+        for (const node of [scriptSetupElement, ...scriptElements]) {
             const startTag = node.startTag
             const endTag = node.endTag
 
@@ -314,7 +314,7 @@ export function parseScriptSetupElements(
     result.ast.loc.start =
         locationCalculator.getLocFromIndex(programStartOffset)
     if (result.ast.start != null) {
-        result.ast.start = [scriptSetupElement, scriptElement].reduce(
+        result.ast.start = [scriptSetupElement, ...scriptElements].reduce(
             (start, node) => {
                 const textNode = node.children[0]
                 return Math.min(
@@ -335,7 +335,7 @@ export function parseScriptSetupElements(
     result.ast.range[1] = programEndOffset
     result.ast.loc.end = locationCalculator.getLocFromIndex(programEndOffset)
     if (result.ast.end != null) {
-        result.ast.end = [scriptSetupElement, scriptElement].reduce(
+        result.ast.end = [scriptSetupElement, ...scriptElements].reduce(
             (end, node) => {
                 const textNode = node.children[0]
                 return Math.max(
@@ -447,7 +447,7 @@ export function parseScriptSetupElements(
  */
 function getScriptSetupModuleCodeBlocks(
     scriptSetupElement: VElement,
-    scriptElement: VElement,
+    scriptElements: VElement[],
     sfcCode: string,
     linesAndColumns: LinesAndColumns,
     parserOptions: ParserOptions,
@@ -459,17 +459,22 @@ function getScriptSetupModuleCodeBlocks(
         parserOptions,
     )
 
-    const textNode = scriptElement.children[0]
-    if (textNode == null || textNode.type !== "VText") {
-        return scriptSetupCodeBlocks
+    const codeBlocks = new CodeBlocks()
+
+    for (const scriptElement of scriptElements) {
+        const textNode = scriptElement.children[0]
+        if (textNode == null || textNode.type !== "VText") {
+            continue
+        }
+
+        const [scriptStartOffset, scriptEndOffset] = textNode.range
+
+        codeBlocks.append(
+            sfcCode.slice(scriptStartOffset, scriptEndOffset),
+            scriptStartOffset,
+        )
     }
 
-    const [scriptStartOffset, scriptEndOffset] = textNode.range
-    const codeBlocks = new CodeBlocks()
-    codeBlocks.append(
-        sfcCode.slice(scriptStartOffset, scriptEndOffset),
-        scriptStartOffset,
-    )
     if (scriptSetupCodeBlocks == null) {
         return { codeBlocks }
     }
@@ -477,6 +482,7 @@ function getScriptSetupModuleCodeBlocks(
     codeBlocks.appendSplitPunctuators(";")
     const scriptSetupOffset = codeBlocks.length
     codeBlocks.appendCodeBlocks(scriptSetupCodeBlocks.codeBlocks)
+
     return {
         codeBlocks,
         scriptSetupBlockRange: [

From 74eda59ee1c1bcd09cfd3fe4c6b51e0095060df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ya=C3=ABl=20Guilloux?= <yael.guilloux@gmail.com>
Date: Thu, 14 Sep 2023 17:54:54 +0200
Subject: [PATCH 3/3] chore(tests): remove .only from new tests

---
 test/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/index.js b/test/index.js
index 64c97729..26d6f4c9 100644
--- a/test/index.js
+++ b/test/index.js
@@ -540,7 +540,7 @@ describe("Basic tests", () => {
     })
 
     describe("About fixtures/lang-ts", () => {
-        it.only('Should parse lang="ts" blocks as script blocks', () => {
+        it('Should parse lang="ts" blocks as script blocks', () => {
             const ast = parse(
                 [
                     "<template><div></div></template>",
@@ -551,7 +551,7 @@ describe("Basic tests", () => {
             )
             const body = ast
         })
-        it.only('Should treat lang="ts" blocks as script tags', async () => {
+        it('Should treat lang="ts" blocks as script tags', async () => {
             const cli = new ESLint({
                 cwd: FIXTURE_DIR,
                 overrideConfig: {