Fix an error when using default for generic (#222)

vuejs · Jan 22, 2024 · 2b3a762 · 2b3a762
1 parent 7c9c24b
commit 2b3a762
Show file tree

Hide file tree

Showing 11 changed files with 7,407 additions and 12 deletions.
diff --git a/src/script/generic.ts b/src/script/generic.ts
@@ -124,31 +124,40 @@ function getConstraint(node: TSESTree.TSTypeParameter, rawParam: string) {
     if (!node.constraint) {
         return "unknown"
     }
-    let startIndex = rawParam.indexOf(node.name.name) + node.name.name.length
-    while (startIndex < rawParam.length) {
-        if (rawParam.startsWith("extends", startIndex)) {
-            return rawParam.slice(startIndex + 7)
+    let index = rawParam.indexOf(node.name.name) + node.name.name.length
+    let startIndex: number | null = null
+    while (index < rawParam.length) {
+        if (startIndex == null) {
+            if (rawParam.startsWith("extends", index)) {
+                startIndex = index = index + 7
+                continue
+            }
+        } else if (rawParam[index] === "=") {
+            return rawParam.slice(startIndex, index)
         }
-        if (rawParam.startsWith("//", startIndex)) {
-            const lfIndex = rawParam.indexOf("\n", startIndex)
+        if (rawParam.startsWith("//", index)) {
+            const lfIndex = rawParam.indexOf("\n", index)
             if (lfIndex >= 0) {
-                startIndex = lfIndex + 1
+                index = lfIndex + 1
                 continue
             }
             return "unknown"
         }
-        if (rawParam.startsWith("/*", startIndex)) {
-            const endIndex = rawParam.indexOf("*/", startIndex)
+        if (rawParam.startsWith("/*", index)) {
+            const endIndex = rawParam.indexOf("*/", index)
             if (endIndex >= 0) {
-                startIndex = endIndex + 2
+                index = endIndex + 2
                 continue
             }
             return "unknown"
         }
-        startIndex++
+        index++
+    }
+    if (startIndex == null) {
+        return "unknown"
     }
 
-    return "unknown"
+    return rawParam.slice(startIndex)
 }
 
 /** Remove variable def */

diff --git a/test/fixtures/ast/vue3.3-generic-6-with-default/ast.json b/test/fixtures/ast/vue3.3-generic-6-with-default/ast.json
diff --git a/test/fixtures/ast/vue3.3-generic-6-with-default/parser-options.json b/test/fixtures/ast/vue3.3-generic-6-with-default/parser-options.json
@@ -0,0 +1,6 @@
+{
+  "sourceType": "module",
+  "parser": {
+    "ts": "@typescript-eslint/parser"
+  }
+}
diff --git a/test/fixtures/ast/vue3.3-generic-6-with-default/source.vue b/test/fixtures/ast/vue3.3-generic-6-with-default/source.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts" generic="
+  T // Comments
+    extends /* = */ Foo = number,
+    // Comments
+  U /* extends */
+    extends
+    Record&lt;
+      /* = */
+      string, // =
+      T
+    >
+     = Record<string, number&gt;
+">
+type Foo = number | string
+const p = defineProps<{foo:T, bar: U}>()
+const foo = p.foo
+console.log(foo)
+</script>
+<template>
+{{foo}}
+</template>
diff --git a/test/fixtures/ast/vue3.3-generic-6-with-default/token-ranges.json b/test/fixtures/ast/vue3.3-generic-6-with-default/token-ranges.json
@@ -0,0 +1,123 @@
+[
+    "<script setup lang=\"ts\" generic=\"\n  T // Comments\n    extends /* = */ Foo = number,\n    // Comments\n  U /* extends */\n    extends\n    Record&lt;\n      /* = */\n      string, // =\n      T\n    >\n     = Record<string, number&gt;\n\">",
+    "type",
+    "Foo",
+    "=",
+    "number",
+    "|",
+    "string",
+    "const",
+    "p",
+    "=",
+    "defineProps",
+    "<",
+    "{",
+    "foo",
+    ":",
+    "T",
+    ",",
+    "bar",
+    ":",
+    "U",
+    "}",
+    ">",
+    "(",
+    ")",
+    "const",
+    "foo",
+    "=",
+    "p",
+    ".",
+    "foo",
+    "console",
+    ".",
+    "log",
+    "(",
+    "foo",
+    ")",
+    "</script>",
+    "<script",
+    "setup",
+    "lang",
+    "=",
+    "\"ts\"",
+    "generic",
+    "=",
+    "\"",
+    "T",
+    "extends",
+    "Foo",
+    "=",
+    "number",
+    ",",
+    "U",
+    "extends",
+    "Record",
+    "&lt;",
+    "string",
+    ",",
+    "T",
+    ">",
+    "=",
+    "Record",
+    "<",
+    "string",
+    ",",
+    "number",
+    "&gt;",
+    "\"",
+    ">",
+    "\n",
+    "type",
+    " ",
+    "Foo",
+    " ",
+    "=",
+    " ",
+    "number",
+    " ",
+    "|",
+    " ",
+    "string",
+    "\n",
+    "const",
+    " ",
+    "p",
+    " ",
+    "=",
+    " ",
+    "defineProps<{foo:T,",
+    " ",
+    "bar:",
+    " ",
+    "U}>()",
+    "\n",
+    "const",
+    " ",
+    "foo",
+    " ",
+    "=",
+    " ",
+    "p.foo",
+    "\n",
+    "console.log(foo)",
+    "\n",
+    "</script",
+    ">",
+    "\n",
+    "<template",
+    ">",
+    "\n",
+    "{{",
+    "foo",
+    "}}",
+    "\n",
+    "</template",
+    ">",
+    "// Comments",
+    "/* = */",
+    "// Comments",
+    "/* extends */",
+    "/* = */",
+    "// ="
+]
diff --git a/test/fixtures/ast/vue3.3-generic-6-with-default/tree.json b/test/fixtures/ast/vue3.3-generic-6-with-default/tree.json
@@ -0,0 +1,39 @@
+[
+    {
+        "type": "VElement",
+        "text": "<template>\n{{foo}}\n</template>",
+        "children": [
+            {
+                "type": "VStartTag",
+                "text": "<template>",
+                "children": []
+            },
+            {
+                "type": "VText",
+                "text": "\n",
+                "children": []
+            },
+            {
+                "type": "VExpressionContainer",
+                "text": "{{foo}}",
+                "children": [
+                    {
+                        "type": "Identifier",
+                        "text": "foo",
+                        "children": []
+                    }
+                ]
+            },
+            {
+                "type": "VText",
+                "text": "\n",
+                "children": []
+            },
+            {
+                "type": "VEndTag",
+                "text": "</template>",
+                "children": []
+            }
+        ]
+    }
+]