@gjsify/cli 0.16.5 → 0.16.7

package/lib/actions/build.d.ts

@@ -55,26 +55,42 @@ export declare class BuildAction {
      */
     private loadPluginViaGjsBundle;
     /**
-     * Bundle a single plugin entry for `--app gjs` to a cached temp file and
-     * return its path. Reuses the full `--app gjs` pipeline (exports-map-aware
-     * resolution, `node:`→`@gjsify` aliases, `--globals auto`, single-file
-     * output) via a nested `BuildAction`. The nested config carries no
-     * `bundler.plugins`, so it never recurses back into plugin resolution.
-     *
-     * Cached under `node_modules/.cache/gjsify/plugins/`, keyed by the resolved
-     * source path. Invalidated when the plugin entry OR the project lockfile is
-     * newer than the cached bundle — a dep bump rewrites the lockfile but not
-     * the plugin's own entry mtime. The one window neither mtime catches (a
-     * transitive dep edited in place) is covered by the `GJSIFY_NO_PLUGIN_CACHE=1`
-     * escape hatch. Failures are rethrown with context naming the plugin.
+     * Bundle a single plugin entry for GJS via {@link bundleFileForGjsCached} and
+     * return its path. Rethrows with context naming the plugin. (GJS's native ESM
+     * loader can't resolve a plugin's `package.json#exports` subpaths for a bare
+     * specifier; Rolldown resolves them at bundle time.)
      */
     private bundlePluginForGjs;
     /**
-     * Fresh when the cached bundle is newer than BOTH the plugin entry AND the
-     * project's lockfile (the dep-change signal). Missing bundle/source → not
-     * fresh (rebuild).
+     * Bundle a single ESM entry file to a self-contained `--app gjs` module and
+     * return its path — the shared "bundle one file for GJS" helper behind both
+     * the plugin loader (exports-map subpaths GJS can't resolve for a bare
+     * specifier) and the config loader (`node:`/npm imports GJS can't resolve for
+     * an external ESM file). Reuses the full `--app gjs` pipeline (exports-map-aware
+     * resolution, `node:`→`@gjsify` aliases, `gi://` externalized, `--globals auto`,
+     * single-file output).
+     *
+     * The nested `BuildAction` is constructed with EXPLICIT bundler options, so
+     * `buildApp` uses that configData directly and never re-enters `Config.load`
+     * — no recursion, even when the input is the very `gjsify.config.js` being
+     * loaded. `preserveDefaultExport` re-exports `default` through the side-effect
+     * entry wrapper so the file imports as a library; shebang stays unset (the
+     * artifact is imported, not executed).
+     *
+     * Cached under `node_modules/.cache/gjsify/<cacheSubdir>/`, keyed by the source
+     * path. Invalidated when the source OR the project lockfile is newer than the
+     * cached bundle (a dep bump rewrites the lockfile but not the source mtime).
+     * `<noCacheEnv>=1` forces a rebuild (covers the residual window: a transitive
+     * dep edited in place, touching neither the source nor a lockfile).
      */
-    private isPluginBundleFresh;
+    static bundleFileForGjsCached(inputPath: string, opts: {
+        cacheSubdir: string;
+        label: string;
+        verbose?: boolean;
+        noCacheEnv?: string;
+        /** Extra compile-time `define`s (e.g. rewrite the entry's `import.meta.url`). */
+        define?: Record<string, string>;
+    }): Promise<string>;
     /** Application mode */
     buildApp(app?: App, opts?: {
         watch?: boolean;

package/lib/actions/build.js

@@ -75,6 +75,22 @@ async function newestLockfileMtime(cwd) {
     }
     return newest;
 }
+/**
+ * Fresh when the cached GJS bundle is newer than BOTH the source file AND the
+ * project's lockfile (the dep-change signal). Missing bundle/source → not fresh
+ * (rebuild). Shared by the plugin + config GJS-bundle caches.
+ */
+async function isBundleFresh(outfile, sourcePath, cwd) {
+    try {
+        const outStat = await stat(outfile);
+        const srcStat = await stat(sourcePath);
+        const depMtime = await newestLockfileMtime(cwd);
+        return outStat.mtimeMs >= Math.max(srcStat.mtimeMs, depMtime);
+    }
+    catch {
+        return false;
+    }
+}
 export class BuildAction {
     configData;
     constructor(configData = {}) {
@@ -283,70 +299,71 @@ export class BuildAction {
         }
     }
     /**
-     * Bundle a single plugin entry for `--app gjs` to a cached temp file and
-     * return its path. Reuses the full `--app gjs` pipeline (exports-map-aware
-     * resolution, `node:`→`@gjsify` aliases, `--globals auto`, single-file
-     * output) via a nested `BuildAction`. The nested config carries no
-     * `bundler.plugins`, so it never recurses back into plugin resolution.
-     *
-     * Cached under `node_modules/.cache/gjsify/plugins/`, keyed by the resolved
-     * source path. Invalidated when the plugin entry OR the project lockfile is
-     * newer than the cached bundle — a dep bump rewrites the lockfile but not
-     * the plugin's own entry mtime. The one window neither mtime catches (a
-     * transitive dep edited in place) is covered by the `GJSIFY_NO_PLUGIN_CACHE=1`
-     * escape hatch. Failures are rethrown with context naming the plugin.
+     * Bundle a single plugin entry for GJS via {@link bundleFileForGjsCached} and
+     * return its path. Rethrows with context naming the plugin. (GJS's native ESM
+     * loader can't resolve a plugin's `package.json#exports` subpaths for a bare
+     * specifier; Rolldown resolves them at bundle time.)
      */
     async bundlePluginForGjs(resolvedPath, pluginName, verbose) {
-        const cwd = process.cwd();
-        const cacheDir = join(cwd, 'node_modules', '.cache', 'gjsify', 'plugins');
-        const safeName = pluginName.replace(/[^a-zA-Z0-9._-]/g, '_');
-        const outfile = join(cacheDir, `${safeName}-${shortHash(resolvedPath)}.mjs`);
-        const cacheDisabled = isTruthyEnv(process.env.GJSIFY_NO_PLUGIN_CACHE);
-        if (!cacheDisabled && (await this.isPluginBundleFresh(outfile, resolvedPath, cwd))) {
-            if (verbose)
-                console.debug(`[gjsify] plugin "${pluginName}": reusing cached GJS bundle ${outfile}`);
-            return outfile;
-        }
-        if (verbose)
-            console.debug(`[gjsify] plugin "${pluginName}": bundling for GJS → ${outfile}`);
         try {
-            await mkdir(cacheDir, { recursive: true });
-            // `--globals auto` stays on so the plugin's own runtime globals
-            // (the MDX/unified toolchain touches `document`, etc.) are injected
-            // — but that injection wraps the entry with `export * from <entry>`,
-            // which drops the `default` export the plugin factory lives on.
-            // `preserveDefaultExport` makes the wrapper re-export `default` too,
-            // so the bundled plugin imports correctly as a library.
-            // shebang is intentionally left unset — the artifact is imported,
-            // not executed, so it must NOT carry a `#!` line.
-            const pluginBuild = new BuildAction({
+            return await BuildAction.bundleFileForGjsCached(resolvedPath, {
+                cacheSubdir: 'plugins',
+                label: pluginName,
                 verbose,
-                bundler: { input: resolvedPath, output: { file: outfile } },
+                noCacheEnv: 'GJSIFY_NO_PLUGIN_CACHE',
             });
-            await pluginBuild.buildApp('gjs', { preserveDefaultExport: true });
         }
         catch (err) {
             throw new Error(`gjsify config: failed to bundle plugin "${pluginName}" for GJS ` +
-                `(needed because GJS can't import packages that use exports-map subpaths directly; ` +
-                `cache dir ${cacheDir}). (${err.message})`);
+                `(needed because GJS can't import packages that use exports-map subpaths directly). ` +
+                `(${err.message})`);
         }
-        return outfile;
     }
     /**
-     * Fresh when the cached bundle is newer than BOTH the plugin entry AND the
-     * project's lockfile (the dep-change signal). Missing bundle/source → not
-     * fresh (rebuild).
+     * Bundle a single ESM entry file to a self-contained `--app gjs` module and
+     * return its path — the shared "bundle one file for GJS" helper behind both
+     * the plugin loader (exports-map subpaths GJS can't resolve for a bare
+     * specifier) and the config loader (`node:`/npm imports GJS can't resolve for
+     * an external ESM file). Reuses the full `--app gjs` pipeline (exports-map-aware
+     * resolution, `node:`→`@gjsify` aliases, `gi://` externalized, `--globals auto`,
+     * single-file output).
+     *
+     * The nested `BuildAction` is constructed with EXPLICIT bundler options, so
+     * `buildApp` uses that configData directly and never re-enters `Config.load`
+     * — no recursion, even when the input is the very `gjsify.config.js` being
+     * loaded. `preserveDefaultExport` re-exports `default` through the side-effect
+     * entry wrapper so the file imports as a library; shebang stays unset (the
+     * artifact is imported, not executed).
+     *
+     * Cached under `node_modules/.cache/gjsify/<cacheSubdir>/`, keyed by the source
+     * path. Invalidated when the source OR the project lockfile is newer than the
+     * cached bundle (a dep bump rewrites the lockfile but not the source mtime).
+     * `<noCacheEnv>=1` forces a rebuild (covers the residual window: a transitive
+     * dep edited in place, touching neither the source nor a lockfile).
      */
-    async isPluginBundleFresh(outfile, resolvedPath, cwd) {
-        try {
-            const outStat = await stat(outfile);
-            const srcStat = await stat(resolvedPath);
-            const depMtime = await newestLockfileMtime(cwd);
-            return outStat.mtimeMs >= Math.max(srcStat.mtimeMs, depMtime);
-        }
-        catch {
-            return false;
+    static async bundleFileForGjsCached(inputPath, opts) {
+        const cwd = process.cwd();
+        const cacheDir = join(cwd, 'node_modules', '.cache', 'gjsify', opts.cacheSubdir);
+        const safeName = opts.label.replace(/[^a-zA-Z0-9._-]/g, '_');
+        const outfile = join(cacheDir, `${safeName}-${shortHash(inputPath)}.mjs`);
+        const cacheDisabled = opts.noCacheEnv ? isTruthyEnv(process.env[opts.noCacheEnv]) : false;
+        if (!cacheDisabled && (await isBundleFresh(outfile, inputPath, cwd))) {
+            if (opts.verbose)
+                console.debug(`[gjsify] reusing cached GJS bundle ${outfile}`);
+            return outfile;
         }
+        if (opts.verbose)
+            console.debug(`[gjsify] bundling ${inputPath} for GJS → ${outfile}`);
+        await mkdir(cacheDir, { recursive: true });
+        await new BuildAction({
+            verbose: opts.verbose,
+            bundler: {
+                input: inputPath,
+                output: { file: outfile },
+                ...(opts.define ? { transform: { define: opts.define } } : {}),
+            },
+        }).buildApp('gjs', { preserveDefaultExport: true });
+        return outfile;
     }
     /** Application mode */
     async buildApp(app = 'gjs', opts = {}) {

package/lib/config.js

@@ -1,5 +1,93 @@
 import { APP_NAME } from './constants.js';
 import { cosmiconfig } from 'cosmiconfig';
+import { basename } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { isGjs } from '@gjsify/rolldown-plugin-gjsify/runtime';
+/**
+ * Does the failed `import()` of a config look like a MODULE-RESOLUTION failure
+ * (the config imports something GJS's ESM loader can't resolve for an external
+ * file — `node:` builtins, npm deps) rather than a syntax/eval error in the
+ * config body? Only the former is worth retrying by bundling the config.
+ */
+function isModuleResolutionFailure(err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    return /Unsupported URI scheme|\bnode:|Cannot find (module|package)|Module not found|ERR_MODULE_NOT_FOUND|Failed to resolve/i.test(msg);
+}
+/**
+ * Load a `gjsify.config.js` that imports `node:`/npm modules under the
+ * GJS-bundled CLI by BUNDLING it first (`--app gjs`: `node:`→`@gjsify`, `gi://`
+ * externalized, `--globals auto`, one self-contained ESM), then importing that.
+ * The Node-free way to run an otherwise-unimportable config under GJS — cached +
+ * de-recursed (the nested build uses explicit options, never re-enters config
+ * loading; see `BuildAction.bundleFileForGjsCached`).
+ */
+async function loadConfigViaGjsBundle(filepath, verbose) {
+    let outfile;
+    try {
+        // Dynamic import keeps the build machinery out of config.ts's eager
+        // module graph — pulled only when a config actually needs bundling.
+        const { BuildAction } = await import('./actions/build.js');
+        outfile = await BuildAction.bundleFileForGjsCached(filepath, {
+            cacheSubdir: 'config',
+            label: basename(filepath),
+            verbose,
+            noCacheEnv: 'GJSIFY_NO_CONFIG_CACHE',
+            // The bundle lives in the cache dir, but the config commonly resolves
+            // sibling files (e.g. `readFileSync(resolve(dirname(fileURLToPath(
+            // import.meta.url)), 'package.json'))`) relative to ITS OWN location.
+            // Bake the original config's URL so those reads hit the real dir.
+            define: { 'import.meta.url': JSON.stringify(pathToFileURL(filepath).href) },
+        });
+    }
+    catch (bundleErr) {
+        throw new Error(`gjsify: failed to bundle the config ${filepath} for the GJS CLI. ` +
+            `Fixes: run the build under Node (\`npx gjsify …\`), keep the config to plain values / ` +
+            `\`process.env\`, or move settings into \`package.json#gjsify\`. (${bundleErr.message})`);
+    }
+    try {
+        const mod = (await import(pathToFileURL(outfile).href));
+        return mod.default ?? mod;
+    }
+    catch (importErr) {
+        throw new Error(`gjsify: bundled the config ${filepath} for GJS but could not import the result ` +
+            `(${outfile}). (${importErr.message})`);
+    }
+}
+/**
+ * Config-file loader for the GJS-bundled CLI (`cli.gjs.mjs`).
+ *
+ * cosmiconfig's default `.js`/`.mjs`/`.cjs` loader does `await import(href)` and,
+ * on failure, falls back to a synchronous CJS `require` — which under GJS crashes
+ * deep in the bundled require-shim with an opaque `a.shift is not a function`.
+ * The real cause: a `gjsify.config.js` that imports `node:` builtins (e.g.
+ * `node:fs` to read `package.json`) can't be resolved by GJS's ESM loader for an
+ * externally-imported module (`Unsupported URI scheme for importing: node`).
+ *
+ * Fast path: plain-value configs `import()` fine under GJS — no bundling. When
+ * the import fails on module resolution, bundle the config for GJS and import
+ * THAT (so `node:`/npm imports resolve) — so node:-importing configs work
+ * Node-free, not just fail cleanly. Genuine syntax/eval errors are rethrown
+ * as-is. The Node CLI never takes this path (its `import()` resolves `node:`).
+ */
+const gjsConfigLoader = async (filepath) => {
+    try {
+        const mod = (await import(pathToFileURL(filepath).href));
+        return mod.default ?? mod;
+    }
+    catch (err) {
+        if (!isModuleResolutionFailure(err))
+            throw err;
+        return loadConfigViaGjsBundle(filepath, Boolean(process.env.GJSIFY_DEBUG));
+    }
+};
+/**
+ * On GJS, override cosmiconfig's default JS loaders (whose require fallback
+ * crashes) with {@link gjsConfigLoader}. Empty on Node, so cosmiconfig keeps its
+ * defaults there — zero behavior change off GJS.
+ */
+const gjsConfigLoaders = isGjs()
+    ? { '.js': gjsConfigLoader, '.mjs': gjsConfigLoader, '.cjs': gjsConfigLoader }
+    : {};
 /** Default cosmiconfig search places for a given module name (matches cosmiconfig defaults). */
 function defaultSearchPlaces(name) {
     return [
@@ -89,6 +177,10 @@ export class Config {
         const fileExplorer = cosmiconfig(APP_NAME, {
             ...this.loadOptions,
             searchPlaces: (this.loadOptions.searchPlaces ?? defaultSearchPlaces(APP_NAME)).filter((p) => p !== 'package.json'),
+            // GJS: swap the crashing default JS loaders for one that surfaces an
+            // actionable error instead of `a.shift is not a function`. User-provided
+            // loaders still win. No-op on Node (gjsConfigLoaders is empty there).
+            loaders: { ...gjsConfigLoaders, ...this.loadOptions.loaders },
         });
         const fileResult = (await fileExplorer.search(searchFrom));
         const merged = {};

package/package.json

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