@markuplint/pug-parser 4.6.7 → 4.6.8

package/CHANGELOG.md

@@ -3,21 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [4.6.7](https://github.com/markuplint/markuplint/compare/@markuplint/pug-parser@4.6.6...@markuplint/pug-parser@4.6.7) (2024-09-23)
+## [4.6.8](https://github.com/markuplint/markuplint/compare/@markuplint/pug-parser@4.6.7...@markuplint/pug-parser@4.6.8) (2024-10-14)
 
-**Note:** Version bump only for package @markuplint/pug-parser
 
+### Bug Fixes
 
+* **pug-parser:** fix to support `BlockComment` node ([afa721c](https://github.com/markuplint/markuplint/commit/afa721cd29cab8a47fa27cefe808d3fb7066b42e))
 
 
 
-## [4.6.6](https://github.com/markuplint/markuplint/compare/@markuplint/pug-parser@4.6.5...@markuplint/pug-parser@4.6.6) (2024-09-02)
 
-**Note:** Version bump only for package @markuplint/pug-parser
 
+## [4.6.7](https://github.com/markuplint/markuplint/compare/@markuplint/pug-parser@4.6.6...@markuplint/pug-parser@4.6.7) (2024-09-23)
 
+**Note:** Version bump only for package @markuplint/pug-parser
 
+## [4.6.6](https://github.com/markuplint/markuplint/compare/@markuplint/pug-parser@4.6.5...@markuplint/pug-parser@4.6.6) (2024-09-02)
 
+**Note:** Version bump only for package @markuplint/pug-parser
 
 ## [4.6.5](https://github.com/markuplint/markuplint/compare/@markuplint/pug-parser@4.6.4...@markuplint/pug-parser@4.6.5) (2024-06-25)
 

package/lib/parser.js

@@ -95,6 +95,18 @@ class PugParser extends Parser {
                     isBogus: false,
                 });
             }
+            case 'BlockComment': {
+                const lastBlock = originNode.block.nodes.at(-1);
+                const endOffset = lastBlock ? lastBlock.endOffset : originNode.endOffset;
+                const token = this.sliceFragment(originNode.offset, endOffset);
+                return this.visitComment({
+                    ...token,
+                    depth,
+                    parentNode,
+                }, {
+                    isBogus: false,
+                });
+            }
             case 'Tag': {
                 const namespace = getNamespace(originNode.name, parentNamespace);
                 const attrs = originNode.attrs.map(attr => {
@@ -142,8 +154,15 @@ class PugParser extends Parser {
                 });
             }
             default: {
+                let tokenIncludesFile = token;
+                if ('file' in originNode) {
+                    const interval = originNode.file.column - originNode.endColumn;
+                    const fileOffset = originNode.endOffset + interval;
+                    const fileEndOffset = fileOffset + originNode.file.path.length;
+                    tokenIncludesFile = this.sliceFragment(originNode.offset, fileEndOffset);
+                }
                 return this.visitPsBlock({
-                    ...token,
+                    ...tokenIncludesFile,
                     depth,
                     parentNode,
                     nodeName: originNode.type,

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

@@ -1,13 +1,15 @@
 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 | ASTNamedBlockNode | ASTFilterNode | ASTEachNode | ASTConditionalNode | ASTCaseNode | ASTCaseWhenNode;
+export type ASTNode = ASTTagNode | ASTTextNode | ASTEmptyPipeNode | ASTCodeNode | ASTComment | ASTBlockComment | ASTDoctype | ASTIncludeNode | ASTRawIncludeNode | 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;
 export type ASTCodeNode = PugASTCodeNode & AdditionalASTData;
 export type ASTComment = PugASTCommentNode & AdditionalASTData;
+export type ASTBlockComment = PugASTBlockCommentNode<ASTBlock> & AdditionalASTData;
 export type ASTDoctype = PugASTDoctypeNode & AdditionalASTData;
 export type ASTIncludeNode = PugASTIncludeNode<ASTBlock> & AdditionalASTData;
+export type ASTRawIncludeNode = PugASTRawIncludeNode & AdditionalASTData;
 export type ASTMixinNode = Omit<PugASTMixinNode<ASTAttr, ASTBlock>, 'attributeBlocks'> & AdditionalASTData;
 export type ASTMixinSlotNode = PugASTMixinSlotNode & AdditionalASTData;
 export type ASTNamedBlockNode = PugASTNamedBlockNode<ASTNode> & AdditionalASTData;
@@ -76,6 +78,14 @@ type PugASTCommentNode = {
     line: number;
     column: number;
 };
+type PugASTBlockCommentNode<B> = {
+    type: 'BlockComment';
+    val: string;
+    block: B;
+    buffer: boolean;
+    line: number;
+    column: number;
+};
 type PugASTDoctypeNode = {
     type: 'Doctype';
     val: string;
@@ -84,16 +94,24 @@ type PugASTDoctypeNode = {
 };
 type PugASTIncludeNode<B> = {
     type: 'Include';
-    file: {
-        type: 'FileReference';
-        path: string;
-        line: number;
-        column: number;
-    };
+    file: RugASTIncludeFile;
     block: B;
     line: number;
     column: number;
 };
+type PugASTRawIncludeNode = {
+    type: 'RawInclude';
+    file: RugASTIncludeFile;
+    line: number;
+    column: number;
+    filters: unknown[];
+};
+type RugASTIncludeFile = {
+    type: 'FileReference';
+    path: string;
+    line: number;
+    column: number;
+};
 type PugASTEachNode<B> = {
     type: 'Each';
     obj: string;

package/lib/pug-parser/index.js

@@ -146,6 +146,22 @@ tokens, pug) {
                 nodes.push(includeNode);
                 continue;
             }
+            case 'RawInclude': {
+                const includeNode = {
+                    type: node.type,
+                    file: node.file,
+                    raw,
+                    offset,
+                    endOffset,
+                    line,
+                    endLine,
+                    column,
+                    endColumn,
+                    filters: node.filters,
+                };
+                nodes.push(includeNode);
+                continue;
+            }
             case 'Mixin': {
                 // TODO: Attributes when call mixin
                 // const attrs = getAttrs(node.attrs, tokens, offsets, pug);
@@ -222,6 +238,24 @@ tokens, pug) {
                 nodes.push(commentNode);
                 continue;
             }
+            case 'BlockComment': {
+                const block = optimizeAST(node.block, tokens, pug);
+                const commentNode = {
+                    type: node.type,
+                    val: node.val,
+                    buffer: node.buffer,
+                    block,
+                    raw,
+                    offset,
+                    endOffset,
+                    line,
+                    endLine,
+                    column,
+                    endColumn,
+                };
+                nodes.push(commentNode);
+                continue;
+            }
             case 'Code': {
                 const newNode = {
                     type: node.type,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/pug-parser",
-	"version": "4.6.7",
+	"version": "4.6.8",
 	"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.7",
-		"@markuplint/ml-ast": "4.4.4",
-		"@markuplint/parser-utils": "4.6.7",
+		"@markuplint/html-parser": "4.6.8",
+		"@markuplint/ml-ast": "4.4.5",
+		"@markuplint/parser-utils": "4.6.8",
 		"pug-lexer": "5.0.1",
 		"pug-parser": "6.0.0"
 	},
-	"gitHead": "05d2eabfcc41b67847c24049f12dd2b9f5ca6485"
+	"gitHead": "e59d4e8b762c66c7e3fb8b0a0d9d99d5160b0afa"
 }