@markuplint/pug-parser 3.10.0 → 4.0.0-alpha.2

package/lib/attr-tokenizer.d.ts

@@ -1,3 +1,3 @@
-import type { ASTAttr } from './pug-parser';
+import type { ASTAttr } from './pug-parser/index.js';
 import type { MLASTAttr } from '@markuplint/ml-ast';
 export default function attrTokenizer(attr: ASTAttr): MLASTAttr;

package/lib/attr-tokenizer.js

@@ -1,21 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const parser_utils_1 = require("@markuplint/parser-utils");
-function attrTokenizer(
+import { tokenizer, uuid } from '@markuplint/parser-utils';
+export default function attrTokenizer(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 attr) {
-    var _a, _b, _c;
     if (attr.raw[0] === '#' || attr.raw[0] === '.') {
         let value = '';
         if (typeof attr.val === 'string') {
-            [, , value] = (_a = attr.val.match(/(['"`]?)([^\1]+)(\1)/)) !== null && _a !== void 0 ? _a : ['', '', ''];
+            [, , value] = attr.val.match(/(['"`]?)([^\1]+)(\1)/) ?? ['', '', ''];
         }
         else {
             value = `${attr.val}`;
         }
         return {
             type: 'ps-attr',
-            uuid: (0, parser_utils_1.uuid)(),
+            uuid: uuid(),
             raw: attr.raw,
             startOffset: attr.offset,
             endOffset: attr.endOffset,
@@ -24,7 +21,7 @@ attr) {
             startCol: attr.column,
             endCol: attr.endColumn,
             potentialName: attr.name,
-            potentialValue: value !== null && value !== void 0 ? value : '',
+            potentialValue: value ?? '',
             valueType: 'string',
             isDuplicatable: attr.raw[0] === '.',
             nodeName: '#pug-special-attr',
@@ -54,13 +51,13 @@ attr) {
         const withoutName = attr.raw.slice(attr.name.length);
         const valueOffset = withoutName.indexOf(attr.val);
         const equalAndBeforeSpaceAfterSpace = withoutName.slice(0, valueOffset);
-        const [, before, equal, after] = (_b = equalAndBeforeSpaceAfterSpace.match(/^(\s*)(=)(\s*)$/)) !== null && _b !== void 0 ? _b : ['', '', '', ''];
-        const [, quote, coreValue] = (_c = attr.val.match(/(['"`]?)([^\1]+)(\1)/)) !== null && _c !== void 0 ? _c : ['', '', ''];
-        spacesBeforeEqualChars = before !== null && before !== void 0 ? before : '';
-        equalChars = equal !== null && equal !== void 0 ? equal : '';
-        spacesAfterEqualChars = after !== null && after !== void 0 ? after : '';
-        quoteChars = quote !== null && quote !== void 0 ? quote : '';
-        valueChars = coreValue !== null && coreValue !== void 0 ? coreValue : '';
+        const [, before, equal, after] = equalAndBeforeSpaceAfterSpace.match(/^(\s*)(=)(\s*)$/) ?? ['', '', '', ''];
+        const [, quote, coreValue] = attr.val.match(/(['"`]?)([^\1]+)(\1)/) ?? ['', '', ''];
+        spacesBeforeEqualChars = before ?? '';
+        equalChars = equal ?? '';
+        spacesAfterEqualChars = after ?? '';
+        quoteChars = quote ?? '';
+        valueChars = coreValue ?? '';
         if (quote === '`' || quote === '') {
             isDynamicValue = true;
         }
@@ -73,36 +70,36 @@ attr) {
     let offset = attr.offset;
     let line = attr.line;
     let col = attr.column;
-    const attrToken = (0, parser_utils_1.tokenizer)(attr.raw, line, col, offset);
-    const spacesBeforeName = (0, parser_utils_1.tokenizer)(spacesBeforeAttrString, line, col, offset);
+    const attrToken = tokenizer(attr.raw, line, col, offset);
+    const spacesBeforeName = tokenizer(spacesBeforeAttrString, line, col, offset);
     line = spacesBeforeName.endLine;
     col = spacesBeforeName.endCol;
     offset = spacesBeforeName.endOffset;
-    const name = (0, parser_utils_1.tokenizer)(nameChars, line, col, offset);
+    const name = tokenizer(nameChars, line, col, offset);
     line = name.endLine;
     col = name.endCol;
     offset = name.endOffset;
-    const spacesBeforeEqual = (0, parser_utils_1.tokenizer)(spacesBeforeEqualChars, line, col, offset);
+    const spacesBeforeEqual = tokenizer(spacesBeforeEqualChars, line, col, offset);
     line = spacesBeforeEqual.endLine;
     col = spacesBeforeEqual.endCol;
     offset = spacesBeforeEqual.endOffset;
-    const equal = (0, parser_utils_1.tokenizer)(equalChars, line, col, offset);
+    const equal = tokenizer(equalChars, line, col, offset);
     line = equal.endLine;
     col = equal.endCol;
     offset = equal.endOffset;
-    const spacesAfterEqual = (0, parser_utils_1.tokenizer)(spacesAfterEqualChars, line, col, offset);
+    const spacesAfterEqual = tokenizer(spacesAfterEqualChars, line, col, offset);
     line = spacesAfterEqual.endLine;
     col = spacesAfterEqual.endCol;
     offset = spacesAfterEqual.endOffset;
-    const startQuote = (0, parser_utils_1.tokenizer)(quoteChars, line, col, offset);
+    const startQuote = tokenizer(quoteChars, line, col, offset);
     line = startQuote.endLine;
     col = startQuote.endCol;
     offset = startQuote.endOffset;
-    const value = (0, parser_utils_1.tokenizer)(valueChars, line, col, offset);
+    const value = tokenizer(valueChars, line, col, offset);
     line = value.endLine;
     col = value.endCol;
     offset = value.endOffset;
-    const endQuote = (0, parser_utils_1.tokenizer)(quoteChars, line, col, offset);
+    const endQuote = tokenizer(quoteChars, line, col, offset);
     line = endQuote.endLine;
     col = endQuote.endCol;
     offset = endQuote.endOffset;
@@ -112,7 +109,7 @@ attr) {
     }
     return {
         type: 'html-attr',
-        uuid: (0, parser_utils_1.uuid)(),
+        uuid: uuid(),
         raw: attrToken.raw,
         startOffset: attrToken.startOffset,
         endOffset: attrToken.endOffset,
@@ -138,4 +135,3 @@ attr) {
         isGhost: false,
     };
 }
-exports.default = attrTokenizer;

package/lib/index.d.ts

@@ -1,2 +1,2 @@
-export { parse } from './parse';
+export { parse } from './parse.js';
 export declare const endTag = "never";

package/lib/index.js

@@ -1,6 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.endTag = exports.parse = void 0;
-var parse_1 = require("./parse");
-Object.defineProperty(exports, "parse", { enumerable: true, get: function () { return parse_1.parse; } });
-exports.endTag = 'never';
+export { parse } from './parse.js';
+export const endTag = 'never';

package/lib/parse.js

@@ -1,17 +1,14 @@
-"use strict";
 var _Parser_ast;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = void 0;
-const tslib_1 = require("tslib");
-const html_parser_1 = require("@markuplint/html-parser");
-const parser_utils_1 = require("@markuplint/parser-utils");
-const attr_tokenizer_1 = tslib_1.__importDefault(require("./attr-tokenizer"));
-const pug_parser_1 = require("./pug-parser");
-const parse = (rawCode, options) => {
+import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
+import { getNamespace, parse as htmlParser, isDocumentFragment } from '@markuplint/html-parser';
+import { detectElementType, ignoreFrontMatter, ParserError, tokenizer, uuid, walk, removeDeprecatedNode, } from '@markuplint/parser-utils';
+import attrTokenizer from './attr-tokenizer.js';
+import { pugParse } from './pug-parser/index.js';
+export const parse = (rawCode, options) => {
     let unknownParseError;
     let nodeList;
-    if (options === null || options === void 0 ? void 0 : options.ignoreFrontMatter) {
-        rawCode = (0, parser_utils_1.ignoreFrontMatter)(rawCode);
+    if (options?.ignoreFrontMatter) {
+        rawCode = ignoreFrontMatter(rawCode);
     }
     try {
         const parser = new Parser(rawCode);
@@ -20,7 +17,7 @@ const parse = (rawCode, options) => {
     catch (err) {
         nodeList = [];
         if (err instanceof Error && 'msg' in err && 'line' in err && 'column' in err && 'src' in err) {
-            throw new parser_utils_1.ParserError(
+            throw new ParserError(
             // @ts-ignore
             err.msg, {
                 // @ts-ignore
@@ -35,29 +32,28 @@ const parse = (rawCode, options) => {
     }
     return {
         nodeList,
-        isFragment: (0, html_parser_1.isDocumentFragment)(rawCode),
+        isFragment: isDocumentFragment(rawCode),
         unknownParseError: unknownParseError,
     };
 };
-exports.parse = parse;
 class Parser {
     constructor(raw) {
         _Parser_ast.set(this, void 0);
-        tslib_1.__classPrivateFieldSet(this, _Parser_ast, (0, pug_parser_1.pugParse)(raw), "f");
+        __classPrivateFieldSet(this, _Parser_ast, pugParse(raw), "f");
         // console.log(JSON.stringify(this.#ast, null, 2));
     }
     flattenNodes(
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     nodeTree) {
         const nodeOrders = [];
-        (0, parser_utils_1.walk)(nodeTree, node => {
+        walk(nodeTree, node => {
             nodeOrders.push(node);
         });
-        (0, parser_utils_1.removeDeprecatedNode)(nodeOrders);
+        removeDeprecatedNode(nodeOrders);
         return nodeOrders;
     }
     getNodeList() {
-        const nodeTree = this.traverse(tslib_1.__classPrivateFieldGet(this, _Parser_ast, "f").nodes, null);
+        const nodeTree = this.traverse(__classPrivateFieldGet(this, _Parser_ast, "f").nodes, null);
         return this.flattenNodes(nodeTree);
     }
     nodeize(
@@ -67,7 +63,6 @@ class Parser {
     prevNode, 
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     parentNode) {
-        var _a;
         const nextNode = null;
         const startOffset = originNode.offset;
         const endOffset = originNode.endOffset;
@@ -79,9 +74,9 @@ class Parser {
         switch (originNode.type) {
             case 'Doctype': {
                 return {
-                    uuid: (0, parser_utils_1.uuid)(),
+                    uuid: uuid(),
                     raw: originNode.raw,
-                    name: (_a = originNode.val) !== null && _a !== void 0 ? _a : '',
+                    name: originNode.val ?? '',
                     // TODO:
                     publicId: '',
                     // TODO:
@@ -105,7 +100,7 @@ class Parser {
             case 'Text': {
                 if (parentNode && /^script$|^style$/i.test(parentNode.nodeName)) {
                     return {
-                        uuid: (0, parser_utils_1.uuid)(),
+                        uuid: uuid(),
                         raw: originNode.raw,
                         startOffset,
                         endOffset,
@@ -122,7 +117,7 @@ class Parser {
                         isGhost: false,
                     };
                 }
-                const htmlDoc = (0, html_parser_1.parse)(originNode.raw, {
+                const htmlDoc = htmlParser(originNode.raw, {
                     offsetOffset: originNode.offset,
                     offsetLine: originNode.line - 1,
                     offsetColumn: originNode.column - 1,
@@ -137,7 +132,7 @@ class Parser {
             }
             case 'Comment': {
                 return {
-                    uuid: (0, parser_utils_1.uuid)(),
+                    uuid: uuid(),
                     raw: originNode.raw,
                     startOffset,
                     endOffset,
@@ -155,9 +150,9 @@ class Parser {
                 };
             }
             case 'Tag': {
-                const namespace = (0, html_parser_1.getNamespace)(originNode.name, parentNamespace);
+                const namespace = getNamespace(originNode.name, parentNamespace);
                 const tag = {
-                    uuid: (0, parser_utils_1.uuid)(),
+                    uuid: uuid(),
                     raw: originNode.raw,
                     startOffset,
                     endOffset,
@@ -168,15 +163,15 @@ class Parser {
                     nodeName: originNode.name,
                     type: 'starttag',
                     namespace,
-                    elementType: (0, parser_utils_1.detectElementType)(originNode.name),
-                    attributes: originNode.attrs.map(attr => (0, attr_tokenizer_1.default)(attr)),
+                    elementType: detectElementType(originNode.name),
+                    attributes: originNode.attrs.map(attr => attrTokenizer(attr)),
                     hasSpreadAttr: false,
                     parentNode,
                     prevNode,
                     nextNode,
                     pearNode: null,
-                    selfClosingSolidus: (0, parser_utils_1.tokenizer)('', originNode.line, originNode.column, originNode.offset),
-                    endSpace: (0, parser_utils_1.tokenizer)('', originNode.line, originNode.column, originNode.offset),
+                    selfClosingSolidus: tokenizer('', originNode.line, originNode.column, originNode.offset),
+                    endSpace: tokenizer('', originNode.line, originNode.column, originNode.offset),
                     isFragment: false,
                     isGhost: false,
                     tagOpenChar: '',
@@ -189,7 +184,7 @@ class Parser {
             }
             default: {
                 const tag = {
-                    uuid: (0, parser_utils_1.uuid)(),
+                    uuid: uuid(),
                     raw: originNode.raw,
                     startOffset,
                     endOffset,

package/lib/pug-parser/index.js

@@ -1,22 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pugParse = void 0;
-const tslib_1 = require("tslib");
 // @ts-ignore
-const pug_lexer_1 = tslib_1.__importDefault(require("pug-lexer"));
+import lexer from 'pug-lexer';
 // @ts-ignore
-const pug_parser_1 = tslib_1.__importDefault(require("pug-parser"));
-const get_offset_from_line_and_col_1 = require("../utils/get-offset-from-line-and-col");
-function pugParse(pug) {
-    const lexOrigin = (0, pug_lexer_1.default)(pug);
+import parser from 'pug-parser';
+import { getOffsetFromLineAndCol } from '../utils/get-offset-from-line-and-col.js';
+export function pugParse(pug) {
+    const lexOrigin = lexer(pug);
     const lex = JSON.parse(JSON.stringify(lexOrigin));
-    const originAst = (0, pug_parser_1.default)(lexOrigin);
+    const originAst = parser(lexOrigin);
     // console.log(lex);
     // console.log(JSON.stringify(originAst, null, 2));
     const ast = optimizeAST(originAst, lex, pug);
     return ast;
 }
-exports.pugParse = pugParse;
 function getOffsetsFromLines(pug) {
     const lines = pug.split(/\n/g);
     let chars = 0;
@@ -29,10 +24,9 @@ function getOffsetsFromLines(pug) {
 function mergeTextNode(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 nodes, pug) {
-    var _a;
     const baseNodes = [];
     for (const node of nodes) {
-        const prevNode = (_a = baseNodes[baseNodes.length - 1]) !== null && _a !== void 0 ? _a : null;
+        const prevNode = baseNodes[baseNodes.length - 1] ?? null;
         if (prevNode && prevNode.type === 'Text' && node.type === 'Text') {
             prevNode.raw = pug.slice(prevNode.offset, node.endOffset);
             prevNode.endColumn = node.endColumn;
@@ -55,13 +49,12 @@ function optimizeAST(
 originalAST, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 tokens, pug) {
-    var _a;
     const nodes = [];
     for (const node of originalAST.nodes) {
         const line = node.line;
         const column = node.column;
         const offsets = getOffsetsFromLines(pug);
-        const lineOffset = Math.max((_a = offsets[line - 2]) !== null && _a !== void 0 ? _a : 0, 0);
+        const lineOffset = Math.max(offsets[line - 2] ?? 0, 0);
         const offset = lineOffset + column - 1;
         const { endLine, endColumn, endOffset } = getLocationFromToken(offset, line, column, tokens);
         const raw = pug.slice(offset, endOffset);
@@ -316,7 +309,6 @@ function optimizeASTOfConditionalNode(
 node, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 tokens, pug, offsets, depth) {
-    var _a, _b;
     const altNodes = [];
     let tokenOfCurrentNode = null;
     for (const token of tokens) {
@@ -327,7 +319,7 @@ tokens, pug, offsets, depth) {
     }
     if (tokenOfCurrentNode) {
         // console.log(JSON.stringify(node, null, 2));
-        const lineOffset = Math.max((_a = offsets[node.line - 2]) !== null && _a !== void 0 ? _a : 0, 0);
+        const lineOffset = Math.max(offsets[node.line - 2] ?? 0, 0);
         const offset = lineOffset + node.column - 1;
         const length = tokenOfCurrentNode.loc.end.column - tokenOfCurrentNode.loc.start.column;
         const endOffset = offset + length;
@@ -359,7 +351,7 @@ tokens, pug, offsets, depth) {
                 if (!tokenOfCurrentNode) {
                     return [];
                 }
-                const lineOffset = Math.max((_b = offsets[tokenOfCurrentNode.loc.start.line - 2]) !== null && _b !== void 0 ? _b : 0, 0);
+                const lineOffset = Math.max(offsets[tokenOfCurrentNode.loc.start.line - 2] ?? 0, 0);
                 const offset = lineOffset + tokenOfCurrentNode.loc.start.column - 1;
                 const length = tokenOfCurrentNode.loc.end.column - tokenOfCurrentNode.loc.start.column;
                 const endOffset = offset + length;
@@ -390,7 +382,7 @@ tokens, pug, offsets, depth) {
 function getLocationFromToken(offset, line, column, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 tokens, tokenType) {
-    const tokenTypes = typeof tokenType === 'string' ? (tokenType !== '' ? [tokenType] : null) : tokenType !== null && tokenType !== void 0 ? tokenType : null;
+    const tokenTypes = typeof tokenType === 'string' ? (tokenType !== '' ? [tokenType] : null) : tokenType ?? null;
     let tokenOfCurrentNode = null;
     for (const token of tokens) {
         if ((tokenTypes == null || tokenTypes.includes(token.type)) &&
@@ -416,10 +408,9 @@ function getAttrs(
 originalAttrs, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 tokens, offsets, pug) {
-    var _a;
     const attrs = [];
     for (const attr of originalAttrs) {
-        const attrLineOffset = (_a = offsets[attr.line - 2]) !== null && _a !== void 0 ? _a : 0;
+        const attrLineOffset = offsets[attr.line - 2] ?? 0;
         const attrOffset = attrLineOffset + attr.column - 1;
         let tokenOfCurrentAttr = null;
         for (const token of tokens) {
@@ -452,7 +443,6 @@ tokens, offsets, pug) {
 function getEndAttributeLocation(nodeName, offset, line, column, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 tokens, offsets) {
-    var _a;
     let beforeNewlineToken = null;
     for (const token of tokens) {
         // Searching token after the tag node.
@@ -463,7 +453,7 @@ tokens, offsets) {
             token.type !== 'end-attributes' &&
             token.type !== 'id' &&
             token.type !== 'class') {
-            const endAttrLineOffset = Math.max((_a = offsets[beforeNewlineToken.loc.end.line - 2]) !== null && _a !== void 0 ? _a : 0, 0);
+            const endAttrLineOffset = Math.max(offsets[beforeNewlineToken.loc.end.line - 2] ?? 0, 0);
             const endAttrOffset = endAttrLineOffset + beforeNewlineToken.loc.end.column - 1;
             return {
                 endOffset: endAttrOffset,
@@ -500,8 +490,8 @@ tokens) {
     if (startPipelessText.loc.start.line < node.line && node.line < endPipelessText.loc.start.line) {
         const { line, column } = startPipelessText.loc.start;
         const { line: endLine, column: endColumn } = endPipelessText.loc.end;
-        const offset = (0, get_offset_from_line_and_col_1.getOffsetFromLineAndCol)(pug, line, column);
-        const endOffset = (0, get_offset_from_line_and_col_1.getOffsetFromLineAndCol)(pug, endLine, endColumn);
+        const offset = getOffsetFromLineAndCol(pug, line, column);
+        const endOffset = getOffsetFromLineAndCol(pug, endLine, endColumn);
         const raw = pug.slice(offset, endOffset);
         return {
             raw,
@@ -518,7 +508,6 @@ tokens) {
 function getRawTextAndLocationEnd(val, offset, line, column, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 tokens, offsets, pug) {
-    var _a;
     let beforeNewlineToken = null;
     for (const token of tokens) {
         // Searching token after the text.
@@ -528,7 +517,7 @@ tokens, offsets, pug) {
             token.type !== 'text-html' &&
             token.type !== 'indent' &&
             token.type !== 'outdent') {
-            const endAttrLineOffset = Math.max((_a = offsets[beforeNewlineToken.loc.end.line - 2]) !== null && _a !== void 0 ? _a : 0, 0);
+            const endAttrLineOffset = Math.max(offsets[beforeNewlineToken.loc.end.line - 2] ?? 0, 0);
             const endAttrOffset = endAttrLineOffset + beforeNewlineToken.loc.end.column - 1;
             return {
                 endOffset: endAttrOffset,

package/lib/utils/get-offset-from-line-and-col.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOffsetFromLineAndCol = void 0;
-function getOffsetFromLineAndCol(str, line, col) {
+export function getOffsetFromLineAndCol(str, line, col) {
     const lines = str.split('\n').slice(0, line);
     const lastLine = lines.pop();
     if (lastLine) {
@@ -9,4 +6,3 @@ function getOffsetFromLineAndCol(str, line, col) {
     }
     return lines.join('\n').length;
 }
-exports.getOffsetFromLineAndCol = getOffsetFromLineAndCol;

package/package.json

@@ -1,12 +1,17 @@
 {
 	"name": "@markuplint/pug-parser",
-	"version": "3.10.0",
+	"version": "4.0.0-alpha.2",
 	"description": "Pug parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
 	"license": "MIT",
 	"private": false,
-	"main": "lib/index.js",
+	"type": "module",
+	"exports": {
+		".": {
+			"import": "./lib/index.js"
+		}
+	},
 	"types": "lib/index.d.ts",
 	"publishConfig": {
 		"access": "public"
@@ -16,12 +21,12 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "3.11.0",
-		"@markuplint/ml-ast": "3.2.0",
-		"@markuplint/parser-utils": "3.11.0",
+		"@markuplint/html-parser": "4.0.0-alpha.2",
+		"@markuplint/ml-ast": "4.0.0-alpha.2",
+		"@markuplint/parser-utils": "4.0.0-alpha.2",
 		"pug-lexer": "^5.0.1",
 		"pug-parser": "^6.0.0",
 		"tslib": "^2.6.2"
 	},
-	"gitHead": "ef31aef8f2fff319d0f692feead332ec5fc5c7cf"
+	"gitHead": "51ad52c760435641f9bff8685707d8178b0787eb"
 }