Fix wrong scope for generic attribute (#254)

ota-meshi · web-flow · commit 8fef4ca3631e · 2025-03-05T22:58:24.000+09:00
* Fix wrong scope for generic attribute

* update
diff --git a/src/script/generic.ts b/src/script/generic.ts
@@ -94,7 +94,8 @@ export function extractGeneric(element: VElement): GenericProcessInfo | null {
         typeDefScope: Scope,
         isRemoveTarget: (nodeOrToken: HasLocation) => boolean,
     ) {
-        for (const variable of typeDefScope.variables) {
+        // eslint-disable-next-line unicorn/no-useless-spread -- The original array is mutated
+        for (const variable of [...typeDefScope.variables]) {
             let def = variable.defs.find((d) =>
                 isRemoveTarget(d.name as HasLocation),
             )
@@ -105,13 +106,15 @@ export function extractGeneric(element: VElement): GenericProcessInfo | null {
                 )
             }
         }
-        for (const reference of typeDefScope.references) {
+        // eslint-disable-next-line unicorn/no-useless-spread -- The original array is mutated
+        for (const reference of [...typeDefScope.references]) {
             if (isRemoveTarget(reference.identifier as HasLocation)) {
                 removeReference(reference, typeDefScope)
             }
         }
 
-        for (const scope of scopeManager.scopes) {
+        // eslint-disable-next-line unicorn/no-useless-spread -- The original array is mutated
+        for (const scope of [...scopeManager.scopes]) {
             if (isRemoveTarget(scope.block as HasLocation)) {
                 removeScope(scopeManager, scope)
             }
diff --git a/test/fixtures/ast/define-model05-with-modifiers/ast.json b/test/fixtures/ast/define-model05-with-modifiers/ast.json
@@ -214,7 +214,6 @@
                                             ],
                                             "name": "set"
                                         },
-                                        "kind": "init",
                                         "value": {
                                             "type": "FunctionExpression",
                                             "start": 71,
@@ -522,7 +521,8 @@
                                                     }
                                                 ]
                                             }
-                                        }
+                                        },
+                                        "kind": "init"
                                     }
                                 ]
                             }
diff --git a/test/fixtures/ast/multiple-scripts-5/ast.json b/test/fixtures/ast/multiple-scripts-5/ast.json
@@ -118,7 +118,8 @@
                 "kind": "let"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "ImportDeclaration",
diff --git a/test/fixtures/ast/multiple-scripts-6/ast.json b/test/fixtures/ast/multiple-scripts-6/ast.json
@@ -260,7 +260,8 @@
                 "kind": "const"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         }
     ],
     "sourceType": "module",
diff --git a/test/fixtures/ast/multiple-scripts-7/ast.json b/test/fixtures/ast/multiple-scripts-7/ast.json
@@ -118,7 +118,8 @@
                 "kind": "let"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "ImportDeclaration",
diff --git a/test/fixtures/ast/multiple-scripts-8/ast.json b/test/fixtures/ast/multiple-scripts-8/ast.json
@@ -118,7 +118,8 @@
                 "kind": "let"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "VariableDeclaration",
diff --git a/test/fixtures/ast/multiple-scripts-with-export01/ast.json b/test/fixtures/ast/multiple-scripts-with-export01/ast.json
@@ -200,7 +200,8 @@
                 "kind": "let"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         }
     ],
     "sourceType": "module",
diff --git a/test/fixtures/ast/multiple-scripts-with-export02/ast.json b/test/fixtures/ast/multiple-scripts-with-export02/ast.json
@@ -364,7 +364,8 @@
                 "kind": "let"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "ImportDeclaration",
@@ -914,7 +915,8 @@
                     }
                 }
             ],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "ExportNamedDeclaration",
@@ -1055,7 +1057,8 @@
                     }
                 }
             ],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "ExportNamedDeclaration",
@@ -1077,7 +1080,8 @@
             ],
             "declaration": null,
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "VariableDeclaration",
diff --git a/test/fixtures/ast/multiple-scripts-with-export04/ast.json b/test/fixtures/ast/multiple-scripts-with-export04/ast.json
@@ -118,7 +118,8 @@
                 "kind": "let"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "ExportNamedDeclaration",
@@ -221,7 +222,8 @@
                 "kind": "let"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "ImportDeclaration",
@@ -467,7 +469,8 @@
                     }
                 }
             ],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "ExportNamedDeclaration",
@@ -570,7 +573,8 @@
                 "kind": "let"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         }
     ],
     "sourceType": "module",
diff --git a/test/fixtures/ast/multiple-scripts/ast.json b/test/fixtures/ast/multiple-scripts/ast.json
@@ -178,7 +178,8 @@
                 "kind": "const"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "VariableDeclaration",
diff --git a/test/fixtures/ast/script-setup-example13/ast.json b/test/fixtures/ast/script-setup-example13/ast.json
@@ -340,7 +340,6 @@
                                     ],
                                     "name": "a"
                                 },
-                                "kind": "init",
                                 "value": {
                                     "type": "Identifier",
                                     "start": 62,
@@ -360,7 +359,8 @@
                                         63
                                     ],
                                     "name": "a"
-                                }
+                                },
+                                "kind": "init"
                             },
                             {
                                 "type": "Property",
@@ -403,7 +403,6 @@
                                     ],
                                     "name": "b"
                                 },
-                                "kind": "init",
                                 "value": {
                                     "type": "Identifier",
                                     "start": 67,
@@ -423,7 +422,8 @@
                                         68
                                     ],
                                     "name": "b"
-                                }
+                                },
+                                "kind": "init"
                             }
                         ]
                     }
diff --git a/test/fixtures/ast/script-setup-example14/ast.json b/test/fixtures/ast/script-setup-example14/ast.json
@@ -178,7 +178,8 @@
                 "kind": "const"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         },
         {
             "type": "VariableDeclaration",
diff --git a/test/fixtures/ast/script-setup-with-export/ast.json b/test/fixtures/ast/script-setup-with-export/ast.json
@@ -118,7 +118,8 @@
                 "kind": "let"
             },
             "specifiers": [],
-            "source": null
+            "source": null,
+            "attributes": []
         }
     ],
     "sourceType": "module",
diff --git a/test/fixtures/ast/slot-scope-destructuring/ast.json b/test/fixtures/ast/slot-scope-destructuring/ast.json
@@ -319,7 +319,6 @@
                                                                 ],
                                                                 "name": "a"
                                                             },
-                                                            "kind": "init",
                                                             "value": {
                                                                 "type": "Identifier",
                                                                 "start": 58,
@@ -339,7 +338,8 @@
                                                                     59
                                                                 ],
                                                                 "name": "a"
-                                                            }
+                                                            },
+                                                            "kind": "init"
                                                         },
                                                         {
                                                             "type": "Property",
@@ -382,7 +382,6 @@
                                                                 ],
                                                                 "name": "b"
                                                             },
-                                                            "kind": "init",
                                                             "value": {
                                                                 "type": "Identifier",
                                                                 "start": 61,
@@ -402,7 +401,8 @@
                                                                     62
                                                                 ],
                                                                 "name": "b"
-                                                            }
+                                                            },
+                                                            "kind": "init"
                                                         },
                                                         {
                                                             "type": "RestElement",
diff --git a/test/fixtures/ast/v-bind-same-name-shorthand02-options/ast.json b/test/fixtures/ast/v-bind-same-name-shorthand02-options/ast.json
@@ -95,7 +95,6 @@
                             ],
                             "name": "data"
                         },
-                        "kind": "init",
                         "value": {
                             "type": "FunctionExpression",
                             "start": 33,
@@ -244,7 +243,8 @@
                                     }
                                 ]
                             }
-                        }
+                        },
+                        "kind": "init"
                     }
                 ]
             }
diff --git a/test/fixtures/ast/v-bind-same-name-shorthand04-with-v-for/ast.json b/test/fixtures/ast/v-bind-same-name-shorthand04-with-v-for/ast.json
@@ -95,7 +95,6 @@
                             ],
                             "name": "data"
                         },
-                        "kind": "init",
                         "value": {
                             "type": "FunctionExpression",
                             "start": 33,
@@ -286,7 +285,8 @@
                                     }
                                 ]
                             }
-                        }
+                        },
+                        "kind": "init"
                     }
                 ]
             }
diff --git a/test/fixtures/ast/v-for-directives-with-destructuring/ast.json b/test/fixtures/ast/v-for-directives-with-destructuring/ast.json
@@ -262,7 +262,6 @@
                                                         ],
                                                         "name": "key"
                                                     },
-                                                    "kind": "init",
                                                     "value": {
                                                         "type": "Identifier",
                                                         "start": 28,
@@ -282,7 +281,8 @@
                                                             31
                                                         ],
                                                         "name": "key"
-                                                    }
+                                                    },
+                                                    "kind": "init"
                                                 },
                                                 {
                                                     "type": "Property",
@@ -325,7 +325,6 @@
                                                         ],
                                                         "name": "name"
                                                     },
-                                                    "kind": "init",
                                                     "value": {
                                                         "type": "Identifier",
                                                         "start": 32,
@@ -345,7 +344,8 @@
                                                             36
                                                         ],
                                                         "name": "name"
-                                                    }
+                                                    },
+                                                    "kind": "init"
                                                 }
                                             ]
                                         }
@@ -1460,7 +1460,6 @@
                                                         ],
                                                         "name": "name"
                                                     },
-                                                    "kind": "init",
                                                     "value": {
                                                         "type": "Identifier",
                                                         "start": 163,
@@ -1480,7 +1479,8 @@
                                                             167
                                                         ],
                                                         "name": "name"
-                                                    }
+                                                    },
+                                                    "kind": "init"
                                                 }
                                             ]
                                         }
diff --git a/test/fixtures/ast/v-slot-default-shorthand/ast.json b/test/fixtures/ast/v-slot-default-shorthand/ast.json
@@ -280,7 +280,6 @@
                                                         ],
                                                         "name": "foo"
                                                     },
-                                                    "kind": "init",
                                                     "value": {
                                                         "type": "Identifier",
                                                         "start": 43,
@@ -300,7 +299,8 @@
                                                             46
                                                         ],
                                                         "name": "foo"
-                                                    }
+                                                    },
+                                                    "kind": "init"
                                                 }
                                             ]
                                         }
diff --git a/test/fixtures/ast/v-slot-default/ast.json b/test/fixtures/ast/v-slot-default/ast.json
diff --git a/test/fixtures/ast/v-slot-named-shorthand/ast.json b/test/fixtures/ast/v-slot-named-shorthand/ast.json
diff --git a/test/fixtures/ast/v-slot-named/ast.json b/test/fixtures/ast/v-slot-named/ast.json
diff --git a/test/fixtures/ast/vue3.3-generic-3/scope.json b/test/fixtures/ast/vue3.3-generic-3/scope.json

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ export function extractGeneric(element: VElement): GenericProcessInfo \| null {`
`94`	`94`	`typeDefScope: Scope,`
`95`	`95`	`isRemoveTarget: (nodeOrToken: HasLocation) => boolean,`
`96`	`96`	`) {`
`97`		`- for (const variable of typeDefScope.variables) {`
	`97`	`+ // eslint-disable-next-line unicorn/no-useless-spread -- The original array is mutated`
	`98`	`+ for (const variable of [...typeDefScope.variables]) {`
`98`	`99`	`let def = variable.defs.find((d) =>`
`99`	`100`	`isRemoveTarget(d.name as HasLocation),`
`100`	`101`	`)`
`@@ -105,13 +106,15 @@ export function extractGeneric(element: VElement): GenericProcessInfo \| null {`
`105`	`106`	`)`
`106`	`107`	`}`
`107`	`108`	`}`
`108`		`- for (const reference of typeDefScope.references) {`
	`109`	`+ // eslint-disable-next-line unicorn/no-useless-spread -- The original array is mutated`
	`110`	`+ for (const reference of [...typeDefScope.references]) {`
`109`	`111`	`if (isRemoveTarget(reference.identifier as HasLocation)) {`
`110`	`112`	`removeReference(reference, typeDefScope)`
`111`	`113`	`}`
`112`	`114`	`}`
`113`	`115`
`114`		`- for (const scope of scopeManager.scopes) {`
	`116`	`+ // eslint-disable-next-line unicorn/no-useless-spread -- The original array is mutated`
	`117`	`+ for (const scope of [...scopeManager.scopes]) {`
`115`	`118`	`if (isRemoveTarget(scope.block as HasLocation)) {`
`116`	`119`	`removeScope(scopeManager, scope)`
`117`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,6 @@`
`214`	`214`	`],`
`215`	`215`	`"name": "set"`
`216`	`216`	`},`
`217`		`- "kind": "init",`
`218`	`217`	`"value": {`
`219`	`218`	`"type": "FunctionExpression",`
`220`	`219`	`"start": 71,`
`@@ -522,7 +521,8 @@`
`522`	`521`	`}`
`523`	`522`	`]`
`524`	`523`	`}`
`525`		`- }`
	`524`	`+ },`
	`525`	`+ "kind": "init"`
`526`	`526`	`}`
`527`	`527`	`]`
`528`	`528`	`}`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,8 @@`
`364`	`364`	`"kind": "let"`
`365`	`365`	`},`
`366`	`366`	`"specifiers": [],`
`367`		`- "source": null`
	`367`	`+ "source": null,`
	`368`	`+ "attributes": []`
`368`	`369`	`},`
`369`	`370`	`{`
`370`	`371`	`"type": "ImportDeclaration",`
`@@ -914,7 +915,8 @@`
`914`	`915`	`}`
`915`	`916`	`}`
`916`	`917`	`],`
`917`		`- "source": null`
	`918`	`+ "source": null,`
	`919`	`+ "attributes": []`
`918`	`920`	`},`
`919`	`921`	`{`
`920`	`922`	`"type": "ExportNamedDeclaration",`
`@@ -1055,7 +1057,8 @@`
`1055`	`1057`	`}`
`1056`	`1058`	`}`
`1057`	`1059`	`],`
`1058`		`- "source": null`
	`1060`	`+ "source": null,`
	`1061`	`+ "attributes": []`
`1059`	`1062`	`},`
`1060`	`1063`	`{`
`1061`	`1064`	`"type": "ExportNamedDeclaration",`
`@@ -1077,7 +1080,8 @@`
`1077`	`1080`	`],`
`1078`	`1081`	`"declaration": null,`
`1079`	`1082`	`"specifiers": [],`
`1080`		`- "source": null`
	`1083`	`+ "source": null,`
	`1084`	`+ "attributes": []`
`1081`	`1085`	`},`
`1082`	`1086`	`{`
`1083`	`1087`	`"type": "VariableDeclaration",`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,6 @@`
`340`	`340`	`],`
`341`	`341`	`"name": "a"`
`342`	`342`	`},`
`343`		`- "kind": "init",`
`344`	`343`	`"value": {`
`345`	`344`	`"type": "Identifier",`
`346`	`345`	`"start": 62,`
`@@ -360,7 +359,8 @@`
`360`	`359`	`63`
`361`	`360`	`],`
`362`	`361`	`"name": "a"`
`363`		`- }`
	`362`	`+ },`
	`363`	`+ "kind": "init"`
`364`	`364`	`},`
`365`	`365`	`{`
`366`	`366`	`"type": "Property",`
`@@ -403,7 +403,6 @@`
`403`	`403`	`],`
`404`	`404`	`"name": "b"`
`405`	`405`	`},`
`406`		`- "kind": "init",`
`407`	`406`	`"value": {`
`408`	`407`	`"type": "Identifier",`
`409`	`408`	`"start": 67,`
`@@ -423,7 +422,8 @@`
`423`	`422`	`68`
`424`	`423`	`],`
`425`	`424`	`"name": "b"`
`426`		`- }`
	`425`	`+ },`
	`426`	`+ "kind": "init"`
`427`	`427`	`}`
`428`	`428`	`]`
`429`	`429`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@`
`95`	`95`	`],`
`96`	`96`	`"name": "data"`
`97`	`97`	`},`
`98`		`- "kind": "init",`
`99`	`98`	`"value": {`
`100`	`99`	`"type": "FunctionExpression",`
`101`	`100`	`"start": 33,`
`@@ -244,7 +243,8 @@`
`244`	`243`	`}`
`245`	`244`	`]`
`246`	`245`	`}`
`247`		`- }`
	`246`	`+ },`
	`247`	`+ "kind": "init"`
`248`	`248`	`}`
`249`	`249`	`]`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,6 @@`
`262`	`262`	`],`
`263`	`263`	`"name": "key"`
`264`	`264`	`},`
`265`		`- "kind": "init",`
`266`	`265`	`"value": {`
`267`	`266`	`"type": "Identifier",`
`268`	`267`	`"start": 28,`
`@@ -282,7 +281,8 @@`
`282`	`281`	`31`
`283`	`282`	`],`
`284`	`283`	`"name": "key"`
`285`		`- }`
	`284`	`+ },`
	`285`	`+ "kind": "init"`
`286`	`286`	`},`
`287`	`287`	`{`
`288`	`288`	`"type": "Property",`
`@@ -325,7 +325,6 @@`
`325`	`325`	`],`
`326`	`326`	`"name": "name"`
`327`	`327`	`},`
`328`		`- "kind": "init",`
`329`	`328`	`"value": {`
`330`	`329`	`"type": "Identifier",`
`331`	`330`	`"start": 32,`
`@@ -345,7 +344,8 @@`
`345`	`344`	`36`
`346`	`345`	`],`
`347`	`346`	`"name": "name"`
`348`		`- }`
	`347`	`+ },`
	`348`	`+ "kind": "init"`
`349`	`349`	`}`
`350`	`350`	`]`
`351`	`351`	`}`
`@@ -1460,7 +1460,6 @@`
`1460`	`1460`	`],`
`1461`	`1461`	`"name": "name"`
`1462`	`1462`	`},`
`1463`		`- "kind": "init",`
`1464`	`1463`	`"value": {`
`1465`	`1464`	`"type": "Identifier",`
`1466`	`1465`	`"start": 163,`
`@@ -1480,7 +1479,8 @@`
`1480`	`1479`	`167`
`1481`	`1480`	`],`
`1482`	`1481`	`"name": "name"`
`1483`		`- }`
	`1482`	`+ },`
	`1483`	`+ "kind": "init"`
`1484`	`1484`	`}`
`1485`	`1485`	`]`
`1486`	`1486`	`}`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,6 @@`
`280`	`280`	`],`
`281`	`281`	`"name": "foo"`
`282`	`282`	`},`
`283`		`- "kind": "init",`
`284`	`283`	`"value": {`
`285`	`284`	`"type": "Identifier",`
`286`	`285`	`"start": 43,`
`@@ -300,7 +299,8 @@`
`300`	`299`	`46`
`301`	`300`	`],`
`302`	`301`	`"name": "foo"`
`303`		`- }`
	`302`	`+ },`
	`303`	`+ "kind": "init"`
`304`	`304`	`}`
`305`	`305`	`]`
`306`	`306`	`}`