feat(lang-ts): try supporting all lang="ts" blocks as scripts elements

Author: Tahul

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")
+    )
 }
 
 /**

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),
             {

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,24 +459,30 @@ 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 }
     }
 
     codeBlocks.appendSplitPunctuators(";")
     const scriptSetupOffset = codeBlocks.length
     codeBlocks.appendCodeBlocks(scriptSetupCodeBlocks.codeBlocks)
+
     return {
         codeBlocks,
         scriptSetupBlockRange: [