@reteps/tree-sitter-htmlmustache 0.9.1 → 0.9.2

package/browser/out/core/configSchema.d.ts

@@ -34,6 +34,14 @@ export interface CustomRule {
     selector: string;
     message: string;
     severity?: RuleSeverity;
+    /**
+     * Optional glob patterns (relative to the config file) restricting which
+     * files this rule applies to. Applied as an additional filter on top of the
+     * top-level `include`/`exclude` — a rule only fires for files that both
+     * the top-level settings include AND the per-rule settings include.
+     */
+    include?: string[];
+    exclude?: string[];
 }
 export interface NoBreakDelimiter {
     start: string;

package/browser/out/core/configSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configSchema.d.ts","sourceRoot":"","sources":["../../../src/core/configSchema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAA2B,MAAM,qBAAqB,CAAC;AAWxF,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,SAAS,GAAG,KAAK,CAAC;AAEvD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpD;AAED,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG;IAAE,QAAQ,EAAE,YAAY,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,oBAAoB,CAAC,QAAQ,IAAI,YAAY,GAAG,CAAC;IAAE,QAAQ,EAAE,YAAY,CAAA;CAAE,GAAG,QAAQ,CAAC,CAAC;AAEpG,MAAM,WAAW,WAAW;IAC1B,uBAAuB,CAAC,EAAE,SAAS,CAAC;IACpC,0BAA0B,CAAC,EAAE,SAAS,CAAC;IACvC,4BAA4B,CAAC,EAAE,SAAS,CAAC;IACzC,sBAAsB,CAAC,EAAE,SAAS,CAAC;IACnC,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAChC,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,sBAAsB,CAAC,EAAE,SAAS,CAAC;IACnC,oBAAoB,CAAC,EAAE,SAAS,CAAC;IACjC,qBAAqB,CAAC,EAAE,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;CAC5E;AAuCD,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACvC,UAAU,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACnC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CA2ChD;AAiCD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,kBAAkB,CAwF/D"}
+{"version":3,"file":"configSchema.d.ts","sourceRoot":"","sources":["../../../src/core/configSchema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAA2B,MAAM,qBAAqB,CAAC;AAWxF,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,SAAS,GAAG,KAAK,CAAC;AAEvD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpD;AAED,MAAM,MAAM,SAAS,GAAG,YAAY,GAAG;IAAE,QAAQ,EAAE,YAAY,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,oBAAoB,CAAC,QAAQ,IAAI,YAAY,GAAG,CAAC;IAAE,QAAQ,EAAE,YAAY,CAAA;CAAE,GAAG,QAAQ,CAAC,CAAC;AAEpG,MAAM,WAAW,WAAW;IAC1B,uBAAuB,CAAC,EAAE,SAAS,CAAC;IACpC,0BAA0B,CAAC,EAAE,SAAS,CAAC;IACvC,4BAA4B,CAAC,EAAE,SAAS,CAAC;IACzC,sBAAsB,CAAC,EAAE,SAAS,CAAC;IACnC,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAChC,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,sBAAsB,CAAC,EAAE,SAAS,CAAC;IACnC,oBAAoB,CAAC,EAAE,SAAS,CAAC;IACjC,qBAAqB,CAAC,EAAE,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;CAC5E;AAuCD,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACvC,UAAU,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACnC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CA2ChD;AAiCD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,kBAAkB,CAgG/D"}

package/browser/out/core/customRuleFilter.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Filter custom lint rules by per-rule `include` / `exclude` glob patterns.
+ *
+ * Patterns are matched against a path relative to the config file's directory.
+ * Path separators are normalized to forward slashes so cross-platform patterns
+ * like `questions/**` work regardless of host OS.
+ *
+ * Uses Node's `path.matchesGlob` (available since Node 22.5), so this module
+ * is Node-only — the browser entrypoint does not import it.
+ */
+import type { CustomRule } from './configSchema.js';
+export declare function ruleMatchesPath(rule: CustomRule, relPath: string): boolean;
+export declare function filterCustomRulesForPath(rules: CustomRule[] | undefined, relPath: string): CustomRule[] | undefined;
+//# sourceMappingURL=customRuleFilter.d.ts.map

package/browser/out/core/customRuleFilter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"customRuleFilter.d.ts","sourceRoot":"","sources":["../../../src/core/customRuleFilter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAS1E;AAED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,UAAU,EAAE,GAAG,SAAS,EAC/B,OAAO,EAAE,MAAM,GACd,UAAU,EAAE,GAAG,SAAS,CAG1B"}

package/cli/out/main.js

@@ -784,6 +784,14 @@ function validateConfig(raw) {
       if (typeof e2.severity === "string" && VALID_RULE_SEVERITIES.has(e2.severity)) {
         rule.severity = e2.severity;
       }
+      if (Array.isArray(e2.include)) {
+        const items = e2.include.filter((s2) => typeof s2 === "string" && s2.length > 0);
+        if (items.length > 0) rule.include = items;
+      }
+      if (Array.isArray(e2.exclude)) {
+        const items = e2.exclude.filter((s2) => typeof s2 === "string" && s2.length > 0);
+        if (items.length > 0) rule.exclude = items;
+      }
       rules.push(rule);
     }
     if (rules.length > 0) config.customRules = rules;
@@ -815,7 +823,8 @@ function loadConfigFileForPath(filePath) {
   try {
     const text2 = fs.readFileSync(configPath, "utf-8");
     const raw = parseJsonc(text2);
-    return validateConfig(raw);
+    const config = validateConfig(raw);
+    return { config, configDir: path2.dirname(configPath) };
   } catch {
     return null;
   }
@@ -1916,9 +1925,9 @@ function preprocessMustacheLiterals(raw) {
       case "=":
         return null;
       default: {
-        const path5 = body.trim();
-        if (path5.length === 0) return null;
-        out += `:m-variable(${path5})`;
+        const path6 = body.trim();
+        if (path6.length === 0) return null;
+        out += `:m-variable(${path6})`;
         break;
       }
     }
@@ -2669,6 +2678,23 @@ function collectErrors(tree, rules, customTagNames, customRules) {
   );
 }
 
+// src/core/customRuleFilter.ts
+var path3 = __toESM(require("node:path"));
+function ruleMatchesPath(rule, relPath) {
+  const normalized = relPath.split(path3.sep).join("/");
+  if (rule.exclude && rule.exclude.some((p2) => path3.matchesGlob(normalized, p2))) {
+    return false;
+  }
+  if (rule.include && rule.include.length > 0) {
+    return rule.include.some((p2) => path3.matchesGlob(normalized, p2));
+  }
+  return true;
+}
+function filterCustomRulesForPath(rules, relPath) {
+  if (!rules) return rules;
+  return rules.filter((r2) => ruleMatchesPath(r2, relPath));
+}
+
 // src/core/diagnostic.ts
 function toFix(r2) {
   return { range: [r2.startIndex, r2.endIndex], newText: r2.newText };
@@ -2768,6 +2794,7 @@ var DEFAULT_EXCLUDE_SEGMENTS = ["/node_modules/", "/.git/"];
 function resolveFiles(cliPatterns) {
   const configPath = findConfigFile(process.cwd());
   let config = null;
+  const configDir = configPath ? import_node_path.default.dirname(configPath) : null;
   if (configPath) {
     try {
       const text2 = import_node_fs.default.readFileSync(configPath, "utf-8");
@@ -2783,7 +2810,7 @@ function resolveFiles(cliPatterns) {
   } else if (config?.include && config.include.length > 0) {
     patterns = config.include;
   } else {
-    return { files: [], config };
+    return { files: [], config, configDir };
   }
   let files = expandGlobs(patterns);
   files = files.filter((f2) => !DEFAULT_EXCLUDE_SEGMENTS.some((seg) => f2.includes(seg)));
@@ -2801,7 +2828,7 @@ function resolveFiles(cliPatterns) {
     }
     files = files.filter((f2) => !excludeSet.has(f2));
   }
-  return { files, config };
+  return { files, config, configDir };
 }
 function applyFixes(source, errors) {
   const replacements = [];
@@ -2848,7 +2875,7 @@ async function run(args) {
   }
   const fixMode = args.includes("--fix");
   const patterns = args.filter((a2) => a2 !== "--fix");
-  const { files, config } = resolveFiles(patterns);
+  const { files, config, configDir } = resolveFiles(patterns);
   if (files.length === 0) {
     if (patterns.length === 0 && (!config?.include || config.include.length === 0)) {
       console.log(USAGE);
@@ -2870,12 +2897,15 @@ async function run(args) {
   const rules = config?.rules;
   const customTagNames = config?.customTags?.map((t2) => t2.name);
   const customRules = config?.customRules;
+  const ruleFilterBase = configDir ?? cwd;
   for (const file of files) {
     const displayPath = import_node_path.default.relative(cwd, file) || file;
+    const ruleFilterPath = import_node_path.default.relative(ruleFilterBase, file) || displayPath;
+    const applicableCustomRules = filterCustomRulesForPath(customRules, ruleFilterPath);
     let source = import_node_fs.default.readFileSync(file, "utf-8");
     if (fixMode) {
       const tree2 = parseDocument(source);
-      const errors2 = collectErrors2(tree2, displayPath, rules, customTagNames, customRules);
+      const errors2 = collectErrors2(tree2, displayPath, rules, customTagNames, applicableCustomRules);
       const fixed = applyFixes(source, errors2);
       if (fixed !== source) {
         import_node_fs.default.writeFileSync(file, fixed, "utf-8");
@@ -2883,7 +2913,7 @@ async function run(args) {
       }
     }
     const tree = parseDocument(source);
-    const errors = collectErrors2(tree, displayPath, rules, customTagNames, customRules);
+    const errors = collectErrors2(tree, displayPath, rules, customTagNames, applicableCustomRules);
     const fileErrors = errors.filter((e2) => e2.severity !== "warning");
     const fileWarnings = errors.filter((e2) => e2.severity === "warning");
     if (errors.length > 0) {

package/package.json

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

package/src/browser/browser.test.ts

@@ -107,6 +107,20 @@ describe('lint', () => {
     expect(d.some((x) => x.ruleName === 'no-script')).toBe(true);
   });
 
+  it('rejects per-rule include/exclude at the type level', () => {
+    linter.lint('<script>x</script>', {
+      customRules: [{
+        id: 'no-script',
+        selector: 'script',
+        message: 'Bare <script> is disallowed',
+        // @ts-expect-error include is stripped from the browser CustomRule type
+        include: ['questions/**'],
+        // @ts-expect-error exclude is stripped from the browser CustomRule type
+        exclude: ['**/legacy/**'],
+      }],
+    });
+  });
+
   it('honors <!-- htmlmustache-disable ruleName --> directives', () => {
     const src = '<!-- htmlmustache-disable duplicateAttributes -->\n<p id="a" id="b"></p>';
     const d = linter.lint(src, DEFAULT_CONFIG);

package/src/browser/index.ts

@@ -28,8 +28,17 @@ import type {
 } 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 };
 

package/src/core/configSchema.ts

@@ -79,6 +79,14 @@ export interface CustomRule {
   selector: string;
   message: string;
   severity?: RuleSeverity;
+  /**
+   * Optional glob patterns (relative to the config file) restricting which
+   * files this rule applies to. Applied as an additional filter on top of the
+   * top-level `include`/`exclude` — a rule only fires for files that both
+   * the top-level settings include AND the per-rule settings include.
+   */
+  include?: string[];
+  exclude?: string[];
 }
 
 export interface NoBreakDelimiter {
@@ -264,6 +272,14 @@ export function validateConfig(raw: unknown): HtmlMustacheConfig {
       if (typeof e.severity === 'string' && VALID_RULE_SEVERITIES.has(e.severity)) {
         rule.severity = e.severity as RuleSeverity;
       }
+      if (Array.isArray(e.include)) {
+        const items = e.include.filter((s: unknown) => typeof s === 'string' && s.length > 0);
+        if (items.length > 0) rule.include = items as string[];
+      }
+      if (Array.isArray(e.exclude)) {
+        const items = e.exclude.filter((s: unknown) => typeof s === 'string' && s.length > 0);
+        if (items.length > 0) rule.exclude = items as string[];
+      }
       rules.push(rule);
     }
     if (rules.length > 0) config.customRules = rules;

package/src/core/customRuleFilter.ts

@@ -0,0 +1,32 @@
+/**
+ * Filter custom lint rules by per-rule `include` / `exclude` glob patterns.
+ *
+ * Patterns are matched against a path relative to the config file's directory.
+ * Path separators are normalized to forward slashes so cross-platform patterns
+ * like `questions/**` work regardless of host OS.
+ *
+ * Uses Node's `path.matchesGlob` (available since Node 22.5), so this module
+ * is Node-only — the browser entrypoint does not import it.
+ */
+
+import * as path from 'node:path';
+import type { CustomRule } from './configSchema.js';
+
+export function ruleMatchesPath(rule: CustomRule, relPath: string): boolean {
+  const normalized = relPath.split(path.sep).join('/');
+  if (rule.exclude && rule.exclude.some(p => path.matchesGlob(normalized, p))) {
+    return false;
+  }
+  if (rule.include && rule.include.length > 0) {
+    return rule.include.some(p => path.matchesGlob(normalized, p));
+  }
+  return true;
+}
+
+export function filterCustomRulesForPath(
+  rules: CustomRule[] | undefined,
+  relPath: string,
+): CustomRule[] | undefined {
+  if (!rules) return rules;
+  return rules.filter(r => ruleMatchesPath(r, relPath));
+}