@markuplint/astro-parser 3.6.1 → 3.6.2

package/lib/astro-parser.d.ts

@@ -1,3 +1,11 @@
 import type { RootNode } from '@astrojs/compiler/shared/ast';
-export type { RootNode, ElementNode, CustomElementNode, ComponentNode, FragmentNode, AttributeNode, Node, } from '@astrojs/compiler/shared/ast';
+export type {
+	RootNode,
+	ElementNode,
+	CustomElementNode,
+	ComponentNode,
+	FragmentNode,
+	AttributeNode,
+	Node,
+} from '@astrojs/compiler/shared/ast';
 export declare function astroParse(code: string): RootNode;

package/lib/attr-tokenizer.d.ts

@@ -1,3 +1,9 @@
 import type { AttributeNode } from './astro-parser';
 import type { MLASTHTMLAttr } from '@markuplint/ml-ast';
-export declare function attrTokenizer(attr: AttributeNode, nextAttr: AttributeNode | null, rawHtml: string, startTag: string, startTagEndOffset: number): MLASTHTMLAttr;
+export declare function attrTokenizer(
+	attr: AttributeNode,
+	nextAttr: AttributeNode | null,
+	rawHtml: string,
+	startTag: string,
+	startTagEndOffset: number,
+): MLASTHTMLAttr;

package/lib/parse.js

@@ -233,25 +233,42 @@ nextNode, offset, options) {
     if (!originNode.position) {
         throw new TypeError("Node doesn't have position");
     }
+    let startTagRaw;
     let childrenStart;
     let childrenEnd;
     if (originNode.children[0]) {
         childrenStart = ((_c = (_b = (_a = originNode.children[0].position) === null || _a === void 0 ? void 0 : _a.start) === null || _b === void 0 ? void 0 : _b.offset) !== null && _c !== void 0 ? _c : 0) + offset;
         childrenEnd = ((_g = (_f = (_e = (_d = originNode.children[originNode.children.length - 1]) === null || _d === void 0 ? void 0 : _d.position) === null || _e === void 0 ? void 0 : _e.end) === null || _f === void 0 ? void 0 : _f.offset) !== null && _g !== void 0 ? _g : 0) + offset;
+        const startTagStartOffset = originNode.position.start.offset + offset;
+        const startTagEndOffset = childrenStart;
+        startTagRaw = rawHtml.slice(startTagStartOffset, startTagEndOffset);
     }
     else {
         childrenStart = offset + ((_k = (_j = (_h = originNode.position.end) === null || _h === void 0 ? void 0 : _h.offset) !== null && _j !== void 0 ? _j : nextNode === null || nextNode === void 0 ? void 0 : nextNode.endOffset) !== null && _k !== void 0 ? _k : rawHtml.length - offset);
         childrenEnd = childrenStart;
         const startTagStartOffset = originNode.position.start.offset + offset;
-        const startTagEndOffset = childrenStart;
-        const tag = rawHtml.slice(startTagStartOffset, startTagEndOffset);
+        let startTagEndOffset = childrenStart;
+        startTagRaw = rawHtml.slice(startTagStartOffset, startTagEndOffset);
         const expectedCloseTag = `</${originNode.name}>`;
-        if (tag.includes(expectedCloseTag)) {
+        if (startTagRaw.includes(expectedCloseTag)) {
             childrenStart -= expectedCloseTag.length;
             childrenEnd = childrenStart;
+            startTagRaw = startTagRaw.replace(expectedCloseTag, '');
+        }
+        else {
+            let startTagRawMasked = startTagRaw;
+            for (const attr of originNode.attributes) {
+                startTagRawMasked = startTagRawMasked.replace(attr.value, ' '.repeat(attr.value.length));
+            }
+            const closeChars = '>';
+            const closeOffset = startTagRawMasked.indexOf(closeChars) + closeChars.length;
+            startTagEndOffset = startTagStartOffset + closeOffset;
+            startTagRaw = rawHtml.slice(startTagStartOffset, startTagEndOffset);
         }
         // console.log({
-        // 	tag,
+        // 	originNode,
+        // 	attrs: originNode.attributes,
+        // 	startTagRaw,
         // 	startTagStartOffset,
         // 	startTagEndOffset,
         // 	expectedCloseTag,
@@ -259,9 +276,6 @@ nextNode, offset, options) {
         // 	childrenEnd,
         // });
     }
-    const startTagStartOffset = originNode.position.start.offset + offset;
-    const startTagEndOffset = childrenStart;
-    const startTagRaw = rawHtml.slice(startTagStartOffset, startTagEndOffset);
     const tagTokens = (0, html_parser_1.parseRawTag)(startTagRaw, startLine, startCol, startOffset);
     const tagName = tagTokens.tagName;
     let endTag = null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/astro-parser",
-	"version": "3.6.1",
+	"version": "3.6.2",
 	"description": "astro parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -26,5 +26,5 @@
 		"astro-eslint-parser": "^0.13.2",
 		"tslib": "^2.4.1"
 	},
-	"gitHead": "3cdf5a088b2da03773d5d4461d0e65ec32290a00"
+	"gitHead": "884e8dbf60ec2a350761d5cda3cdc0725881b9dc"
 }