From 3f5e1b2a9f26a476f9da3f6a595f6966fb0067a0 Mon Sep 17 00:00:00 2001
From: Ben Edgington <ben@benjaminion.xyz>
Date: Fri, 13 Jun 2025 11:08:52 +0100
Subject: [PATCH] Simplify reporting handling

---
 bin/build/prebuild.js | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/bin/build/prebuild.js b/bin/build/prebuild.js
index 7d987ea..cc2f8df 100644
--- a/bin/build/prebuild.js
+++ b/bin/build/prebuild.js
@@ -99,26 +99,27 @@ function printLines(s, reporter) {
   s.split(/\r?\n/).forEach((line) => line && reporter.warn(line));
 }
 
-async function runCheck({ name, enabled, checker }) {
-  let info = '';
-  let warn = '';
+async function runCheck({ name, enabled, checker }, reporter) {
   let success = true;
   if (enabled) {
-    info += `Doing ${name} check`;
     try {
       const out = await checker();
-      if (out !== '' && out !== null) {
-        warn += `Issues were found by ${name} check:\n` + out;
+      if (out === '' || out === null) {
+        reporter.info(`The ${name} check passed`);
+      } else {
+        reporter.warn(`Issues were found by ${name} check:`);
+        printLines(out, reporter);
         success = false;
       }
     } catch (err) {
-      warn += `An error occurred during ${name} check:\n` + err.toString();
+      reporter.warn(`An error occurred during ${name} check:`);
+      printLines(err.toString(), reporter);
       success = false;
     }
   } else {
-    warn += `Skipping ${name} check`;
+    reporter.warn(`Skipping ${name} check`);
   }
-  return { success: success, info: info, warn: warn };
+  return success;
 }
 
 // Set `exitToShell` to false to continue processing after running checks (e.g. while building)
@@ -126,14 +127,11 @@ export default async function runChecks(
   reporter = customReporter,
   exitToShell = true,
 ) {
-  const results = await Promise.all(checks.map((check) => runCheck(check)));
-
-  results.forEach(({ info, warn }) => {
-    info && reporter.info(info);
-    warn && printLines(warn, reporter);
-  });
+  const results = await Promise.all(
+    checks.map((check) => runCheck(check, reporter)),
+  );
 
   if (exitToShell) {
-    process.exit(results.every(({ success }) => success) ? 0 : 2);
+    process.exit(results.every((x) => x) ? 0 : 2);
   }
 }