@markuplint/astro-parser 3.0.0-alpha.6 → 3.0.0-dev.176

package/README.md

@@ -1,12 +1,12 @@
 # @markuplint/astro-parser
 
 [![npm version](https://badge.fury.io/js/%40markuplint%2Fastro-parser.svg)](https://www.npmjs.com/package/@markuplint/astro-parser)
-[![Build Status](https://travis-ci.org/markuplint/markuplint.svg?branch=main)](https://travis-ci.org/markuplint/markuplint)
-[![Coverage Status](https://coveralls.io/repos/github/markuplint/markuplint/badge.svg?branch=main)](https://coveralls.io/github/markuplint/markuplint?branch=main)
+
+Use **markuplint** with [**Astro**](https://astro.build/).
 
 ## Install
 
-```sh
+```shell
 $ npm install -D @markuplint/astro-parser
 
 $ yarn add -D @markuplint/astro-parser
@@ -14,7 +14,7 @@ $ yarn add -D @markuplint/astro-parser
 
 ## Usage
 
-Add `parser` option into your [configuration file](https://markuplint.dev/configuration#parser).
+Add `parser` option to your [configuration](https://markuplint.dev/configuration/#properties/parser).
 
 ```json
 {

package/lib/astro-parser.d.ts

@@ -1,11 +1,11 @@
-import type { Attribute, Style, TemplateNode } from '@astrojs/parser';
-import { CompileError as AstroCompileError } from '@astrojs/parser';
-export { CompileError as AstroCompileError } from '@astrojs/parser';
-export type ASTNode = TemplateNode;
-export type ASTStyleNode = Style;
-export type ASTAttribute = Attribute;
-export type AstroAST = {
-	html?: ASTNode;
-	style?: ASTStyleNode[];
-};
-export declare function astroParse(code: string): AstroAST | AstroCompileError;
+import type { RootNode } 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/astro-parser.js

@@ -1,22 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.astroParse = exports.AstroCompileError = void 0;
-const parser_1 = require("@astrojs/parser");
-var parser_2 = require("@astrojs/parser");
-Object.defineProperty(exports, "AstroCompileError", { enumerable: true, get: function () { return parser_2.CompileError; } });
+exports.astroParse = void 0;
+const parser_utils_1 = require("@markuplint/parser-utils");
+const astro_eslint_parser_1 = require("astro-eslint-parser");
 function astroParse(code) {
-    try {
-        const ast = (0, parser_1.parse)(code, {});
-        return {
-            html: ast.html,
-            style: ast.css,
-        };
-    }
-    catch (e) {
-        if (e instanceof parser_1.CompileError) {
-            return e;
-        }
-        throw e;
+    const { result } = (0, astro_eslint_parser_1.parseTemplate)(code);
+    if (result.diagnostics[0]) {
+        const error = result.diagnostics[0];
+        throw new parser_utils_1.ParserError(error.text, {
+            line: error.location.line,
+            col: error.location.column,
+        });
     }
+    return result.ast;
 }
 exports.astroParse = astroParse;

package/lib/attr-tokenizer.d.ts

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

package/lib/attr-tokenizer.js

@@ -2,78 +2,61 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.attrTokenizer = void 0;
 const parser_utils_1 = require("@markuplint/parser-utils");
-function attrTokenizer(attr, rawHtml, codeOffset) {
-    var _a, _b, _c, _d, _e, _f;
-    const { raw, startOffset } = (0, parser_utils_1.sliceFragment)(rawHtml, attr.start + codeOffset, attr.end + codeOffset);
-    const isDynamicValue = ((_b = (_a = attr.value) === null || _a === void 0 ? void 0 : _a.some) === null || _b === void 0 ? void 0 : _b.call(_a, v => {
-        // @ts-ignore
-        return v.type === 'MustacheTag';
-    })) || undefined;
-    const attrToken = (0, parser_utils_1.createTokenFromRawCode)(raw, startOffset, rawHtml);
-    const beforeCode = rawHtml.slice(0, attrToken.startOffset);
-    const beforeAttrMatched = beforeCode.match(/\s+$/m);
-    const beforeAttrChar = (beforeAttrMatched === null || beforeAttrMatched === void 0 ? void 0 : beforeAttrMatched[0]) || '';
-    const spacesBeforeName = (0, parser_utils_1.createTokenFromRawCode)(beforeAttrChar, attrToken.startOffset - beforeAttrChar.length, rawHtml);
-    const name = (0, parser_utils_1.createTokenFromRawCode)(attr.name, spacesBeforeName.endOffset, rawHtml);
-    let rawValue;
-    let rawValueStart;
-    if (
-    //
-    !attr.value ||
-        // @ts-ignore
-        attr.value === true ||
-        //
-        attr.value.length === 0) {
-        rawValue = '';
-        rawValueStart = name.endOffset;
+const mustacheTag = {
+    start: '{',
+    end: '}',
+};
+function attrTokenizer(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+attr, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+nextAttr, rawHtml, startTag, startTagEndOffset) {
+    var _a, _b, _c;
+    if (!attr.position) {
+        throw new TypeError("Attr doesn't have position");
     }
-    else if (isDynamicValue) {
-        rawValue = attr.value[0].expression.codeChunks.join('');
-        rawValueStart = attr.value[0].expression.start;
+    if (attr.position.end) {
+        throw new TypeError('Node may is an attribute because it has end position');
+    }
+    let nextAttrBeforeSpaceOffset;
+    if (nextAttr) {
+        if (!nextAttr.position) {
+            throw new TypeError("NextAttr doesn't have position");
+        }
+        if (nextAttr.position.end) {
+            throw new TypeError('NextAttr Node may is an attribute because it has end position');
+        }
+        nextAttrBeforeSpaceOffset = (0, parser_utils_1.getSpaceBefore)(nextAttr.position.start.offset, rawHtml).startOffset;
     }
     else {
-        rawValue = attr.value[0].raw;
-        rawValueStart = attr.value[0].start;
+        const close = (_b = (_a = /(\/?>)$/.exec(startTag)) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : '';
+        nextAttrBeforeSpaceOffset = startTagEndOffset - close.length;
+    }
+    const { raw, startOffset } = (0, parser_utils_1.sliceFragment)(rawHtml, attr.position.start.offset, nextAttrBeforeSpaceOffset);
+    const result = (0, parser_utils_1.parseAttr)(raw, startOffset, rawHtml, {
+        valueDelimiters: [...parser_utils_1.defaultValueDelimiters, mustacheTag],
+    });
+    if (result.startQuote.raw === mustacheTag.start) {
+        result.isDynamicValue = true;
+    }
+    /**
+     * Detects Template Directive
+     *
+     * @see https://docs.astro.build/en/reference/directives-reference/
+     */
+    const [, directive] = (_c = result.name.raw.match(/^([^:]+):([^:]+)$/)) !== null && _c !== void 0 ? _c : [];
+    if (directive) {
+        const lowerCaseDirectiveName = directive.toLowerCase();
+        switch (lowerCaseDirectiveName) {
+            case 'class': {
+                result.potentialName = lowerCaseDirectiveName;
+                break;
+            }
+            default: {
+                result.isDirective = true;
+            }
+        }
     }
-    const value = (0, parser_utils_1.createTokenFromRawCode)(rawValue, rawValueStart + codeOffset, rawHtml);
-    const eq = (0, parser_utils_1.sliceFragment)(rawHtml, name.endOffset, value.startOffset);
-    const eqRegexp = /^(?<bs>\s*)(?<eq>=)(?<as>\s*)(?<squot>"|'|{)?$/g;
-    const exp = eqRegexp.exec(eq.raw);
-    const bsChar = ((_c = exp === null || exp === void 0 ? void 0 : exp.groups) === null || _c === void 0 ? void 0 : _c.bs) || '';
-    const eqChar = ((_d = exp === null || exp === void 0 ? void 0 : exp.groups) === null || _d === void 0 ? void 0 : _d.eq) || '';
-    const asChar = ((_e = exp === null || exp === void 0 ? void 0 : exp.groups) === null || _e === void 0 ? void 0 : _e.as) || '';
-    const squotChar = ((_f = exp === null || exp === void 0 ? void 0 : exp.groups) === null || _f === void 0 ? void 0 : _f.squot) || '';
-    const spacesBeforeEqual = (0, parser_utils_1.createTokenFromRawCode)(bsChar, name.endOffset, rawHtml);
-    const equal = (0, parser_utils_1.createTokenFromRawCode)(eqChar, spacesBeforeEqual.endOffset, rawHtml);
-    const spacesAfterEqual = (0, parser_utils_1.createTokenFromRawCode)(asChar, equal.endOffset, rawHtml);
-    const startQuote = (0, parser_utils_1.createTokenFromRawCode)(squotChar, spacesAfterEqual.endOffset, rawHtml);
-    const endQuote = (0, parser_utils_1.createTokenFromRawCode)(squotChar === '{' ? '}' : squotChar, value.endOffset, rawHtml);
-    return {
-        type: 'html-attr',
-        uuid: (0, parser_utils_1.uuid)(),
-        raw: attrToken.raw,
-        startOffset: attrToken.startOffset,
-        endOffset: attrToken.endOffset,
-        startLine: attrToken.startLine,
-        endLine: attrToken.endLine,
-        startCol: attrToken.startCol,
-        endCol: attrToken.endCol,
-        spacesBeforeName,
-        name,
-        spacesBeforeEqual,
-        equal,
-        spacesAfterEqual,
-        startQuote,
-        value,
-        endQuote,
-        isDuplicatable: false,
-        isDynamicValue,
-        nodeName: name.raw,
-        parentNode: null,
-        nextNode: null,
-        prevNode: null,
-        isFragment: false,
-        isGhost: false,
-    };
+    return result;
 }
 exports.attrTokenizer = attrTokenizer;

package/lib/parse.js

@@ -5,52 +5,42 @@ const html_parser_1 = require("@markuplint/html-parser");
 const parser_utils_1 = require("@markuplint/parser-utils");
 const astro_parser_1 = require("./astro-parser");
 const attr_tokenizer_1 = require("./attr-tokenizer");
-const parse = (rawCode, options) => {
+const parse = (rawCode, options = {}) => {
+    var _a, _b;
     const ast = (0, astro_parser_1.astroParse)(rawCode);
-    if (ast instanceof astro_parser_1.AstroCompileError) {
-        return {
-            nodeList: [],
-            isFragment: true,
-            parseError: ast.stack || ast.message,
-        };
-    }
-    if (!ast.html) {
-        return {
-            nodeList: [],
-            isFragment: false,
-        };
-    }
-    const htmlRawNodeList = traverse(ast.html, null, 'http://www.w3.org/1999/xhtml', rawCode);
-    if (ast.style) {
-        const styleNodes = parseStyle(ast.style, 'http://www.w3.org/1999/xhtml', rawCode, 0, options);
-        htmlRawNodeList.push(...styleNodes);
-    }
-    const nodeList = (0, html_parser_1.flattenNodes)(htmlRawNodeList, rawCode);
-    // Remove `</template>`
-    const templateEndTagIndex = nodeList.findIndex(node => /\s*<\/\s*template\s*>\s*/i.test(node.raw));
-    if (templateEndTagIndex !== -1) {
-        const templateEndTag = nodeList[templateEndTagIndex];
-        for (const node of nodeList) {
-            if (node.nextNode && node.nextNode.uuid === templateEndTag.uuid) {
-                node.nextNode = null;
-            }
-        }
-        nodeList.splice(templateEndTagIndex, 1);
+    const htmlRawNodeList = traverse(ast, null, 'http://www.w3.org/1999/xhtml', rawCode, 0, options);
+    const firstOffset = (_b = (_a = htmlRawNodeList[0]) === null || _a === void 0 ? void 0 : _a.startOffset) !== null && _b !== void 0 ? _b : 0;
+    if (firstOffset > 0) {
+        const head = rawCode.slice(0, firstOffset);
+        const ast = (0, html_parser_1.parse)(head, {
+            ...options,
+            ignoreFrontMatter: true,
+        });
+        const headNodes = ast.nodeList.filter(node => {
+            return !node.isGhost;
+        });
+        htmlRawNodeList.unshift(...headNodes);
     }
+    const nodeList = (0, parser_utils_1.flattenNodes)(htmlRawNodeList, rawCode);
     return {
         nodeList,
         isFragment: true,
     };
 };
 exports.parse = parse;
-function traverse(rootNode, parentNode = null, scopeNS, rawHtml, offset, options) {
+function traverse(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+rootNode, parentNode = null, scopeNS, rawHtml, offset, options, inExpression) {
     const nodeList = [];
-    if (!rootNode.children) {
+    if (!('children' in rootNode)) {
+        return nodeList;
+    }
+    if (rootNode.children.length === 0) {
         return nodeList;
     }
     let prevNode = null;
     for (const astNode of rootNode.children) {
-        const node = nodeize(astNode, prevNode, parentNode, scopeNS, rawHtml, offset, options);
+        const node = nodeize(astNode, prevNode, parentNode, scopeNS, rawHtml, offset, options, inExpression);
         if (!node) {
             continue;
         }
@@ -68,22 +58,34 @@ function traverse(rootNode, parentNode = null, scopeNS, rawHtml, offset, options
     }
     return nodeList;
 }
-function nodeize(originNode, prevNode, parentNode, scopeNS, rawHtml, offset = 0, options) {
-    var _a, _b;
+function nodeize(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+originNode, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+prevNode, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+parentNode, scopeNS, rawHtml, offset = 0, options, inExpression) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    if (!originNode.position) {
+        throw new TypeError("Node doesn't have position");
+    }
     const nextNode = null;
-    const startOffset = originNode.start + offset;
-    const endOffset = originNode.end + offset;
+    const startOffset = originNode.position.start.offset + offset;
+    const endOffset = ((_b = (_a = originNode.position.end) === null || _a === void 0 ? void 0 : _a.offset) !== null && _b !== void 0 ? _b : originNode.position.start.offset) + offset;
     const { startLine, endLine, startCol, endCol, raw } = (0, parser_utils_1.sliceFragment)(rawHtml, startOffset, endOffset);
     if (scopeNS === 'http://www.w3.org/1999/xhtml' &&
-        originNode.type === 'Element' &&
-        ((_a = originNode.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'svg') {
+        originNode.type === 'element' &&
+        ((_c = originNode.name) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === 'svg') {
         scopeNS = 'http://www.w3.org/2000/svg';
     }
     else if (scopeNS === 'http://www.w3.org/2000/svg' && parentNode && parentNode.nodeName === 'foreignObject') {
         scopeNS = 'http://www.w3.org/1999/xhtml';
     }
     switch (originNode.type) {
-        case 'Text': {
+        case 'text': {
+            if (inExpression) {
+                return null;
+            }
             const node = {
                 uuid: (0, parser_utils_1.uuid)(),
                 raw,
@@ -103,18 +105,36 @@ function nodeize(originNode, prevNode, parentNode, scopeNS, rawHtml, offset = 0,
             };
             return node;
         }
-        case 'MustacheTag': {
-            if (!originNode.expression.children || originNode.expression.children.length === 0) {
-                return {
+        case 'expression': {
+            let _endOffset = endOffset;
+            let _startLine = startLine;
+            let _endLine = endLine;
+            let _startCol = startCol;
+            let _endCol = endCol;
+            let _raw = raw;
+            let closeExpression = null;
+            const firstChild = originNode.children[0];
+            const lastChild = originNode.children[originNode.children.length - 1];
+            if (firstChild && lastChild && firstChild !== lastChild) {
+                _endOffset = (_f = (_e = (_d = firstChild.position) === null || _d === void 0 ? void 0 : _d.end) === null || _e === void 0 ? void 0 : _e.offset) !== null && _f !== void 0 ? _f : endOffset;
+                const startLoc = (0, parser_utils_1.sliceFragment)(rawHtml, startOffset, _endOffset);
+                _startLine = startLoc.startLine;
+                _endLine = startLoc.endLine;
+                _startCol = startLoc.startCol;
+                _endCol = startLoc.endCol;
+                _raw = startLoc.raw;
+                const closeStartOffset = (_h = (_g = lastChild.position) === null || _g === void 0 ? void 0 : _g.start.offset) !== null && _h !== void 0 ? _h : startOffset;
+                const closeLoc = (0, parser_utils_1.sliceFragment)(rawHtml, closeStartOffset, endOffset);
+                closeExpression = {
                     uuid: (0, parser_utils_1.uuid)(),
-                    raw,
-                    startOffset,
-                    endOffset,
-                    startLine,
-                    endLine,
-                    startCol,
-                    endCol,
-                    nodeName: originNode.type,
+                    raw: closeLoc.raw,
+                    startOffset: closeStartOffset,
+                    endOffset: closeLoc.endOffset,
+                    startLine: closeLoc.startLine,
+                    endLine: closeLoc.endLine,
+                    startCol: closeLoc.startCol,
+                    endCol: closeLoc.endCol,
+                    nodeName: 'MustacheTag',
                     type: 'psblock',
                     parentNode,
                     prevNode,
@@ -123,53 +143,32 @@ function nodeize(originNode, prevNode, parentNode, scopeNS, rawHtml, offset = 0,
                     isGhost: false,
                 };
             }
-            // console.log(originNode, originNode.expression);
-            let stub = raw;
-            const blocks = [];
-            const [, codeStart, , codeEnd] = raw.match(/(^{\s*)((?:.|\s)*)(}$)/m) || [];
-            const chunks = originNode.expression.codeChunks.map((chunk, i) => {
-                if (i === 0) {
-                    return `${codeStart}${chunk}`;
-                }
-                else if (i === originNode.expression.codeChunks.length - 1) {
-                    return `${chunk}${codeEnd}`;
-                }
-                return chunk;
-            });
-            for (const chunk of chunks) {
-                const i = stub.indexOf(chunk);
-                if (i === -1) {
-                    throw new Error(`Invalid chunk: "${chunk}" from ${raw}`);
-                }
-                const prevBlock = blocks[blocks.length - 1];
-                const prevBlockEndOffset = prevBlock ? prevBlock.endOffset : originNode.start;
-                const loc = (0, parser_utils_1.sliceFragment)(rawHtml, prevBlockEndOffset + i, prevBlockEndOffset + i + chunk.length);
-                blocks.push({
-                    uuid: (0, parser_utils_1.uuid)(),
-                    raw: chunk,
-                    startOffset: loc.startOffset,
-                    endOffset: loc.endOffset,
-                    startLine: loc.startLine,
-                    endLine: loc.endLine,
-                    startCol: loc.startCol,
-                    endCol: loc.endCol,
-                    nodeName: originNode.type,
-                    type: 'psblock',
-                    parentNode,
-                    prevNode,
-                    nextNode,
-                    isFragment: false,
-                    isGhost: false,
-                });
-                stub = stub.slice(i + chunk.length);
+            const node = {
+                uuid: (0, parser_utils_1.uuid)(),
+                raw: _raw,
+                startOffset,
+                endOffset: _endOffset,
+                startLine: _startLine,
+                endLine: _endLine,
+                startCol: _startCol,
+                endCol: _endCol,
+                nodeName: 'MustacheTag',
+                type: 'psblock',
+                parentNode,
+                prevNode,
+                nextNode,
+                isFragment: false,
+                isGhost: false,
+            };
+            if (originNode.children.length > 0) {
+                node.childNodes = traverse(originNode, parentNode, scopeNS, rawHtml, offset, options, true);
             }
-            if (blocks[0]) {
-                const childNodes = traverse(originNode.expression, blocks[0], scopeNS, rawHtml, blocks[0].endOffset);
-                blocks[0].childNodes = childNodes;
+            if (closeExpression) {
+                return [node, closeExpression];
             }
-            return blocks;
+            return node;
         }
-        case 'Comment': {
+        case 'comment': {
             return {
                 uuid: (0, parser_utils_1.uuid)(),
                 raw,
@@ -188,9 +187,11 @@ function nodeize(originNode, prevNode, parentNode, scopeNS, rawHtml, offset = 0,
                 isGhost: false,
             };
         }
-        case 'InlineComponent':
-        case 'Element': {
-            if (((_b = originNode.name) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === '!doctype') {
+        case 'component':
+        case 'custom-element':
+        case 'fragment':
+        case 'element': {
+            if (((_j = originNode.name) === null || _j === void 0 ? void 0 : _j.toLowerCase()) === '!doctype') {
                 return {
                     uuid: (0, parser_utils_1.uuid)(),
                     raw,
@@ -212,46 +213,74 @@ function nodeize(originNode, prevNode, parentNode, scopeNS, rawHtml, offset = 0,
                     isGhost: false,
                 };
             }
-            return parseElement(originNode.name, originNode, scopeNS, rawHtml, startLine, startCol, startOffset, parentNode, prevNode, nextNode, offset, options);
-        }
-        case 'Fragment': {
-            return originNode.children ? traverse(originNode, parentNode, scopeNS, rawHtml, offset) : null;
+            return parseElement(originNode, scopeNS, rawHtml, startLine, startCol, startOffset, parentNode, prevNode, nextNode, offset, options);
         }
         default: {
             return null;
         }
     }
 }
-function parseElement(nodeName, originNode, scopeNS, rawHtml, startLine, startCol, startOffset, parentNode, prevNode, nextNode, offset, options) {
-    const { raw } = (0, parser_utils_1.sliceFragment)(rawHtml, originNode.start + offset, originNode.end + offset);
+function parseElement(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+originNode, scopeNS, rawHtml, startLine, startCol, startOffset, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+parentNode, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+prevNode, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+nextNode, offset, options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    if (!originNode.position) {
+        throw new TypeError("Node doesn't have position");
+    }
+    let startTagRaw;
     let childrenStart;
     let childrenEnd;
-    if (originNode.children && originNode.children[0]) {
-        childrenStart = originNode.children[0].start + offset;
-        childrenEnd = originNode.children[originNode.children.length - 1].end + offset;
-    }
-    else if (originNode.content) {
-        childrenStart = originNode.content.start + offset;
-        childrenEnd = originNode.content.end + offset;
-    }
-    else if (/\/>$/.test(raw)) {
-        childrenStart = originNode.end + offset;
-        childrenEnd = originNode.end + offset;
+    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 {
-        const expectedEndTag = `</${nodeName}>`;
-        const endTagStart = originNode.end + offset - expectedEndTag.length;
-        childrenStart = endTagStart;
-        childrenEnd = endTagStart;
+        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;
+        let startTagEndOffset = childrenStart;
+        startTagRaw = rawHtml.slice(startTagStartOffset, startTagEndOffset);
+        const expectedCloseTag = `</${originNode.name}>`;
+        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({
+        // 	originNode,
+        // 	attrs: originNode.attributes,
+        // 	startTagRaw,
+        // 	startTagStartOffset,
+        // 	startTagEndOffset,
+        // 	expectedCloseTag,
+        // 	childrenStart,
+        // 	childrenEnd,
+        // });
     }
-    const startTagStartOffset = originNode.start + 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;
-    if (childrenEnd < originNode.end + offset) {
-        const endTagLoc = (0, parser_utils_1.sliceFragment)(rawHtml, childrenEnd, originNode.end + offset);
+    if (childrenEnd < ((_m = (_l = originNode.position.end) === null || _l === void 0 ? void 0 : _l.offset) !== null && _m !== void 0 ? _m : 0) + offset) {
+        const endTagLoc = (0, parser_utils_1.sliceFragment)(rawHtml, childrenEnd, ((_p = (_o = originNode.position.end) === null || _o === void 0 ? void 0 : _o.offset) !== null && _p !== void 0 ? _p : 0) + offset);
         const endTagTokens = (0, html_parser_1.parseRawTag)(endTagLoc.raw, endTagLoc.startLine, endTagLoc.startCol, endTagLoc.startOffset);
         const endTagName = endTagTokens.tagName;
         endTag = {
@@ -290,7 +319,12 @@ function parseElement(nodeName, originNode, scopeNS, rawHtml, startLine, startCo
         type: 'starttag',
         namespace: scopeNS,
         elementType: (0, parser_utils_1.detectElementType)(tagName, options === null || options === void 0 ? void 0 : options.authoredElementName, /^[A-Z]|\./),
-        attributes: originNode.attributes.map((attr) => (0, attr_tokenizer_1.attrTokenizer)(attr, rawHtml, offset)),
+        attributes: originNode.attributes.map((
+        // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+        attr, i) => {
+            var _a;
+            return (0, attr_tokenizer_1.attrTokenizer)(attr, (_a = originNode.attributes[i + 1]) !== null && _a !== void 0 ? _a : null, rawHtml, startTagRaw, startOffset + startTagRaw.length);
+        }),
         hasSpreadAttr: false,
         parentNode,
         prevNode,
@@ -306,15 +340,8 @@ function parseElement(nodeName, originNode, scopeNS, rawHtml, startLine, startCo
     if (endTag) {
         endTag.pearNode = startTag;
     }
-    startTag.childNodes = traverse(originNode, startTag, scopeNS, rawHtml, offset);
+    startTag.childNodes = ['style', 'script'].includes(tagName)
+        ? undefined
+        : traverse(originNode, startTag, scopeNS, rawHtml, offset, options);
     return startTag;
 }
-function parseStyle(nodes, scopeNS, rawHtml, offset, options) {
-    const result = [];
-    for (const node of nodes) {
-        const { startLine, startCol, startOffset } = (0, parser_utils_1.sliceFragment)(rawHtml, node.start, node.end);
-        const styleEl = parseElement('style', node, scopeNS, rawHtml, startLine, startCol, startOffset, null, null, null, offset, options);
-        result.push(styleEl);
-    }
-    return result;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/astro-parser",
-	"version": "3.0.0-alpha.6",
+	"version": "3.0.0-dev.176+f6ad62e9",
 	"description": "astro parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -16,11 +16,12 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@astrojs/parser": "0.20",
-		"@markuplint/html-parser": "3.0.0-alpha.6",
-		"@markuplint/ml-ast": "3.0.0-alpha.6",
-		"@markuplint/parser-utils": "3.0.0-alpha.6",
-		"tslib": "^2.4.0"
+		"@astrojs/parser": "0.22.2",
+		"@markuplint/html-parser": "3.0.0-dev.176+f6ad62e9",
+		"@markuplint/ml-ast": "3.0.0-dev.176+f6ad62e9",
+		"@markuplint/parser-utils": "3.0.0-dev.176+f6ad62e9",
+		"astro-eslint-parser": "^0.13.2",
+		"tslib": "^2.4.1"
 	},
-	"gitHead": "b185a06d4ea09a1bf32458f7be4abe510eb57b89"
+	"gitHead": "f6ad62e992e1569be4067f1e90d2d6017a658f57"
 }