From 66a1d70a27cc2f0f80a9483595f705f2e4415894 Mon Sep 17 00:00:00 2001
From: yosuke ota <otameshiyo23@gmail.com>
Date: Wed, 1 Sep 2021 18:11:34 +0900
Subject: [PATCH 1/3] Change to determine parser by extension when parsing
 non-vue files using multiple parser

---
 src/common/parser-options.ts | 44 +++++++++++++++++-------------------
 src/html/parser.ts           | 16 +++++++++----
 src/index.ts                 | 17 ++++++++++----
 test/fixtures/typed.ts       |  9 ++++++++
 test/index.js                | 21 +++++++++++++++++
 5 files changed, 76 insertions(+), 31 deletions(-)
 create mode 100644 test/fixtures/typed.ts

diff --git a/src/common/parser-options.ts b/src/common/parser-options.ts
index 48613210..fd88e645 100644
--- a/src/common/parser-options.ts
+++ b/src/common/parser-options.ts
@@ -47,23 +47,22 @@ export function isSFCFile(parserOptions: ParserOptions) {
 }
 
 /**
- * Gets the script parser name from the given SFC document fragment.
+ * Gets the script parser name from the given parser lang.
  */
 export function getScriptParser(
     parser: boolean | string | Record<string, string | undefined> | undefined,
-    doc: VDocumentFragment | null,
-    block: "script" | "template",
+    getParserLang: () => string | null | Iterable<string | null>,
 ): string | undefined {
     if (parser && typeof parser === "object") {
-        if (block === "template") {
-            const parserForTemplate = parser["<template>"]
-            if (typeof parserForTemplate === "string") {
-                return parserForTemplate
-            }
-        }
-        const lang = getScriptLang()
-        if (lang) {
-            const parserForLang = parser[lang]
+        const parserLang = getParserLang()
+        const parserLangs =
+            parserLang == null
+                ? []
+                : typeof parserLang === "string"
+                ? [parserLang]
+                : parserLang
+        for (const lang of parserLangs) {
+            const parserForLang = lang && parser[lang]
             if (typeof parserForLang === "string") {
                 return parserForLang
             }
@@ -71,18 +70,17 @@ export function getScriptParser(
         return parser.js
     }
     return typeof parser === "string" ? parser : undefined
+}
 
-    function getScriptLang() {
-        if (doc) {
-            const scripts = doc.children.filter(isScriptElement)
-            const script =
-                scripts.length === 2
-                    ? scripts.find(isScriptSetupElement)
-                    : scripts[0]
-            if (script) {
-                return getLang(script)
-            }
+export function getParserLangFromSFC(doc: VDocumentFragment): string | null {
+    if (doc) {
+        const scripts = doc.children.filter(isScriptElement)
+        const script =
+            (scripts.length === 2 && scripts.find(isScriptSetupElement)) ||
+            scripts[0]
+        if (script) {
+            return getLang(script)
         }
-        return null
     }
+    return null
 }
diff --git a/src/html/parser.ts b/src/html/parser.ts
index d03ecd8b..538e5f24 100644
--- a/src/html/parser.ts
+++ b/src/html/parser.ts
@@ -46,7 +46,11 @@ import type {
 import { IntermediateTokenizer } from "./intermediate-tokenizer"
 import type { Tokenizer } from "./tokenizer"
 import type { ParserOptions } from "../common/parser-options"
-import { isSFCFile, getScriptParser } from "../common/parser-options"
+import {
+    isSFCFile,
+    getScriptParser,
+    getParserLangFromSFC,
+} from "../common/parser-options"
 
 const DIRECTIVE_NAME = /^(?:v-|[.:@#]).*[^.:@#]$/u
 const DT_DD = /^d[dt]$/u
@@ -279,12 +283,16 @@ export class Parser {
         this.popElementStackUntil(0)
         propagateEndLocation(this.document)
 
+        const doc = this.document
+
         const parserOptions = {
             ...this.baseParserOptions,
             parser: getScriptParser(
                 this.baseParserOptions.parser,
-                this.document,
-                "template",
+                function* () {
+                    yield "<template>"
+                    yield getParserLangFromSFC(doc)
+                },
             ),
         }
         for (const proc of this.postProcessesForScript) {
@@ -292,7 +300,7 @@ export class Parser {
         }
         this.postProcessesForScript = []
 
-        return this.document
+        return doc
     }
 
     /**
diff --git a/src/index.ts b/src/index.ts
index 2001860d..15f20700 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -10,7 +10,7 @@ import { HTMLParser, HTMLTokenizer } from "./html"
 import { parseScript, parseScriptElement } from "./script"
 import * as services from "./parser-services"
 import type { ParserOptions } from "./common/parser-options"
-import { getScriptParser } from "./common/parser-options"
+import { getScriptParser, getParserLangFromSFC } from "./common/parser-options"
 import { parseScriptSetupElements } from "./script-setup"
 import { LinesAndColumns } from "./common/lines-and-columns"
 import type { VElement } from "./ast"
@@ -64,7 +64,11 @@ export function parseForESLint(
         result = parseScript(code, {
             ...options,
             ecmaVersion: options.ecmaVersion || DEFAULT_ECMA_VERSION,
-            parser: getScriptParser(options.parser, null, "script"),
+            parser: getScriptParser(options.parser, () =>
+                (path.extname(options.filePath || "unknown.js") || "")
+                    // remove dot
+                    .slice(1),
+            ),
         })
         document = null
         locationCalculator = null
@@ -94,7 +98,9 @@ export function parseForESLint(
                 ? Object.assign(template, concreteInfo)
                 : undefined
 
-        const scriptParser = getScriptParser(options.parser, rootAST, "script")
+        const scriptParser = getScriptParser(options.parser, () =>
+            getParserLangFromSFC(rootAST),
+        )
         let scriptSetup: VElement | undefined
         if (skipParsingScript || !scripts.length) {
             result = parseScript("", {
@@ -126,7 +132,10 @@ export function parseForESLint(
             const styles = rootAST.children.filter(isStyleElement)
             parseStyleElements(styles, locationCalculator, {
                 ...options,
-                parser: getScriptParser(options.parser, rootAST, "template"),
+                parser: getScriptParser(options.parser, function* () {
+                    yield "<template>"
+                    yield getParserLangFromSFC(rootAST)
+                }),
             })
         }
 
diff --git a/test/fixtures/typed.ts b/test/fixtures/typed.ts
new file mode 100644
index 00000000..0e3e9712
--- /dev/null
+++ b/test/fixtures/typed.ts
@@ -0,0 +1,9 @@
+interface Data {
+    greeting: string
+}
+
+export default {
+    data(): Data {
+        return {greeting: "Hello"}
+    },
+}
diff --git a/test/index.js b/test/index.js
index c59eb8fc..88f27dea 100644
--- a/test/index.js
+++ b/test/index.js
@@ -291,6 +291,27 @@ describe("Basic tests", () => {
 
                 assert.deepStrictEqual(messages, [])
             })
+
+            it("should notify no error with multiple parser with '@typescript-eslint/parser'", async () => {
+                const cli = new ESLint({
+                    cwd: FIXTURE_DIR,
+                    overrideConfig: {
+                        env: { es6: true, node: true },
+                        parser: PARSER_PATH,
+                        parserOptions: {
+                            parser: {
+                                ts: "@typescript-eslint/parser",
+                            },
+                        },
+                        rules: { semi: ["error", "never"] },
+                    },
+                    useEslintrc: false,
+                })
+                const report = await cli.lintFiles(["typed.ts"])
+                const messages = report[0].messages
+
+                assert.deepStrictEqual(messages, [])
+            })
         }
     })
 

From 86224cea2514afb4d24d9fa4c87cbc5a52062462 Mon Sep 17 00:00:00 2001
From: yosuke ota <otameshiyo23@gmail.com>
Date: Fri, 3 Sep 2021 21:20:38 +0900
Subject: [PATCH 2/3] update

---
 src/index.ts            | 17 +++++++++++++----
 test/fixtures/typed.tsx |  9 +++++++++
 test/index.js           |  6 +++---
 3 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 test/fixtures/typed.tsx

diff --git a/src/index.ts b/src/index.ts
index 15f20700..5c733379 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -64,11 +64,20 @@ export function parseForESLint(
         result = parseScript(code, {
             ...options,
             ecmaVersion: options.ecmaVersion || DEFAULT_ECMA_VERSION,
-            parser: getScriptParser(options.parser, () =>
-                (path.extname(options.filePath || "unknown.js") || "")
+            parser: getScriptParser(options.parser, () => {
+                const ext = (
+                    path
+                        .extname(options.filePath || "unknown.js")
+                        .toLowerCase() || ""
+                )
                     // remove dot
-                    .slice(1),
-            ),
+                    .slice(1)
+                if (/^[jt]sx$/u.test(ext)) {
+                    return [ext, ext.slice(0, -1)]
+                }
+
+                return ext
+            }),
         })
         document = null
         locationCalculator = null
diff --git a/test/fixtures/typed.tsx b/test/fixtures/typed.tsx
new file mode 100644
index 00000000..0e3e9712
--- /dev/null
+++ b/test/fixtures/typed.tsx
@@ -0,0 +1,9 @@
+interface Data {
+    greeting: string
+}
+
+export default {
+    data(): Data {
+        return {greeting: "Hello"}
+    },
+}
diff --git a/test/index.js b/test/index.js
index 88f27dea..84303b73 100644
--- a/test/index.js
+++ b/test/index.js
@@ -307,10 +307,10 @@ describe("Basic tests", () => {
                     },
                     useEslintrc: false,
                 })
-                const report = await cli.lintFiles(["typed.ts"])
-                const messages = report[0].messages
+                const report = await cli.lintFiles(["typed.ts", "typed.tsx"])
 
-                assert.deepStrictEqual(messages, [])
+                assert.deepStrictEqual(report[0].messages, [])
+                assert.deepStrictEqual(report[1].messages, [])
             })
         }
     })

From b6c36b5f8093d24e2e84eab2e687ca15a7716322 Mon Sep 17 00:00:00 2001
From: yosuke ota <otameshiyo23@gmail.com>
Date: Fri, 3 Sep 2021 21:27:09 +0900
Subject: [PATCH 3/3] update

---
 .../ast/filters-opt-filter-off-babel/ast.json  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/test/fixtures/ast/filters-opt-filter-off-babel/ast.json b/test/fixtures/ast/filters-opt-filter-off-babel/ast.json
index 5798c090..3d1db875 100644
--- a/test/fixtures/ast/filters-opt-filter-off-babel/ast.json
+++ b/test/fixtures/ast/filters-opt-filter-off-babel/ast.json
@@ -10,7 +10,8 @@
         "end": {
             "line": 1,
             "column": 0
-        }
+        },
+        "filename": "source.vue"
     },
     "range": [
         0,
@@ -144,7 +145,8 @@
                                 "end": {
                                     "line": 2,
                                     "column": 22
-                                }
+                                },
+                                "filename": "source.vue"
                             },
                             "range": [
                                 23,
@@ -162,7 +164,8 @@
                                     "end": {
                                         "line": 2,
                                         "column": 15
-                                    }
+                                    },
+                                    "filename": "source.vue"
                                 },
                                 "range": [
                                     23,
@@ -183,7 +186,8 @@
                                     "end": {
                                         "line": 2,
                                         "column": 22
-                                    }
+                                    },
+                                    "filename": "source.vue"
                                 },
                                 "range": [
                                     30,
@@ -206,7 +210,8 @@
                                         "end": {
                                             "line": 2,
                                             "column": 15
-                                        }
+                                        },
+                                        "filename": "source.vue"
                                     },
                                     "range": [
                                         23,
@@ -229,7 +234,8 @@
                                         "end": {
                                             "line": 2,
                                             "column": 22
-                                        }
+                                        },
+                                        "filename": "source.vue"
                                     },
                                     "range": [
                                         30,