willfire 0.1.15 → 0.1.17

package/dist/matrix/expandMatrixDetailed.js

@@ -9,35 +9,43 @@ import { evaluateValue } from "../expr/evaluateValue.js";
  * the whole job `unknown` rather than a guess at how many checks it creates.
  */
 function axisValues(v, scope) {
-    if (Array.isArray(v))
+    if (Array.isArray(v)) {
         return v;
-    if (typeof v !== "string")
+    }
+    if (typeof v !== "string") {
         return null;
+    }
     const val = evaluateValue(v, scope);
-    if (val.kind !== "json" || !Array.isArray(val.v))
+    if (val.kind !== "json" || !Array.isArray(val.v)) {
         return null;
+    }
     return val.v;
 }
 export function expandMatrixDetailed(strategy, scope = {}) {
     const matrix = strategy?.matrix;
-    if (matrix == null)
+    if (matrix == null) {
         return [null];
+    }
     // `matrix: ${{ ... }}` — the whole matrix as one expression, rather than the
     // per-axis form below. It yields include-style entries, not axes, so it is a
     // separate expansion and is not modelled.
-    if (typeof matrix === "string")
+    if (typeof matrix === "string") {
         return null;
+    }
     const include = matrix.include ?? [];
     const exclude = matrix.exclude ?? [];
-    if (typeof include === "string" || typeof exclude === "string")
+    if (typeof include === "string" || typeof exclude === "string") {
         return null;
+    }
     const axes = {};
     for (const [k, v] of Object.entries(matrix)) {
-        if (k === "include" || k === "exclude")
+        if (k === "include" || k === "exclude") {
             continue;
+        }
         const vals = axisValues(v, scope);
-        if (vals == null)
+        if (vals == null) {
             return null;
+        }
         axes[k] = vals;
     }
     const axisKeys = Object.keys(axes);
@@ -45,8 +53,9 @@ export function expandMatrixDetailed(strategy, scope = {}) {
     for (const [k, vals] of Object.entries(axes)) {
         combos = combos.flatMap((c) => vals.map((v) => ({ values: { ...c.values, [k]: v }, displayKeys: axisKeys })));
     }
-    if (axisKeys.length === 0)
+    if (axisKeys.length === 0) {
         combos = [];
+    }
     combos = combos.filter((c) => !exclude.some((ex) => Object.entries(ex).every(([k, v]) => c.values[k] === v)));
     const extra = [];
     for (const inc of include) {
@@ -57,8 +66,9 @@ export function expandMatrixDetailed(strategy, scope = {}) {
             // matches every combination, per the docs ("added to each of the matrix
             // combinations if none of the key:value pairs overwrite any of the
             // original matrix values").
-            for (const c of targets)
+            for (const c of targets) {
                 Object.assign(c.values, inc);
+            }
         }
         else {
             // No combination to attach to: the include entry becomes a combination

package/dist/matrix/formatMatrixValue.js

@@ -6,11 +6,14 @@
  * `m-object (linux, x64)`.
  */
 export function formatMatrixValue(v) {
-    if (v == null)
+    if (v == null) {
         return "";
-    if (Array.isArray(v))
+    }
+    if (Array.isArray(v)) {
         return v.map(formatMatrixValue).join(", ");
-    if (typeof v === "object")
+    }
+    if (typeof v === "object") {
         return Object.values(v).map(formatMatrixValue).join(", ");
+    }
     return String(v);
 }

package/dist/matrix/matrixSuffix.js

@@ -2,7 +2,8 @@ import { formatMatrixValue } from "./formatMatrixValue.js";
 /** The ` (v1, v2)` suffix GitHub appends for a matrix combination. */
 export function matrixSuffix(combo) {
     const keys = combo.displayKeys.filter((k) => k in combo.values);
-    if (keys.length === 0)
+    if (keys.length === 0) {
         return "";
+    }
     return ` (${keys.map((k) => formatMatrixValue(combo.values[k])).join(", ")})`;
 }

package/dist/predict/finalizePrediction.js

@@ -7,8 +7,9 @@ export function finalizePrediction(entries, skip, sources) {
     const final = entries.map(finalize);
     const names = new Set();
     for (const e of final) {
-        if (e.status === "run" && e.checkName != null)
+        if (e.status === "run" && e.checkName !== null) {
             names.add(e.checkName);
+        }
     }
     return {
         entries: final,

package/dist/predict/makeOctokit.js

@@ -1,7 +1,8 @@
 import { Octokit } from "@octokit/rest";
 export function makeOctokit() {
     const token = process.env.GH_TOKEN ?? process.env.GITHUB_TOKEN;
-    if (!token)
+    if (!token) {
         throw new Error("GH_TOKEN or GITHUB_TOKEN must be set");
+    }
     return new Octokit({ auth: token });
 }

package/dist/predict/predict.js

@@ -30,7 +30,7 @@ export async function predict(octokit, repo, prNumber, opts = {}) {
         // is a guess kept only so existing callers keep working.
         action: opts.action ?? (pr.commits > 1 ? "synchronize" : "opened"),
         baseRef: pr.base.ref,
-        ...(stackTarget != null ? { stackTarget } : {}),
+        ...(stackTarget !== null ? { stackTarget } : {}),
         files: files.map((f) => f.filename),
     };
     const headSha = pr.head.sha;
@@ -58,8 +58,9 @@ export async function predict(octokit, repo, prNumber, opts = {}) {
     const resolveRef = async (src) => {
         const key = sourceKey(src);
         const hit = refCache.get(key);
-        if (hit !== undefined)
+        if (hit !== undefined) {
             return hit;
+        }
         let sha;
         try {
             const { data } = await octokit.rest.repos.getCommit({
@@ -75,8 +76,9 @@ export async function predict(octokit, repo, prNumber, opts = {}) {
             sha = null;
         }
         refCache.set(key, sha);
-        if (sha != null)
+        if (sha !== null) {
             sources.set(key, { ...src, sha });
+        }
         return sha;
     };
     // One callee is commonly reached from several callers — a fleet repo calls
@@ -89,8 +91,9 @@ export async function predict(octokit, repo, prNumber, opts = {}) {
         // that moves mid-prediction cannot hand back two different files.
         const key = `${src.owner}/${src.repo}/${path}@${src.sha}`;
         const hit = cache.get(key);
-        if (hit !== undefined)
+        if (hit !== undefined) {
             return hit;
+        }
         let content;
         try {
             const { data } = await octokit.rest.repos.getContent({
@@ -115,7 +118,7 @@ export async function predict(octokit, repo, prNumber, opts = {}) {
     // from the tarball endpoint at the resolved commit, and every subprocess —
     // `tar` included — goes through the one `runShell` seam.
     let executor;
-    if (opts.execute != null && opts.execute.length > 0) {
+    if (opts.execute !== undefined && opts.execute.length > 0) {
         const download = async (src) => {
             try {
                 const { data } = await octokit.rest.repos.downloadTarballArchive({
@@ -152,32 +155,20 @@ export async function predict(octokit, repo, prNumber, opts = {}) {
     const prFacts = {
         github: { repository: `${headSource.owner}/${headSource.repo}` },
     };
-    const entries = [];
-    for (const w of workflows) {
-        const path = w.path;
-        if (!path.startsWith(".github/workflows/"))
-            continue;
-        if (w.state !== "active") {
-            entries.push({
-                workflow: path,
-                job: "*",
-                status: "no-dispatch",
-                reason: `workflow state: ${w.state}`,
-            });
-            continue;
+    const workflowEntries = async (path, state) => {
+        if (state !== "active") {
+            return [
+                { workflow: path, job: "*", status: "no-dispatch", reason: `workflow state: ${state}` },
+            ];
         }
         const content = await fetchWorkflow(path, headSource);
-        if (content == null) {
+        if (content === null) {
             // The Actions API keeps listing a workflow as `active` after its file is
             // deleted. There is no file at head, so there is nothing to dispatch —
             // the same verdict as the disabled case above, reached a different way.
-            entries.push({
-                workflow: path,
-                job: "*",
-                status: "no-dispatch",
-                reason: "no workflow file at head",
-            });
-            continue;
+            return [
+                { workflow: path, job: "*", status: "no-dispatch", reason: "no workflow file at head" },
+            ];
         }
         let wf;
         try {
@@ -187,27 +178,25 @@ export async function predict(octokit, repo, prNumber, opts = {}) {
             // GitHub creates a run for an unparseable workflow file and concludes it
             // `startup_failure`. The run exists but has no jobs, so this is a
             // workflow-level "it dispatches" with nothing to expand.
-            entries.push({
-                workflow: path,
-                job: "*",
-                status: "run",
-                reason: `YAML parse error: ${e}`,
-            });
-            continue;
+            return [{ workflow: path, job: "*", status: "run", reason: `YAML parse error: ${e}` }];
         }
         const [dispatches, reason] = workflowDispatches(wf, ctx);
         if (!dispatches) {
-            entries.push({ workflow: path, job: "*", status: "no-dispatch", reason });
-            continue;
+            return [{ workflow: path, job: "*", status: "no-dispatch", reason }];
         }
-        for (const j of await expandJobs(wf, ctx, reader, headSource, 0, "", true, prFacts, executor)) {
-            entries.push({
-                workflow: path,
-                job: jobName(j.job),
-                checkName: j.checkName,
-                status: j.status,
-                reason: j.reason || reason,
-            });
+        const jobs = await expandJobs(wf, ctx, reader, headSource, 0, "", true, prFacts, executor);
+        return jobs.map((j) => ({
+            workflow: path,
+            job: jobName(j.job),
+            checkName: j.checkName,
+            status: j.status,
+            reason: j.reason || reason,
+        }));
+    };
+    const entries = [];
+    for (const w of workflows) {
+        if (w.path.startsWith(".github/workflows/")) {
+            entries.push(...(await workflowEntries(w.path, w.state)));
         }
     }
     return finalizePrediction(entries, null, sources);

package/dist/predict/stackTargetRef.js

@@ -17,24 +17,27 @@ export async function stackTargetRef(octokit, owner, repo, pr) {
     try {
         for (let hop = 0; hop < MAX_STACK_DEPTH; hop++) {
             const mergeSha = cur.merge_commit_sha;
-            if (mergeSha == null)
+            if (mergeSha === null) {
                 break;
+            }
             const { data: preview } = await octokit.rest.repos.getCommit({
                 owner,
                 repo,
                 ref: mergeSha,
             });
             const previewParent = preview.parents[0]?.sha;
-            if (previewParent == null)
+            if (previewParent === undefined) {
                 break;
+            }
             const { data: baseTip } = await octokit.rest.repos.getCommit({
                 owner,
                 repo,
                 ref: cur.base.ref,
             });
             // Built on the base branch tip: normal mode, the walk is done.
-            if (previewParent === baseTip.sha)
+            if (previewParent === baseTip.sha) {
                 break;
+            }
             // Otherwise only an exact match against an open PR whose head is the
             // base branch proves stacked mode; a stale preview matches nothing.
             const { data: candidates } = await octokit.rest.pulls.list({
@@ -45,8 +48,9 @@ export async function stackTargetRef(octokit, owner, repo, pr) {
                 per_page: 100,
             });
             const parent = candidates.find((p) => p.merge_commit_sha === previewParent);
-            if (parent == null)
+            if (parent === undefined) {
                 break;
+            }
             target = parent.base.ref;
             cur = parent;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "willfire",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Predict the set of CI check entries GitHub Actions will create for a pull request",
   "license": "MIT",
   "packageManager": "pnpm@10.33.0",
@@ -40,6 +40,7 @@
     "prepare": "pnpm build",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
+    "test:e2e": "vitest run --config tests/e2e/vitest.config.mts",
     "typecheck": "tsc -p tsconfig.json",
     "verify": "tsx src/verify.ts"
   },