Fix bugs (#32)

Author: ota-meshi

package.json

@@ -43,6 +43,7 @@
     "homepage": "https://github.com/ota-meshi/astro-eslint-parser#readme",
     "dependencies": {
         "@astrojs/compiler": "^0.14.3",
+        "@typescript-eslint/types": "^5.25.0",
         "debug": "^4.3.4",
         "eslint-visitor-keys": "^3.0.0",
         "espree": "^9.0.0",

src/ast/index.ts

@@ -1,2 +1,8 @@
 export * from "./astro"
 export * from "./jsx"
+import type { TSESTree } from "@typescript-eslint/types"
+export type Comment = TSESTree.Comment
+export type Token = TSESTree.Token
+export type SourceLocation = TSESTree.SourceLocation
+export type Range = TSESTree.Range
+export type Position = TSESTree.Position

src/ast/jsx.ts

@@ -1,4 +1,4 @@
-import type { TSESTree as ES, AST_NODE_TYPES } from "@typescript-eslint/types"
+import type { TSESTree as ES } from "@typescript-eslint/types"
 import type {
     AstroFragment,
     AstroHTMLComment,
@@ -32,21 +32,21 @@ export type JSXChild =
 export type JSXParentNode = JSXElement | JSXFragment | AstroFragment
 /* --- Tags --- */
 export interface JSXElement extends BaseNode {
-    type: AST_NODE_TYPES.JSXElement
+    type: "JSXElement"
     openingElement: JSXOpeningElement
     closingElement: JSXClosingElement | null
     children: JSXChild[]
     parent?: JSXParentNode
 }
 export interface JSXFragment extends BaseNode {
-    type: AST_NODE_TYPES.JSXFragment
+    type: "JSXFragment"
     openingFragment: JSXOpeningFragment
     closingFragment: JSXClosingFragment
     children: JSXChild[]
     parent?: JSXParentNode
 }
 export interface JSXOpeningElement extends BaseNode {
-    type: AST_NODE_TYPES.JSXOpeningElement
+    type: "JSXOpeningElement"
     typeParameters?: ES.TSTypeParameterInstantiation
     selfClosing: boolean
     name: JSXTagNameExpression
@@ -59,28 +59,28 @@ export interface JSXOpeningElement extends BaseNode {
     parent?: JSXElement
 }
 export interface JSXClosingElement extends BaseNode {
-    type: AST_NODE_TYPES.JSXClosingElement
+    type: "JSXClosingElement"
     name: JSXTagNameExpression
     parent?: JSXElement
 }
 export interface JSXClosingFragment extends BaseNode {
-    type: AST_NODE_TYPES.JSXClosingFragment
+    type: "JSXClosingFragment"
     parent?: JSXFragment
 }
 export interface JSXOpeningFragment extends BaseNode {
-    type: AST_NODE_TYPES.JSXOpeningFragment
+    type: "JSXOpeningFragment"
     parent?: JSXFragment
 }
 
 /* --- Attributes --- */
 export interface JSXAttribute extends BaseNode {
-    type: AST_NODE_TYPES.JSXAttribute
+    type: "JSXAttribute"
     name: JSXIdentifier | JSXNamespacedName
     value: JSXExpression | ES.Literal | null
     parent?: JSXOpeningElement
 }
 export interface JSXSpreadAttribute extends BaseNode {
-    type: AST_NODE_TYPES.JSXSpreadAttribute
+    type: "JSXSpreadAttribute"
     argument: ES.Expression
     parent?: JSXOpeningElement
 }
@@ -91,7 +91,7 @@ export type JSXTagNameExpression =
     | JSXMemberExpression
     | JSXNamespacedName
 export interface JSXIdentifier extends BaseNode {
-    type: AST_NODE_TYPES.JSXIdentifier
+    type: "JSXIdentifier"
     name: string
     parent?:
         | JSXAttribute
@@ -103,13 +103,13 @@ export interface JSXIdentifier extends BaseNode {
         | JSXClosingElement
 }
 export interface JSXMemberExpression extends BaseNode {
-    type: AST_NODE_TYPES.JSXMemberExpression
+    type: "JSXMemberExpression"
     object: JSXTagNameExpression
     property: JSXIdentifier
     parent?: JSXMemberExpression | JSXOpeningElement | JSXClosingElement
 }
 export interface JSXNamespacedName extends BaseNode {
-    type: AST_NODE_TYPES.JSXNamespacedName
+    type: "JSXNamespacedName"
     namespace: JSXIdentifier
     name: JSXIdentifier
     parent?:
@@ -124,7 +124,7 @@ export interface JSXNamespacedName extends BaseNode {
 /* --- Expressions --- */
 export type JSXExpression = JSXExpressionContainer | JSXSpreadChild
 export interface JSXExpressionContainer extends BaseNode {
-    type: AST_NODE_TYPES.JSXExpressionContainer
+    type: "JSXExpressionContainer"
     expression: ES.Expression | JSXEmptyExpression
     parent?:
         | JSXAttribute
@@ -133,18 +133,18 @@ export interface JSXExpressionContainer extends BaseNode {
         | JSXParentNode
 }
 export interface JSXSpreadChild extends BaseNode {
-    type: AST_NODE_TYPES.JSXSpreadChild
+    type: "JSXSpreadChild"
     expression: ES.Expression
     parent?: JSXAttribute | JSXParentNode
 }
 export interface JSXEmptyExpression extends BaseNode {
-    type: AST_NODE_TYPES.JSXEmptyExpression
+    type: "JSXEmptyExpression"
     parent?: JSXExpressionContainer
 }
 
 /* --- Texts --- */
 export interface JSXText extends BaseNode {
-    type: AST_NODE_TYPES.JSXText
+    type: "JSXText"
     value: string
     raw: string
     parent?: JSXParentNode

src/astro-tools/index.ts

@@ -1,17 +1,27 @@
 import type { ParseResult } from "@astrojs/compiler"
 import { parseTemplate as parse } from "../parser/template"
-import { getEndOffset, walk } from "../astro"
+import {
+    getEndOffset,
+    walk,
+    calcAttributeValueStartOffset,
+    calcAttributeEndOffset,
+} from "../astro"
 import type { AttributeNode, Node, ParentNode } from "@astrojs/compiler/types"
 
 export interface ParseTemplateResult {
     result: ParseResult
     getEndOffset: (node: Node) => number
+    calcAttributeValueStartOffset: (node: AttributeNode) => number
+    calcAttributeEndOffset: (node: AttributeNode) => number
     walk: (
         parent: ParentNode,
         enter: (n: Node | AttributeNode, parents: ParentNode[]) => void,
         leave?: (n: Node | AttributeNode, parents: ParentNode[]) => void,
     ) => void
+    getLocFromIndex: (index: number) => { line: number; column: number }
+    getIndexFromLoc: (loc: { line: number; column: number }) => number
 }
+
 /**
  * Parse the astro component template.
  */
@@ -20,6 +30,10 @@ export function parseTemplate(code: string): ParseTemplateResult {
     return {
         result: parsed.result,
         getEndOffset: (node) => getEndOffset(node, parsed.context),
+        calcAttributeValueStartOffset: (node) =>
+            calcAttributeValueStartOffset(node, parsed.context),
+        calcAttributeEndOffset: (node) =>
+            calcAttributeEndOffset(node, parsed.context),
         walk(parent, enter, leave) {
             walk(
                 parent,
@@ -31,5 +45,7 @@ export function parseTemplate(code: string): ParseTemplateResult {
                     }),
             )
         },
+        getLocFromIndex: (index) => parsed.context.getLocFromIndex(index),
+        getIndexFromLoc: (loc) => parsed.context.locs.getIndexFromLoc(loc),
     }
 }

src/index.ts

@@ -1,5 +1,5 @@
 import { parseForESLint } from "./parser"
-import { parseTemplate } from "./astro-tools"
+import { parseTemplate, ParseTemplateResult } from "./astro-tools"
 import * as AST from "./ast"
 import { traverseNodes } from "./traverse"
 import { KEYS } from "./visitor-keys"
@@ -14,4 +14,4 @@ export { parseForESLint }
 export const VisitorKeys = KEYS
 
 // tools
-export { traverseNodes, parseTemplate }
+export { traverseNodes, parseTemplate, ParseTemplateResult }

src/parser/script.ts

@@ -18,7 +18,11 @@ export function parseScript(
 
     try {
         const scriptParserOptions = { ...parserOptions.parserOptions }
-        if (parserOptions.isTypeScript() && scriptParserOptions.filePath) {
+        if (
+            parserOptions.isTypeScript() &&
+            scriptParserOptions.filePath &&
+            scriptParserOptions.project
+        ) {
             scriptParserOptions.filePath += ".tsx"
             if (!fs.existsSync(scriptParserOptions.filePath)) {
                 fs.writeFileSync(