@reteps/tree-sitter-htmlmustache 0.9.2 → 0.9.3

package/browser/out/browser/index.mjs

@@ -1685,11 +1685,16 @@ function hasDescendantMatch(node, selector) {
   }
   return false;
 }
-function checkSelfNegations(node, negations, rootNode) {
+function checkSelfNegations(node, negations, rootNode, cursor) {
   for (const sel of negations) {
     for (const alt of sel) {
-      if (alt.length !== 1) continue;
-      if (nodeMatchesSegment(node, alt[0], rootNode)) return false;
+      if (alt.length === 0) continue;
+      const lastSegment = alt[alt.length - 1];
+      if (!nodeMatchesSegment(node, lastSegment, rootNode, cursor)) continue;
+      if (alt.length === 1) return false;
+      if (checkPrefix(cursor, alt, alt.length - 2, lastSegment.combinator, rootNode)) {
+        return false;
+      }
     }
   }
   return true;
@@ -1700,10 +1705,10 @@ function matchesName(actual, segment) {
   if (segment.pathRegex) return segment.pathRegex.test(actual);
   return actual === segment.name;
 }
-function nodeMatchesSegment(node, segment, rootNode) {
+function nodeMatchesSegment(node, segment, rootNode, cursor) {
   if (segment.rootOnly) {
     if (node !== rootNode) return false;
-    return checkDescendants(node, segment.descendantChecks) && checkSelfNegations(node, segment.selfNegations, rootNode);
+    return checkDescendants(node, segment.descendantChecks) && checkSelfNegations(node, segment.selfNegations, rootNode, cursor);
   }
   const baseMatches = (() => {
     switch (segment.kind) {
@@ -1742,7 +1747,7 @@ function nodeMatchesSegment(node, segment, rootNode) {
     }
   })();
   if (!baseMatches) return false;
-  return checkSelfNegations(node, segment.selfNegations, rootNode);
+  return checkSelfNegations(node, segment.selfNegations, rootNode, cursor);
 }
 function checkPrefix(cursor, segments, segIdx, stepCombinator, rootNode) {
   if (segIdx < 0) return true;
@@ -1751,16 +1756,16 @@ function checkPrefix(cursor, segments, segIdx, stepCombinator, rootNode) {
     for (let i = cursor.indexInSiblings - 1; i >= 0; i--) {
       const sib = cursor.siblings[i];
       if (!isMatchableNode(sib)) continue;
-      if (!nodeMatchesSegment(sib, segment, rootNode)) {
-        if (stepCombinator === "adjacent-sibling") return false;
-        continue;
-      }
-      const newCursor = {
+      const sibCursor = {
         ancestors: cursor.ancestors,
         siblings: cursor.siblings,
         indexInSiblings: i
       };
-      if (checkPrefix(newCursor, segments, segIdx - 1, segment.combinator, rootNode)) return true;
+      if (!nodeMatchesSegment(sib, segment, rootNode, sibCursor)) {
+        if (stepCombinator === "adjacent-sibling") return false;
+        continue;
+      }
+      if (checkPrefix(sibCursor, segments, segIdx - 1, segment.combinator, rootNode)) return true;
       if (stepCombinator === "adjacent-sibling") return false;
     }
     return false;
@@ -1777,13 +1782,13 @@ function checkPrefix(cursor, segments, segIdx, stepCombinator, rootNode) {
       if (!matchesName(entry.name, segment)) return false;
       if (segment.kind === "html" && !checkAttributes(entry.node, segment.attributes)) return false;
       if (!checkDescendants(entry.node, segment.descendantChecks)) return false;
-      if (!checkSelfNegations(entry.node, segment.selfNegations, rootNode)) return false;
-      const newCursor = {
+      const ancestorCursor = {
         ancestors: cursor.ancestors.slice(0, a),
         siblings: entry.siblings,
         indexInSiblings: entry.indexInSiblings
       };
-      return checkPrefix(newCursor, segments, segIdx - 1, segment.combinator, rootNode);
+      if (!checkSelfNegations(entry.node, segment.selfNegations, rootNode, ancestorCursor)) return false;
+      return checkPrefix(ancestorCursor, segments, segIdx - 1, segment.combinator, rootNode);
     }
     return false;
   }
@@ -1793,13 +1798,13 @@ function checkPrefix(cursor, segments, segIdx, stepCombinator, rootNode) {
     if (!matchesName(entry.name, segment)) continue;
     if (segment.kind === "html" && !checkAttributes(entry.node, segment.attributes)) continue;
     if (!checkDescendants(entry.node, segment.descendantChecks)) continue;
-    if (!checkSelfNegations(entry.node, segment.selfNegations, rootNode)) continue;
-    const newCursor = {
+    const ancestorCursor = {
       ancestors: cursor.ancestors.slice(0, a),
       siblings: entry.siblings,
       indexInSiblings: entry.indexInSiblings
     };
-    if (checkPrefix(newCursor, segments, segIdx - 1, segment.combinator, rootNode)) return true;
+    if (!checkSelfNegations(entry.node, segment.selfNegations, rootNode, ancestorCursor)) continue;
+    if (checkPrefix(ancestorCursor, segments, segIdx - 1, segment.combinator, rootNode)) return true;
   }
   return false;
 }
@@ -1843,8 +1848,8 @@ function matchAlternative(rootNode, segments, rootSiblings, rootIndexInSiblings)
   const results = [];
   const lastSegment = segments[segments.length - 1];
   function walk(node, ancestors, siblings, indexInSiblings) {
-    if (nodeMatchesSegment(node, lastSegment, rootNode)) {
-      const cursor = { ancestors, siblings, indexInSiblings };
+    const cursor = { ancestors, siblings, indexInSiblings };
+    if (nodeMatchesSegment(node, lastSegment, rootNode, cursor)) {
       if (segments.length === 1 || checkPrefix(cursor, segments, segments.length - 2, lastSegment.combinator, rootNode)) {
         results.push(getReportNode(node, rootNode));
       }