astro-eslint-parser 0.0.4 → 0.0.5

package/README.md

@@ -15,7 +15,7 @@ You can check it on [Online DEMO](https://ota-meshi.github.io/astro-eslint-parse
 
 This parser is in the ***experimental stages*** of development.
 
-Currently this parser relies heavily on the internal API of [@astrojs/compiler]. It may stop working in a future update of [@astrojs/compiler].
+⚠ 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
 
@@ -151,7 +151,7 @@ For example, the [react/jsx-no-target-blank] rule works fine.
 ## Usage for Custom Rules / Plugins
 
 - TBA
-- You can check it on the [Online DEMO](https://ota-meshi.github.io/astro-eslint-parser/). However, AST is subject to major changes in the future.
+- You can check the AST in the [Online DEMO](https://ota-meshi.github.io/astro-eslint-parser/). However, AST is subject to major changes in the future.
 
 <!-- - [AST.md](./docs/AST.md) is AST specification. You can check it on the [Online DEMO](https://ota-meshi.github.io/astro-eslint-parser/). -->
 <!-- - I have already [implemented some rules] in the [`@ota-meshi/eslint-plugin-astro`]. The source code for these rules will be helpful to you. -->

package/lib/astro/index.d.ts

@@ -8,9 +8,9 @@ export declare function isTag(node: Node): node is Node & TagLikeNode;
  */
 export declare function isParent(node: Node): node is ParentNode;
 /** walk element nodes */
-export declare function walkElements(parent: ParentNode, cb: (n: Node, parent: ParentNode) => void): void;
+export declare function walkElements(parent: ParentNode, code: string, cb: (n: Node, parent: ParentNode) => void): void;
 /** walk nodes */
-export declare function walk(parent: ParentNode, enter: (n: Node | AttributeNode, parent: ParentNode) => void, leave?: (n: Node | AttributeNode, parent: ParentNode) => void): void;
+export declare function walk(parent: ParentNode, code: string, enter: (n: Node | AttributeNode, parent: ParentNode) => void, leave?: (n: Node | AttributeNode, parent: ParentNode) => void): void;
 /**
  * Get end offset of start tag
  */

package/lib/astro/index.js

@@ -19,27 +19,19 @@ function isParent(node) {
 }
 exports.isParent = isParent;
 /** walk element nodes */
-function walkElements(parent, cb) {
-    let children = parent.children;
-    if (parent.type === "root" && children.every((n) => n.position)) {
-        // The order of comments and frontmatter may be changed.
-        children = [...children].sort((a, b) => a.position.start.offset - b.position.start.offset);
-    }
+function walkElements(parent, code, cb) {
+    const children = getSortedChildren(parent, code);
     for (const node of children) {
         cb(node, parent);
         if (isParent(node)) {
-            walkElements(node, cb);
+            walkElements(node, code, cb);
         }
     }
 }
 exports.walkElements = walkElements;
 /** walk nodes */
-function walk(parent, enter, leave) {
-    let children = parent.children;
-    if (parent.type === "root" && children.every((n) => n.position)) {
-        // The order of comments and frontmatter may be changed.
-        children = [...children].sort((a, b) => a.position.start.offset - b.position.start.offset);
-    }
+function walk(parent, code, enter, leave) {
+    const children = getSortedChildren(parent, code);
     for (const node of children) {
         enter(node, parent);
         if (isTag(node)) {
@@ -49,7 +41,7 @@ function walk(parent, enter, leave) {
             }
         }
         if (isParent(node)) {
-            walk(node, enter, leave);
+            walk(node, code, enter, leave);
         }
         leave === null || leave === void 0 ? void 0 : leave(node, parent);
     }
@@ -186,3 +178,41 @@ function skipSpaces(string, position) {
     return position;
 }
 exports.skipSpaces = skipSpaces;
+/**
+ * Get children
+ */
+function getSortedChildren(parent, code) {
+    var _a;
+    if (parent.type === "root" && ((_a = parent.children[0]) === null || _a === void 0 ? void 0 : _a.type) === "frontmatter") {
+        // The order of comments and frontmatter may be changed.
+        const children = [...parent.children];
+        if (children.every((n) => n.position)) {
+            return children.sort((a, b) => a.position.start.offset - b.position.start.offset);
+        }
+        let start = skipSpaces(code, 0);
+        if (code.startsWith("<!", start)) {
+            const frontmatter = children.shift();
+            const before = [];
+            let first;
+            while ((first = children.shift())) {
+                start = skipSpaces(code, start);
+                if (first.type === "comment" &&
+                    code.startsWith("<!--", start)) {
+                    start = code.indexOf("-->", start + 4) + 3;
+                    before.push(first);
+                }
+                else if (first.type === "doctype" &&
+                    code.startsWith("<!", start)) {
+                    start = code.indexOf(">", start + 2) + 1;
+                    before.push(first);
+                }
+                else {
+                    children.unshift(first);
+                    break;
+                }
+            }
+            return [...before, frontmatter, ...children];
+        }
+    }
+    return parent.children;
+}

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

@@ -41,7 +41,7 @@ exports.parse = parse;
 function fixLocations(node, code) {
     // FIXME: Adjust because the parser does not return the correct location.
     let start = 0;
-    (0, astro_1.walk)(node, (node) => {
+    (0, astro_1.walk)(node, code, (node) => {
         if (node.type === "frontmatter") {
             start = node.position.start.offset = tokenIndex(code, "---", start);
             start = node.position.end.offset =
@@ -81,6 +81,9 @@ function fixLocations(node, code) {
             if (!node.position) {
                 node.position = { start: {}, end: {} };
             }
+            if (!node.position.end) {
+                node.position.end = {};
+            }
             start = node.position.start.offset = tokenIndex(code, "<!", start);
             start += 2;
             start = node.position.end.offset =

package/lib/parser/process-template.js

@@ -16,7 +16,7 @@ function processTemplate(ctx, resultTemplate) {
         fragmentOpened = true;
     }
     // eslint-disable-next-line complexity -- X(
-    (0, astro_1.walkElements)(resultTemplate.ast, (node, parent) => {
+    (0, astro_1.walkElements)(resultTemplate.ast, ctx.code, (node, parent) => {
         if (node.type === "frontmatter") {
             const start = node.position.start.offset;
             script.appendOriginal(start);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "astro-eslint-parser",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "description": "Astro parser for ESLint",
     "main": "lib/index.js",
     "files": [