@markuplint/pug-parser 4.0.0-alpha.10 → 4.0.0-alpha.11

package/lib/parser.d.ts

@@ -19,11 +19,7 @@ declare class PugParser extends Parser<ASTNode> {
             readonly attributes: readonly MLASTAttr[];
         };
     }): MLASTNodeTreeItem[];
-    visitAttr(token: Token): (import("@markuplint/ml-ast").MLASTHTMLAttr & {
-        __rightText?: string | undefined;
-    }) | (import("@markuplint/ml-ast").MLASTSpreadAttr & {
-        __rightText?: string | undefined;
-    });
+    visitAttr(token: Token): MLASTAttr;
 }
 export declare const parser: PugParser;
 export {};

package/lib/parser.js

@@ -1,5 +1,5 @@
 import { getNamespace, parser as htmlParser } from '@markuplint/html-parser';
-import { ParserError, Parser, AttrState, removeQuote, scriptParser } from '@markuplint/parser-utils';
+import { ParserError, Parser, AttrState, scriptParser } from '@markuplint/parser-utils';
 import { pugParse } from './pug-parser/index.js';
 class PugParser extends Parser {
     constructor() {
@@ -143,20 +143,56 @@ class PugParser extends Parser {
         const valueCodeTokens = scriptParser(attr.value.raw.trim());
         if (valueCodeTokens.length === 1) {
             const token = valueCodeTokens[0];
-            if (token.type === 'Numeric' || token.type === 'Boolean') {
-                this.updateAttr(attr, { potentialValue: token.value });
-            }
-            else if (token.type === 'String' || token.type === 'Template') {
-                this.updateAttr(attr, { potentialValue: removeQuote(token.value) });
-            }
-            else {
-                this.updateAttr(attr, { isDynamicValue: true });
+            switch (token.type) {
+                case 'Numeric': {
+                    return {
+                        ...attr,
+                        potentialValue: token.value,
+                        valueType: 'number',
+                    };
+                }
+                case 'Boolean': {
+                    return {
+                        ...attr,
+                        potentialValue: token.value,
+                        valueType: 'boolean',
+                    };
+                }
+                case 'String':
+                case 'Template': {
+                    const value = super.visitAttr(attr.value, {
+                        startState: AttrState.BeforeValue,
+                        quoteSet: [
+                            { start: '"', end: '"' },
+                            { start: "'", end: "'" },
+                            { start: '`', end: '`' },
+                        ],
+                        quoteInValueChars: [
+                            { start: '"', end: '"' },
+                            { start: "'", end: "'" },
+                            { start: '`', end: '`' },
+                            { start: '${', end: '}' },
+                        ],
+                    });
+                    if (value.type === 'spread') {
+                        throw new ParserError('Unexpected attribute value', value);
+                    }
+                    return {
+                        ...attr,
+                        startQuote: value.startQuote,
+                        value: value.value,
+                        endQuote: value.endQuote,
+                        potentialValue: value.value.raw,
+                        valueType: 'string',
+                    };
+                }
             }
         }
-        else {
-            this.updateAttr(attr, { isDynamicValue: true });
-        }
-        return attr;
+        return {
+            ...attr,
+            isDynamicValue: true,
+            valueType: 'code',
+        };
     }
 }
 export const parser = new PugParser();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/pug-parser",
-	"version": "4.0.0-alpha.10",
+	"version": "4.0.0-alpha.11",
 	"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.10",
-		"@markuplint/ml-ast": "4.0.0-alpha.10",
-		"@markuplint/parser-utils": "4.0.0-alpha.10",
+		"@markuplint/html-parser": "4.0.0-alpha.11",
+		"@markuplint/ml-ast": "4.0.0-alpha.11",
+		"@markuplint/parser-utils": "4.0.0-alpha.11",
 		"pug-lexer": "^5.0.1",
 		"pug-parser": "^6.0.0"
 	},
-	"gitHead": "b41153ea665aa8f091daf6114a06047f4ccb8350"
+	"gitHead": "78ab1adaa4e178b4187f6c5f135bb8fc0c8f4b9e"
 }