astro-eslint-parser 0.0.6 → 0.0.9

package/lib/astro/index.d.ts

@@ -1,4 +1,5 @@
 import type { AttributeNode, CommentNode, Node, ParentNode, TagLikeNode } from "@astrojs/compiler/types";
+import type { Context } from "../context";
 /**
  * Checks if the given node is TagLikeNode
  */
@@ -14,19 +15,19 @@ export declare function walk(parent: ParentNode, code: string, enter: (n: Node |
 /**
  * Get end offset of start tag
  */
-export declare function getStartTagEndOffset(node: TagLikeNode, code: string): number;
+export declare function getStartTagEndOffset(node: TagLikeNode, ctx: Context): number;
 /**
  * Get end offset of attribute
  */
-export declare function getAttributeEndOffset(node: AttributeNode, code: string): number;
+export declare function getAttributeEndOffset(node: AttributeNode, ctx: Context): number;
 /**
  * Get start offset of attribute value
  */
-export declare function getAttributeValueStartOffset(node: AttributeNode, code: string): number;
+export declare function getAttributeValueStartOffset(node: AttributeNode, ctx: Context): number;
 /**
  * Get end offset of comment
  */
-export declare function getCommentEndOffset(node: CommentNode, code: string): number;
+export declare function getCommentEndOffset(node: CommentNode, ctx: Context): number;
 /**
  * Skip spaces
  */

package/lib/astro/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.skipSpaces = exports.getCommentEndOffset = exports.getAttributeValueStartOffset = exports.getAttributeEndOffset = exports.getStartTagEndOffset = exports.walk = exports.walkElements = exports.isParent = exports.isTag = void 0;
+const errors_1 = require("../errors");
 /**
  * Checks if the given node is TagLikeNode
  */
@@ -50,45 +51,45 @@ exports.walk = walk;
 /**
  * Get end offset of start tag
  */
-function getStartTagEndOffset(node, code) {
+function getStartTagEndOffset(node, ctx) {
     const lastAttr = node.attributes[node.attributes.length - 1];
     let beforeCloseIndex;
     if (lastAttr) {
-        beforeCloseIndex = getAttributeEndOffset(lastAttr, code);
+        beforeCloseIndex = getAttributeEndOffset(lastAttr, ctx);
     }
     else {
-        const info = getTokenInfo(code, [`<${node.name}`], node.position.start.offset);
+        const info = getTokenInfo(ctx, [`<${node.name}`], node.position.start.offset);
         beforeCloseIndex = info.index + info.match.length;
     }
-    const info = getTokenInfo(code, [[">", "/>"]], beforeCloseIndex);
+    const info = getTokenInfo(ctx, [[">", "/>"]], beforeCloseIndex);
     return info.index + info.match.length;
 }
 exports.getStartTagEndOffset = getStartTagEndOffset;
 /**
  * Get end offset of attribute
  */
-function getAttributeEndOffset(node, code) {
+function getAttributeEndOffset(node, ctx) {
     let info;
     if (node.kind === "empty") {
-        info = getTokenInfo(code, [node.name], node.position.start.offset);
+        info = getTokenInfo(ctx, [node.name], node.position.start.offset);
     }
     else if (node.kind === "quoted") {
-        info = getTokenInfo(code, [[`"${node.value}"`, `'${node.value}'`, node.value]], getAttributeValueStartOffset(node, code));
+        info = getTokenInfo(ctx, [[`"${node.value}"`, `'${node.value}'`, node.value]], getAttributeValueStartOffset(node, ctx));
     }
     else if (node.kind === "expression") {
-        info = getTokenInfo(code, ["{", node.value, "}"], getAttributeValueStartOffset(node, code));
+        info = getTokenInfo(ctx, ["{", node.value, "}"], getAttributeValueStartOffset(node, ctx));
     }
     else if (node.kind === "shorthand") {
-        info = getTokenInfo(code, ["{", node.name, "}"], node.position.start.offset);
+        info = getTokenInfo(ctx, ["{", node.name, "}"], node.position.start.offset);
     }
     else if (node.kind === "spread") {
-        info = getTokenInfo(code, ["{", "...", node.name, "}"], node.position.start.offset);
+        info = getTokenInfo(ctx, ["{", "...", node.name, "}"], node.position.start.offset);
     }
     else if (node.kind === "template-literal") {
-        info = getTokenInfo(code, [`\`${node.value}\``], getAttributeValueStartOffset(node, code));
+        info = getTokenInfo(ctx, [`\`${node.value}\``], getAttributeValueStartOffset(node, ctx));
     }
     else {
-        throw new Error(`Unknown attr kind: ${node.kind}`);
+        throw new errors_1.ParseError(`Unknown attr kind: ${node.kind}`, node.position.start.offset, ctx);
     }
     return info.index + info.match.length;
 }
@@ -96,19 +97,19 @@ exports.getAttributeEndOffset = getAttributeEndOffset;
 /**
  * Get start offset of attribute value
  */
-function getAttributeValueStartOffset(node, code) {
+function getAttributeValueStartOffset(node, ctx) {
     let info;
     if (node.kind === "quoted") {
-        info = getTokenInfo(code, [node.name, "=", [`"`, `'`, node.value]], node.position.start.offset);
+        info = getTokenInfo(ctx, [node.name, "=", [`"`, `'`, node.value]], node.position.start.offset);
     }
     else if (node.kind === "expression") {
-        info = getTokenInfo(code, [node.name, "=", "{"], node.position.start.offset);
+        info = getTokenInfo(ctx, [node.name, "=", "{"], node.position.start.offset);
     }
     else if (node.kind === "template-literal") {
-        info = getTokenInfo(code, [node.name, "=", "`"], node.position.start.offset);
+        info = getTokenInfo(ctx, [node.name, "=", "`"], node.position.start.offset);
     }
     else {
-        throw new Error(`Unknown attr kind: ${node.kind}`);
+        throw new errors_1.ParseError(`Unknown attr kind: ${node.kind}`, node.position.start.offset, ctx);
     }
     return info.index;
 }
@@ -116,15 +117,15 @@ exports.getAttributeValueStartOffset = getAttributeValueStartOffset;
 /**
  * Get end offset of comment
  */
-function getCommentEndOffset(node, code) {
-    const info = getTokenInfo(code, ["<!--", node.value, "-->"], node.position.start.offset);
+function getCommentEndOffset(node, ctx) {
+    const info = getTokenInfo(ctx, ["<!--", node.value, "-->"], node.position.start.offset);
     return info.index + info.match.length;
 }
 exports.getCommentEndOffset = getCommentEndOffset;
 /**
  * Get token info
  */
-function getTokenInfo(string, tokens, position) {
+function getTokenInfo(ctx, tokens, position) {
     let lastMatch;
     for (const t of tokens) {
         const index = lastMatch
@@ -134,7 +135,7 @@ function getTokenInfo(string, tokens, position) {
             ? matchOfStr(t, index)
             : matchOfForMulti(t, index);
         if (m == null) {
-            throw new Error(`Unknown token at ${index}, expected: ${JSON.stringify(t)}, actual: ${JSON.stringify(string.slice(index, index + 10))}`);
+            throw new errors_1.ParseError(`Unknown token at ${index}, expected: ${JSON.stringify(t)}, actual: ${JSON.stringify(ctx.code.slice(index, index + 10))}`, index, ctx);
         }
         lastMatch = m;
     }
@@ -143,8 +144,8 @@ function getTokenInfo(string, tokens, position) {
      * For string
      */
     function matchOfStr(search, position) {
-        const index = search.trim() === search ? skipSpaces(string, position) : position;
-        if (string.startsWith(search, index)) {
+        const index = search.trim() === search ? skipSpaces(ctx.code, position) : position;
+        if (ctx.code.startsWith(search, index)) {
             return {
                 match: search,
                 index,

package/lib/parser/astro-parser/parse.d.ts

@@ -1,5 +1,6 @@
 import type { ParseResult } from "@astrojs/compiler";
+import type { Context } from "../../context";
 /**
  * Parse code by `@astrojs/compiler`
  */
-export declare function parse(code: string): ParseResult;
+export declare function parse(code: string, ctx: Context): ParseResult;

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

@@ -26,26 +26,79 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = void 0;
 const service = __importStar(require("./astrojs-compiler-service"));
 const astro_1 = require("../../astro");
+const errors_1 = require("../../errors");
 /**
  * Parse code by `@astrojs/compiler`
  */
-function parse(code) {
+function parse(code, ctx) {
     const ast = service.parse(code, { position: true }).ast;
-    fixLocations(ast, code);
+    const htmlElement = ast.children.find((n) => n.type === "element" && n.name === "html");
+    if (htmlElement) {
+        adjustHTML(ast, htmlElement, ctx);
+    }
+    fixLocations(ast, ctx);
     return { ast };
 }
 exports.parse = parse;
+/**
+ * Adjust <html> element node
+ */
+function adjustHTML(ast, htmlElement, ctx) {
+    var _a;
+    const htmlEnd = ctx.code.indexOf("</html");
+    if (htmlEnd == null) {
+        return;
+    }
+    const children = [...htmlElement.children];
+    for (const child of children) {
+        const offset = (_a = child.position) === null || _a === void 0 ? void 0 : _a.start.offset;
+        if (offset != null) {
+            if (htmlEnd <= offset) {
+                htmlElement.children.splice(htmlElement.children.indexOf(child), 1);
+                ast.children.push(child);
+            }
+        }
+        if (child.type === "element" && child.name === "body") {
+            adjustHTMLBody(ast, htmlElement, htmlEnd, child, ctx);
+        }
+    }
+}
+/**
+ * Adjust <body> element node
+ */
+function adjustHTMLBody(ast, htmlElement, htmlEnd, bodyElement, ctx) {
+    var _a;
+    const bodyEnd = ctx.code.indexOf("</body");
+    if (bodyEnd == null) {
+        return;
+    }
+    const children = [...bodyElement.children];
+    for (const child of children) {
+        const offset = (_a = child.position) === null || _a === void 0 ? void 0 : _a.start.offset;
+        if (offset != null) {
+            if (bodyEnd <= offset) {
+                bodyElement.children.splice(bodyElement.children.indexOf(child), 1);
+                if (htmlEnd <= offset) {
+                    ast.children.push(child);
+                }
+                else {
+                    htmlElement.children.push(child);
+                }
+            }
+        }
+    }
+}
 /**
  * Fix locations
  */
-function fixLocations(node, code) {
+function fixLocations(node, ctx) {
     // FIXME: Adjust because the parser does not return the correct location.
     let start = 0;
-    (0, astro_1.walk)(node, code, (node) => {
+    (0, astro_1.walk)(node, ctx.code, (node) => {
         if (node.type === "frontmatter") {
-            start = node.position.start.offset = tokenIndex(code, "---", start);
+            start = node.position.start.offset = tokenIndex(ctx, "---", start);
             start = node.position.end.offset =
-                tokenIndex(code, "---", start + 3 + node.value.length) + 3;
+                tokenIndex(ctx, "---", start + 3 + node.value.length) + 3;
         }
         else if (node.type === "fragment" ||
             node.type === "element" ||
@@ -54,27 +107,27 @@ function fixLocations(node, code) {
             if (!node.position) {
                 node.position = { start: {}, end: {} };
             }
-            start = node.position.start.offset = tokenIndex(code, "<", start);
+            start = node.position.start.offset = tokenIndex(ctx, "<", start);
             start += 1;
             start += node.name.length;
             if (!node.attributes.length) {
-                start = (0, astro_1.getStartTagEndOffset)(node, code);
+                start = (0, astro_1.getStartTagEndOffset)(node, ctx);
             }
         }
         else if (node.type === "attribute") {
-            fixLocationForAttr(node, code, start);
-            start = (0, astro_1.getAttributeEndOffset)(node, code);
+            fixLocationForAttr(node, ctx, start);
+            start = (0, astro_1.getAttributeEndOffset)(node, ctx);
         }
         else if (node.type === "comment") {
-            node.position.start.offset = tokenIndex(code, "<!--", start);
-            start = (0, astro_1.getCommentEndOffset)(node, code);
+            node.position.start.offset = tokenIndex(ctx, "<!--", start);
+            start = (0, astro_1.getCommentEndOffset)(node, ctx);
         }
         else if (node.type === "text") {
-            start = node.position.start.offset = tokenIndex(code, node.value, start);
+            start = node.position.start.offset = tokenIndex(ctx, node.value, start);
             start += node.value.length;
         }
         else if (node.type === "expression") {
-            start = node.position.start.offset = tokenIndex(code, "{", start);
+            start = node.position.start.offset = tokenIndex(ctx, "{", start);
             start += 1;
         }
         else if (node.type === "doctype") {
@@ -84,10 +137,10 @@ function fixLocations(node, code) {
             if (!node.position.end) {
                 node.position.end = {};
             }
-            start = node.position.start.offset = tokenIndex(code, "<!", start);
+            start = node.position.start.offset = tokenIndex(ctx, "<!", start);
             start += 2;
             start = node.position.end.offset =
-                code.indexOf(">", start) + 1;
+                ctx.code.indexOf(">", start) + 1;
         }
         else if (node.type === "root") {
             // noop
@@ -96,21 +149,21 @@ function fixLocations(node, code) {
         if (node.type === "attribute") {
             const attributes = parent.attributes;
             if (attributes[attributes.length - 1] === node) {
-                start = (0, astro_1.getStartTagEndOffset)(parent, code);
+                start = (0, astro_1.getStartTagEndOffset)(parent, ctx);
             }
             return;
         }
         if (node.type === "expression") {
-            start = tokenIndex(code, "}", start) + 1;
+            start = tokenIndex(ctx, "}", start) + 1;
         }
         else if (node.type === "fragment" ||
             node.type === "element" ||
             node.type === "component" ||
             node.type === "custom-element") {
-            const closeTagStart = tokenIndexSafe(code, `</${node.name}`, start);
+            const closeTagStart = tokenIndexSafe(ctx.code, `</${node.name}`, start);
             if (closeTagStart != null) {
                 start = closeTagStart + 2 + node.name.length;
-                start = tokenIndex(code, ">", start) + 1;
+                start = tokenIndex(ctx, ">", start) + 1;
             }
         }
         else {
@@ -124,37 +177,37 @@ function fixLocations(node, code) {
 /**
  * Fix locations
  */
-function fixLocationForAttr(node, code, start) {
+function fixLocationForAttr(node, ctx, start) {
     if (node.kind === "empty") {
-        node.position.start.offset = tokenIndex(code, node.name, start);
+        node.position.start.offset = tokenIndex(ctx, node.name, start);
     }
     else if (node.kind === "quoted") {
-        node.position.start.offset = tokenIndex(code, node.name, start);
+        node.position.start.offset = tokenIndex(ctx, node.name, start);
     }
     else if (node.kind === "expression") {
-        node.position.start.offset = tokenIndex(code, node.name, start);
+        node.position.start.offset = tokenIndex(ctx, node.name, start);
     }
     else if (node.kind === "shorthand") {
-        node.position.start.offset = tokenIndex(code, "{", start);
+        node.position.start.offset = tokenIndex(ctx, "{", start);
     }
     else if (node.kind === "spread") {
-        node.position.start.offset = tokenIndex(code, "{", start);
+        node.position.start.offset = tokenIndex(ctx, "{", start);
     }
     else if (node.kind === "template-literal") {
-        node.position.start.offset = tokenIndex(code, node.name, start);
+        node.position.start.offset = tokenIndex(ctx, node.name, start);
     }
     else {
-        throw new Error(`Unknown attr kind: ${node.kind}`);
+        throw new errors_1.ParseError(`Unknown attr kind: ${node.kind}`, node.position.start.offset, ctx);
     }
 }
 /**
  * Get token index
  */
-function tokenIndex(string, token, position) {
-    const index = tokenIndexSafe(string, token, position);
+function tokenIndex(ctx, token, position) {
+    const index = tokenIndexSafe(ctx.code, token, position);
     if (index == null) {
-        const start = token.trim() === token ? (0, astro_1.skipSpaces)(string, position) : position;
-        throw new Error(`Unknown token at ${start}, expected: ${JSON.stringify(token)}, actual: ${JSON.stringify(string.slice(start, start + 10))}`);
+        const start = token.trim() === token ? (0, astro_1.skipSpaces)(ctx.code, position) : position;
+        throw new errors_1.ParseError(`Unknown token at ${start}, expected: ${JSON.stringify(token)}, actual: ${JSON.stringify(ctx.code.slice(start, start + 10))}`, start, ctx);
     }
     return index;
 }

package/lib/parser/index.js

@@ -82,7 +82,7 @@ function extractTokens(ast, ctx) {
  */
 function parseTemplate(code, ctx) {
     try {
-        return (0, parse_1.parse)(code);
+        return (0, parse_1.parse)(code, ctx);
     }
     catch (e) {
         if (typeof e.pos === "number") {

package/lib/parser/process-template.js

@@ -8,6 +8,8 @@ const script_1 = require("../context/script");
  * Process the template to generate a ScriptContext.
  */
 function processTemplate(ctx, resultTemplate) {
+    let uniqueIdSeq = 0;
+    const usedUniqueIds = new Set();
     const script = new script_1.ScriptContext(ctx);
     const frontmatter = resultTemplate.ast.children.find((n) => n.type === "frontmatter");
     let fragmentOpened = false;
@@ -99,13 +101,19 @@ function processTemplate(ctx, resultTemplate) {
                 if (attr.kind === "shorthand") {
                     const start = attr.position.start.offset;
                     script.appendOriginal(start);
-                    script.appendScript(`${attr.name}=`);
+                    const jsxName = /[\s"'[\]{}]/u.test(attr.name)
+                        ? generateUniqueId(attr.name)
+                        : attr.name;
+                    script.appendScript(`${jsxName}=`);
                     script.addRestoreNodeProcess((scriptNode) => {
                         if (scriptNode.type === types_1.AST_NODE_TYPES.JSXAttribute &&
                             scriptNode.range[0] === start) {
                             const attrNode = scriptNode;
                             attrNode.type = "AstroShorthandAttribute";
                             const locs = ctx.getLocations(...attrNode.value.expression.range);
+                            if (jsxName !== attr.name) {
+                                attrNode.name.name = attr.name;
+                            }
                             attrNode.name.range = locs.range;
                             attrNode.name.loc = locs.loc;
                             return true;
@@ -115,8 +123,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.code);
-                    const end = (0, astro_1.getAttributeEndOffset)(attr, ctx.code);
+                    const start = (0, astro_1.getAttributeValueStartOffset)(attr, ctx);
+                    const end = (0, astro_1.getAttributeEndOffset)(attr, ctx);
                     script.appendOriginal(start);
                     script.appendScript("{");
                     script.appendOriginal(end);
@@ -228,6 +236,17 @@ function processTemplate(ctx, resultTemplate) {
     script.appendOriginal(ctx.code.length);
     script.appendScript("</>");
     return script;
+    /**
+     * Generate unique id
+     */
+    function generateUniqueId(base) {
+        let candidate = `$_${base.replace(/\W/g, "_")}${uniqueIdSeq++}`;
+        while (usedUniqueIds.has(candidate) || ctx.code.includes(candidate)) {
+            candidate = `$_${base.replace(/\W/g, "_")}${uniqueIdSeq++}`;
+        }
+        usedUniqueIds.add(candidate);
+        return candidate;
+    }
 }
 exports.processTemplate = processTemplate;
 /**
@@ -253,7 +272,7 @@ function getVoidSelfClosingTag(node, parent, ctx) {
         const next = parent.children[childIndex + 1];
         nextElementIndex = next.position.start.offset;
     }
-    const endOffset = (0, astro_1.getStartTagEndOffset)(node, code);
+    const endOffset = (0, astro_1.getStartTagEndOffset)(node, ctx);
     if (code.slice(endOffset, nextElementIndex).trim()) {
         // has end tag
         return null;

package/package.json

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