@markuplint/pug-parser 4.0.0-alpha.4 → 4.0.0-alpha.6

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)/)?.[2] ?? '';
-        }
-        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,28 +32,29 @@ 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;
         }
     }
@@ -127,6 +123,7 @@ attr) {
         endQuote,
         isDynamicValue,
         isDuplicatable,
+        potentialValue,
         nodeName: name.raw,
         parentNode: null,
         nextNode: null,

package/lib/parse.js

@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _Parser_ast;
 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;

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;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/pug-parser",
-	"version": "4.0.0-alpha.4",
+	"version": "4.0.0-alpha.6",
 	"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.0.0-alpha.4",
-		"@markuplint/ml-ast": "4.0.0-alpha.4",
-		"@markuplint/parser-utils": "4.0.0-alpha.4",
+		"@markuplint/html-parser": "4.0.0-alpha.6",
+		"@markuplint/ml-ast": "4.0.0-alpha.6",
+		"@markuplint/parser-utils": "4.0.0-alpha.6",
 		"pug-lexer": "^5.0.1",
 		"pug-parser": "^6.0.0"
 	},
-	"gitHead": "991b3aef77fde42c79343ee8c807257a35c589d7"
+	"gitHead": "06e1242d274c72cf08a10a572b06ac35d1b924a4"
 }