@markuplint/pug-parser 3.4.0 → 3.6.0

package/lib/attr-tokenizer.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const parser_utils_1 = require("@markuplint/parser-utils");
-function attrTokenizer(attr) {
+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] = attr.val.match(/(['"`]?)([^\1]+)(\1)/) || ['', '', ''];
+            [, , value] = (_a = attr.val.match(/(['"`]?)([^\1]+)(\1)/)) !== null && _a !== void 0 ? _a : ['', '', ''];
         }
         else {
             value = `${attr.val}`;
@@ -51,8 +54,8 @@ function attrTokenizer(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] = equalAndBeforeSpaceAfterSpace.match(/^(\s*)(=)(\s*)$/) || ['', '', '', ''];
-        const [, quote, coreValue] = attr.val.match(/(['"`]?)([^\1]+)(\1)/) || ['', '', ''];
+        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 : '';

package/lib/parse.js

@@ -46,19 +46,27 @@ class Parser {
         tslib_1.__classPrivateFieldSet(this, _Parser_ast, (0, pug_parser_1.pugParse)(raw), "f");
         // console.log(JSON.stringify(this.#ast, null, 2));
     }
-    flattenNodes(nodeTree) {
+    flattenNodes(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    nodeTree) {
         const nodeOrders = [];
         (0, parser_utils_1.walk)(nodeTree, node => {
             nodeOrders.push(node);
         });
-        (0, html_parser_1.removeDeprecatedNode)(nodeOrders);
+        (0, parser_utils_1.removeDeprecatedNode)(nodeOrders);
         return nodeOrders;
     }
     getNodeList() {
         const nodeTree = this.traverse(tslib_1.__classPrivateFieldGet(this, _Parser_ast, "f").nodes, null);
         return this.flattenNodes(nodeTree);
     }
-    nodeize(originNode, prevNode, parentNode) {
+    nodeize(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    originNode, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    prevNode, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    parentNode) {
         var _a;
         const nextNode = null;
         const startOffset = originNode.offset;
@@ -73,7 +81,7 @@ class Parser {
                 return {
                     uuid: (0, parser_utils_1.uuid)(),
                     raw: originNode.raw,
-                    name: originNode.val || '',
+                    name: (_a = originNode.val) !== null && _a !== void 0 ? _a : '',
                     // TODO:
                     publicId: '',
                     // TODO:
@@ -174,7 +182,7 @@ class Parser {
                     tagOpenChar: '',
                     tagCloseChar: '',
                 };
-                if (originNode.block.nodes.length) {
+                if (originNode.block.nodes.length > 0) {
                     tag.childNodes = this.traverse(originNode.block.nodes, tag);
                 }
                 return tag;
@@ -197,14 +205,16 @@ class Parser {
                     isFragment: true,
                     isGhost: false,
                 };
-                if ('block' in originNode && ((_a = originNode.block) === null || _a === void 0 ? void 0 : _a.nodes.length)) {
+                if ('block' in originNode && originNode.block && originNode.block.nodes.length > 0) {
                     tag.childNodes = this.traverse(originNode.block.nodes, tag);
                 }
                 return tag;
             }
         }
     }
-    traverse(astNodes, parentNode = null) {
+    traverse(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    astNodes, parentNode = null) {
         const nodeList = [];
         let prevNode = null;
         for (const astNode of astNodes) {

package/lib/pug-parser/index.js

@@ -26,10 +26,13 @@ function getOffsetsFromLines(pug) {
     });
     return result;
 }
-function mergeTextNode(nodes, 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 = baseNodes[baseNodes.length - 1] || null;
+        const prevNode = (_a = baseNodes[baseNodes.length - 1]) !== null && _a !== void 0 ? _a : null;
         if (prevNode && prevNode.type === 'Text' && node.type === 'Text') {
             prevNode.raw = pug.slice(prevNode.offset, node.endOffset);
             prevNode.endColumn = node.endColumn;
@@ -47,14 +50,18 @@ function mergeTextNode(nodes, pug) {
  * @param tokens Lexed token list
  * @param pug Raw code
  */
-function optimizeAST(originalAST, tokens, pug) {
+function optimizeAST(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+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) || 0;
+        const lineOffset = Math.max((_a = offsets[line - 2]) !== null && _a !== void 0 ? _a : 0, 0);
         const offset = lineOffset + column - 1;
         const { endLine, endColumn, endOffset } = getLocationFromToken(offset, line, column, tokens);
         const raw = pug.slice(offset, endOffset);
@@ -304,7 +311,11 @@ function optimizeAST(originalAST, tokens, pug) {
         line: originalAST.line,
     };
 }
-function optimizeASTOfConditionalNode(node, tokens, pug, offsets, depth) {
+function optimizeASTOfConditionalNode(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+node, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+tokens, pug, offsets, depth) {
     var _a, _b;
     const altNodes = [];
     let tokenOfCurrentNode = null;
@@ -316,7 +327,7 @@ function optimizeASTOfConditionalNode(node, 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) || 0;
+        const lineOffset = Math.max((_a = offsets[node.line - 2]) !== null && _a !== void 0 ? _a : 0, 0);
         const offset = lineOffset + node.column - 1;
         const length = tokenOfCurrentNode.loc.end.column - tokenOfCurrentNode.loc.start.column;
         const endOffset = offset + length;
@@ -348,7 +359,7 @@ function optimizeASTOfConditionalNode(node, 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) || 0;
+                const lineOffset = Math.max((_b = offsets[tokenOfCurrentNode.loc.start.line - 2]) !== null && _b !== void 0 ? _b : 0, 0);
                 const offset = lineOffset + tokenOfCurrentNode.loc.start.column - 1;
                 const length = tokenOfCurrentNode.loc.end.column - tokenOfCurrentNode.loc.start.column;
                 const endOffset = offset + length;
@@ -376,14 +387,13 @@ function optimizeASTOfConditionalNode(node, tokens, pug, offsets, depth) {
     }
     return altNodes;
 }
-function getLocationFromToken(offset, line, column, tokens, tokenType = '') {
+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;
     let tokenOfCurrentNode = null;
     for (const token of tokens) {
-        if ((tokenType
-            ? Array.isArray(tokenType)
-                ? tokenType.includes(token.type)
-                : tokenType === token.type
-            : true) &&
+        if ((tokenTypes == null || tokenTypes.includes(token.type)) &&
             token.loc.start.line === line &&
             token.loc.start.column === column) {
             tokenOfCurrentNode = token;
@@ -401,10 +411,15 @@ function getLocationFromToken(offset, line, column, tokens, tokenType = '') {
         length,
     };
 }
-function getAttrs(originalAttrs, tokens, offsets, pug) {
+function getAttrs(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+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 = offsets[attr.line - 2] || 0;
+        const attrLineOffset = (_a = offsets[attr.line - 2]) !== null && _a !== void 0 ? _a : 0;
         const attrOffset = attrLineOffset + attr.column - 1;
         let tokenOfCurrentAttr = null;
         for (const token of tokens) {
@@ -434,7 +449,9 @@ function getAttrs(originalAttrs, tokens, offsets, pug) {
     }
     return attrs;
 }
-function getEndAttributeLocation(nodeName, offset, line, column, tokens, offsets) {
+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) {
@@ -446,7 +463,7 @@ function getEndAttributeLocation(nodeName, offset, line, column, 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) || 0;
+            const endAttrLineOffset = Math.max((_a = offsets[beforeNewlineToken.loc.end.line - 2]) !== null && _a !== void 0 ? _a : 0, 0);
             const endAttrOffset = endAttrLineOffset + beforeNewlineToken.loc.end.column - 1;
             return {
                 endOffset: endAttrOffset,
@@ -462,7 +479,11 @@ function getEndAttributeLocation(nodeName, offset, line, column, tokens, offsets
         endColumn: column + nodeName.length,
     };
 }
-function getPipelessText(node, pug, tokens) {
+function getPipelessText(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+node, pug, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+tokens) {
     let startPipelessText = null;
     let endPipelessText = null;
     for (const token of tokens) {
@@ -494,7 +515,9 @@ function getPipelessText(node, pug, tokens) {
     }
     return null;
 }
-function getRawTextAndLocationEnd(val, offset, line, column, tokens, offsets, pug) {
+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) {
@@ -505,7 +528,7 @@ function getRawTextAndLocationEnd(val, offset, line, column, tokens, offsets, pu
             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) || 0;
+            const endAttrLineOffset = Math.max((_a = offsets[beforeNewlineToken.loc.end.line - 2]) !== null && _a !== void 0 ? _a : 0, 0);
             const endAttrOffset = endAttrLineOffset + beforeNewlineToken.loc.end.column - 1;
             return {
                 endOffset: endAttrOffset,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/pug-parser",
-	"version": "3.4.0",
+	"version": "3.6.0",
 	"description": "Pug parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -16,12 +16,12 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "3.4.0",
-		"@markuplint/ml-ast": "3.0.0",
-		"@markuplint/parser-utils": "3.4.0",
+		"@markuplint/html-parser": "3.6.0",
+		"@markuplint/ml-ast": "3.1.0",
+		"@markuplint/parser-utils": "3.6.0",
 		"pug-lexer": "^5.0.1",
 		"pug-parser": "^6.0.0",
 		"tslib": "^2.4.1"
 	},
-	"gitHead": "a83e0f5f214a9bbcc0286b9e269074ddca6189e7"
+	"gitHead": "715dd53d3b1064a9bcf616c1533921cad9e3b187"
 }