@reteps/tree-sitter-htmlmustache 0.0.30 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reteps/tree-sitter-htmlmustache",
-  "version": "0.0.30",
+  "version": "0.0.34",
   "description": "HTML with Mustache/Handlebars template syntax grammar for tree-sitter",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
   },
   "main": "bindings/node",
   "bin": {
-    "htmlmustache": "cli/out/check.js"
+    "htmlmustache": "cli/out/main.js"
   },
   "types": "bindings/node",
   "keywords": [
@@ -36,12 +36,17 @@
   ],
   "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"
+    "tree-sitter": "^0.25.0",
+    "vscode-languageserver-textdocument": "^1.0.12",
+    "web-tree-sitter": "^0.25.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.39.2",
     "@types/node": "^22.19.11",
+    "esbuild": "^0.25.0",
     "eslint": "^9.14.0",
     "eslint-config-treesitter": "^1.0.2",
     "prebuildify": "^6.0.1",
@@ -49,6 +54,7 @@
     "tree-sitter": "^0.25.0",
     "tree-sitter-cli": "^0.26.3",
     "typescript": "^5.7.0",
+    "typescript-eslint": "^8.54.0",
     "vitest": "^3.0.0"
   },
   "pnpm": {
@@ -61,8 +67,8 @@
   "scripts": {
     "install": "node-gyp-build",
     "build": "tree-sitter build --wasm",
-    "prepack": "tsc -p cli/tsconfig.json",
-    "build:cli": "tsc -p cli/tsconfig.json",
+    "prepack": "node cli/esbuild.mjs",
+    "build:cli": "node cli/esbuild.mjs",
     "check": "node cli/out/check.js check",
     "lint": "eslint .",
     "format": "prettier --write .",

package/cli/out/check.js

@@ -1,235 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.collectErrors = collectErrors;
-exports.formatError = formatError;
-exports.formatSummary = formatSummary;
-exports.expandGlobs = expandGlobs;
-exports.run = run;
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
-const chalk_1 = __importDefault(require("chalk"));
-function loadParser() {
-    let Parser;
-    try {
-        Parser = require('tree-sitter');
-    }
-    catch {
-        console.error(chalk_1.default.red('Error: tree-sitter is not installed.\n') +
-            'Install it with: npm install tree-sitter');
-        process.exit(1);
-    }
-    let language;
-    try {
-        language = require(node_path_1.default.resolve(__dirname, '..', '..'));
-    }
-    catch {
-        console.error(chalk_1.default.red('Error: could not load tree-sitter-htmlmustache bindings.\n') +
-            'Run "npm install" in the tree-sitter-htmlmustache root first.');
-        process.exit(1);
-    }
-    const parser = new Parser();
-    parser.setLanguage(language);
-    return parser;
-}
-// ── Error collection ──
-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');
-        return `Mismatched mustache section: {{/${tagNameNode?.text || '?'}}}`;
-    }
-    if (nodeType === 'html_erroneous_end_tag') {
-        const tagNameNode = node.children.find((c) => c.type === 'html_erroneous_end_tag_name');
-        return `Mismatched HTML end tag: </${tagNameNode?.text || '?'}>`;
-    }
-    if (nodeType === 'ERROR') {
-        return 'Syntax error';
-    }
-    // isMissing node
-    return `Missing ${nodeType}`;
-}
-const ERROR_NODE_TYPES = new Set([
-    'ERROR',
-    'mustache_erroneous_section_end',
-    'mustache_erroneous_inverted_section_end',
-    'html_erroneous_end_tag',
-]);
-function collectErrors(tree, file) {
-    const errors = [];
-    const cursor = tree.walk();
-    function visit() {
-        const node = cursor.currentNode;
-        const nodeType = cursor.nodeType;
-        if (ERROR_NODE_TYPES.has(nodeType) || cursor.nodeIsMissing) {
-            errors.push({
-                file,
-                line: node.startPosition.row + 1,
-                column: node.startPosition.column + 1,
-                endLine: node.endPosition.row + 1,
-                endColumn: node.endPosition.column + 1,
-                message: errorMessageForNode(nodeType, node),
-                nodeText: node.text,
-            });
-            // Don't recurse into ERROR nodes — the children are not meaningful
-            if (nodeType === 'ERROR')
-                return;
-        }
-        if (cursor.gotoFirstChild()) {
-            do {
-                visit();
-            } while (cursor.gotoNextSibling());
-            cursor.gotoParent();
-        }
-    }
-    visit();
-    return errors;
-}
-// ── Formatting ──
-function formatError(error, source) {
-    const lines = source.split('\n');
-    const errorLine = error.line - 1; // 0-based index
-    // Location header
-    const header = chalk_1.default.bold(`${error.file}:${error.line}:${error.column}`) +
-        ' ' + chalk_1.default.red('error') + ': ' + error.message;
-    // Context lines: up to 2 before + the error line(s)
-    const contextStart = Math.max(0, errorLine - 2);
-    const contextEnd = Math.min(lines.length - 1, error.endLine - 1);
-    const gutterWidth = String(contextEnd + 1).length;
-    const pad = (n) => String(n).padStart(gutterWidth);
-    const outputLines = [header];
-    outputLines.push(chalk_1.default.dim(' '.repeat(gutterWidth) + ' |'));
-    for (let i = contextStart; i <= contextEnd; i++) {
-        const lineNum = i + 1;
-        outputLines.push(chalk_1.default.dim(`${pad(lineNum)} |`) + ' ' + lines[i]);
-    }
-    // Underline: only on the last displayed line of the error
-    const lastErrorLineIdx = error.endLine - 1;
-    const lastLine = lines[lastErrorLineIdx] || '';
-    let underlineStart;
-    let underlineEnd;
-    if (error.line === error.endLine) {
-        // Single-line error
-        underlineStart = error.column - 1;
-        underlineEnd = error.endColumn - 1;
-    }
-    else {
-        // Multi-line: underline to end of last line
-        underlineStart = 0;
-        underlineEnd = lastLine.length;
-    }
-    const underlineLength = Math.max(1, underlineEnd - underlineStart);
-    const underline = ' '.repeat(underlineStart) + '^'.repeat(underlineLength) +
-        ' ' + error.message;
-    outputLines.push(chalk_1.default.dim(' '.repeat(gutterWidth) + ' |') + ' ' + chalk_1.default.red(underline));
-    return outputLines.join('\n');
-}
-function formatSummary(totalErrors, filesWithErrors, totalFiles) {
-    if (totalErrors === 0) {
-        return chalk_1.default.green(`No errors found (${totalFiles} ${totalFiles === 1 ? 'file' : 'files'} checked)`);
-    }
-    const errStr = totalErrors === 1 ? 'error' : 'errors';
-    const errFileStr = filesWithErrors === 1 ? 'file' : 'files';
-    const totalStr = totalFiles === 1 ? 'file' : 'files';
-    return chalk_1.default.red(`${totalErrors} ${errStr} in ${filesWithErrors} ${errFileStr}`) +
-        ` (${totalFiles} ${totalStr} checked)`;
-}
-// ── Glob expansion ──
-function expandGlobs(patterns) {
-    const files = new Set();
-    const cwd = process.cwd();
-    for (const pattern of patterns) {
-        // If the pattern is an exact file path, use it directly
-        if (!pattern.includes('*') && !pattern.includes('?')) {
-            const resolved = node_path_1.default.resolve(cwd, pattern);
-            if (node_fs_1.default.existsSync(resolved)) {
-                files.add(resolved);
-            }
-        }
-        else {
-            for (const match of node_fs_1.default.globSync(pattern, { cwd })) {
-                files.add(node_path_1.default.resolve(cwd, match));
-            }
-        }
-    }
-    return [...files].sort();
-}
-// ── Main ──
-const USAGE = `Usage: htmlmustache check <patterns...>
-
-Check HTML Mustache templates for errors.
-
-Arguments:
-  patterns  One or more glob patterns (e.g. '**/*.mustache' '**/*.hbs')
-
-Options:
-  --help    Show this help message
-
-Examples:
-  htmlmustache check '**/*.mustache'
-  htmlmustache check 'templates/**/*.hbs' 'partials/**/*.mustache'`;
-function run(args) {
-    // Strip "check" subcommand if present
-    if (args[0] === 'check') {
-        args = args.slice(1);
-    }
-    if (args.includes('--help') || args.length === 0) {
-        console.log(USAGE);
-        return args.includes('--help') ? 0 : 1;
-    }
-    const files = expandGlobs(args);
-    if (files.length === 0) {
-        console.error(chalk_1.default.yellow('No files matched the given patterns:'));
-        for (const arg of args) {
-            console.error(chalk_1.default.yellow(`  ${arg}`));
-        }
-        return 1;
-    }
-    const parser = loadParser();
-    let totalErrors = 0;
-    let filesWithErrors = 0;
-    const cwd = process.cwd();
-    const errorOutput = [];
-    for (const file of files) {
-        const displayPath = node_path_1.default.relative(cwd, file) || file;
-        const source = node_fs_1.default.readFileSync(file, 'utf-8');
-        const tree = parser.parse(source);
-        const errors = collectErrors(tree, displayPath);
-        if (errors.length > 0) {
-            filesWithErrors++;
-            totalErrors += errors.length;
-            for (const error of errors) {
-                errorOutput.push(formatError(error, source));
-            }
-        }
-        console.log(errors.length > 0
-            ? chalk_1.default.red(displayPath)
-            : chalk_1.default.dim(displayPath));
-    }
-    if (errorOutput.length > 0) {
-        console.log();
-        for (const output of errorOutput) {
-            console.log(output);
-            console.log();
-        }
-    }
-    console.log(formatSummary(totalErrors, filesWithErrors, files.length));
-    return totalErrors > 0 ? 1 : 0;
-}
-// CLI entry point
-if (require.main === module) {
-    const args = process.argv.slice(2);
-    if (args[0] !== 'check' && !args.includes('--help')) {
-        if (args.length === 0) {
-            console.log(USAGE);
-            process.exit(1);
-        }
-        console.error(chalk_1.default.red(`Unknown command: ${args[0]}`));
-        console.error('Run "htmlmustache --help" for usage.');
-        process.exit(1);
-    }
-    const code = run(args);
-    process.exit(code);
-}