@reteps/tree-sitter-htmlmustache 0.5.2 → 0.6.0

package/cli/out/main.js

@@ -708,9 +708,12 @@ function validateConfig(raw) {
     config.mustacheSpaces = obj.mustacheSpaces;
   }
   if (Array.isArray(obj.noBreakDelimiters)) {
-    const items = obj.noBreakDelimiters.filter(
-      (s) => typeof s === "string" && s.length > 0
-    );
+    const items = [];
+    for (const entry of obj.noBreakDelimiters) {
+      if (entry && typeof entry === "object" && !Array.isArray(entry) && typeof entry.start === "string" && entry.start !== "" && typeof entry.end === "string" && entry.end !== "") {
+        items.push({ start: entry.start, end: entry.end });
+      }
+    }
     if (items.length > 0) config.noBreakDelimiters = items;
   }
   if (Array.isArray(obj.include)) {
@@ -3280,7 +3283,9 @@ function textWords(str) {
 }
 function collapseDelimitedRegions(parts, delimiters) {
   if (delimiters.length === 0) return parts;
-  const sorted = [...delimiters].sort((a, b) => b.length - a.length);
+  const sorted = [...delimiters].sort(
+    (a, b) => Math.max(b.start.length, b.end.length) - Math.max(a.start.length, a.end.length)
+  );
   const result = [...parts];
   let activeDelimiter = null;
   for (let i = 0; i < result.length; i++) {
@@ -3288,10 +3293,10 @@ function collapseDelimitedRegions(parts, delimiters) {
     if (typeof part === "string") {
       if (activeDelimiter === null) {
         for (const delim of sorted) {
-          const delimIdx = part.indexOf(delim);
-          if (delimIdx >= 0) {
-            const afterOpen = delimIdx + delim.length;
-            const closeIdx = part.indexOf(delim, afterOpen);
+          const startIdx = part.indexOf(delim.start);
+          if (startIdx >= 0) {
+            const afterOpen = startIdx + delim.start.length;
+            const closeIdx = part.indexOf(delim.end, afterOpen);
             if (closeIdx >= 0) {
               continue;
             }
@@ -3300,7 +3305,7 @@ function collapseDelimitedRegions(parts, delimiters) {
           }
         }
       } else {
-        if (part.includes(activeDelimiter)) {
+        if (part.includes(activeDelimiter.end)) {
           activeDelimiter = null;
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reteps/tree-sitter-htmlmustache",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "HTML with Mustache/Handlebars template syntax grammar for tree-sitter",
   "repository": {
     "type": "git",