@cronwatch/sdk 0.12.4 → 0.12.5

package/dist/index.cjs

@@ -30,7 +30,7 @@ function parseDuration(value, label = "duration") {
     consumed += match[0];
   }
   if (consumed.replace(/\s+/g, "") !== text.replace(/\s+/g, "")) {
-    throw new Error(`${label} "${value}" is not a duration like "15m", "1h30m" or "90s"`);
+    throw new Error(`${label} "${value}" is not a duration like "15m", "1h30m", or "90s"`);
   }
   return Math.round(total);
 }
@@ -636,6 +636,10 @@ function tail(text, n) {
   const lines = text.trimEnd().split("\n");
   return lines.slice(Math.max(0, lines.length - n)).join("\n");
 }
+function andList(words2) {
+  if (words2.length <= 2) return words2.join(" and ");
+  return `${words2.slice(0, -1).join(", ")}, and ${words2[words2.length - 1]}`;
+}
 function errorLine(error) {
   const text = firstLines(error, 4);
   return /^[A-Za-z_$][\w$]*: /.test(text) ? text : `Error: ${text}`;
@@ -709,7 +713,7 @@ ${out}`);
         break;
       }
       title = `${name} recovered`;
-      const after2 = draft.details.after.map((c) => c.replace("_", " ")).join(", ");
+      const after2 = andList(draft.details.after.map((c) => c.replace("_", " ")));
       lines.push(`A run ${run ? when(run.startedAt, now) : "just now"} succeeded${after2 ? ` after: ${after2}` : ""}.`);
       if (run?.durationMs !== null && run?.durationMs !== void 0) lines.push(`Ran ${formatDuration(run.durationMs)}.`);
       break;
@@ -799,7 +803,7 @@ var SECRET_PATTERNS = [
   // Incoming webhook URLs carry their secret in the path.
   [/(\bhooks\.slack\.com\/(?:services|workflows|triggers)\/)[A-Za-z0-9/_-]{1,255}/gi, `$1${REDACTED}`],
   [/(\bdiscord(?:app)?\.com\/api\/(?:v\d{1,2}\/)?webhooks\/)[A-Za-z0-9/_-]{1,255}/gi, `$1${REDACTED}`],
-  // Well-known token shapes: AWS, GitHub, Slack, Stripe, Anthropic, OpenAI and Google style keys.
+  // Well-known token shapes: AWS, GitHub, Slack, Stripe, Anthropic, OpenAI, and Google style keys.
   [/\b(?:AKIA|ASIA)[0-9A-Z]{16}\b/g, REDACTED],
   [/\b(?:gh[pousr]_[A-Za-z0-9]{30,255}|github_pat_[A-Za-z0-9_]{20,255})\b/g, REDACTED],
   [/\bxox[abposr]-[A-Za-z0-9-]{10,255}/g, REDACTED],
@@ -937,7 +941,7 @@ function manifest(base) {
     id: `${base}/`,
     name: "CronWatch",
     short_name: "CronWatch",
-    description: "The scheduled jobs of this app: their health, their last day and their runs.",
+    description: "The scheduled jobs of this app: their health, their last day, and their runs.",
     start_url: `${base}/`,
     scope: `${base}/`,
     display: "standalone",
@@ -1041,7 +1045,7 @@ function staticAsset(path, base) {
 }
 
 // src/version.ts
-var VERSION = "0.12.4";
+var VERSION = "0.12.5";
 var API_VERSION = 1;
 
 // src/routes/timeline.ts
@@ -1157,11 +1161,11 @@ function laneNote(job, missed, now) {
   if (job.open.includes("stuck")) return "stuck";
   if (job.open.includes("over_budget") && last) {
     const over = overCeilings(job);
-    return `went over budget${over.length ? ` on ${over.join(" and ")}` : ""} at ${when2(last.startedAt, now)}`;
+    return `went over budget${over.length ? ` on ${andList(over)}` : ""} at ${when2(last.startedAt, now)}`;
   }
   if (job.open.includes("under_floor") && last) {
     const under = underFloors(job);
-    return `fell short${under.length ? ` on ${under.join(" and ")}` : ""} at ${when2(last.startedAt, now)}`;
+    return `fell short${under.length ? ` on ${andList(under)}` : ""} at ${when2(last.startedAt, now)}`;
   }
   if (job.open.includes("slow") && last?.durationMs != null) return `slow: took ${formatDuration(last.durationMs)}`;
   if (job.open.includes("failed")) return "failing";
@@ -1279,7 +1283,7 @@ function legend() {
     [box("run ok"), "ran"],
     [box("run bad"), "failed"],
     [box("run timeout"), "timed out"],
-    [box("run warn"), "over budget, under floor or slow"],
+    [box("run warn"), "over budget, under floor, or slow"],
     [box("run running"), "running"],
     [box("missed"), "missed"]
   ];
@@ -2225,7 +2229,7 @@ function validateDefinition(def) {
     }
   }
   if (def.expect !== void 0 && typeof def.expect !== "string" && !(def.expect instanceof RegExp) && typeof def.expect !== "function") {
-    throw new Error(`job "${name}": expect must be a string, a RegExp or a function`);
+    throw new Error(`job "${name}": expect must be a string, a RegExp, or a function`);
   }
 }
 function sameState(a, b) {
@@ -2297,7 +2301,7 @@ var Cronwatch = class {
   /** Declare a job. Call it once, at module level, and keep the handle. */
   job(name, options = {}) {
     if (!NAME_RE.test(name)) {
-      throw new Error(`job name "${name}" must be 1 to 120 characters of letters, digits, ".", "_", ":" or "-"`);
+      throw new Error(`job name "${name}" must be 1 to 120 characters of letters, digits, ".", "_", ":", or "-"`);
     }
     const definition = { ...this.defaults, ...options, name };
     validateDefinition(definition);
@@ -3120,7 +3124,7 @@ ${id}`;
       state.silencedUntil = null;
     });
   }
-  /** Read, change and write one job's state, in turn with every other update to it. */
+  /** Read, change, and write one job's state, in turn with every other update to it. */
   async patchState(name, change) {
     await this.ensureReady();
     const { state } = await this.updateState(name, (current) => {
@@ -3189,7 +3193,7 @@ ${id}`;
   }
   /**
    * Stop the interval, wait for a check already under way (bounded by its
-   * own channel, triage and retry timeouts; what it throws was reported to
+   * own channel, triage, and retry timeouts; what it throws was reported to
    * whoever started it), then close the store, so that check neither writes
    * after the store is closed nor loses the alerts it would queue.
    */