@markuplint/pug-parser 3.3.1 → 3.4.0

package/lib/attr-tokenizer.js

@@ -21,7 +21,7 @@ function attrTokenizer(attr) {
             startCol: attr.column,
             endCol: attr.endColumn,
             potentialName: attr.name,
-            potentialValue: value,
+            potentialValue: value !== null && value !== void 0 ? value : '',
             valueType: 'string',
             isDuplicatable: attr.raw[0] === '.',
             nodeName: '#pug-special-attr',
@@ -53,11 +53,11 @@ function attrTokenizer(attr) {
         const equalAndBeforeSpaceAfterSpace = withoutName.slice(0, valueOffset);
         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;
+        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 : '';
         if (quote === '`' || quote === '') {
             isDynamicValue = true;
         }

package/lib/parse.js

@@ -214,7 +214,11 @@ class Parser {
             }
             let node;
             if (Array.isArray(nodes)) {
-                node = nodes[nodes.length - 1];
+                const lastNode = nodes[nodes.length - 1];
+                if (!lastNode) {
+                    continue;
+                }
+                node = lastNode;
             }
             else {
                 node = nodes;

package/lib/pug-parser/index.js

@@ -48,12 +48,13 @@ function mergeTextNode(nodes, pug) {
  * @param pug Raw code
  */
 function optimizeAST(originalAST, 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(offsets[line - 2], 0) || 0;
+        const lineOffset = Math.max((_a = offsets[line - 2]) !== null && _a !== void 0 ? _a : 0, 0) || 0;
         const offset = lineOffset + column - 1;
         const { endLine, endColumn, endOffset } = getLocationFromToken(offset, line, column, tokens);
         const raw = pug.slice(offset, endOffset);
@@ -304,6 +305,7 @@ function optimizeAST(originalAST, tokens, pug) {
     };
 }
 function optimizeASTOfConditionalNode(node, tokens, pug, offsets, depth) {
+    var _a, _b;
     const altNodes = [];
     let tokenOfCurrentNode = null;
     for (const token of tokens) {
@@ -314,7 +316,7 @@ function optimizeASTOfConditionalNode(node, tokens, pug, offsets, depth) {
     }
     if (tokenOfCurrentNode) {
         // console.log(JSON.stringify(node, null, 2));
-        const lineOffset = Math.max(offsets[node.line - 2], 0) || 0;
+        const lineOffset = Math.max((_a = offsets[node.line - 2]) !== null && _a !== void 0 ? _a : 0, 0) || 0;
         const offset = lineOffset + node.column - 1;
         const length = tokenOfCurrentNode.loc.end.column - tokenOfCurrentNode.loc.start.column;
         const endOffset = offset + length;
@@ -346,7 +348,7 @@ function optimizeASTOfConditionalNode(node, tokens, pug, offsets, depth) {
                 if (!tokenOfCurrentNode) {
                     return [];
                 }
-                const lineOffset = Math.max(offsets[tokenOfCurrentNode.loc.start.line - 2], 0) || 0;
+                const lineOffset = Math.max((_b = offsets[tokenOfCurrentNode.loc.start.line - 2]) !== null && _b !== void 0 ? _b : 0, 0) || 0;
                 const offset = lineOffset + tokenOfCurrentNode.loc.start.column - 1;
                 const length = tokenOfCurrentNode.loc.end.column - tokenOfCurrentNode.loc.start.column;
                 const endOffset = offset + length;
@@ -433,6 +435,7 @@ function getAttrs(originalAttrs, tokens, offsets, pug) {
     return attrs;
 }
 function getEndAttributeLocation(nodeName, offset, line, column, tokens, offsets) {
+    var _a;
     let beforeNewlineToken = null;
     for (const token of tokens) {
         // Searching token after the tag node.
@@ -443,7 +446,7 @@ function getEndAttributeLocation(nodeName, offset, line, column, tokens, offsets
             token.type !== 'end-attributes' &&
             token.type !== 'id' &&
             token.type !== 'class') {
-            const endAttrLineOffset = Math.max(offsets[beforeNewlineToken.loc.end.line - 2], 0) || 0;
+            const endAttrLineOffset = Math.max((_a = offsets[beforeNewlineToken.loc.end.line - 2]) !== null && _a !== void 0 ? _a : 0, 0) || 0;
             const endAttrOffset = endAttrLineOffset + beforeNewlineToken.loc.end.column - 1;
             return {
                 endOffset: endAttrOffset,
@@ -492,6 +495,7 @@ function getPipelessText(node, pug, tokens) {
     return null;
 }
 function getRawTextAndLocationEnd(val, offset, line, column, tokens, offsets, pug) {
+    var _a;
     let beforeNewlineToken = null;
     for (const token of tokens) {
         // Searching token after the text.
@@ -501,7 +505,7 @@ function getRawTextAndLocationEnd(val, offset, line, column, tokens, offsets, pu
             token.type !== 'text-html' &&
             token.type !== 'indent' &&
             token.type !== 'outdent') {
-            const endAttrLineOffset = Math.max(offsets[beforeNewlineToken.loc.end.line - 2], 0) || 0;
+            const endAttrLineOffset = Math.max((_a = offsets[beforeNewlineToken.loc.end.line - 2]) !== null && _a !== void 0 ? _a : 0, 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.3.1",
+	"version": "3.4.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.3.1",
+		"@markuplint/html-parser": "3.4.0",
 		"@markuplint/ml-ast": "3.0.0",
-		"@markuplint/parser-utils": "3.3.0",
+		"@markuplint/parser-utils": "3.4.0",
 		"pug-lexer": "^5.0.1",
 		"pug-parser": "^6.0.0",
 		"tslib": "^2.4.1"
 	},
-	"gitHead": "f19e7de726cf01d53342bc5513c30da75d28da63"
+	"gitHead": "a83e0f5f214a9bbcc0286b9e269074ddca6189e7"
 }