@markuplint/pug-parser 4.0.0-alpha.3 → 4.0.0-alpha.5

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2019 Yusuke Hirao
+Copyright (c) 2017-2023 Yusuke Hirao
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/attr-tokenizer.d.ts

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

package/lib/attr-tokenizer.js

@@ -1,15 +1,10 @@
-import { tokenizer, uuid } from '@markuplint/parser-utils';
-export default function attrTokenizer(
+import { tokenizer, uuid, scriptParser, removeQuote } from '@markuplint/parser-utils';
+export function attrTokenizer(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 attr) {
     if (attr.raw[0] === '#' || attr.raw[0] === '.') {
-        let value = '';
-        if (typeof attr.val === 'string') {
-            [, , value] = attr.val.match(/(['"`]?)([^\1]+)(\1)/) ?? ['', '', ''];
-        }
-        else {
-            value = `${attr.val}`;
-        }
+        const value = `${attr.val}`;
+        const potentialValue = removeQuote(value);
         return {
             type: 'ps-attr',
             uuid: uuid(),
@@ -21,7 +16,7 @@ attr) {
             startCol: attr.column,
             endCol: attr.endColumn,
             potentialName: attr.name,
-            potentialValue: value ?? '',
+            potentialValue,
             valueType: 'string',
             isDuplicatable: attr.raw[0] === '.',
             nodeName: '#pug-special-attr',
@@ -37,32 +32,33 @@ attr) {
     let spacesBeforeEqualChars;
     let equalChars;
     let spacesAfterEqualChars;
-    let quoteChars;
+    const quoteChars = '';
     let valueChars;
+    let potentialValue;
     let isDynamicValue = undefined;
     if (attr.val === true) {
         spacesBeforeEqualChars = '';
         equalChars = '';
         spacesAfterEqualChars = '';
-        quoteChars = '';
         valueChars = '';
+        potentialValue = '';
     }
     else {
         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 valueTokens = scriptParser(attr.val);
         spacesBeforeEqualChars = before ?? '';
         equalChars = equal ?? '';
         spacesAfterEqualChars = after ?? '';
-        quoteChars = quote ?? '';
-        valueChars = coreValue ?? '';
-        if (quote === '`' || quote === '') {
+        valueChars = attr.val;
+        potentialValue = removeQuote(attr.val);
+        if (valueTokens.length > 1 || valueTokens[0].type !== 'String') {
             isDynamicValue = true;
         }
     }
-    const invalid = !!(valueChars && quoteChars === null && /["'=<>`]/.test(valueChars)) ||
+    const invalid = !!(valueChars && quoteChars === null && /["'<=>`]/.test(valueChars)) ||
         !!(equalChars && quoteChars === null && valueChars === null);
     if (invalid) {
         throw new Error('Parse error: It has invalid attribute');
@@ -127,6 +123,7 @@ attr) {
         endQuote,
         isDynamicValue,
         isDuplicatable,
+        potentialValue,
         nodeName: name.raw,
         parentNode: null,
         nextNode: null,

package/lib/parse.js

@@ -1,8 +1,18 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var _Parser_ast;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
-import { getNamespace, parse as htmlParser, isDocumentFragment } from '@markuplint/html-parser';
+import { getNamespace, parse as htmlParse, isDocumentFragment } from '@markuplint/html-parser';
 import { detectElementType, ignoreFrontMatter, ParserError, tokenizer, uuid, walk, removeDeprecatedNode, } from '@markuplint/parser-utils';
-import attrTokenizer from './attr-tokenizer.js';
+import { attrTokenizer } from './attr-tokenizer.js';
 import { pugParse } from './pug-parser/index.js';
 export const parse = (rawCode, options) => {
     let unknownParseError;
@@ -14,21 +24,21 @@ export const parse = (rawCode, options) => {
         const parser = new Parser(rawCode);
         nodeList = parser.getNodeList();
     }
-    catch (err) {
+    catch (error) {
         nodeList = [];
-        if (err instanceof Error && 'msg' in err && 'line' in err && 'column' in err && 'src' in err) {
+        if (error instanceof Error && 'msg' in error && 'line' in error && 'column' in error && 'src' in error) {
             throw new ParserError(
             // @ts-ignore
-            err.msg, {
+            error.msg, {
                 // @ts-ignore
-                line: err.line,
+                line: error.line,
                 // @ts-ignore
-                col: err.column,
+                col: error.column,
                 // @ts-ignore
-                raw: err.src,
+                raw: error.src,
             });
         }
-        unknownParseError = err instanceof Error ? err.message : new Error(`${err}`).message;
+        unknownParseError = error instanceof Error ? error.message : new Error(`${error}`).message;
     }
     return {
         nodeList,
@@ -117,17 +127,14 @@ class Parser {
                         isGhost: false,
                     };
                 }
-                const htmlDoc = htmlParser(originNode.raw, {
+                const htmlDoc = htmlParse(originNode.raw, {
                     offsetOffset: originNode.offset,
                     offsetLine: originNode.line - 1,
                     offsetColumn: originNode.column - 1,
                 });
-                const nodes = htmlDoc.nodeList;
-                for (const node of nodes) {
-                    if (!node.parentNode) {
-                        node.parentNode = parentNode;
-                    }
-                }
+                const nodes = htmlDoc.nodeList.filter(node => {
+                    return node.parentNode == null && node.type !== 'endtag';
+                });
                 return nodes;
             }
             case 'Comment': {
@@ -219,7 +226,7 @@ class Parser {
             }
             let node;
             if (Array.isArray(nodes)) {
-                const lastNode = nodes[nodes.length - 1];
+                const lastNode = nodes.at(-1);
                 if (!lastNode) {
                     continue;
                 }

package/lib/pug-parser/index.js

@@ -13,7 +13,7 @@ export function pugParse(pug) {
     return ast;
 }
 function getOffsetsFromLines(pug) {
-    const lines = pug.split(/\n/g);
+    const lines = pug.split(/\n/);
     let chars = 0;
     const result = lines.map(line => {
         chars += line.length + 1;
@@ -26,7 +26,7 @@ function mergeTextNode(
 nodes, pug) {
     const baseNodes = [];
     for (const node of nodes) {
-        const prevNode = baseNodes[baseNodes.length - 1] ?? null;
+        const prevNode = baseNodes.at(-1) ?? null;
         if (prevNode && prevNode.type === 'Text' && node.type === 'Text') {
             prevNode.raw = pug.slice(prevNode.offset, node.endOffset);
             prevNode.endColumn = node.endColumn;
@@ -382,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;
+    const tokenTypes = typeof tokenType === 'string' ? (tokenType === '' ? null : [tokenType]) : tokenType ?? null;
     let tokenOfCurrentNode = null;
     for (const token of tokens) {
         if ((tokenTypes == null || tokenTypes.includes(token.type)) &&

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

@@ -2,7 +2,7 @@ export function getOffsetFromLineAndCol(str, line, col) {
     const lines = str.split('\n').slice(0, line);
     const lastLine = lines.pop();
     if (lastLine) {
-        lines.push(lastLine.split('').slice(0, col).join(''));
+        lines.push([...lastLine].slice(0, col).join(''));
     }
     return lines.join('\n').length;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/pug-parser",
-	"version": "4.0.0-alpha.3",
+	"version": "4.0.0-alpha.5",
 	"description": "Pug parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,12 +21,11 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.0.0-alpha.3",
-		"@markuplint/ml-ast": "4.0.0-alpha.3",
-		"@markuplint/parser-utils": "4.0.0-alpha.3",
+		"@markuplint/html-parser": "4.0.0-alpha.5",
+		"@markuplint/ml-ast": "4.0.0-alpha.5",
+		"@markuplint/parser-utils": "4.0.0-alpha.5",
 		"pug-lexer": "^5.0.1",
-		"pug-parser": "^6.0.0",
-		"tslib": "^2.6.2"
+		"pug-parser": "^6.0.0"
 	},
-	"gitHead": "380836f7adc1ff7e8eaf9d869e68d29eee8f3b7e"
+	"gitHead": "0c3e4690662edf1765bcc4b6411ec5507c1e2ea3"
 }