@markuplint/parser-utils 4.1.1 → 4.2.0

package/lib/parser.js

@@ -1082,6 +1082,7 @@ _Parser_booleanish = new WeakMap(), _Parser_defaultState = new WeakMap(), _Parse
         ? // TODO: Use sort instead of toSorted until we end support for Node 18
             [...nodes].sort(sortNodes)
         : nodes.toSorted(sortNodes);
+    const nameToLastOpenTag = {};
     for (const node of oldNodes) {
         const id = `${node.startOffset}::${node.nodeName}`;
         if (stack.has(id)) {
@@ -1089,13 +1090,16 @@ _Parser_booleanish = new WeakMap(), _Parser_defaultState = new WeakMap(), _Parse
         }
         stack.add(id);
         if (node.type === 'endtag') {
-            const openTag = newNodes.findLast((n) => n.type === 'starttag' && n.nodeName === node.nodeName);
+            const openTag = nameToLastOpenTag[node.nodeName];
             if (openTag && !openTag.pairNode) {
                 __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_pairing).call(this, openTag, node, false);
                 newNodes.push(node);
                 continue;
             }
         }
+        else if (node.type === 'starttag') {
+            nameToLastOpenTag[node.nodeName] = node;
+        }
         newNodes.push(node);
     }
     return newNodes;

package/lib/sort-nodes.d.ts

@@ -1,2 +1,2 @@
 import type { MLASTNodeTreeItem } from '@markuplint/ml-ast';
-export declare function sortNodes(a: MLASTNodeTreeItem, b: MLASTNodeTreeItem): 1 | -1 | 0;
+export declare function sortNodes(a: MLASTNodeTreeItem, b: MLASTNodeTreeItem): number;

package/lib/sort-nodes.js

@@ -1,18 +1,13 @@
 export function sortNodes(a, b) {
     if (a.startOffset === b.startOffset) {
-        return sort(a, b, 'endOffset');
+        return sort(a.endOffset, b.endOffset);
     }
-    return sort(a, b, 'startOffset');
+    return sort(a.startOffset, b.startOffset);
 }
-function sort(a, b, key) {
-    if (Number.isNaN(a[key]) || Number.isNaN(b[key])) {
+function sort(a, b) {
+    const diff = a - b;
+    if (Number.isNaN(diff)) {
         return 0;
     }
-    if (a[key] < b[key]) {
-        return -1;
-    }
-    if (a[key] > b[key]) {
-        return 1;
-    }
-    return 0;
+    return diff;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/parser-utils",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"description": "Utility module for markuplint parser plugin",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -28,7 +28,7 @@
 	},
 	"dependencies": {
 		"@markuplint/ml-ast": "4.0.1",
-		"@markuplint/ml-spec": "4.0.2",
+		"@markuplint/ml-spec": "4.1.0",
 		"@markuplint/types": "4.0.2",
 		"@types/uuid": "^9.0.8",
 		"debug": "^4.3.4",
@@ -36,5 +36,5 @@
 		"type-fest": "^4.10.2",
 		"uuid": "^9.0.1"
 	},
-	"gitHead": "10ce6c8374106f311eeaaffbae8f3fdcbb40f877"
+	"gitHead": "d5d99c5d84b676f8b2bb84684533ed74cf2f1da6"
 }