@markuplint/parser-utils 4.0.0-alpha.6 → 4.0.0-alpha.8

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2023 Yusuke Hirao
+Copyright (c) 2017-2024 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/const.d.ts

@@ -11,6 +11,7 @@ export declare const reSplitterTag: RegExp;
  * - U+0009 CHARACTER TABULATION (tab) => `\t`
  * - U+000A LINE FEED (LF) => `\n`
  * - U+000C FORM FEED (FF) => `\f`
+ * - U+000D CARRIAGE RETURN (CR) => `\r`
  * - U+0020 SPACE => ` `
  */
-export declare const defaultSpaces: readonly ["\t", "\n", "\f", " "];
+export declare const defaultSpaces: readonly ["\t", "\n", "\f", "\r", " "];

package/lib/const.js

@@ -100,6 +100,7 @@ export const reSplitterTag = /<[^>]+>/g;
  * - U+0009 CHARACTER TABULATION (tab) => `\t`
  * - U+000A LINE FEED (LF) => `\n`
  * - U+000C FORM FEED (FF) => `\f`
+ * - U+000D CARRIAGE RETURN (CR) => `\r`
  * - U+0020 SPACE => ` `
  */
-export const defaultSpaces = ['\t', '\n', '\f', ' '];
+export const defaultSpaces = ['\t', '\n', '\f', '\r', ' '];

package/lib/ignore-block.d.ts

@@ -1,4 +1,4 @@
 import type { IgnoreBlock, IgnoreTag } from './types.js';
 import type { MLASTNode } from '@markuplint/ml-ast';
 export declare function ignoreBlock(source: string, tags: readonly IgnoreTag[], maskChar?: string): IgnoreBlock;
-export declare function restoreNode(nodeList: MLASTNode[], ignoreBlock: IgnoreBlock): MLASTNode[];
+export declare function restoreNode(nodeList: MLASTNode[], ignoreBlock: IgnoreBlock, throwErrorWhenTagHasUnresolved?: boolean): MLASTNode[];

package/lib/ignore-block.js

@@ -1,21 +1,11 @@
 import { MASK_CHAR } from './const.js';
 import { uuid } from './create-token.js';
-import { sliceFragment } from './get-location.js';
-import { siblingsCorrection } from './siblings-correction.js';
+import { getCol, getLine } from './get-location.js';
+import { ParserError } from './parser-error.js';
 export function ignoreBlock(source, tags, maskChar = MASK_CHAR) {
     let replaced = source;
     const stack = [];
     for (const tag of tags) {
-        // Replace tags in attributes
-        const attr = maskText(prepend(tag.start, '(?<=(?:"|\'))'), append(tag.end, '(?=(?:"|\'))'), replaced, (startTag, taggedCode, endTag) => {
-            const mask = maskChar.repeat(startTag.length) +
-                taggedCode.replaceAll(/[^\n]/g, maskChar) +
-                maskChar.repeat((endTag ?? '').length);
-            return mask;
-        });
-        replaced = attr.replaced;
-        stack.push(...attr.stack.map(res => ({ ...res, type: tag.type })));
-        // Replace tags in other nodes
         const text = maskText(tag.start, tag.end, replaced, (startTag, taggedCode, endTag) => {
             const mask = maskChar.repeat(startTag.length) +
                 taggedCode.replaceAll(/[^\n]/g, maskChar) +
@@ -49,6 +39,7 @@ function maskText(start, end, replaced, masking) {
             startTag,
             taggedCode,
             endTag: endTag ?? null,
+            resolved: false,
         });
         /**
          * It will not replace line breaks because detects line number.
@@ -62,103 +53,48 @@ function maskText(start, end, replaced, masking) {
 }
 export function restoreNode(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-nodeList, ignoreBlock) {
+nodeList, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+ignoreBlock, throwErrorWhenTagHasUnresolved = true) {
     nodeList = [...nodeList];
     const { source, stack, maskChar } = ignoreBlock;
-    for (const node of nodeList) {
-        if (node.type === 'comment' || node.type === 'text' || node.type === 'psblock') {
-            if (!hasIgnoreBlock(node.raw, maskChar)) {
-                continue;
-            }
-            const parentNode = node.parentNode;
-            const index = nodeList.indexOf(node);
-            const insertList = [];
-            let text = node.raw;
-            let pointer = 0;
-            for (const tag of stack) {
-                if (node.startOffset <= tag.index && tag.index < node.endOffset) {
-                    const start = tag.index - node.startOffset;
-                    const body = tag.startTag + tag.taggedCode + (tag.endTag ?? '');
-                    const above = node.raw.slice(pointer, start);
-                    const below = text.slice(above.length + body.length);
-                    if (above) {
-                        const offset = node.startOffset + pointer;
-                        const { raw, startOffset, endOffset, startLine, endLine, startCol, endCol } = sliceFragment(source, offset, offset + above.length);
-                        const textNode = {
-                            ...node,
-                            uuid: uuid(),
-                            type: 'text',
-                            raw,
-                            startOffset,
-                            endOffset,
-                            startLine,
-                            endLine,
-                            startCol,
-                            endCol,
-                        };
-                        if (node.prevNode?.nextNode) {
-                            node.prevNode.nextNode = textNode;
-                        }
-                        if (node.nextNode?.prevNode) {
-                            node.nextNode.prevNode = textNode;
-                        }
-                        insertList.push(textNode);
-                    }
-                    if (body) {
-                        const offset = node.startOffset + pointer + above.length;
-                        const { raw, startOffset, endOffset, startLine, endLine, startCol, endCol } = sliceFragment(source, offset, offset + body.length);
-                        const bodyNode = {
-                            uuid: uuid(),
-                            type: 'psblock',
-                            nodeName: `#ps:${tag.type}`,
-                            raw,
-                            parentNode: node.parentNode,
-                            prevNode: null,
-                            nextNode: null,
-                            isFragment: node.isFragment,
-                            isGhost: false,
-                            startOffset,
-                            endOffset,
-                            startLine,
-                            endLine,
-                            startCol,
-                            endCol,
-                        };
-                        if (node.prevNode?.nextNode) {
-                            node.prevNode.nextNode = bodyNode;
-                        }
-                        if (node.nextNode?.prevNode) {
-                            node.nextNode.prevNode = bodyNode;
-                        }
-                        insertList.push(bodyNode);
-                    }
-                    text = below;
-                    pointer = start + body.length;
-                }
-            }
-            if (text) {
-                const offset = node.endOffset - text.length;
-                const { raw, startOffset, endOffset, startLine, endLine, startCol, endCol } = sliceFragment(source, offset, offset + text.length);
-                const textNode = {
-                    ...node,
-                    uuid: uuid(),
-                    type: 'text',
-                    raw,
-                    startOffset,
-                    endOffset,
-                    startLine,
-                    endLine,
-                    startCol,
-                    endCol,
-                };
-                insertList.push(textNode);
-            }
-            siblingsCorrection(insertList);
-            if (parentNode) {
-                parentNode.childNodes = insertList;
-            }
-            nodeList.splice(index, 1, ...insertList);
+    for (const tag of stack) {
+        const node = nodeList.find(node => node.startOffset === tag.index);
+        if (!node) {
+            continue;
         }
+        const psNode = {
+            uuid: uuid(),
+            type: 'psblock',
+            nodeName: `#ps:${tag.type}`,
+            raw: `${tag.startTag}${tag.taggedCode}${tag.endTag ?? ''}`,
+            parentNode: node.parentNode,
+            prevNode: null,
+            nextNode: null,
+            isFragment: node.isFragment,
+            isGhost: false,
+            startOffset: node.startOffset,
+            endOffset: node.endOffset,
+            startLine: node.startLine,
+            endLine: node.endLine,
+            startCol: node.startCol,
+            endCol: node.endCol,
+        };
+        if (node.prevNode?.nextNode) {
+            node.prevNode.nextNode = psNode;
+        }
+        if (node.nextNode?.prevNode) {
+            node.nextNode.prevNode = psNode;
+        }
+        if (node.parentNode?.childNodes) {
+            const index = node.parentNode.childNodes.indexOf(node);
+            node.parentNode.childNodes.splice(index, 1, psNode);
+        }
+        const index = nodeList.indexOf(node);
+        nodeList.splice(index, 1, psNode);
+        tag.resolved = true;
+    }
+    for (const node of nodeList) {
         if (node.type === 'starttag') {
             for (const attr of node.attributes) {
                 if (attr.type === 'ps-attr' || attr.value.raw === '' || !hasIgnoreBlock(attr.value.raw, maskChar)) {
@@ -173,8 +109,35 @@ nodeList, ignoreBlock) {
                         const below = attr.value.raw.slice(offset + length);
                         attr.value.raw = above + raw + below;
                         attr.isDynamicValue = true;
+                        tag.resolved = true;
                     }
+                    attr.raw =
+                        attr.spacesBeforeName.raw +
+                            attr.name.raw +
+                            attr.spacesBeforeEqual.raw +
+                            attr.equal.raw +
+                            attr.spacesAfterEqual.raw +
+                            attr.startQuote.raw +
+                            attr.value.raw +
+                            attr.endQuote.raw;
                 }
+                // Update node raw
+                const length = attr.raw.length;
+                const offset = attr.startOffset - node.startOffset - attr.spacesBeforeName.raw.length;
+                const above = node.raw.slice(0, offset);
+                const below = node.raw.slice(offset + length);
+                node.raw = above + attr.raw + below;
+            }
+        }
+    }
+    if (throwErrorWhenTagHasUnresolved) {
+        for (const tag of stack) {
+            if (!tag.resolved) {
+                throw new ParserError('Parsing failed. Unsupported syntax detected', {
+                    line: getLine(source, tag.index),
+                    col: getCol(source, tag.index),
+                    raw: tag.startTag + tag.taggedCode + (tag.endTag ?? ''),
+                });
             }
         }
     }
@@ -197,18 +160,6 @@ function removeGlobalOption(reg) {
     }
     return new RegExp(reg.source, reg.ignoreCase ? 'i' : '');
 }
-function prepend(reg, str) {
-    if (typeof reg === 'string') {
-        return new RegExp(str + escapeRegExpForStr(reg));
-    }
-    return new RegExp(str + reg.source, reg.ignoreCase ? 'i' : '');
-}
-function append(reg, str) {
-    if (typeof reg === 'string') {
-        return new RegExp(escapeRegExpForStr(reg) + str);
-    }
-    return new RegExp(reg.source + str, reg.ignoreCase ? 'i' : '');
-}
 function hasIgnoreBlock(textContent, maskChar) {
     return textContent.includes(maskChar);
 }

package/lib/types.d.ts

@@ -4,6 +4,7 @@ export type Code = {
     readonly startTag: string;
     readonly taggedCode: string;
     readonly endTag: string | null;
+    resolved: boolean;
 };
 export type IgnoreTag = {
     readonly type: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/parser-utils",
-	"version": "4.0.0-alpha.6",
+	"version": "4.0.0-alpha.8",
 	"description": "Utility module for markuplint parser plugin",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -24,12 +24,12 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.0.0-alpha.6",
-		"@markuplint/types": "4.0.0-alpha.6",
+		"@markuplint/ml-ast": "4.0.0-alpha.8",
+		"@markuplint/types": "4.0.0-alpha.8",
 		"@types/uuid": "^9.0.7",
 		"espree": "^9.6.1",
-		"type-fest": "^4.8.2",
+		"type-fest": "^4.9.0",
 		"uuid": "^9.0.1"
 	},
-	"gitHead": "06e1242d274c72cf08a10a572b06ac35d1b924a4"
+	"gitHead": "5bcd25f13ff804af0d09aaabd87e495af668e6a8"
 }