@gjsify/rolldown-native 0.52.0 → 0.54.0

package/README.md

@@ -71,32 +71,26 @@ the lock — regenerate it in the same commit as the submodule pin and the npm `
 | `linux-x64` | ✅ `.so` + `.gir` + `.typelib` | native runner |
 | `linux-arm64` | ✅ | native runner |
 | `linux-ppc64`, `linux-s390x`, `linux-riscv64` | ❌ | not built — the rolldown crate graph is too slow under QEMU |
-| macOS (`darwin-arm64`) | ⏳ source-ready, no prebuild yet | pending a green `prebuilds.yml` macOS leg |
-| macOS (`darwin-x64`) | ❌ | — |
+| macOS (`darwin-arm64`) | ✅ `.dylib` + `.gir` + `.typelib` | native runner |
+| macOS (`darwin-x64`) | ✅ | native runner |
 | Windows | ❌ | — no Vala/GI bridge in this repo targets Windows |
 
 All prebuilds are produced by [`.github/workflows/prebuilds.yml`](../../../.github/workflows/prebuilds.yml)
 and committed back to the repository.
 
-### macOS status
-
-The **Rust-level blocker is gone.** The core used to wake the GLib main loop through three
-`libc::eventfd(2)` descriptors — a Linux syscall the `libc` crate does not even expose on
-Apple targets, so `cargo build` could not compile at all there. The wakeup channel is now a
-plain anonymous pipe (`src/rust/src/wakeup.rs`), one portable implementation used on every
-platform, so the crate cross-compiles: `cargo check --target aarch64-apple-darwin` is green.
-`meson.build` was already macOS-ready (`.dylib` naming, `@loader_path` rpath).
-
-What is still missing is a **native macOS build**: the `.dylib` + `.gir` + `.typelib` have to
-be produced and load-tested by the `prebuilds.yml` darwin leg (Homebrew `vala`, `gobject-
-introspection`, `json-glib`, `gjs`) before `darwin-arm64` is added to `package.json`'s
-`gjsify.platforms` and a prebuild is committed. Until that leg is green, treat macOS as
-unproven — a cross-`check` does not exercise linking, the GIR/typelib step, or `gi://` load.
-
-Because `@gjsify/rolldown-native` is the only bundler engine available to `gjsify build`
-under GJS, it is the last package gating a Node-free gjsify toolchain on macOS —
-`@gjsify/lightningcss-native` and `@gjsify/oxfmt-native` already ship `darwin-arm64`
-prebuilds.
+### Runtime system dependency: json-glib
+
+The prebuild links **json-glib** (`BundlerSession` peeks at the hook name and request id of each
+Rust-emitted JSON envelope before routing it), and it is a SYSTEM library on every target, like
+GLib itself: `libjson-glib-1.0.so.0` on Linux, `@rpath/libjson-glib-1.0.0.dylib` on macOS, where
+the rpath list ends in the Homebrew prefix ([docs/prebuilds.md](../../../docs/prebuilds.md)). Homebrew's
+`gjs` formula does not pull it in, so a Mac needs `brew install json-glib`; `gjsify system-check`
+lists it with the install command for the host.
+
+Without it the typelib still resolves and the library fails to open. GJS reports that at the first
+class access as `Unsupported type void, deriving from fundamental void`, so `gjsify build` probes
+the library before choosing the engine (`probeNativeLibrary()` in `@gjsify/utils/core`) and prints
+the file that failed, the dependency the loader named, and the install command.
 
 ### Wakeup channel (implementation note)
 

package/lib/esm/plugins.js

@@ -1,2 +1,2 @@
 import"./_virtual/_rolldown/runtime.js";import{loadNativeRolldown as e}from"./index.js";function getGLib(){let e=globalThis.imports?.gi;if(!e||!e.GLib)throw Error(`@gjsify/rolldown-native: GLib not available (not running under GJS?)`);return e.GLib}const enc=e=>getGLib().Bytes.new(new TextEncoder().encode(e)),dec=e=>new TextDecoder().decode(e.get_data()??new Uint8Array),t=[`load`,`transform`,`resolveId`,`renderChunk`,`banner`,`footer`,`intro`,`outro`,`buildStart`,`buildEnd`,`generateBundle`,`writeBundle`,`closeBundle`];function pluginMeta(e){let n=t.filter(t=>typeof e[t]==`function`),r={name:e.name,hooks:n};return e.idFilter&&(r.idFilter=e.idFilter),r}const n=new Set;function isResolveMiss(e){return e.startsWith(`NotFound(`)}var HookErrorLog=class{entries=[];record(e,t){this.entries.push({...e,message:t})}format(){if(this.entries.length===0)return``;let e=this.entries.slice(0,8),t=e.map(({plugin:e,hook:t,message:n})=>`  [plugin ${e}] ${t}: ${n}`),n=this.entries.length-e.length;return n>0&&t.push(`  … and ${n} more`),`${this.entries.length===1?`1 plugin hook failed during this build:`:`${this.entries.length} plugin hooks failed during this build:`}\n${t.join(`
-`)}`}};function bundleWithPlugins(t,r){let i=e();if(!i)return Promise.reject(Error(`@gjsify/rolldown-native: prebuild not available`));let a=new i.BundlerSession;n.add(a);let o=new HookErrorLog,s=new Map;a.connect(`context_response`,(e,t,n)=>{let r=s.get(t);if(!r)return;s.delete(t);let i;try{i=JSON.parse(dec(n))}catch(e){r.reject(e instanceof Error?e:Error(String(e)));return}i.error&&isResolveMiss(i.error)?r.resolve(null):i.error?r.reject(Error(i.error)):i.id?r.resolve({id:i.id,external:i.external??!1}):r.resolve(null)});function makeContext(e){return{resolve(t,n,r){return new Promise((i,o)=>{let c=a.context_resolve(e,enc(JSON.stringify({specifier:t,importer:n,skipSelf:r?.skipSelf??!0,isEntry:r?.isEntry??!1})));if(c===0){o(Error(`@gjsify/rolldown-native: ctx.resolve('${t}') failed — parent req_id ${e} unknown`));return}s.set(c,{resolve:i,reject:o})})},warn(e){a.context_warn(enc(e))},error(e){throw Error(e)}}}a.connect(`hook_requested`,(e,t,n,r,i)=>{dispatchHook(t,n,r,i)});async function dispatchHook(e,t,n,i){let o={plugin:r[n]?.name??`#${n}`,hook:e},s;try{s=JSON.parse(dec(i))}catch(e){respondError(t,e,o);return}let c=r[n];if(!c){respondError(t,Error(`@gjsify/rolldown-native: unknown plugin index ${n}`),o);return}let l=makeContext(t);try{if(e===`transform`&&c.transform){let e=s,n=a.take_request_payload(t);if(n===null)throw Error(`@gjsify/rolldown-native: transform request for ${e.id} missing payload bytes`);let r=dec(n);respondTransform(t,await c.transform.call(l,r,e.id,e.moduleType),o);return}respondOk(t,await runHook(c,e,s,l))}catch(e){respondError(t,e,o)}}function respondOk(e,t){let n=t==null?{kind:`skip`}:{kind:`ok`,value:t};a.respond(e,enc(JSON.stringify(n)))}function respondTransform(e,t,n){if(t==null){a.respond(e,enc(JSON.stringify({kind:`skip`})));return}let r,i;if(typeof t==`string`)r=t;else if(typeof t==`object`){let e=t;r=e.code,i=e.moduleType}if(typeof r!=`string`){a.respond(e,enc(JSON.stringify({kind:`skip`})));return}let o=getGLib().Bytes.new(new TextEncoder().encode(r));if(!a.set_response_payload(e,o)){respondError(e,Error(`@gjsify/rolldown-native: failed to stash transform response payload for reqId ${e}`),n);return}a.respond(e,enc(JSON.stringify({kind:`ok`,value:i===void 0?{hasCodeBytes:!0}:{hasCodeBytes:!0,moduleType:i}})))}function respondError(e,t,n){let r=t instanceof Error?t:Error(String(t));o.record(n,r.message),a.respond(e,enc(JSON.stringify({kind:`error`,message:r.message,stack:r.stack})))}let closeSession=()=>{n.delete(a);let e=a;try{e.close?.()}catch{}};return new Promise((e,n)=>{a.connect(`completed`,(t,r)=>{try{e(JSON.parse(dec(r)))}catch(e){n(e instanceof Error?e:Error(String(e)))}}),a.connect(`error_occurred`,(e,t)=>{let r=o.format();n(Error(r?`${t}\n${r}`:t))});try{a.start(enc(JSON.stringify({options:t,plugins:r.map(pluginMeta)})))}catch(e){n(e instanceof Error?e:Error(String(e)))}}).finally(closeSession)}async function runHook(e,t,n,r){switch(t){case`load`:return e.load?normalizeLoadResult(await e.load.call(r,n.id)):null;case`transform`:return null;case`resolveId`:{if(!e.resolveId)return null;let t=n;return normalizeResolveIdResult(await e.resolveId.call(r,t.specifier,t.importer,{isEntry:t.isEntry}))}case`renderChunk`:{if(!e.renderChunk)return null;let t=n;return normalizeRenderChunkResult(await e.renderChunk.call(r,t.code,{fileName:t.fileName,name:t.name,isEntry:t.isEntry}))}case`banner`:case`footer`:case`intro`:case`outro`:{let i=e[t];if(!i)return null;let a=n;return normalizeAddonResult(await i.call(r,{fileName:a.fileName,name:a.name,isEntry:a.isEntry}))}case`buildStart`:case`buildEnd`:case`generateBundle`:case`writeBundle`:case`closeBundle`:{let n=e[t];return n&&await n.call(r),null}default:throw Error(`@gjsify/rolldown-native: unknown hook '${t}'`)}}function normalizeLoadResult(e){return e==null?null:typeof e==`string`?{code:e}:{code:e.code,moduleType:e.moduleType}}function normalizeResolveIdResult(e){return e==null?null:typeof e==`string`?{id:e}:{id:e.id,external:e.external}}function normalizeRenderChunkResult(e){return e==null?null:typeof e==`string`?{code:e}:{code:e.code}}function normalizeAddonResult(e){return e==null?null:typeof e==`string`?e:e.text}export{bundleWithPlugins,isResolveMiss};
+`)}`}};function bundleWithPlugins(t,r){let i=e();if(!i)return Promise.reject(Error(`@gjsify/rolldown-native: prebuild not available`));let a=new i.BundlerSession;n.add(a);let o=new HookErrorLog,s=new Set,c=new Map;a.connect(`context_response`,(e,t,n)=>{let r=c.get(t);if(!r)return;c.delete(t);let i;try{i=JSON.parse(dec(n))}catch(e){r.reject(e instanceof Error?e:Error(String(e)));return}i.error&&isResolveMiss(i.error)?r.resolve(null):i.error?r.reject(Error(i.error)):i.id?r.resolve({id:i.id,external:i.external??!1}):r.resolve(null)});function makeContext(e){return{addWatchFile(e){s.add(e)},resolve(t,n,r){return new Promise((i,o)=>{let s=a.context_resolve(e,enc(JSON.stringify({specifier:t,importer:n,skipSelf:r?.skipSelf??!0,isEntry:r?.isEntry??!1})));if(s===0){o(Error(`@gjsify/rolldown-native: ctx.resolve('${t}') failed — parent req_id ${e} unknown`));return}c.set(s,{resolve:i,reject:o})})},warn(e){a.context_warn(enc(e))},error(e){throw Error(e)}}}a.connect(`hook_requested`,(e,t,n,r,i)=>{dispatchHook(t,n,r,i)});async function dispatchHook(e,t,n,i){let o={plugin:r[n]?.name??`#${n}`,hook:e},s;try{s=JSON.parse(dec(i))}catch(e){respondError(t,e,o);return}let c=r[n];if(!c){respondError(t,Error(`@gjsify/rolldown-native: unknown plugin index ${n}`),o);return}let l=makeContext(t);try{if(e===`transform`&&c.transform){let e=s,n=a.take_request_payload(t);if(n===null)throw Error(`@gjsify/rolldown-native: transform request for ${e.id} missing payload bytes`);let r=dec(n);respondTransform(t,await c.transform.call(l,r,e.id,e.moduleType),o);return}respondOk(t,await runHook(c,e,s,l))}catch(e){respondError(t,e,o)}}function respondOk(e,t){let n=t==null?{kind:`skip`}:{kind:`ok`,value:t};a.respond(e,enc(JSON.stringify(n)))}function respondTransform(e,t,n){if(t==null){a.respond(e,enc(JSON.stringify({kind:`skip`})));return}let r,i;if(typeof t==`string`)r=t;else if(typeof t==`object`){let e=t;r=e.code,i=e.moduleType}if(typeof r!=`string`){a.respond(e,enc(JSON.stringify({kind:`skip`})));return}let o=getGLib().Bytes.new(new TextEncoder().encode(r));if(!a.set_response_payload(e,o)){respondError(e,Error(`@gjsify/rolldown-native: failed to stash transform response payload for reqId ${e}`),n);return}a.respond(e,enc(JSON.stringify({kind:`ok`,value:i===void 0?{hasCodeBytes:!0}:{hasCodeBytes:!0,moduleType:i}})))}function respondError(e,t,n){let r=t instanceof Error?t:Error(String(t));o.record(n,r.message),a.respond(e,enc(JSON.stringify({kind:`error`,message:r.message,stack:r.stack})))}let closeSession=()=>{n.delete(a);let e=a;try{e.close?.()}catch{}};return new Promise((e,n)=>{a.connect(`completed`,(t,r)=>{try{e({...JSON.parse(dec(r)),watchedFiles:[...s]})}catch(e){n(e instanceof Error?e:Error(String(e)))}}),a.connect(`error_occurred`,(e,t)=>{let r=o.format();n(Error(r?`${t}\n${r}`:t))});try{a.start(enc(JSON.stringify({options:t,plugins:r.map(pluginMeta)})))}catch(e){n(e instanceof Error?e:Error(String(e)))}}).finally(closeSession)}async function runHook(e,t,n,r){switch(t){case`load`:return e.load?normalizeLoadResult(await e.load.call(r,n.id)):null;case`transform`:return null;case`resolveId`:{if(!e.resolveId)return null;let t=n;return normalizeResolveIdResult(await e.resolveId.call(r,t.specifier,t.importer,{isEntry:t.isEntry}))}case`renderChunk`:{if(!e.renderChunk)return null;let t=n;return normalizeRenderChunkResult(await e.renderChunk.call(r,t.code,{fileName:t.fileName,name:t.name,isEntry:t.isEntry}))}case`banner`:case`footer`:case`intro`:case`outro`:{let i=e[t];if(!i)return null;let a=n;return normalizeAddonResult(await i.call(r,{fileName:a.fileName,name:a.name,isEntry:a.isEntry}))}case`buildStart`:case`buildEnd`:case`generateBundle`:case`writeBundle`:case`closeBundle`:{let n=e[t];return n&&await n.call(r),null}default:throw Error(`@gjsify/rolldown-native: unknown hook '${t}'`)}}function normalizeLoadResult(e){return e==null?null:typeof e==`string`?{code:e}:{code:e.code,moduleType:e.moduleType}}function normalizeResolveIdResult(e){return e==null?null:typeof e==`string`?{id:e}:{id:e.id,external:e.external}}function normalizeRenderChunkResult(e){return e==null?null:typeof e==`string`?{code:e}:{code:e.code}}function normalizeAddonResult(e){return e==null?null:typeof e==`string`?e:e.text}export{bundleWithPlugins,isResolveMiss};

package/lib/types/index.d.ts

@@ -49,6 +49,12 @@ export type BundleOutputItem = BundleChunk | BundleAsset;
 export interface BundleResult {
     warnings: string[];
     output: BundleOutputItem[];
+    /**
+     * Files a plugin declared with `this.addWatchFile` — npm rolldown's
+     * `RolldownBuild.watchFiles`, collected here because this engine has no
+     * watcher to feed. Absent on a `bundle()` result that declares none.
+     */
+    watchedFiles?: string[];
 }
 export { bundleWithPlugins, isResolveMiss, type NativePlugin, type NativePluginContext, type PluginIdFilter, type LoadHookHandler, type TransformHookHandler, type ResolveIdHookHandler, type RenderChunkHookHandler, type AddonHookHandler, type LifecycleHookHandler, } from './plugins.js';
 /**

package/lib/types/plugins.d.ts

@@ -24,6 +24,19 @@ export interface NativePluginContext {
         id: string;
         external: boolean;
     } | null>;
+    /**
+     * Register a file the output depends on but the bundler never made a module
+     * — rolldown's `this.addWatchFile`. Collected into the result's
+     * `watchedFiles`.
+     *
+     * The native engine has no watcher to feed and the Rust side never asked
+     * for one, so the list goes nowhere but the caller: `gjsify test` judges its
+     * bundle against it. An older published copy of this package is what a host
+     * may actually load (the CLI resolves the engine through several anchors),
+     * so a plugin must feature-detect this — a build must not fail over
+     * bookkeeping, and a miss is reported rather than silent.
+     */
+    addWatchFile(id: string): void;
     /** Append a warning to the bundle's warnings list. */
     warn(message: string): void;
     /** Throw with `message` — caught at the dispatch boundary and

package/meson.build

@@ -1,4 +1,10 @@
-project('GjsifyRolldown', ['c', 'vala'], version: '1.0')
+# `buildtype=plain` = NO `-g`. ld64 emits a DEBUG MAP into any image whose objects
+# carry DWARF — one `N_OSO` stab per object, holding its MTIME — so with `-g` every
+# rebuild of this commit differed in bytes (plus the `LC_UUID` and the ad-hoc signature
+# computed over them) and `commit-prebuilds` re-committed all 16 darwin dylibs. That map
+# names intermediate `.o` files no consumer can have. Why: docs/prebuilds.md.
+project('GjsifyRolldown', ['c', 'vala'], version: '1.0',
+        default_options: ['buildtype=plain'])
 
 # Required system packages (Fedora 43+):
 #   dnf install vala meson ninja-build cargo
@@ -54,22 +60,62 @@ if host_system == 'darwin'
     lib_rpath = '@loader_path'
     # Normalise the cdylib's LC_ID_DYLIB to @rpath/<leaf> BEFORE the Vala
     # library links against it: ld64 copies the dependency's install name
-    # verbatim into the dependent's LC_LOAD_DYLIB. rustc's own install name has
-    # varied across releases (absolute build path in older rustc, @rpath/<leaf>
-    # in current ones); pinning it here makes the recorded dependency
-    # rustc-version-independent, and @rpath/ is never longer than an absolute
-    # path so install_name_tool can always rewrite in place.
-    rust_cdylib_post = ' && install_name_tool -id "@rpath/' + rust_cdylib_name + '" "$3"'
+    # verbatim into the dependent's LC_LOAD_DYLIB. Pinning it here makes the
+    # recorded dependency rustc-version-independent, and @rpath/ is never
+    # longer than an absolute path so install_name_tool can always rewrite in
+    # place.
+    #
+    # The cdylib must be a FUNCTION OF ITS SOURCES, and on darwin that takes
+    # TWO steps, only the first of which `install_name_tool` could do.
+    # MEASURED with rustc 1.98.1 / ld64-27037.1 (macOS 27, arm64); the whole
+    # measurement and the reasoning behind each step: scripts/macho-set-uuid.mjs.
+    #
+    # 1. THE INSTALL NAME, at the LINK. rustc still gives a cdylib the ABSOLUTE
+    #    path of its own output as `LC_ID_DYLIB`
+    #    (`<builddir>/cargo-target/release/deps/<leaf>`), so the build
+    #    directory's name and LENGTH reach the artifact: the recorded name, the
+    #    load-command block's size, and therefore every section address after it.
+    #    Without this, two builds from `build/` and `builddir/` differ by 8 bytes
+    #    of pure layout before any content is compared. ld64 takes the LAST
+    #    `-install_name` (verified), and a `-C link-arg` lands after rustc's own,
+    #    so this one wins. `install_name_tool` then keeps the recorded dependency
+    #    rustc-version-independent.
+    # 2. THE UUID, after every other edit (the script, which re-signs). ld64
+    #    computed that field over the image it emitted and `install_name_tool`
+    #    recomputes neither it nor the signature — and it is not a function of
+    #    the emitted bytes even so, so pinning the name above still leaves 48
+    #    moving bytes (16 `LC_UUID` + 32 of the signature hashing it). It is
+    #    derived from the image instead, so if the CODE ever stops being a
+    #    function of the sources the UUID moves with it and
+    #    `check-prebuild-reproducible.mjs` still reds; nothing here hides
+    #    content drift.
+    rust_cargo_link_args = ' -- -C link-arg=-Wl,-install_name,@rpath/' + rust_cdylib_name
+    rust_cargo_cmd = 'cargo rustc --lib'
+    # The repo's OWN script, from the package's own meson.build — so a bridge
+    # built outside the workspace has to say so itself rather than silently
+    # skipping the step that makes its artifact reproducible.
+    set_uuid_tool = meson.current_source_dir() / '..' / '..' / '..' / 'scripts' / 'macho-set-uuid.mjs'
+    rust_cdylib_post = ' && install_name_tool -id "@rpath/' + rust_cdylib_name + '" "$3"' \
+                      + ' && ' + find_program('node').full_path() + ' "' + set_uuid_tool + '" "$3"'
 else
     rust_cdylib_name = 'libgjsify_rolldown.so'
     shared_lib_name = 'libgjsifyrolldown.so'
     lib_rpath = '$ORIGIN'
+    # ELF records a bare SONAME and no UUID load command, and its link line is
+    # already a function of the sources: the darwin branch's steps have no ELF
+    # spelling, so this one is left exactly as it was.
+    rust_cargo_link_args = ''
+    rust_cargo_cmd = 'cargo build'
     rust_cdylib_post = ''
 endif
 
 # ----------------------------------------------------------------------------
 # Rust cdylib (cargo)
 # ----------------------------------------------------------------------------
+# `cargo rustc --lib -- <args>` rather than `cargo build`, so the link args reach
+# the FINAL crate's rustc and no other: the dependency rlibs and any build
+# script are linked without them, and a pinned `-install_name` on an executable
+# is not a thing ld64 wants.
 cargo = find_program('cargo')
 
 rust_sources = files(
@@ -94,7 +140,8 @@ rust_cdylib = custom_target('gjsify-rolldown-rust',
     input:  rust_sources,
     output: rust_cdylib_name,
     command: ['sh', '-c',
-              'cargo build --release ${CI:+--locked} --manifest-path "$1" --target-dir "$2" && cp "$2/release/'
+              rust_cargo_cmd + ' --release ${CI:+--locked} --manifest-path "$1" --target-dir "$2"'
+                  + rust_cargo_link_args + ' && cp "$2/release/'
                   + rust_cdylib_name + '" "$3"' + rust_cdylib_post,
               'sh',
               meson.current_source_dir() / 'src/rust/Cargo.toml',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-native",
-    "version": "0.52.0",
+    "version": "0.54.0",
     "description": "Phase D-2 POC: Vala/GObject + Rust cdylib bridge to rolldown for GJS. Wraps `rolldown::Bundler::generate()` (async, tokio) in a per-call current-thread runtime so JS sees a sync `bundle()` call. JSON-encoded BundlerOptions in, JSON-encoded BundleOutput out — the boundary stays small even though rolldown's option surface is enormous. POC scope: no JS plugins (Phase B), no watch/HMR, no incremental builds. Companion to `@gjsify/lightningcss-native`; together they remove the last two Rust-crate runtime blockers from the gjsify build pipeline (Phase D-3 unblock).",
     "type": "module",
     "main": "lib/esm/index.js",
@@ -58,7 +58,7 @@
         "@girs/gobject-2.0": "5.4.0"
     },
     "devDependencies": {
-        "@gjsify/cli": "^0.52.0",
+        "@gjsify/cli": "^0.54.0",
         "@types/node": "^25.9.2",
         "typescript": "^6.0.3"
     },
@@ -74,9 +74,9 @@
     },
     "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/infra/rolldown-native#readme",
     "optionalDependencies": {
-        "@gjsify/rolldown-native-darwin-arm64": "0.52.0",
-        "@gjsify/rolldown-native-darwin-x64": "0.52.0",
-        "@gjsify/rolldown-native-linux-arm64": "0.52.0",
-        "@gjsify/rolldown-native-linux-x64": "0.52.0"
+        "@gjsify/rolldown-native-darwin-arm64": "0.54.0",
+        "@gjsify/rolldown-native-darwin-x64": "0.54.0",
+        "@gjsify/rolldown-native-linux-arm64": "0.54.0",
+        "@gjsify/rolldown-native-linux-x64": "0.54.0"
     }
 }