Fix parsing error when combining <script> and export in <script setup> (#115)

* Fix parsing error when combining `<script>` and `export` in `<script setup>`

* update

* update

Author: ota-meshi

package.json

@@ -64,8 +64,8 @@
     "setup": "git submodule update --init && cd test/fixtures/eslint && npm install",
     "pretest": "run-s build lint",
     "test": "npm run -s test:mocha",
-    "test:mocha": "nyc mocha \"test/*.js\" --reporter dot --timeout 10000",
-    "test:debug": "mocha --inspect --require ts-node/register/transpile-only \"test/*.js\" --reporter dot --timeout 10000",
+    "test:mocha": "nyc mocha \"test/*.js\" --reporter dot --timeout 60000",
+    "test:debug": "mocha --inspect --require ts-node/register/transpile-only \"test/*.js\" --reporter dot --timeout 60000",
     "preupdate-fixtures": "npm run -s build",
     "update-fixtures": "node scripts/update-fixtures-ast.js && node scripts/update-fixtures-document-fragment.js",
     "preversion": "npm test",

scripts/update-fixtures-ast.js

@@ -228,6 +228,7 @@ for (const name of TARGETS) {
             ? JSON.parse(fs.readFileSync(optionsPath, "utf8"))
             : {}
     )
+    // console.log("Start:", name)
     const actual = parser.parseForESLint(source, options)
     const tokenRanges = getAllTokens(actual.ast).map((t) =>
         source.slice(t.range[0], t.range[1])

src/ast/nodes.ts

@@ -310,6 +310,7 @@ export interface ESLintExportNamedDeclaration extends HasLocation, HasParent {
 
 export interface ESLintExportSpecifier extends HasLocation, HasParent {
     type: "ExportSpecifier"
+    local: ESLintIdentifier
     exported: ESLintIdentifier
 }
 

src/common/fix-locations.ts

@@ -1,5 +1,6 @@
 import type {
     ESLintExtendedProgram,
+    ESLintNode,
     HasLocation,
     LocationRange,
     Node,
@@ -20,13 +21,28 @@ import type { LocationCalculator } from "./location-calculator"
 export function fixLocations(
     result: ESLintExtendedProgram,
     locationCalculator: LocationCalculator,
+): void {
+    fixNodeLocations(result.ast, result.visitorKeys, locationCalculator)
+
+    for (const token of result.ast.tokens || []) {
+        fixLocation(token, locationCalculator)
+    }
+    for (const comment of result.ast.comments || []) {
+        fixLocation(comment, locationCalculator)
+    }
+}
+
+export function fixNodeLocations(
+    rootNode: ESLintNode,
+    visitorKeys: ESLintExtendedProgram["visitorKeys"],
+    locationCalculator: LocationCalculator,
 ): void {
     // There are cases which the same node instance appears twice in the tree.
     // E.g. `let {a} = {}` // This `a` appears twice at `Property#key` and `Property#value`.
     const traversed = new Map<Node | number[] | LocationRange, Node>()
 
-    traverseNodes(result.ast, {
-        visitorKeys: result.visitorKeys,
+    traverseNodes(rootNode, {
+        visitorKeys,
 
         enterNode(node, parent) {
             if (!traversed.has(node)) {
@@ -65,13 +81,6 @@ export function fixLocations(
             // Do nothing.
         },
     })
-
-    for (const token of result.ast.tokens || []) {
-        fixLocation(token, locationCalculator)
-    }
-    for (const comment of result.ast.comments || []) {
-        fixLocation(comment, locationCalculator)
-    }
 }
 
 /**