@markuplint/parser-utils 4.5.0 → 4.6.0

package/lib/attr-tokenizer.js

@@ -23,6 +23,7 @@ export function attrTokenizer(raw, quoteSet = defaultQuoteSet, startState = Attr
     let quoteStart = '';
     let attrValue = '';
     let valueType = noQuoteValueType;
+    let parser;
     let quoteEnd = '';
     const isBeforeValueStarted = startState === AttrState.BeforeValue;
     const chars = [...raw];
@@ -105,6 +106,7 @@ export function attrTokenizer(raw, quoteSet = defaultQuoteSet, startState = Attr
                 if (quote) {
                     quoteStart = quote.start;
                     valueType = quote.type;
+                    parser = quote.parser;
                     state = AttrState.Value;
                     break;
                 }
@@ -125,7 +127,7 @@ export function attrTokenizer(raw, quoteSet = defaultQuoteSet, startState = Attr
                 }
                 if (valueType === 'script') {
                     const raw = char + chars.join('');
-                    const { validScript } = safeScriptParser(raw);
+                    const { validScript } = safeScriptParser(raw, parser);
                     attrValue += validScript;
                     chars.splice(0, validScript.length - 1);
                     break;

package/lib/debugger.js

@@ -62,7 +62,7 @@ function tokenDebug(n, type = '') {
     }
     return `[${n.startLine}:${n.startCol}]>[${n.endLine}:${n.endCol}](${n.startOffset},${n.endOffset})${
     // @ts-ignore
-    n.potentialName ?? n.nodeName ?? n.name ?? n.type ?? type}${'isGhost' in n && n.isGhost ? '(👻)' : ''}${'isBogus' in n && n.isBogus ? '(👿)' : ''}: ${visibleWhiteSpace(n.raw)}`;
+    n.potentialName ?? n.nodeName ?? n.name ?? n.type ?? type}${'isGhost' in n && n.isGhost ? '(👻)' : ''}${'isBogus' in n && n.isBogus ? '(👿)' : ''}${'conditionalType' in n && n.conditionalType ? ` (${n.conditionalType})` : ''}: ${visibleWhiteSpace(n.raw)}`;
 }
 function visibleWhiteSpace(chars) {
     return chars.replaceAll('\n', '⏎').replaceAll('\t', '→').replaceAll(/\s/g, '␣');

package/lib/ignore-block.js

@@ -73,6 +73,7 @@ ignoreBlock, throwErrorWhenTagHasUnresolved = true) {
             const psNode = {
                 ...token,
                 type: 'psblock',
+                conditionalType: null,
                 depth: node.depth,
                 nodeName: `#ps:${tag.type}`,
                 parentNode: node.parentNode,
@@ -102,6 +103,7 @@ ignoreBlock, throwErrorWhenTagHasUnresolved = true) {
             const psNode = {
                 ...token,
                 type: 'psblock',
+                conditionalType: null,
                 depth: node.depth,
                 nodeName: `#ps:${tag.type}`,
                 parentNode: node.parentNode,

package/lib/parser.d.ts

@@ -1,5 +1,5 @@
 import type { Token, ChildToken, QuoteSet, ParseOptions, ParserOptions, Tokenized, ValueType } from './types.js';
-import type { EndTagType, MLASTDocument, MLASTParentNode, MLParser, ParserAuthoredElementNameDistinguishing, MLASTElement, MLASTElementCloseTag, MLASTToken, MLASTNodeTreeItem, MLASTTag, MLASTText, MLASTAttr, MLASTChildNode, MLASTSpreadAttr, ElementType, Walker, MLASTHTMLAttr } from '@markuplint/ml-ast';
+import type { EndTagType, MLASTDocument, MLASTParentNode, MLParser, ParserAuthoredElementNameDistinguishing, MLASTElement, MLASTElementCloseTag, MLASTToken, MLASTNodeTreeItem, MLASTTag, MLASTText, MLASTAttr, MLASTChildNode, MLASTSpreadAttr, ElementType, Walker, MLASTHTMLAttr, MLASTPreprocessorSpecificBlockConditionalType } from '@markuplint/ml-ast';
 import { AttrState } from './enums.js';
 import { ParserError } from './parser-error.js';
 export declare abstract class Parser<Node extends {} = {}, State extends unknown = null> implements MLParser {
@@ -71,7 +71,7 @@ export declare abstract class Parser<Node extends {} = {}, State extends unknown
     }): readonly MLASTNodeTreeItem[];
     visitPsBlock(token: ChildToken & {
         readonly nodeName: string;
-    }, childNodes?: readonly Node[], originBlockNode?: Node): readonly MLASTNodeTreeItem[];
+    }, childNodes?: readonly Node[], conditionalType?: MLASTPreprocessorSpecificBlockConditionalType, originBlockNode?: Node): readonly MLASTNodeTreeItem[];
     visitChildren(children: readonly Node[], parentNode: MLASTParentNode | null): readonly MLASTNodeTreeItem[];
     visitSpreadAttr(token: Token): MLASTSpreadAttr | null;
     visitAttr(token: Token, options?: {

package/lib/parser.js

@@ -308,11 +308,12 @@ export class Parser {
         }
         return [startTag, ...siblings];
     }
-    visitPsBlock(token, childNodes = [], originBlockNode) {
+    visitPsBlock(token, childNodes = [], conditionalType = null, originBlockNode) {
         const block = {
             ...token,
             ...this.createToken(token),
             type: 'psblock',
+            conditionalType,
             nodeName: `#ps:${token.nodeName}`,
             childNodes: [],
             isBogus: false,

package/lib/script-parser.d.ts

@@ -1,5 +1,6 @@
+import type { CustomParser } from './types.js';
 export declare function scriptParser(script: string): ScriptTokenType[];
-export declare function safeScriptParser(script: string): {
+export declare function safeScriptParser(script: string, parse?: CustomParser): {
     validScript: string;
     leftover: string;
 };

package/lib/script-parser.js

@@ -10,19 +10,19 @@ export function scriptParser(script) {
         value: token.value,
     }));
 }
-export function safeScriptParser(script) {
-    let { validScript, leftover } = safeParse(script);
+export function safeScriptParser(script, parse = defaultParse) {
+    let { validScript, leftover } = safeParse(script, parse);
     // Support for object literal
     if (leftover.trim()) {
         const assignment = '$=';
-        ({ validScript } = safeParse(`${assignment}${script}`));
+        ({ validScript } = safeParse(`${assignment}${script}`, parse));
         validScript = validScript.length > assignment.length ? validScript.slice(assignment.length) : '';
     }
     // Support for spread operator
     if (validScript.trim() === '') {
         const coverStart = '$={';
         const coverEnd = '}';
-        ({ validScript } = safeParse(`${coverStart}${script}${coverEnd}`));
+        ({ validScript } = safeParse(`${coverStart}${script}${coverEnd}`, parse));
         const coverEndLastIndex = validScript.lastIndexOf(coverEnd);
         validScript =
             validScript.length > coverStart.length + coverEnd.length
@@ -35,16 +35,11 @@ export function safeScriptParser(script) {
         leftover,
     };
 }
-function safeParse(script) {
+function safeParse(script, parse) {
     let validScript;
     let leftover;
     try {
-        parse(script, {
-            ecmaVersion: 'latest',
-            ecmaFeatures: {
-                jsx: true,
-            },
-        });
+        parse(script);
         validScript = script;
         leftover = '';
     }
@@ -67,3 +62,11 @@ function safeParse(script) {
         leftover,
     };
 }
+function defaultParse(script) {
+    parse(script, {
+        ecmaVersion: 'latest',
+        ecmaFeatures: {
+            jsx: true,
+        },
+    });
+}

package/lib/types.d.ts

@@ -54,5 +54,7 @@ export type QuoteSet = {
     readonly start: string;
     readonly end: string;
     readonly type: ValueType;
+    readonly parser?: CustomParser;
 };
+export type CustomParser = (code: string) => void;
 export type ValueType = 'string' | 'script';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/parser-utils",
-	"version": "4.5.0",
+	"version": "4.6.0",
 	"description": "Utility module for markuplint parser plugin",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -27,14 +27,17 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.2.0",
-		"@markuplint/ml-spec": "4.4.0",
-		"@markuplint/types": "4.3.0",
+		"@markuplint/ml-ast": "4.3.0",
+		"@markuplint/ml-spec": "4.5.0",
+		"@markuplint/types": "4.4.0",
 		"@types/uuid": "9.0.8",
 		"debug": "4.3.4",
 		"espree": "10.0.1",
-		"type-fest": "4.15.0",
+		"type-fest": "4.18.1",
 		"uuid": "9.0.1"
 	},
-	"gitHead": "d5c8786b0dbbd82cdd89018dd57941d62bbe8d06"
+	"devDependencies": {
+		"@typescript-eslint/typescript-estree": "7.8.0"
+	},
+	"gitHead": "b8d7bae9bdcdad63ff79abe21b88be12abde3633"
 }