auto-cr-cmd 2.0.99 → 2.0.101

package/README.md

@@ -52,17 +52,14 @@ Common flags:
 Sample output:
 
 ```text
- WARN  [12:56:18] ⚠️ [Base Rules]: no-deep-relative-imports
-
-    File: /Volumes/Wei/Codes/github/auto-cr/examples/src/app/features/admin/pages/dashboard.ts:2 
-    Description: Import path "../../../../shared/deep/utils" must not exceed max depth 2 
-    Code: ../../../../shared/deep/utils
-    Suggestion: Use a path alias (for example: @shared/deep/utils). | Create an index file at a higher level to re-export the module and shorten the import.
-
- WARN  [12:56:18] ⚠️ [untagged]: no-index-import
-
-    File: /Volumes/Wei/Codes/github/auto-cr/examples/src/app/features/admin/pages/dashboard.ts:3
-    Description: Import ../../consts/index is not allowed. Import the concrete file instead.
+[auto-cr] [warning] /Volumes/Wei/Codes/github/auto-cr/examples/src/app/features/admin/pages/dashboard.ts:2 Import path "../../../../shared/deep/utils" must not exceed max depth 2
+  rule: no-deep-relative-imports (Base)
+  code: ../../../../shared/deep/utils
+  suggestion:
+    - Use a path alias (for example: @shared/deep/utils).
+    - Create an index file at a higher level to re-export the module and shorten the import.
+[auto-cr] [warning] /Volumes/Wei/Codes/github/auto-cr/examples/src/app/features/admin/pages/dashboard.ts:3 Import ../../consts/index is not allowed. Import the concrete file instead.
+  rule: no-index-import (untagged)
 
 ✔  Code scan complete, scanned 3 files: 0 with errors, 1 with warnings, 0 with optimizing hints! 
 ```

package/README.zh-CN.md

@@ -52,17 +52,14 @@ npx auto-cr-cmd --language zh [需要扫描的代码目录]
 示例输出：
 
 ```text
- WARN  [12:52:48] ⚠️ [基础规则]：no-deep-relative-imports 
-  
-    文件位置: .../dashboard.ts:2
-    错误描述: 导入路径 "../../../../shared/deep/utils"，不能超过最大层级2
-    错误代码: ../../../../shared/deep/utils
-    优化建议: 使用别名路径（如 @shared/deep/utils）； 或在上层聚合导出，避免过深相对路径。
-
- WARN  [12:52:48] ⚠️ [未定义]：no-index-import
-
-    文件位置: .../dashboard.ts:3
-    错误描述: 禁止直接导入 ../../consts/index，请改用具体文件
+[auto-cr] [warning] .../dashboard.ts:2 导入路径 "../../../../shared/deep/utils"，不能超过最大层级2
+  rule: no-deep-relative-imports (基础规则)
+  code: ../../../../shared/deep/utils
+  suggestion:
+    - 使用别名路径（如 @shared/deep/utils）。
+    - 或在上层聚合导出，避免过深相对路径。
+[auto-cr] [warning] .../dashboard.ts:3 禁止直接导入 ../../consts/index，请改用具体文件
+  rule: no-index-import (未定义)
 
 ✔  代码扫描完成，本次共扫描3个文件，其中0个文件存在错误，1个文件存在警告，0个文件存在优化建议！
 ```

package/dist/index.js

@@ -78,10 +78,16 @@ var loader_1 = require("./rules/loader");
 var autocrrc_1 = require("./config/autocrrc");
 var ignore_1 = require("./config/ignore");
 consola_1.consola.options.formatOptions = __assign(__assign({}, consola_1.consola.options.formatOptions), { date: false });
+// 文本输出统一写入 stderr，避免多线程时 stdout/stderr 混排导致顺序错乱。
+var textLogger = consola_1.consola.create({
+    stdout: process.stderr,
+    stderr: process.stderr,
+});
+textLogger.options.formatOptions = __assign(__assign({}, textLogger.options.formatOptions), { date: false });
 var consolaLoggers = {
-    info: consola_1.consola.info.bind(consola_1.consola),
-    warn: consola_1.consola.warn.bind(consola_1.consola),
-    error: consola_1.consola.error.bind(consola_1.consola),
+    info: textLogger.info.bind(textLogger),
+    warn: textLogger.warn.bind(textLogger),
+    error: textLogger.error.bind(textLogger),
 };
 // 仅扫描 JS/TS 源码扩展名，避免把配置文件/JSON/图片等送进 SWC 解析导致报错。
 var SCANNABLE_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx'];
@@ -642,12 +648,12 @@ catch (error) {
                     process.exit(exitCode);
                 }
                 if (result.scannedFiles > 0) {
-                    consola_1.consola.log(' ');
+                    textLogger.log(' ');
                     language = (0, i18n_1.getLanguage)();
                     resultMessage = language.startsWith('zh')
                         ? " ".concat(t.scanComplete(), "\uFF0C\u672C\u6B21\u5171\u626B\u63CF").concat(result.scannedFiles, "\u4E2A\u6587\u4EF6\uFF0C\u5176\u4E2D").concat(result.filesWithErrors, "\u4E2A\u6587\u4EF6\u5B58\u5728\u9519\u8BEF\uFF0C").concat(result.filesWithWarnings, "\u4E2A\u6587\u4EF6\u5B58\u5728\u8B66\u544A\uFF0C").concat(result.filesWithOptimizing, "\u4E2A\u6587\u4EF6\u5B58\u5728\u4F18\u5316\u5EFA\u8BAE\uFF01")
                         : " ".concat(t.scanComplete(), ", scanned ").concat(result.scannedFiles, " files: ").concat(result.filesWithErrors, " with errors, ").concat(result.filesWithWarnings, " with warnings, ").concat(result.filesWithOptimizing, " with optimizing hints!");
-                    consola_1.consola.success(resultMessage);
+                    textLogger.success(resultMessage);
                     exitCode = result.filesWithErrors > 0 ? 1 : 0;
                     process.exit(exitCode);
                 }

package/dist/report/index.js

@@ -19,24 +19,26 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _a;
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReporter = createReporter;
 exports.renderViolations = renderViolations;
 var auto_cr_rules_1 = require("auto-cr-rules");
-var consola_1 = __importDefault(require("consola"));
 var i18n_1 = require("../i18n");
 var UNTAGGED_TAG = 'untagged';
 var DEFAULT_FORMAT = 'text';
-// 不同严重级别映射到不同日志级别。
-var severityLoggers = (_a = {},
-    _a[auto_cr_rules_1.RuleSeverity.Error] = consola_1.default.error,
-    _a[auto_cr_rules_1.RuleSeverity.Warning] = consola_1.default.warn,
-    _a[auto_cr_rules_1.RuleSeverity.Optimizing] = consola_1.default.info,
+// 文本输出统一写入 stderr，避免 stdout/stderr 混排导致顺序错乱。
+var SEVERITY_LABELS = (_a = {},
+    _a[auto_cr_rules_1.RuleSeverity.Error] = 'error',
+    _a[auto_cr_rules_1.RuleSeverity.Warning] = 'warning',
+    _a[auto_cr_rules_1.RuleSeverity.Optimizing] = 'optimizing',
     _a);
+var SEVERITY_COLORS = (_b = {},
+    _b[auto_cr_rules_1.RuleSeverity.Error] = '\x1b[31m',
+    _b[auto_cr_rules_1.RuleSeverity.Warning] = '\x1b[33m',
+    _b[auto_cr_rules_1.RuleSeverity.Optimizing] = '\x1b[90m',
+    _b);
+var RESET_COLOR = '\x1b[0m';
 function createReporter(filePath, source, options) {
     var _a;
     if (options === void 0) { options = {}; }
@@ -186,52 +188,65 @@ function renderViolations(filePath, violations, options) {
     if (format !== 'text' || violations.length === 0) {
         return;
     }
+    (_b = options.onBeforeReport) === null || _b === void 0 ? void 0 : _b.call(options);
+    renderCompactViolations(filePath, violations);
+    (_c = options.onAfterReport) === null || _c === void 0 ? void 0 : _c.call(options);
+}
+function renderCompactViolations(filePath, violations) {
     var t = (0, i18n_1.getTranslator)();
     var language = (0, i18n_1.getLanguage)();
-    var locale = language === 'zh' ? 'zh-CN' : 'en-US';
-    var formatter = new Intl.DateTimeFormat(locale, {
-        hour: '2-digit',
-        minute: '2-digit',
-        second: '2-digit',
-        hour12: false,
-    });
-    var indent = '    ';
-    var colon = language === 'zh' ? '：' : ':';
-    var headerGap = language === 'zh' ? '' : ' ';
-    var writeLine = function (stream, line) {
-        stream.write("".concat(line, "\n"));
-    };
-    (_b = options.onBeforeReport) === null || _b === void 0 ? void 0 : _b.call(options);
+    var stream = process.stderr;
+    var useColor = Boolean(stream.isTTY) && !process.env.NO_COLOR;
+    var prefix = '[auto-cr] ';
+    var indent = '  ';
+    var bulletIndent = '    ';
     violations.forEach(function (violation) {
-        var timestamp = formatter.format(new Date());
-        var tagLabel = t.ruleTagLabel({ tag: violation.tag });
-        var severityIcon = t.reporterSeverityIcon({ severity: violation.severity });
-        var logger = getLoggerForSeverity(violation.severity);
-        var header = "[".concat(timestamp, "] ").concat(severityIcon, " [").concat(tagLabel, "]").concat(colon).concat(headerGap).concat(violation.ruleName);
-        logger(header);
-        // 让 header 与详情走同一输出流，避免 stdout/stderr 混排导致顺序错乱。
-        var detailStream = violation.severity === auto_cr_rules_1.RuleSeverity.Error || violation.severity === auto_cr_rules_1.RuleSeverity.Warning
-            ? process.stderr
-            : process.stdout;
-        var location = typeof violation.line === 'number' ? "".concat(filePath, ":").concat(violation.line) : filePath;
-        writeLine(detailStream, "".concat(indent).concat(t.reporterFileLabel(), ": ").concat(location));
-        writeLine(detailStream, "".concat(indent).concat(t.reporterDescriptionLabel(), ": ").concat(violation.message));
-        if (violation.code) {
-            writeLine(detailStream, "".concat(indent).concat(t.reporterCodeLabel(), ": ").concat(violation.code));
+        var _a, _b;
+        var severityLabel = (_a = SEVERITY_LABELS[violation.severity]) !== null && _a !== void 0 ? _a : 'error';
+        var color = useColor ? (_b = SEVERITY_COLORS[violation.severity]) !== null && _b !== void 0 ? _b : '' : '';
+        var reset = useColor ? RESET_COLOR : '';
+        var location = typeof violation.line === 'number' ? "".concat(filePath, ":").concat(violation.line) : "".concat(filePath, ":-");
+        var codeText = violation.code ? compactText(violation.code) : undefined;
+        var message = stripRedundantCodeSuffix(compactText(violation.message), codeText);
+        var header = "".concat(prefix).concat(color, "[").concat(severityLabel, "] ").concat(location, " ").concat(message).concat(reset);
+        stream.write("".concat(header, "\n"));
+        var tagLabel = formatTagLabel(violation.tag, language, t);
+        var tagSuffix = tagLabel ? " (".concat(tagLabel, ")") : '';
+        stream.write("".concat(indent, "rule: ").concat(violation.ruleName).concat(tagSuffix, "\n"));
+        if (codeText) {
+            stream.write("".concat(indent, "code: ").concat(codeText, "\n"));
         }
         if (violation.suggestions && violation.suggestions.length > 0) {
-            var suggestionSeparator = language === 'zh' ? '； ' : ' | ';
-            var suggestionLine = violation.suggestions
-                .map(function (suggestion) { return t.reporterFormatSuggestion(suggestion); })
-                .join(suggestionSeparator);
-            writeLine(detailStream, "".concat(indent).concat(t.reporterSuggestionLabel(), ": ").concat(suggestionLine));
+            stream.write("".concat(indent, "suggestion:\n"));
+            violation.suggestions.forEach(function (suggestion) {
+                stream.write("".concat(bulletIndent, "- ").concat(compactText(t.reporterFormatSuggestion(suggestion)), "\n"));
+            });
         }
     });
-    (_c = options.onAfterReport) === null || _c === void 0 ? void 0 : _c.call(options);
 }
-function getLoggerForSeverity(severity) {
-    var _a;
-    return (_a = severityLoggers[severity]) !== null && _a !== void 0 ? _a : consola_1.default.error;
+function formatTagLabel(tag, language, t) {
+    var label = t.ruleTagLabel({ tag: tag });
+    if (language === 'en' && label.endsWith(' Rules')) {
+        return label.slice(0, -' Rules'.length);
+    }
+    return label;
+}
+function compactText(value) {
+    return value.replace(/\s*\n\s*/g, ' ').replace(/\s{2,}/g, ' ').trim();
+}
+function stripRedundantCodeSuffix(message, code) {
+    if (!code) {
+        return message;
+    }
+    var trimmed = message.trim();
+    var pattern = new RegExp(":\\s*".concat(escapeRegExp(code), "$"));
+    if (pattern.test(trimmed)) {
+        return trimmed.replace(pattern, '').trim();
+    }
+    return message;
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
 function resolveLine(record, offsets) {
     if (typeof record.line === 'number') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auto-cr-cmd",
-  "version": "2.0.99",
+  "version": "2.0.101",
   "description": "Fast automated code review CLI powered by SWC-based static analysis",
   "main": "./dist/index.js",
   "types": "./dist/types/index.d.ts",
@@ -39,7 +39,7 @@
     "consola": "^3.4.2",
     "jsonc-parser": "^3.3.1",
     "picomatch": "^4.0.3",
-    "auto-cr-rules": "2.0.99"
+    "auto-cr-rules": "2.0.101"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.2",