@reteps/tree-sitter-htmlmustache 0.7.1 → 0.7.3

package/cli/out/main.js

@@ -4030,6 +4030,59 @@ function formatDocument2(tree, document, options, params = {}) {
   return [{ range: fullRange, newText: formatted }];
 }
 
+// lsp/server/src/embeddedRegions.ts
+function getEmbeddedLanguageId(node) {
+  if (node.type === "html_style_element") {
+    return "css";
+  }
+  for (let i = 0; i < node.childCount; i++) {
+    const child = node.child(i);
+    if (child?.type === "html_start_tag") {
+      for (let j = 0; j < child.childCount; j++) {
+        const attr = child.child(j);
+        if (attr?.type === "html_attribute") {
+          let name = "";
+          let value = "";
+          for (let k = 0; k < attr.childCount; k++) {
+            const part = attr.child(k);
+            if (part?.type === "html_attribute_name") name = part.text.toLowerCase();
+            if (part?.type === "html_quoted_attribute_value") value = part.text.replace(/^["']|["']$/g, "").toLowerCase();
+            if (part?.type === "html_attribute_value") value = part.text.toLowerCase();
+          }
+          if (name === "type" && (value === "text/typescript" || value === "ts")) {
+            return "typescript";
+          }
+        }
+      }
+    }
+  }
+  return "javascript";
+}
+function collectEmbeddedRegions(rootNode) {
+  const regions = [];
+  const walk = (node) => {
+    if (node.type === "html_script_element" || node.type === "html_style_element") {
+      for (let i = 0; i < node.childCount; i++) {
+        const child = node.child(i);
+        if (child?.type === "html_raw_text") {
+          regions.push({
+            startIndex: child.startIndex,
+            content: child.text,
+            languageId: getEmbeddedLanguageId(node)
+          });
+        }
+      }
+      return;
+    }
+    for (let i = 0; i < node.childCount; i++) {
+      const child = node.child(i);
+      if (child) walk(child);
+    }
+  };
+  walk(rootNode);
+  return regions;
+}
+
 // cli/src/format.ts
 var USAGE2 = `Usage: htmlmustache format [options] [patterns...]
 
@@ -4137,10 +4190,53 @@ function resolveSettings(flags, filePath) {
     configFile
   };
 }
-function formatSource(source, options, params = {}) {
+var LANGUAGE_TO_PRETTIER_PARSER = {
+  javascript: "babel",
+  typescript: "typescript",
+  css: "css"
+};
+var prettierModule;
+async function getPrettier() {
+  if (prettierModule !== void 0) return prettierModule;
+  try {
+    prettierModule = await import("prettier");
+    return prettierModule;
+  } catch {
+    prettierModule = null;
+    return null;
+  }
+}
+async function formatEmbeddedRegions(tree, options) {
+  const result = /* @__PURE__ */ new Map();
+  const prettier = await getPrettier();
+  if (!prettier) return result;
+  const regions = collectEmbeddedRegions(tree.rootNode);
+  if (regions.length === 0) return result;
+  await Promise.all(
+    regions.map(async (region) => {
+      const parser2 = LANGUAGE_TO_PRETTIER_PARSER[region.languageId];
+      if (!parser2) return;
+      try {
+        const formatted = await prettier.format(region.content, {
+          parser: parser2,
+          tabWidth: options.tabSize,
+          useTabs: !options.insertSpaces
+        });
+        result.set(region.startIndex, formatted);
+      } catch {
+      }
+    })
+  );
+  return result;
+}
+async function formatSource(source, options, params = {}) {
   const tree = parseDocument(source);
+  const embeddedFormatted = await formatEmbeddedRegions(tree, options);
   const document = TextDocument.create("file:///stdin", "htmlmustache", 1, source);
-  const edits = formatDocument2(tree, document, options, params);
+  const edits = formatDocument2(tree, document, options, {
+    ...params,
+    embeddedFormatted: embeddedFormatted.size > 0 ? embeddedFormatted : void 0
+  });
   if (edits.length === 0) return source;
   return edits[0].newText;
 }
@@ -4157,7 +4253,7 @@ async function run2(args) {
     await initializeParser();
     const { options, ...params } = resolveSettings(flags);
     const source = import_node_fs2.default.readFileSync(0, "utf-8");
-    const formatted = formatSource(source, options, params);
+    const formatted = await formatSource(source, options, params);
     process.stdout.write(formatted);
     return 0;
   }
@@ -4181,7 +4277,7 @@ async function run2(args) {
     const displayPath = import_node_path2.default.relative(cwd, file) || file;
     const source = import_node_fs2.default.readFileSync(file, "utf-8");
     const { options, ...params } = resolveSettings(flags, file);
-    const formatted = formatSource(source, options, params);
+    const formatted = await formatSource(source, options, params);
     const changed = formatted !== source;
     if (changed) changedCount++;
     if (flags.check) {

package/package.json

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

package/src/parser.c

@@ -10874,8 +10874,8 @@ TS_PUBLIC const TSLanguage *tree_sitter_htmlmustache(void) {
     .max_reserved_word_set_size = 0,
     .metadata = {
       .major_version = 0,
-      .minor_version = 0,
-      .patch_version = 2,
+      .minor_version = 4,
+      .patch_version = 1,
     },
   };
   return &language;

package/src/scanner.c

@@ -386,6 +386,17 @@ static bool scan_end_tag_name(Scanner *scanner, TSLexer *lexer) {
 
     Tag tag = tag_for_name(tag_name);
     if (scanner->tags.size > 0 && tag_eq(array_back(&scanner->tags), &tag)) {
+        // Don't close HTML tags that were opened before the current mustache section.
+        // This prevents e.g. </div> inside {{#section}}...{{/section}} from closing
+        // an outer <div> that was opened before the section started.
+        if (scanner->mustache_tags.size > 0) {
+            MustacheTag *current_mustache_tag = array_back(&scanner->mustache_tags);
+            if (scanner->tags.size <= current_mustache_tag->html_tag_stack_size) {
+                lexer->result_symbol = HTML_ERRONEOUS_END_TAG_NAME;
+                tag_free(&tag);
+                return true;
+            }
+        }
         pop_html_tag(scanner);
         lexer->result_symbol = HTML_END_TAG_NAME;
     } else {