@markuplint/astro-parser 4.6.22 → 5.0.0-alpha.0

package/lib/parser.js

@@ -1,21 +1,19 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _AstroParser_instances, _AstroParser_updateScopeNS;
 import { AttrState, Parser, ParserError } from '@markuplint/parser-utils';
 import { astroParse } from './astro-parser.js';
+import { detectBlockBehavior } from './detect-block-behavior.js';
+/**
+ * Parser implementation for Astro component templates.
+ * Extends the base Parser to handle Astro-specific syntax including frontmatter blocks,
+ * expression containers (`{}`), component/element/fragment types, Astro directives
+ * (e.g., `class:list`, `set:html`), and shorthand attributes.
+ */
 class AstroParser extends Parser {
     constructor() {
         super({
             endTagType: 'xml',
             selfCloseType: 'html+xml',
             tagNameCaseSensitive: true,
-        }, {
-            scopeNS: 'http://www.w3.org/1999/xhtml',
         });
-        _AstroParser_instances.add(this);
     }
     tokenize() {
         return {
@@ -23,16 +21,25 @@ class AstroParser extends Parser {
             isFragment: true,
         };
     }
+    /**
+     * Converts an Astro AST node into markuplint node tree items.
+     * Handles frontmatter, doctype, text, comment, component/element/fragment,
+     * and expression nodes.
+     *
+     * @param originNode - The Astro AST node to convert
+     * @param parentNode - The parent node in the markuplint tree, or null for root nodes
+     * @param depth - The nesting depth of the node
+     * @returns An array of markuplint node tree items
+     */
     nodeize(
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     originNode, parentNode, depth) {
         if (!originNode.position) {
             throw new TypeError("Node doesn't have position");
         }
-        const startOffset = originNode.position.start.offset;
+        const offset = originNode.position.start.offset;
         const endOffset = originNode.position.end?.offset;
-        const token = this.sliceFragment(startOffset, endOffset);
-        __classPrivateFieldGet(this, _AstroParser_instances, "m", _AstroParser_updateScopeNS).call(this, originNode, parentNode);
+        const token = this.sliceFragment(offset, endOffset);
         switch (originNode.type) {
             case 'frontmatter': {
                 return this.visitPsBlock({
@@ -85,34 +92,42 @@ class AstroParser extends Parser {
                 const firstChild = originNode.children.at(0);
                 const lastChild = originNode.children.at(-1);
                 let startExpressionRaw = token.raw;
-                let startExpressionStartLine = token.startLine;
-                let startExpressionStartCol = token.startCol;
+                let startExpressionStartLine = token.line;
+                let startExpressionStartCol = token.col;
                 const nodes = [];
+                let closeExpressionLocation = null;
                 if (firstChild && lastChild && firstChild !== lastChild) {
-                    const startExpressionEndOffset = firstChild.position?.end?.offset ?? endOffset ?? startOffset;
-                    const startExpressionLocation = this.sliceFragment(startOffset, startExpressionEndOffset);
+                    const startExpressionEndOffset = firstChild.position?.end?.offset ?? endOffset ?? offset;
+                    const startExpressionLocation = this.sliceFragment(offset, startExpressionEndOffset);
                     startExpressionRaw = startExpressionLocation.raw;
-                    startExpressionStartLine = startExpressionLocation.startLine;
-                    startExpressionStartCol = startExpressionLocation.startCol;
-                    const closeExpressionLocation = this.sliceFragment(lastChild.position?.start.offset ?? startOffset, endOffset);
-                    nodes.push(...this.visitPsBlock({
-                        ...closeExpressionLocation,
-                        depth,
-                        parentNode,
-                        nodeName: 'MustacheTag',
-                        isFragment: false,
-                    }));
+                    startExpressionStartLine = startExpressionLocation.line;
+                    startExpressionStartCol = startExpressionLocation.col;
+                    closeExpressionLocation = this.sliceFragment(lastChild.position?.start.offset ?? offset, endOffset);
                 }
+                const blockBehavior = detectBlockBehavior(startExpressionRaw);
                 nodes.push(...this.visitPsBlock({
                     raw: startExpressionRaw,
-                    startOffset,
-                    startLine: startExpressionStartLine,
-                    startCol: startExpressionStartCol,
+                    offset,
+                    line: startExpressionStartLine,
+                    col: startExpressionStartCol,
                     depth,
                     parentNode,
                     nodeName: 'MustacheTag',
                     isFragment: true,
-                }, originNode.children));
+                }, originNode.children, blockBehavior), ...(closeExpressionLocation
+                    ? this.visitPsBlock({
+                        ...closeExpressionLocation,
+                        depth,
+                        parentNode,
+                        nodeName: 'MustacheTag',
+                        isFragment: false,
+                    }, [], blockBehavior
+                        ? {
+                            type: 'end',
+                            expression: closeExpressionLocation.raw,
+                        }
+                        : undefined)
+                    : []));
                 return nodes;
             }
             default: {
@@ -125,6 +140,15 @@ class AstroParser extends Parser {
             exposeInvalidNode: false,
         });
     }
+    /**
+     * Visits an element token by first parsing the raw HTML fragment to extract
+     * the start tag, then delegating to the base visitElement with Astro-specific
+     * options including nameless fragment support.
+     *
+     * @param token - The child token representing the element
+     * @param childNodes - The child Astro AST nodes within the element
+     * @returns An array of markuplint node tree items
+     */
     visitElement(token, 
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     childNodes) {
@@ -139,11 +163,8 @@ class AstroParser extends Parser {
         return super.visitElement(startTagNode, childNodes, {
             // https://docs.astro.build/en/basics/astro-syntax/#fragments
             namelessFragment: true,
-            overwriteProps: {
-                namespace: this.state.scopeNS,
-            },
             createEndTagToken: () => {
-                if (startTagNode.selfClosingSolidus?.raw === '/') {
+                if (startTagNode.tagCloseChar.startsWith('/')) {
                     return null;
                 }
                 const endTagNode = parsedNodes.at(-1);
@@ -154,6 +175,15 @@ class AstroParser extends Parser {
             },
         });
     }
+    /**
+     * Visits child nodes and verifies that no sibling nodes with differing
+     * hierarchy levels are produced. Throws a ParserError if unexpected
+     * sibling nodes are discovered.
+     *
+     * @param children - The child Astro AST nodes to visit
+     * @param parentNode - The parent node in the markuplint tree
+     * @returns An empty array (all children are attached via the visitor)
+     */
     visitChildren(
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     children, parentNode) {
@@ -163,6 +193,14 @@ class AstroParser extends Parser {
         }
         return [];
     }
+    /**
+     * Visits an attribute token, handling Astro-specific syntax including
+     * curly-brace expression values, shorthand attributes (`{name}`),
+     * and template directives (e.g., `class:list`, `set:html`).
+     *
+     * @param token - The token representing the attribute
+     * @returns The parsed attribute node with Astro-specific metadata
+     */
     visitAttr(token) {
         const attr = super.visitAttr(token, {
             quoteSet: [
@@ -220,17 +258,4 @@ class AstroParser extends Parser {
         return super.detectElementType(nodeName, /^[A-Z]/);
     }
 }
-_AstroParser_instances = new WeakSet(), _AstroParser_updateScopeNS = function _AstroParser_updateScopeNS(
-// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-originNode, parentNode) {
-    const parentNS = this.state.scopeNS;
-    if (parentNS === 'http://www.w3.org/1999/xhtml' &&
-        originNode.type === 'element' &&
-        originNode.name?.toLowerCase() === 'svg') {
-        this.state.scopeNS = 'http://www.w3.org/2000/svg';
-    }
-    else if (parentNS === 'http://www.w3.org/2000/svg' && parentNode && parentNode.nodeName === 'foreignObject') {
-        this.state.scopeNS = 'http://www.w3.org/1999/xhtml';
-    }
-};
 export const parser = new AstroParser();

package/package.json

@@ -1,10 +1,13 @@
 {
 	"name": "@markuplint/astro-parser",
-	"version": "4.6.22",
+	"version": "5.0.0-alpha.0",
 	"description": "astro parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
 	"license": "MIT",
+	"engines": {
+		"node": ">=22"
+	},
 	"type": "module",
 	"exports": {
 		".": {
@@ -21,12 +24,12 @@
 		"clean": "tsc --build --clean tsconfig.build.json"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.4.10",
-		"@markuplint/parser-utils": "4.8.10",
-		"astro-eslint-parser": "1.2.2"
+		"@markuplint/ml-ast": "5.0.0-alpha.0",
+		"@markuplint/parser-utils": "5.0.0-alpha.0",
+		"astro-eslint-parser": "1.3.0"
 	},
 	"devDependencies": {
-		"@astrojs/compiler": "2.13.0"
+		"@astrojs/compiler": "2.13.1"
 	},
-	"gitHead": "6213ea30269ef404f030e67bbcc7fc7443ec1060"
+	"gitHead": "13dcfc84ec83d87360c720e253383b60767e1b56"
 }