@gjsify/rolldown-plugin-gjsify 0.4.0 → 0.4.4

package/package.json

@@ -1,72 +1,76 @@
 {
-  "name": "@gjsify/rolldown-plugin-gjsify",
-  "version": "0.4.0",
-  "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
-  "type": "module",
-  "main": "lib/index.js",
-  "module": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/index.d.ts",
-      "default": "./lib/index.js"
+    "name": "@gjsify/rolldown-plugin-gjsify",
+    "version": "0.4.4",
+    "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
+    "type": "module",
+    "main": "lib/index.js",
+    "module": "lib/index.js",
+    "types": "lib/index.d.ts",
+    "exports": {
+        ".": {
+            "types": "./lib/index.d.ts",
+            "default": "./lib/index.js"
+        },
+        "./globals": {
+            "types": "./lib/globals.d.ts",
+            "default": "./lib/globals.js"
+        },
+        "./shims/console-gjs": {
+            "default": "./lib/shims/console-gjs.js"
+        }
     },
-    "./globals": {
-      "types": "./lib/globals.d.ts",
-      "default": "./lib/globals.js"
+    "files": [
+        "lib"
+    ],
+    "scripts": {
+        "clear": "rm -rf lib tsconfig.tsbuildinfo || exit 0",
+        "check": "tsc --noEmit",
+        "build": "tsc"
     },
-    "./shims/console-gjs": {
-      "default": "./lib/shims/console-gjs.js"
-    }
-  },
-  "scripts": {
-    "clear": "rm -rf lib tsconfig.tsbuildinfo || exit 0",
-    "check": "tsc --noEmit",
-    "build": "tsc"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/gjsify/gjsify.git"
-  },
-  "bugs": {
-    "url": "https://github.com/gjsify/gjsify/issues"
-  },
-  "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/infra/rolldown-plugin-gjsify#readme",
-  "keywords": [
-    "gjs",
-    "rolldown",
-    "rollup",
-    "vite",
-    "plugin",
-    "gjsify"
-  ],
-  "license": "MIT",
-  "dependencies": {
-    "@gjsify/resolve-npm": "^0.4.0",
-    "@gjsify/rolldown-plugin-deepkit": "^0.4.0",
-    "@gjsify/rolldown-plugin-pnp": "^0.4.0",
-    "@gjsify/vite-plugin-blueprint": "^0.4.0",
-    "@rollup/pluginutils": "^5.3.0",
-    "acorn": "^8.16.0",
-    "acorn-walk": "^8.3.5",
-    "fast-glob": "^3.3.3",
-    "lightningcss": "^1.32.0"
-  },
-  "peerDependencies": {
-    "@gjsify/lightningcss-native": "^0.4.0",
-    "rolldown": "^1.0.0-rc.18"
-  },
-  "peerDependenciesMeta": {
-    "@gjsify/lightningcss-native": {
-      "optional": true
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/gjsify/gjsify.git"
+    },
+    "bugs": {
+        "url": "https://github.com/gjsify/gjsify/issues"
+    },
+    "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/infra/rolldown-plugin-gjsify#readme",
+    "keywords": [
+        "gjs",
+        "rolldown",
+        "rollup",
+        "vite",
+        "plugin",
+        "gjsify"
+    ],
+    "license": "MIT",
+    "dependencies": {
+        "@gjsify/console": "^0.4.4",
+        "@gjsify/resolve-npm": "^0.4.4",
+        "@gjsify/rolldown-plugin-deepkit": "^0.4.4",
+        "@gjsify/rolldown-plugin-pnp": "^0.4.4",
+        "@gjsify/vite-plugin-blueprint": "^0.4.4",
+        "@rollup/pluginutils": "^5.3.0",
+        "acorn": "^8.16.0",
+        "acorn-walk": "^8.3.5",
+        "fast-glob": "^3.3.3",
+        "lightningcss": "^1.32.0"
+    },
+    "peerDependencies": {
+        "@gjsify/lightningcss-native": "^0.4.4",
+        "rolldown": "^1.0.0-rc.18"
+    },
+    "peerDependenciesMeta": {
+        "@gjsify/lightningcss-native": {
+            "optional": true
+        },
+        "rolldown": {
+            "optional": true
+        }
     },
-    "rolldown": {
-      "optional": true
+    "devDependencies": {
+        "@types/node": "^25.6.2",
+        "rolldown": "^1.0.0",
+        "typescript": "^6.0.3"
     }
-  },
-  "devDependencies": {
-    "@types/node": "^25.6.2",
-    "rolldown": "^1.0.0",
-    "typescript": "^6.0.3"
-  }
-}
+}

package/src/app/browser.ts

@@ -1,101 +0,0 @@
-// `--app browser` Rolldown configuration factory.
-//
-// Browser builds redirect `@girs/*` and `gi://*` to an empty virtual module
-// (they appear transitively via `@gjsify/unit` and similar packages with
-// GJS-specific code paths). Standard Node.js → browser polyfill aliases
-// for `process` and `assert` keep `@gjsify/unit`'s top-level imports
-// resolvable in a browser bundle.
-
-import { aliasPlugin } from '../plugins/alias.js';
-import type { RolldownOptions, RolldownPluginOption } from 'rolldown';
-
-import { deepkitPlugin } from '@gjsify/rolldown-plugin-deepkit';
-import blueprintPlugin from '@gjsify/vite-plugin-blueprint';
-
-import type { PluginOptions } from '../types/plugin-options.js';
-import { globToEntryPoints } from '../utils/entry-points.js';
-import { gjsImportsEmptyPlugin } from '../plugins/gjs-imports-empty.js';
-import { cssAsStringPlugin } from '../plugins/css-as-string.js';
-
-export interface BrowserBuildConfig {
-    options: RolldownOptions;
-    plugins: RolldownPluginOption[];
-}
-
-export interface BrowserFactoryInput {
-    input?: RolldownOptions['input'];
-    output: { file?: string; dir?: string };
-    userExternal?: string[];
-    userAliases?: Record<string, string>;
-    pluginOptions: PluginOptions;
-}
-
-export const setupForBrowser = async (input: BrowserFactoryInput): Promise<BrowserBuildConfig> => {
-    const userExternal = input.userExternal ?? [];
-    const external = [...userExternal];
-
-    const exclude = input.pluginOptions.exclude ?? [];
-    const entryPoints = await globToEntryPoints(input.input, exclude);
-
-    // `@gjsify/unit` has `await import('process')` inside a try-catch that
-    // is unreachable in browser (typeof document check comes first), but
-    // Rolldown still resolves it statically. Map to `@gjsify/empty` so the
-    // build succeeds. `assert` → `@gjsify/assert` because `@gjsify/unit`
-    // imports `node:assert` at the top level.
-    const browserPolyfillAliases: Record<string, string> = {
-        process: '@gjsify/empty',
-        'node:process': '@gjsify/empty',
-        assert: '@gjsify/assert',
-        'node:assert': '@gjsify/assert',
-    };
-
-    const aliasMap: Record<string, string> = {
-        ...browserPolyfillAliases,
-        ...(input.pluginOptions.aliases ?? {}),
-        ...(input.userAliases ?? {}),
-    };
-
-    const options: RolldownOptions = {
-        input: entryPoints,
-        platform: 'browser',
-        external,
-        resolve: {
-            mainFields: ['browser', 'module', 'main'],
-            conditionNames: ['import', 'browser'],
-        },
-        transform: {
-            target: 'esnext',
-            define: {
-                global: 'globalThis',
-                window: 'globalThis',
-            },
-        },
-        output: {
-            ...input.output,
-            format: 'esm',
-            sourcemap: false,
-            // Single-bundle output. `codeSplitting: false` replaces the
-            // deprecated `inlineDynamicImports: true`.
-            codeSplitting: false,
-        },
-        treeshake: true,
-    };
-
-    const plugins: RolldownPluginOption[] = [
-        gjsImportsEmptyPlugin(),
-        aliasPlugin({ entries: flattenAliases(aliasMap) }),
-        blueprintPlugin() as RolldownPluginOption,
-        deepkitPlugin({ reflection: input.pluginOptions.reflection }),
-        cssAsStringPlugin(),
-    ];
-
-    return { options, plugins };
-};
-
-function flattenAliases(map: Record<string, string>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [from, to] of Object.entries(map)) {
-        if (to) out[from] = to;
-    }
-    return out;
-}

package/src/app/gjs.ts

@@ -1,334 +0,0 @@
-// `--app gjs` Rolldown configuration factory.
-//
-// Mirrors the esbuild predecessor's `setupForGjs` exactly in terms of the
-// effective build behaviour: same externals, same alias map, same target
-// (firefox140 for JS, firefox60 for CSS), same console-shim injection,
-// same process-stub banner, same `random-access-file` fs-backed-fallback.
-//
-// Returns a partial `RolldownOptions` template plus the plugin array the
-// caller should compose with their user-supplied options. Library mode is
-// handled separately by `setupLib`.
-
-import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'node:path';
-import type { RolldownOptions, RolldownPluginOption } from 'rolldown';
-import { aliasPlugin } from '../plugins/alias.js';
-
-import { deepkitPlugin } from '@gjsify/rolldown-plugin-deepkit';
-import blueprintPlugin from '@gjsify/vite-plugin-blueprint';
-
-import type { PluginOptions } from '../types/plugin-options.js';
-import { getAliasesForGjs } from '../utils/alias.js';
-import { globToEntryPoints } from '../utils/entry-points.js';
-import {
-    nodeModulesPathRewritePlugin,
-    getBundleDirFromOutput,
-} from '../plugins/rewrite-node-modules-paths.js';
-import { processStubPlugin } from '../plugins/process-stub.js';
-import { cssAsStringPlugin } from '../plugins/css-as-string.js';
-import { shebangPlugin, resolveShebangLine, inputShebangStripPlugin } from '../plugins/shebang.js';
-
-const _shimDir = dirname(fileURLToPath(import.meta.url));
-
-function resolveConsoleShim(): string {
-    // Preferred: relative to this module's directory. Works under the
-    // normal Node consumer flow where `_shimDir` = `<pkg>/lib/app/`.
-    const relative = resolve(_shimDir, '../shims/console-gjs.js');
-    let fs: typeof import('node:fs') | null = null;
-    try {
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        fs = require('node:fs') as typeof import('node:fs');
-    } catch { return relative; }
-    if (fs.existsSync(relative)) return relative;
-    // Fallback: when the orchestrator is bundled into a single .mjs
-    // (GJS-CLI self-host loop) `_shimDir` collapses to the bundle's
-    // own directory and the relative lookup misses. createRequire's
-    // resolver is `exports`-map-aware (Phase C), so the published
-    // subpath export `./shims/console-gjs` works under both Node and
-    // GJS without further walking.
-    try {
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        const Module = require('node:module') as typeof import('node:module');
-        const require_ = Module.createRequire(import.meta.url);
-        return require_.resolve('@gjsify/rolldown-plugin-gjsify/shims/console-gjs');
-    } catch {
-        return relative;
-    }
-}
-
-/** Resolved Rolldown configuration template + plugins for `--app gjs`. */
-export interface GjsBuildConfig {
-    options: RolldownOptions;
-    plugins: RolldownPluginOption[];
-}
-
-export interface GjsFactoryInput {
-    /** User entry points after CLI / config merging. */
-    input?: RolldownOptions['input'];
-    /** Output `file` or `dir` so `import.meta.url` rewriter knows the bundle path. */
-    output: { file?: string; dir?: string };
-    /** Caller-supplied externals (`gjsify build --external`). */
-    userExternal?: string[];
-    /** User-supplied banner string (may contain a leading `#!shebang`). */
-    userBanner?: string;
-    /** User-supplied resolve.alias overrides. */
-    userAliases?: Record<string, string>;
-    /**
-     * Shebang to prepend to the output bundle.
-     *   `true`  → default `#!/usr/bin/env -S gjs -m`
-     *   `false` → no shebang
-     *   `"…"`   → custom line, supports `${env:NAME[:-default]}` placeholders
-     */
-    shebang?: boolean | string;
-    /** Plugin options forwarded to sub-plugins (deepkit, css, …). */
-    pluginOptions: PluginOptions;
-}
-
-export const setupForGjs = async (input: GjsFactoryInput): Promise<GjsBuildConfig> => {
-    const userExternal = input.userExternal ?? [];
-    // Rolldown's `external` array does not support glob patterns the way
-    // esbuild's did (`gi://*`). We use a function predicate so any
-    // `gi://Foo?version=…` URI matches by prefix and the GJS-built-in
-    // string specifiers stay externalised by name.
-    const exactExternal = ['cairo', 'gettext', 'system', ...userExternal];
-    const external = (id: string): boolean => {
-        if (id.startsWith('gi://')) return true;
-        if (exactExternal.includes(id)) return true;
-        return false;
-    };
-    const format = input.pluginOptions.format ?? 'esm';
-
-    const exclude = input.pluginOptions.exclude ?? [];
-    const entryPoints = await globToEntryPoints(input.input, exclude);
-
-    // unicorn-magic gates its full API behind the "node" conditional
-    // exports. We deliberately omit `node` from conditionNames (some
-    // packages ship genuinely Node-only code there — see comment
-    // around `conditionNames` below). Route the package to our
-    // bundled shim so the API is reachable under --app gjs without
-    // turning on the node condition globally.
-    const unicornMagicShim = resolve(_shimDir, '../shims/unicorn-magic.js');
-
-    const aliasMap = {
-        ...getAliasesForGjs({ external }),
-        'unicorn-magic': unicornMagicShim,
-        ...(input.pluginOptions.aliases ?? {}),
-        ...(input.userAliases ?? {}),
-    };
-
-    // The console shim replaces all `console` references with print()/printerr()-
-    // based implementations that bypass GLib.log_structured() — no prefix,
-    // ANSI codes work. Disabled via `pluginOptions.consoleShim === false`.
-    //
-    // Path resolution: `resolve(_shimDir, '../shims/...')` works in normal
-    // Node consumption (_shimDir = `<pkg>/lib/app/`). When the CLI is
-    // bundled into a single .mjs (e.g. the GJS-CLI self-host loop),
-    // `import.meta.url` collapses to the bundle's path and the relative
-    // resolution lands at a non-existent location. Walk up via
-    // createRequire's node_modules-aware resolver as a fallback.
-    const consoleShimEnabled = input.pluginOptions.consoleShim !== false;
-    const consoleShimPath = consoleShimEnabled
-        ? resolveConsoleShim()
-        : null;
-
-    // The auto-globals inject stub (when present) is side-effect-imported
-    // via a virtual entry — its register modules write to globalThis, so
-    // the import chain matters but no name binding does. We can't use
-    // Rolldown's `inject` for this because the auto-globals invariant
-    // forbids source-AST rewrites for global identifiers (false positives
-    // from isomorphic guards / bracket access — see AGENTS.md).
-    const sideEffectImports: string[] = [];
-    if (input.pluginOptions.autoGlobalsInject) sideEffectImports.push(input.pluginOptions.autoGlobalsInject);
-
-    const virtualEntries = wrapInputWithSideEffects(entryPoints, sideEffectImports);
-    const finalInput = virtualEntries.input;
-
-    const options: RolldownOptions = {
-        input: finalInput,
-        platform: 'neutral',
-        external,
-        // 'browser' field is needed so packages like create-hash, create-hmac,
-        // randombytes use their pure-JS browser entry instead of index.js
-        // (which does require('crypto') and causes circular dependencies via
-        // the crypto → @gjsify/crypto alias).
-        resolve: {
-            mainFields: format === 'esm' ? ['browser', 'module', 'main'] : ['browser', 'main', 'module'],
-            // ESM: omit 'require' — packages listing 'require' before 'import'
-            // would silently route through their CJS entry.
-            //
-            // We deliberately do NOT add `'node'` here. Per Node's exports-map
-            // spec the resolver iterates keys in DECLARATION ORDER and picks
-            // the first one whose name is in `conditionNames` — the order of
-            // conditionNames itself is irrelevant. Packages like
-            // `cross-fetch-ponyfill` declare `"node"` first in their exports
-            // map and ship a Node-only entry that imports `blobFrom`/
-            // `fileFrom` (from native `node:fetch`). With `node` enabled,
-            // the resolver picks that branch over `browser` and the bundle
-            // breaks at link time. Packages that genuinely need their `node`
-            // export under GJS (rare — only one known case so far,
-            // `unicorn-magic`'s `traversePathUp`) are handled with explicit
-            // resolve aliases instead.
-            conditionNames: format === 'esm' ? ['browser', 'import'] : ['browser', 'require', 'import'],
-        },
-        transform: {
-            // Compile target: GJS 1.86 / SpiderMonkey 140 ≈ firefox140.
-            target: 'firefox140',
-            define: {
-                global: 'globalThis',
-                window: 'globalThis',
-                'process.env.READABLE_STREAM': '"disable"',
-            },
-            // Console shim: rewrite bare `console` references to a named
-            // import from our shim module. We use Rolldown's `inject`
-            // (Oxc-driven, lives under `transform`) because:
-            //   1. `globalThis.console` is non-configurable on SpiderMonkey
-            //      128 so a register-style global write throws.
-            //   2. We're replacing console unconditionally — there's no
-            //      tree-shake-aware detection concern that motivated the
-            //      auto-globals invariant.
-            ...(consoleShimPath ? { inject: { console: [consoleShimPath, 'console'] } } : {}),
-        },
-        output: {
-            ...input.output,
-            format,
-            sourcemap: false,
-            // App builds emit a single bundle file. Disable code-splitting
-            // so dynamic imports get inlined and the entire program lands
-            // in one chunk that matches `gjsify build --outfile foo.js`.
-            // (`codeSplitting: false` replaces the deprecated
-            // `inlineDynamicImports: true` in Rolldown ≥ 1.0-rc.18.)
-            codeSplitting: false,
-        },
-        treeshake: true,
-    };
-
-    const bundleDir = getBundleDirFromOutput(input.output);
-
-    const plugins: RolldownPluginOption[] = [
-        // Virtual-entry plugin runs FIRST so its resolveId/load match the
-        // synthetic input ids that `wrapInputWithSideEffects` produces.
-        ...(virtualEntries.plugin ? [virtualEntries.plugin] : []),
-        // Strip leading #! from any input module BEFORE bundling — otherwise
-        // a shebang in e.g. the CLI's own entry file ends up embedded
-        // mid-chunk after our process-stub banner, and acorn (auto-globals
-        // detector) rejects the `#` byte. Final-output shebang is composed
-        // by shebangPlugin's renderChunk hook.
-        inputShebangStripPlugin(),
-        // random-access-file's 'browser' field maps to a throwing stub; force
-        // the fs-backed Node entry. Implemented via the gjsify alias plugin
-        // as a direct entry-table override.
-        aliasPlugin({
-            entries: {
-                'random-access-file': 'random-access-file/index.js',
-                ...flattenAliases(aliasMap),
-            },
-        }),
-        blueprintPlugin() as RolldownPluginOption,
-        deepkitPlugin({ reflection: input.pluginOptions.reflection }),
-        // GTK4's CSS engine is much older than browser engines — its
-        // parser predates nesting + many modern selectors. Targeting
-        // `firefox: 60 << 16` makes lightningcss flatten the source
-        // into the subset GTK4 understands.
-        cssAsStringPlugin({ targets: { firefox: 60 << 16 } }),
-        nodeModulesPathRewritePlugin({ bundleDir }),
-        processStubPlugin({ userBanner: input.userBanner }),
-        // resolveShebangLine returns null when disabled (false/undefined) and
-        // the resolved line otherwise — also handles `${env:…}` expansion.
-        (() => {
-            const line = resolveShebangLine(input.shebang);
-            return shebangPlugin({ enabled: line !== null, line: line ?? undefined });
-        })(),
-    ];
-
-    return { options, plugins };
-};
-
-interface VirtualEntriesResult {
-    input: RolldownOptions['input'];
-    plugin: RolldownPluginOption | null;
-}
-
-/**
- * If there are side-effect imports to land alongside the user's entry,
- * wrap each entry in a virtual module that imports them first then
- * re-exports the entry. Returns the rewritten `input` plus the resolveId/load
- * plugin that resolves the virtual ids.
- *
- * Single-input case: `'src/index.ts'` → `'\0gjsify-entry:src/index.ts'`.
- * Array-input case: each element gets the same wrapper id.
- * Record-input case: values get wrapped, keys preserved.
- *
- * `\0`-prefixed ids are Rollup's convention for synthetic modules — Rolldown
- * recognises and treats them as not-from-disk, skipping the default loader.
- */
-function wrapInputWithSideEffects(
-    input: RolldownOptions['input'],
-    sideEffects: string[],
-): VirtualEntriesResult {
-    if (sideEffects.length === 0 || input === undefined) {
-        return { input, plugin: null };
-    }
-
-    const userEntries = new Map<string, string>(); // virtualId → realPath
-    const PREFIX = '\0gjsify-entry:';
-
-    function wrap(realPath: string): string {
-        const id = PREFIX + realPath;
-        userEntries.set(id, realPath);
-        return id;
-    }
-
-    let wrappedInput: RolldownOptions['input'];
-    if (typeof input === 'string') {
-        wrappedInput = wrap(input);
-    } else if (Array.isArray(input)) {
-        wrappedInput = input.map(wrap);
-    } else {
-        const out: Record<string, string> = {};
-        for (const [name, path] of Object.entries(input)) {
-            out[name] = wrap(path);
-        }
-        wrappedInput = out;
-    }
-
-    const sideEffectImports = sideEffects
-        .map((p) => `import ${JSON.stringify(p)};`)
-        .join('\n');
-
-    const plugin: RolldownPluginOption = {
-        name: 'gjsify-virtual-entry',
-        async resolveId(source, importer) {
-            if (source.startsWith(PREFIX)) return source;
-            return null;
-        },
-        async load(id) {
-            if (!id.startsWith(PREFIX)) return null;
-            const realPath = userEntries.get(id);
-            if (!realPath) return null;
-            // Resolve the user-provided entry path through the full
-            // resolver chain so the re-export targets a real on-disk
-            // module — otherwise Rolldown treats `src/foo.ts` as a bare
-            // specifier and emits it as an external import.
-            const resolved = await this.resolve(realPath, undefined, { skipSelf: true });
-            const target = resolved?.id ?? realPath;
-            return {
-                code: `${sideEffectImports}\nexport * from ${JSON.stringify(target)};\n`,
-                moduleSideEffects: true,
-            };
-        },
-    };
-
-    return { input: wrappedInput, plugin };
-}
-
-/**
- * Flatten the legacy `Record<string, string>` alias map into the
- * `@rollup/plugin-alias` `entries` array shape, dropping empty values.
- */
-function flattenAliases(map: Record<string, string>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [from, to] of Object.entries(map)) {
-        if (to) out[from] = to;
-    }
-    return out;
-}

package/src/app/index.ts

@@ -1,6 +0,0 @@
-export { setupForGjs } from './gjs.js';
-export type { GjsBuildConfig, GjsFactoryInput } from './gjs.js';
-export { setupForNode } from './node.js';
-export type { NodeBuildConfig, NodeFactoryInput } from './node.js';
-export { setupForBrowser } from './browser.js';
-export type { BrowserBuildConfig, BrowserFactoryInput } from './browser.js';