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

package/ARCHITECTURE.ja.md

@@ -181,6 +181,8 @@ case 'Doctype':
 
 その他すべてのノードタイプ — `Conditional`、`Code`、`Each`、`Mixin`、`MixinBlock`、`Include`、`RawInclude`、`Extends`、`NamedBlock`、`Case`、`When`、`While`、`Filter`、`YieldBlock`、`InterpolatedTag`、`FileReference` — は `visitPsBlock()` を通じてプリプロセッサ固有ブロックにマッピングされます。
 
+`Each` ノードでは、`blockBehavior` に `{ type: 'each', expression }` が設定されます。`expression` はイテレーション式（例: `i in obj`）です。これによりコアエンジンが Pug のループを認識できるようになります。
+
 `file` プロパティを持つノード（例: `Include`、`Extends`）では、ノードの終了位置からファイル参照オフセットを計算して、生ソースにファイルパスを含むようトークンが拡張されます。
 
 子ノードはノードタイプに応じて `block.nodes` または `nodes` から抽出されます。

package/ARCHITECTURE.md

@@ -181,6 +181,8 @@ Tag processing is the most complex path:
 
 All other node types — `Conditional`, `Code`, `Each`, `Mixin`, `MixinBlock`, `Include`, `RawInclude`, `Extends`, `NamedBlock`, `Case`, `When`, `While`, `Filter`, `YieldBlock`, `InterpolatedTag`, `FileReference` — are mapped to preprocessor-specific blocks via `visitPsBlock()`.
 
+For `Each` nodes, a `blockBehavior` of `{ type: 'each', expression }` is set, where `expression` is the iteration expression (e.g., `i in obj`). This enables the core engine to recognize Pug loops.
+
 For nodes with a `file` property (e.g., `Include`, `Extends`), the token is extended to include the file path in the raw source by computing the file reference offset from the node's end position.
 
 Child nodes are extracted from either `block.nodes` or `nodes`, depending on the node type.

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(pug-parser)!: update for simplified AST token properties ([7e0704e](https://github.com/markuplint/markuplint/commit/7e0704e32761f418a0c2e078557e797dae80b722))
+
+### Features
+
+- **pug-parser:** support loop blocks ([1ed3ab8](https://github.com/markuplint/markuplint/commit/1ed3ab82203dbb32389c78a669a43412a8b407e2))
+
+### BREAKING CHANGES
+
+- Adapt to renamed token properties and add
+  blockBehavior to visitElement calls.
+
+* Token property access: startOffset -> offset, startLine -> line,
+  startCol -> col
+* Update test assertions for new property names
+* Add blockBehavior: null to element creation
+
+Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
+
 ## [4.6.23](https://github.com/markuplint/markuplint/compare/@markuplint/pug-parser@4.6.22...@markuplint/pug-parser@4.6.23) (2026-02-10)
 
 **Note:** Version bump only for package @markuplint/pug-parser

package/lib/parser.d.ts

@@ -36,14 +36,13 @@ declare class PugParser extends Parser<ASTNode> {
      * pre-parsed attributes (including `&attributes` spread syntax) and
      * visiting child nodes within the Pug block.
      *
-     * @param token - The child token with tag metadata and namespace
+     * @param token - The child token with tag metadata
      * @param childNodes - The child Pug AST nodes within the tag's block
      * @param options - Options containing pre-parsed attribute overrides
      * @returns An array of markuplint node tree items for the element and its children
      */
     visitElement(token: ChildToken & {
         readonly nodeName: string;
-        readonly namespace: string;
         readonly isFragment: false;
     }, childNodes: readonly ASTNode[], options: {
         readonly overwriteProps: {

package/lib/parser.js

@@ -1,5 +1,5 @@
-import { HtmlParser, getNamespace } from '@markuplint/html-parser';
-import { ParserError, Parser, AttrState, scriptParser } from '@markuplint/parser-utils';
+import { HtmlParser } from '@markuplint/html-parser';
+import { ParserError, Parser, AttrState, scriptParser, getNamespace } from '@markuplint/parser-utils';
 import { pugParse } from './pug-parser/index.js';
 /**
  * Internal HTML parser used for inline HTML content within Pug templates.
@@ -71,7 +71,6 @@ class PugParser extends Parser {
     nodeize(
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     originNode, parentNode, depth) {
-        const parentNamespace = parentNode && 'namespace' in parentNode ? parentNode.namespace : 'http://www.w3.org/1999/xhtml';
         const token = this.sliceFragment(originNode.offset, originNode.endOffset);
         switch (originNode.type) {
             case 'Doctype': {
@@ -98,7 +97,7 @@ class PugParser extends Parser {
                 const htmlDoc = new HtmlInPugParser().parse(originNode.raw, {
                     offsetOffset: originNode.offset,
                     offsetLine: originNode.line,
-                    offsetColumn: originNode.column ?? parentNode?.endCol,
+                    offsetColumn: originNode.column ?? parentNode?.col,
                     depth,
                 });
                 const newNodeList = [];
@@ -107,9 +106,9 @@ class PugParser extends Parser {
                         // Remove `#[` and `]`
                         const raw = node.raw.slice(2, -1);
                         const innerNodes = new PugParser().parse(raw, {
-                            offsetOffset: node.startOffset + 2,
-                            offsetLine: node.startLine,
-                            offsetColumn: node.startCol + 2,
+                            offsetOffset: node.offset + 2,
+                            offsetLine: node.line,
+                            offsetColumn: node.col + 2,
                             depth: node.depth,
                         });
                         newNodeList.push(...innerNodes.nodeList);
@@ -141,7 +140,6 @@ class PugParser extends Parser {
                 });
             }
             case 'Tag': {
-                const namespace = getNamespace(originNode.name, parentNamespace);
                 const attrs = originNode.attrs.map(attr => {
                     // eslint-disable-next-line prefer-const
                     let { offset, endOffset } = this.getOffsetsFromCode(attr.line, attr.column, attr.endLine, attr.endColumn);
@@ -166,7 +164,7 @@ class PugParser extends Parser {
                     const blockLength = '&attributes('.length;
                     const { offset, endOffset } = this.getOffsetsFromCode(block.line, block.column + blockLength, block.line, block.column + blockLength + block.val.length);
                     const token = this.sliceFragment(offset, endOffset);
-                    const node = this.createToken(token.raw, token.startOffset, token.startLine, token.startCol);
+                    const node = this.createToken(token.raw, token.offset, token.line, token.col);
                     return {
                         ...node,
                         type: 'spread',
@@ -178,7 +176,6 @@ class PugParser extends Parser {
                     depth,
                     parentNode,
                     nodeName: originNode.name,
-                    namespace,
                     isFragment: false,
                 }, originNode.block?.nodes ?? [], {
                     overwriteProps: {
@@ -194,6 +191,16 @@ class PugParser extends Parser {
                     const fileEndOffset = fileOffset + originNode.file.path.length;
                     tokenIncludesFile = this.sliceFragment(originNode.offset, fileEndOffset);
                 }
+                let blockBehavior = null;
+                switch (originNode.type) {
+                    case 'Each': {
+                        blockBehavior = {
+                            type: 'each',
+                            expression: originNode.val,
+                        };
+                        break;
+                    }
+                }
                 return this.visitPsBlock({
                     ...tokenIncludesFile,
                     depth,
@@ -204,7 +211,7 @@ class PugParser extends Parser {
                     ? originNode.block.nodes
                     : 'nodes' in originNode
                         ? originNode.nodes
-                        : []);
+                        : [], blockBehavior);
             }
         }
     }
@@ -219,7 +226,7 @@ class PugParser extends Parser {
      * pre-parsed attributes (including `&attributes` spread syntax) and
      * visiting child nodes within the Pug block.
      *
-     * @param token - The child token with tag metadata and namespace
+     * @param token - The child token with tag metadata
      * @param childNodes - The child Pug AST nodes within the tag's block
      * @param options - Options containing pre-parsed attribute overrides
      * @returns An array of markuplint node tree items for the element and its children
@@ -233,7 +240,9 @@ class PugParser extends Parser {
             ...options.overwriteProps,
             type: 'starttag',
             elementType: this.detectElementType(token.nodeName),
+            namespace: getNamespace(token.nodeName, token.parentNode),
             childNodes: [],
+            blockBehavior: null,
             pairNode: null,
             tagOpenChar: '',
             tagCloseChar: '',

package/package.json

@@ -1,10 +1,13 @@
 {
 	"name": "@markuplint/pug-parser",
-	"version": "4.6.23",
+	"version": "5.0.0-alpha.0",
 	"description": "Pug 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,11 +24,11 @@
 		"clean": "tsc --build --clean tsconfig.build.json"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.6.23",
-		"@markuplint/ml-ast": "4.4.11",
-		"@markuplint/parser-utils": "4.8.11",
+		"@markuplint/html-parser": "5.0.0-alpha.0",
+		"@markuplint/ml-ast": "5.0.0-alpha.0",
+		"@markuplint/parser-utils": "5.0.0-alpha.0",
 		"pug-lexer": "5.0.1",
 		"pug-parser": "6.0.0"
 	},
-	"gitHead": "193ee7c1262bbed95424e38efdf1a8e56ff049f4"
+	"gitHead": "13dcfc84ec83d87360c720e253383b60767e1b56"
 }