@gjsify/cli 0.38.1 → 0.39.0

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 = {
@@ -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/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/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/sync-flathub.js

@@ -17,7 +17,8 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { join, resolve } from 'node:path';
 import { homedir } from 'node:os';
-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 { Config } from '../../config.js';
 import { readPackageJson } from './utils.js';
@@ -204,28 +205,19 @@ async function detectDefaultBranch(cloneDir, verbose) {
     }
     return 'master';
 }
-function gitInRepo(cwd, args, verbose) {
+// `completion: 'return'` on both helpers — the handler returns; see `utils/spawn.ts`.
+async function gitInRepo(cwd, args, verbose) {
     if (verbose)
         console.log(`[gjsify flatpak sync-flathub] git ${args.join(' ')} (in ${cwd})`);
-    return new Promise((res, rej) => {
-        const child = spawn('git', args, { cwd, stdio: 'inherit' });
-        child.on('error', (err) => {
-            if (err.code === 'ENOENT') {
-                rej(new Error('[gjsify flatpak sync-flathub] `git` not found. Install it from your distro.'));
-            }
-            else {
-                rej(err);
-            }
-        });
-        child.on('exit', (code) => {
-            if (code === 0)
-                res();
-            else
-                rej(new Error(`git ${args[0]} exited ${code}`));
-        });
+    const result = await spawnToCompletion('git', args, {
+        completion: 'return',
+        cwd,
+        notFound: () => new Error('[gjsify flatpak sync-flathub] `git` not found. Install it from your distro.'),
     });
+    if (result.code !== 0)
+        throw new Error(`git ${args[0]} exited ${describeExit(result)}`);
 }
-function ghCreate(cloneDir, flathubRepo, branch, version, body, verbose) {
+async function ghCreate(cloneDir, flathubRepo, branch, version, body, verbose) {
     const args = [
         'pr',
         'create',
@@ -240,23 +232,13 @@ function ghCreate(cloneDir, flathubRepo, branch, version, body, verbose) {
     ];
     if (verbose)
         console.log(`[gjsify flatpak sync-flathub] gh ${args.join(' ')} (in ${cloneDir})`);
-    return new Promise((res, rej) => {
-        const child = spawn('gh', args, { cwd: cloneDir, stdio: 'inherit' });
-        child.on('error', (err) => {
-            if (err.code === 'ENOENT') {
-                rej(new Error('[gjsify flatpak sync-flathub] `gh` (GitHub CLI) not found. Install via `dnf install gh` (Fedora), `apt install gh` (Debian/Ubuntu), or `flatpak install -y flathub com.github.cli`.'));
-            }
-            else {
-                rej(err);
-            }
-        });
-        child.on('exit', (code) => {
-            if (code === 0)
-                res();
-            else
-                rej(new Error(`gh pr create exited ${code}`));
-        });
+    const result = await spawnToCompletion('gh', args, {
+        completion: 'return',
+        cwd: cloneDir,
+        notFound: () => new Error('[gjsify flatpak sync-flathub] `gh` (GitHub CLI) not found. Install via `dnf install gh` (Fedora), `apt install gh` (Debian/Ubuntu), or `flatpak install -y flathub com.github.cli`.'),
     });
+    if (result.code !== 0)
+        throw new Error(`gh pr create exited ${describeExit(result)}`);
 }
 /**
  * Surgically edit a Flathub manifest to update the git source's `tag` +

package/lib/commands/gettext.js

@@ -1,6 +1,6 @@
 import { execFile } from 'node:child_process';
 import { mkdir, readFile, readdir, stat, writeFile } from 'node:fs/promises';
-import { join, resolve } from 'node:path';
+import { basename, join, resolve } from 'node:path';
 import { promisify } from 'node:util';
 const execFileAsync = promisify(execFile);
 async function listLanguages(poDir) {
@@ -80,9 +80,12 @@ function defaultFilename(domain, format, metainfoTemplate) {
             // Mirror the template filename but without the trailing `.in` (convention for
             // pre-processed metainfo templates: `org.foo.Bar.metainfo.xml.in`).
             if (metainfoTemplate) {
-                const base = metainfoTemplate.replace(/\.in$/, '');
-                const slash = base.lastIndexOf('/');
-                return slash >= 0 ? base.slice(slash + 1) : base;
+                // `basename`, not a hand-rolled `lastIndexOf('/')`: this is a path the USER
+                // passed, and on win32 it separates with `\`, which the slice read as part
+                // of the name (#1143). `node:path` is the right owner for host tooling —
+                // though it only answers correctly under Node until #1146 makes
+                // `@gjsify/path` select win32 per host.
+                return basename(metainfoTemplate.replace(/\.in$/, ''));
             }
             return `${domain}.xml`;
         }

package/lib/utils/spawn.d.ts

@@ -32,8 +32,14 @@ export interface SpawnToCompletionOptions {
      * stderr**, for a parent whose own stdout is machine-readable: `gjsify pack
      * --json` emits JSON there, and interleaved lifecycle-script log lines make it
      * unparseable for anything piping into `JSON.parse`.
+     *
+     * `'capture'` collects both streams into {@link SpawnCompletion} and emits
+     * NEITHER, for a caller that reports the child's output only on failure. Unlike
+     * `'pipe'` it works on both paths, so it composes with `completion: 'return'` —
+     * `'pipe'` hands back a live `ChildProcess` the blocking path cannot produce,
+     * which is why that one is `'exit'`-only.
      */
-    stdio?: 'inherit' | 'pipe' | 'inherit-stderr';
+    stdio?: 'inherit' | 'pipe' | 'inherit-stderr' | 'capture';
     /**
      * Run `cmd` through the platform shell so `&&`, `|` and env-var references work.
      * `cmd` is then a whole command LINE and `args` must be empty — npm/yarn script
@@ -65,6 +71,10 @@ export interface SpawnCompletion {
     code: number | null;
     /** The terminating signal, or `null` on a normal exit. */
     signal: NodeJS.Signals | null;
+    /** The child's stdout — only under `stdio: 'capture'`, `''` when it wrote none. */
+    stdout?: string;
+    /** The child's stderr — only under `stdio: 'capture'`, `''` when it wrote none. */
+    stderr?: string;
 }
 /**
  * Run `cmd args…` to completion and resolve with its exit code and signal.

package/lib/utils/spawn.js

@@ -122,6 +122,16 @@ export function spawnToCompletion(cmd, args, opts) {
         });
         if (r.error)
             return Promise.reject(mapSpawnError(r.error, opts));
+        // `'capture'` hands both streams back instead of emitting them — this path
+        // already pipes, so it is the same read, routed to the caller.
+        if (opts.stdio === 'capture') {
+            return Promise.resolve({
+                code: r.status,
+                signal: r.signal ?? null,
+                stdout: String(r.stdout ?? ''),
+                stderr: String(r.stderr ?? ''),
+            });
+        }
         // Captured stdout goes to the parent's STDERR under `'inherit-stderr'`, the
         // destination the streaming path routes it to, so the two agree on where a
         // lifecycle script's chatter lands.
@@ -140,9 +150,11 @@ export function spawnToCompletion(cmd, args, opts) {
             // `['inherit', 2, 2]` is stdin inherited, stdout AND stderr → fd 2.
             stdio: opts.stdio === 'pipe'
                 ? ['ignore', 'pipe', 'pipe']
-                : opts.stdio === 'inherit-stderr'
-                    ? ['inherit', 2, 2]
-                    : 'inherit',
+                : opts.stdio === 'capture'
+                    ? ['inherit', 'pipe', 'pipe']
+                    : opts.stdio === 'inherit-stderr'
+                        ? ['inherit', 2, 2]
+                        : 'inherit',
         };
         if (opts.shell)
             spawnOpts.shell = true;
@@ -152,10 +164,22 @@ export function spawnToCompletion(cmd, args, opts) {
             spawnOpts.windowsVerbatimArguments = true;
         const child = spawn(win.cmd, win.args, spawnOpts);
         opts.onSpawn?.(child);
+        // Collected only under `'capture'`; the other modes never attach a reader,
+        // so an inherited stream is untouched.
+        let captured;
+        if (opts.stdio === 'capture') {
+            // Bound to a const the listeners close over: narrowing `captured` does
+            // not survive into a callback, and `captured!` would be a lie the day
+            // someone reorders these lines.
+            const buf = { stdout: '', stderr: '' };
+            captured = buf;
+            child.stdout?.on('data', (d) => (buf.stdout += String(d)));
+            child.stderr?.on('data', (d) => (buf.stderr += String(d)));
+        }
         // `close` (not `exit`) so piped stdio is fully drained before the caller's
         // flushers run; with `stdio: 'inherit'` the two are emitted back to back.
         child.on('close', (code, signal) => {
-            resolvePromise({ code, signal });
+            resolvePromise(captured ? { code, signal, ...captured } : { code, signal });
         });
         child.on('error', (err) => {
             reject(mapSpawnError(err, opts));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/cli",
-    "version": "0.38.1",
+    "version": "0.39.0",
     "description": "CLI for Gjsify",
     "type": "module",
     "main": "lib/index.js",
@@ -134,20 +134,20 @@
         "cli"
     ],
     "dependencies": {
-        "@gjsify/buffer": "^0.38.1",
-        "@gjsify/create-app": "^0.38.1",
-        "@gjsify/node-globals": "^0.38.1",
-        "@gjsify/node-polyfills": "^0.38.1",
-        "@gjsify/npm-registry": "^0.38.1",
-        "@gjsify/resolve-npm": "^0.38.1",
-        "@gjsify/rolldown-plugin-gjsify": "^0.38.1",
-        "@gjsify/vite-plugin-blueprint": "^0.38.1",
-        "@gjsify/rolldown-plugin-pnp": "^0.38.1",
-        "@gjsify/semver": "^0.38.1",
-        "@gjsify/tar": "^0.38.1",
-        "@gjsify/tsc": "^0.38.1",
-        "@gjsify/web-polyfills": "^0.38.1",
-        "@gjsify/workspace": "^0.38.1",
+        "@gjsify/buffer": "^0.39.0",
+        "@gjsify/create-app": "^0.39.0",
+        "@gjsify/node-globals": "^0.39.0",
+        "@gjsify/node-polyfills": "^0.39.0",
+        "@gjsify/npm-registry": "^0.39.0",
+        "@gjsify/resolve-npm": "^0.39.0",
+        "@gjsify/rolldown-plugin-gjsify": "^0.39.0",
+        "@gjsify/vite-plugin-blueprint": "^0.39.0",
+        "@gjsify/rolldown-plugin-pnp": "^0.39.0",
+        "@gjsify/semver": "^0.39.0",
+        "@gjsify/tar": "^0.39.0",
+        "@gjsify/tsc": "^0.39.0",
+        "@gjsify/web-polyfills": "^0.39.0",
+        "@gjsify/workspace": "^0.39.0",
         "cosmiconfig": "^9.0.2",
         "get-tsconfig": "^4.14.0",
         "pkg-types": "^2.3.1",
@@ -155,13 +155,13 @@
         "yargs": "^18.0.0"
     },
     "devDependencies": {
-        "@gjsify/unit": "^0.38.1",
+        "@gjsify/unit": "^0.39.0",
         "@types/yargs": "^17.0.35",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@gjsify/oxfmt-native": "^0.38.1",
-        "@gjsify/rolldown-native": "^0.38.1"
+        "@gjsify/oxfmt-native": "^0.39.0",
+        "@gjsify/rolldown-native": "^0.39.0"
     },
     "peerDependenciesMeta": {
         "@gjsify/oxfmt-native": {