@gjsify/cli 0.38.1 → 0.40.0

package/lib/commands/affected.js

@@ -56,7 +56,8 @@ import { spawnSync } from 'node:child_process';
 // every spec and fires only inside a GitHub Actions step.
 import { appendFileSync } from 'node:fs';
 import { readStdinLines } from '../utils/stdin.js';
-import { discoverWorkspaces, buildDependencyGraph, buildReverseDependencyGraph, affectedClosure, workspacesForChangedFiles, } from '@gjsify/workspace';
+import { discoverWorkspaces } from '@gjsify/workspace';
+import { classifyAndExpand } from './affected-classify.js';
 import { findWorkspaceRoot } from '../utils/workspace-root.js';
 export const affectedCommand = {
     command: 'affected',
@@ -95,296 +96,6 @@ export const affectedCommand = {
         emit(args.format, result);
     },
 };
-/** Patterns that force a full run. First-match wins; order is intentional. */
-const GLOBAL_TRIGGERS = [
-    // The classifier itself + everything in its plumbing.
-    /^packages\/infra\/workspace\//,
-    /^packages\/infra\/cli\//,
-    /^packages\/infra\/rolldown-plugin-gjsify\//,
-    /^packages\/infra\/resolve-npm\//,
-    // The test framework every spec imports, as a *devDependency* — which the
-    // prod-deps-only closure below does not walk, so a change to it would yield a
-    // near-empty closure and silently skip every downstream test, while a bug in a
-    // matcher can break assertions anywhere.
-    /^packages\/gjs\/unit\//,
-    // The composite action every CI job sets itself up with: a change alters the
-    // environment of the whole matrix. Listed EXPLICITLY — it previously forced a
-    // full run only by falling through to the "unmatched files" path, which is luck
-    // rather than intent.
-    /^\.github\/actions\//,
-    // Cross-cutting dep + lockfile + root config.
-    /^gjsify-lock\.json$/,
-    /^package\.json$/,
-    /^tsconfig[^/]*\.json$/,
-    // The workflow file itself: a job-shape change is invisible until the workflow
-    // re-runs, so a path-filtered job cannot safely apply the new shape to an
-    // in-flight PR.
-    /^\.github\/workflows\/main\.yml$/,
-    /^scripts\/audit-runtimes\.mjs$/,
-];
-/**
- * Inputs OWNED BY ANOTHER WORKFLOW — build-relevant, just not to `main.yml`.
- *
- * Adding a regex here is a claim with two halves and BOTH must hold: `main.yml`
- * must not read the path, and some other workflow must have it in its own
- * `paths:` filter so a break still reds a PR. The test is never "is this file
- * unimportant" — none of these are.
- */
-const OTHER_WORKFLOW_INPUTS = [
-    // Each sibling workflow's own definition. `main.yml` is deliberately absent: it
-    // is a GLOBAL_TRIGGER instead.
-    /^\.github\/workflows\/(deploy-docs|commitlint|release|release-cut|audit-runtimes|prebuilds|node-gi|napi|cli-cross-platform|build-ci-image|cancel-pr-runs)\.yml$/,
-    // `prebuilds.yml`'s toolchain (#838): the QEMU-emulated build script and the
-    // classifier deciding which native packages a prebuild run rebuilds. It is in
-    // both of that workflow's `paths:` filters; `main.yml` builds no prebuild and
-    // runs no emulated leg.
-    /^\.github\/prebuild-toolchain\//,
-    // The REPO-SCOPED manifest-conformance rules (#847), gated by
-    // `audit-runtimes.yml`, which runs on EVERY pull_request with no `paths:` filter;
-    // `prebuilds.yml` also treats it as a shared input (#843).
-    //
-    // The distinction is real, not a technicality: `main.yml` DOES run
-    // manifest-conformance code, but reaches it through
-    // `packages/infra/manifest-conformance/` — the PACKAGE, a normal workspace that
-    // maps and seeds like any other. Only the `scripts/`-side repo-scoped half is
-    // ignored, and that is precisely the half `main.yml` does not load.
-    /^scripts\/manifest-conformance\//,
-    // The authored status data (ADR 0016) + its generator. Same two halves:
-    // `main.yml` never runs `status:generate` and never opens `status/`, while
-    // `audit-runtimes.yml` runs the `status-data` rule over it on every PR.
-    //
-    // Naming the directory makes the `.md` case intentional rather than incidental:
-    // `status/*.md` already fell into IGNORE via the generic `/\.md$/i`, so the gap
-    // showed up only on `status/status.json`, which matched nothing, landed in
-    // `unmatched`, and paid for a FULL matrix run over a file `main.yml` cannot read.
-    /^status\//,
-    /^scripts\/generate-status\.mjs$/,
-];
-/** Patterns that contribute no seed and don't force a full run. */
-const IGNORE = [
-    /\.md$/i,
-    /^refs\//,
-    /^website\//,
-    /^docs\//,
-    ...OTHER_WORKFLOW_INPUTS,
-    // Neither `@gjsify/node-gi` (the Node-native GI engine) nor `@gjsify/napi` (the
-    // N-API host over SpiderMonkey) is a gjsify workspace member: the GJS-first
-    // install/foreach tooling cannot build their node-gyp addons or Vala+C++/meson
-    // shim, so `main.yml` neither builds nor tests them and their own workflows are
-    // the source of truth. Without the carve-outs their files map to no workspace,
-    // land in `unmatched`, and force a full run on every node-gi/napi PR.
-    /^packages\/node-gi\//,
-    /^packages\/napi\//,
-    // Flatpak build/distribution tooling (SDK-extension manifest + metainfo). No
-    // package-test consumers; its own `tests/e2e/flatpak-sdk-extension` runs on
-    // `tests/e2e/**` and global triggers. Worth revisiting: ignoring `.githooks/`
-    // for the same reason is what let a change walk past the suite guarding it (see
-    // SCRIPT_COUPLINGS), and IGNORE wins over every other rule.
-    /^flatpak\//,
-    /^LICENSE/,
-    /^\.gitignore$/,
-    /^\.gjsify-[^/]*\.md$/,
-    /^STATUS\.md$/,
-    /^CHANGELOG\.md$/,
-    /^AGENTS\.md$/,
-    /^CLAUDE\.md$/,
-    /^README\.md$/,
-];
-/** Patterns that suggest a test-only change. */
-const TEST_PATHS = [/\.spec\.[mc]?[tj]sx?$/, /^tests\/(e2e|integration)\//];
-const SCRIPT_COUPLINGS = [
-    {
-        // `.githooks/pre-commit` is guarded by an e2e suite and reachable from no
-        // workspace at all — not source, not a dependency, its consumer is git. So a
-        // change to it selected NOTHING and the e2e tier stayed off (that turns on
-        // for a `tests/e2e/**` touch): #1095 edited the hook's command line, merged
-        // green, and turned `main` red on the push run. Same shape #1028 noted —
-        // whoever changes the GUARDED thing walks past the guard, because the guard's
-        // trigger names the TEST's path instead of the thing under test.
-        //
-        // No extra seeds: there is no workspace to rebuild. The tier is the point.
-        match: /^\.githooks\//,
-        seeds: [],
-        runE2E: true,
-        why: 'tests/e2e/git-hooks-cli-bundle-staleness drives .githooks/pre-commit',
-    },
-    {
-        // `templates/*` ARE workspaces, so a template change already seeds its own
-        // `@gjsify/template-<name>` — not the consumer that matters. That consumer is
-        // `@gjsify/create-app`, unreachable twice over: it lives at
-        // `packages/infra/create-gjsify/`, so no directory-name search finds it, and
-        // it pulls the templates in through its own `scripts/process-template.mjs`
-        // build step (which resolves each `workspace:^` specifier and copies the
-        // result into `dist-templates/`), so there is no dependency edge either.
-        // `dist-templates/` is a build-output cache candidate, so once stale it
-        // stays stale.
-        match: /^templates\//,
-        seeds: ['@gjsify/create-app'],
-        // `tests/e2e/create-app` is the ONLY thing that would notice — it scaffolds a
-        // project out of `dist-templates/` and builds it. Without this a
-        // templates-only PR got neither the regenerated templates nor that suite;
-        // #853 passed only by also touching root `package.json`.
-        runE2E: true,
-        why: '@gjsify/create-app build → node scripts/process-template.mjs reads templates/',
-    },
-];
-function classifyAndExpand(workspaces, changedFiles) {
-    const files = changedFiles.map((f) => f.replace(/\\/g, '/')).filter((f) => f.length > 0);
-    if (files.length === 0) {
-        return {
-            global: false,
-            reason: 'empty-diff',
-            workspaces: [],
-            runE2E: false,
-            runIntegration: false,
-            skipAll: true,
-        };
-    }
-    // Ignored files go FIRST, before the global-trigger check: ignore wins over
-    // global, so `packages/infra/cli/README.md` must not force a full run.
-    const remaining = [];
-    for (const f of files) {
-        if (IGNORE.some((re) => re.test(f)))
-            continue;
-        remaining.push(f);
-    }
-    if (remaining.length === 0) {
-        return {
-            global: false,
-            reason: 'ignored-only',
-            workspaces: [],
-            runE2E: false,
-            runIntegration: false,
-            skipAll: true,
-        };
-    }
-    // Global triggers short-circuit — checked on the non-ignored remainder.
-    for (const f of remaining) {
-        for (const re of GLOBAL_TRIGGERS) {
-            if (re.test(f)) {
-                return {
-                    global: true,
-                    reason: `global-trigger ${re.source} matched ${f}`,
-                    workspaces: workspaces.map((w) => w.name),
-                    runE2E: true,
-                    runIntegration: true,
-                    skipAll: false,
-                };
-            }
-        }
-    }
-    const { matched, unmatched } = workspacesForChangedFiles(workspaces, remaining);
-    // Seeds no graph edge can reach. BEFORE the `unmatched` bail-out, so the table
-    // also works for a coupled directory that is not itself a workspace — such a
-    // file would otherwise force a full run and never consult the declared seeds.
-    const knownNames = new Set(workspaces.map((w) => w.name));
-    const couplingSeeds = new Set();
-    const couplingAccounted = new Set();
-    let couplingRunE2E = false;
-    for (const c of SCRIPT_COUPLINGS) {
-        const hits = remaining.filter((f) => c.match.test(f));
-        if (hits.length === 0)
-            continue;
-        for (const h of hits)
-            couplingAccounted.add(h);
-        for (const s of c.seeds) {
-            // A declared seed that is not a workspace means the table drifted from the
-            // tree (renamed, moved, removed). Fail towards the full run and SAY SO: a
-            // missing rebuild here is invisible, so this must never degrade quietly
-            // back into the bug the table exists to prevent.
-            if (!knownNames.has(s)) {
-                return {
-                    global: true,
-                    reason: `script-coupling seed ${s} is not a workspace (${c.match.source} → ${c.why}); ` +
-                        `SCRIPT_COUPLINGS in commands/affected.ts is stale`,
-                    workspaces: workspaces.map((w) => w.name),
-                    runE2E: true,
-                    runIntegration: true,
-                    skipAll: false,
-                };
-            }
-            couplingSeeds.add(s);
-        }
-        if (c.runE2E)
-            couplingRunE2E = true;
-    }
-    // Unmatched-but-not-ignored (a new top-level dotfile, an uncarved `scripts/`
-    // file) falls back to the full run. A file a coupling claimed does not count.
-    const stillUnmatched = unmatched.filter((f) => !couplingAccounted.has(f));
-    if (stillUnmatched.length > 0) {
-        return {
-            global: true,
-            reason: `unmatched files (${stillUnmatched.length}): ${stillUnmatched.slice(0, 3).join(', ')}${stillUnmatched.length > 3 ? '…' : ''}`,
-            workspaces: workspaces.map((w) => w.name),
-            runE2E: true,
-            runIntegration: true,
-            skipAll: false,
-        };
-    }
-    for (const s of couplingSeeds)
-        matched.add(s);
-    // Every remaining file is a spec / e2e / integration path under ONE workspace, so
-    // skip the closure: test code has no downstream consumers. A coupling disables
-    // this — its extra seeds exist precisely because a consumer DOES care.
-    const testOnly = couplingSeeds.size === 0 && remaining.every((f) => TEST_PATHS.some((re) => re.test(f)));
-    if (testOnly && matched.size === 1) {
-        const only = [...matched][0];
-        // An e2e- or integration-only change still needs its own job.
-        const touchedE2E = remaining.some((f) => f.startsWith('tests/e2e/'));
-        const touchedIntegration = remaining.some((f) => f.startsWith('tests/integration/'));
-        return {
-            global: false,
-            reason: `test-only (${remaining.length} file(s) in ${only})`,
-            workspaces: [only],
-            runE2E: touchedE2E,
-            runIntegration: touchedIntegration || isIntegrationWorkspace(only),
-            skipAll: false,
-        };
-    }
-    // PRODUCTION dependencies only. The closure answers "whose tests must re-run
-    // because a package they depend on changed", which is a RUNTIME relationship;
-    // walking devDependency edges conflated it with the build/test toolchain, so ANY
-    // single-package change fanned out to ~210 of 221 workspaces and selective CI
-    // bought almost nothing. Prod-only collapses a typical seed to a handful (sqlite
-    // 210→4, fetch 210→34) while keeping every real runtime dependent.
-    //
-    // Safe against under-selection: no `*.spec.ts` imports a CROSS-PACKAGE sibling
-    // via a devDependency (the only such imports are self-imports, covered by the
-    // package being its own seed), `@gjsify/unit` is a GLOBAL_TRIGGER above, and
-    // every push-to-main plus the nightly cron still run the FULL suite.
-    const reverse = buildReverseDependencyGraph(workspaces, { includeDev: false });
-    const closure = affectedClosure(reverse, [...matched]);
-    // `includeDev: true`, deliberately broader than the reverse closure: integration
-    // packages declare the pillars they exercise as `dependencies`, but the wider
-    // walk tolerates a devDep-declared edge too. Over-running an integration suite is
-    // cheap; missing one is not.
-    const forward = buildDependencyGraph(workspaces, { includeDev: true });
-    let runIntegration = false;
-    for (const [from, deps] of forward.edges) {
-        if (!isIntegrationWorkspace(from))
-            continue;
-        for (const dep of deps) {
-            if (closure.has(dep)) {
-                closure.add(from);
-                runIntegration = true;
-                break;
-            }
-        }
-    }
-    const runE2E = remaining.some((f) => f.startsWith('tests/e2e/')) || couplingRunE2E;
-    return {
-        global: false,
-        reason: `closure (${closure.size} ws from ${matched.size} seed(s))` +
-            (couplingSeeds.size > 0 ? `, ${couplingSeeds.size} via script-coupling` : ''),
-        workspaces: [...closure].sort(),
-        runE2E,
-        runIntegration,
-        skipAll: false,
-    };
-}
-function isIntegrationWorkspace(name) {
-    return name.startsWith('@gjsify/integration-');
-}
 function runGitDiff(cwd, base, head) {
     // `base...head` lists changed paths on `head` relative to the MERGE-BASE, which
     // matches what a GitHub PR diff shows and survives stacked PRs without picking up

package/lib/commands/flatpak/check.js

@@ -11,7 +11,7 @@
 // `flatpak install -y flathub org.flatpak.Builder`.
 import { existsSync, readdirSync } from 'node:fs';
 import { resolve, join } from 'node:path';
-import { spawn } from 'node:child_process';
+import { spawnToCompletion } from '../../utils/spawn.js';
 import { readPackageJson, looksLikeAppId } from './utils.js';
 import { Config } from '../../config.js';
 export const flatpakCheckCommand = {
@@ -52,7 +52,7 @@ export const flatpakCheckCommand = {
     },
     handler: async (args) => {
         const cfg = new Config();
-        const configData = await cfg.forBuild({}).catch(() => ({}));
+        const configData = await cfg.forCommand().catch(() => ({}));
         const flatpak = configData.flatpak ?? {};
         const cwd = process.cwd();
         const appId = resolveAppId(args.manifest, flatpak, cwd);
@@ -123,48 +123,39 @@ function resolveManifestPath(explicit, appId, cwd) {
     throw new Error('gjsify flatpak check: no manifest path given and could not auto-detect. ' +
         'Pass the manifest as a positional argument.');
 }
-function runLinter(bin, args, verbose) {
-    return new Promise((resolveP) => {
-        const child = spawn(bin, args, {
-            stdio: verbose ? 'inherit' : ['ignore', 'pipe', 'pipe'],
+async function runLinter(bin, args, verbose) {
+    // `completion: 'return'` — the handler's SUCCESS path ends with a `console.log`
+    // and returns, so under GJS an async spawn leaves `ensureMainLoop`'s loop armed
+    // and the command parks at 0 % CPU after every check has passed. The failure
+    // path exits, which is why the hang would have shown up only on a clean run.
+    let result;
+    try {
+        result = await spawnToCompletion(bin, args, {
+            completion: 'return',
+            stdio: verbose ? 'inherit' : 'capture',
         });
-        let stdout = '';
-        let stderr = '';
-        if (!verbose) {
-            child.stdout?.setEncoding('utf-8');
-            child.stderr?.setEncoding('utf-8');
-            child.stdout?.on('data', (c) => {
-                stdout += c;
-            });
-            child.stderr?.on('data', (c) => {
-                stderr += c;
-            });
+    }
+    catch (err) {
+        const e = err;
+        if (e.code === 'ENOENT') {
+            console.error(`[gjsify flatpak check] ${bin} not found in PATH.\n` +
+                `Install via:\n` +
+                `  flatpak install -y flathub org.flatpak.Builder\n` +
+                `  alias ${bin}="flatpak run --command=${bin} org.flatpak.Builder"`);
         }
-        child.on('error', (err) => {
-            const e = err;
-            if (e.code === 'ENOENT') {
-                console.error(`[gjsify flatpak check] ${bin} not found in PATH.\n` +
-                    `Install via:\n` +
-                    `  flatpak install -y flathub org.flatpak.Builder\n` +
-                    `  alias ${bin}="flatpak run --command=${bin} org.flatpak.Builder"`);
-            }
-            else {
-                console.error(`[gjsify flatpak check] ${bin} failed to spawn: ${e.message}`);
-            }
-            resolveP(false);
-        });
-        child.on('exit', (code) => {
-            const ok = code === 0;
-            const tag = ok ? 'OK' : 'FAIL';
-            console.log(`[gjsify flatpak check] ${tag}: ${bin} ${args.join(' ')}`);
-            if (!ok && !verbose) {
-                if (stdout.trim())
-                    console.log(stdout.trimEnd());
-                if (stderr.trim())
-                    console.error(stderr.trimEnd());
-            }
-            resolveP(ok);
-        });
-    });
+        else {
+            console.error(`[gjsify flatpak check] ${bin} failed to spawn: ${e.message}`);
+        }
+        return false;
+    }
+    const ok = result.code === 0;
+    console.log(`[gjsify flatpak check] ${ok ? 'OK' : 'FAIL'}: ${bin} ${args.join(' ')}`);
+    if (!ok && !verbose) {
+        if (result.stdout?.trim())
+            console.log(result.stdout.trimEnd());
+        if (result.stderr?.trim())
+            console.error(result.stderr.trimEnd());
+    }
+    return ok;
 }
 void join;

package/lib/commands/flatpak/ci.js

@@ -58,7 +58,7 @@ export const flatpakCiCommand = {
     handler: async (args) => {
         const cwd = process.cwd();
         const cfg = new Config();
-        const configData = await cfg.forBuild({}).catch(() => ({}));
+        const configData = await cfg.forCommand().catch(() => ({}));
         const flatpak = configData.flatpak ?? {};
         const pkg = readPackageJson(cwd);
         const appId = flatpak.appId ?? (looksLikeAppId(pkg.name) ? pkg.name : undefined);

package/lib/commands/flatpak/deps.js

@@ -7,7 +7,7 @@
 // https://github.com/flatpak/flatpak-builder-tools — installed via
 // `pipx install flatpak-node-generator` or `pip install --user
 // flatpak-node-generator`.
-import { spawn } from 'node:child_process';
+import { describeExit, spawnToCompletion } from '../../utils/spawn.js';
 import { existsSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { mkdirSync } from 'node:fs';
@@ -64,25 +64,16 @@ export const flatpakDepsCommand = {
         if (args.verbose) {
             console.log(`[gjsify flatpak deps] flatpak-node-generator ${cmdArgs.join(' ')}`);
         }
-        await new Promise((res, rej) => {
-            const child = spawn('flatpak-node-generator', cmdArgs, { stdio: 'inherit' });
-            child.on('error', (err) => {
-                if (err.code === 'ENOENT') {
-                    rej(new Error('gjsify flatpak deps: flatpak-node-generator not found. ' +
-                        'Install via `pipx install flatpak-node-generator` ' +
-                        '(see https://github.com/flatpak/flatpak-builder-tools/tree/master/node).'));
-                }
-                else {
-                    rej(err);
-                }
-            });
-            child.on('exit', (code) => {
-                if (code === 0)
-                    res();
-                else
-                    rej(new Error(`gjsify flatpak deps: flatpak-node-generator exited with status ${code}`));
-            });
+        // `completion: 'return'` — this handler returns; see `utils/spawn.ts`.
+        const result = await spawnToCompletion('flatpak-node-generator', cmdArgs, {
+            completion: 'return',
+            notFound: () => new Error('gjsify flatpak deps: flatpak-node-generator not found. ' +
+                'Install via `pipx install flatpak-node-generator` ' +
+                '(see https://github.com/flatpak/flatpak-builder-tools/tree/master/node).'),
         });
+        if (result.code !== 0) {
+            throw new Error(`gjsify flatpak deps: flatpak-node-generator exited with ${describeExit(result)}`);
+        }
         console.log(`[gjsify flatpak deps] wrote ${out}`);
     },
 };

package/lib/commands/flatpak/diff.js

@@ -60,7 +60,7 @@ export const flatpakDiffCommand = {
     handler: async (args) => {
         const cwd = process.cwd();
         const cfg = new Config();
-        const configData = await cfg.forBuild({}).catch(() => ({}));
+        const configData = await cfg.forCommand().catch(() => ({}));
         const flatpak = configData.flatpak ?? {};
         const appId = args.appId ?? flatpak.appId ?? readPackageJson(cwd).name;
         if (!appId) {

package/lib/commands/flatpak/init.js

@@ -97,7 +97,7 @@ export const flatpakInitCommand = {
     },
     handler: async (args) => {
         const cfg = new Config();
-        const configData = await cfg.forBuild({}).catch(() => ({}));
+        const configData = await cfg.forCommand().catch(() => ({}));
         const flatpak = configData.flatpak ?? {};
         const cwd = process.cwd();
         const pkg = readPackageJson(cwd);

package/lib/commands/flatpak/release.js

@@ -13,7 +13,8 @@
 // behaviour to running the sub-commands directly. The orchestrator
 // stops at the first failure and reports which step blocked, with a
 // clear command the user can re-run by hand.
-import { execFile, spawn } from 'node:child_process';
+import { execFile } from 'node:child_process';
+import { describeExit, spawnToCompletion } from '../../utils/spawn.js';
 import { promisify } from 'node:util';
 import { fileURLToPath } from 'node:url';
 import { resolve, dirname } from 'node:path';
@@ -139,14 +140,9 @@ function resolveCliEntry() {
 }
 /** Spawn `node <args>` and reject on non-zero exit. */
 async function runNode(args, cwd) {
-    await new Promise((resolvePromise, reject) => {
-        const child = spawn('node', args, { cwd, stdio: 'inherit' });
-        child.on('error', reject);
-        child.on('exit', (code) => {
-            if (code === 0)
-                resolvePromise();
-            else
-                reject(new Error(`sub-command exited with code ${code}: node ${args.join(' ')}`));
-        });
-    });
+    // `completion: 'return'` — the handler returns; see `utils/spawn.ts`.
+    const result = await spawnToCompletion('node', args, { completion: 'return', cwd });
+    if (result.code !== 0) {
+        throw new Error(`sub-command exited with ${describeExit(result)}: node ${args.join(' ')}`);
+    }
 }

package/lib/commands/flatpak/scaffold.d.ts

@@ -1,4 +1,6 @@
 import type { ConfigDataFlatpak } from '../../types/config-data.js';
+import { type MissingFieldError } from '../../utils/app-metadata.js';
+export type { MissingFieldError };
 export interface ScaffoldInputs {
     appId: string;
     name: string;
@@ -6,10 +8,6 @@ export interface ScaffoldInputs {
     kind: 'app' | 'cli';
     flatpak: ConfigDataFlatpak;
 }
-export interface MissingFieldError {
-    field: string;
-    hint: string;
-}
 /**
  * Validate that the config has the minimum set of fields required for
  * MetaInfo XML rendering. Returns the list of missing fields with