From 6014008698796cbaefc66af41bb979461682428f Mon Sep 17 00:00:00 2001
From: ota-meshi <otameshiyo23@gmail.com>
Date: Sun, 14 May 2023 10:20:53 +0900
Subject: [PATCH 1/4] add VGenericExpression to ast.md

---
 docs/ast.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/ast.md b/docs/ast.md
index df6f8480..22182902 100644
--- a/docs/ast.md
+++ b/docs/ast.md
@@ -111,6 +111,11 @@ interface VSlotScopeExpression <: Expression {
     params: [ Pattern | RestElement ]
 }
 
+interface VGenericExpression <: Expression {
+    type: "VGenericExpression"
+    params: [ TSTypeParameter ]
+}
+
 interface VFilterSequenceExpression <: Expression {
     type: "VFilterSequenceExpression"
     expression: Expression
@@ -132,6 +137,7 @@ interface VFilter <: Node {
 - `VForExpression` is an expression node like [ForInStatement] but it has an array as `left` property and does not have `body` property. This is the value of [`v-for` directives].
 - `VOnExpression` is an expression node like [BlockStatement] but it does not have braces. This is the value of [`v-on` directives] only if the `v-on` directive doesn't have that argument.
 - `VSlotScopeExpression` is an expression node like [VariableDeclarator]. This is the value of [`v-slot` directives], [`slot-scope` attributes], and `scope` attributes.
+- `VGenericExpression` is an expression node like typescript-eslint's TSTypeParameterDeclaration. This is the value of [the `generic` attributes on the `<script>` tag](https://vuejs.org/api/sfc-script-setup.html#generics).
 - `VFilterSequenceExpression` is an expression node for [Vue.js Filters](https://vuejs.org/v2/guide/filters.html) syntax.
 
 > Note: `vue-eslint-parser` transforms `v-for="(x, i) in list"` to `for(let [x, i] in list);` then gives the configured parser (`espree` by default) it. This implies that it needs the capability to parse ES2015 destructuring in order to parse [`v-for` directives].

From 4b402ee9d3e0e054799ad301353d96017f95f345 Mon Sep 17 00:00:00 2001
From: ota-meshi <otameshiyo23@gmail.com>
Date: Sun, 14 May 2023 10:37:52 +0900
Subject: [PATCH 2/4] add my account to FUNDING.yml

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index ce763b1f..71f6fe76 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,3 @@
 github:
+- ota-meshi
 - mysticatea

From fcba4fea209f714b2542f89f32e7820ca3625982 Mon Sep 17 00:00:00 2001
From: Yosuke Ota <otameshiyo23@gmail.com>
Date: Sun, 11 Jun 2023 17:11:32 +0900
Subject: [PATCH 3/4] Fix wrong scope for generics with multiple script blocks
 (#201)

---
 src/script-setup/scope-analyzer.ts            | 11 +--
 test/fixtures/ast/vue3.3-generic-2/scope.json | 46 +++++-----
 test/fixtures/ast/vue3.3-generic-3/scope.json | 92 ++++++++++---------
 .../no-undef/valid/generic2.vue               | 13 +++
 4 files changed, 92 insertions(+), 70 deletions(-)
 create mode 100644 test/fixtures/integrations/script-setup-with-typescript-eslint/no-undef/valid/generic2.vue

diff --git a/src/script-setup/scope-analyzer.ts b/src/script-setup/scope-analyzer.ts
index 15d23a3a..46ae6cef 100644
--- a/src/script-setup/scope-analyzer.ts
+++ b/src/script-setup/scope-analyzer.ts
@@ -321,13 +321,10 @@ function analyzeScriptSetupVariables(
     )
 
     const genericDefineNames = new Set<string>()
-    const scriptElement = df.children.find(isScriptElement)
-    if (
-        scriptElement &&
-        isScriptSetupElement(scriptElement) &&
-        findGenericDirective(scriptElement)
-    ) {
-        for (const variable of scriptElement.variables) {
+    const scriptElements = df.children.filter(isScriptElement)
+    const scriptSetupElement = scriptElements.find(isScriptSetupElement)
+    if (scriptSetupElement && findGenericDirective(scriptSetupElement)) {
+        for (const variable of scriptSetupElement.variables) {
             if (variable.kind === "generic") {
                 genericDefineNames.add(variable.id.name)
             }
diff --git a/test/fixtures/ast/vue3.3-generic-2/scope.json b/test/fixtures/ast/vue3.3-generic-2/scope.json
index 9629ab05..261ad368 100644
--- a/test/fixtures/ast/vue3.3-generic-2/scope.json
+++ b/test/fixtures/ast/vue3.3-generic-2/scope.json
@@ -907,6 +907,31 @@
                     "init": null
                 }
             ]
+        },
+        {
+            "name": "T",
+            "identifiers": [],
+            "defs": [],
+            "references": [
+                {
+                    "identifier": {
+                        "type": "Identifier",
+                        "name": "T",
+                        "loc": {
+                            "start": {
+                                "line": 5,
+                                "column": 27
+                            },
+                            "end": {
+                                "line": 5,
+                                "column": 28
+                            }
+                        }
+                    },
+                    "from": "module",
+                    "init": null
+                }
+            ]
         }
     ],
     "references": [],
@@ -1296,7 +1321,6 @@
                         }
                     },
                     "from": "module",
-                    "resolved": null,
                     "init": null
                 },
                 {
@@ -1451,7 +1475,6 @@
                         }
                     },
                     "from": "module",
-                    "resolved": null,
                     "init": null
                 },
                 {
@@ -1477,25 +1500,6 @@
         }
     ],
     "through": [
-        {
-            "identifier": {
-                "type": "Identifier",
-                "name": "T",
-                "loc": {
-                    "start": {
-                        "line": 5,
-                        "column": 27
-                    },
-                    "end": {
-                        "line": 5,
-                        "column": 28
-                    }
-                }
-            },
-            "from": "module",
-            "resolved": null,
-            "init": null
-        },
         {
             "identifier": {
                 "type": "Identifier",
diff --git a/test/fixtures/ast/vue3.3-generic-3/scope.json b/test/fixtures/ast/vue3.3-generic-3/scope.json
index 7deedb76..07bfd168 100644
--- a/test/fixtures/ast/vue3.3-generic-3/scope.json
+++ b/test/fixtures/ast/vue3.3-generic-3/scope.json
@@ -907,6 +907,56 @@
                     "init": null
                 }
             ]
+        },
+        {
+            "name": "T",
+            "identifiers": [],
+            "defs": [],
+            "references": [
+                {
+                    "identifier": {
+                        "type": "Identifier",
+                        "name": "T",
+                        "loc": {
+                            "start": {
+                                "line": 5,
+                                "column": 27
+                            },
+                            "end": {
+                                "line": 5,
+                                "column": 28
+                            }
+                        }
+                    },
+                    "from": "module",
+                    "init": null
+                }
+            ]
+        },
+        {
+            "name": "U",
+            "identifiers": [],
+            "defs": [],
+            "references": [
+                {
+                    "identifier": {
+                        "type": "Identifier",
+                        "name": "U",
+                        "loc": {
+                            "start": {
+                                "line": 5,
+                                "column": 35
+                            },
+                            "end": {
+                                "line": 5,
+                                "column": 36
+                            }
+                        }
+                    },
+                    "from": "module",
+                    "init": null
+                }
+            ]
         }
     ],
     "references": [],
@@ -1296,7 +1346,6 @@
                         }
                     },
                     "from": "module",
-                    "resolved": null,
                     "init": null
                 },
                 {
@@ -1315,7 +1364,6 @@
                         }
                     },
                     "from": "module",
-                    "resolved": null,
                     "init": null
                 },
                 {
@@ -1470,7 +1518,6 @@
                         }
                     },
                     "from": "module",
-                    "resolved": null,
                     "init": null
                 },
                 {
@@ -1489,7 +1536,6 @@
                         }
                     },
                     "from": "module",
-                    "resolved": null,
                     "init": null
                 },
                 {
@@ -1515,44 +1561,6 @@
         }
     ],
     "through": [
-        {
-            "identifier": {
-                "type": "Identifier",
-                "name": "T",
-                "loc": {
-                    "start": {
-                        "line": 5,
-                        "column": 27
-                    },
-                    "end": {
-                        "line": 5,
-                        "column": 28
-                    }
-                }
-            },
-            "from": "module",
-            "resolved": null,
-            "init": null
-        },
-        {
-            "identifier": {
-                "type": "Identifier",
-                "name": "U",
-                "loc": {
-                    "start": {
-                        "line": 5,
-                        "column": 35
-                    },
-                    "end": {
-                        "line": 5,
-                        "column": 36
-                    }
-                }
-            },
-            "from": "module",
-            "resolved": null,
-            "init": null
-        },
         {
             "identifier": {
                 "type": "Identifier",
diff --git a/test/fixtures/integrations/script-setup-with-typescript-eslint/no-undef/valid/generic2.vue b/test/fixtures/integrations/script-setup-with-typescript-eslint/no-undef/valid/generic2.vue
new file mode 100644
index 00000000..7d10afcf
--- /dev/null
+++ b/test/fixtures/integrations/script-setup-with-typescript-eslint/no-undef/valid/generic2.vue
@@ -0,0 +1,13 @@
+<script lang="ts">
+export default {}
+</script>
+<script setup lang="ts" generic="T extends Foo | Bar">
+type Foo = number | string
+type Bar = number[] | string[]
+interface Props {
+  msg?: T
+}
+defineProps<Props>(), {
+  msg: 'hello',
+}
+</script>

From 6aa8585df1722d6154890db9a820680f1b2ee61a Mon Sep 17 00:00:00 2001
From: yosuke ota <otameshiyo23@gmail.com>
Date: Sun, 11 Jun 2023 17:17:03 +0900
Subject: [PATCH 4/4] 9.3.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f764dd38..b0edab4b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-eslint-parser",
-  "version": "9.3.0",
+  "version": "9.3.1",
   "description": "The ESLint custom parser for `.vue` files.",
   "engines": {
     "node": "^14.17.0 || >=16.0.0"