@gjsify/cli 0.4.16 → 0.4.18

package/lib/commands/install.js

@@ -354,6 +354,14 @@ async function workspaceInstall(cwd, args) {
     // target in a shell script that picks the right interpreter (`gjs -m`
     // for `.mjs` bundles, `node` for `.js` files).
     const wsBinDir = join(cwd, 'node_modules', '.bin');
+    // Discover native prebuilds reachable from the workspace cwd so the
+    // workspace-local `node_modules/.bin/gjsify` shim sets GI_TYPELIB_PATH /
+    // LD_LIBRARY_PATH for them. Same rationale as the global launcher in
+    // install-global.ts — the bin shim invokes the CLI bundle via `gjs -m`
+    // directly, with no chance to set env after the fact, so without this
+    // preamble `imports.gi.GjsifyTerminal` etc. fail and process.stdout
+    // collapses to no-color, 80-col defaults.
+    const nativePrebuildDirs = detectNativePackages(cwd).map((p) => p.prebuildsDir);
     let wsBinsCreated = 0;
     for (const ws of workspaces) {
         const m = ws.manifest;
@@ -375,7 +383,7 @@ async function workspaceInstall(cwd, args) {
                 rmSync(linkPath, { force: true });
             }
             catch { /* fine */ }
-            writeFileSync(linkPath, buildBinShim(ws.location, nodeTarget, gjsTarget), { mode: 0o755 });
+            writeFileSync(linkPath, buildBinShim(ws.location, nodeTarget, gjsTarget, nativePrebuildDirs), { mode: 0o755 });
             chmodSync(linkPath, 0o755);
             wsBinsCreated++;
         }
@@ -441,16 +449,27 @@ function extractOverrides(rootManifest) {
     merge(rootManifest.resolutions, 'resolutions');
     return Object.keys(out).length > 0 ? out : undefined;
 }
-function buildBinShim(wsLocation, nodeTarget, gjsTarget) {
+function buildBinShim(wsLocation, nodeTarget, gjsTarget, nativePrebuildDirs = []) {
     const nodeAbs = nodeTarget ? join(wsLocation, nodeTarget) : null;
     const gjsAbs = gjsTarget ? join(wsLocation, gjsTarget) : null;
+    // GJS-only env preamble — Node ignores GI_TYPELIB_PATH so we scope the
+    // export to the gjs branch, keeping the shim minimal when no native pkgs
+    // exist or only the Node bin is in play.
+    const gjsPreamble = nativePrebuildDirs.length === 0
+        ? ''
+        : (() => {
+            const joined = `'${nativePrebuildDirs.join(':').replace(/'/g, `'\\''`)}'`;
+            return (`GI_TYPELIB_PATH=${joined}\${GI_TYPELIB_PATH:+":$GI_TYPELIB_PATH"}\n` +
+                `LD_LIBRARY_PATH=${joined}\${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}\n` +
+                `export GI_TYPELIB_PATH LD_LIBRARY_PATH\n`);
+        })();
     if (nodeAbs && gjsAbs) {
-        return `#!/bin/sh\nif [ -f "${nodeAbs}" ]; then\n  exec node "${nodeAbs}" "$@"\nfi\nexec gjs -m "${gjsAbs}" "$@"\n`;
+        return `#!/bin/sh\nif [ -f "${nodeAbs}" ]; then\n  exec node "${nodeAbs}" "$@"\nfi\n${gjsPreamble}exec gjs -m "${gjsAbs}" "$@"\n`;
     }
     if (nodeAbs)
         return `#!/bin/sh\nexec node "${nodeAbs}" "$@"\n`;
     if (gjsAbs)
-        return `#!/bin/sh\nexec gjs -m "${gjsAbs}" "$@"\n`;
+        return `#!/bin/sh\n${gjsPreamble}exec gjs -m "${gjsAbs}" "$@"\n`;
     throw new Error('buildBinShim: either nodeTarget or gjsTarget must be provided');
 }
 /**

package/lib/commands/uninstall.js

@@ -97,13 +97,18 @@ export const uninstallCommand = {
  *   #!/bin/sh
  *   exec '<absolute-path>' "$@"
  *
- * or (for `.gjs.mjs` / `.mjs` targets):
+ * or (for `.gjs.mjs` / `.mjs` targets, with optional GI_TYPELIB_PATH /
+ * LD_LIBRARY_PATH preamble for native @gjsify/* prebuilds):
  *
  *   #!/bin/sh
+ *   GI_TYPELIB_PATH='<dirs>'${GI_TYPELIB_PATH:+":$GI_TYPELIB_PATH"}
+ *   LD_LIBRARY_PATH='<dirs>'${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}
+ *   export GI_TYPELIB_PATH LD_LIBRARY_PATH
  *   exec gjs -m '<absolute-path>' "$@"
  *
- * We parse the absolute path out of the single-quoted segment and check
- * whether it's under `pkgDir`. Non-shim files (e.g. unrelated binaries
+ * We extract the single-quoted path on the `exec` line (NOT the first quoted
+ * string in the file, which with the preamble is the prebuild dir list) and
+ * check whether it's under `pkgDir`. Non-shim files (e.g. unrelated binaries
  * the user installed via `npm install -g`) are skipped silently.
  */
 function findBinShimsForPackage(binDir, pkgDir, verbose) {
@@ -126,8 +131,15 @@ function findBinShimsForPackage(binDir, pkgDir, verbose) {
             const content = readFileSync(fullPath, 'utf-8');
             if (!content.startsWith('#!/bin/sh'))
                 continue;
-            // Match the first single-quoted absolute path.
-            const m = content.match(/'([^']+)'/);
+            // Find the `exec [gjs -m] '<target>' "$@"` line; the path may
+            // contain `:` from the optional prebuild preamble lines, which
+            // is why we anchor to `exec ` rather than the first quoted run.
+            const execLine = content
+                .split('\n')
+                .find((line) => /^exec (?:gjs -m )?'/.test(line));
+            if (!execLine)
+                continue;
+            const m = execLine.match(/'([^']+)'/);
             if (!m)
                 continue;
             const target = m[1];

package/lib/index.js

@@ -8,9 +8,19 @@ import { APP_NAME } from './constants.js';
 // cosmetic — the event loop holds the process up — but under GJS the
 // script ends as soon as the top-level synchronous flow finishes, and
 // fire-and-forget handlers silently exit before any async work runs.
-await yargs(hideBin(process.argv))
+const cli = yargs(hideBin(process.argv));
+await cli
     .scriptName(APP_NAME)
     .strict()
+    // Use the full terminal width for help. yargs's default caps at 80
+    // (`Math.min(80, process.stdout.columns)`); we explicitly opt into
+    // the real terminal width so long option/description lines wrap at
+    // the actual terminal edge instead of an arbitrary 80-col limit.
+    // `terminalWidth()` reads `process.stdout.columns`, which under GJS
+    // is backed by @gjsify/terminal-native (ioctl TIOCGWINSZ) when the
+    // typelib is on GI_TYPELIB_PATH — see the global launcher in
+    // packages/infra/cli/src/utils/install-global.ts.
+    .wrap(cli.terminalWidth())
     .command(create.command, create.description, create.builder, create.handler)
     .command(install.command, install.description, install.builder, install.handler)
     .command(build.command, build.description, build.builder, build.handler)

package/lib/utils/install-global.js

@@ -23,6 +23,7 @@
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
+import { detectNativePackages } from './detect-native-packages.js';
 /**
  * Compute the canonical global install layout for the current user. Honours
  * `XDG_DATA_HOME` (per the XDG Base Directory Spec) plus
@@ -67,6 +68,18 @@ export function defaultGlobalLayout() {
 export function linkGlobalBins(packageNames, layout) {
     fs.mkdirSync(layout.binDir, { recursive: true });
     const created = [];
+    // Discover @gjsify/* packages with native prebuilds (Vala/GObject typelibs
+    // + shared libs) under the global prefix. The launcher bakes their
+    // directories into GI_TYPELIB_PATH / LD_LIBRARY_PATH so `imports.gi.X`
+    // resolves at CLI startup — required for e.g. @gjsify/terminal-native,
+    // without which process.stdout.isTTY / columns / colors all fall back to
+    // the conservative env-only defaults (no colors, 80-col wrap).
+    //
+    // `runGjsBundle()` does the same dance for `gjsify run <bundle>` at
+    // runtime; here we do it at install time because the global launcher
+    // invokes the CLI bundle directly, with no opportunity to set env first.
+    const nativePrebuildDirs = detectNativePackages(layout.prefix).map((p) => p.prebuildsDir);
+    const envPreamble = buildLauncherEnvPreamble(nativePrebuildDirs);
     for (const pkgName of packageNames) {
         const pkgDir = path.join(layout.prefix, 'node_modules', pkgName);
         const pkgJsonPath = path.join(pkgDir, 'package.json');
@@ -101,8 +114,11 @@ export function linkGlobalBins(packageNames, layout) {
             // then tries to parse JavaScript as shell. Plain Node scripts
             // with shebangs (lib/index.js) keep the direct-exec path.
             const isGjsBundle = targetAbs.endsWith('.gjs.mjs') || targetAbs.endsWith('.mjs');
+            // Only GJS bundles need the GI typelib search path. Plain Node
+            // scripts ignore GI_TYPELIB_PATH, so skipping the preamble there
+            // keeps the launcher minimal.
             const launcher = isGjsBundle
-                ? `#!/bin/sh\nexec gjs -m ${shQuote(targetAbs)} "$@"\n`
+                ? `#!/bin/sh\n${envPreamble}exec gjs -m ${shQuote(targetAbs)} "$@"\n`
                 : `#!/bin/sh\nexec ${shQuote(targetAbs)} "$@"\n`;
             fs.writeFileSync(linkPath, launcher);
             fs.chmodSync(linkPath, 0o755);
@@ -114,6 +130,23 @@ export function linkGlobalBins(packageNames, layout) {
 function shQuote(s) {
     return `'${s.replace(/'/g, `'\\''`)}'`;
 }
+/**
+ * Build the POSIX-sh `export` lines that prepend the given prebuild
+ * directories to GI_TYPELIB_PATH and LD_LIBRARY_PATH. Any pre-existing value
+ * inherited from the user's environment is preserved as a suffix so
+ * user-installed typelibs/libraries still resolve.
+ *
+ * Returns the empty string when no prebuilds were found — avoids emitting an
+ * inert assignment in the launcher.
+ */
+function buildLauncherEnvPreamble(prebuildsDirs) {
+    if (prebuildsDirs.length === 0)
+        return '';
+    const joined = shQuote(prebuildsDirs.join(':'));
+    return (`GI_TYPELIB_PATH=${joined}\${GI_TYPELIB_PATH:+":$GI_TYPELIB_PATH"}\n` +
+        `LD_LIBRARY_PATH=${joined}\${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}\n` +
+        `export GI_TYPELIB_PATH LD_LIBRARY_PATH\n`);
+}
 function pickBinMap(pkgName, pkgJson) {
     const gjsifyEntry = pkgJson.gjsify;
     if (gjsifyEntry?.bin !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/cli",
-    "version": "0.4.16",
+    "version": "0.4.18",
     "description": "CLI for Gjsify",
     "type": "module",
     "main": "lib/index.js",
@@ -37,18 +37,18 @@
         "cli"
     ],
     "dependencies": {
-        "@gjsify/buffer": "^0.4.16",
-        "@gjsify/create-app": "^0.4.16",
-        "@gjsify/node-globals": "^0.4.16",
-        "@gjsify/node-polyfills": "^0.4.16",
-        "@gjsify/npm-registry": "^0.4.16",
-        "@gjsify/resolve-npm": "^0.4.16",
-        "@gjsify/rolldown-plugin-gjsify": "^0.4.16",
-        "@gjsify/rolldown-plugin-pnp": "^0.4.16",
-        "@gjsify/semver": "^0.4.16",
-        "@gjsify/tar": "^0.4.16",
-        "@gjsify/web-polyfills": "^0.4.16",
-        "@gjsify/workspace": "^0.4.16",
+        "@gjsify/buffer": "^0.4.18",
+        "@gjsify/create-app": "^0.4.18",
+        "@gjsify/node-globals": "^0.4.18",
+        "@gjsify/node-polyfills": "^0.4.18",
+        "@gjsify/npm-registry": "^0.4.18",
+        "@gjsify/resolve-npm": "^0.4.18",
+        "@gjsify/rolldown-plugin-gjsify": "^0.4.18",
+        "@gjsify/rolldown-plugin-pnp": "^0.4.18",
+        "@gjsify/semver": "^0.4.18",
+        "@gjsify/tar": "^0.4.18",
+        "@gjsify/web-polyfills": "^0.4.18",
+        "@gjsify/workspace": "^0.4.18",
         "cosmiconfig": "^9.0.1",
         "get-tsconfig": "^4.14.0",
         "pkg-types": "^2.3.1",
@@ -56,12 +56,12 @@
         "yargs": "^18.0.0"
     },
     "devDependencies": {
-        "@gjsify/unit": "^0.4.16",
+        "@gjsify/unit": "^0.4.18",
         "@types/yargs": "^17.0.35",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@gjsify/rolldown-native": "^0.4.16"
+        "@gjsify/rolldown-native": "^0.4.18"
     },
     "peerDependenciesMeta": {
         "@gjsify/rolldown-native": {