@markuplint/parser-utils 4.0.0-alpha.3 → 4.0.0-alpha.4

package/lib/const.js

@@ -96,5 +96,5 @@ export const svgElementList = [
 ];
 export const reTag = /^<((?:.|\s|\n)+)>\s*$/;
 // eslint-disable-next-line no-control-regex
-export const reTagName = /^(?:[a-z][^\u0000\u0009\u000A\u000C\u0020/>]*)/i;
+export const reTagName = /^[a-z][^\u0000\u0009\u000A\u000C />]*/i;
 export const reSplitterTag = /<[^>]+>/g;

package/lib/debugger.js

@@ -1,21 +1,19 @@
 export function nodeListToDebugMaps(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 nodeList, withAttr = false) {
-    return nodeList
-        .map(n => {
+    return nodeList.flatMap(n => {
         const r = [];
-        if (!n.isGhost) {
+        if (n.isGhost) {
+            r.push(`[N/A]>[N/A](N/A)${n.nodeName}: ${visibleWhiteSpace(n.raw)}`);
+        }
+        else {
             r.push(tokenDebug(n));
             if (withAttr && 'attributes' in n) {
                 r.push(...attributesToDebugMaps(n.attributes).flat());
             }
         }
-        else {
-            r.push(`[N/A]>[N/A](N/A)${n.nodeName}: ${visibleWhiteSpace(n.raw)}`);
-        }
         return r;
-    })
-        .flat();
+    });
 }
 export function attributesToDebugMaps(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
@@ -28,16 +26,7 @@ attributes) {
             }),
         ];
         if (n.type === 'html-attr') {
-            r.push(`  ${tokenDebug(n.spacesBeforeName, 'bN')}`);
-            r.push(`  ${tokenDebug(n.name, 'name')}`);
-            r.push(`  ${tokenDebug(n.spacesBeforeEqual, 'bE')}`);
-            r.push(`  ${tokenDebug(n.equal, 'equal')}`);
-            r.push(`  ${tokenDebug(n.spacesAfterEqual, 'aE')}`);
-            r.push(`  ${tokenDebug(n.startQuote, 'sQ')}`);
-            r.push(`  ${tokenDebug(n.value, 'value')}`);
-            r.push(`  ${tokenDebug(n.endQuote, 'eQ')}`);
-            r.push(`  isDirective: ${!!n.isDirective}`);
-            r.push(`  isDynamicValue: ${!!n.isDynamicValue}`);
+            r.push(`  ${tokenDebug(n.spacesBeforeName, 'bN')}`, `  ${tokenDebug(n.name, 'name')}`, `  ${tokenDebug(n.spacesBeforeEqual, 'bE')}`, `  ${tokenDebug(n.equal, 'equal')}`, `  ${tokenDebug(n.spacesAfterEqual, 'aE')}`, `  ${tokenDebug(n.startQuote, 'sQ')}`, `  ${tokenDebug(n.value, 'value')}`, `  ${tokenDebug(n.endQuote, 'eQ')}`, `  isDirective: ${!!n.isDirective}`, `  isDynamicValue: ${!!n.isDynamicValue}`);
         }
         if (n.potentialName != null) {
             r.push(`  potentialName: ${visibleWhiteSpace(n.potentialName)}`);
@@ -54,5 +43,5 @@ function tokenDebug(n, type = '') {
     n.potentialName ?? n.nodeName ?? n.name ?? n.type ?? type}: ${visibleWhiteSpace(n.raw)}`;
 }
 function visibleWhiteSpace(chars) {
-    return chars.replace(/\n/g, '⏎').replace(/\t/g, '→').replace(/\s/g, '␣');
+    return chars.replaceAll('\n', '⏎').replaceAll('\t', '→').replaceAll(/\s/g, '␣');
 }

package/lib/detect-element-type.js

@@ -25,7 +25,7 @@ function _distinguishAuthoredName(name, patterns) {
     });
 }
 function toRegexp(pattern) {
-    const matched = pattern.match(/^\/(.+)\/([ig]*)$/i);
+    const matched = pattern.match(/^\/(.+)\/([gi]*)$/i);
     if (matched && matched[1]) {
         return new RegExp(matched[1], matched[2]);
     }

package/lib/flatten-nodes.js

@@ -71,9 +71,9 @@ nodeTree, rawHtml, createLastText = true) {
                  * create Last spaces
                  */
                 let lastOffset = 0;
-                nodeOrders.forEach((node, i) => {
+                for (const node of nodeOrders) {
                     lastOffset = Math.max(node.endOffset, lastOffset);
-                });
+                }
                 // console.log(lastOffset);
                 const lastTextContent = rawHtml.slice(lastOffset);
                 // console.log(`"${lastTextContent}"`);
@@ -110,8 +110,8 @@ nodeTree, rawHtml, createLastText = true) {
      * concat text nodes
      */
     const result = [];
-    nodeOrders.forEach(node => {
-        const prevNode = result[result.length - 1] ?? null;
+    for (const node of nodeOrders) {
+        const prevNode = result.at(-1) ?? null;
         if (node.type === 'text' && prevNode?.type === 'text') {
             prevNode.raw = prevNode.raw + node.raw;
             prevNode.endOffset = node.endOffset;
@@ -132,10 +132,10 @@ nodeTree, rawHtml, createLastText = true) {
             if (node.nextNode) {
                 node.nextNode.prevNode = prevNode;
             }
-            return;
+            continue;
         }
         result.push(node);
-    });
+    }
     {
         /**
          * Correction prev/next/parent
@@ -168,10 +168,12 @@ nodeTree, rawHtml, createLastText = true) {
             // Children
             if (node.type === 'text') {
                 const parent = node.parentNode;
-                if (parent && parent.type === 'starttag' && parent.nodeName.toLowerCase() === 'html') {
-                    if (parent.childNodes && !parent.childNodes.some(n => n.uuid === node.uuid)) {
-                        parent.childNodes.push(node);
-                    }
+                if (parent &&
+                    parent.type === 'starttag' &&
+                    parent.nodeName.toLowerCase() === 'html' &&
+                    parent.childNodes &&
+                    !parent.childNodes.some(n => n.uuid === node.uuid)) {
+                    parent.childNodes.push(node);
                 }
             }
             prevToken = node;
@@ -241,5 +243,5 @@ nodeTree, rawHtml) {
         node.endOffset = node.endOffset ?? currentEndOffset;
         nodeOrders.push(node);
     });
-    return nodeOrders.slice();
+    return [...nodeOrders];
 }

package/lib/get-location.js

@@ -3,7 +3,7 @@ export function getLine(html, startOffset) {
 }
 export function getCol(html, startOffset) {
     const lines = html.slice(0, startOffset).split(/\n/g);
-    return (lines[lines.length - 1] ?? '').length + 1;
+    return (lines.at(-1) ?? '').length + 1;
 }
 export function getEndLine(html, line) {
     return html.split(/\r?\n/).length - 1 + line;

package/lib/idl-attributes.js

@@ -428,8 +428,8 @@ export function searchIDLAttribute(name) {
     };
 }
 function camelize(str) {
-    return str.replace(/[:-][a-z]/g, $0 => $0[1]?.toUpperCase() ?? '');
+    return str.replaceAll(/[:-][a-z]/g, $0 => $0[1]?.toUpperCase() ?? '');
 }
 function hyphenize(str) {
-    return str.replace(/[A-Z]/g, $0 => `-${$0.toLowerCase()}`);
+    return str.replaceAll(/[A-Z]/g, $0 => `-${$0.toLowerCase()}`);
 }

package/lib/ignore-block.js

@@ -9,7 +9,7 @@ export function ignoreBlock(source, tags, maskChar = MASK_CHAR) {
         // Replace tags in attributes
         const attr = maskText(prepend(tag.start, '(?<=(?:"|\'))'), append(tag.end, '(?=(?:"|\'))'), replaced, (startTag, taggedCode, endTag) => {
             const mask = maskChar.repeat(startTag.length) +
-                taggedCode.replace(/[^\n]/g, maskChar) +
+                taggedCode.replaceAll(/[^\n]/g, maskChar) +
                 maskChar.repeat((endTag ?? '').length);
             return mask;
         });
@@ -18,7 +18,7 @@ export function ignoreBlock(source, tags, maskChar = MASK_CHAR) {
         // Replace tags in other nodes
         const text = maskText(tag.start, tag.end, replaced, (startTag, taggedCode, endTag) => {
             const mask = maskChar.repeat(startTag.length) +
-                taggedCode.replace(/[^\n]/g, maskChar) +
+                taggedCode.replaceAll(/[^\n]/g, maskChar) +
                 maskChar.repeat((endTag ?? '').length);
             const taggedMask = `<!${mask.slice(2).slice(0, -1)}>`;
             return taggedMask;
@@ -63,7 +63,7 @@ function maskText(start, end, replaced, masking) {
 export function restoreNode(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 nodeList, ignoreBlock) {
-    nodeList = nodeList.slice();
+    nodeList = [...nodeList];
     const { source, stack, maskChar } = ignoreBlock;
     for (const node of nodeList) {
         if (node.type === 'comment' || node.type === 'text' || node.type === 'psblock') {
@@ -71,7 +71,7 @@ nodeList, ignoreBlock) {
                 continue;
             }
             const parentNode = node.parentNode;
-            const index = nodeList.findIndex(n => n === node);
+            const index = nodeList.indexOf(node);
             const insertList = [];
             let text = node.raw;
             let pointer = 0;

package/lib/ignore-front-matter.js

@@ -12,6 +12,6 @@ export function ignoreFrontMatter(code) {
     const endPoint = startPoint + reEnd.index + reEnd[0].length;
     const frontMatter = code.slice(0, endPoint);
     const afterCode = code.slice(endPoint);
-    const masked = frontMatter.replace(/[^\r\n]/g, ' ');
+    const masked = frontMatter.replaceAll(/[^\n\r]/g, ' ');
     return masked + afterCode;
 }

package/lib/parse-attr.js

@@ -55,7 +55,7 @@ export function tokenize(raw, options) {
     const valueDelimiters = options?.valueDelimiters ?? defaultValueDelimiters;
     const equalDelimiter = options?.equal ?? defaultEqual;
     let state = 'b-name';
-    const charactors = raw.split('');
+    const charactors = [...raw];
     let beforeName = '';
     let name = '';
     let afterName = '';

package/lib/remove-deprecated-node.js

@@ -20,16 +20,16 @@ nodeOrders) {
      */
     const stack = {};
     const removeIndexes = [];
-    nodeOrders.forEach((node, i) => {
+    for (const [i, node] of nodeOrders.entries()) {
         if (node.isGhost) {
-            return;
+            continue;
         }
         const id = `${node.startLine}:${node.startCol}:${node.endLine}:${node.endCol}`;
         if (stack[id] != null) {
             removeIndexes.push(i);
         }
         stack[id] = i;
-    });
+    }
     let r = nodeOrders.length;
     while (r-- > 0) {
         if (removeIndexes.includes(r)) {

package/lib/tag-splitter.js

@@ -8,7 +8,7 @@ function tagSplitterAsString(raw) {
     if (!tagMatches) {
         return [raw];
     }
-    const tokens = Array.from(tagMatches);
+    const tokens = [...tagMatches];
     tokens.unshift(); // remove all match
     const nodes = [];
     let rest = raw;
@@ -31,15 +31,7 @@ function tagSplitterAsString(raw) {
 function withLocation(nodes, line, col) {
     const result = [];
     for (const node of nodes) {
-        if (node[0] !== '<') {
-            result.push({
-                type: 'text',
-                raw: node,
-                line,
-                col,
-            });
-        }
-        else {
+        if (node[0] === '<') {
             const label = node.slice(1).slice(0, -1);
             if (reTagName.test(label)) {
                 result.push({
@@ -49,39 +41,54 @@ function withLocation(nodes, line, col) {
                     col,
                 });
             }
-            else if (label[0] === '/') {
-                result.push({
-                    type: 'endtag',
-                    raw: node,
-                    line,
-                    col,
-                });
-            }
-            else if (label[0] === '!') {
-                result.push({
-                    type: 'comment',
-                    raw: node,
-                    line,
-                    col,
-                });
-            }
-            else if (label[0] === '?') {
-                result.push({
-                    type: 'boguscomment',
-                    raw: node,
-                    line,
-                    col,
-                });
-            }
             else {
-                result.push({
-                    type: 'text',
-                    raw: node,
-                    line,
-                    col,
-                });
+                switch (label[0]) {
+                    case '/': {
+                        result.push({
+                            type: 'endtag',
+                            raw: node,
+                            line,
+                            col,
+                        });
+                        break;
+                    }
+                    case '!': {
+                        result.push({
+                            type: 'comment',
+                            raw: node,
+                            line,
+                            col,
+                        });
+                        break;
+                    }
+                    case '?': {
+                        result.push({
+                            type: 'boguscomment',
+                            raw: node,
+                            line,
+                            col,
+                        });
+                        break;
+                    }
+                    default: {
+                        result.push({
+                            type: 'text',
+                            raw: node,
+                            line,
+                            col,
+                        });
+                    }
+                }
             }
         }
+        else {
+            result.push({
+                type: 'text',
+                raw: node,
+                line,
+                col,
+            });
+        }
         line = getEndLine(node, line);
         col = getEndCol(node, col);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/parser-utils",
-	"version": "4.0.0-alpha.3",
+	"version": "4.0.0-alpha.4",
 	"description": "Utility module for markuplint parser plugin",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -24,12 +24,11 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.0.0-alpha.3",
-		"@markuplint/types": "4.0.0-alpha.3",
-		"@types/uuid": "^9.0.4",
-		"tslib": "^2.6.2",
-		"type-fest": "^4.3.1",
+		"@markuplint/ml-ast": "4.0.0-alpha.4",
+		"@markuplint/types": "4.0.0-alpha.4",
+		"@types/uuid": "^9.0.6",
+		"type-fest": "^4.5.0",
 		"uuid": "^9.0.1"
 	},
-	"gitHead": "380836f7adc1ff7e8eaf9d869e68d29eee8f3b7e"
+	"gitHead": "991b3aef77fde42c79343ee8c807257a35c589d7"
 }