@gjsify/cli 0.3.21 → 0.4.3

package/lib/utils/pkg-json-edit.js

@@ -0,0 +1,108 @@
+// Helpers for editing `package.json` during `gjsify install <pkg>`.
+//
+// Mirrors npm's `--save-{prod,dev,peer,optional}` semantics:
+//   - default → dependencies (production)
+//   - --save-dev → devDependencies
+//   - --save-peer → peerDependencies
+//   - --save-optional → optionalDependencies
+//
+// Version specifier resolution mirrors npm's default (`^x.y.z` from the
+// installed version), unless the user passed an explicit range in the spec
+// (`react@^18` → keep `^18`).
+import { readFileSync, writeFileSync, existsSync } from 'node:fs';
+export function readPackageJson(pkgPath) {
+    if (!existsSync(pkgPath))
+        return null;
+    const raw = readFileSync(pkgPath, 'utf-8');
+    try {
+        return JSON.parse(raw);
+    }
+    catch (e) {
+        throw new Error(`gjsify install: ${pkgPath} is not valid JSON: ${e.message}`);
+    }
+}
+export function writePackageJson(pkgPath, pkg) {
+    const sorted = sortKnownDepFields(pkg);
+    writeFileSync(pkgPath, JSON.stringify(sorted, null, 2) + '\n', 'utf-8');
+}
+/**
+ * Parse a user spec into `{ name, range }`:
+ *   `react`         → { name: 'react', range: undefined }
+ *   `react@^18`     → { name: 'react', range: '^18' }
+ *   `@types/node`   → { name: '@types/node', range: undefined }
+ *   `@types/node@1` → { name: '@types/node', range: '1' }
+ */
+export function parseSpec(spec) {
+    if (spec.startsWith('@')) {
+        const slash = spec.indexOf('/');
+        if (slash === -1)
+            return { name: spec };
+        const at = spec.indexOf('@', slash + 1);
+        if (at === -1)
+            return { name: spec };
+        return { name: spec.slice(0, at), range: spec.slice(at + 1) };
+    }
+    const at = spec.indexOf('@');
+    if (at === -1)
+        return { name: spec };
+    return { name: spec.slice(0, at), range: spec.slice(at + 1) };
+}
+/**
+ * Collect existing dependencies + devDependencies + optionalDependencies
+ * from a project package.json into installable specs of the form
+ * `name@range`. Used by `gjsify install` (no args) to seed the resolver
+ * with the project's existing dependency manifest — equivalent to
+ * `npm install` reading `package.json`.
+ */
+export function projectSpecsFromPackageJson(pkg) {
+    const out = [];
+    for (const kind of ['dependencies', 'devDependencies', 'optionalDependencies']) {
+        const block = pkg[kind];
+        if (!block)
+            continue;
+        for (const [name, range] of Object.entries(block)) {
+            // Skip workspace: / link: / file: / portal: specifiers — those
+            // are workspace-local references handled by Phase D.3, not by
+            // the project-local install path.
+            if (typeof range !== 'string')
+                continue;
+            if (/^(workspace|link|file|portal|git\+|https?):/.test(range))
+                continue;
+            out.push(`${name}@${range}`);
+        }
+    }
+    return out;
+}
+/**
+ * Add or update a dependency entry in `pkg`. If the spec didn't include
+ * a range, callers fill in the installed version after resolution and
+ * call this again with `installedVersion` set.
+ */
+export function addDependencyEntry(pkg, name, range, kind) {
+    if (pkg[kind] === undefined) {
+        pkg[kind] = {};
+    }
+    pkg[kind][name] = range;
+}
+/**
+ * Default version range when the user didn't pin one: `^x.y.z` from the
+ * installed version. Mirrors npm's `save-prefix` default (`^`).
+ */
+export function defaultRangeFromVersion(version) {
+    return `^${version}`;
+}
+function sortKnownDepFields(pkg) {
+    const out = { ...pkg };
+    for (const kind of [
+        'dependencies',
+        'devDependencies',
+        'peerDependencies',
+        'optionalDependencies',
+    ]) {
+        const block = out[kind];
+        if (!block)
+            continue;
+        out[kind] = Object.fromEntries(Object.entries(block).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)));
+    }
+    return out;
+}

package/lib/utils/workspace-root.d.ts

@@ -0,0 +1 @@
+export declare function findWorkspaceRoot(start: string): string | null;

package/lib/utils/workspace-root.js

@@ -0,0 +1,46 @@
+// Walk up from a starting directory to the first ancestor whose
+// `package.json` declares a `workspaces` field — the monorepo root.
+//
+// Used by `gjsify run`, `gjsify workspace`, and `gjsify foreach`: each
+// can be invoked from inside any workspace (chained script calls put the
+// child CLI invocation's cwd at the inner workspace's location), and
+// every one of them needs the monorepo root to discover sibling
+// workspaces, resolve `workspace:^` deps, and walk the dep graph.
+//
+// Sanity-checked via `discoverWorkspaces(candidate)`: the candidate
+// 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 { join, resolve } from 'node:path';
+import { discoverWorkspaces } from '@gjsify/workspace';
+function readPackageJson(path) {
+    try {
+        return JSON.parse(readFileSync(path, 'utf-8'));
+    }
+    catch {
+        return null;
+    }
+}
+export function findWorkspaceRoot(start) {
+    let dir = start;
+    for (let i = 0; i < 12; i++) {
+        const pkgPath = join(dir, 'package.json');
+        if (existsSync(pkgPath)) {
+            const pkg = readPackageJson(pkgPath);
+            if (pkg?.workspaces !== undefined) {
+                try {
+                    const ws = discoverWorkspaces(dir);
+                    if (dir === start || ws.some((w) => w.location === start))
+                        return dir;
+                }
+                catch { /* not a usable workspace root */ }
+            }
+        }
+        const parent = resolve(dir, '..');
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}

package/package.json

@@ -1,45 +1,71 @@
 {
-  "name": "@gjsify/cli",
-  "version": "0.3.21",
-  "description": "CLI for Gjsify",
-  "type": "module",
-  "main": "lib/index.js",
-  "module": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "bin": {
-    "gjsify": "./lib/index.js"
-  },
-  "scripts": {
-    "clear": "rm -rf lib tsconfig.tsbuildinfo || exit 0",
-    "check": "tsc --noEmit",
-    "start": "node lib/index.js",
-    "build": "tsc && yarn chmod",
-    "chmod": "chmod +x ./lib/index.js"
-  },
-  "keywords": [
-    "gjs",
-    "node",
-    "gjsify",
-    "cli"
-  ],
-  "dependencies": {
-    "@gjsify/create-app": "^0.3.21",
-    "@gjsify/node-polyfills": "^0.3.21",
-    "@gjsify/npm-registry": "^0.3.21",
-    "@gjsify/resolve-npm": "^0.3.21",
-    "@gjsify/rolldown-plugin-gjsify": "^0.3.21",
-    "@gjsify/rolldown-plugin-pnp": "^0.3.21",
-    "@gjsify/semver": "^0.3.21",
-    "@gjsify/tar": "^0.3.21",
-    "@gjsify/web-polyfills": "^0.3.21",
-    "cosmiconfig": "^9.0.1",
-    "get-tsconfig": "^4.14.0",
-    "pkg-types": "^2.3.1",
-    "rolldown": "^1.0.0",
-    "yargs": "^18.0.0"
-  },
-  "devDependencies": {
-    "@types/yargs": "^17.0.35",
-    "typescript": "^6.0.3"
-  }
-}
+    "name": "@gjsify/cli",
+    "version": "0.4.3",
+    "description": "CLI for Gjsify",
+    "type": "module",
+    "main": "lib/index.js",
+    "module": "lib/index.js",
+    "types": "lib/index.d.ts",
+    "bin": {
+        "gjsify": "./lib/index.js"
+    },
+    "gjsify": {
+        "bin": {
+            "gjsify": "./dist/cli.gjs.mjs"
+        }
+    },
+    "files": [
+        "lib",
+        "dist/cli.gjs.mjs",
+        "showcases.json"
+    ],
+    "scripts": {
+        "clear": "rm -rf lib dist tsconfig.tsbuildinfo || exit 0",
+        "check": "tsc --noEmit",
+        "start": "node lib/index.js",
+        "build": "tsc && gjsify run chmod",
+        "build:gjs-bundle": "node lib/index.js build src/index.ts --app gjs --outfile dist/cli.gjs.mjs",
+        "chmod": "chmod +x ./lib/index.js",
+        "build:test:node": "node lib/index.js build src/test.mts --app node --outfile dist/test.node.mjs",
+        "test:node": "node dist/test.node.mjs",
+        "test": "gjsify run build:test:node && gjsify run test:node"
+    },
+    "keywords": [
+        "gjs",
+        "node",
+        "gjsify",
+        "cli"
+    ],
+    "dependencies": {
+        "@gjsify/buffer": "workspace:^",
+        "@gjsify/create-app": "workspace:^",
+        "@gjsify/node-globals": "workspace:^",
+        "@gjsify/node-polyfills": "workspace:^",
+        "@gjsify/npm-registry": "workspace:^",
+        "@gjsify/resolve-npm": "workspace:^",
+        "@gjsify/rolldown-plugin-gjsify": "workspace:^",
+        "@gjsify/rolldown-plugin-pnp": "workspace:^",
+        "@gjsify/semver": "workspace:^",
+        "@gjsify/tar": "workspace:^",
+        "@gjsify/web-polyfills": "workspace:^",
+        "@gjsify/workspace": "workspace:^",
+        "cosmiconfig": "^9.0.1",
+        "get-tsconfig": "^4.14.0",
+        "pkg-types": "^2.3.1",
+        "rolldown": "^1.0.0",
+        "yargs": "^18.0.0"
+    },
+    "devDependencies": {
+        "@gjsify/unit": "workspace:^",
+        "@types/yargs": "^17.0.35",
+        "typescript": "^6.0.3"
+    },
+    "peerDependencies": {
+        "@gjsify/rolldown-native": "workspace:^"
+    },
+    "peerDependenciesMeta": {
+        "@gjsify/rolldown-native": {
+            "optional": true
+        }
+    }
+}