@gjsify/lightningcss-native 0.23.0 → 0.24.2

package/README.md

@@ -32,12 +32,43 @@ if (hasNativeLightningcss()) {
 
 The native bridge is consumed automatically by `gjsify build --app gjs` via `@gjsify/rolldown-plugin-gjsify`. Direct use is only needed when calling the CSS pipeline outside of a gjsify build.
 
+## Building from source
+
+```bash
+gjsify workspace @gjsify/lightningcss-native build:prebuilds   # needs meson + vala + cargo
+```
+
+Unlike the other two Rust bridges this one has no `refs/` submodule — `lightningcss`,
+`parcel_sourcemap` and `browserslist-rs` all come from crates.io.
+
+### Dependency lock
+
+`src/rust/Cargo.lock` is **committed**, and because there is no `refs/` pin here it is the *only*
+thing tying the shipped prebuild to a known dependency graph. CI builds with `--locked`
+(`${CI:+--locked}` on the `cargo build` in `meson.build`; every CI leg runs with `CI=true`),
+so a lock that no longer satisfies `Cargo.toml` fails the run instead of being silently rewritten.
+Local builds are unlocked, so editing `Cargo.toml` still just works — commit the resulting lock
+diff with the change.
+
+Updating a dependency is a deliberate act:
+
+```bash
+cd packages/infra/lightningcss-native/src/rust
+cargo update -p <crate>        # or plain `cargo update` for the whole registry side
+cargo tree -d                  # review what the update duplicated
+cd -
+gjsify workspace @gjsify/lightningcss-native build:prebuilds
+```
+
+Note that `lightningcss` is a pre-release line (`1.0.0-alpha.*`), where a caret requirement still
+matches later alphas — so without the lock a plain rebuild can silently pick up a new alpha.
+
 ## Platform coverage
 
 | Platform | Prebuild | Built by |
 |---|---|---|
-| `linux-x86_64` | ✅ `.so` + `.gir` + `.typelib` | native runner |
-| `linux-aarch64` | ✅ | native runner |
+| `linux-x64` | ✅ `.so` + `.gir` + `.typelib` | native runner |
+| `linux-arm64` | ✅ | native runner |
 | `linux-ppc64`, `linux-s390x`, `linux-riscv64` | ✅ | QEMU emulation |
 | `darwin-arm64` (macOS, Apple silicon) | ✅ `.dylib` + `.gir` + `.typelib` | `macos-latest` runner |
 | `darwin-x64` (macOS, Intel) | ❌ | — no runner leg yet |

package/lib/esm/index.gjs.spec.js

@@ -0,0 +1 @@
+import{__name as e}from"./_virtual/_rolldown/runtime.js";import{bundle as t,getLoadError as n,hasNativeLightningcss as r,loadNativeLightningcss as i,transform as a}from"./index.js";import{describe as o,expect as s,it as c,on as l}from"@gjsify/unit";import u from"@girs/glib-2.0";const decode=e=>new TextDecoder().decode(e),d=`.btn { color: red; & .icon { padding: 4px; } &:hover { color: blue; } }`,f=`firefox >= 60`;function writeTempCss(e,t,n){let r=`${e}/${t}`;return u.file_set_contents(r,new TextEncoder().encode(n)),r}var p=e(async()=>{await l(`Gjs`,async()=>{await o(`@gjsify/lightningcss-native — module loading`,async()=>{await c(`loads the GjsifyLightningcss typelib successfully`,()=>{s(r()).toBe(!0),s(n()).toBeNull(),s(typeof i()?.Engine).toBe(`function`)})}),await o(`@gjsify/lightningcss-native — shared engine: option independence`,async()=>{let e=decode(a({filename:`a.css`,code:d}).code),t=decode(a({filename:`a.css`,code:d,targets:f}).code);await c(`the fixture actually distinguishes targets (guards the guard)`,()=>{s(e).not.toBe(t),s(t).toContain(`.btn .icon`)}),await c(`targets do not leak from a previous call`,()=>{a({filename:`a.css`,code:d,targets:f}),s(decode(a({filename:`a.css`,code:d}).code)).toBe(e),a({filename:`a.css`,code:d}),s(decode(a({filename:`a.css`,code:d,targets:f}).code)).toBe(t)}),await c(`minify does not leak from a previous call`,()=>{let e=decode(a({filename:`a.css`,code:d,minify:!1}).code),t=decode(a({filename:`a.css`,code:d,minify:!0}).code);s(e).not.toBe(t),s(decode(a({filename:`a.css`,code:d,minify:!1}).code)).toBe(e),s(decode(a({filename:`a.css`,code:d,minify:!0}).code)).toBe(t)}),await c(`a stored source map does not leak into a later map-less call`,()=>{s(a({filename:`a.css`,code:d,sourceMap:!0}).map).toBeDefined(),s(a({filename:`a.css`,code:d,sourceMap:!1}).map).toBeUndefined()}),await c(`the filename of a previous call does not leak into a later source map`,()=>{a({filename:`first.css`,code:d,sourceMap:!0});let e=a({filename:`second.css`,code:d,sourceMap:!0}),t=JSON.parse(decode(e.map));s(t.sources.join(`,`)).toContain(`second.css`),s(t.sources.join(`,`)).not.toContain(`first.css`)}),await c(`stays stable across many interleaved option changes`,()=>{for(let n=0;n<25;n++)s(decode(a({filename:`a.css`,code:d}).code)).toBe(e),s(decode(a({filename:`a.css`,code:d,targets:f}).code)).toBe(t)})}),await o(`@gjsify/lightningcss-native — shared engine: error isolation`,async()=>{await c(`surfaces a transform error and leaves the shared engine usable`,()=>{let e=decode(a({filename:`a.css`,code:d}).code);s(()=>a({filename:`a.css`,code:``})).toThrow(),s(decode(a({filename:`a.css`,code:d}).code)).toBe(e)}),await c(`surfaces a bundle error and leaves the shared engine usable`,()=>{let e=decode(a({filename:`a.css`,code:d}).code);s(()=>t({filename:`/nonexistent/gjsify-does-not-exist.css`})).toThrow(),s(decode(a({filename:`a.css`,code:d}).code)).toBe(e)})}),await o(`@gjsify/lightningcss-native — shared engine: bundle/transform interop`,async()=>{let e=u.Dir.make_tmp(`gjsify-lightningcss-XXXXXX`),n=writeTempCss(e,`leaf.css`,`.leaf { color: green; }`),r=writeTempCss(e,`entry.css`,`@import "./leaf.css";\n${d}`);await c(`bundle() resolves @import chains`,()=>{let e=decode(t({filename:r}).code);s(e).toContain(`.leaf`),s(e).toContain(`.btn`)}),await c(`bundle() and transform() do not contaminate each other`,()=>{let e=decode(t({filename:r}).code),n=decode(a({filename:`a.css`,code:d}).code);t({filename:r,targets:f,minify:!0}),s(decode(a({filename:`a.css`,code:d}).code)).toBe(n),a({filename:`a.css`,code:d,targets:f,sourceMap:!0}),s(decode(t({filename:r}).code)).toBe(e)}),await c(`cleans up the temp fixture directory`,()=>{u.unlink(r),u.unlink(n),u.rmdir(e),s(u.file_test(e,u.FileTest.EXISTS)).toBe(!1)})}),await o(`@gjsify/lightningcss-native — shared engine: the engine really is reused`,async()=>{await c(`constructs no further Engine instances after the first call`,()=>{let e=i();s(e).not.toBeNull(),a({filename:`a.css`,code:d});let t=e.Engine,n=0,Counting=function(){return n++,new t},r=!1;try{e.Engine=Counting,r=e.Engine===Counting;for(let e=0;e<25;e++)a({filename:`a.css`,code:d})}finally{r&&(e.Engine=t)}r?s(n).toBe(0):s(e.Engine).toBe(t)})})})},`default`);export{p as default};

package/lib/esm/index.js

@@ -1 +1 @@
-import"./_virtual/_rolldown/runtime.js";let e=null,t=!1,n=null;function loadNativeLightningcss(){if(t)return e;t=!0;try{let t=globalThis.imports?.gi;if(!t)return n=Error(`imports.gi not available — not running under GJS?`),null;let r=t.GjsifyLightningcss;return r?(e=r,e):(n=Error(`GjsifyLightningcss typelib not found on GI_TYPELIB_PATH`),null)}catch(t){return n=t instanceof Error?t:Error(String(t)),e=null,null}}function hasNativeLightningcss(){return loadNativeLightningcss()!==null}function getLoadError(){return n}function getGLib(){let e=globalThis.imports?.gi;if(!e||!e.GLib)throw Error(`@gjsify/lightningcss-native: GLib not available (not running under GJS?)`);return e.GLib}function transform(e){let t=loadNativeLightningcss();if(!t)throw Error(`@gjsify/lightningcss-native: prebuild not available (${n?.message??`unknown`})`);let r=typeof e.code==`string`?new TextEncoder().encode(e.code):e.code,i=getGLib().Bytes.new(r),[a,o]=new t.Engine().transform(e.filename??null,i,e.targets??null,!!e.minify,!!e.sourceMap),s={code:a.get_data()??new Uint8Array};if(o){let e=o.get_data();e&&(s.map=e)}return s}function bundle(e){let t=loadNativeLightningcss();if(!t)throw Error(`@gjsify/lightningcss-native: prebuild not available (${n?.message??`unknown`})`);let[r,i]=new t.Engine().bundle(e.filename,e.targets??null,!!e.minify,!!e.sourceMap,e.errorRecovery??!0),a={code:r.get_data()??new Uint8Array};if(i){let e=i.get_data();e&&(a.map=e)}return a}export{bundle,getLoadError,hasNativeLightningcss,loadNativeLightningcss,transform};
+import"./_virtual/_rolldown/runtime.js";let e=null,t=!1,n=null;function loadNativeLightningcss(){if(t)return e;t=!0;try{let t=globalThis.imports?.gi;if(!t)return n=Error(`imports.gi not available — not running under GJS?`),null;let r=t.GjsifyLightningcss;return r?(e=r,e):(n=Error(`GjsifyLightningcss typelib not found on GI_TYPELIB_PATH`),null)}catch(t){return n=t instanceof Error?t:Error(String(t)),e=null,null}}function hasNativeLightningcss(){return loadNativeLightningcss()!==null}function getLoadError(){return n}let r=null;function getEngine(e){return r===null&&(r=new e.Engine),r}function getGLib(){let e=globalThis.imports?.gi;if(!e||!e.GLib)throw Error(`@gjsify/lightningcss-native: GLib not available (not running under GJS?)`);return e.GLib}function transform(e){let t=loadNativeLightningcss();if(!t)throw Error(`@gjsify/lightningcss-native: prebuild not available (${n?.message??`unknown`})`);let r=typeof e.code==`string`?new TextEncoder().encode(e.code):e.code,i=getGLib().Bytes.new(r),[a,o]=getEngine(t).transform(e.filename??null,i,e.targets??null,!!e.minify,!!e.sourceMap),s={code:a.get_data()??new Uint8Array};if(o){let e=o.get_data();e&&(s.map=e)}return s}function bundle(e){let t=loadNativeLightningcss();if(!t)throw Error(`@gjsify/lightningcss-native: prebuild not available (${n?.message??`unknown`})`);let[r,i]=getEngine(t).bundle(e.filename,e.targets??null,!!e.minify,!!e.sourceMap,e.errorRecovery??!0),a={code:r.get_data()??new Uint8Array};if(i){let e=i.get_data();e&&(a.map=e)}return a}export{bundle,getLoadError,hasNativeLightningcss,loadNativeLightningcss,transform};

package/meson.build

@@ -70,16 +70,24 @@ cargo = find_program('cargo')
 
 rust_sources = files(
     'src/rust/Cargo.toml',
+    'src/rust/Cargo.lock',
     'src/rust/src/lib.rs',
 )
 
 rust_target_dir = meson.current_build_dir() / 'cargo-target'
 
+# `${CI:+--locked}` — on a CI runner (GitHub Actions always exports CI=true) the
+# committed src/rust/Cargo.lock is ENFORCED: cargo fails loudly instead of
+# re-resolving the registry and rewriting the lock, so a lock that no longer
+# satisfies Cargo.toml (or a refs/ bump that moved a path crate's version) reds
+# the run rather than silently shipping a differently-linked prebuild. Locally
+# the flag expands to nothing, so editing Cargo.toml still just works — commit
+# the resulting lock diff together with the change.
 rust_cdylib = custom_target('gjsify-lightningcss-rust',
     input:  rust_sources,
     output: rust_cdylib_name,
     command: ['sh', '-c',
-              'cargo build --release --manifest-path "$1" --target-dir "$2" && cp "$2/release/'
+              'cargo build --release ${CI:+--locked} --manifest-path "$1" --target-dir "$2" && 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/lightningcss-native",
-    "version": "0.23.0",
+    "version": "0.24.2",
     "description": "Vala/GObject + Rust cdylib bridge to lightningcss for GJS. Replaces the Node-only npm `lightningcss` package: parse, transform, minify, and browserslist-target lowering of CSS without leaving a Node-free GJS process. Backs `@gjsify/rolldown-plugin-gjsify`'s cssAsStringPlugin under `--app gjs` so GTK4-CSS lowering (firefox60) works without a Node runtime in the build pipeline.",
     "type": "module",
     "main": "lib/esm/index.js",
@@ -21,8 +21,8 @@
     ],
     "gjsify": {
         "platforms": [
-            "linux-x86_64",
-            "linux-aarch64",
+            "linux-x64",
+            "linux-arm64",
             "linux-ppc64",
             "linux-s390x",
             "linux-riscv64",
@@ -32,16 +32,19 @@
         "tier": 1
     },
     "scripts": {
-        "clear": "rm -rf lib build tsconfig.tsbuildinfo tsconfig.types.tsbuildinfo || exit 0",
-        "check": "gjsify tsc --noEmit",
+        "clear": "rm -rf lib build tsconfig.tsbuildinfo tsconfig.types.tsbuildinfo test.gjs.mjs || exit 0",
+        "check": "gjsify tsc --noEmit && gjsify tsc --noEmit -p tsconfig.spec.json",
         "init:meson": "meson setup build .",
         "init:meson:wipe": "gjsify run init:meson --wipe",
         "build": "gjsify run build:gjsify && gjsify run build:types",
         "build:gjsify": "gjsify build --library 'src/ts/**/*.{ts,js}'",
         "build:meson": "node ../../../scripts/check-refs-pin.mjs . && gjsify run init:meson && meson compile -C build",
         "build:types": "gjsify tsc",
+        "build:test:gjs": "gjsify build src/ts/test.mts --app gjs --outfile test.gjs.mjs",
+        "test": "gjsify run build:gjsify && gjsify run build:test:gjs && gjsify run test:gjs",
+        "test:gjs": "gjsify run test.gjs.mjs",
         "build:prebuilds": "gjsify run build:meson && node ../../../scripts/stage-prebuild.mjs .",
-        "build:gir-types": "ts-for-gir generate --externalDeps --allowMissingDeps --girDirectories=./prebuilds/linux-x86_64 --girDirectories=/usr/share/gir-1.0 --modules=GjsifyLightningcss-1.0 --outdir=src/ts --npmScope=@girs --package=false --ignoreVersionConflicts=true"
+        "build:gir-types": "ts-for-gir generate --externalDeps --allowMissingDeps --girDirectories=./prebuilds/linux-x64 --girDirectories=/usr/share/gir-1.0 --modules=GjsifyLightningcss-1.0 --outdir=src/ts --npmScope=@girs --package=false --ignoreVersionConflicts=true"
     },
     "keywords": [
         "gjs",
@@ -59,7 +62,8 @@
         "@girs/gobject-2.0": "^4.1.0"
     },
     "devDependencies": {
-        "@gjsify/cli": "^0.23.0",
+        "@gjsify/cli": "^0.24.2",
+        "@gjsify/unit": "^0.24.2",
         "@ts-for-gir/cli": "^4.1.0",
         "@types/node": "^25.9.2",
         "typescript": "^6.0.3"

package/prebuilds/darwin-arm64/GjsifyLightningcss-1.0.gir

@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!-- GjsifyLightningcss-1.0.gir generated by valac 0.56.19, do not modify. -->
+<repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:doc="http://www.gtk.org/introspection/doc/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+<include name="GObject" version="2.0"/>
+<include name="GLib" version="2.0"/>
+<package name="gjsifylightningcss"/>
+<c:include name="gjsify-lightningcss-glue.h"/>
+<c:include name="gjsifylightningcss.h"/>
+<doc:format name="unknown"/>
+<namespace name="GjsifyLightningcss" version="1.0" shared-library="libgjsifylightningcss.dylib" c:prefix="GjsifyLightningcss" c:identifier-prefixes="GjsifyLightningcss" c:symbol-prefixes="gjsify_lightningcss">
+	<class name="Engine" c:type="GjsifyLightningcssEngine" c:symbol-prefix="engine" glib:type-name="GjsifyLightningcssEngine" glib:get-type="gjsify_lightningcss_engine_get_type" glib:type-struct="EngineClass" parent="GObject.Object">
+		<field name="parent_instance" readable="0" private="1">
+			<type name="GObject.Object" c:type="GObject"/>
+		</field>
+		<field name="priv" readable="0" private="1">
+			<type name="EnginePrivate" c:type="GjsifyLightningcssEnginePrivate*"/>
+		</field>
+		<method name="transform" c:identifier="gjsify_lightningcss_engine_transform" throws="1">
+			<return-value transfer-ownership="full">
+				<type name="GLib.Bytes" c:type="GBytes*"/>
+			</return-value>
+			<parameters>
+				<instance-parameter name="self" transfer-ownership="none">
+					<type name="GjsifyLightningcss.Engine" c:type="GjsifyLightningcssEngine*"/>
+				</instance-parameter>
+				<parameter name="filename" transfer-ownership="none" nullable="1">
+					<type name="utf8" c:type="const gchar*"/>
+				</parameter>
+				<parameter name="code" transfer-ownership="none">
+					<type name="GLib.Bytes" c:type="GBytes*"/>
+				</parameter>
+				<parameter name="browserslist" transfer-ownership="none" nullable="1">
+					<type name="utf8" c:type="const gchar*"/>
+				</parameter>
+				<parameter name="minify" transfer-ownership="none">
+					<type name="gboolean" c:type="gboolean"/>
+				</parameter>
+				<parameter name="source_map" transfer-ownership="none">
+					<type name="gboolean" c:type="gboolean"/>
+				</parameter>
+				<parameter name="out_source_map" direction="out" transfer-ownership="full" optional="1">
+					<type name="GLib.Bytes" c:type="GBytes**"/>
+				</parameter>
+			</parameters>
+		</method>
+		<method name="bundle" c:identifier="gjsify_lightningcss_engine_bundle" throws="1">
+			<return-value transfer-ownership="full">
+				<type name="GLib.Bytes" c:type="GBytes*"/>
+			</return-value>
+			<parameters>
+				<instance-parameter name="self" transfer-ownership="none">
+					<type name="GjsifyLightningcss.Engine" c:type="GjsifyLightningcssEngine*"/>
+				</instance-parameter>
+				<parameter name="filename" transfer-ownership="none">
+					<type name="utf8" c:type="const gchar*"/>
+				</parameter>
+				<parameter name="browserslist" transfer-ownership="none" nullable="1">
+					<type name="utf8" c:type="const gchar*"/>
+				</parameter>
+				<parameter name="minify" transfer-ownership="none">
+					<type name="gboolean" c:type="gboolean"/>
+				</parameter>
+				<parameter name="source_map" transfer-ownership="none">
+					<type name="gboolean" c:type="gboolean"/>
+				</parameter>
+				<parameter name="error_recovery" transfer-ownership="none">
+					<type name="gboolean" c:type="gboolean"/>
+				</parameter>
+				<parameter name="out_source_map" direction="out" transfer-ownership="full" optional="1">
+					<type name="GLib.Bytes" c:type="GBytes**"/>
+				</parameter>
+			</parameters>
+		</method>
+		<constructor name="new" c:identifier="gjsify_lightningcss_engine_new">
+			<return-value transfer-ownership="full">
+				<type name="GjsifyLightningcss.Engine" c:type="GjsifyLightningcssEngine*"/>
+			</return-value>
+		</constructor>
+	</class>
+	<record name="EngineClass" c:type="GjsifyLightningcssEngineClass" glib:is-gtype-struct-for="Engine">
+		<field name="parent_class" readable="0" private="1">
+			<type name="GObject.ObjectClass" c:type="GObjectClass"/>
+		</field>
+	</record>
+	<record name="EnginePrivate" c:type="GjsifyLightningcssEnginePrivate" disguised="1"/>
+</namespace>
+</repository>