@reteps/tree-sitter-htmlmustache 0.0.34 → 0.0.35

package/README.md

@@ -79,6 +79,12 @@ Check templates for parse errors:
 htmlmustache check '**/*.mustache' '**/*.hbs'
 ```
 
+If `include` is configured in `.htmlmustache.jsonc`, patterns are optional:
+
+```
+htmlmustache check
+```
+
 ```
 file.mustache:3:3 error: Mismatched mustache section: {{/wrong}}
   |
@@ -100,6 +106,12 @@ Format templates:
 htmlmustache format --write '**/*.mustache'
 ```
 
+If `include` is configured in `.htmlmustache.jsonc`, patterns are optional:
+
+```
+htmlmustache format --write
+```
+
 Check formatting in CI (exits 1 if any files would change):
 
 ```
@@ -114,14 +126,14 @@ echo '<div><p>hi</p></div>' | htmlmustache format --stdin
 
 **Options:**
 
-| Flag                 | Description                                    |
-| -------------------- | ---------------------------------------------- |
-| `--write`            | Modify files in-place (default: print to stdout) |
-| `--check`            | Exit 1 if any files would change (for CI)      |
-| `--stdin`            | Read from stdin, write to stdout               |
-| `--indent-size N`    | Spaces per indent level (default: 2)           |
-| `--print-width N`    | Max line width (default: 80)                   |
-| `--mustache-spaces`  | Add spaces inside mustache delimiters          |
+| Flag                | Description                                      |
+| ------------------- | ------------------------------------------------ |
+| `--write`           | Modify files in-place (default: print to stdout) |
+| `--check`           | Exit 1 if any files would change (for CI)        |
+| `--stdin`           | Read from stdin, write to stdout                 |
+| `--indent-size N`   | Spaces per indent level (default: 2)             |
+| `--print-width N`   | Max line width (default: 80)                     |
+| `--mustache-spaces` | Add spaces inside mustache delimiters            |
 
 ## Configuration
 
@@ -131,6 +143,12 @@ Create a `.htmlmustache.jsonc` file in your project root to configure formatting
 
 ```jsonc
 {
+  // File patterns for CLI commands (used when no patterns are passed as arguments)
+  "include": ["**/*.mustache", "**/*.hbs"],
+
+  // Patterns to always exclude (node_modules and .git are excluded by default)
+  "exclude": ["**/vendor/**"],
+
   // Max line width before wrapping (default: 80)
   "printWidth": 100,
 
@@ -144,9 +162,9 @@ Create a `.htmlmustache.jsonc` file in your project root to configure formatting
   "customCodeTags": [
     {
       "name": "x-code",
-      "languageDefault": "javascript"
-    }
-  ]
+      "languageDefault": "javascript",
+    },
+  ],
 }
 ```
 

package/cli/out/main.js

@@ -1580,29 +1580,142 @@ var import_chalk3 = __toESM(require_source());
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = __toESM(require("node:path"));
 var import_chalk = __toESM(require_source());
-function loadParser() {
-  let Parser2;
-  try {
-    Parser2 = require("tree-sitter");
-  } catch {
-    console.error(
-      import_chalk.default.red("Error: tree-sitter is not installed.\n") + "Install it with: npm install tree-sitter"
-    );
-    process.exit(1);
+
+// cli/src/wasm.ts
+var path = __toESM(require("node:path"));
+var import_web_tree_sitter = require("web-tree-sitter");
+var parser;
+async function initializeParser() {
+  await import_web_tree_sitter.Parser.init();
+  parser = new import_web_tree_sitter.Parser();
+  const wasmPath = path.resolve(__dirname, "..", "..", "tree-sitter-htmlmustache.wasm");
+  const language = await import_web_tree_sitter.Language.load(wasmPath);
+  parser.setLanguage(language);
+}
+function parseDocument(source) {
+  const tree = parser.parse(source);
+  if (!tree) {
+    throw new Error("Failed to parse document");
   }
-  let language;
+  return tree;
+}
+
+// lsp/server/src/configFile.ts
+var fs = __toESM(require("fs"));
+var path2 = __toESM(require("path"));
+var CONFIG_FILENAME = ".htmlmustache.jsonc";
+function parseJsonc(text2) {
+  let result = "";
+  let i = 0;
+  while (i < text2.length) {
+    if (text2[i] === '"') {
+      result += '"';
+      i++;
+      while (i < text2.length && text2[i] !== '"') {
+        if (text2[i] === "\\") {
+          result += text2[i] + (text2[i + 1] ?? "");
+          i += 2;
+        } else {
+          result += text2[i];
+          i++;
+        }
+      }
+      if (i < text2.length) {
+        result += '"';
+        i++;
+      }
+      continue;
+    }
+    if (text2[i] === "/" && text2[i + 1] === "/") {
+      while (i < text2.length && text2[i] !== "\n") i++;
+      continue;
+    }
+    if (text2[i] === "/" && text2[i + 1] === "*") {
+      i += 2;
+      while (i < text2.length && !(text2[i] === "*" && text2[i + 1] === "/")) i++;
+      i += 2;
+      continue;
+    }
+    result += text2[i];
+    i++;
+  }
+  result = result.replace(/,\s*([}\]])/g, "$1");
+  return JSON.parse(result);
+}
+function findConfigFile(startDir) {
+  let dir = path2.resolve(startDir);
+  const root = path2.parse(dir).root;
+  while (true) {
+    const candidate = path2.join(dir, CONFIG_FILENAME);
+    try {
+      fs.accessSync(candidate, fs.constants.R_OK);
+      return candidate;
+    } catch {
+    }
+    const parent = path2.dirname(dir);
+    if (parent === dir || dir === root) return null;
+    dir = parent;
+  }
+}
+var VALID_INDENT_MODES = /* @__PURE__ */ new Set(["never", "always", "attribute"]);
+function validateConfig(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
+  const obj = raw;
+  const config = {};
+  if (typeof obj.printWidth === "number" && obj.printWidth > 0) {
+    config.printWidth = obj.printWidth;
+  }
+  if (typeof obj.indentSize === "number" && obj.indentSize > 0) {
+    config.indentSize = obj.indentSize;
+  }
+  if (typeof obj.mustacheSpaces === "boolean") {
+    config.mustacheSpaces = obj.mustacheSpaces;
+  }
+  if (Array.isArray(obj.include)) {
+    const items = obj.include.filter((s) => typeof s === "string" && s.length > 0);
+    if (items.length > 0) config.include = items;
+  }
+  if (Array.isArray(obj.exclude)) {
+    const items = obj.exclude.filter((s) => typeof s === "string" && s.length > 0);
+    if (items.length > 0) config.exclude = items;
+  }
+  if (Array.isArray(obj.customCodeTags)) {
+    const tags = [];
+    for (const entry of obj.customCodeTags) {
+      if (entry && typeof entry === "object" && "name" in entry) {
+        const e = entry;
+        if (typeof e.name !== "string" || e.name.length === 0) continue;
+        const tag = { name: e.name };
+        if (typeof e.languageAttribute === "string") tag.languageAttribute = e.languageAttribute;
+        if (e.languageMap && typeof e.languageMap === "object" && !Array.isArray(e.languageMap)) {
+          tag.languageMap = e.languageMap;
+        }
+        if (typeof e.languageDefault === "string") tag.languageDefault = e.languageDefault;
+        if (typeof e.indent === "string" && VALID_INDENT_MODES.has(e.indent)) {
+          tag.indent = e.indent;
+        }
+        if (typeof e.indentAttribute === "string") tag.indentAttribute = e.indentAttribute;
+        tags.push(tag);
+      }
+    }
+    if (tags.length > 0) config.customCodeTags = tags;
+  }
+  return config;
+}
+function loadConfigFileForPath(filePath) {
+  const dir = path2.dirname(path2.resolve(filePath));
+  const configPath = findConfigFile(dir);
+  if (!configPath) return null;
   try {
-    language = require(import_node_path.default.resolve(__dirname, "..", ".."));
+    const text2 = fs.readFileSync(configPath, "utf-8");
+    const raw = parseJsonc(text2);
+    return validateConfig(raw);
   } catch {
-    console.error(
-      import_chalk.default.red("Error: could not load tree-sitter-htmlmustache bindings.\n") + 'Run "npm install" in the tree-sitter-htmlmustache root first.'
-    );
-    process.exit(1);
+    return null;
   }
-  const parser2 = new Parser2();
-  parser2.setLanguage(language);
-  return parser2;
 }
+
+// cli/src/check.ts
 function errorMessageForNode(nodeType, node) {
   if (nodeType === "mustache_erroneous_section_end" || nodeType === "mustache_erroneous_inverted_section_end") {
     const tagNameNode = node.children.find((c) => c.type === "mustache_erroneous_tag_name");
@@ -1707,36 +1820,81 @@ function expandGlobs(patterns) {
   }
   return [...files].sort();
 }
-var USAGE = `Usage: htmlmustache check <patterns...>
+var DEFAULT_EXCLUDE_SEGMENTS = ["/node_modules/", "/.git/"];
+function resolveFiles(cliPatterns) {
+  const configPath = findConfigFile(process.cwd());
+  let config = null;
+  if (configPath) {
+    try {
+      const text2 = import_node_fs.default.readFileSync(configPath, "utf-8");
+      const raw = parseJsonc(text2);
+      config = validateConfig(raw);
+    } catch {
+      config = null;
+    }
+  }
+  let patterns;
+  if (cliPatterns.length > 0) {
+    patterns = cliPatterns;
+  } else if (config?.include && config.include.length > 0) {
+    patterns = config.include;
+  } else {
+    return { files: [], config };
+  }
+  let files = expandGlobs(patterns);
+  files = files.filter((f) => !DEFAULT_EXCLUDE_SEGMENTS.some((seg) => f.includes(seg)));
+  if (config?.exclude && config.exclude.length > 0) {
+    const cwd = process.cwd();
+    const excludeSet = /* @__PURE__ */ new Set();
+    for (const pattern of config.exclude) {
+      if (!pattern.includes("*") && !pattern.includes("?")) {
+        excludeSet.add(import_node_path.default.resolve(cwd, pattern));
+      } else {
+        for (const match of import_node_fs.default.globSync(pattern, { cwd })) {
+          excludeSet.add(import_node_path.default.resolve(cwd, match));
+        }
+      }
+    }
+    files = files.filter((f) => !excludeSet.has(f));
+  }
+  return { files, config };
+}
+var USAGE = `Usage: htmlmustache check [patterns...]
 
 Check HTML Mustache templates for errors.
 
 Arguments:
-  patterns  One or more glob patterns (e.g. '**/*.mustache' '**/*.hbs')
+  patterns  One or more glob patterns (optional if "include" is set in config)
 
 Options:
   --help    Show this help message
 
 Examples:
   htmlmustache check '**/*.mustache'
-  htmlmustache check 'templates/**/*.hbs' 'partials/**/*.mustache'`;
-function run(args) {
+  htmlmustache check 'templates/**/*.hbs' 'partials/**/*.mustache'
+  htmlmustache check                       (uses "include" from .htmlmustache.jsonc)`;
+async function run(args) {
   if (args[0] === "check") {
     args = args.slice(1);
   }
-  if (args.includes("--help") || args.length === 0) {
+  if (args.includes("--help")) {
     console.log(USAGE);
-    return args.includes("--help") ? 0 : 1;
+    return 0;
   }
-  const files = expandGlobs(args);
+  const { files, config } = resolveFiles(args);
   if (files.length === 0) {
+    if (args.length === 0 && (!config?.include || config.include.length === 0)) {
+      console.log(USAGE);
+      return 1;
+    }
+    const patterns = args.length > 0 ? args : config?.include ?? [];
     console.error(import_chalk.default.yellow("No files matched the given patterns:"));
-    for (const arg of args) {
-      console.error(import_chalk.default.yellow(`  ${arg}`));
+    for (const p of patterns) {
+      console.error(import_chalk.default.yellow(`  ${p}`));
     }
     return 1;
   }
-  const parser2 = loadParser();
+  await initializeParser();
   let totalErrors = 0;
   let filesWithErrors = 0;
   const cwd = process.cwd();
@@ -1744,7 +1902,7 @@ function run(args) {
   for (const file of files) {
     const displayPath = import_node_path.default.relative(cwd, file) || file;
     const source = import_node_fs.default.readFileSync(file, "utf-8");
-    const tree = parser2.parse(source);
+    const tree = parseDocument(source);
     const errors = collectErrors(tree, displayPath);
     if (errors.length > 0) {
       filesWithErrors++;
@@ -2524,7 +2682,7 @@ function shouldTreatAsBlock(node, index, nodes) {
 }
 
 // lsp/server/src/customCodeTags.ts
-var VALID_INDENT_MODES = /* @__PURE__ */ new Set(["never", "always", "attribute"]);
+var VALID_INDENT_MODES2 = /* @__PURE__ */ new Set(["never", "always", "attribute"]);
 function parseCustomCodeTagSettings(tags) {
   const tagNames = [];
   const configs = [];
@@ -2535,7 +2693,7 @@ function parseCustomCodeTagSettings(tags) {
       if (typeof t.languageAttribute === "string") config.languageAttribute = t.languageAttribute;
       if (t.languageMap && typeof t.languageMap === "object") config.languageMap = t.languageMap;
       if (typeof t.languageDefault === "string") config.languageDefault = t.languageDefault;
-      if (typeof t.indent === "string" && VALID_INDENT_MODES.has(t.indent)) {
+      if (typeof t.indent === "string" && VALID_INDENT_MODES2.has(t.indent)) {
         config.indent = t.indent;
       }
       if (typeof t.indentAttribute === "string") config.indentAttribute = t.indentAttribute;
@@ -3278,139 +3436,13 @@ function buildConfigMap(configs) {
   return map;
 }
 
-// lsp/server/src/configFile.ts
-var fs2 = __toESM(require("fs"));
-var path2 = __toESM(require("path"));
-var CONFIG_FILENAME = ".htmlmustache.jsonc";
-function parseJsonc(text2) {
-  let result = "";
-  let i = 0;
-  while (i < text2.length) {
-    if (text2[i] === '"') {
-      result += '"';
-      i++;
-      while (i < text2.length && text2[i] !== '"') {
-        if (text2[i] === "\\") {
-          result += text2[i] + (text2[i + 1] ?? "");
-          i += 2;
-        } else {
-          result += text2[i];
-          i++;
-        }
-      }
-      if (i < text2.length) {
-        result += '"';
-        i++;
-      }
-      continue;
-    }
-    if (text2[i] === "/" && text2[i + 1] === "/") {
-      while (i < text2.length && text2[i] !== "\n") i++;
-      continue;
-    }
-    if (text2[i] === "/" && text2[i + 1] === "*") {
-      i += 2;
-      while (i < text2.length && !(text2[i] === "*" && text2[i + 1] === "/")) i++;
-      i += 2;
-      continue;
-    }
-    result += text2[i];
-    i++;
-  }
-  result = result.replace(/,\s*([}\]])/g, "$1");
-  return JSON.parse(result);
-}
-function findConfigFile(startDir) {
-  let dir = path2.resolve(startDir);
-  const root = path2.parse(dir).root;
-  while (true) {
-    const candidate = path2.join(dir, CONFIG_FILENAME);
-    try {
-      fs2.accessSync(candidate, fs2.constants.R_OK);
-      return candidate;
-    } catch {
-    }
-    const parent = path2.dirname(dir);
-    if (parent === dir || dir === root) return null;
-    dir = parent;
-  }
-}
-var VALID_INDENT_MODES2 = /* @__PURE__ */ new Set(["never", "always", "attribute"]);
-function validateConfig(raw) {
-  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return {};
-  const obj = raw;
-  const config = {};
-  if (typeof obj.printWidth === "number" && obj.printWidth > 0) {
-    config.printWidth = obj.printWidth;
-  }
-  if (typeof obj.indentSize === "number" && obj.indentSize > 0) {
-    config.indentSize = obj.indentSize;
-  }
-  if (typeof obj.mustacheSpaces === "boolean") {
-    config.mustacheSpaces = obj.mustacheSpaces;
-  }
-  if (Array.isArray(obj.customCodeTags)) {
-    const tags = [];
-    for (const entry of obj.customCodeTags) {
-      if (entry && typeof entry === "object" && "name" in entry) {
-        const e = entry;
-        if (typeof e.name !== "string" || e.name.length === 0) continue;
-        const tag = { name: e.name };
-        if (typeof e.languageAttribute === "string") tag.languageAttribute = e.languageAttribute;
-        if (e.languageMap && typeof e.languageMap === "object" && !Array.isArray(e.languageMap)) {
-          tag.languageMap = e.languageMap;
-        }
-        if (typeof e.languageDefault === "string") tag.languageDefault = e.languageDefault;
-        if (typeof e.indent === "string" && VALID_INDENT_MODES2.has(e.indent)) {
-          tag.indent = e.indent;
-        }
-        if (typeof e.indentAttribute === "string") tag.indentAttribute = e.indentAttribute;
-        tags.push(tag);
-      }
-    }
-    if (tags.length > 0) config.customCodeTags = tags;
-  }
-  return config;
-}
-function loadConfigFileForPath(filePath) {
-  const dir = path2.dirname(path2.resolve(filePath));
-  const configPath = findConfigFile(dir);
-  if (!configPath) return null;
-  try {
-    const text2 = fs2.readFileSync(configPath, "utf-8");
-    const raw = parseJsonc(text2);
-    return validateConfig(raw);
-  } catch {
-    return null;
-  }
-}
-
-// cli/src/wasm.ts
-var path3 = __toESM(require("node:path"));
-var import_web_tree_sitter = require("web-tree-sitter");
-var parser;
-async function initializeParser() {
-  await import_web_tree_sitter.Parser.init();
-  parser = new import_web_tree_sitter.Parser();
-  const wasmPath = path3.resolve(__dirname, "..", "..", "tree-sitter-htmlmustache.wasm");
-  const language = await import_web_tree_sitter.Language.load(wasmPath);
-  parser.setLanguage(language);
-}
-function parseDocument(source) {
-  const tree = parser.parse(source);
-  if (!tree) {
-    throw new Error("Failed to parse document");
-  }
-  return tree;
-}
-
 // cli/src/format.ts
-var USAGE2 = `Usage: htmlmustache format [options] <patterns...>
+var USAGE2 = `Usage: htmlmustache format [options] [patterns...]
 
 Format HTML Mustache templates.
 
 Arguments:
-  patterns          One or more glob patterns (e.g. '**/*.mustache')
+  patterns          One or more glob patterns (optional if "include" is set in config)
 
 Options:
   --write           Modify files in-place (default: print to stdout)
@@ -3424,6 +3456,7 @@ Options:
 Examples:
   htmlmustache format --write '**/*.mustache'
   htmlmustache format --check 'templates/**/*.hbs'
+  htmlmustache format --write                       (uses "include" from .htmlmustache.jsonc)
   echo '<div><p>hi</p></div>' | htmlmustache format --stdin`;
 function parseFlags(args) {
   const flags = {
@@ -3527,26 +3560,28 @@ async function run2(args) {
     return 0;
   }
   const flags = parseFlags(args);
-  if (!flags.stdin && flags.patterns.length === 0) {
-    console.log(USAGE2);
-    return 1;
-  }
-  await initializeParser();
   if (flags.stdin) {
+    await initializeParser();
     const { options, ...params } = resolveSettings(flags);
     const source = import_node_fs2.default.readFileSync(0, "utf-8");
     const formatted = formatSource(source, options, params);
     process.stdout.write(formatted);
     return 0;
   }
-  const files = expandGlobs(flags.patterns);
+  const { files, config } = resolveFiles(flags.patterns);
   if (files.length === 0) {
+    if (flags.patterns.length === 0 && (!config?.include || config.include.length === 0)) {
+      console.log(USAGE2);
+      return 1;
+    }
+    const patterns = flags.patterns.length > 0 ? flags.patterns : config?.include ?? [];
     console.error(import_chalk2.default.yellow("No files matched the given patterns:"));
-    for (const pattern of flags.patterns) {
+    for (const pattern of patterns) {
       console.error(import_chalk2.default.yellow(`  ${pattern}`));
     }
     return 1;
   }
+  await initializeParser();
   const cwd = process.cwd();
   let changedCount = 0;
   for (const file of files) {
@@ -3593,7 +3628,7 @@ async function main() {
   const command = args[0];
   switch (command) {
     case "check":
-      process.exit(run(args));
+      process.exit(await run(args));
       break;
     case "format":
       process.exit(await run2(args));

package/grammar.js

@@ -218,7 +218,13 @@ module.exports = grammar({
     html_erroneous_end_tag: ($) =>
       seq('</', $.html_erroneous_end_tag_name, '>'),
 
-    _attribute: ($) => choice($.mustache_attribute, $.html_attribute, $.mustache_interpolation, $.mustache_triple),
+    _attribute: ($) =>
+      choice(
+        $.mustache_attribute,
+        $.html_attribute,
+        $.mustache_interpolation,
+        $.mustache_triple,
+      ),
     html_attribute: ($) =>
       seq(
         seq(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reteps/tree-sitter-htmlmustache",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "description": "HTML with Mustache/Handlebars template syntax grammar for tree-sitter",
   "repository": {
     "type": "git",
@@ -37,12 +37,14 @@
   "dependencies": {
     "chalk": "^4.1.2",
     "editorconfig": "^2.0.1",
-    "node-addon-api": "^8.2.2",
-    "node-gyp-build": "^4.8.2",
-    "tree-sitter": "^0.25.0",
     "vscode-languageserver-textdocument": "^1.0.12",
     "web-tree-sitter": "^0.25.0"
   },
+  "optionalDependencies": {
+    "node-addon-api": "^8.2.2",
+    "node-gyp-build": "^4.8.2",
+    "tree-sitter": "^0.25.0"
+  },
   "devDependencies": {
     "@eslint/js": "^9.39.2",
     "@types/node": "^22.19.11",
@@ -65,9 +67,9 @@
     ]
   },
   "scripts": {
-    "install": "node-gyp-build",
+    "install": "node-gyp-build || exit 0",
     "build": "tree-sitter build --wasm",
-    "prepack": "node cli/esbuild.mjs",
+    "prepack": "tree-sitter build --wasm && node cli/esbuild.mjs",
     "build:cli": "node cli/esbuild.mjs",
     "check": "node cli/out/check.js check",
     "lint": "eslint .",