astro-eslint-parser 0.0.1 → 0.0.2

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

@@ -41,9 +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, 
-    // eslint-disable-next-line complexity -- ignore
-    (node) => {
+    (0, astro_1.walk)(node, (node) => {
         if (node.type === "frontmatter") {
             start = node.position.start.offset = tokenIndex(code, "---", start);
             start = node.position.end.offset =
@@ -58,11 +56,7 @@ function fixLocations(node, code) {
             }
             start = node.position.start.offset = tokenIndex(code, "<", start);
             start += 1;
-            if (node.type === "element" ||
-                node.type === "component" ||
-                node.type === "custom-element") {
-                start += node.name.length;
-            }
+            start += node.name.length;
             if (!node.attributes.length) {
                 start = (0, astro_1.getStartTagEndOffset)(node, code);
             }
@@ -106,20 +100,18 @@ function fixLocations(node, code) {
         if (node.type === "expression") {
             start = tokenIndex(code, "}", start) + 1;
         }
-        else if (node.type === "fragment") {
-            start = tokenIndex(code, "</>", start) + 3;
-        }
-        else if (node.type === "element" ||
+        else if (node.type === "fragment" ||
+            node.type === "element" ||
             node.type === "component" ||
             node.type === "custom-element") {
             if (!node.position.end) {
                 return;
             }
-            start =
-                tokenIndex(code, `</${node.name}`, start) +
-                    2 +
-                    node.name.length;
-            start = tokenIndex(code, ">", start) + 1;
+            const closeTagStart = tokenIndexSafe(code, `</${node.name}`, start);
+            if (closeTagStart != null) {
+                start = closeTagStart + 2 + node.name.length;
+                start = tokenIndex(code, ">", start) + 1;
+            }
         }
         else {
             return;
@@ -159,9 +151,20 @@ function fixLocationForAttr(node, code, start) {
  * Get token index
  */
 function tokenIndex(string, token, position) {
+    const index = tokenIndexSafe(string, 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))}`);
+    }
+    return index;
+}
+/**
+ * Get token index
+ */
+function tokenIndexSafe(string, token, position) {
     const index = token.trim() === token ? (0, astro_1.skipSpaces)(string, position) : position;
     if (string.startsWith(token, index)) {
         return index;
     }
-    throw new Error(`Unknown token at ${index}, expected: ${JSON.stringify(token)}, actual: ${JSON.stringify(string.slice(index, index + 10))}`);
+    return null;
 }

package/lib/parser/process-template.js

@@ -15,6 +15,7 @@ function processTemplate(ctx, resultTemplate) {
         script.appendScript("<>");
         fragmentOpened = true;
     }
+    // eslint-disable-next-line complexity -- X(
     (0, astro_1.walkElements)(resultTemplate.ast, (node, parent) => {
         if (node.type === "frontmatter") {
             const start = node.position.start.offset;
@@ -45,6 +46,56 @@ function processTemplate(ctx, resultTemplate) {
         }
         else if ((0, astro_1.isTag)(node)) {
             for (const attr of node.attributes) {
+                if ((node.type === "component" || node.type === "fragment") &&
+                    (attr.kind === "quoted" ||
+                        attr.kind === "empty" ||
+                        attr.kind === "expression" ||
+                        attr.kind === "template-literal")) {
+                    const colonIndex = attr.name.indexOf(":");
+                    if (colonIndex >= 0) {
+                        const start = attr.position.start.offset;
+                        script.appendOriginal(start + colonIndex);
+                        script.skipOriginalOffset(1);
+                        script.appendScript(`_`);
+                        script.addToken(types_1.AST_TOKEN_TYPES.JSXIdentifier, [
+                            start,
+                            start + colonIndex,
+                        ]);
+                        script.addToken(types_1.AST_TOKEN_TYPES.Punctuator, [
+                            start + colonIndex,
+                            start + colonIndex + 1,
+                        ]);
+                        script.addToken(types_1.AST_TOKEN_TYPES.JSXIdentifier, [
+                            start + colonIndex + 1,
+                            start + attr.name.length,
+                        ]);
+                        script.addRestoreNodeProcess((scriptNode, result) => {
+                            if (scriptNode.type ===
+                                types_1.AST_NODE_TYPES.JSXAttribute &&
+                                scriptNode.range[0] === start) {
+                                const baseNameNode = scriptNode.name;
+                                const nsn = Object.assign(Object.assign({}, baseNameNode), { type: types_1.AST_NODE_TYPES.JSXNamespacedName, namespace: Object.assign({ type: types_1.AST_NODE_TYPES.JSXIdentifier, name: attr.name.slice(0, colonIndex) }, ctx.getLocations(baseNameNode.range[0], baseNameNode.range[0] + colonIndex)), name: Object.assign({ type: types_1.AST_NODE_TYPES.JSXIdentifier, name: attr.name.slice(colonIndex + 1) }, ctx.getLocations(baseNameNode.range[0] +
+                                        colonIndex +
+                                        1, baseNameNode.range[1])) });
+                                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;
+                                    }
+                                }
+                                return true;
+                            }
+                            return false;
+                        });
+                    }
+                }
                 if (attr.kind === "shorthand") {
                     const start = attr.position.start.offset;
                     script.appendOriginal(start);
@@ -181,10 +232,9 @@ exports.processTemplate = processTemplate;
  * If the given tag is a void tag, get the self-closing tag.
  */
 function getVoidSelfClosingTag(node, parent, ctx) {
-    if (node.type === "fragment") {
-        return false;
-    }
-    if (node.children.length > 0) {
+    var _a;
+    const children = node.children.filter((c) => c.type !== "text" || c.value.trim());
+    if (children.length > 0) {
         return false;
     }
     const code = ctx.code;
@@ -192,8 +242,10 @@ function getVoidSelfClosingTag(node, parent, ctx) {
     const childIndex = parent.children.indexOf(node);
     if (childIndex === parent.children.length - 1) {
         // last
-        nextElementIndex = parent.position.end.offset;
-        nextElementIndex = code.lastIndexOf("</", nextElementIndex);
+        if ((_a = parent.position) === null || _a === void 0 ? void 0 : _a.end) {
+            nextElementIndex = parent.position.end.offset;
+            nextElementIndex = code.lastIndexOf("</", nextElementIndex);
+        }
     }
     else {
         const next = parent.children[childIndex + 1];

package/package.json

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