@reteps/tree-sitter-htmlmustache 0.7.0 → 0.7.2

package/README.md

@@ -228,36 +228,87 @@ Additionally, the following rules are configurable. Set their severities (`"erro
 {
   "rules": {
     "consecutiveDuplicateSections": "off",
-    "preferMustacheComments": "warning"
-  }
+    "preferMustacheComments": "warning",
+  },
 }
 ```
 
 <!-- RULES_TABLE_START -->
 
-| Rule | Default | Description |
-| --- | --- | --- |
-| `nestedDuplicateSections` | `error` | Flags `{{#name}}` nested inside another `{{#name}}` with the same name |
-| `unquotedMustacheAttributes` | `error` | Requires quotes around mustache expressions used as attribute values |
-| `consecutiveDuplicateSections` | `warning` | Warns when adjacent same-name sections can be merged |
-| `selfClosingNonVoidTags` | `error` | Disallows self-closing syntax on non-void HTML elements (e.g. `<div/>`) |
-| `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 |
+| Rule                           | Default   | Description                                                                  |
+| ------------------------------ | --------- | ---------------------------------------------------------------------------- |
+| `nestedDuplicateSections`      | `error`   | Flags `{{#name}}` nested inside another `{{#name}}` with the same name       |
+| `unquotedMustacheAttributes`   | `error`   | Requires quotes around mustache expressions used as attribute values         |
+| `consecutiveDuplicateSections` | `warning` | Warns when adjacent same-name sections can be merged                         |
+| `selfClosingNonVoidTags`       | `error`   | Disallows self-closing syntax on non-void HTML elements (e.g. `<div/>`)      |
+| `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 -->
 
+### Custom Rules
+
+Define project-specific lint rules using CSS-like selectors to match HTML elements and Mustache sections:
+
+```jsonc
+{
+  "customRules": [
+    {
+      "id": "no-font",
+      "selector": "font",
+      "message": "The <font> tag is deprecated. Use CSS instead.",
+    },
+    {
+      "id": "no-inline-styles",
+      "selector": "[style]",
+      "message": "Avoid inline styles",
+      "severity": "warning",
+    },
+    {
+      "id": "images-need-alt",
+      "selector": "img:not([alt])",
+      "message": "Images must have alt text for accessibility",
+    },
+    {
+      "id": "no-hidden-inputs-in-list",
+      "selector": "#items > input[type=hidden]",
+      "message": "Hidden inputs inside {{#items}} sections are usually a mistake",
+    },
+  ],
+}
+```
+
+Each custom rule requires an `id`, `selector`, and `message`. The `severity` defaults to `"error"` but can be set to `"warning"` or `"off"`.
+
+**Selector syntax:**
+
+| Selector             | Matches                                  |
+| -------------------- | ---------------------------------------- |
+| `div`                | HTML elements by tag name                |
+| `#items`             | Mustache sections by name (`{{#items}}`) |
+| `*`                  | Any HTML element                         |
+| `#`                  | Any Mustache section                     |
+| `div span`           | Descendant (span anywhere inside div)    |
+| `div > span`         | Direct child (span directly inside div)  |
+| `[style]`            | Attribute presence                       |
+| `input[type=hidden]` | Attribute value                          |
+| `img:not([alt])`     | Negated attribute                        |
+| `div, span`          | Comma-separated alternatives             |
+
+The `>` (child) combinator is kind-transparent: `div > span` matches even if a Mustache section sits between them (e.g. `<div>{{#show}}<span>{{/show}}</div>`), and `#a > #b` matches across intervening HTML elements.
+
 ### Disabling Lint Rules
 
-Disable a configurable lint rule for an entire file with an inline comment:
+Disable a lint rule for an entire file with an inline comment:
 
 ```html
 <!-- htmlmustache-disable preferMustacheComments -->
 {{! htmlmustache-disable selfClosingNonVoidTags }}
 ```
 
-The comment can appear anywhere in the file. Only configurable rules (listed above) can be disabled. Use multiple comments to disable multiple rules.
+The comment can appear anywhere in the file. Both built-in and custom rules can be disabled by name/id. Use multiple comments to disable multiple rules.
 
 ### EditorConfig
 

package/cli/out/main.js

@@ -1980,7 +1980,8 @@ function collectErrors(tree, rules, customTagNames, customRules) {
         message: error.message,
         severity,
         fix: error.fix,
-        fixDescription: error.fixDescription
+        fixDescription: error.fixDescription,
+        ruleName: rule
       });
     }
   }
@@ -1993,7 +1994,7 @@ function collectErrors(tree, rules, customTagNames, customRules) {
       if (!parsed) continue;
       const matches = matchSelector(tree.rootNode, parsed);
       for (const node of matches) {
-        errors.push({ node, message: rule.message, severity });
+        errors.push({ node, message: rule.message, severity, ruleName: rule.id });
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reteps/tree-sitter-htmlmustache",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "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 {