fix: review changes

Author: marianfoo

README.md

@@ -21,7 +21,6 @@
 			- [`--details`](#--details)
 			- [`--format`](#--format)
 			- [`--fix`](#--fix)
-				- [Dry Run Mode](#dry-run-mode)
 			- [`--quiet`](#--quiet)
 			- [`--ignore-pattern`](#--ignore-pattern)
 			- [`--config`](#--config)

src/cli/base.ts

@@ -10,7 +10,6 @@ import {isLogLevelEnabled} from "@ui5/logger";
 import ConsoleWriter from "@ui5/logger/writers/Console";
 import {getVersion} from "./version.js";
 import {ui5lint} from "../index.js";
-import type {LintResult} from "../linter/LinterContext.js";
 import {LintMessageSeverity} from "../linter/messages.js";
 
 export interface LinterArg {
@@ -180,39 +179,37 @@ async function handleLint(argv: ArgumentsCamelCase<LinterArg>) {
 		ui5Config,
 	});
 
-	// Define a simple function to filter a single result set
-	const applyQuietFilter = (results: LintResult[]): LintResult[] => {
-		if (!quiet) {
-			return results;
+	// Apply quiet mode filtering directly to the results if needed
+	if (quiet) {
+		// Filter out warnings from all result objects
+		for (const result of res) {
+			// Keep only error messages (severity === 2)
+			result.messages = result.messages.filter((msg) => msg.severity === LintMessageSeverity.Error);
+			// Reset warning counts
+			result.warningCount = 0;
+			// Reset fixableWarningCount if it exists
+			if ("fixableWarningCount" in result) {
+				result.fixableWarningCount = 0;
+			}
 		}
-		return results.map((file) => ({
-			...file,
-			messages: file.messages.filter((msg) => msg.severity === LintMessageSeverity.Error),
-			warningCount: 0,
-			fixableWarningCount: 0,
-		}));
-	};
+	}
 
 	if (coverage) {
 		const coverageFormatter = new Coverage();
-		const filteredResults = applyQuietFilter(res);
-		await writeFile("ui5lint-report.html", await coverageFormatter.format(filteredResults, new Date()));
+		await writeFile("ui5lint-report.html", await coverageFormatter.format(res, new Date()));
 	}
 
 	if (format === "json") {
 		const jsonFormatter = new Json();
-		const filteredResults = applyQuietFilter(res);
-		process.stdout.write(jsonFormatter.format(filteredResults, details, quiet));
+		process.stdout.write(jsonFormatter.format(res, details, quiet));
 		process.stdout.write("\n");
 	} else if (format === "markdown") {
 		const markdownFormatter = new Markdown();
-		const filteredResults = applyQuietFilter(res);
-		process.stdout.write(markdownFormatter.format(filteredResults, details, getVersion(), fix, quiet));
+		process.stdout.write(markdownFormatter.format(res, details, getVersion(), fix, quiet));
 		process.stdout.write("\n");
 	} else if (format === "" || format === "stylish") {
 		const textFormatter = new Text(rootDir);
-		const filteredResults = applyQuietFilter(res);
-		process.stderr.write(textFormatter.format(filteredResults, details, fix, quiet));
+		process.stderr.write(textFormatter.format(res, details, fix, quiet));
 	}
 	// Stop profiling after CLI finished execution
 	if (profile) {

src/formatter/json.ts

@@ -28,7 +28,7 @@ export class Json {
 					filePath: oLintedFile.filePath,
 					messages: aFileMessages,
 					errorCount: oLintedFile.errorCount,
-					warningCount: quiet ? 0 : oLintedFile.warningCount,
+					warningCount: oLintedFile.warningCount,
 					fatalErrorCount: oLintedFile.fatalErrorCount,
 				});
 			}

src/formatter/markdown.ts

@@ -65,15 +65,17 @@ export class Markdown {
 		});
 
 		let summary = "## Summary\n\n";
-		if (quiet) {
-			summary +=
-				`> ${totalErrorCount} ${totalErrorCount === 1 ? "problem" : "problems"} ` +
-				`(${totalErrorCount} ${totalErrorCount === 1 ? "error" : "errors"})  \n`;
-		} else {
-			summary +=
-				`> ${totalErrorCount + totalWarningCount} problems ` +
-				`(${totalErrorCount} errors, ${totalWarningCount} warnings)  \n`;
+		const errorsText = `${totalErrorCount} ${totalErrorCount === 1 ? "error" : "errors"}`;
+		let warningsText = "";
+		if (!quiet) {
+			warningsText = `, ${totalWarningCount} ${totalWarningCount === 1 ? "warning" : "warnings"}`;
 		}
+
+		const totalCount = quiet ? totalErrorCount : totalErrorCount + totalWarningCount;
+		const problemsText = `${totalCount} ${totalCount === 1 ? "problem" : "problems"}`;
+
+		summary += `> ${problemsText} (${errorsText}${warningsText})  \n`;
+
 		if (totalFatalErrorCount) {
 			summary += `> **${totalFatalErrorCount} fatal errors**\n`;
 		}

src/formatter/text.ts

@@ -101,22 +101,19 @@ export class Text {
 			summaryColor = chalk.yellow;
 		}
 
-		// In quiet mode, only mention errors in the summary
-		if (quiet) {
-			this.#writeln(
-				summaryColor(
-					`${totalErrorCount} ${totalErrorCount === 1 ? "problem" : "problems"} ` +
-					`(${totalErrorCount} ${totalErrorCount === 1 ? "error" : "errors"})`
-				)
-			);
-		} else {
-			this.#writeln(
-				summaryColor(
-					`${totalErrorCount + totalWarningCount} problems ` +
-					`(${totalErrorCount} errors, ${totalWarningCount} warnings)`
-				)
-			);
+		const errorsText = `${totalErrorCount} ${totalErrorCount === 1 ? "error" : "errors"}`;
+		let warningsText = "";
+		if (!quiet) {
+			warningsText = `, ${totalWarningCount} ${totalWarningCount === 1 ? "warning" : "warnings"}`;
 		}
+
+		const totalCount = quiet ? totalErrorCount : totalErrorCount + totalWarningCount;
+		const problemsText = `${totalCount} ${totalCount === 1 ? "problem" : "problems"}`;
+
+		this.#writeln(
+			summaryColor(`${problemsText} (${errorsText}${warningsText})`)
+		);
+
 		if (!autofix && (totalErrorCount + totalWarningCount > 0)) {
 			this.#writeln("   Run \"ui5lint --fix\" to resolve all auto-fixable problems\n");
 		}