@reteps/tree-sitter-htmlmustache 0.8.0 → 0.9.0

package/cli/out/main.js

@@ -525,11 +525,16 @@ var import_node_path = __toESM(require("node:path"));
 // cli/src/wasm.ts
 var path = __toESM(require("node:path"));
 var import_web_tree_sitter = require("web-tree-sitter");
+
+// src/core/grammar.ts
+var GRAMMAR_WASM_FILENAME = "tree-sitter-htmlmustache.wasm";
+
+// cli/src/wasm.ts
 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 wasmPath = path.resolve(__dirname, "..", "..", GRAMMAR_WASM_FILENAME);
   const language = await import_web_tree_sitter.Language.load(wasmPath);
   parser.setLanguage(language);
 }
@@ -545,7 +550,7 @@ function parseDocument(source) {
 var fs = __toESM(require("fs"), 1);
 var path2 = __toESM(require("path"), 1);
 
-// lsp/server/src/ruleMetadata.ts
+// src/core/ruleMetadata.ts
 var RULES = [
   {
     name: "nestedDuplicateSections",
@@ -598,7 +603,7 @@ var RULE_DEFAULTS = Object.fromEntries(
   RULES.map((r2) => [r2.name, r2.defaultSeverity])
 );
 
-// lsp/server/src/configFile.ts
+// src/core/configSchema.ts
 var VALID_CSS_DISPLAY_VALUES = /* @__PURE__ */ new Set([
   "block",
   "inline",
@@ -648,7 +653,6 @@ function parseRuleEntry(key, value) {
   if (!options) return { severity };
   return { severity, ...options };
 }
-var CONFIG_FILENAME = ".htmlmustache.jsonc";
 function parseJsonc(text2) {
   let result = "";
   let i2 = 0;
@@ -687,21 +691,6 @@ function parseJsonc(text2) {
   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 parseCustomTagArray(arr) {
   if (!Array.isArray(arr)) return [];
@@ -801,6 +790,24 @@ function validateConfig(raw) {
   }
   return config;
 }
+
+// lsp/server/src/configFile.ts
+var CONFIG_FILENAME = ".htmlmustache.jsonc";
+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;
+  }
+}
 function loadConfigFileForPath(filePath) {
   const dir = path2.dirname(path2.resolve(filePath));
   const configPath = findConfigFile(dir);
@@ -814,7 +821,7 @@ function loadConfigFileForPath(filePath) {
   }
 }
 
-// lsp/server/src/nodeHelpers.ts
+// src/core/nodeHelpers.ts
 var MUSTACHE_SECTION_TYPES = /* @__PURE__ */ new Set([
   "mustache_section",
   "mustache_inverted_section"
@@ -878,7 +885,7 @@ function getPartialName(node) {
   return child ? child.text.trim() : null;
 }
 
-// lsp/server/src/htmlBalanceChecker.ts
+// src/core/htmlBalanceChecker.ts
 function getTagNameLower(element) {
   return getTagName(element)?.toLowerCase() ?? null;
 }
@@ -1175,7 +1182,7 @@ function checkHtmlBalance(rootNode) {
   return allErrors;
 }
 
-// lsp/server/src/mustacheChecks.ts
+// src/core/mustacheChecks.ts
 function checkNestedSameNameSections(rootNode) {
   const errors = [];
   function visit(node, ancestors) {
@@ -1834,7 +1841,7 @@ function m(e2, { recursive: t2 = true, list: s2 = true } = {}) {
   return c2;
 }
 
-// lsp/server/src/selectorMatcher.ts
+// src/core/selectorMatcher.ts
 var MUSTACHE_KIND_PSEUDO = /* @__PURE__ */ new Set([
   "m-section",
   "m-inverted",
@@ -1963,6 +1970,7 @@ function segmentFromCompound(ast) {
   let kind;
   let name = null;
   let pathRegex;
+  let rootOnly = false;
   const attributes = [];
   const descendantChecks = [];
   const forbidChange = (requested) => {
@@ -2021,6 +2029,11 @@ function segmentFromCompound(ast) {
           if (!applyNegatedSubtree(token.subtree, attributes, descendantChecks)) return null;
           break;
         }
+        if (token.name === "root") {
+          rootOnly = true;
+          if (kind === void 0) kind = "html";
+          break;
+        }
         return null;
       }
       default:
@@ -2030,9 +2043,12 @@ function segmentFromCompound(ast) {
   if (kind === void 0) {
     kind = "html";
   }
+  if (rootOnly) {
+    if (name !== null || attributes.length > 0 || kind !== "html") return null;
+  }
   const isHtml = kind === "html";
   const finalAttrs = isHtml ? attributes : [];
-  return { kind, name, pathRegex, attributes: finalAttrs, descendantChecks, combinator: "descendant" };
+  return { kind, rootOnly, name, pathRegex, attributes: finalAttrs, descendantChecks, combinator: "descendant" };
 }
 function mustacheKindFromMarker(name) {
   switch (name) {
@@ -2227,7 +2243,11 @@ function matchesName(actual, segment) {
   if (segment.pathRegex) return segment.pathRegex.test(actual);
   return actual === segment.name;
 }
-function nodeMatchesSegment(node, segment) {
+function nodeMatchesSegment(node, segment, rootNode) {
+  if (segment.rootOnly) {
+    if (node !== rootNode) return false;
+    return checkDescendants(node, segment.descendantChecks);
+  }
   switch (segment.kind) {
     case "html": {
       if (!HTML_ELEMENT_TYPES.has(node.type)) return false;
@@ -2271,7 +2291,10 @@ function checkAncestors(ancestors, segments, segIdx, childCombinator) {
   if (childCombinator === "child") {
     for (let a2 = ancestors.length - 1; a2 >= 0; a2--) {
       const entry = ancestors[a2];
-      if (entry.kind !== ancestorKind) continue;
+      if (entry.kind !== ancestorKind) {
+        if (ancestorKind === "root" && entry.kind === "html") return false;
+        continue;
+      }
       if (!matchesName(entry.name, segment)) return false;
       if (segment.kind === "html" && !checkAttributes(entry.node, segment.attributes)) return false;
       if (!checkDescendants(entry.node, segment.descendantChecks)) return false;
@@ -2292,12 +2315,13 @@ function checkAncestors(ancestors, segments, segIdx, childCombinator) {
   return false;
 }
 function ancestorKindForSegment(segment) {
+  if (segment.rootOnly) return "root";
   if (segment.kind === "html") return "html";
   if (segment.kind === "section") return "section";
   if (segment.kind === "inverted") return "inverted";
   return null;
 }
-function getReportNode(node) {
+function getReportNode(node, rootNode) {
   if (HTML_ELEMENT_TYPES.has(node.type)) {
     const startTag = node.children.find(
       (c2) => c2.type === "html_start_tag" || c2.type === "html_self_closing_tag"
@@ -2310,15 +2334,26 @@ function getReportNode(node) {
     );
     return begin ?? node;
   }
+  if (rootNode && node === rootNode) {
+    return {
+      type: node.type,
+      text: "",
+      startPosition: node.startPosition,
+      endPosition: { row: node.startPosition.row, column: node.startPosition.column + 1 },
+      startIndex: node.startIndex,
+      endIndex: Math.min(node.startIndex + 1, node.endIndex),
+      children: []
+    };
+  }
   return node;
 }
 function matchAlternative(rootNode, segments) {
   const results = [];
   const lastSegment = segments[segments.length - 1];
   function walk(node, ancestors) {
-    if (nodeMatchesSegment(node, lastSegment)) {
+    if (nodeMatchesSegment(node, lastSegment, rootNode)) {
       if (segments.length === 1 || checkAncestors(ancestors, segments, segments.length - 2, lastSegment.combinator)) {
-        results.push(getReportNode(node));
+        results.push(getReportNode(node, rootNode));
       }
     }
     let newAncestors = ancestors;
@@ -2331,7 +2366,7 @@ function matchAlternative(rootNode, segments) {
     }
     for (const child of node.children) walk(child, newAncestors);
   }
-  walk(rootNode, []);
+  walk(rootNode, [{ kind: "root", name: "", node: rootNode }]);
   return results;
 }
 function matchSelector(rootNode, selector) {
@@ -2348,7 +2383,15 @@ function matchSelector(rootNode, selector) {
   return allResults;
 }
 
-// lsp/server/src/collectErrors.ts
+// src/core/collectErrors.ts
+var selectorCache = /* @__PURE__ */ new Map();
+function parseSelectorCached(raw) {
+  const hit = selectorCache.get(raw);
+  if (hit !== void 0) return hit;
+  const parsed = parseSelector(raw);
+  selectorCache.set(raw, parsed);
+  return parsed;
+}
 var ERROR_NODE_TYPES = /* @__PURE__ */ new Set([
   "ERROR",
   "mustache_erroneous_section_end",
@@ -2479,7 +2522,7 @@ function collectErrors(tree, rules, customTagNames, customRules) {
       if (disabledRules.has(rule.id)) continue;
       const severity = rule.severity ?? "error";
       if (severity === "off") continue;
-      const parsed = parseSelector(rule.selector);
+      const parsed = parseSelectorCached(rule.selector);
       if (!parsed) continue;
       const matches = matchSelector(tree.rootNode, parsed);
       for (const node of matches) {
@@ -2492,20 +2535,32 @@ function collectErrors(tree, rules, customTagNames, customRules) {
   );
 }
 
+// src/core/diagnostic.ts
+function toFix(r2) {
+  return { range: [r2.startIndex, r2.endIndex], newText: r2.newText };
+}
+function toDiagnostic(err) {
+  const { node } = err;
+  return {
+    line: node.startPosition.row + 1,
+    column: node.startPosition.column + 1,
+    endLine: node.endPosition.row + 1,
+    endColumn: node.endPosition.column + 1,
+    message: err.message,
+    severity: err.severity ?? "error",
+    ruleName: err.ruleName,
+    fix: err.fix && err.fix.length > 0 ? err.fix.map(toFix) : void 0,
+    fixDescription: err.fixDescription
+  };
+}
+
 // cli/src/check.ts
 function collectErrors2(tree, file, rules, customTagNames, customRules) {
   const errors = collectErrors(tree, rules, customTagNames, customRules);
   return errors.map((error) => ({
     file,
-    line: error.node.startPosition.row + 1,
-    column: error.node.startPosition.column + 1,
-    endLine: error.node.endPosition.row + 1,
-    endColumn: error.node.endPosition.column + 1,
-    message: error.message,
     nodeText: error.node.text,
-    severity: error.severity,
-    fix: error.fix,
-    fixDescription: error.fixDescription
+    ...toDiagnostic(error)
   }));
 }
 function formatError(error, source) {
@@ -2617,8 +2672,9 @@ function resolveFiles(cliPatterns) {
 function applyFixes(source, errors) {
   const replacements = [];
   for (const error of errors) {
-    if (error.fix) {
-      replacements.push(...error.fix);
+    if (!error.fix) continue;
+    for (const edit of error.fix) {
+      replacements.push({ startIndex: edit.range[0], endIndex: edit.range[1], newText: edit.newText });
     }
   }
   if (replacements.length === 0) return source;
@@ -2946,7 +3002,7 @@ function getWellformedEdit(textEdit) {
   return textEdit;
 }
 
-// lsp/server/src/formatting/printer.ts
+// src/core/formatting/printer.ts
 function print(doc, options) {
   const output = [];
   const state = { indentLevel: 0, mode: "break", groupModes: /* @__PURE__ */ new Map() };
@@ -3096,7 +3152,7 @@ function makeIndent(level, options) {
   return options.indentUnit.repeat(level);
 }
 
-// lsp/server/src/formatting/ir.ts
+// src/core/formatting/ir.ts
 var hardline = { type: "hardline" };
 var softline = { type: "softline" };
 var line = { type: "line" };
@@ -3148,7 +3204,7 @@ function isLine(doc) {
   return typeof doc === "object" && doc.type === "line";
 }
 
-// lsp/server/src/formatting/utils.ts
+// src/core/formatting/utils.ts
 function normalizeText(text2) {
   return text2.split("\n").map((line2) => line2.replace(/[ \t]+/g, " ").trim()).filter((line2, i2, arr) => line2 || i2 > 0 && i2 < arr.length - 1).join("\n");
 }
@@ -3224,7 +3280,7 @@ function getIgnoreDirective(node) {
   return null;
 }
 
-// lsp/server/src/customCodeTags.ts
+// src/core/customCodeTags.ts
 function isCodeTag(config) {
   return !!(config.languageAttribute || config.languageDefault);
 }
@@ -3253,7 +3309,7 @@ function getAttributeValue(node, attrName) {
   return null;
 }
 
-// lsp/server/src/formatting/classifier.ts
+// src/core/formatting/classifier.ts
 var EMPTY_MAP = /* @__PURE__ */ new Map();
 var CSS_DISPLAY_MAP = {
   // Block elements
@@ -3555,7 +3611,7 @@ function shouldTreatAsBlock(node, index, nodes, customTags = EMPTY_MAP) {
   return isHtmlEl && !shouldHtmlElementStayInline(node, index, nodes, customTags) || isMustacheSec && !isInTextFlow(node, index, nodes) || isBlockLevel(node, customTags) && !isInTextFlow(node, index, nodes);
 }
 
-// lsp/server/src/formatting/formatters.ts
+// src/core/formatting/formatters.ts
 function isAttributeTruthy(value) {
   if (value === null || value === "" || value === "false" || value === "0") {
     return false;
@@ -4447,46 +4503,12 @@ function trimDoc(doc) {
   return doc;
 }
 
-// lsp/server/src/formatting/editorconfig.ts
-var import_editorconfig = require("editorconfig");
-var import_url = require("url");
-function getEditorConfigOptions(uri) {
-  try {
-    if (!uri.startsWith("file://")) {
-      return {};
-    }
-    const filePath = (0, import_url.fileURLToPath)(uri);
-    const config = (0, import_editorconfig.parseSync)(filePath);
-    const result = {};
-    if (config.indent_style === "space") {
-      result.insertSpaces = true;
-    } else if (config.indent_style === "tab") {
-      result.insertSpaces = false;
-    }
-    if (typeof config.indent_size === "number") {
-      result.tabSize = config.indent_size;
-    } else if (config.indent_size === "tab" && typeof config.tab_width === "number") {
-      result.tabSize = config.tab_width;
-    }
-    return result;
-  } catch {
-    return {};
-  }
-}
-function mergeOptions(lspOptions, uri, configFile) {
-  let tabSize = lspOptions.tabSize;
-  let insertSpaces = lspOptions.insertSpaces;
-  if (configFile?.indentSize !== void 0) tabSize = configFile.indentSize;
-  const ec = getEditorConfigOptions(uri);
-  if (ec.tabSize !== void 0) tabSize = ec.tabSize;
-  if (ec.insertSpaces !== void 0) insertSpaces = ec.insertSpaces;
-  return { tabSize, insertSpaces };
-}
+// src/core/formatting/mergeOptions.ts
 function createIndentUnit(options) {
   return options.insertSpaces ? " ".repeat(options.tabSize) : "	";
 }
 
-// lsp/server/src/formatting/index.ts
+// src/core/formatting/index.ts
 function buildCustomTagMap(customTags) {
   if (!customTags || customTags.length === 0) return void 0;
   const map = /* @__PURE__ */ new Map();
@@ -4496,12 +4518,9 @@ function buildCustomTagMap(customTags) {
   return map;
 }
 function formatDocument2(tree, document, options, params = {}) {
-  const { printWidth = 80, embeddedFormatted, mustacheSpaces, noBreakDelimiters, configFile } = params;
-  const mergedOptions = mergeOptions(options, document.uri, configFile);
-  const indentUnit = createIndentUnit(mergedOptions);
-  if (tree.rootNode.hasError) {
-    return [];
-  }
+  const { printWidth = 80, embeddedFormatted, mustacheSpaces, noBreakDelimiters } = params;
+  const indentUnit = createIndentUnit(options);
+  if (tree.rootNode.hasError) return [];
   const customTagMap = buildCustomTagMap(params.customTags);
   const context = {
     document,
@@ -4519,7 +4538,7 @@ function formatDocument2(tree, document, options, params = {}) {
   return [{ range: fullRange, newText: formatted }];
 }
 
-// lsp/server/src/embeddedRegions.ts
+// src/core/embeddedRegions.ts
 function getEmbeddedLanguageId(node) {
   if (node.type === "html_style_element") {
     return "css";
@@ -4572,6 +4591,62 @@ function collectEmbeddedRegions(rootNode) {
   return regions;
 }
 
+// src/core/formatting/embedded.ts
+var LANGUAGE_TO_PRETTIER_PARSER = {
+  javascript: "babel",
+  typescript: "typescript",
+  css: "css"
+};
+async function formatEmbeddedRegions(rootNode, options, prettier) {
+  const result = /* @__PURE__ */ new Map();
+  if (!prettier) return result;
+  const regions = collectEmbeddedRegions(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;
+}
+
+// lsp/server/src/formatting/editorconfig.ts
+var import_editorconfig = require("editorconfig");
+var import_url = require("url");
+function getEditorConfigOptions(uri) {
+  try {
+    if (!uri.startsWith("file://")) {
+      return {};
+    }
+    const filePath = (0, import_url.fileURLToPath)(uri);
+    const config = (0, import_editorconfig.parseSync)(filePath);
+    const result = {};
+    if (config.indent_style === "space") {
+      result.insertSpaces = true;
+    } else if (config.indent_style === "tab") {
+      result.insertSpaces = false;
+    }
+    if (typeof config.indent_size === "number") {
+      result.tabSize = config.indent_size;
+    } else if (config.indent_size === "tab" && typeof config.tab_width === "number") {
+      result.tabSize = config.tab_width;
+    }
+    return result;
+  } catch {
+    return {};
+  }
+}
+
 // cli/src/format.ts
 var USAGE2 = `Usage: htmlmustache format [options] [patterns...]
 
@@ -4675,15 +4750,9 @@ function resolveSettings(flags, filePath) {
     printWidth,
     mustacheSpaces,
     noBreakDelimiters,
-    customTags,
-    configFile
+    customTags
   };
 }
-var LANGUAGE_TO_PRETTIER_PARSER = {
-  javascript: "babel",
-  typescript: "typescript",
-  css: "css"
-};
 var prettierModule;
 async function getPrettier() {
   if (prettierModule !== void 0) return prettierModule;
@@ -4695,32 +4764,9 @@ async function getPrettier() {
     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 embeddedFormatted = await formatEmbeddedRegions(tree.rootNode, options, await getPrettier());
   const document = TextDocument.create("file:///stdin", "htmlmustache", 1, source);
   const edits = formatDocument2(tree, document, options, {
     ...params,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reteps/tree-sitter-htmlmustache",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "HTML with Mustache/Handlebars template syntax grammar for tree-sitter",
   "repository": {
     "type": "git",
@@ -15,6 +15,18 @@
     "htmlmustache": "cli/out/main.js"
   },
   "types": "bindings/node",
+  "exports": {
+    ".": {
+      "types": "./bindings/node/index.d.ts",
+      "default": "./bindings/node/index.js"
+    },
+    "./browser": {
+      "types": "./browser/out/browser/index.d.ts",
+      "import": "./browser/out/browser/index.mjs"
+    },
+    "./tree-sitter-htmlmustache.wasm": "./tree-sitter-htmlmustache.wasm",
+    "./package.json": "./package.json"
+  },
   "keywords": [
     "incremental",
     "parsing",
@@ -32,7 +44,8 @@
     "queries/*",
     "src/**",
     "*.wasm",
-    "cli/out/*"
+    "cli/out/*",
+    "browser/out/**"
   ],
   "dependencies": {
     "chalk": "^5.6.2",
@@ -43,6 +56,7 @@
   "peerDependencies": {
     "node-addon-api": "^8.2.2",
     "node-gyp-build": "^4.8.2",
+    "prettier": "^3.0.0",
     "tree-sitter": "^0.25.0"
   },
   "peerDependenciesMeta": {
@@ -52,6 +66,9 @@
     "node-gyp-build": {
       "optional": true
     },
+    "prettier": {
+      "optional": true
+    },
     "tree-sitter": {
       "optional": true
     }
@@ -81,8 +98,9 @@
   "scripts": {
     "install": "node-gyp-build || exit 0",
     "build": "tree-sitter build --wasm",
-    "prepack": "tree-sitter build --wasm && node cli/esbuild.mjs",
+    "prepack": "tree-sitter build --wasm && node cli/esbuild.mjs && node browser/esbuild.mjs && tsc -p src/browser/tsconfig.json",
     "build:cli": "node cli/esbuild.mjs",
+    "build:browser": "node browser/esbuild.mjs && tsc -p src/browser/tsconfig.json",
     "check": "node cli/out/check.js check",
     "lint": "eslint .",
     "format": "prettier --write .",