@reteps/tree-sitter-htmlmustache 0.5.1 → 0.6.0

package/README.md

@@ -244,6 +244,7 @@ Additionally, the following rules are configurable. Set their severities (`"erro
 | `duplicateAttributes` | `error` | Detects duplicate HTML attributes on the same element |
 | `unescapedEntities` | `warning` | Flags unescaped `&` and `>` characters in text content |
 | `preferMustacheComments` | `off` | Suggests replacing HTML comments with mustache comments |
+| `unrecognizedHtmlTags` | `error` | Flags HTML tags that are not standard HTML elements or valid custom elements |
 
 <!-- RULES_TABLE_END -->
 

package/cli/out/main.js

@@ -581,6 +581,11 @@ var RULES = [
     name: "preferMustacheComments",
     defaultSeverity: "off",
     description: "Suggests replacing HTML comments with mustache comments"
+  },
+  {
+    name: "unrecognizedHtmlTags",
+    defaultSeverity: "error",
+    description: "Flags HTML tags that are not standard HTML elements or valid custom elements"
   }
 ];
 var KNOWN_RULE_NAMES = new Set(RULES.map((r) => r.name));
@@ -703,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)) {
@@ -1361,6 +1369,165 @@ function checkHtmlComments(rootNode) {
   visit(rootNode);
   return errors;
 }
+var KNOWN_HTML_TAGS = /* @__PURE__ */ new Set([
+  // Void elements
+  "area",
+  "base",
+  "basefont",
+  "bgsound",
+  "br",
+  "col",
+  "command",
+  "embed",
+  "frame",
+  "hr",
+  "image",
+  "img",
+  "input",
+  "isindex",
+  "keygen",
+  "link",
+  "menuitem",
+  "meta",
+  "nextid",
+  "param",
+  "source",
+  "track",
+  "wbr",
+  // Non-void elements
+  "a",
+  "abbr",
+  "address",
+  "article",
+  "aside",
+  "audio",
+  "b",
+  "bdi",
+  "bdo",
+  "blockquote",
+  "body",
+  "button",
+  "canvas",
+  "caption",
+  "cite",
+  "code",
+  "colgroup",
+  "data",
+  "datalist",
+  "dd",
+  "del",
+  "details",
+  "dfn",
+  "dialog",
+  "div",
+  "dl",
+  "dt",
+  "em",
+  "fieldset",
+  "figcaption",
+  "figure",
+  "footer",
+  "form",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "head",
+  "header",
+  "hgroup",
+  "html",
+  "i",
+  "iframe",
+  "ins",
+  "kbd",
+  "label",
+  "legend",
+  "li",
+  "main",
+  "map",
+  "mark",
+  "math",
+  "menu",
+  "meter",
+  "nav",
+  "noscript",
+  "object",
+  "ol",
+  "optgroup",
+  "option",
+  "output",
+  "p",
+  "picture",
+  "pre",
+  "progress",
+  "q",
+  "rb",
+  "rp",
+  "rt",
+  "rtc",
+  "ruby",
+  "s",
+  "samp",
+  "script",
+  "search",
+  "section",
+  "select",
+  "slot",
+  "small",
+  "span",
+  "strong",
+  "style",
+  "sub",
+  "summary",
+  "sup",
+  "svg",
+  "table",
+  "tbody",
+  "td",
+  "template",
+  "textarea",
+  "tfoot",
+  "th",
+  "thead",
+  "time",
+  "title",
+  "tr",
+  "u",
+  "ul",
+  "var",
+  "video"
+]);
+function checkUnrecognizedHtmlTags(rootNode, customTagNames) {
+  const errors = [];
+  const customSet = customTagNames ? new Set(customTagNames.map((n) => n.toLowerCase())) : void 0;
+  function visit(node) {
+    if (node.type === "html_element" || node.type === "html_self_closing_tag") {
+      const tagNameNode = node.type === "html_self_closing_tag" ? node.children.find((c) => c.type === "html_tag_name") : node.children.find((c) => c.type === "html_start_tag")?.children.find((c) => c.type === "html_tag_name");
+      const tagName = tagNameNode?.text.toLowerCase();
+      if (tagName === "svg" || tagName === "math") return;
+    }
+    if (node.type === "html_start_tag" || node.type === "html_self_closing_tag") {
+      const tagNameNode = node.children.find((c) => c.type === "html_tag_name");
+      if (tagNameNode) {
+        const tagName = tagNameNode.text.toLowerCase();
+        if (!KNOWN_HTML_TAGS.has(tagName) && !customSet?.has(tagName)) {
+          errors.push({
+            node: tagNameNode,
+            message: `Unrecognized HTML tag: <${tagNameNode.text}>`
+          });
+        }
+      }
+      return;
+    }
+    for (const child of node.children) {
+      visit(child);
+    }
+  }
+  visit(rootNode);
+  return errors;
+}
 function checkDuplicateAttributes(rootNode) {
   const errors = [];
   function visit(node) {
@@ -1454,7 +1621,7 @@ function collectDisabledRules(rootNode) {
   walk(rootNode);
   return disabled;
 }
-function collectErrors(tree, rules) {
+function collectErrors(tree, rules, customTagNames) {
   const errors = [];
   const cursor = tree.walk();
   function visit() {
@@ -1496,7 +1663,8 @@ function collectErrors(tree, rules) {
     { rule: "selfClosingNonVoidTags", errors: () => checkSelfClosingNonVoidTags(tree.rootNode) },
     { rule: "duplicateAttributes", errors: () => checkDuplicateAttributes(tree.rootNode) },
     { rule: "unescapedEntities", errors: () => checkUnescapedEntities(tree.rootNode) },
-    { rule: "preferMustacheComments", errors: () => checkHtmlComments(tree.rootNode) }
+    { rule: "preferMustacheComments", errors: () => checkHtmlComments(tree.rootNode) },
+    { rule: "unrecognizedHtmlTags", errors: () => checkUnrecognizedHtmlTags(tree.rootNode, customTagNames) }
   ];
   for (const { rule, errors: getErrors } of ruleChecks) {
     const severity = resolveRuleSeverity(effectiveRules, rule);
@@ -1517,8 +1685,8 @@ function collectErrors(tree, rules) {
 }
 
 // cli/src/check.ts
-function collectErrors2(tree, file, rules) {
-  const errors = collectErrors(tree, rules);
+function collectErrors2(tree, file, rules, customTagNames) {
+  const errors = collectErrors(tree, rules, customTagNames);
   return errors.map((error) => ({
     file,
     line: error.node.startPosition.row + 1,
@@ -1702,12 +1870,13 @@ async function run(args) {
   const cwd = process.cwd();
   const errorOutput = [];
   const rules = config?.rules;
+  const customTagNames = config?.customTags?.map((t) => t.name);
   for (const file of files) {
     const displayPath = import_node_path.default.relative(cwd, file) || file;
     let source = import_node_fs.default.readFileSync(file, "utf-8");
     if (fixMode) {
       const tree2 = parseDocument(source);
-      const errors2 = collectErrors2(tree2, displayPath, rules);
+      const errors2 = collectErrors2(tree2, displayPath, rules, customTagNames);
       const fixed = applyFixes(source, errors2);
       if (fixed !== source) {
         import_node_fs.default.writeFileSync(file, fixed, "utf-8");
@@ -1715,7 +1884,7 @@ async function run(args) {
       }
     }
     const tree = parseDocument(source);
-    const errors = collectErrors2(tree, displayPath, rules);
+    const errors = collectErrors2(tree, displayPath, rules, customTagNames);
     const fileErrors = errors.filter((e) => e.severity !== "warning");
     const fileWarnings = errors.filter((e) => e.severity === "warning");
     if (errors.length > 0) {
@@ -2377,6 +2546,7 @@ function getCSSDisplay(node, customTags = EMPTY_MAP) {
       if (config) {
         if (config.display) return config.display;
         if (isCodeTag(config)) return "block";
+        return "inline-block";
       }
       return CSS_DISPLAY_MAP[lower] ?? "inline";
     }
@@ -2748,7 +2918,7 @@ function formatHtmlElement(node, context, forceInline = false) {
         parts.push(text(child.text));
       }
     }
-  } else if (!isBlock && (!hasHtmlElementChildren || forceInline && !contentNodes.some(
+  } else if (!isBlock && (!hasHtmlElementChildren || forceInline && display !== "inline-block" && !contentNodes.some(
     (child) => isRawContentElement(child) || isBlockLevel(child, tags)
   ))) {
     if (!forceInline && startTag && startTagHasAttributes(startTag)) {
@@ -3113,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++) {
@@ -3121,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;
             }
@@ -3133,7 +3305,7 @@ function collapseDelimitedRegions(parts, delimiters) {
           }
         }
       } else {
-        if (part.includes(activeDelimiter)) {
+        if (part.includes(activeDelimiter.end)) {
           activeDelimiter = null;
         }
       }
@@ -3393,6 +3565,17 @@ function formatBlockChildren(nodes, context) {
         }
       }
     }
+    if (node.type === "html_element" && currentLine.length > 0) {
+      const tagName = getTagName(node);
+      if (tagName?.toLowerCase() === "br") {
+        const lineContent = trimDoc(flushCurrentLine());
+        if (hasDocContent(lineContent)) {
+          lines.push({ doc: lineContent, blankLineBefore: blankLineBeforeCurrentLine });
+          blankLineBeforeCurrentLine = false;
+        }
+        currentLine = [];
+      }
+    }
     lastNodeEnd = node.endIndex;
   }
   if (inIgnoreRegion && nodes.length > 0) {

package/package.json

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