@reteps/tree-sitter-htmlmustache 0.9.1 → 0.9.3

package/browser/out/browser/index.d.ts

@@ -9,8 +9,17 @@ import type { PrettierLike } from '../core/formatting/embedded.js';
 import type { Diagnostic } from '../core/diagnostic.js';
 import type { HtmlMustacheConfig, RulesConfig, RuleSeverity, CustomRule as CustomRuleType } from '../core/configSchema.js';
 import type { CustomCodeTagConfig } from '../core/customCodeTags.js';
-export type Config = Omit<HtmlMustacheConfig, 'include' | 'exclude'>;
-export type CustomRule = CustomRuleType;
+/**
+ * `include`/`exclude` on custom rules are stripped from the browser surface:
+ * the browser API has no filesystem path to match against, so those fields
+ * would silently do nothing. Users who share a `.htmlmustache.jsonc` config
+ * between the CLI and a web playground should strip them before passing, or
+ * let TypeScript catch the mismatch.
+ */
+export type CustomRule = Omit<CustomRuleType, 'include' | 'exclude'>;
+export type Config = Omit<HtmlMustacheConfig, 'include' | 'exclude' | 'customRules'> & {
+    customRules?: CustomRule[];
+};
 export type CustomTag = CustomCodeTagConfig;
 export type { RulesConfig, RuleSeverity, PrettierLike, Diagnostic };
 export type LocateWasm = string | ((filename: string) => string);

package/browser/out/browser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAGnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EACV,kBAAkB,EAClB,WAAW,EACX,YAAY,EACZ,UAAU,IAAI,cAAc,EAC7B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,MAAM,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;AACrE,MAAM,MAAM,UAAU,GAAG,cAAc,CAAC;AACxC,MAAM,MAAM,SAAS,GAAG,mBAAmB,CAAC;AAC5C,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;AAEpE,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC;AAEjE,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,UAAU,EAAE,UAAU,CAAC;IACvB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,yDAAyD;IACzD,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,EAAE,CAAC;IACpD,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAChF;AAED,kDAAkD;AAClD,eAAO,MAAM,cAAc,EAAE,MAAgD,CAAC;AAc9E;;;GAGG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiD7E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAGnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EACV,kBAAkB,EAClB,WAAW,EACX,YAAY,EACZ,UAAU,IAAI,cAAc,EAC7B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;AACrE,MAAM,MAAM,MAAM,GAChB,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,SAAS,GAAG,aAAa,CAAC,GAC7D;IAAE,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;CAAE,CAAC;AACnC,MAAM,MAAM,SAAS,GAAG,mBAAmB,CAAC;AAC5C,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;AAEpE,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC;AAEjE,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,UAAU,EAAE,UAAU,CAAC;IACvB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,yDAAyD;IACzD,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,EAAE,CAAC;IACpD,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAChF;AAED,kDAAkD;AAClD,eAAO,MAAM,cAAc,EAAE,MAAgD,CAAC;AAc9E;;;GAGG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiD7E"}

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));
       }