astro-eslint-parser 0.0.15 → 0.0.16

package/README.md

@@ -15,6 +15,8 @@ You can check it on [Online DEMO](https://ota-meshi.github.io/astro-eslint-parse
 
 This parser is in the ***experimental stages*** of development.
 
+At least it works fine with a [fork of the `astro.build` repository](https://github.com/ota-meshi/astro.build/tree/eslint).
+
 ⚠ Currently this parser relies heavily on the internal API of [@astrojs/compiler]. It may stop working in a future update of [@astrojs/compiler]. ⚠
 
 [@astrojs/compiler]: https://github.com/withastro/compiler
@@ -37,25 +39,28 @@ npm install --save-dev eslint astro-eslint-parser
 ## 📖 Usage
 
 1. Write `overrides.parser` option into your `.eslintrc.*` file.
-2. Use glob patterns or `--ext .astro` CLI option.
 
-```json
-{
-    "extends": "eslint:recommended",
-    "overrides": [
-        {
-            "files": ["*.astro"],
-            "parser": "astro-eslint-parser"
-        }
-    ]
-}
-```
+    ```json
+    {
+        "extends": "eslint:recommended",
+        "overrides": [
+            {
+                "files": ["*.astro"],
+                "parser": "astro-eslint-parser"
+            }
+        ]
+    }
+    ```
 
-```console
-$ eslint "src/**/*.{js,astro}"
-# or
-$ eslint src --ext .astro
-```
+2. If you have specified the extension in the CLI, add `.astro` as well.
+
+    ```console
+    $ eslint "src/**/*.{js,astro}"
+    # or
+    $ eslint src --ext .js,.astro
+    ```
+
+The commit diff [here](https://github.com/ota-meshi/astro.build/commit/7f291ac15e6d97cc20a64b8f97dcbd85379759b5) is an example of introducing this parser to the `astro.build` repository.
 
 ## 🔧 Options
 

package/lib/astro/index.d.ts

@@ -1,4 +1,4 @@
-import type { AttributeNode, CommentNode, ExpressionNode, Node, ParentNode, TagLikeNode } from "@astrojs/compiler/types";
+import type { AttributeNode, CommentNode, Node, ParentNode, TagLikeNode } from "@astrojs/compiler/types";
 import type { Context } from "../context";
 /**
  * Checks if the given node is TagLikeNode
@@ -15,35 +15,27 @@ export declare function walk(parent: ParentNode, code: string, enter: (n: Node |
 /**
  * Get end offset of start tag
  */
-export declare function getStartTagEndOffset(node: TagLikeNode, ctx: Context): number;
-/**
- * Get end offset of tag
- */
-export declare function getTagEndOffset(node: TagLikeNode, ctx: Context): number;
-/**
- * Get end offset of Expression
- */
-export declare function getExpressionEndOffset(node: ExpressionNode, ctx: Context): number;
+export declare function calcStartTagEndOffset(node: TagLikeNode, ctx: Context): number;
 /**
  * Get end offset of attribute
  */
-export declare function getAttributeEndOffset(node: AttributeNode, ctx: Context): number;
+export declare function calcAttributeEndOffset(node: AttributeNode, ctx: Context): number;
 /**
  * Get start offset of attribute value
  */
-export declare function getAttributeValueStartOffset(node: AttributeNode, ctx: Context): number;
+export declare function calcAttributeValueStartOffset(node: AttributeNode, ctx: Context): number;
 /**
- * Get end offset of comment
+ * Get end offset of tag
  */
-export declare function getCommentEndOffset(node: CommentNode, ctx: Context): number;
+export declare function getEndOffset(node: Node, ctx: Context): number;
 /**
  * Get content end offset
  */
-export declare function getContentEndOffset(parent: ParentNode, ctx: Context): number;
+export declare function calcContentEndOffset(parent: ParentNode, ctx: Context): number;
 /**
  * If the given tag is a self-close tag, get the self-closing tag.
  */
-export declare function getSelfClosingTag(node: TagLikeNode, parent: ParentNode, ctx: Context): null | {
+export declare function getSelfClosingTag(node: TagLikeNode, ctx: Context): null | {
     offset: number;
     end: "/>" | ">";
 };
@@ -54,6 +46,10 @@ export declare function getEndTag(node: TagLikeNode, ctx: Context): null | {
     offset: number;
     tag: string;
 };
+/**
+ * Get end offset of comment
+ */
+export declare function calcCommentEndOffset(node: CommentNode, ctx: Context): number;
 /**
  * Skip spaces
  */

package/lib/astro/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.skipSpaces = exports.getEndTag = exports.getSelfClosingTag = exports.getContentEndOffset = exports.getCommentEndOffset = exports.getAttributeValueStartOffset = exports.getAttributeEndOffset = exports.getExpressionEndOffset = exports.getTagEndOffset = exports.getStartTagEndOffset = exports.walk = exports.walkElements = exports.isParent = exports.isTag = void 0;
+exports.skipSpaces = exports.calcCommentEndOffset = exports.getEndTag = exports.getSelfClosingTag = exports.calcContentEndOffset = exports.getEndOffset = exports.calcAttributeValueStartOffset = exports.calcAttributeEndOffset = exports.calcStartTagEndOffset = exports.walk = exports.walkElements = exports.isParent = exports.isTag = void 0;
 const errors_1 = require("../errors");
 /**
  * Checks if the given node is TagLikeNode
@@ -49,11 +49,11 @@ exports.walk = walk;
 /**
  * Get end offset of start tag
  */
-function getStartTagEndOffset(node, ctx) {
+function calcStartTagEndOffset(node, ctx) {
     const lastAttr = node.attributes[node.attributes.length - 1];
     let beforeCloseIndex;
     if (lastAttr) {
-        beforeCloseIndex = getAttributeEndOffset(lastAttr, ctx);
+        beforeCloseIndex = calcAttributeEndOffset(lastAttr, ctx);
     }
     else {
         const info = getTokenInfo(ctx, [`<${node.name}`], node.position.start.offset);
@@ -62,63 +62,20 @@ function getStartTagEndOffset(node, ctx) {
     const info = getTokenInfo(ctx, [[">", "/>"]], beforeCloseIndex);
     return info.index + info.match.length;
 }
-exports.getStartTagEndOffset = getStartTagEndOffset;
-/**
- * Get end offset of tag
- */
-function getTagEndOffset(node, ctx) {
-    var _a;
-    if (((_a = node.position.end) === null || _a === void 0 ? void 0 : _a.offset) != null) {
-        return node.position.end.offset;
-    }
-    let beforeIndex;
-    if (node.children.length) {
-        const lastChild = node.children[node.children.length - 1];
-        beforeIndex = getEndOffset(lastChild, ctx);
-    }
-    else {
-        beforeIndex = getStartTagEndOffset(node, ctx);
-    }
-    beforeIndex = skipSpaces(ctx.code, beforeIndex);
-    if (ctx.code.startsWith(`</${node.name}`, beforeIndex)) {
-        beforeIndex = beforeIndex + 2 + node.name.length;
-        const info = getTokenInfo(ctx, [">"], beforeIndex);
-        return info.index + info.match.length;
-    }
-    return beforeIndex;
-}
-exports.getTagEndOffset = getTagEndOffset;
-/**
- * Get end offset of Expression
- */
-function getExpressionEndOffset(node, ctx) {
-    var _a;
-    if (((_a = node.position.end) === null || _a === void 0 ? void 0 : _a.offset) != null) {
-        return node.position.end.offset;
-    }
-    if (node.children.length) {
-        const lastChild = node.children[node.children.length - 1];
-        const beforeIndex = getEndOffset(lastChild, ctx);
-        const info = getTokenInfo(ctx, ["}"], beforeIndex);
-        return info.index + info.match.length;
-    }
-    const info = getTokenInfo(ctx, ["{", "}"], node.position.start.offset);
-    return info.index + info.match.length;
-}
-exports.getExpressionEndOffset = getExpressionEndOffset;
+exports.calcStartTagEndOffset = calcStartTagEndOffset;
 /**
  * Get end offset of attribute
  */
-function getAttributeEndOffset(node, ctx) {
+function calcAttributeEndOffset(node, ctx) {
     let info;
     if (node.kind === "empty") {
         info = getTokenInfo(ctx, [node.name], node.position.start.offset);
     }
     else if (node.kind === "quoted") {
-        info = getTokenInfo(ctx, [[`"${node.value}"`, `'${node.value}'`, node.value]], getAttributeValueStartOffset(node, ctx));
+        info = getTokenInfo(ctx, [[`"${node.value}"`, `'${node.value}'`, node.value]], calcAttributeValueStartOffset(node, ctx));
     }
     else if (node.kind === "expression") {
-        info = getTokenInfo(ctx, ["{", node.value, "}"], getAttributeValueStartOffset(node, ctx));
+        info = getTokenInfo(ctx, ["{", node.value, "}"], calcAttributeValueStartOffset(node, ctx));
     }
     else if (node.kind === "shorthand") {
         info = getTokenInfo(ctx, ["{", node.name, "}"], node.position.start.offset);
@@ -127,18 +84,18 @@ function getAttributeEndOffset(node, ctx) {
         info = getTokenInfo(ctx, ["{", "...", node.name, "}"], node.position.start.offset);
     }
     else if (node.kind === "template-literal") {
-        info = getTokenInfo(ctx, [`\`${node.value}\``], getAttributeValueStartOffset(node, ctx));
+        info = getTokenInfo(ctx, [`\`${node.value}\``], calcAttributeValueStartOffset(node, ctx));
     }
     else {
         throw new errors_1.ParseError(`Unknown attr kind: ${node.kind}`, node.position.start.offset, ctx);
     }
     return info.index + info.match.length;
 }
-exports.getAttributeEndOffset = getAttributeEndOffset;
+exports.calcAttributeEndOffset = calcAttributeEndOffset;
 /**
  * Get start offset of attribute value
  */
-function getAttributeValueStartOffset(node, ctx) {
+function calcAttributeValueStartOffset(node, ctx) {
     let info;
     if (node.kind === "quoted") {
         info = getTokenInfo(ctx, [node.name, "=", [`"`, `'`, node.value]], node.position.start.offset);
@@ -154,22 +111,46 @@ function getAttributeValueStartOffset(node, ctx) {
     }
     return info.index;
 }
-exports.getAttributeValueStartOffset = getAttributeValueStartOffset;
+exports.calcAttributeValueStartOffset = calcAttributeValueStartOffset;
 /**
- * Get end offset of comment
+ * Get end offset of tag
  */
-function getCommentEndOffset(node, ctx) {
-    const info = getTokenInfo(ctx, ["<!--", node.value, "-->"], node.position.start.offset);
-    return info.index + info.match.length;
+function getEndOffset(node, ctx) {
+    var _a;
+    if (((_a = node.position.end) === null || _a === void 0 ? void 0 : _a.offset) != null) {
+        return node.position.end.offset;
+    }
+    if (isTag(node))
+        return calcTagEndOffset(node, ctx);
+    if (node.type === "expression")
+        return calcExpressionEndOffset(node, ctx);
+    if (node.type === "comment")
+        return calcCommentEndOffset(node, ctx);
+    if (node.type === "frontmatter") {
+        const start = node.position.start.offset;
+        return ctx.code.indexOf("---", start + 3) + 3;
+    }
+    if (node.type === "doctype") {
+        const start = node.position.start.offset;
+        return ctx.code.indexOf(">", start) + 1;
+    }
+    if (node.type === "text") {
+        const start = node.position.start.offset;
+        return start + node.value.length;
+    }
+    if (node.type === "root") {
+        return ctx.code.length;
+    }
+    throw new Error(`unknown type: ${node.type}`);
 }
-exports.getCommentEndOffset = getCommentEndOffset;
+exports.getEndOffset = getEndOffset;
 /**
  * Get content end offset
  */
-function getContentEndOffset(parent, ctx) {
+function calcContentEndOffset(parent, ctx) {
     const code = ctx.code;
     if (isTag(parent)) {
-        const end = getTagEndOffset(parent, ctx);
+        const end = getEndOffset(parent, ctx);
         if (code[end - 1] !== ">") {
             return end;
         }
@@ -181,7 +162,7 @@ function getContentEndOffset(parent, ctx) {
         return end;
     }
     else if (parent.type === "expression") {
-        const end = getExpressionEndOffset(parent, ctx);
+        const end = getEndOffset(parent, ctx);
         return code.lastIndexOf("}", end);
     }
     else if (parent.type === "root") {
@@ -189,33 +170,28 @@ function getContentEndOffset(parent, ctx) {
     }
     throw new Error(`unknown type: ${parent.type}`);
 }
-exports.getContentEndOffset = getContentEndOffset;
+exports.calcContentEndOffset = calcContentEndOffset;
 /**
  * If the given tag is a self-close tag, get the self-closing tag.
  */
-function getSelfClosingTag(node, parent, ctx) {
+function getSelfClosingTag(node, ctx) {
     if (node.children.length > 0) {
         return null;
     }
     const code = ctx.code;
-    let nextElementIndex = code.length;
-    const childIndex = parent.children.indexOf(node);
-    if (childIndex === parent.children.length - 1) {
-        // last
-        nextElementIndex = getContentEndOffset(parent, ctx);
-    }
-    else {
-        const next = parent.children[childIndex + 1];
-        nextElementIndex = next.position.start.offset;
+    const startTagEndOffset = calcStartTagEndOffset(node, ctx);
+    if (code.startsWith("/>", startTagEndOffset - 2)) {
+        return {
+            offset: startTagEndOffset,
+            end: "/>",
+        };
     }
-    const endOffset = getStartTagEndOffset(node, ctx);
-    if (code.slice(endOffset, nextElementIndex).trim()) {
-        // has end tag
+    if (code.startsWith(`</${node.name}`, startTagEndOffset)) {
         return null;
     }
     return {
-        offset: endOffset,
-        end: code.slice(endOffset - 2, endOffset) === "/>" ? "/>" : ">",
+        offset: startTagEndOffset,
+        end: ">",
     };
 }
 exports.getSelfClosingTag = getSelfClosingTag;
@@ -229,7 +205,7 @@ function getEndTag(node, ctx) {
         beforeIndex = getEndOffset(lastChild, ctx);
     }
     else {
-        beforeIndex = getStartTagEndOffset(node, ctx);
+        beforeIndex = calcStartTagEndOffset(node, ctx);
     }
     beforeIndex = skipSpaces(ctx.code, beforeIndex);
     if (ctx.code.startsWith(`</${node.name}`, beforeIndex)) {
@@ -245,36 +221,46 @@ function getEndTag(node, ctx) {
     return null;
 }
 exports.getEndTag = getEndTag;
+/**
+ * Get end offset of comment
+ */
+function calcCommentEndOffset(node, ctx) {
+    const info = getTokenInfo(ctx, ["<!--", node.value, "-->"], node.position.start.offset);
+    return info.index + info.match.length;
+}
+exports.calcCommentEndOffset = calcCommentEndOffset;
 /**
  * Get end offset of tag
  */
-function getEndOffset(node, ctx) {
-    var _a;
-    if (((_a = node.position.end) === null || _a === void 0 ? void 0 : _a.offset) != null) {
-        return node.position.end.offset;
-    }
-    if (isTag(node))
-        return getTagEndOffset(node, ctx);
-    if (node.type === "expression")
-        return getExpressionEndOffset(node, ctx);
-    if (node.type === "comment")
-        return getCommentEndOffset(node, ctx);
-    if (node.type === "frontmatter") {
-        const start = node.position.start.offset;
-        return ctx.code.indexOf("---", start + 3) + 3;
+function calcTagEndOffset(node, ctx) {
+    let beforeIndex;
+    if (node.children.length) {
+        const lastChild = node.children[node.children.length - 1];
+        beforeIndex = getEndOffset(lastChild, ctx);
     }
-    if (node.type === "doctype") {
-        const start = node.position.start.offset;
-        return ctx.code.indexOf(">", start) + 1;
+    else {
+        beforeIndex = calcStartTagEndOffset(node, ctx);
     }
-    if (node.type === "text") {
-        const start = node.position.start.offset;
-        return start + node.value.length;
+    beforeIndex = skipSpaces(ctx.code, beforeIndex);
+    if (ctx.code.startsWith(`</${node.name}`, beforeIndex)) {
+        beforeIndex = beforeIndex + 2 + node.name.length;
+        const info = getTokenInfo(ctx, [">"], beforeIndex);
+        return info.index + info.match.length;
     }
-    if (node.type === "root") {
-        return ctx.code.length;
+    return beforeIndex;
+}
+/**
+ * Get end offset of Expression
+ */
+function calcExpressionEndOffset(node, ctx) {
+    if (node.children.length) {
+        const lastChild = node.children[node.children.length - 1];
+        const beforeIndex = getEndOffset(lastChild, ctx);
+        const info = getTokenInfo(ctx, ["}"], beforeIndex);
+        return info.index + info.match.length;
     }
-    throw new Error(`unknown type: ${node.type}`);
+    const info = getTokenInfo(ctx, ["{", "}"], node.position.start.offset);
+    return info.index + info.match.length;
 }
 /**
  * Get token info

package/lib/context/script.d.ts

@@ -1,6 +1,12 @@
 import type { Context } from ".";
 import type { ESLintExtendedProgram } from "../parser";
 import type { TSESTree } from "@typescript-eslint/types";
+declare class RestoreNodeProcessContext {
+    readonly result: ESLintExtendedProgram;
+    readonly removeTokens: Set<(token: TSESTree.Token) => boolean>;
+    constructor(result: ESLintExtendedProgram);
+    addRemoveToken(test: (token: TSESTree.Token) => boolean): void;
+}
 export declare class ScriptContext {
     private readonly ctx;
     script: string;
@@ -14,7 +20,7 @@ export declare class ScriptContext {
     appendOriginal(index: number): void;
     appendScript(fragment: string): void;
     addToken(type: TSESTree.Token["type"], range: TSESTree.Range): void;
-    addRestoreNodeProcess(process: (node: TSESTree.Node, result: ESLintExtendedProgram, parent: TSESTree.Node) => boolean): void;
+    addRestoreNodeProcess(process: (node: TSESTree.Node, context: RestoreNodeProcessContext, parent: TSESTree.Node) => boolean): void;
     /**
      * Restore AST nodes
      */
@@ -22,3 +28,4 @@ export declare class ScriptContext {
     private remapLocation;
     private getRemapRange;
 }
+export {};

package/lib/context/script.js

@@ -3,6 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScriptContext = void 0;
 const traverse_1 = require("../traverse");
 const errors_1 = require("../errors");
+class RestoreNodeProcessContext {
+    constructor(result) {
+        this.removeTokens = new Set();
+        this.result = result;
+    }
+    addRemoveToken(test) {
+        this.removeTokens.add(test);
+    }
+}
 class ScriptContext {
     constructor(ctx) {
         this.script = "";
@@ -38,6 +47,7 @@ class ScriptContext {
     /**
      * Restore AST nodes
      */
+    // eslint-disable-next-line complexity -- X(
     restore(result) {
         const last = result.ast.body[result.ast.body.length - 1];
         if (last.type !== "ExpressionStatement") {
@@ -77,11 +87,27 @@ class ScriptContext {
         for (const token of result.ast.comments || []) {
             this.remapLocation(token);
         }
+        const context = new RestoreNodeProcessContext(result);
         let restoreNodeProcesses = this.restoreNodeProcesses;
         for (const [node, parent] of traversed) {
             if (!parent)
                 continue;
-            restoreNodeProcesses = restoreNodeProcesses.filter((proc) => !proc(node, result, parent));
+            restoreNodeProcesses = restoreNodeProcesses.filter((proc) => !proc(node, context, parent));
+        }
+        if (context.removeTokens.size) {
+            const tokens = result.ast.tokens || [];
+            for (let index = tokens.length - 1; index >= 0; index--) {
+                const token = tokens[index];
+                for (const rt of context.removeTokens) {
+                    if (rt(token)) {
+                        tokens.splice(index, 1);
+                        context.removeTokens.delete(rt);
+                        if (!context.removeTokens.size) {
+                            break;
+                        }
+                    }
+                }
+            }
         }
         // Adjust program node location
         const first = result.ast.body[0];

package/lib/parser/astro-parser/parse.js

@@ -140,16 +140,22 @@ function fixLocations(node, ctx) {
             start += 1;
             start += node.name.length;
             if (!node.attributes.length) {
-                start = (0, astro_1.getStartTagEndOffset)(node, ctx);
+                start = (0, astro_1.calcStartTagEndOffset)(node, ctx);
             }
         }
         else if (node.type === "attribute") {
             fixLocationForAttr(node, ctx, start);
-            start = (0, astro_1.getAttributeEndOffset)(node, ctx);
+            start = (0, astro_1.calcAttributeEndOffset)(node, ctx);
+            if (node.position.end) {
+                node.position.end.offset = start;
+            }
         }
         else if (node.type === "comment") {
             node.position.start.offset = tokenIndex(ctx, "<!--", start);
-            start = (0, astro_1.getCommentEndOffset)(node, ctx);
+            start = (0, astro_1.calcCommentEndOffset)(node, ctx);
+            if (node.position.end) {
+                node.position.end.offset = start;
+            }
         }
         else if (node.type === "text") {
             if (parent.type === "element" &&
@@ -193,6 +199,9 @@ function fixLocations(node, ctx) {
                     node.value = ctx.code.slice(node.position.start.offset, start);
                 }
             }
+            if (node.position.end) {
+                node.position.end.offset = start;
+            }
         }
         else if (node.type === "expression") {
             start = node.position.start.offset = tokenIndex(ctx, "{", start);
@@ -217,7 +226,7 @@ function fixLocations(node, ctx) {
         if (node.type === "attribute") {
             const attributes = parent.attributes;
             if (attributes[attributes.length - 1] === node) {
-                start = (0, astro_1.getStartTagEndOffset)(parent, ctx);
+                start = (0, astro_1.calcStartTagEndOffset)(parent, ctx);
             }
         }
         else if (node.type === "expression") {
@@ -227,7 +236,7 @@ function fixLocations(node, ctx) {
             node.type === "element" ||
             node.type === "component" ||
             node.type === "custom-element") {
-            if (!(0, astro_1.getSelfClosingTag)(node, parent, ctx)) {
+            if (!(0, astro_1.getSelfClosingTag)(node, ctx)) {
                 const closeTagStart = tokenIndexSafe(ctx.code, `</${node.name}`, start);
                 if (closeTagStart != null) {
                     start = closeTagStart + 2 + node.name.length;

package/lib/parser/process-template.js

@@ -24,12 +24,12 @@ function processTemplate(ctx, resultTemplate) {
             const start = node.position.start.offset;
             script.appendOriginal(start);
             script.skipOriginalOffset(3);
-            const end = node.position.end.offset;
+            const end = (0, astro_1.getEndOffset)(node, ctx);
             script.appendOriginal(end - 3);
             script.appendScript(";<>");
             fragmentOpened = true;
             script.skipOriginalOffset(3);
-            script.addRestoreNodeProcess((_scriptNode, result) => {
+            script.addRestoreNodeProcess((_scriptNode, { result }) => {
                 for (let index = 0; index < result.ast.body.length; index++) {
                     const st = result.ast.body[index];
                     if (st.type === types_1.AST_NODE_TYPES.EmptyStatement) {
@@ -107,7 +107,7 @@ function processTemplate(ctx, resultTemplate) {
                             start + colonIndex + 1,
                             start + attr.name.length,
                         ]);
-                        script.addRestoreNodeProcess((scriptNode, result) => {
+                        script.addRestoreNodeProcess((scriptNode, context) => {
                             if (scriptNode.type ===
                                 types_1.AST_NODE_TYPES.JSXAttribute &&
                                 scriptNode.range[0] === start) {
@@ -119,17 +119,10 @@ function processTemplate(ctx, resultTemplate) {
                                 scriptNode.name = nsn;
                                 nsn.namespace.parent = nsn;
                                 nsn.name.parent = nsn;
-                                const tokens = result.ast.tokens || [];
-                                for (let index = 0; index < tokens.length; index++) {
-                                    const token = tokens[index];
-                                    if (token.range[0] ===
-                                        baseNameNode.range[0] &&
-                                        token.range[1] ===
-                                            baseNameNode.range[1]) {
-                                        tokens.splice(index, 1);
-                                        break;
-                                    }
-                                }
+                                context.addRemoveToken((token) => token.range[0] ===
+                                    baseNameNode.range[0] &&
+                                    token.range[1] ===
+                                        baseNameNode.range[1]);
                                 return true;
                             }
                             return false;
@@ -162,8 +155,8 @@ function processTemplate(ctx, resultTemplate) {
                 }
                 else if (attr.kind === "template-literal") {
                     const attrStart = attr.position.start.offset;
-                    const start = (0, astro_1.getAttributeValueStartOffset)(attr, ctx);
-                    const end = (0, astro_1.getAttributeEndOffset)(attr, ctx);
+                    const start = (0, astro_1.calcAttributeValueStartOffset)(attr, ctx);
+                    const end = (0, astro_1.calcAttributeEndOffset)(attr, ctx);
                     script.appendOriginal(start);
                     script.appendScript("{");
                     script.appendOriginal(end);
@@ -181,7 +174,7 @@ function processTemplate(ctx, resultTemplate) {
                 }
             }
             // Process for start tag close
-            const closing = (0, astro_1.getSelfClosingTag)(node, parent, ctx);
+            const closing = (0, astro_1.getSelfClosingTag)(node, ctx);
             if (closing && closing.end === ">") {
                 script.appendOriginal(closing.offset - 1);
                 script.appendScript("/");
@@ -214,7 +207,8 @@ function processTemplate(ctx, resultTemplate) {
         }
         else if (node.type === "comment") {
             const start = node.position.start.offset;
-            const length = 4 + node.value.length + 3;
+            const end = (0, astro_1.getEndOffset)(node, ctx);
+            const length = end - start;
             script.appendOriginal(start);
             let targetType;
             if (fragmentOpened) {
@@ -228,7 +222,7 @@ function processTemplate(ctx, resultTemplate) {
                 targetType = types_1.AST_NODE_TYPES.ExpressionStatement;
                 script.skipOriginalOffset(length);
             }
-            script.addRestoreNodeProcess((scriptNode, result) => {
+            script.addRestoreNodeProcess((scriptNode, context) => {
                 if (scriptNode.range[0] === start &&
                     scriptNode.type === targetType) {
                     delete scriptNode.children;
@@ -238,26 +232,11 @@ function processTemplate(ctx, resultTemplate) {
                     const commentNode = scriptNode;
                     commentNode.type = "AstroHTMLComment";
                     commentNode.value = node.value;
-                    if (fragmentOpened) {
-                        const removeTokenSet = new Set([
-                            (token) => token.value === "<" &&
-                                token.range[0] === scriptNode.range[0],
-                            (token) => token.value === ">" &&
-                                token.range[1] === scriptNode.range[1],
-                        ]);
-                        const tokens = result.ast.tokens || [];
-                        for (let index = tokens.length - 1; index >= 0; index--) {
-                            const token = tokens[index];
-                            for (const rt of removeTokenSet) {
-                                if (rt(token)) {
-                                    tokens.splice(index, 1);
-                                    removeTokenSet.delete(rt);
-                                    if (!removeTokenSet.size) {
-                                        break;
-                                    }
-                                }
-                            }
-                        }
+                    if (targetType === types_1.AST_NODE_TYPES.JSXFragment) {
+                        context.addRemoveToken((token) => token.value === "<" &&
+                            token.range[0] === scriptNode.range[0]);
+                        context.addRemoveToken((token) => token.value === ">" &&
+                            token.range[1] === scriptNode.range[1]);
                     }
                     return true;
                 }
@@ -270,19 +249,22 @@ function processTemplate(ctx, resultTemplate) {
         }
         else if (node.type === "doctype") {
             const start = node.position.start.offset;
-            const end = node.position.end.offset;
+            const end = (0, astro_1.getEndOffset)(node, ctx);
+            const length = end - start;
             script.appendOriginal(start);
             let targetType;
             if (fragmentOpened) {
-                script.appendScript(`<></>`);
+                script.appendOriginal(start + 1);
+                script.appendScript(`></`);
+                script.skipOriginalOffset(length - 2);
                 targetType = types_1.AST_NODE_TYPES.JSXFragment;
             }
             else {
                 script.appendScript(`0;`);
                 targetType = types_1.AST_NODE_TYPES.ExpressionStatement;
+                script.skipOriginalOffset(length);
             }
-            script.skipOriginalOffset(end - start);
-            script.addRestoreNodeProcess((scriptNode) => {
+            script.addRestoreNodeProcess((scriptNode, context) => {
                 if (scriptNode.range[0] === start &&
                     scriptNode.type === targetType) {
                     delete scriptNode.children;
@@ -291,6 +273,12 @@ function processTemplate(ctx, resultTemplate) {
                     delete scriptNode.expression;
                     const doctypeNode = scriptNode;
                     doctypeNode.type = "AstroDoctype";
+                    if (targetType === types_1.AST_NODE_TYPES.JSXFragment) {
+                        context.addRemoveToken((token) => token.value === "<" &&
+                            token.range[0] === scriptNode.range[0]);
+                        context.addRemoveToken((token) => token.value === ">" &&
+                            token.range[1] === scriptNode.range[1]);
+                    }
                     return true;
                 }
                 return false;
@@ -299,11 +287,11 @@ function processTemplate(ctx, resultTemplate) {
         }
     }, (node, [parent]) => {
         if ((0, astro_1.isTag)(node)) {
-            const closing = (0, astro_1.getSelfClosingTag)(node, parent, ctx);
+            const closing = (0, astro_1.getSelfClosingTag)(node, ctx);
             if (!closing) {
                 const end = (0, astro_1.getEndTag)(node, ctx);
                 if (!end) {
-                    const offset = (0, astro_1.getContentEndOffset)(node, ctx);
+                    const offset = (0, astro_1.calcContentEndOffset)(node, ctx);
                     script.appendOriginal(offset);
                     script.appendScript(`</${node.name}>`);
                     script.addRestoreNodeProcess((scriptNode, _result, parent) => {
@@ -328,9 +316,7 @@ function processTemplate(ctx, resultTemplate) {
                 const before = parent.children[index - 1];
                 if (before &&
                     ((0, astro_1.isTag)(before) || before.type === "comment")) {
-                    const end = (0, astro_1.isTag)(node)
-                        ? (0, astro_1.getTagEndOffset)(node, ctx)
-                        : (0, astro_1.getCommentEndOffset)(node, ctx);
+                    const end = (0, astro_1.getEndOffset)(node, ctx);
                     script.appendOriginal(end);
                     script.appendScript("</>");
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "astro-eslint-parser",
-    "version": "0.0.15",
+    "version": "0.0.16",
     "description": "Astro parser for ESLint",
     "main": "lib/index.js",
     "files": [
@@ -60,6 +60,7 @@
         "@types/semver": "^7.3.9",
         "@typescript-eslint/eslint-plugin": "^5.4.0",
         "@typescript-eslint/parser": "^5.4.0",
+        "astro-eslint-parser": ">=0.0.15",
         "benchmark": "^2.1.4",
         "chai": "^4.3.4",
         "code-red": "^0.2.3",