@atlisp/lint 0.1.3 → 0.1.5

package/dist/index.js

@@ -39,48 +39,26 @@ const path = __importStar(require("path"));
 const child_process_1 = require("child_process");
 const config_1 = require("./config");
 const runner_1 = require("./runner");
+const project_1 = require("./project");
 const sbcl_1 = require("./sbcl");
 const formatters_1 = require("./formatters");
-const watch_1 = require("./watch");
-const validate_1 = require("./validate");
-const rules_1 = require("./rules");
 const locale_1 = require("./locale");
-const VERSION = require('../package.json').version;
-const HELP_TEXT = `
-@atlisp/lint v${VERSION} — AutoLISP static analysis tool
-
-USAGE
-  atlisp-lint [options]
-
-OPTIONS
-  --src <dir>          Source directory (repeatable)
-  --test <dir>         Test directory (repeatable)
-  --config <path>      Path to config file
-  --staged             Lint only git-staged files
-  --format <fmt>       Output: default, json, html
-  --output <path>      Write output to file
-  --fix                Auto-fix trailing whitespace / BOM / comment style
-  --init               Generate .atlisp-lint.json
-  --install-hook       Install git pre-commit hook
-  --hook-args <args>   Extra args for pre-commit hook
-  --watch              Watch mode
-  --parallel           Use parallel workers
-  --cache              Enable result caching
-  --clear-cache        Clear cache and exit
-  --max-warnings <n>   Fail if warnings exceed n
-  --validate-config    Validate config and exit
-  --docs               Print rules documentation
-  --quiet              Only output errors
-  --help               Show this help
-  --version            Show version
-`.trim();
+const cache_1 = require("./cache");
 function parseArgs() {
     const argv = process.argv.slice(2);
     const opts = {
-        src: [], test: [], staged: false, format: 'default', init: false,
-        installHook: false, fix: false, hookArgs: '', watch: false,
-        parallel: false, cache: false, clearCache: false,
-        validateConfig: false, docs: false, quiet: false, help: false, version: false,
+        src: [],
+        test: [],
+        staged: false,
+        format: 'default',
+        init: false,
+        installHook: false,
+        fix: false,
+        hookArgs: '',
+        cache: false,
+        clearCache: false,
+        parallel: false,
+        project: false,
     };
     for (let i = 0; i < argv.length; i++) {
         switch (argv[i]) {
@@ -111,44 +89,25 @@ function parseArgs() {
             case '--hook-args':
                 opts.hookArgs = argv[++i];
                 break;
-            case '--watch':
-                opts.watch = true;
-                break;
-            case '--parallel':
-                opts.parallel = true;
-                break;
             case '--cache':
                 opts.cache = true;
                 break;
             case '--clear-cache':
                 opts.clearCache = true;
                 break;
-            case '--max-warnings':
-                opts.maxWarnings = parseInt(argv[++i], 10);
-                break;
-            case '--validate-config':
-                opts.validateConfig = true;
-                break;
-            case '--docs':
-                opts.docs = true;
-                break;
-            case '--quiet':
-                opts.quiet = true;
-                break;
-            case '--help':
-                opts.help = true;
+            case '--parallel':
+                opts.parallel = true;
                 break;
-            case '--version':
-                opts.version = true;
+            case '--project':
+                opts.project = true;
                 break;
-            case '--output':
-                opts.output = argv[++i];
+            default:
                 break;
-            default: break;
         }
     }
     return opts;
 }
+// Zero-dependency glob: **/*.lsp → recursive walk + regex match
 function* walkFiles(dir, rootDir, regex) {
     let entries;
     try {
@@ -189,6 +148,7 @@ function globFiles(pattern, rootDir) {
 function collectFiles(rootDir, opts, config) {
     const files = new Set();
     if (opts.src.length > 0 || opts.test.length > 0) {
+        // Walk specific directories
         for (const d of opts.src) {
             for (const f of globFiles('**/*.lsp', path.resolve(rootDir, d))) {
                 files.add(f);
@@ -201,38 +161,43 @@ function collectFiles(rootDir, opts, config) {
         }
     }
     else {
+        // Use config globs relative to rootDir
         for (const pattern of config.source.globs) {
             for (const f of globFiles(pattern, rootDir)) {
                 files.add(f);
             }
         }
     }
-    const excludePatterns = config.source.exclude.map(e => {
+    const excludePatterns = config.source.exclude.map((e) => {
         const str = e.replace(/\./g, '\\.').replace(/\*\*/g, '.*').replace(/\*/g, '[^/]*');
         return new RegExp(`^${str}$`);
     });
-    return Array.from(files).filter(f => {
+    return Array.from(files)
+        .filter((f) => {
         const rel = path.relative(rootDir, f).replace(/\\/g, '/');
         for (const re of excludePatterns) {
             if (re.test(rel))
                 return false;
         }
         return true;
-    }).sort();
+    })
+        .sort();
 }
 function collectStagedFiles(rootDir) {
     const output = (0, child_process_1.execSync)('git diff --cached --name-only --diff-filter=ACM', {
-        cwd: rootDir, encoding: 'utf-8',
+        cwd: rootDir,
+        encoding: 'utf-8',
     });
-    return output.split('\n')
-        .map(l => l.trim())
-        .filter(l => l.endsWith('.lsp'))
-        .map(l => path.resolve(rootDir, l))
-        .filter(f => fs.existsSync(f));
+    return output
+        .split('\n')
+        .map((l) => l.trim())
+        .filter((l) => l.endsWith('.lsp'))
+        .map((l) => path.resolve(rootDir, l))
+        .filter((f) => fs.existsSync(f));
 }
 function initConfig(rootDir) {
     const defaultPath = path.join(__dirname, '..', 'atlisp-lint.default.json');
-    const targetPath = path.join(rootDir, '.atlisp-lint.json');
+    const targetPath = path.join(rootDir, 'atlisp-lint.json');
     if (fs.existsSync(targetPath)) {
         console.log((0, locale_1.t)('index.config_exists'));
         return;
@@ -258,152 +223,117 @@ npx @atlisp/lint ${args} || exit 1
     console.log((0, locale_1.t)('index.hook_installed', hookPath));
 }
 async function main() {
-    const opts = parseArgs();
-    const rootDir = process.cwd();
-    if (opts.help) {
-        console.log(HELP_TEXT);
-        return;
-    }
-    if (opts.version) {
-        console.log(VERSION);
-        return;
-    }
-    // --clear-cache
-    if (opts.clearCache) {
-        (0, runner_1.clearCache)(rootDir);
-        console.log((0, locale_1.t)('index.cache_cleared'));
-        return;
-    }
-    if (opts.docs) {
-        const docs = (0, rules_1.generateRulesMarkdown)();
-        if (opts.output) {
-            fs.writeFileSync(opts.output, docs, 'utf-8');
-            console.log(`${(0, locale_1.t)('index.config_created', opts.output)}`);
+    try {
+        const opts = parseArgs();
+        const rootDir = process.cwd();
+        if (opts.init) {
+            initConfig(rootDir);
+            return;
         }
-        else {
-            console.log(docs);
+        if (opts.installHook) {
+            installPreCommitHook(rootDir, opts.hookArgs);
+            return;
         }
-        return;
-    }
-    if (opts.init) {
-        initConfig(rootDir);
-        return;
-    }
-    if (opts.installHook) {
-        installPreCommitHook(rootDir, opts.hookArgs);
-        return;
-    }
-    const configPath = opts.config || path.join(rootDir, '.atlisp-lint.json');
-    const config = (0, config_1.loadConfig)(fs.existsSync(configPath) ? configPath : undefined);
-    (0, locale_1.setLocale)(config.locale || 'zh');
-    if (opts.validateConfig) {
-        const errors = (0, validate_1.validateConfig)(config);
-        if (errors.length === 0) {
-            console.log((0, locale_1.t)('index.config_valid'));
+        if (opts.clearCache) {
+            (0, cache_1.clearCache)(rootDir);
+            console.log((0, locale_1.t)('index.cache_cleared'));
+            return;
         }
-        else {
-            for (const e of errors) {
-                console.error(`${(0, locale_1.t)('summary.tag_fail')}: ${e.path} — ${e.message}`);
+        // Load config
+        const configPath = opts.config || path.join(rootDir, 'atlisp-lint.json');
+        const config = (0, config_1.loadConfig)(fs.existsSync(configPath) ? configPath : undefined);
+        (0, locale_1.setLocale)(config.locale || 'zh');
+        // Collect files
+        const files = opts.staged ? collectStagedFiles(rootDir) : collectFiles(rootDir, opts, config);
+        if (files.length === 0) {
+            console.log((0, locale_1.t)('index.no_files'));
+            return;
+        }
+        // --fix mode: auto-fix before linting
+        if (opts.fix) {
+            for (const f of files) {
+                const fixes = (0, runner_1.fixFile)(f);
+                for (const rule of fixes) {
+                    console.log(`${(0, locale_1.t)('summary.tag_fail')}: ${path.relative(rootDir, f)} — ${(0, locale_1.t)('index.fixed', rule)}`);
+                }
             }
-            process.exit(1);
+            if (!opts.staged)
+                return;
         }
-        return;
-    }
-    const files = opts.staged ? collectStagedFiles(rootDir) : collectFiles(rootDir, opts, config);
-    if (files.length === 0) {
-        console.log((0, locale_1.t)('index.no_files'));
-        return;
-    }
-    if (opts.watch) {
-        (0, watch_1.watchFiles)(files, { rootDir, format: opts.format === 'html' ? 'default' : opts.format, config });
-        return;
-    }
-    // Load ignore patterns
-    const ignorePatterns = (0, runner_1.parseIgnoreFile)(rootDir);
-    // Progress callback
-    let lastProgress = 0;
-    const onProgress = (done, total) => {
-        if (opts.quiet)
+        // Filter cached files
+        const filesToLint = opts.cache
+            ? files.filter((f) => {
+                const cached = (0, cache_1.isCached)(f, rootDir);
+                if (cached) {
+                    console.log(`${(0, locale_1.t)('summary.tag_warn')}: ${path.relative(rootDir, f)} — ${(0, locale_1.t)('index.cached')}`);
+                }
+                return !cached;
+            })
+            : files;
+        if (filesToLint.length === 0) {
+            console.log((0, locale_1.t)('index.all_cached'));
             return;
-        const pct = Math.round((done / total) * 100);
-        if (pct > lastProgress) {
-            lastProgress = pct;
-            process.stdout.write(`\r${(0, locale_1.t)('index.progress', done, total, pct)}`);
-            if (done >= total)
-                process.stdout.write('\n');
         }
-    };
-    // --fix mode
-    if (opts.fix) {
-        for (const f of files) {
-            const relForward = path.relative(rootDir, f).replace(/\\/g, '/');
-            if (ignorePatterns.some(re => re.test(relForward)))
-                continue;
-            const fixes = (0, runner_1.fixFile)(f);
-            for (const rule of fixes) {
-                console.log(`${(0, locale_1.t)('summary.tag_fail')}: ${path.relative(rootDir, f)} — ${(0, locale_1.t)('index.fixed', rule)}`);
+        // Phase 1: Static checks (parallel or sequential)
+        const issues = opts.parallel
+            ? await (0, runner_1.lintFilesParallel)(filesToLint, config, rootDir)
+            : (0, runner_1.lintFiles)(filesToLint, config, rootDir);
+        // Phase 1b: Project-level cross-file checks
+        if (opts.project) {
+            const projectIssues = (0, project_1.lintProject)(filesToLint, config, rootDir);
+            issues.push(...projectIssues);
+        }
+        // Mark as cached
+        if (opts.cache) {
+            for (const f of filesToLint) {
+                (0, cache_1.markCached)(f, rootDir);
             }
         }
-        if (!opts.staged)
-            return;
-    }
-    // Phase 1: Static checks
-    let issues;
-    if (opts.parallel) {
-        issues = await (0, runner_1.lintFilesParallel)(files, config, rootDir, { ignorePatterns, onProgress });
-    }
-    else {
-        issues = (0, runner_1.lintFiles)(files, config, rootDir, { useCache: opts.cache, ignorePatterns, onProgress });
-    }
-    // Phase 2: SBCL syntax validation
-    const stubPkgPath = path.join(__dirname, '..', 'stub-packages.json');
-    try {
-        const sbclIssues = (0, sbcl_1.runSbclLint)(rootDir, config.sbcl, stubPkgPath);
-        issues.push(...sbclIssues);
-    }
-    catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        issues.push({
-            file: 'sbcl', line: 1, severity: 'error', rule: 'sbcl',
-            message: msg,
-        });
-    }
-    // Build file content map for code line display
-    const fileContents = new Map();
-    for (const iss of issues) {
-        if (!fileContents.has(iss.file)) {
-            const fp = path.resolve(rootDir, iss.file);
-            try {
-                fileContents.set(iss.file, fs.readFileSync(fp, 'utf-8'));
+        // Phase 2: SBCL syntax validation
+        const stubPkgPath = path.join(__dirname, '..', 'stub-packages.json');
+        try {
+            const sbclIssues = (0, sbcl_1.runSbclLint)(rootDir, config.sbcl, stubPkgPath);
+            issues.push(...sbclIssues);
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            issues.push({
+                file: 'sbcl',
+                line: 1,
+                severity: 'error',
+                rule: 'sbcl',
+                message: msg,
+            });
+        }
+        // Build file content map for code line display
+        const fileContents = new Map();
+        for (const iss of issues) {
+            if (!fileContents.has(iss.file)) {
+                const fp = path.resolve(rootDir, iss.file);
+                try {
+                    fileContents.set(iss.file, fs.readFileSync(fp, 'utf-8'));
+                }
+                catch {
+                    /* ignore */
+                }
             }
-            catch { /* ignore */ }
         }
-    }
-    const outputIssues = opts.quiet ? issues.filter(i => i.severity === 'error') : issues;
-    const errorCount = outputIssues.filter(i => i.severity === 'error').length;
-    const warningCount = outputIssues.filter(i => i.severity === 'warn').length;
-    // --max-warnings
-    if (opts.maxWarnings !== undefined && warningCount > opts.maxWarnings) {
-        console.log(`${(0, locale_1.t)('index.max_warnings')}: ${warningCount} > ${opts.maxWarnings}`);
-        process.exit(1);
-    }
-    if (opts.format === 'html') {
-        const html = (0, formatters_1.formatHtml)(outputIssues, errorCount, warningCount);
-        if (opts.output) {
-            fs.writeFileSync(opts.output, html, 'utf-8');
-            console.log(`${(0, locale_1.t)('index.config_created', opts.output)}`);
+        // Format & output
+        const errorCount = issues.filter((i) => i.severity === 'error').length;
+        const warningCount = issues.filter((i) => i.severity === 'warn').length;
+        if (opts.format === 'json') {
+            console.log((0, formatters_1.formatJson)(issues, errorCount, warningCount));
         }
         else {
-            console.log(html);
+            console.log((0, formatters_1.formatDefault)(issues, fileContents));
         }
+        process.exit(errorCount > 0 ? 1 : 0);
     }
-    else if (opts.format === 'json') {
-        console.log((0, formatters_1.formatJson)(outputIssues));
-    }
-    else {
-        console.log((0, formatters_1.formatDefault)(outputIssues, fileContents));
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.error(`Error: ${msg}`);
+        process.exit(1);
     }
-    process.exit(errorCount > 0 ? 1 : 0);
 }
 if (require.main === module) {
     main();