@gjsify/cli 0.5.1 → 0.6.0

package/lib/bundler-pick.d.ts

@@ -78,6 +78,20 @@ export declare function runWatch(finalOpts: BundlerOptions): Promise<RolldownWat
  */
 export declare function runBundle(finalOpts: BundlerOptions): Promise<RolldownOutput>;
 export declare function shouldUseNative(): Promise<boolean>;
+/**
+ * Walk parent directories from `startDir` (and optionally a second anchor
+ * `bundleDir`) looking for `node_modules/@gjsify/rolldown-native/package.json`.
+ * Returns the package root path (parent of its `package.json`) on the first
+ * hit, or null when nothing is found within 12 levels.
+ *
+ * This is a raw `existsSync`-based probe that bypasses both `createRequire`
+ * (whose GJS polyfill may not walk the full chain when anchored inside a
+ * sub-package dir) and `findWorkspaceRoot` (which requires `discoverWorkspaces`
+ * to map the sub-package to a workspace member, a step that can fail under
+ * the GJS polyfill stack). Used by `tryLoadNative` as an explicit fallback
+ * when the standard `resolveNpmPackage` anchors miss.
+ */
+export declare function findRolldownNativeDir(startDir: string, bundleDir?: string): string | null;
 /**
  * Sanitize fields the JSON encoder can't ship to the Rust deserializer.
  *

package/lib/bundler-pick.js

@@ -27,7 +27,7 @@
 // at hook-call time. The current gjsify plugin set doesn't use any
 // of those, so we don't gate on it; future incompatibilities surface
 // as build errors rather than silent wrong behavior.
-import { promises as fs } from 'node:fs';
+import { promises as fs, existsSync } from 'node:fs';
 import * as path from 'node:path';
 import { createRequire } from 'node:module';
 import { pathToFileURL } from 'node:url';
@@ -199,6 +199,39 @@ export async function shouldUseNative() {
     const native = await tryLoadNative();
     return native !== null;
 }
+/**
+ * Walk parent directories from `startDir` (and optionally a second anchor
+ * `bundleDir`) looking for `node_modules/@gjsify/rolldown-native/package.json`.
+ * Returns the package root path (parent of its `package.json`) on the first
+ * hit, or null when nothing is found within 12 levels.
+ *
+ * This is a raw `existsSync`-based probe that bypasses both `createRequire`
+ * (whose GJS polyfill may not walk the full chain when anchored inside a
+ * sub-package dir) and `findWorkspaceRoot` (which requires `discoverWorkspaces`
+ * to map the sub-package to a workspace member, a step that can fail under
+ * the GJS polyfill stack). Used by `tryLoadNative` as an explicit fallback
+ * when the standard `resolveNpmPackage` anchors miss.
+ */
+export function findRolldownNativeDir(startDir, bundleDir) {
+    const relPath = path.join('node_modules', '@gjsify', 'rolldown-native', 'package.json');
+    const dirsToSearch = [startDir];
+    if (bundleDir && bundleDir !== startDir)
+        dirsToSearch.push(bundleDir);
+    for (const anchor of dirsToSearch) {
+        let dir = anchor;
+        for (let i = 0; i < 12; i++) {
+            const candidate = path.join(dir, relPath);
+            if (existsSync(candidate)) {
+                return path.join(dir, 'node_modules', '@gjsify', 'rolldown-native');
+            }
+            const parent = path.resolve(dir, '..');
+            if (parent === dir)
+                break;
+            dir = parent;
+        }
+    }
+    return null;
+}
 async function tryLoadNative() {
     if (_nativeProbe)
         return _nativeProbe;
@@ -229,7 +262,36 @@ async function tryLoadNative() {
                 // install dir, anchoring solely at `import.meta.url`
                 // misses node_modules layouts where the user's cwd
                 // or the workspace root carries the package instead.
-                const resolved = resolveNpmPackage(specifier, { bundleUrl: import.meta.url }) ??
+                //
+                // When `resolveNpmPackage`'s standard anchors all miss
+                // (e.g. invoked from a package subdir whose own
+                // node_modules doesn't carry the optional-peer
+                // `@gjsify/rolldown-native`), fall back to a raw
+                // `existsSync`-based parent-dir walk — it bypasses
+                // both the GJS `createRequire` polyfill's walk
+                // limitations and `findWorkspaceRoot`'s dependency on
+                // `discoverWorkspaces`, both of which can fail to map a
+                // sub-package dir up to the hoisted workspace root.
+                const bundleDir = path.dirname(new URL(import.meta.url).pathname);
+                const resolvedFromNpm = resolveNpmPackage(specifier, { bundleUrl: import.meta.url });
+                const resolvedFromFs = resolvedFromNpm
+                    ? null
+                    : (() => {
+                        const pkgDir = findRolldownNativeDir(process.cwd(), bundleDir);
+                        if (!pkgDir)
+                            return null;
+                        // Resolve the package entry via createRequire anchored
+                        // inside the found package dir so we get the correct
+                        // exports-map / main field entry point.
+                        try {
+                            return createRequire(pathToFileURL(path.join(pkgDir, '__gjsify_resolve__.js')).href).resolve(specifier);
+                        }
+                        catch {
+                            return null;
+                        }
+                    })();
+                const resolved = resolvedFromNpm ??
+                    resolvedFromFs ??
                     createRequire(import.meta.url).resolve(specifier);
                 target = pathToFileURL(resolved).href;
             }

package/package.json

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