astro-eslint-parser 0.0.14 → 0.0.15

package/lib/astro/index.d.ts

@@ -19,11 +19,11 @@ export declare function getStartTagEndOffset(node: TagLikeNode, ctx: Context): n
 /**
  * Get end offset of tag
  */
-export declare function getTagEndOffset(node: TagLikeNode, parents: ParentNode[], ctx: Context): number;
+export declare function getTagEndOffset(node: TagLikeNode, ctx: Context): number;
 /**
  * Get end offset of Expression
  */
-export declare function getExpressionEndOffset(node: ExpressionNode, parents: ParentNode[], ctx: Context): number;
+export declare function getExpressionEndOffset(node: ExpressionNode, ctx: Context): number;
 /**
  * Get end offset of attribute
  */
@@ -39,18 +39,18 @@ export declare function getCommentEndOffset(node: CommentNode, ctx: Context): nu
 /**
  * Get content end offset
  */
-export declare function getContentEndOffset(parent: ParentNode, parents: ParentNode[], ctx: Context): number;
+export declare function getContentEndOffset(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, parents: ParentNode[], ctx: Context): null | {
+export declare function getSelfClosingTag(node: TagLikeNode, parent: ParentNode, ctx: Context): null | {
     offset: number;
     end: "/>" | ">";
 };
 /**
  * If the given tag has a end tag, get the end tag.
  */
-export declare function getEndTag(node: TagLikeNode, parents: ParentNode[], ctx: Context): null | {
+export declare function getEndTag(node: TagLikeNode, ctx: Context): null | {
     offset: number;
     tag: string;
 };

package/lib/astro/index.js

@@ -66,7 +66,7 @@ exports.getStartTagEndOffset = getStartTagEndOffset;
 /**
  * Get end offset of tag
  */
-function getTagEndOffset(node, parents, ctx) {
+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;
@@ -74,7 +74,7 @@ function getTagEndOffset(node, parents, ctx) {
     let beforeIndex;
     if (node.children.length) {
         const lastChild = node.children[node.children.length - 1];
-        beforeIndex = getEndOffset(lastChild, [node, ...parents], ctx);
+        beforeIndex = getEndOffset(lastChild, ctx);
     }
     else {
         beforeIndex = getStartTagEndOffset(node, ctx);
@@ -91,14 +91,14 @@ exports.getTagEndOffset = getTagEndOffset;
 /**
  * Get end offset of Expression
  */
-function getExpressionEndOffset(node, parents, ctx) {
+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, [node, ...parents], ctx);
+        const beforeIndex = getEndOffset(lastChild, ctx);
         const info = getTokenInfo(ctx, ["}"], beforeIndex);
         return info.index + info.match.length;
     }
@@ -166,21 +166,22 @@ exports.getCommentEndOffset = getCommentEndOffset;
 /**
  * Get content end offset
  */
-function getContentEndOffset(parent, parents, ctx) {
+function getContentEndOffset(parent, ctx) {
     const code = ctx.code;
     if (isTag(parent)) {
-        const end = getTagEndOffset(parent, parents, ctx);
+        const end = getTagEndOffset(parent, ctx);
         if (code[end - 1] !== ">") {
             return end;
         }
-        const index = code.lastIndexOf("</", end);
-        if (index >= 0 && code.slice(index, end).trim() === parent.name) {
+        const index = code.lastIndexOf("</", end - 1);
+        if (index >= 0 &&
+            code.slice(index + 2, end - 1).trim() === parent.name) {
             return index;
         }
         return end;
     }
     else if (parent.type === "expression") {
-        const end = getExpressionEndOffset(parent, parents, ctx);
+        const end = getExpressionEndOffset(parent, ctx);
         return code.lastIndexOf("}", end);
     }
     else if (parent.type === "root") {
@@ -192,18 +193,16 @@ exports.getContentEndOffset = getContentEndOffset;
 /**
  * If the given tag is a self-close tag, get the self-closing tag.
  */
-function getSelfClosingTag(node, parents, ctx) {
-    const children = node.children.filter((c) => c.type !== "text" || c.value.trim());
-    if (children.length > 0) {
+function getSelfClosingTag(node, parent, ctx) {
+    if (node.children.length > 0) {
         return null;
     }
-    const parent = parents[0];
     const code = ctx.code;
     let nextElementIndex = code.length;
     const childIndex = parent.children.indexOf(node);
     if (childIndex === parent.children.length - 1) {
         // last
-        nextElementIndex = getContentEndOffset(parent, parents.slice(1), ctx);
+        nextElementIndex = getContentEndOffset(parent, ctx);
     }
     else {
         const next = parent.children[childIndex + 1];
@@ -223,11 +222,11 @@ exports.getSelfClosingTag = getSelfClosingTag;
 /**
  * If the given tag has a end tag, get the end tag.
  */
-function getEndTag(node, parents, ctx) {
+function getEndTag(node, ctx) {
     let beforeIndex;
     if (node.children.length) {
         const lastChild = node.children[node.children.length - 1];
-        beforeIndex = getEndOffset(lastChild, [node, ...parents], ctx);
+        beforeIndex = getEndOffset(lastChild, ctx);
     }
     else {
         beforeIndex = getStartTagEndOffset(node, ctx);
@@ -249,15 +248,15 @@ exports.getEndTag = getEndTag;
 /**
  * Get end offset of tag
  */
-function getEndOffset(node, parents, ctx) {
+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, parents, ctx);
+        return getTagEndOffset(node, ctx);
     if (node.type === "expression")
-        return getExpressionEndOffset(node, parents, ctx);
+        return getExpressionEndOffset(node, ctx);
     if (node.type === "comment")
         return getCommentEndOffset(node, ctx);
     if (node.type === "frontmatter") {

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

@@ -219,19 +219,20 @@ function fixLocations(node, ctx) {
             if (attributes[attributes.length - 1] === node) {
                 start = (0, astro_1.getStartTagEndOffset)(parent, ctx);
             }
-            return;
         }
-        if (node.type === "expression") {
+        else if (node.type === "expression") {
             start = tokenIndex(ctx, "}", start) + 1;
         }
         else if (node.type === "fragment" ||
             node.type === "element" ||
             node.type === "component" ||
             node.type === "custom-element") {
-            const closeTagStart = tokenIndexSafe(ctx.code, `</${node.name}`, start);
-            if (closeTagStart != null) {
-                start = closeTagStart + 2 + node.name.length;
-                start = tokenIndex(ctx, ">", start) + 1;
+            if (!(0, astro_1.getSelfClosingTag)(node, parent, ctx)) {
+                const closeTagStart = tokenIndexSafe(ctx.code, `</${node.name}`, start);
+                if (closeTagStart != null) {
+                    start = closeTagStart + 2 + node.name.length;
+                    start = tokenIndex(ctx, ">", start) + 1;
+                }
             }
         }
         else {

package/lib/parser/process-template.js

@@ -19,7 +19,7 @@ function processTemplate(ctx, resultTemplate) {
     }
     (0, astro_1.walkElements)(resultTemplate.ast, ctx.code, 
     // eslint-disable-next-line complexity -- X(
-    (node, parents) => {
+    (node, [parent]) => {
         if (node.type === "frontmatter") {
             const start = node.position.start.offset;
             script.appendOriginal(start);
@@ -50,7 +50,6 @@ function processTemplate(ctx, resultTemplate) {
         }
         else if ((0, astro_1.isTag)(node)) {
             // Process for multiple tag
-            const parent = parents[0];
             if (parent.type === "expression") {
                 const index = parent.children.indexOf(node);
                 const before = parent.children[index - 1];
@@ -182,7 +181,7 @@ function processTemplate(ctx, resultTemplate) {
                 }
             }
             // Process for start tag close
-            const closing = (0, astro_1.getSelfClosingTag)(node, parents, ctx);
+            const closing = (0, astro_1.getSelfClosingTag)(node, parent, ctx);
             if (closing && closing.end === ">") {
                 script.appendOriginal(closing.offset - 1);
                 script.appendScript("/");
@@ -298,13 +297,13 @@ function processTemplate(ctx, resultTemplate) {
             });
             script.addToken("HTMLDocType", [start, end]);
         }
-    }, (node, parents) => {
+    }, (node, [parent]) => {
         if ((0, astro_1.isTag)(node)) {
-            const closing = (0, astro_1.getSelfClosingTag)(node, parents, ctx);
+            const closing = (0, astro_1.getSelfClosingTag)(node, parent, ctx);
             if (!closing) {
-                const end = (0, astro_1.getEndTag)(node, parents, ctx);
+                const end = (0, astro_1.getEndTag)(node, ctx);
                 if (!end) {
-                    const offset = (0, astro_1.getContentEndOffset)(node, parents, ctx);
+                    const offset = (0, astro_1.getContentEndOffset)(node, ctx);
                     script.appendOriginal(offset);
                     script.appendScript(`</${node.name}>`);
                     script.addRestoreNodeProcess((scriptNode, _result, parent) => {
@@ -321,7 +320,6 @@ function processTemplate(ctx, resultTemplate) {
             }
         }
         // Process for multiple tag
-        const parent = parents[0];
         if (((0, astro_1.isTag)(node) || node.type === "comment") &&
             parent.type === "expression") {
             const index = parent.children.indexOf(node);
@@ -331,7 +329,7 @@ function processTemplate(ctx, resultTemplate) {
                 if (before &&
                     ((0, astro_1.isTag)(before) || before.type === "comment")) {
                     const end = (0, astro_1.isTag)(node)
-                        ? (0, astro_1.getTagEndOffset)(node, parents, ctx)
+                        ? (0, astro_1.getTagEndOffset)(node, ctx)
                         : (0, astro_1.getCommentEndOffset)(node, ctx);
                     script.appendOriginal(end);
                     script.appendScript("</>");

package/lib/parser/script.js

@@ -30,7 +30,9 @@ function parseScript(code, ctx) {
         return { ast: result };
     }
     catch (e) {
-        (0, debug_1.debug)("[script] parsing error:", e.message, `@ ${JSON.stringify(code)}`);
+        (0, debug_1.debug)("[script] parsing error:", e.message, `@ ${JSON.stringify(code)}
+
+${code}`);
         throw e;
     }
     finally {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "astro-eslint-parser",
-    "version": "0.0.14",
+    "version": "0.0.15",
     "description": "Astro parser for ESLint",
     "main": "lib/index.js",
     "files": [
@@ -19,7 +19,7 @@
         "cover": "nyc --reporter=lcov npm run test",
         "debug": "mocha --require ts-node/register/transpile-only \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
         "preversion": "npm run lint && npm test",
-        "update-fixtures": "ts-node --transpile-only ./tools/update-fixtures.ts",
+        "update-fixtures": "DEBUG='astro-eslint-parser' ts-node --transpile-only ./tools/update-fixtures.ts",
         "debug-parser": "ts-node --transpile-only ./tools/parser-test.ts",
         "eslint-playground": "eslint tests/fixtures --ext .astro --config .eslintrc-for-playground.js --format codeframe",
         "benchmark": "ts-node --transpile-only benchmark/index.ts"