@markuplint/astro-parser 4.0.0-alpha.3 → 4.0.0-alpha.5

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2019 Yusuke Hirao
+Copyright (c) 2017-2023 Yusuke Hirao
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/parse.js

@@ -1,5 +1,5 @@
-import { parseRawTag, parse as htmlParse } from '@markuplint/html-parser';
-import { flattenNodes, detectElementType, getEndCol, getEndLine, sliceFragment, uuid } from '@markuplint/parser-utils';
+import { parse as htmlParse } from '@markuplint/html-parser';
+import { flattenNodes, detectElementType, getEndCol, getEndLine, sliceFragment, uuid, tagParser, } from '@markuplint/parser-utils';
 import { astroParse } from './astro-parser.js';
 import { attrTokenizer } from './attr-tokenizer.js';
 export const parse = (rawCode, options = {}) => {
@@ -108,7 +108,7 @@ parentNode, scopeNS, rawHtml, offset = 0, options, inExpression) {
             let _raw = raw;
             let closeExpression = null;
             const firstChild = originNode.children[0];
-            const lastChild = originNode.children[originNode.children.length - 1];
+            const lastChild = originNode.children.at(-1);
             if (firstChild && lastChild && firstChild !== lastChild) {
                 _endOffset = firstChild.position?.end?.offset ?? endOffset;
                 const startLoc = sliceFragment(rawHtml, startOffset, _endOffset);
@@ -231,7 +231,7 @@ nextNode, offset, options) {
     let childrenEnd;
     if (originNode.children[0]) {
         childrenStart = (originNode.children[0].position?.start?.offset ?? 0) + offset;
-        childrenEnd = (originNode.children[originNode.children.length - 1]?.position?.end?.offset ?? 0) + offset;
+        childrenEnd = (originNode.children.at(-1)?.position?.end?.offset ?? 0) + offset;
         const startTagStartOffset = originNode.position.start.offset + offset;
         const startTagEndOffset = childrenStart;
         startTagRaw = rawHtml.slice(startTagStartOffset, startTagEndOffset);
@@ -269,12 +269,12 @@ nextNode, offset, options) {
         // 	childrenEnd,
         // });
     }
-    const tagTokens = parseRawTag(startTagRaw, startLine, startCol, startOffset);
+    const tagTokens = tagParser(startTagRaw, startLine, startCol, startOffset);
     const tagName = tagTokens.tagName;
     let endTag = null;
     if (childrenEnd < (originNode.position.end?.offset ?? 0) + offset) {
         const endTagLoc = sliceFragment(rawHtml, childrenEnd, (originNode.position.end?.offset ?? 0) + offset);
-        const endTagTokens = parseRawTag(endTagLoc.raw, endTagLoc.startLine, endTagLoc.startCol, endTagLoc.startOffset);
+        const endTagTokens = tagParser(endTagLoc.raw, endTagLoc.startLine, endTagLoc.startCol, endTagLoc.startOffset);
         const endTagName = endTagTokens.tagName;
         endTag = {
             uuid: uuid(),
@@ -321,7 +321,7 @@ nextNode, offset, options) {
         nextNode,
         pearNode: endTag,
         selfClosingSolidus: tagTokens.selfClosingSolidus,
-        endSpace: tagTokens.endSpace,
+        endSpace: tagTokens.afterAttrSpaces,
         isFragment: false,
         isGhost: false,
         tagOpenChar: '<',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/astro-parser",
-	"version": "4.0.0-alpha.3",
+	"version": "4.0.0-alpha.5",
 	"description": "astro parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -22,11 +22,10 @@
 	},
 	"dependencies": {
 		"@astrojs/parser": "0.22.2",
-		"@markuplint/html-parser": "4.0.0-alpha.3",
-		"@markuplint/ml-ast": "4.0.0-alpha.3",
-		"@markuplint/parser-utils": "4.0.0-alpha.3",
-		"astro-eslint-parser": "^0.16.0",
-		"tslib": "^2.6.2"
+		"@markuplint/html-parser": "4.0.0-alpha.5",
+		"@markuplint/ml-ast": "4.0.0-alpha.5",
+		"@markuplint/parser-utils": "4.0.0-alpha.5",
+		"astro-eslint-parser": "^0.16.0"
 	},
-	"gitHead": "380836f7adc1ff7e8eaf9d869e68d29eee8f3b7e"
+	"gitHead": "0c3e4690662edf1765bcc4b6411ec5507c1e2ea3"
 }