@reddoorla/maintenance 0.14.0 → 0.16.0

package/dist/cli/commands/audit.js

@@ -8,6 +8,20 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/util/credentials.ts
+import { readFileSync } from "fs";
+import { homedir } from "os";
+import { join as join6 } from "path";
+function defaultCredentialsPath() {
+  const base = process.env.XDG_CONFIG_HOME ?? join6(homedir(), ".config");
+  return join6(base, "reddoor-maint", "credentials.env");
+}
+var init_credentials = __esm({
+  "src/util/credentials.ts"() {
+    "use strict";
+  }
+});
+
 // src/reports/airtable/client.ts
 var client_exports = {};
 __export(client_exports, {
@@ -15,11 +29,19 @@ __export(client_exports, {
   readAirtableConfig: () => readAirtableConfig
 });
 import Airtable from "airtable";
+function missing(name) {
+  return Object.assign(
+    new Error(
+      `${name} not set. Export it in your shell or put it in ${defaultCredentialsPath()} as ${name}=...`
+    ),
+    { exitCode: 2 }
+  );
+}
 function readAirtableConfig() {
   const apiKey = process.env.AIRTABLE_PAT;
   const baseId = process.env.AIRTABLE_BASE_ID;
-  if (!apiKey) throw Object.assign(new Error("AIRTABLE_PAT not set"), { exitCode: 2 });
-  if (!baseId) throw Object.assign(new Error("AIRTABLE_BASE_ID not set"), { exitCode: 2 });
+  if (!apiKey) throw missing("AIRTABLE_PAT");
+  if (!baseId) throw missing("AIRTABLE_BASE_ID");
   return { apiKey, baseId };
 }
 function openBase(cfg) {
@@ -28,6 +50,7 @@ function openBase(cfg) {
 var init_client = __esm({
   "src/reports/airtable/client.ts"() {
     "use strict";
+    init_credentials();
   }
 });
 
@@ -178,7 +201,7 @@ __export(lighthouse_airtable_exports, {
   resolveSlugFromCwd: () => resolveSlugFromCwd
 });
 import { readFile as readFile7 } from "fs/promises";
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 function hasRealScores(result) {
   if (result.audit !== "lighthouse") return false;
   const details = result.details ?? {};
@@ -203,7 +226,7 @@ function lighthouseScoresFromResult(result) {
 }
 async function resolveSlugFromCwd(cwd) {
   try {
-    const pkgPath = join7(cwd, "package.json");
+    const pkgPath = join8(cwd, "package.json");
     const raw = await readFile7(pkgPath, "utf-8");
     const pkg = JSON.parse(raw);
     if (!pkg.name) throw new Error("package.json has no 'name' field");
@@ -348,6 +371,7 @@ var init_write_audits_to_airtable = __esm({
 
 // src/cli/commands/audit.ts
 import { resolve as resolve2 } from "path";
+import { Listr } from "listr2";
 
 // src/audits/util/spawn.ts
 import { spawn } from "child_process";
@@ -1104,29 +1128,20 @@ var DEFAULT_AUDIT_TIMEOUT_MS = 3e4;
 function timedSpawn(timeoutMs) {
   return (cmd, args, opts = {}) => defaultSpawn(cmd, args, { ...opts, timeoutMs: opts.timeoutMs ?? timeoutMs });
 }
-async function runAudits(site, which) {
-  const names = which ?? ALL_AUDIT_NAMES;
-  for (const n of names) {
-    if (!(n in REGISTRY)) throw new Error(`unknown audit: ${n}`);
-  }
+async function runOneAudit(site, name) {
+  if (!(name in REGISTRY)) throw new Error(`unknown audit: ${name}`);
   const spawn2 = timedSpawn(DEFAULT_AUDIT_TIMEOUT_MS);
   const label = site.name ?? site.path;
-  return Promise.all(
-    names.map(
-      (n) => REGISTRY[n]({ site, spawn: spawn2 }).catch(
-        (err) => ({
-          audit: n,
-          site: label,
-          status: "fail",
-          summary: `${n}: unexpected error \u2014 ${String(err)}`
-        })
-      )
-    )
-  );
-}
-async function runAuditsAcross(sites, which) {
-  const all = await Promise.all(sites.map((s) => runAudits(s, which)));
-  return all.flat();
+  try {
+    return await REGISTRY[name]({ site, spawn: spawn2 });
+  } catch (err) {
+    return {
+      audit: name,
+      site: label,
+      status: "fail",
+      summary: `${name}: unexpected error \u2014 ${String(err)}`
+    };
+  }
 }
 
 // src/cli/fleet/resolve-sites.ts
@@ -1217,7 +1232,7 @@ async function resolveSites(input) {
 
 // src/cli/fleet/clone-if-needed.ts
 import { stat, readdir as readdir2, mkdir } from "fs/promises";
-import { isAbsolute as isAbsolute2, join as join6 } from "path";
+import { isAbsolute as isAbsolute2, join as join7 } from "path";
 function deriveNameFromRepoUrl(repoUrl) {
   const slash = repoUrl.split("/").pop() ?? repoUrl;
   return slash.replace(/\.git$/, "");
@@ -1258,7 +1273,7 @@ async function cloneIfNeeded(site, opts) {
   const name = site.name ?? deriveNameFromRepoUrl(site.repoUrl);
   assertSafeName(name);
   assertSafeRepoUrl(site.repoUrl);
-  const target = join6(opts.workdir, name);
+  const target = join7(opts.workdir, name);
   await mkdir(opts.workdir, { recursive: true });
   if (await isNonEmptyDir(target)) {
     return { ...site, name, path: target };
@@ -1292,8 +1307,87 @@ function formatTable(results) {
 function exitCode(results) {
   return results.some((r) => r.status === "fail") ? 1 : 0;
 }
+function formatDuration(ms) {
+  if (ms < 1e3) return `${ms}ms`;
+  const totalSeconds = Math.round(ms / 1e3);
+  if (totalSeconds < 60) return `${totalSeconds}s`;
+  const m = Math.floor(totalSeconds / 60);
+  const s = totalSeconds % 60;
+  return `${m}m${s.toString().padStart(2, "0")}s`;
+}
+function buildAuditTasks(sites, which, results, renderer) {
+  const singleSite = sites.length === 1;
+  if (singleSite) {
+    const site = sites[0];
+    return new Listr(
+      which.map((name) => ({
+        title: name,
+        task: async (_ctx, task) => {
+          const start = Date.now();
+          const result = await runOneAudit(site, name);
+          results.push(result);
+          const elapsed = formatDuration(Date.now() - start);
+          task.title = `${name}: ${result.summary} (${elapsed})`;
+          if (result.status === "fail") throw new Error(result.summary);
+        }
+      })),
+      { concurrent: true, exitOnError: false, renderer }
+    );
+  }
+  return new Listr(
+    sites.map((site) => {
+      const label = site.name ?? site.path;
+      return {
+        title: label,
+        task: async (_ctx, task) => {
+          const start = Date.now();
+          let done = 0;
+          task.output = `0/${which.length} audits`;
+          const settled = await Promise.all(
+            which.map(async (name) => {
+              const r = await runOneAudit(site, name);
+              results.push(r);
+              done += 1;
+              task.output = `${done}/${which.length} audits`;
+              return r;
+            })
+          );
+          const elapsed = formatDuration(Date.now() - start);
+          const failed = settled.filter((r) => r.status === "fail").length;
+          const warned = settled.filter((r) => r.status === "warn").length;
+          const note = failed > 0 ? `${failed} failed` : warned > 0 ? `${warned} warning${warned === 1 ? "" : "s"}` : "all green";
+          task.title = `${label}: ${note} (${elapsed})`;
+          if (failed > 0) throw new Error(`${label}: ${failed} audit(s) failed`);
+        }
+      };
+    }),
+    { concurrent: true, exitOnError: false, renderer }
+  );
+}
+function formatWriteSummary(summary) {
+  const lines = summary.writes.map((w) => {
+    if (w.audit === "lighthouse") {
+      const s = w.counts;
+      return `  lighthouse: P=${s.performance} A=${s.accessibility} BP=${s.bestPractices} SEO=${s.seo}`;
+    }
+    if (w.audit === "a11y") {
+      return `  a11y: ${w.counts.violations} violations`;
+    }
+    if (w.audit === "deps") {
+      const c2 = w.counts;
+      return `  deps: ${c2.drifted} drifted (${c2.majorBehind} major)`;
+    }
+    const c = w.counts;
+    return `  security: ${c.critical}C/${c.high}H/${c.moderate}M/${c.low}L`;
+  });
+  return `\u2192 wrote to Websites[${summary.siteName}]:
+${lines.join("\n")}`;
+}
+function rendererFor(json) {
+  return json ? "silent" : "default";
+}
 async function runAuditCommand(site, opts) {
-  const which = parseOnly(opts.only);
+  const which = parseOnly(opts.only) ?? ALL_AUDIT_NAMES;
   const cwd = opts.cwd ? resolve2(opts.cwd) : process.cwd();
   let sites = await resolveSites({
     ...site !== void 0 ? { site } : {},
@@ -1305,7 +1399,9 @@ async function runAuditCommand(site, opts) {
     const workdir = opts.workdir ?? `${process.env.HOME ?? ""}/.reddoor-maint/sites`;
     sites = await Promise.all(sites.map((s) => cloneIfNeeded(s, { workdir })));
   }
-  const results = await runAuditsAcross(sites, which);
+  const results = [];
+  const renderer = rendererFor(opts.json);
+  await buildAuditTasks(sites, which, results, renderer).run();
   let output = opts.json ? JSON.stringify(results, null, 2) : formatTable(results);
   if (opts.writeAirtable !== void 0) {
     const { openBase: openBase2, readAirtableConfig: readAirtableConfig2 } = await Promise.resolve().then(() => (init_client(), client_exports));
@@ -1313,28 +1409,26 @@ async function runAuditCommand(site, opts) {
     const { resolveSlugFromCwd: resolveSlugFromCwd2 } = await Promise.resolve().then(() => (init_lighthouse_airtable(), lighthouse_airtable_exports));
     const { writeAuditsToAirtable: writeAuditsToAirtable2 } = await Promise.resolve().then(() => (init_write_audits_to_airtable(), write_audits_to_airtable_exports));
     const slug = typeof opts.writeAirtable === "string" && opts.writeAirtable.length > 0 ? opts.writeAirtable : await resolveSlugFromCwd2(cwd);
-    const base = openBase2(readAirtableConfig2());
-    const websites = await listWebsites2(base);
-    const summary = await writeAuditsToAirtable2({ base, websites, slug, results });
-    const lines = summary.writes.map((w) => {
-      if (w.audit === "lighthouse") {
-        const s = w.counts;
-        return `  lighthouse: P=${s.performance} A=${s.accessibility} BP=${s.bestPractices} SEO=${s.seo}`;
-      }
-      if (w.audit === "a11y") {
-        return `  a11y: ${w.counts.violations} violations`;
-      }
-      if (w.audit === "deps") {
-        const c2 = w.counts;
-        return `  deps: ${c2.drifted} drifted (${c2.majorBehind} major)`;
-      }
-      const c = w.counts;
-      return `  security: ${c.critical}C/${c.high}H/${c.moderate}M/${c.low}L`;
-    });
-    output += `
+    let writeSummary = null;
+    await new Listr(
+      [
+        {
+          title: `Write to Airtable[${slug}]`,
+          task: async (_ctx, task) => {
+            const base = openBase2(readAirtableConfig2());
+            task.output = "loading Websites\u2026";
+            const websites = await listWebsites2(base);
+            task.output = "writing scores\u2026";
+            writeSummary = await writeAuditsToAirtable2({ base, websites, slug, results });
+            task.title = `Wrote to Websites[${writeSummary.siteName}] (${writeSummary.writes.length} audit type${writeSummary.writes.length === 1 ? "" : "s"})`;
+          }
+        }
+      ],
+      { renderer }
+    ).run();
+    if (writeSummary) output += `
 
-\u2192 wrote to Websites[${summary.siteName}]:
-${lines.join("\n")}`;
+${formatWriteSummary(writeSummary)}`;
   }
   return { output, code: exitCode(results) };
 }