@gjsify/cli 0.17.0 → 0.18.0

package/lib/cli-app.js

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'node:url';
 import yargs from 'yargs';
 import { buildCommand as build, testCommand as test, runCommand as run, infoCommand as info, systemCheckCommand as systemCheck, checkCommand as check, showcaseCommand as showcase, createCommand as create, gresourceCommand as gresource, gettextCommand as gettext, gsettingsCommand as gsettings, flatpakCommand as flatpak, dlxCommand as dlx, installCommand as install, foreachCommand as foreach, workspaceCommand as workspace, packCommand as pack, publishCommand as publish, whoamiCommand as whoami, loginCommand as login, logoutCommand as logout, trustCommand as trust, onboardCommand as onboard, selfUpdateCommand as selfUpdate, generateInstallerCommand as generateInstaller, uninstallCommand as uninstall, formatCommand as format, lintCommand as lint, fixCommand as fix, upgradeCommand as upgrade, barrelsCommand as barrels, tscCommand as tsc, affectedCommand as affected, storybookCommand as storybook, debugCommand as debug, browseCommand as browse, } from './commands/index.js';
 import { APP_NAME } from './constants.js';
-import { isNode } from '@gjsify/rolldown-plugin-gjsify/runtime';
+import { isNode, gjsSystemVersion } from '@gjsify/rolldown-plugin-gjsify/runtime';
 import { ensureGjsifyShimOnPath } from './utils/gjsify-shim.js';
 // Detect which runtime is executing the CLI (GJS or Node.js).
 // GJS MUST be checked first because @gjsify/process sets
@@ -29,9 +29,9 @@ import { ensureGjsifyShimOnPath } from './utils/gjsify-shim.js';
 // `process.versions.node` check would be a false Node positive under GJS.
 function runtimeLabel() {
     try {
-        const sys = globalThis.imports?.system;
-        if (sys?.version !== undefined) {
-            const v = Number(sys.version);
+        const sysVersion = gjsSystemVersion();
+        if (sysVersion !== undefined) {
+            const v = Number(sysVersion);
             return `GJS ${Math.floor(v / 10000)}.${Math.floor((v % 10000) / 100)}.${v % 100} (SpiderMonkey)`;
         }
     }

package/lib/commands/check.js

@@ -16,22 +16,11 @@
 // (since the typescript-check binding is positional `[paths..]`).
 import { spawn, spawnSync } from 'node:child_process';
 import { prefixLines } from '../utils/prefixed-output.js';
-import { existsSync, readFileSync } from 'node:fs';
+import { readPackageJson } from '../utils/pkg-json.js';
 import { join } from 'node:path';
 import { cpus } from 'node:os';
 import { discoverWorkspaces, filterWorkspaces } from '@gjsify/workspace';
 import { findWorkspaceRoot } from '../utils/workspace-root.js';
-function readPackageJson(dir) {
-    const path = join(dir, 'package.json');
-    if (!existsSync(path))
-        return null;
-    try {
-        return JSON.parse(readFileSync(path, 'utf-8'));
-    }
-    catch {
-        return null;
-    }
-}
 /**
  * Run a single workspace's `check` script. Returns the exit code; non-zero
  * indicates failure. Output is forwarded to the parent's stdout/stderr,
@@ -108,7 +97,7 @@ export const checkCommand = {
         // through gjsify so the command surface stays uniform with format/
         // lint/fix.
         if (workspaceRoot && cwd !== workspaceRoot) {
-            const pkg = readPackageJson(cwd);
+            const pkg = readPackageJson(join(cwd, 'package.json'));
             if (pkg?.scripts?.check) {
                 if (args.verbose) {
                     console.log(`[check] cwd=${cwd}  → npm run check`);

package/lib/commands/install.js

@@ -31,6 +31,7 @@ import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, rmSync, syml
 import { dirname, join, relative, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { spawn, spawnSync } from 'node:child_process';
+import { gjsExit } from '@gjsify/rolldown-plugin-gjsify/runtime';
 import { discoverWorkspaces } from '@gjsify/workspace';
 import { buildInstallCommand, detectPackageManager, runMinimalChecks } from '../utils/check-system-deps.js';
 import { detectNativePackages } from '../utils/detect-native-packages.js';
@@ -247,11 +248,8 @@ function isAbortedFromOverallTimeout(err) {
  */
 function forceExit(code) {
     process.exitCode = code;
-    const gjs = globalThis.imports;
-    if (gjs?.system?.exit) {
-        gjs.system.exit(code);
+    if (gjsExit(code))
         return;
-    }
     process.exit(code);
 }
 const CLI_PACKAGE_NAME = '@gjsify/cli';

package/lib/index.js

@@ -6,6 +6,7 @@
 // This file is just the executable wrapper around `runCli`.
 import { hideBin } from 'yargs/helpers';
 import { runCli } from './cli-app.js';
+import { gjsExit } from '@gjsify/rolldown-plugin-gjsify/runtime';
 try {
     await runCli(hideBin(process.argv));
 }
@@ -23,6 +24,5 @@ catch (err) {
     // atexit hook and would exit 0 at natural shutdown, so force a non-zero exit
     // via `imports.system.exit` there (no-op on Node, where `imports` is unset).
     process.exitCode = 1;
-    const gjs = globalThis.imports;
-    gjs?.system?.exit?.(1);
+    gjsExit(1);
 }

package/lib/utils/detect-native-packages.js

@@ -10,8 +10,9 @@
 //     their full transitive prebuild set picked up automatically. The
 //     transitive walk is what makes `gjsify showcase` / `gjsify dlx` work
 //     for packages whose Vala typelibs live in *indirect* deps.
-import { readdirSync, existsSync, readFileSync } from 'node:fs';
+import { readdirSync, existsSync } from 'node:fs';
 import { join, resolve } from 'node:path';
+import { readPackageJson } from './pkg-json.js';
 /** Map Node.js process.arch values to the convention used in prebuilds/ directories. */
 function nodeArchToLinuxArch(arch) {
     const map = {
@@ -22,15 +23,6 @@ function nodeArchToLinuxArch(arch) {
     };
     return map[arch] ?? arch;
 }
-/** Read a package.json file and return its parsed content, or null on error. */
-function readPackageJson(pkgJsonPath) {
-    try {
-        return JSON.parse(readFileSync(pkgJsonPath, 'utf-8'));
-    }
-    catch {
-        return null;
-    }
-}
 /**
  * Scan all packages in a node_modules directory for gjsify native prebuilds.
  * Handles scoped packages (@scope/name) as well as flat packages.

package/lib/utils/node-version.js

@@ -7,7 +7,7 @@
 // confusing crash with no actionable message (observed: Node 22 in a Fedora
 // container segfaults `gjsify install --backend native` during download/extract).
 // This preflight turns that into a clear, actionable error.
-import { isNode } from '@gjsify/rolldown-plugin-gjsify/runtime';
+import { isNode, gjsSystemVersion } from '@gjsify/rolldown-plugin-gjsify/runtime';
 /**
  * Minimum Node.js major the native install backend supports — its prebuilt native
  * modules are ABI-locked to this line (kept in sync with `.nvmrc`).
@@ -39,7 +39,7 @@ function onRealNode() {
     // GJS exposes `imports.system.version`; @gjsify/process fakes
     // `process.versions.node = '20.0.0'` for compat, so check GJS FIRST — a plain
     // `process.versions.node` read would be a false Node positive under GJS.
-    const sysVersion = globalThis.imports?.system?.version;
+    const sysVersion = gjsSystemVersion();
     if (sysVersion !== undefined)
         return false;
     return isNode();

package/lib/utils/oxc-resolve.js

@@ -54,7 +54,7 @@ import { pathToFileURL } from 'node:url';
 import { findWorkspaceRoot } from './workspace-root.js';
 import { resolveNpmPackage } from './resolve-npm-package.js';
 import { nodeBinary } from './run-node.js';
-import { isGjs } from '@gjsify/rolldown-plugin-gjsify/runtime';
+import { isGjs, gjsExit } from '@gjsify/rolldown-plugin-gjsify/runtime';
 /**
  * Map Node.js `process.platform` + `arch` (+ musl on Linux) to the
  * napi-rs binding-package suffix oxc uses, e.g. `linux-x64-gnu`,
@@ -408,9 +408,7 @@ export function setOxcExitCode(code) {
     process.exitCode = code;
     if (code === 0)
         return;
-    const gjs = globalThis.imports;
-    if (gjs?.system?.exit)
-        gjs.system.exit(code);
+    gjsExit(code);
 }
 /**
  * Has the given oxc tool's npm package (or its companion) been declared in the

package/lib/utils/pkg-json-edit.d.ts

@@ -11,6 +11,8 @@ export interface PackageJson {
     devDependencies?: Record<string, string>;
     peerDependencies?: Record<string, string>;
     optionalDependencies?: Record<string, string>;
+    scripts?: Record<string, string>;
+    private?: boolean;
     [key: string]: unknown;
 }
 export declare function readPackageJson(pkgPath: string): PackageJson | null;

package/lib/utils/pkg-json.d.ts

@@ -0,0 +1,6 @@
+import type { PackageJson } from './pkg-json-edit.js';
+/**
+ * Read + parse a `package.json` at `pkgPath`. Permissive: any error (missing
+ * file, unreadable, invalid JSON) yields `null`.
+ */
+export declare function readPackageJson(pkgPath: string): PackageJson | null;

package/lib/utils/pkg-json.js

@@ -0,0 +1,24 @@
+// Single permissive reader for `package.json` files, shared by the CLI's
+// workspace- and dependency-discovery paths (`gjsify run`/`workspace`/`foreach`/
+// `check`, native-prebuild scanning). Returns `null` when the file is missing
+// OR unparseable — discovery must degrade gracefully on a stray or corrupt
+// manifest rather than crash the whole command.
+//
+// The install-save path keeps its own STRICTER reader in `pkg-json-edit.ts`
+// (`readPackageJson` there): it returns `null` only when the file is absent but
+// THROWS on invalid JSON, so a corrupt manifest is never silently overwritten
+// during `gjsify install <pkg>`. That contract is intentional and load-bearing
+// — do not fold it into this one.
+import { readFileSync } from 'node:fs';
+/**
+ * Read + parse a `package.json` at `pkgPath`. Permissive: any error (missing
+ * file, unreadable, invalid JSON) yields `null`.
+ */
+export function readPackageJson(pkgPath) {
+    try {
+        return JSON.parse(readFileSync(pkgPath, 'utf-8'));
+    }
+    catch {
+        return null;
+    }
+}

package/lib/utils/run-gjs.js

@@ -53,6 +53,7 @@ export async function runGjsBundle(bundlePath, extraArgs = [], options = {}) {
     const gjsCommand = ['gjs', ...gjsArgs.map((a) => (a.includes(' ') ? `"${a}"` : a))].join(' ');
     console.error(`$ ${envPrefix ? `${envPrefix} ` : ''}${gjsCommand}`);
     const child = spawn('gjs', gjsArgs, { env, stdio: 'inherit' });
+    let failed = false;
     await new Promise((resolvePromise, reject) => {
         child.on('close', (code) => {
             if (code !== 0) {
@@ -65,10 +66,22 @@ export async function runGjsBundle(bundlePath, extraArgs = [], options = {}) {
         child.on('error', reject);
     }).catch((err) => {
         console.error(err.message);
-        process.exit(1);
+        failed = true;
     });
+    if (failed) {
+        // Set `process.exitCode` synchronously BEFORE exiting: under GJS
+        // `process.exit()` is deferred (the GLib main loop is armed), so when
+        // this runs via run.ts's in-process script dispatch, execution returns
+        // to the caller, which propagates by reading `process.exitCode`. Without
+        // this, `gjsify run <script>` whose body is `gjsify run <bundle>`
+        // swallowed a non-zero gjs exit and returned 0 — masking a failing
+        // `test:gjs` in the `test` script chain (and, via `gjsify foreach test`,
+        // in CI). The `return` guards against a fall-through second `exit`.
+        process.exitCode = 1;
+        return process.exit(1);
+    }
     // See RunGjsBundleOptions.exitOnSuccess — terminal callers opt in,
     // mid-flow callers (test.ts's runtime loop) keep the process alive.
     if (options.exitOnSuccess)
-        process.exit(0);
+        return process.exit(0);
 }

package/lib/utils/workspace-root.js

@@ -11,17 +11,10 @@
 // monorepo must actually contain `start` as one of its workspaces.
 // Without this guard, a grand-parent monorepo unrelated to `start`
 // could be picked up.
-import { existsSync, readFileSync } from 'node:fs';
+import { existsSync } from 'node:fs';
 import { join, resolve } from 'node:path';
 import { discoverWorkspaces } from '@gjsify/workspace';
-function readPackageJson(path) {
-    try {
-        return JSON.parse(readFileSync(path, 'utf-8'));
-    }
-    catch {
-        return null;
-    }
-}
+import { readPackageJson } from './pkg-json.js';
 export function findWorkspaceRoot(start) {
     let dir = start;
     for (let i = 0; i < 12; i++) {

package/package.json

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