@markuplint/pug-parser 4.6.1 → 4.6.3

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.6.3](https://github.com/markuplint/markuplint/compare/@markuplint/pug-parser@4.6.2...@markuplint/pug-parser@4.6.3) (2024-05-28)
+
+### Bug Fixes
+
+- **pug-parser:** add to parse `NamedBlock` ([f5197ff](https://github.com/markuplint/markuplint/commit/f5197ffd5281a9a67ad62dfc340b4422a3c20237)), closes [#1741](https://github.com/markuplint/markuplint/issues/1741)
+
+## [4.6.2](https://github.com/markuplint/markuplint/compare/@markuplint/pug-parser@4.6.1...@markuplint/pug-parser@4.6.2) (2024-05-12)
+
+**Note:** Version bump only for package @markuplint/pug-parser
+
 ## [4.6.1](https://github.com/markuplint/markuplint/compare/@markuplint/pug-parser@4.6.1-alpha.0...@markuplint/pug-parser@4.6.1) (2024-05-04)
 
 **Note:** Version bump only for package @markuplint/pug-parser

package/lib/parser.d.ts

@@ -14,6 +14,7 @@ declare class PugParser extends Parser<ASTNode> {
     visitElement(token: ChildToken & {
         readonly nodeName: string;
         readonly namespace: string;
+        readonly isFragment: false;
     }, childNodes: readonly ASTNode[], options: {
         readonly overwriteProps: {
             readonly attributes: readonly MLASTAttr[];

package/lib/parser.js

@@ -134,6 +134,7 @@ class PugParser extends Parser {
                     parentNode,
                     nodeName: originNode.name,
                     namespace,
+                    isFragment: false,
                 }, originNode.block.nodes, {
                     overwriteProps: {
                         attributes: [...attrs, ...andAttr],
@@ -146,7 +147,12 @@ class PugParser extends Parser {
                     depth,
                     parentNode,
                     nodeName: originNode.type,
-                }, 'block' in originNode && originNode.block ? originNode.block.nodes : []);
+                    isFragment: true,
+                }, 'block' in originNode && originNode.block
+                    ? originNode.block.nodes
+                    : 'nodes' in originNode
+                        ? originNode.nodes
+                        : []);
             }
         }
     }

package/lib/pug-parser/index.d.ts

@@ -1,6 +1,6 @@
 export declare function pugParse(pug: string, useOffset?: boolean): ASTBlock;
 export type ASTBlock = PugAST<ASTNode>;
-export type ASTNode = ASTTagNode | ASTTextNode | ASTEmptyPipeNode | ASTCodeNode | ASTComment | ASTDoctype | ASTIncludeNode | ASTMixinNode | ASTMixinSlotNode | ASTFilterNode | ASTEachNode | ASTConditionalNode | ASTCaseNode | ASTCaseWhenNode;
+export type ASTNode = ASTTagNode | ASTTextNode | ASTEmptyPipeNode | ASTCodeNode | ASTComment | ASTDoctype | ASTIncludeNode | ASTMixinNode | ASTMixinSlotNode | ASTNamedBlockNode | ASTFilterNode | ASTEachNode | ASTConditionalNode | ASTCaseNode | ASTCaseWhenNode;
 export type ASTTagNode = Omit<PugASTTagNode<ASTAttr, ASTBlock>, 'selfClosing' | 'isInline'> & AdditionalASTData;
 export type ASTTextNode = Omit<PugASTTextNode, 'val'> & AdditionalASTData;
 export type ASTEmptyPipeNode = PugASTEmptyPipeNode & AdditionalASTData;
@@ -10,6 +10,7 @@ export type ASTDoctype = PugASTDoctypeNode & AdditionalASTData;
 export type ASTIncludeNode = PugASTIncludeNode<ASTBlock> & AdditionalASTData;
 export type ASTMixinNode = Omit<PugASTMixinNode<ASTAttr, ASTBlock>, 'attributeBlocks'> & AdditionalASTData;
 export type ASTMixinSlotNode = PugASTMixinSlotNode & AdditionalASTData;
+export type ASTNamedBlockNode = PugASTNamedBlockNode<ASTNode> & AdditionalASTData;
 export type ASTFilterNode = PugASTFilterNode<ASTAttr, ASTBlock> & AdditionalASTData;
 export type ASTEachNode = PugASTEachNode<ASTBlock> & AdditionalASTData;
 export type ASTConditionalNode = Omit<PugASTConditionalNode<ASTBlock>, 'consequent' | 'alternate'> & {
@@ -118,6 +119,14 @@ type PugASTMixinSlotNode = {
     line: number;
     column: number;
 };
+interface PugASTNamedBlockNode<N> {
+    type: 'NamedBlock';
+    name: string;
+    mode: 'replace' | 'append' | 'prepend';
+    nodes: N[];
+    line: number;
+    column: number;
+}
 type PugASTFilterNode<A, B> = {
     type: 'Filter';
     name: string;

package/lib/pug-parser/index.js

@@ -188,6 +188,24 @@ tokens, pug) {
                 nodes.push(mixinNode);
                 continue;
             }
+            case 'NamedBlock': {
+                const namedBlockNode = {
+                    ...node,
+                    nodes: optimizeAST({
+                        ...node,
+                        type: 'Block',
+                    }, tokens, pug).nodes,
+                    raw,
+                    offset,
+                    endOffset,
+                    line,
+                    endLine,
+                    column,
+                    endColumn,
+                };
+                nodes.push(namedBlockNode);
+                continue;
+            }
             case 'Comment': {
                 const commentNode = {
                     type: node.type,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/pug-parser",
-	"version": "4.6.1",
+	"version": "4.6.3",
 	"description": "Pug parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,11 +21,11 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.6.1",
-		"@markuplint/ml-ast": "4.3.1",
-		"@markuplint/parser-utils": "4.6.1",
+		"@markuplint/html-parser": "4.6.3",
+		"@markuplint/ml-ast": "4.4.0",
+		"@markuplint/parser-utils": "4.6.3",
 		"pug-lexer": "5.0.1",
 		"pug-parser": "6.0.0"
 	},
-	"gitHead": "7a5967fce14fdf66f0d8eae9d93ae5b350648d3d"
+	"gitHead": "bf70c41b1d2497e85b73c9ecd5551eb522e6bdfc"
 }