Fixed parsing error when arrow function type in generics (#234)

* Fixed parsing error when arrow function type in generics * macos-latest to macos-12
vuejs · Jun 1, 2024 · c7b5fbf · c7b5fbf
1 parent 79ecf1e
commit c7b5fbf
Show file tree

Hide file tree

Showing 12 changed files with 6,135 additions and 1 deletion.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -39,7 +39,7 @@ jobs:
             os: windows-latest
           - eslint: 7
             node: 16
-            os: macos-latest
+            os: macos-12
           # On old Node.js versions
           - eslint: 7
             node: 14

diff --git a/src/script/generic.ts b/src/script/generic.ts
@@ -133,9 +133,15 @@ function getConstraint(node: TSESTree.TSTypeParameter, rawParam: string) {
                 continue
             }
         } else if (rawParam[index] === "=") {
+            if (rawParam[index + 1] === ">") {
+                // Arrow function type
+                index += 2
+                continue
+            }
             return rawParam.slice(startIndex, index)
         }
         if (rawParam.startsWith("//", index)) {
+            // Skip line comment
             const lfIndex = rawParam.indexOf("\n", index)
             if (lfIndex >= 0) {
                 index = lfIndex + 1
@@ -144,6 +150,7 @@ function getConstraint(node: TSESTree.TSTypeParameter, rawParam: string) {
             return "unknown"
         }
         if (rawParam.startsWith("/*", index)) {
+            // Skip block comment
             const endIndex = rawParam.indexOf("*/", index)
             if (endIndex >= 0) {
                 index = endIndex + 2

diff --git a/test/fixtures/ast/vue3.3-generic-7-with-arrow/ast.json b/test/fixtures/ast/vue3.3-generic-7-with-arrow/ast.json
diff --git a/test/fixtures/ast/vue3.3-generic-7-with-arrow/parser-options.json b/test/fixtures/ast/vue3.3-generic-7-with-arrow/parser-options.json
@@ -0,0 +1,6 @@
+{
+  "sourceType": "module",
+  "parser": {
+    "ts": "@typescript-eslint/parser"
+  }
+}
diff --git a/test/fixtures/ast/vue3.3-generic-7-with-arrow/source.vue b/test/fixtures/ast/vue3.3-generic-7-with-arrow/source.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts" generic="
+  T extends () => string,
+  U  extends () => string = () => 'abc'
+">
+const p = defineProps<{t: T, u: U}>()
+</script>
+
+<template>
+{{p.t()}}
+{{p.u()}}
+</template>
diff --git a/test/fixtures/ast/vue3.3-generic-7-with-arrow/token-ranges.json b/test/fixtures/ast/vue3.3-generic-7-with-arrow/token-ranges.json
@@ -0,0 +1,88 @@
+[
+    "<script setup lang=\"ts\" generic=\"\n  T extends () => string,\n  U  extends () => string = () => 'abc'\n\">",
+    "const",
+    "p",
+    "=",
+    "defineProps",
+    "<",
+    "{",
+    "t",
+    ":",
+    "T",
+    ",",
+    "u",
+    ":",
+    "U",
+    "}",
+    ">",
+    "(",
+    ")",
+    "</script>",
+    "<script",
+    "setup",
+    "lang",
+    "=",
+    "\"ts\"",
+    "generic",
+    "=",
+    "\"",
+    "T",
+    "extends",
+    "(",
+    ")",
+    "=>",
+    "string",
+    ",",
+    "U",
+    "extends",
+    "(",
+    ")",
+    "=>",
+    "string",
+    "=",
+    "(",
+    ")",
+    "=>",
+    "'abc'",
+    "\"",
+    ">",
+    "\n",
+    "const",
+    " ",
+    "p",
+    " ",
+    "=",
+    " ",
+    "defineProps<{t:",
+    " ",
+    "T,",
+    " ",
+    "u:",
+    " ",
+    "U}>()",
+    "\n",
+    "</script",
+    ">",
+    "\n\n",
+    "<template",
+    ">",
+    "\n",
+    "{{",
+    "p",
+    ".",
+    "t",
+    "(",
+    ")",
+    "}}",
+    "\n",
+    "{{",
+    "p",
+    ".",
+    "u",
+    "(",
+    ")",
+    "}}",
+    "\n",
+    "</template",
+    ">"
+]
diff --git a/test/fixtures/ast/vue3.3-generic-7-with-arrow/tree.json b/test/fixtures/ast/vue3.3-generic-7-with-arrow/tree.json
@@ -0,0 +1,89 @@
+[
+    {
+        "type": "VElement",
+        "text": "<template>\n{{p.t()}}\n{{p.u()}}\n</template>",
+        "children": [
+            {
+                "type": "VStartTag",
+                "text": "<template>",
+                "children": []
+            },
+            {
+                "type": "VText",
+                "text": "\n",
+                "children": []
+            },
+            {
+                "type": "VExpressionContainer",
+                "text": "{{p.t()}}",
+                "children": [
+                    {
+                        "type": "CallExpression",
+                        "text": "p.t()",
+                        "children": [
+                            {
+                                "type": "MemberExpression",
+                                "text": "p.t",
+                                "children": [
+                                    {
+                                        "type": "Identifier",
+                                        "text": "p",
+                                        "children": []
+                                    },
+                                    {
+                                        "type": "Identifier",
+                                        "text": "t",
+                                        "children": []
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "type": "VText",
+                "text": "\n",
+                "children": []
+            },
+            {
+                "type": "VExpressionContainer",
+                "text": "{{p.u()}}",
+                "children": [
+                    {
+                        "type": "CallExpression",
+                        "text": "p.u()",
+                        "children": [
+                            {
+                                "type": "MemberExpression",
+                                "text": "p.u",
+                                "children": [
+                                    {
+                                        "type": "Identifier",
+                                        "text": "p",
+                                        "children": []
+                                    },
+                                    {
+                                        "type": "Identifier",
+                                        "text": "u",
+                                        "children": []
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "type": "VText",
+                "text": "\n",
+                "children": []
+            },
+            {
+                "type": "VEndTag",
+                "text": "</template>",
+                "children": []
+            }
+        ]
+    }
+]