@markuplint/parser-utils 4.0.0-dev.23 → 4.0.0-rc.0

package/lib/debug.d.ts

@@ -0,0 +1,4 @@
+import type { MLASTNode } from '@markuplint/ml-ast';
+import debug from 'debug';
+export declare const log: debug.Debugger;
+export declare function domLog(nodeList: readonly (MLASTNode | null)[]): void;

package/lib/debug.js

@@ -0,0 +1,6 @@
+import debug from 'debug';
+import { nodeListToDebugMaps } from './debugger.js';
+export const log = debug('ml-parser');
+export function domLog(nodeList) {
+    log('Parse result: %O', nodeListToDebugMaps(nodeList, true));
+}

package/lib/debugger.js

@@ -24,6 +24,12 @@ export function attributesToDebugMaps(attributes) {
         if (n.potentialName != null) {
             r.push(`  potentialName: ${visibleWhiteSpace(n.potentialName)}`);
         }
+        if (n.potentialValue != null) {
+            r.push(`  potentialValue: ${visibleWhiteSpace(n.potentialValue)}`);
+        }
+        if (n.valueType != null) {
+            r.push(`  valueType: ${visibleWhiteSpace(n.valueType)}`);
+        }
         if (n.candidate) {
             r.push(`  candidate: ${visibleWhiteSpace(n.candidate)}`);
         }

package/lib/parser.d.ts

@@ -28,7 +28,7 @@ export declare abstract class Parser<Node extends {} = {}, State extends unknown
     get rawCode(): string;
     get tagNameCaseSensitive(): boolean;
     constructor(options?: ParserOptions, defaultState?: State);
-    tokenize(): Tokenized<Node, State>;
+    tokenize(options?: ParseOptions): Tokenized<Node, State>;
     beforeParse(rawCode: string, options?: ParseOptions): string;
     parse(rawCode: string, options?: ParseOptions): MLASTDocument;
     afterParse(nodeList: readonly MLASTNodeTreeItem[], options?: ParseOptions): readonly MLASTNodeTreeItem[];
@@ -102,6 +102,10 @@ export declare abstract class Parser<Node extends {} = {}, State extends unknown
     createToken(token: Token): MLASTToken;
     createToken(token: string, startOffset: number, startLine: number, startCol: number): MLASTToken;
     sliceFragment(start: number, end?: number): Token;
+    getOffsetsFromCode(startLine: number, startCol: number, endLine: number, endCol: number): {
+        offset: number;
+        endOffset: number;
+    };
     walk<Node extends MLASTNodeTreeItem>(nodeList: readonly Node[], walker: Walker<Node>, depth?: number): void;
     appendChild(parentNode: MLASTParentNode | null, ...childNodes: readonly MLASTChildNode[]): void;
     replaceChild(parentNode: MLASTParentNode, oldChildNode: MLASTChildNode, newChildNode: MLASTChildNode): void;

package/lib/parser.js

@@ -9,11 +9,12 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     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 _Parser_instances, _Parser_booleanish, _Parser_defaultState, _Parser_endTagType, _Parser_ignoreTags, _Parser_maskChar, _Parser_tagNameCaseSensitive, _Parser_selfCloseType, _Parser_spaceChars, _Parser_rawTextElements, _Parser_authoredElementName, _Parser_originalRawCode, _Parser_rawCode, _Parser_defaultDepth, _Parser_walkMethodSequentailPrevNode, _Parser_arrayize, _Parser_concatText, _Parser_concatTextNodes, _Parser_convertIntoInvalidNode, _Parser_createOffsetSpaces, _Parser_createRemnantNode, _Parser_exposeRemnantNodes, _Parser_getEndLocation, _Parser_orphanEndTagToBogusMark, _Parser_pairing, _Parser_parseEndTag, _Parser_parseStartTag, _Parser_parseTag, _Parser_removeChild, _Parser_removeDeprecatedNode, _Parser_removeOffsetSpaces, _Parser_reset, _Parser_setRawCode, _Parser_siblingsCorrection;
+var _Parser_instances, _Parser_booleanish, _Parser_defaultState, _Parser_endTagType, _Parser_ignoreTags, _Parser_maskChar, _Parser_tagNameCaseSensitive, _Parser_selfCloseType, _Parser_spaceChars, _Parser_rawTextElements, _Parser_authoredElementName, _Parser_originalRawCode, _Parser_rawCode, _Parser_defaultDepth, _Parser_walkMethodSequentailPrevNode, _Parser_arrayize, _Parser_concatText, _Parser_concatTextNodes, _Parser_convertIntoInvalidNode, _Parser_createOffsetSpaces, _Parser_createRemnantNode, _Parser_exposeRemnantNodes, _Parser_getEndLocation, _Parser_orphanEndTagToBogusMark, _Parser_pairing, _Parser_parseEndTag, _Parser_parseStartTag, _Parser_parseTag, _Parser_removeChild, _Parser_removeDeprecatedNode, _Parser_removeOffsetSpaces, _Parser_reset, _Parser_setRawCode, _Parser_siblingsCorrection, _Parser_trimText;
 import { isVoidElement as detectVoidElement } from '@markuplint/ml-spec';
 import { v4 as uuid } from 'uuid';
 import { attrTokenizer } from './attr-tokenizer.js';
 import { defaultSpaces } from './const.js';
+import { domLog } from './debug.js';
 import { detectElementType } from './detect-element-type.js';
 import { AttrState, TagState } from './enums.js';
 import { getCol, getEndCol, getEndLine, getLine } from './get-location.js';
@@ -81,7 +82,7 @@ export class Parser {
         __classPrivateFieldSet(this, _Parser_defaultState, defaultState ?? null, "f");
         this.state = structuredClone(__classPrivateFieldGet(this, _Parser_defaultState, "f"));
     }
-    tokenize() {
+    tokenize(options) {
         return {
             ast: [],
             isFragment: false,
@@ -106,7 +107,7 @@ export class Parser {
             }
             const blocks = ignoreBlock(this.rawCode, __classPrivateFieldGet(this, _Parser_ignoreTags, "f"), __classPrivateFieldGet(this, _Parser_maskChar, "f"));
             __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_setRawCode).call(this, blocks.replaced);
-            const tokenized = this.tokenize();
+            const tokenized = this.tokenize(options);
             const ast = tokenized.ast;
             const isFragment = tokenized.isFragment;
             __classPrivateFieldSet(this, _Parser_defaultDepth, options?.depth ?? __classPrivateFieldGet(this, _Parser_defaultDepth, "f"), "f");
@@ -140,6 +141,7 @@ export class Parser {
                 }
                 nodeList = [fmNode, ...newNodeList];
             }
+            domLog(nodeList);
             __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_reset).call(this);
             return {
                 raw: rawCode,
@@ -225,6 +227,7 @@ export class Parser {
         if (concatText) {
             nodeList = __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_concatText).call(this, nodeList);
         }
+        nodeList = __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_trimText).call(this, nodeList);
         return nodeList;
     }
     visitDoctype(token) {
@@ -579,6 +582,28 @@ export class Parser {
             startCol: getCol(this.rawCode, start),
         };
     }
+    getOffsetsFromCode(startLine, startCol, endLine, endCol) {
+        const lines = __classPrivateFieldGet(this, _Parser_rawCode, "f").split('\n');
+        let offset = 0;
+        let endOffset = 0;
+        for (let i = 0; i < startLine - 1; i++) {
+            const line = lines[i];
+            if (line == null) {
+                continue;
+            }
+            offset += line.length + 1;
+        }
+        offset += startCol - 1;
+        for (let i = 0; i < endLine - 1; i++) {
+            const line = lines[i];
+            if (line == null) {
+                continue;
+            }
+            endOffset += line.length + 1;
+        }
+        endOffset += endCol - 1;
+        return { offset, endOffset };
+    }
     walk(nodeList, walker, depth = 0) {
         for (const node of nodeList) {
             walker(node, __classPrivateFieldGet(this, _Parser_walkMethodSequentailPrevNode, "f"), depth);
@@ -1073,4 +1098,23 @@ _Parser_booleanish = new WeakMap(), _Parser_defaultState = new WeakMap(), _Parse
         newNodes.push(node);
     }
     return newNodes;
+}, _Parser_trimText = function _Parser_trimText(nodeList) {
+    const newNodeList = [];
+    let prevNode = null;
+    for (const node of nodeList) {
+        if (prevNode?.type === 'text' &&
+            // Empty node
+            node.startOffset !== node.endOffset) {
+            const prevNodeEndOffset = prevNode.endOffset;
+            const nodeStartOffset = node.startOffset;
+            if (prevNodeEndOffset > nodeStartOffset) {
+                const prevNodeRaw = prevNode.raw;
+                const prevNodeTrimmedRaw = prevNodeRaw.slice(0, nodeStartOffset - prevNode.startOffset);
+                this.updateRaw(prevNode, prevNodeTrimmedRaw);
+            }
+        }
+        newNodeList.push(node);
+        prevNode = node;
+    }
+    return newNodeList;
 };

package/lib/script-parser.d.ts

@@ -1,5 +1,4 @@
 export declare function scriptParser(script: string): ScriptTokenType[];
-export declare function removeQuote(str: string): string;
 export type ScriptTokenType = {
     type: 'Identifier' | 'Boolean' | 'Numeric' | 'String' | 'Template' | 'Punctuator';
     value: string;

package/lib/script-parser.js

@@ -10,13 +10,3 @@ export function scriptParser(script) {
         value: token.value,
     }));
 }
-export function removeQuote(str) {
-    const quote = str[0];
-    if (quote !== '"' && quote !== "'" && quote !== '`') {
-        return str;
-    }
-    if (str.at(-1) !== quote) {
-        return str;
-    }
-    return str.slice(1, -1);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/parser-utils",
-	"version": "4.0.0-dev.23+d6f2aa9bc",
+	"version": "4.0.0-rc.0",
 	"description": "Utility module for markuplint parser plugin",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -27,13 +27,14 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.0.0-dev.23+d6f2aa9bc",
-		"@markuplint/ml-spec": "4.0.0-dev.23+d6f2aa9bc",
-		"@markuplint/types": "4.0.0-dev.23+d6f2aa9bc",
-		"@types/uuid": "^9.0.7",
-		"espree": "^9.6.1",
-		"type-fest": "^4.9.0",
+		"@markuplint/ml-ast": "4.0.0-rc.0",
+		"@markuplint/ml-spec": "4.0.0-rc.0",
+		"@markuplint/types": "4.0.0-rc.0",
+		"@types/uuid": "^9.0.8",
+		"debug": "^4.3.4",
+		"espree": "^10.0.0",
+		"type-fest": "^4.10.2",
 		"uuid": "^9.0.1"
 	},
-	"gitHead": "d6f2aa9bc287768466f23b5340e4e0eecfa30d59"
+	"gitHead": "3fdeb45cb69ed52b3a215a7520cea1181601443f"
 }