@darksheep/eslint-formatter-github 0.0.1 → 0.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darksheep/eslint-formatter-github",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "description": "ESLint + Github actions",
   "license": "UNLICENCED",
   "type": "commonjs",
@@ -20,7 +20,7 @@
     "@darksheep/package.json": "~0.0.1"
   },
   "devDependencies": {
-    "@darksheep/eslint": "~4.3.0",
+    "@darksheep/eslint": "~4.4.0",
     "@types/node": "~20.12.0",
     "eslint": "~8.57.0",
     "typescript": "~5.4.0"

package/src/index.js

@@ -40,65 +40,96 @@ const {
  * @property {number} fixableWarningCount
  */
 
+/**
+ * @param {LintResult[]} fileResults The eslint results
+ * @returns {Record<'warningCount' | 'errorCount', number>}
+ */
+function counters(fileResults) {
+  let warningCount = 0;
+  let errorCount = 0;
+
+  for (const fileResult of fileResults) {
+    warningCount += fileResult.warningCount;
+    errorCount += fileResult.errorCount;
+  }
+
+  return {
+    warningCount,
+    errorCount,
+  };
+}
+
+/**
+ * @param {LintResult} fileResult The eslint single file result
+ * @returns {string[]}
+ */
+function formatFileResult(fileResult) {
+  /** @type {string[]} */
+  const lines = [];
+  const filePath = path.relative(
+    GITHUB_WORKSPACE,
+    fileResult.filePath,
+  );
+
+  for (const result of fileResult.messages) {
+    const message = result.ruleId == null || result.ruleId === ''
+      ? `[${result.ruleId}] ${result.message}`
+      : result.message;
+
+    /** @type {import('@darksheep/github-actions').LineAnnotation} */
+    const context = {
+      file: filePath,
+      line: result.line,
+      col: result.column,
+      endLine: result.endLine,
+      endColumn: result.endColumn,
+    };
+
+    switch (result.severity) {
+      /* eslint-disable style/max-statements-per-line */
+      case 0: lines.push(setNotice(message, context)); break;
+      case 1: lines.push(setWarning(message, context)); break;
+      case 2: lines.push(setError(message, context)); break;
+      /* eslint-enable style/max-statements-per-line */
+    }
+  }
+
+  return lines;
+}
+
 /**
  * @param {LintResult[]} fileResults The eslint results
  * @returns {string}
  */
 function formatter(fileResults) {
   const lines = [];
-  let warningCount = 0;
-  let errorCount = 0;
 
   const pkg = getPackageJson(undefined, `${process.cwd()}/package.json`);
   if (pkg == null) {
     throw new Error('Cannot resolve package name');
   }
 
-  lines.push(startGroup(`Linting ${pkg.name}`));
+  const { warningCount, errorCount } = counters(fileResults);
 
-  for (const fileResult of fileResults) {
-    const filePath = path.relative(
-      GITHUB_WORKSPACE,
-      fileResult.filePath,
-    );
+  if (warningCount + errorCount > 0) {
+    lines.push(startGroup([
+      `Linted ${pkg.name} (`,
+      `${errorCount} ${plural('error', errorCount)}, `,
+      `${warningCount} ${plural('warning', warningCount)})`,
+    ].join('')));
+  } else {
+    lines.push(`Linted ${pkg.name} (0 errors, 0 warnings)`);
+  }
 
-    warningCount += fileResult.warningCount;
-    errorCount += fileResult.errorCount;
+  lines.push(...fileResults.flatMap(formatFileResult));
 
-    for (const result of fileResult.messages) {
-      const message = result.ruleId == null || result.ruleId === ''
-        ? `[${result.ruleId}] ${result.message}`
-        : result.message;
-
-      /** @type {import('@darksheep/github-actions').LineAnnotation} */
-      const context = {
-        file: filePath,
-        line: result.line,
-        col: result.column,
-        endLine: result.endLine,
-        endColumn: result.endColumn,
-      };
-
-      switch (result.severity) {
-        case 0:
-          lines.push(setNotice(message, context));
-          break;
-        case 1:
-          lines.push(setWarning(message, context));
-          break;
-        case 2:
-          lines.push(setError(message, context));
-          break;
-      }
-    }
+  if (warningCount + errorCount > 0) {
+    lines.push(endGroup());
   }
 
-  lines.push(endGroup());
-
-  const total = errorCount + warningCount;
-  process.exitCode = errorCount;
+  process.exitCode ??= 0;
+  process.exitCode += errorCount;
 
-  lines.push(`${total} problem(s) (${errorCount} ${plural('error', errorCount)}, ${warningCount} ${plural('warning', warningCount)})`);
   return lines.join('\n');
 }
 

package/types/index.d.ts

@@ -1,27 +1,4 @@
 export = formatter;
-/**
- * @typedef {Object} LintMessage
- * @property {number} column
- * @property {number} line
- * @property {number} [endColumn]
- * @property {number} [endLine]
- * @property {string | null} ruleId
- * @property {string} message
- * @property {string} [messageId]
- * @property {string} [nodeType]
- * @property {boolean} [fatal]
- * @property {0 | 1 | 2} severity
- */
-/**
- * @typedef {Object} LintResult
- * @property {string} filePath
- * @property {LintMessage[]} messages
- * @property {number} errorCount
- * @property {number} fatalErrorCount
- * @property {number} warningCount
- * @property {number} fixableErrorCount
- * @property {number} fixableWarningCount
- */
 /**
  * @param {LintResult[]} fileResults The eslint results
  * @returns {string}