@markuplint/astro-parser 3.3.1 → 3.5.0

package/lib/astro-parser.d.ts

@@ -5,7 +5,7 @@ export type ASTNode = TemplateNode;
 export type ASTStyleNode = Style;
 export type ASTAttribute = Attribute;
 export type AstroAST = {
-	html?: ASTNode;
-	style?: ASTStyleNode[];
+    html?: ASTNode;
+    style?: ASTStyleNode[];
 };
 export declare function astroParse(code: string): AstroAST | AstroCompileError;

package/lib/attr-tokenizer.js

@@ -2,8 +2,10 @@
 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;
+function attrTokenizer(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+attr, rawHtml, codeOffset) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     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
@@ -28,21 +30,21 @@ function attrTokenizer(attr, rawHtml, codeOffset) {
         rawValueStart = name.endOffset;
     }
     else if (isDynamicValue) {
-        rawValue = attr.value[0].expression.codeChunks.join('');
-        rawValueStart = attr.value[0].expression.start;
+        rawValue = (_d = (_c = attr.value[0]) === null || _c === void 0 ? void 0 : _c.expression.codeChunks.join('')) !== null && _d !== void 0 ? _d : '';
+        rawValueStart = (_f = (_e = attr.value[0]) === null || _e === void 0 ? void 0 : _e.expression.start) !== null && _f !== void 0 ? _f : name.endOffset;
     }
     else {
-        rawValue = attr.value[0].raw;
-        rawValueStart = attr.value[0].start;
+        rawValue = (_h = (_g = attr.value[0]) === null || _g === void 0 ? void 0 : _g.raw) !== null && _h !== void 0 ? _h : '';
+        rawValueStart = (_k = (_j = attr.value[0]) === null || _j === void 0 ? void 0 : _j.start) !== null && _k !== void 0 ? _k : name.endOffset;
     }
     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 bsChar = ((_l = exp === null || exp === void 0 ? void 0 : exp.groups) === null || _l === void 0 ? void 0 : _l.bs) || '';
+    const eqChar = ((_m = exp === null || exp === void 0 ? void 0 : exp.groups) === null || _m === void 0 ? void 0 : _m.eq) || '';
+    const asChar = ((_o = exp === null || exp === void 0 ? void 0 : exp.groups) === null || _o === void 0 ? void 0 : _o.as) || '';
+    const squotChar = ((_p = exp === null || exp === void 0 ? void 0 : exp.groups) === null || _p === void 0 ? void 0 : _p.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);

package/lib/index.d.ts

@@ -1,2 +1,2 @@
 export { parse } from './parse';
-export declare const endTag = 'xml';
+export declare const endTag = "xml";

package/lib/parse.js

@@ -25,13 +25,13 @@ const parse = (rawCode, options) => {
         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);
+    const nodeList = (0, parser_utils_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) {
+            if (node.nextNode && node.nextNode.uuid === (templateEndTag === null || templateEndTag === void 0 ? void 0 : templateEndTag.uuid)) {
                 node.nextNode = null;
             }
         }
@@ -43,7 +43,9 @@ const parse = (rawCode, options) => {
     };
 };
 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) {
     const nodeList = [];
     if (!rootNode.children) {
         return nodeList;
@@ -68,7 +70,13 @@ function traverse(rootNode, parentNode = null, scopeNS, rawHtml, offset, options
     }
     return nodeList;
 }
-function nodeize(originNode, prevNode, parentNode, scopeNS, rawHtml, offset = 0, options) {
+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) {
     var _a, _b;
     const nextNode = null;
     const startOffset = originNode.start + offset;
@@ -222,13 +230,22 @@ function nodeize(originNode, prevNode, parentNode, scopeNS, rawHtml, offset = 0,
         }
     }
 }
-function parseElement(nodeName, originNode, scopeNS, rawHtml, startLine, startCol, startOffset, parentNode, prevNode, nextNode, offset, options) {
+function parseElement(nodeName, 
+// 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;
     const { raw } = (0, parser_utils_1.sliceFragment)(rawHtml, originNode.start + offset, originNode.end + offset);
     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;
+        childrenEnd = ((_b = (_a = originNode.children[originNode.children.length - 1]) === null || _a === void 0 ? void 0 : _a.end) !== null && _b !== void 0 ? _b : 0) + offset;
     }
     else if (originNode.content) {
         childrenStart = originNode.content.start + offset;
@@ -290,7 +307,9 @@ 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) => (0, attr_tokenizer_1.attrTokenizer)(attr, rawHtml, offset)),
         hasSpreadAttr: false,
         parentNode,
         prevNode,
@@ -309,7 +328,9 @@ function parseElement(nodeName, originNode, scopeNS, rawHtml, startLine, startCo
     startTag.childNodes = traverse(originNode, startTag, scopeNS, rawHtml, offset);
     return startTag;
 }
-function parseStyle(nodes, scopeNS, rawHtml, offset, options) {
+function parseStyle(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+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);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/astro-parser",
-	"version": "3.3.1",
+	"version": "3.5.0",
 	"description": "astro parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -17,10 +17,10 @@
 	},
 	"dependencies": {
 		"@astrojs/parser": "0.20",
-		"@markuplint/html-parser": "3.3.1",
-		"@markuplint/ml-ast": "3.0.0",
-		"@markuplint/parser-utils": "3.3.0",
+		"@markuplint/html-parser": "3.5.0",
+		"@markuplint/ml-ast": "3.1.0",
+		"@markuplint/parser-utils": "3.5.0",
 		"tslib": "^2.4.1"
 	},
-	"gitHead": "f19e7de726cf01d53342bc5513c30da75d28da63"
+	"gitHead": "0c47b2c2722f6823a17f36edbab98486275f8ab4"
 }