@gjsify/cli 0.16.4 → 0.16.5

package/lib/commands/run.d.ts

@@ -2,6 +2,7 @@ import type { Command } from '../types/index.js';
 interface RunOptions {
     target: string;
     args: string[];
+    workspace?: string;
 }
 export declare const runCommand: Command<unknown, RunOptions>;
 export {};

package/lib/commands/run.js

@@ -14,11 +14,12 @@
 // as a bundle file. Everything else is a script name. Users who want
 // to disambiguate can pass `./<file>` explicitly.
 import { statSync } from 'node:fs';
-import { delimiter, join, resolve } from 'node:path';
+import { basename, delimiter, join, resolve } from 'node:path';
 import { spawn } from 'node:child_process';
 import { runGjsBundle } from '../utils/run-gjs.js';
 import { readPackageJson } from '../utils/pkg-json-edit.js';
 import { findWorkspaceRoot } from '../utils/workspace-root.js';
+import { discoverWorkspaces } from '@gjsify/workspace';
 import { isGjs } from '@gjsify/rolldown-plugin-gjsify/runtime';
 export const runCommand = {
     command: 'run <target> [args..]',
@@ -34,6 +35,16 @@ export const runCommand = {
         type: 'string',
         array: true,
         default: [],
+    })
+        .option('workspace', {
+        // npm/yarn-style `-w <name>`: run <target> as a SCRIPT in the
+        // named workspace instead of the current directory. The name
+        // matches the package.json `name`, the workspace-relative path
+        // (e.g. `cli`), or the directory basename — so both
+        // `-w eco-retrofit-cli` and `-w cli` resolve, matching npm.
+        alias: 'w',
+        type: 'string',
+        description: 'Run <target> as a script in the named workspace (by name or path), like `npm run <script> -w <name>`.',
     })
         .parserConfiguration({
         // Preserve `--` as args['--'] so callers can write
@@ -61,6 +72,12 @@ export const runCommand = {
         const positionalArgs = args.args ?? [];
         const doubleDashArgs = (args['--'] ?? []).filter((v) => typeof v === 'string');
         const extraArgs = [...positionalArgs, ...doubleDashArgs];
+        // `-w <name>` (npm/yarn parity): run <target> as a script in the named
+        // workspace's directory rather than the current one. Never file mode.
+        if (typeof args.workspace === 'string' && args.workspace.length > 0) {
+            await runScriptInWorkspace(args.workspace, target, extraArgs);
+            return;
+        }
         // Script lookup wins over file detection. Without this, a bare
         // `gjsify run build` would resolve to a file when a `./build`
         // directory exists in cwd (e.g. meson's build dir from a Vala
@@ -97,6 +114,31 @@ function looksLikeFile(target) {
         return false;
     }
 }
+/**
+ * Resolve a workspace by npm/yarn `--workspace` semantics — matching the
+ * package.json `name`, the workspace-relative path (`packages/infra/cli` or
+ * `cli`), or the directory basename — then run `script` in that workspace's
+ * directory. Mirrors `npm run <script> --workspace <name>`.
+ */
+async function runScriptInWorkspace(name, script, extraArgs) {
+    const root = findWorkspaceRoot(process.cwd()) ?? process.cwd();
+    let workspaces;
+    try {
+        workspaces = discoverWorkspaces(root);
+    }
+    catch (err) {
+        console.error(`gjsify run: could not read workspaces at ${root}: ${err.message}`);
+        return process.exit(1);
+    }
+    const ws = workspaces.find((w) => w.name === name || w.relativeLocation === name || basename(w.location) === name);
+    if (!ws) {
+        const available = workspaces.map((w) => w.relativeLocation).join(', ') || '<none>';
+        console.error(`gjsify run: no workspace "${name}" under ${root} (available: ${available})`);
+        // `return process.exit` — a bare exit falls through under GJS (see runScript).
+        return process.exit(1);
+    }
+    await runScript(script, extraArgs, ws.location);
+}
 /**
  * Run a script declared in the current workspace's `package.json#scripts`.
  * Mirrors `yarn run <script>` semantics:
@@ -107,20 +149,29 @@ function looksLikeFile(target) {
  *   - executed through `shell: true` so `&&` / `|` / env-var refs work
  *     exactly as in package.json scripts (matches npm/yarn)
  */
-async function runScript(script, extraArgs) {
-    const cwd = process.cwd();
+async function runScript(script, extraArgs, cwd = process.cwd()) {
     const pkgPath = join(cwd, 'package.json');
     const pkg = readPackageJson(pkgPath);
     if (!pkg) {
         console.error(`gjsify run: no package.json in ${cwd}`);
-        process.exit(1);
+        // `return process.exit` — under GJS `process.exit` cannot terminate
+        // synchronously (a parked GLib.MainLoop owns the thread): it SCHEDULES
+        // the exit and returns, so a bare call falls through. Here that reached
+        // `tokenizeSimpleCommand(literal)` with `literal === undefined` →
+        // `cannot access property "length"` → the throw raced the scheduled
+        // exit into a second `system.exit` → `m_should_exit assertion failed`
+        // → core dump. The `return` halts the handler so exactly one exit is
+        // scheduled (same discipline as commands/workspace.ts). No-op on Node.
+        return process.exit(1);
     }
     const scripts = pkg.scripts ?? {};
     const literal = scripts[script];
     if (typeof literal !== 'string') {
         const available = Object.keys(scripts).join(', ') || '<none>';
         console.error(`gjsify run: no script "${script}" in ${pkgPath} (available: ${available})`);
-        process.exit(1);
+        // See the `no package.json` branch above — a bare `process.exit` under
+        // GJS falls through to `tokenizeSimpleCommand(undefined)` and core-dumps.
+        return process.exit(1);
     }
     const monorepoRoot = findWorkspaceRoot(cwd);
     const binDirs = [join(cwd, 'node_modules', '.bin')];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/cli",
-    "version": "0.16.4",
+    "version": "0.16.5",
     "description": "CLI for Gjsify",
     "type": "module",
     "main": "lib/index.js",
@@ -122,19 +122,19 @@
         "cli"
     ],
     "dependencies": {
-        "@gjsify/buffer": "^0.16.4",
-        "@gjsify/create-app": "^0.16.4",
-        "@gjsify/node-globals": "^0.16.4",
-        "@gjsify/node-polyfills": "^0.16.4",
-        "@gjsify/npm-registry": "^0.16.4",
-        "@gjsify/resolve-npm": "^0.16.4",
-        "@gjsify/rolldown-plugin-gjsify": "^0.16.4",
-        "@gjsify/rolldown-plugin-pnp": "^0.16.4",
-        "@gjsify/semver": "^0.16.4",
-        "@gjsify/tar": "^0.16.4",
-        "@gjsify/tsc": "^0.16.4",
-        "@gjsify/web-polyfills": "^0.16.4",
-        "@gjsify/workspace": "^0.16.4",
+        "@gjsify/buffer": "^0.16.5",
+        "@gjsify/create-app": "^0.16.5",
+        "@gjsify/node-globals": "^0.16.5",
+        "@gjsify/node-polyfills": "^0.16.5",
+        "@gjsify/npm-registry": "^0.16.5",
+        "@gjsify/resolve-npm": "^0.16.5",
+        "@gjsify/rolldown-plugin-gjsify": "^0.16.5",
+        "@gjsify/rolldown-plugin-pnp": "^0.16.5",
+        "@gjsify/semver": "^0.16.5",
+        "@gjsify/tar": "^0.16.5",
+        "@gjsify/tsc": "^0.16.5",
+        "@gjsify/web-polyfills": "^0.16.5",
+        "@gjsify/workspace": "^0.16.5",
         "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.16.4",
+        "@gjsify/unit": "^0.16.5",
         "@types/yargs": "^17.0.35",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@gjsify/oxfmt-native": "^0.16.4",
-        "@gjsify/rolldown-native": "^0.16.4"
+        "@gjsify/oxfmt-native": "^0.16.5",
+        "@gjsify/rolldown-native": "^0.16.5"
     },
     "peerDependenciesMeta": {
         "@gjsify/oxfmt-native": {