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

package/ARCHITECTURE.ja.md

@@ -109,9 +109,9 @@ Astro の式（`{expression}`）は Astro AST で `type: 'expression'` ノード
 
 式が HTML 要素を含む場合（例: `{list.map(item => <li>{item}</li>)}`）、パーサーは複数のノードに分割します:
 
-1. **開始式フラグメント**: `{list.map(item => ` — 子ノードを含む MustacheTag psblock
+1. **開始式フラグメント**: `{list.map(item => ` — 子ノードを含む MustacheTag psblock。式が `.map()` または `.filter()` 呼び出しを含む場合（`detectBlockBehavior()` で検出）、開始フラグメントにはそれぞれ `blockBehavior: { type: 'each' }` または `{ type: 'if' }` が設定される
 2. **ネストされた HTML 要素**: `<li>{item}</li>` — 通常の要素として処理
-3. **終了式フラグメント**: `)}` — `isFragment: false` の別の MustacheTag psblock
+3. **終了式フラグメント**: `)}` — `isFragment: false` の別の MustacheTag psblock。開始フラグメントに `blockBehavior` がある場合、終了フラグメントには `blockBehavior: { type: 'end' }` が設定される
 
 分割ロジックは式の children 配列で `firstChild !== lastChild` かどうかを確認します。該当する場合:
 

package/ARCHITECTURE.md

@@ -109,9 +109,9 @@ A simple expression like `{name}` has a single text child. The entire expression
 
 When an expression contains HTML elements (e.g., `{list.map(item => <li>{item}</li>)}`), the parser splits it into multiple nodes:
 
-1. **Opening expression fragment**: `{list.map(item => ` — a MustacheTag psblock containing the child nodes
+1. **Opening expression fragment**: `{list.map(item => ` — a MustacheTag psblock containing the child nodes. If the expression contains a `.map()` or `.filter()` call (detected by `detectBlockBehavior()`), the opening fragment receives `blockBehavior: { type: 'each' }` or `{ type: 'if' }` respectively
 2. **Nested HTML elements**: `<li>{item}</li>` — processed as normal elements
-3. **Closing expression fragment**: `)}` — a separate MustacheTag psblock with `isFragment: false`
+3. **Closing expression fragment**: `)}` — a separate MustacheTag psblock with `isFragment: false`. If the opening fragment had a `blockBehavior`, the closing fragment receives `blockBehavior: { type: 'end' }`
 
 The splitting logic checks whether `firstChild !== lastChild` in the expression's children array. If so:
 

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-alpha.0](https://github.com/markuplint/markuplint/compare/v4.14.1...v5.0.0-alpha.0) (2026-02-20)
+
+### Bug Fixes
+
+- **ml-core:** improve detection of namespace ([5b507ad](https://github.com/markuplint/markuplint/commit/5b507ad7c19c5015b8ce587845d901e31dfa6518))
+
+- refactor(astro-parser)!: update for simplified AST token properties ([4c05de1](https://github.com/markuplint/markuplint/commit/4c05de151d30233a8d4a184c4cb70c26de19b36b))
+
+### Features
+
+- **astro-parser:** support loop blocks ([ebe2eb6](https://github.com/markuplint/markuplint/commit/ebe2eb6b85aa32ff3f29964e333d058afe99d18b))
+
+### BREAKING CHANGES
+
+- Adapt to renamed token properties and remove
+  selfClosingSolidus test.
+
+* Token property access: startOffset -> offset, startLine -> line,
+  startCol -> col
+* Replace selfClosingSolidus check with tagCloseChar
+* Remove selfClosingSolidus test case
+
+Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
+
 ## [4.6.23](https://github.com/markuplint/markuplint/compare/@markuplint/astro-parser@4.6.22...@markuplint/astro-parser@4.6.23) (2026-02-10)
 
 **Note:** Version bump only for package @markuplint/astro-parser

package/lib/detect-block-behavior.d.ts

@@ -1,2 +1,10 @@
 import type { MLASTBlockBehavior } from '@markuplint/ml-ast';
+/**
+ * Detects the block behavior of an Astro expression by inspecting its raw
+ * source for `.map()` or `.filter()` array method calls. Maps `.map()` to
+ * `'each'` (iteration) and `.filter()` to `'if'` (conditional filtering).
+ *
+ * @param raw - The raw source text of the expression to analyze
+ * @returns The detected block behavior, or `null` if no recognized pattern is found
+ */
 export declare function detectBlockBehavior(raw: string): MLASTBlockBehavior | null;

package/lib/detect-block-behavior.js

@@ -1,3 +1,11 @@
+/**
+ * Detects the block behavior of an Astro expression by inspecting its raw
+ * source for `.map()` or `.filter()` array method calls. Maps `.map()` to
+ * `'each'` (iteration) and `.filter()` to `'if'` (conditional filtering).
+ *
+ * @param raw - The raw source text of the expression to analyze
+ * @returns The detected block behavior, or `null` if no recognized pattern is found
+ */
 export function detectBlockBehavior(raw) {
     const re = /\.+\s*(?<type>map|filter)\s*\((?:function\s*\(.[^\n\r{\u2028\u2029]*\{.*return\s*$|.+=>\s*\(?\s*)/;
     const match = raw.match(re);

package/lib/parser.d.ts

@@ -1,19 +1,14 @@
 import type { Node } from './astro-parser.js';
-import type { MLASTParentNode, MLASTNodeTreeItem } from '@markuplint/ml-ast';
+import type { MLASTNodeTreeItem, MLASTParentNode } from '@markuplint/ml-ast';
 import type { ChildToken, Token } from '@markuplint/parser-utils';
 import { Parser } from '@markuplint/parser-utils';
-type State = {
-    scopeNS: string;
-};
 /**
  * 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`), shorthand attributes, and namespace-aware
- * element resolution (XHTML vs SVG).
+ * (e.g., `class:list`, `set:html`), and shorthand attributes.
  */
-declare class AstroParser extends Parser<Node, State> {
-    #private;
+declare class AstroParser extends Parser<Node> {
     constructor();
     tokenize(): {
         ast: Node[];
@@ -22,7 +17,7 @@ declare class AstroParser extends Parser<Node, State> {
     /**
      * Converts an Astro AST node into markuplint node tree items.
      * Handles frontmatter, doctype, text, comment, component/element/fragment,
-     * and expression nodes. Manages namespace scoping for SVG elements.
+     * 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
@@ -34,7 +29,7 @@ declare class AstroParser extends Parser<Node, State> {
     /**
      * 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 namespace scoping and nameless fragment support.
+     * options including nameless fragment support.
      *
      * @param token - The child token representing the element
      * @param childNodes - The child Astro AST nodes within the element
@@ -81,12 +76,9 @@ declare class AstroParser extends Parser<Node, State> {
         isDuplicatable: boolean;
         uuid: string;
         raw: string;
-        startOffset: number;
-        endOffset: number;
-        startLine: number;
-        endLine: number;
-        startCol: number;
-        endCol: number;
+        offset: number;
+        line: number;
+        col: number;
         __rightText?: string;
     };
     /**

package/lib/parser.js

@@ -1,17 +1,11 @@
-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`), shorthand attributes, and namespace-aware
- * element resolution (XHTML vs SVG).
+ * (e.g., `class:list`, `set:html`), and shorthand attributes.
  */
 class AstroParser extends Parser {
     constructor() {
@@ -19,10 +13,7 @@ class AstroParser extends Parser {
             endTagType: 'xml',
             selfCloseType: 'html+xml',
             tagNameCaseSensitive: true,
-        }, {
-            scopeNS: 'http://www.w3.org/1999/xhtml',
         });
-        _AstroParser_instances.add(this);
     }
     tokenize() {
         return {
@@ -33,7 +24,7 @@ class AstroParser extends Parser {
     /**
      * Converts an Astro AST node into markuplint node tree items.
      * Handles frontmatter, doctype, text, comment, component/element/fragment,
-     * and expression nodes. Manages namespace scoping for SVG elements.
+     * 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
@@ -46,10 +37,9 @@ class AstroParser extends Parser {
         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({
@@ -102,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: {
@@ -145,7 +143,7 @@ class AstroParser extends Parser {
     /**
      * 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 namespace scoping and nameless fragment support.
+     * options including nameless fragment support.
      *
      * @param token - The child token representing the element
      * @param childNodes - The child Astro AST nodes within the element
@@ -165,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);
@@ -263,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.23",
+	"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.11",
-		"@markuplint/parser-utils": "4.8.11",
-		"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.1"
 	},
-	"gitHead": "193ee7c1262bbed95424e38efdf1a8e56ff049f4"
+	"gitHead": "13dcfc84ec83d87360c720e253383b60767e1b56"
 }