@atlisp/lint 0.2.11 → 0.2.13

package/dist/index.js

@@ -36,7 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = main;
 const fs = __importStar(require("fs"));
 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");
@@ -49,221 +48,8 @@ const locale_1 = require("./locale");
 const rules_1 = require("./rules");
 const cache_1 = require("./cache");
 const watch_1 = require("./watch");
-function parseArgs() {
-    const argv = process.argv.slice(2);
-    const opts = {
-        src: [],
-        test: [],
-        staged: false,
-        diff: false,
-        changed: '',
-        format: 'default',
-        init: false,
-        installHook: false,
-        fix: false,
-        hookArgs: '',
-        cache: false,
-        clearCache: false,
-        parallel: false,
-        project: false,
-        watch: false,
-        help: false,
-        version: false,
-        formatCode: false,
-        formatCheck: false,
-        sbcl: false,
-        docs: false,
-    };
-    for (let i = 0; i < argv.length; i++) {
-        switch (argv[i]) {
-            case '--src':
-                opts.src.push(argv[++i]);
-                break;
-            case '--test':
-                opts.test.push(argv[++i]);
-                break;
-            case '--config':
-                opts.config = argv[++i];
-                break;
-            case '--staged':
-                opts.staged = true;
-                break;
-            case '--diff':
-                opts.diff = true;
-                break;
-            case '--changed':
-                opts.changed = argv[++i] || 'main';
-                break;
-            case '--format':
-                opts.format = argv[++i];
-                break;
-            case '--init':
-                opts.init = true;
-                break;
-            case '--install-hook':
-                opts.installHook = true;
-                break;
-            case '--fix':
-                opts.fix = true;
-                break;
-            case '--hook-args':
-                opts.hookArgs = argv[++i];
-                break;
-            case '--cache':
-                opts.cache = true;
-                break;
-            case '--clear-cache':
-                opts.clearCache = true;
-                break;
-            case '--parallel':
-                opts.parallel = true;
-                break;
-            case '--project':
-                opts.project = true;
-                break;
-            case '--watch':
-                opts.watch = true;
-                break;
-            case '--help':
-                opts.help = true;
-                break;
-            case '--version':
-                opts.version = true;
-                break;
-            case '--format-code':
-                opts.formatCode = true;
-                break;
-            case '--format-check':
-                opts.formatCheck = true;
-                break;
-            case '--sbcl':
-                opts.sbcl = true;
-                break;
-            case '--docs':
-                opts.docs = true;
-                break;
-            default:
-                break;
-        }
-    }
-    return opts;
-}
-// Zero-dependency glob: **/*.lsp → recursive walk + regex match
-function* walkFiles(dir, rootDir, regex) {
-    let entries;
-    try {
-        entries = fs.readdirSync(dir);
-    }
-    catch {
-        return;
-    }
-    for (const entry of entries) {
-        const fullPath = path.join(dir, entry);
-        let stat;
-        try {
-            stat = fs.statSync(fullPath);
-        }
-        catch {
-            continue;
-        }
-        const rel = path.relative(rootDir, fullPath).replace(/\\/g, '/');
-        if (rel.startsWith('..'))
-            continue;
-        if (stat.isDirectory()) {
-            yield* walkFiles(fullPath, rootDir, regex);
-        }
-        else if (stat.isFile()) {
-            if (regex.test(rel))
-                yield fullPath;
-        }
-    }
-}
-function collectChangedFiles(rootDir, baseBranch) {
-    try {
-        const output = (0, child_process_1.execSync)(`git diff --name-only --diff-filter=ACM ${baseBranch}`, {
-            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));
-    }
-    catch {
-        return [];
-    }
-}
-// Placeholder regex (dynamically constructed to avoid no-control-regex)
-const GLOB_PLACEHOLDER = '\x00GLOB\x00';
-const GLOB_RE = new RegExp(GLOB_PLACEHOLDER, 'g');
-function globFiles(pattern, rootDir) {
-    const regexStr = pattern
-        .replace(/\./g, '\\.')
-        .replace(/\*\*\//g, GLOB_PLACEHOLDER)
-        .replace(/\*\*/g, '.*')
-        .replace(/\*/g, '[^/]*')
-        .replace(/\?/g, '.')
-        .replace(GLOB_RE, '(.*/)?');
-    const regex = new RegExp(`^${regexStr}$`);
-    return Array.from(walkFiles(rootDir, rootDir, regex));
-}
-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);
-            }
-        }
-        for (const d of opts.test) {
-            for (const f of globFiles('**/*.lsp', path.resolve(rootDir, d))) {
-                files.add(f);
-            }
-        }
-    }
-    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 str = e
-            .replace(/\./g, '\\.')
-            .replace(/\*\*\//g, GLOB_PLACEHOLDER)
-            .replace(/\*\*/g, '.*')
-            .replace(/\*/g, '[^/]*')
-            .replace(GLOB_RE, '(.*/)?');
-        return new RegExp(`^${str}$`);
-    });
-    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();
-}
-function collectStagedFiles(rootDir) {
-    const output = (0, child_process_1.execSync)('git diff --cached --name-only --diff-filter=ACM', {
-        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));
-}
+const parser_1 = require("./cli/parser");
+const collector_1 = require("./cli/collector");
 function initConfig(rootDir) {
     const defaultPath = path.join(__dirname, '..', 'atlisp-lint.default.json');
     const targetPath = path.join(rootDir, 'atlisp-lint.json');
@@ -296,12 +82,20 @@ function printHelp() {
 }
 async function main() {
     try {
-        const opts = parseArgs();
+        const opts = (0, parser_1.parseArgs)();
         const rootDir = process.cwd();
         // Load config early so locale is available for --help and other commands
         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.listRules) {
+            console.log('Rule'.padEnd(30) + 'Default'.padEnd(10) + 'Category'.padEnd(14) + 'Description');
+            console.log('-'.repeat(90));
+            for (const r of rules_1.RULES) {
+                console.log(r.name.padEnd(30) + r.defaultSeverity.padEnd(10) + r.category.padEnd(14) + r.description);
+            }
+            return;
+        }
         if (opts.docs) {
             console.log((0, rules_1.generateRulesMarkdown)());
             console.log();
@@ -331,14 +125,18 @@ async function main() {
             console.log((0, locale_1.t)('index.cache_cleared'));
             return;
         }
+        if (opts.explain) {
+            console.log((0, rules_1.generateRuleDetail)(opts.explain));
+            return;
+        }
         // Collect files
         const files = opts.staged
-            ? collectStagedFiles(rootDir)
+            ? (0, collector_1.collectStagedFiles)(rootDir)
             : opts.diff
-                ? collectChangedFiles(rootDir, 'HEAD')
+                ? (0, collector_1.collectChangedFiles)(rootDir, 'HEAD')
                 : opts.changed
-                    ? collectChangedFiles(rootDir, opts.changed)
-                    : collectFiles(rootDir, opts, config);
+                    ? (0, collector_1.collectChangedFiles)(rootDir, opts.changed)
+                    : (0, collector_1.collectFiles)(rootDir, opts, config);
         if (files.length === 0) {
             console.log((0, locale_1.t)('index.no_files'));
             return;
@@ -384,9 +182,17 @@ async function main() {
         // --fix mode: auto-fix before linting
         if (opts.fix) {
             for (const f of files) {
+                const relFile = path.relative(rootDir, f);
+                if (opts.dryRun) {
+                    const content = fs.readFileSync(f, 'utf-8');
+                    const bomFix = content.charCodeAt(0) === 0xfeff;
+                    if (bomFix)
+                        console.log(`${(0, locale_1.t)('summary.tag_info')}: ${relFile} — would fix BOM`);
+                    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)}`);
+                    console.log(`${(0, locale_1.t)('summary.tag_fail')}: ${relFile} — ${(0, locale_1.t)('index.fixed', rule)}`);
                 }
             }
             // format_indent fix for non-staged mode (no lint results available yet)
@@ -401,8 +207,8 @@ async function main() {
                             console.log(`${(0, locale_1.t)('summary.tag_fail')}: ${path.relative(rootDir, f)} — ${(0, locale_1.t)('index.fixed', 'format_indent')}`);
                         }
                     }
-                    catch {
-                        /* ignore */
+                    catch (e) {
+                        console.warn(`[lint] format_indent fix failed for ${path.relative(rootDir, f)}: ${e instanceof Error ? e.message : String(e)}`);
                     }
                 }
             }
@@ -434,9 +240,10 @@ async function main() {
             return;
         }
         // Phase 1: Static checks (parallel or sequential)
+        const contentArg = opts.cache && contentCache.size > 0 ? contentCache : undefined;
         const issues = opts.parallel
             ? await (0, runner_1.lintFilesParallel)(filesToLint, config, rootDir)
-            : (0, runner_1.lintFiles)(filesToLint, config, rootDir);
+            : (0, runner_1.lintFiles)(filesToLint, config, rootDir, contentArg);
         // Phase 1b: Project-level cross-file checks
         if (opts.project) {
             const projectIssues = (0, project_1.lintProject)(filesToLint, config, rootDir);
@@ -452,12 +259,17 @@ async function main() {
                         const content = fs.readFileSync(f, 'utf-8');
                         const fixed = (0, runner_1.applyFixes)(fileIssues, content, relPath);
                         if (fixed !== content) {
-                            fs.writeFileSync(f, fixed, 'utf-8');
-                            console.log(`${(0, locale_1.t)('summary.tag_fail')}: ${relPath} — ${(0, locale_1.t)('index.fixed')}`);
+                            if (opts.dryRun) {
+                                console.log(`${(0, locale_1.t)('summary.tag_info')}: ${relPath} — would apply ${fileIssues.length} fix(es)`);
+                            }
+                            else {
+                                fs.writeFileSync(f, fixed, 'utf-8');
+                                console.log(`${(0, locale_1.t)('summary.tag_fail')}: ${relPath} — ${(0, locale_1.t)('index.fixed')}`);
+                            }
                         }
                     }
-                    catch {
-                        /* ignore */
+                    catch (e) {
+                        console.warn(`[lint] applyFixes failed for ${relPath}: ${e instanceof Error ? e.message : String(e)}`);
                     }
                 }
             }
@@ -472,18 +284,23 @@ async function main() {
                             const content = fs.readFileSync(f, 'utf-8');
                             const formatted = (0, formatter_1.formatCode)(content, indentSize);
                             if (formatted !== content) {
-                                fs.writeFileSync(f, formatted, 'utf-8');
-                                console.log(`${(0, locale_1.t)('summary.tag_fail')}: ${relPath} — ${(0, locale_1.t)('index.fixed', 'format_indent')}`);
+                                if (opts.dryRun) {
+                                    console.log(`${(0, locale_1.t)('summary.tag_info')}: ${relPath} — would fix format_indent`);
+                                }
+                                else {
+                                    fs.writeFileSync(f, formatted, 'utf-8');
+                                    console.log(`${(0, locale_1.t)('summary.tag_fail')}: ${relPath} — ${(0, locale_1.t)('index.fixed', 'format_indent')}`);
+                                }
                             }
                         }
-                        catch {
-                            /* ignore */
+                        catch (e) {
+                            console.warn(`[lint] format_indent fix failed for ${relPath}: ${e instanceof Error ? e.message : String(e)}`);
                         }
                     }
                 }
             }
         }
-        // Mark as cached (reuse pre-read content if available)
+        // Mark as cached
         if (opts.cache) {
             for (const f of filesToLint) {
                 (0, cache_1.markCached)(f, rootDir, contentCache.get(f));
@@ -515,8 +332,8 @@ async function main() {
                 try {
                     fileContents.set(iss.file, fs.readFileSync(fp, 'utf-8'));
                 }
-                catch {
-                    /* ignore */
+                catch (e) {
+                    console.warn(`[lint] failed to read ${fp} for display: ${e instanceof Error ? e.message : String(e)}`);
                 }
             }
         }
@@ -535,6 +352,9 @@ async function main() {
         else {
             console.log((0, formatters_1.formatDefault)(issues, fileContents));
         }
+        if (opts.maxWarnings >= 0 && warningCount > opts.maxWarnings) {
+            process.exit(1);
+        }
         process.exit(errorCount > 0 ? 1 : 0);
     }
     catch (err) {

package/dist/locale.js

@@ -105,6 +105,19 @@ const messages = {
         redundant_entmake: '(entmake (list (cons ...))) should use quoted association list for performance',
         missing_princ: "C: command '{0}' is missing trailing (princ) — may return nil to the command line",
         global_function_naming: "Function '{0}' lacks a package prefix — consider using namespace: prefix",
+        'dangerous.eval': 'eval call — may execute arbitrary code (code injection risk)',
+        command_s: '(command ...) call — use (command-s ...) for better error handling',
+        zerop_usage: 'Use (zerop {0}) instead of comparing with zero',
+        progn_in_body: 'Redundant (progn ...) in {0} body — {0} already allows multiple forms',
+        if_progn_both: 'Both branches of if use progn — use (cond (test ...) (t ...)) instead',
+        redundant_cond: 'Single-clause cond — use (if ...) instead',
+        selection_set_leak: 'More ssget calls ({0}) than ssset calls ({1}) — possible selection set leak',
+        empty_branch_cond: 'Empty cond clause — no body forms after condition',
+        function_reference: "Function '{0}' is referenced but never defined",
+        progn_in_cond: 'Redundant (progn ...) in cond clause — cond already allows multiple forms',
+        redundant_car_cdr: '({0} ({1} x)) can be simplified to ({2} x)',
+        equal_nil: 'Use (null {0}) or (not {0}) instead of (equal {0} nil)',
+        redundant_and_or: '{0} — may be leftover code',
         'help.text': `@atlisp/lint - AutoLISP static analysis tool
 
 Usage: atlisp-lint [options]
@@ -131,7 +144,8 @@ Options:
   --format-check         Check if files are formatted (exit 1 if not)
   --diff                 Only check files changed since last commit
   --changed <branch>     Only check files changed against a branch (default: main)
-  --docs                 Print rules documentation as markdown`,
+  --docs                 Print rules documentation as markdown
+  --list-rules           List all rules with descriptions and default severities`,
     },
     zh: {
         'parens.mismatch': "括号不匹配：{0} 个 '(' vs {1} 个 ')'（{2}）",
@@ -234,6 +248,19 @@ Options:
         redundant_entmake: '(entmake (list (cons ...))) 应使用 quoted 关联表以提升性能',
         missing_princ: "C: 命令 '{0}' 末尾缺少 (princ) — 可能在命令行返回 nil",
         global_function_naming: "函数 '{0}' 缺少包名前缀 — 建议使用 namespace: 前缀",
+        'dangerous.eval': 'eval 调用 —— 可能执行任意代码（代码注入风险）',
+        command_s: '(command ...) 调用 —— 建议使用 (command-s ...) 以获得更好的错误处理',
+        zerop_usage: '建议使用 (zerop {0}) 替代与零的比较',
+        progn_in_body: '{0} 体中冗余的 (progn ...) —— {0} 已隐含 progn，可直接写多个表达式',
+        if_progn_both: 'if 的两个分支都使用了 progn —— 建议改用 (cond (test ...) (t ...))',
+        redundant_cond: '单子句 cond —— 建议改用 (if ...)',
+        selection_set_leak: 'ssget 调用 ({0} 次) 超过 ssset 调用 ({1} 次) —— 可能造成选择集泄漏',
+        empty_branch_cond: 'cond 子句为空 —— 条件后没有表达式',
+        function_reference: "函数 '{0}' 被引用但从未定义",
+        progn_in_cond: 'cond 子句中冗余的 (progn ...) — cond 已隐含 progn',
+        redundant_car_cdr: '({0} ({1} x)) 可简化为 ({2} x)',
+        equal_nil: '建议使用 (null {0}) 或 (not {0}) 替代 (equal {0} nil)',
+        redundant_and_or: '{0} —— 可能是残留代码',
         'help.text': `@atlisp/lint - AutoLISP 静态分析工具
 
 用法: atlisp-lint [选项]
@@ -260,7 +287,8 @@ Options:
   --format-check        检查文件是否已格式化（未格式化则退出码为 1）
   --diff                仅检查自上次提交后变更的文件
   --changed <分支>        仅检查相对于某分支有变更的文件（默认：main）
-  --docs                打印规则文档（Markdown 格式）`,
+  --docs                打印规则文档（Markdown 格式）
+  --list-rules          列出所有规则及其描述和默认严重级别`,
     },
 };
 let currentLocale = 'zh';

package/dist/presets.js

@@ -78,6 +78,18 @@ exports.PRESETS = {
             redundant_entmake: 'warn',
             missing_princ: 'warn',
             global_function_naming: 'info',
+            command_s: 'warn',
+            zerop_usage: 'info',
+            progn_in_body: 'info',
+            if_progn_both: 'info',
+            redundant_cond: 'info',
+            selection_set_leak: 'warn',
+            empty_branch_cond: 'warn',
+            function_reference: 'warn',
+            progn_in_cond: 'info',
+            redundant_car_cdr: 'info',
+            equal_nil: 'info',
+            redundant_and_or: 'info',
         },
     },
     strict: {
@@ -168,6 +180,18 @@ exports.PRESETS = {
             redundant_entmake: 'error',
             missing_princ: 'error',
             global_function_naming: 'error',
+            command_s: 'error',
+            zerop_usage: 'error',
+            progn_in_body: 'error',
+            if_progn_both: 'error',
+            redundant_cond: 'error',
+            selection_set_leak: 'error',
+            empty_branch_cond: 'error',
+            function_reference: 'error',
+            progn_in_cond: 'error',
+            redundant_car_cdr: 'error',
+            equal_nil: 'error',
+            redundant_and_or: 'error',
         },
     },
     relaxed: {