@gjsify/rolldown-plugin-gjsify 0.64.1-next.245 → 0.64.1-next.247

package/lib/app/browser.js

@@ -32,6 +32,7 @@ import { blueprintTemplateExit } from '../utils/blueprint-template-exit.js';
 import { cssAsStringPlugin } from '../plugins/css-as-string.js';
 import { unresolvedWorkspaceImportPlugin } from '../plugins/unresolved-workspace-import.js';
 import { gschemaPlugin } from '../plugins/gschema.js';
+import { gresourcePlugin } from '../plugins/gresource.js';
 import { implicitGlobalAssignPlugin } from '../plugins/implicit-global-assign.js';
 export const setupForBrowser = async (input) => {
     const userExternal = input.userExternal ?? [];
@@ -145,6 +146,7 @@ export const setupForBrowser = async (input) => {
         // replaces the whole global object. This transform runs first and leaves the define
         // nothing to rewrite; the guarded branch stays unreachable on a page either way.
         gschemaPlugin({ mode: 'emit' }),
+        gresourcePlugin({ compressed: 'strip' }),
         implicitGlobalAssignPlugin(),
         cssAsStringPlugin(),
         // `order: 'post'` — see app/gjs.ts. The browser target's whole job is to

package/lib/app/gjs.js

@@ -22,6 +22,7 @@ import { processStubPlugin } from '../plugins/process-stub.js';
 import { cssAsStringPlugin } from '../plugins/css-as-string.js';
 import { consoleAssignPlugin } from '../plugins/console-assign.js';
 import { gschemaPlugin } from '../plugins/gschema.js';
+import { gresourcePlugin } from '../plugins/gresource.js';
 import { implicitGlobalAssignPlugin } from '../plugins/implicit-global-assign.js';
 import { shebangPlugin, resolveShebangLine, inputShebangStripPlugin } from '../plugins/shebang.js';
 import { wrapInputWithSideEffects } from '../utils/entry-wrapper.js';
@@ -203,6 +204,7 @@ export const setupForGjs = async (input) => {
         // `globalThis = {…}`, i.e. code that would replace the whole global object if the
         // branch ever ran. Measured; the plugin header carries the artifact diff.
         gschemaPlugin({ mode: 'ignore' }),
+        gresourcePlugin({ compressed: 'keep' }),
         implicitGlobalAssignPlugin(),
         // `gi://Ns?version=X&optional` → a guarded import (ADR 0087), claimed `pre`
         // so the externals policy never sees the flagged specifier.

package/lib/app/nativescript.js

@@ -48,6 +48,7 @@ import { blueprintTemplateExit } from '../utils/blueprint-template-exit.js';
 import { platformResolvePlugin, nativescriptSuffixChain, detectNativescriptPlatform, nativescriptPlatformDefines, } from '../plugins/platform-resolve.js';
 import { unresolvedWorkspaceImportPlugin } from '../plugins/unresolved-workspace-import.js';
 import { gschemaPlugin } from '../plugins/gschema.js';
+import { gresourcePlugin } from '../plugins/gresource.js';
 import { implicitGlobalAssignPlugin } from '../plugins/implicit-global-assign.js';
 // Never bundled: an app works only with the ONE core instance the runtime boots, and what
 // this target emits is an ENTRY the NS bundler resolves it for. An optional peer absent from
@@ -188,6 +189,7 @@ export const setupForNativescript = async (input) => {
         // `ReferenceError` in a strict module body, not a gate. `globalThis.window = …`
         // holds the author's intent; the guard and the absence are untouched.
         gschemaPlugin({ mode: 'emit' }),
+        gresourcePlugin({ compressed: 'strip' }),
         implicitGlobalAssignPlugin(),
         // NO cssAsStringPlugin — NS ships its own CSS pipeline via
         // @nativescript/core; .css imports are handled by the consuming

package/lib/app/node.js

@@ -12,6 +12,7 @@ import { gjsImportsEmptyPlugin } from '../plugins/gjs-imports-empty.js';
 import { gjsGiNodePlugin, gjsBuiltinModulesNodePlugin } from '../plugins/gjs-gi-node.js';
 import { giOptionalPlugin } from '../plugins/gi-optional.js';
 import { gschemaPlugin } from '../plugins/gschema.js';
+import { gresourcePlugin } from '../plugins/gresource.js';
 import { implicitGlobalAssignPlugin } from '../plugins/implicit-global-assign.js';
 import { unresolvedWorkspaceImportPlugin } from '../plugins/unresolved-workspace-import.js';
 import { nodeNativeExternalPlugin } from '../plugins/node-native-external.js';
@@ -353,6 +354,7 @@ export const setupForNode = async (input) => {
         // `globalThis.window = {…}` is the same statement, the guard is untouched, and
         // nothing defines `window`.
         gschemaPlugin({ mode: 'ignore' }),
+        gresourcePlugin({ compressed: 'keep' }),
         implicitGlobalAssignPlugin(),
         // Decides the fate of `@girs/*` before `aliasPlugin` and the default
         // resolver (same composition order as `app/browser.ts`). `emptyGirs` is

package/lib/index.d.ts

@@ -15,6 +15,8 @@ export { findImplicitGlobalAssignments, rewriteImplicitGlobalAssignments, implic
 export type { ImplicitGlobalAssignment } from './plugins/implicit-global-assign.js';
 export { gschemaPlugin, parseGschema, GSCHEMA_PLUGIN } from './plugins/gschema.js';
 export type { GschemaOut, GschemaKey, GschemaPluginOptions } from './plugins/gschema.js';
+export { gresourcePlugin, compileGresource, prepareGresourceXml, gresourceModuleSource, GRESOURCE_PLUGIN, } from './plugins/gresource.js';
+export type { GresourcePluginOptions } from './plugins/gresource.js';
 export { cssAsStringPlugin } from './plugins/css-as-string.js';
 export { textLoaderPlugin } from './plugins/text-loader.js';
 export type { TextLoaderPluginOptions, LoaderKind } from './plugins/text-loader.js';

package/lib/index.js

@@ -10,6 +10,7 @@ export { giOptionalPlugin, giOptionalShimSource, giOptionalNodeShimSource, giOpt
 export { bindConsoleLocally, consoleAssignPlugin, freeConsoleAssignmentInsertion, CONSOLE_LOCAL_BINDING, } from './plugins/console-assign.js';
 export { findImplicitGlobalAssignments, rewriteImplicitGlobalAssignments, implicitGlobalAssignPlugin, IMPLICIT_GLOBAL_ASSIGN_PLUGIN, } from './plugins/implicit-global-assign.js';
 export { gschemaPlugin, parseGschema, GSCHEMA_PLUGIN } from './plugins/gschema.js';
+export { gresourcePlugin, compileGresource, prepareGresourceXml, gresourceModuleSource, GRESOURCE_PLUGIN, } from './plugins/gresource.js';
 export { cssAsStringPlugin } from './plugins/css-as-string.js';
 export { textLoaderPlugin } from './plugins/text-loader.js';
 export { shebangPlugin, GJS_SHEBANG, NODE_SHEBANG, expandEnvTemplate, resolveShebangLine } from './plugins/shebang.js';

package/lib/plugins/gresource.d.ts

@@ -0,0 +1,25 @@
+import type { Plugin } from 'rolldown';
+export declare const GRESOURCE_PLUGIN = "gjsify-gresource";
+export interface GresourcePluginOptions {
+    /**
+     * `keep`: compile the XML as written (GJS, Node — real GIO inflates).
+     * `strip`: drop `compressed="true"` first (browser, NativeScript, ADR 0116 § 2).
+     */
+    compressed: 'keep' | 'strip';
+}
+/**
+ * Apply the § 2 rules to the descriptor's text. Returns the XML to compile; throws on a refused
+ * option. Comments are blanked first so a commented-out `<file>` neither refuses nor rewrites.
+ */
+export declare function prepareGresourceXml(xml: string, file: string, options: GresourcePluginOptions): string;
+/**
+ * Compile `xmlPath` as `glib-compile-resources --sourcedir=<its dir>` would, after the § 2 rules.
+ * Returns the compiled bytes and every file they were read from.
+ */
+export declare function compileGresource(xmlPath: string, options: GresourcePluginOptions): Promise<{
+    bytes: Uint8Array;
+    inputs: string[];
+}>;
+/** The module source: the bytes as base64 and an inline decoder to a `Uint8Array` default export. */
+export declare function gresourceModuleSource(bytes: Uint8Array): string;
+export declare function gresourcePlugin(options: GresourcePluginOptions): Plugin;

package/lib/plugins/gresource.js

@@ -0,0 +1,134 @@
+// `import bytes from './data/<app-id>.data.gresource.xml'` (ADR 0116 §§ 1–2): the app's compiled
+// GResource as a `Uint8Array` default export, for `Gio.Resource.new_from_data(bytes)`.
+//
+// The `.gresource.xml` stays the single source and `glib-compile-resources` stays the compiler, so
+// the embedded bytes are the bytes GNOME loads; base64 is only the transport through a one-file
+// bundle, as in `adwaita-app/scripts/build-icon-gresource.mjs`. ADR 0116 decides the host tool over
+// an in-JS GVDB writer ("What this does not decide": a JS replacement for glib-compile-resources).
+//
+// § 2 per file: `prefix`, `alias`, nested and `../` paths, `xml-stripblanks`, `json-stripblanks` go
+// through unchanged. `compressed="true"` is dropped for the browser and NativeScript (`strip`),
+// because those targets have no synchronous inflate; GIO answers `lookup_data` and `get_info` with
+// the same data either way. `preprocess="to-pixdata"` is refused, naming the file and line.
+//
+// The decoder is emitted inline instead of calling `atob`/`Uint8Array.fromBase64`: GJS has neither
+// global without an injected register, and the module must evaluate the same on all four targets.
+import { Buffer } from 'node:buffer';
+import { execFile } from 'node:child_process';
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { promisify } from 'node:util';
+const execFileAsync = promisify(execFile);
+export const GRESOURCE_PLUGIN = 'gjsify-gresource';
+const SUFFIX = /\.gresource\.xml$/;
+const TOOL = 'glib-compile-resources';
+function lineOf(xml, index) {
+    return xml.slice(0, index).split('\n').length;
+}
+function attr(tag, name) {
+    return new RegExp(`\\s${name}\\s*=\\s*(?:"([^"]*)"|'([^']*)')`)
+        .exec(tag)
+        ?.slice(1)
+        .find((v) => v !== undefined);
+}
+/**
+ * Apply the § 2 rules to the descriptor's text. Returns the XML to compile; throws on a refused
+ * option. Comments are blanked first so a commented-out `<file>` neither refuses nor rewrites.
+ */
+export function prepareGresourceXml(xml, file, options) {
+    const source = xml.replace(/<!--[\s\S]*?-->/g, (c) => c.replace(/[^\n]/g, ' '));
+    for (const m of source.matchAll(/<file\b([^>]*)>([\s\S]*?)<\/file>/g)) {
+        const preprocess = (attr(m[1], 'preprocess') ?? '').split(',').map((p) => p.trim());
+        if (preprocess.includes('to-pixdata')) {
+            throw new Error(`${file}:${lineOf(source, m.index)}: '${m[2].trim()}' uses preprocess="to-pixdata", which GLib ` +
+                'deprecated and the web and NativeScript cannot decode; ship the PNG as it is (ADR 0116 § 2)');
+        }
+    }
+    if (options.compressed === 'keep')
+        return xml;
+    let out = '';
+    let last = 0;
+    for (const m of source.matchAll(/<file\b[^>]*>/g)) {
+        out += xml.slice(last, m.index);
+        out += xml.slice(m.index, m.index + m[0].length).replace(/\scompressed\s*=\s*(?:"[^"]*"|'[^']*')/, '');
+        last = m.index + m[0].length;
+    }
+    return out + xml.slice(last);
+}
+async function compileResources(args) {
+    try {
+        const { stdout } = await execFileAsync(TOOL, args, { maxBuffer: 64 * 1024 * 1024 });
+        return stdout;
+    }
+    catch (err) {
+        const e = err;
+        if (e?.code === 'ENOENT') {
+            throw new Error(`${TOOL} not found; embedding a .gresource.xml needs it on the build host for every target ` +
+                '(ADR 0116). Install it via your distro (package: glib2-devel / libglib2.0-dev).');
+        }
+        throw new Error(`${TOOL} failed${e?.code !== undefined ? ` (exit ${e.code})` : ''}: ${String(e?.stderr ?? '')}`);
+    }
+}
+/**
+ * Compile `xmlPath` as `glib-compile-resources --sourcedir=<its dir>` would, after the § 2 rules.
+ * Returns the compiled bytes and every file they were read from.
+ */
+export async function compileGresource(xmlPath, options) {
+    const xml = await readFile(xmlPath, 'utf8');
+    const prepared = prepareGresourceXml(xml, xmlPath, options);
+    const sourcedir = dirname(xmlPath);
+    const tmp = await mkdtemp(join(tmpdir(), 'gjsify-gresource-'));
+    try {
+        let descriptor = xmlPath;
+        if (prepared !== xml) {
+            descriptor = join(tmp, 'resources.gresource.xml');
+            await writeFile(descriptor, prepared);
+        }
+        const target = join(tmp, 'resources.gresource');
+        const deps = await compileResources([`--sourcedir=${sourcedir}`, '--generate-dependencies', descriptor]);
+        await compileResources([`--sourcedir=${sourcedir}`, `--target=${target}`, descriptor]);
+        const bytes = new Uint8Array(await readFile(target));
+        return { bytes, inputs: deps.split('\n').filter((l) => l !== '') };
+    }
+    finally {
+        await rm(tmp, { recursive: true, force: true });
+    }
+}
+const B64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+/** The module source: the bytes as base64 and an inline decoder to a `Uint8Array` default export. */
+export function gresourceModuleSource(bytes) {
+    const b64 = Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString('base64');
+    return [
+        `const s = ${JSON.stringify(b64)};`,
+        `const a = ${JSON.stringify(B64)};`,
+        'const t = new Uint8Array(128);',
+        'for (let i = 0; i < 64; i++) t[a.charCodeAt(i)] = i;',
+        'const b = new Uint8Array((s.length / 4) * 3 - (s.endsWith("==") ? 2 : s.endsWith("=") ? 1 : 0));',
+        'for (let i = 0, j = 0; i < s.length; i += 4) {',
+        '    const v = (t[s.charCodeAt(i)] << 18) | (t[s.charCodeAt(i + 1)] << 12) | (t[s.charCodeAt(i + 2)] << 6) | t[s.charCodeAt(i + 3)];',
+        '    b[j++] = v >> 16;',
+        '    if (j < b.length) b[j++] = (v >> 8) & 255;',
+        '    if (j < b.length) b[j++] = v & 255;',
+        '}',
+        'export default b;',
+    ].join('\n');
+}
+export function gresourcePlugin(options) {
+    return {
+        name: GRESOURCE_PLUGIN,
+        async load(id) {
+            if (!SUFFIX.test(id))
+                return null;
+            const { bytes, inputs } = await compileGresource(id, options);
+            // The native engine's context may predate `addWatchFile`/`info`; a build must not
+            // fail over bookkeeping (rolldown-native `NativePluginContext`).
+            const ctx = this;
+            for (const f of [id, ...inputs])
+                ctx.addWatchFile?.(f);
+            const code = gresourceModuleSource(bytes);
+            ctx.info?.(`${id}: ${bytes.byteLength} B compiled, ${code.length} B embedded (ADR 0116)`);
+            return { code, moduleType: 'js' };
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.64.1-next.245",
+    "version": "0.64.1-next.247",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.js",
@@ -63,12 +63,12 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@gjsify/console": "0.64.1-next.245",
-        "@gjsify/resolve-npm": "0.64.1-next.245",
-        "@gjsify/rolldown-plugin-deepkit": "0.64.1-next.245",
-        "@gjsify/rolldown-plugin-pnp": "0.64.1-next.245",
-        "@gjsify/utils": "0.64.1-next.245",
-        "@gjsify/vite-plugin-blueprint": "0.64.1-next.245",
+        "@gjsify/console": "0.64.1-next.247",
+        "@gjsify/resolve-npm": "0.64.1-next.247",
+        "@gjsify/rolldown-plugin-deepkit": "0.64.1-next.247",
+        "@gjsify/rolldown-plugin-pnp": "0.64.1-next.247",
+        "@gjsify/utils": "0.64.1-next.247",
+        "@gjsify/vite-plugin-blueprint": "0.64.1-next.247",
         "@rollup/pluginutils": "^5.4.0",
         "acorn": "^8.17.0",
         "acorn-typescript": "^1.4.13",
@@ -78,7 +78,7 @@
         "sass": "^1.101.0"
     },
     "peerDependencies": {
-        "@gjsify/lightningcss-native": "0.64.1-next.245",
+        "@gjsify/lightningcss-native": "0.64.1-next.247",
         "rolldown": "^1.1.4"
     },
     "peerDependenciesMeta": {
@@ -90,8 +90,8 @@
         }
     },
     "devDependencies": {
-        "@gjsify/cli": "0.64.1-next.245",
-        "@gjsify/unit": "0.64.1-next.245",
+        "@gjsify/cli": "0.64.1-next.247",
+        "@gjsify/unit": "0.64.1-next.247",
         "@types/node": "^25.9.2",
         "rolldown": "^1.1.4",
         "typescript": "^6.0.3"
@@ -104,5 +104,5 @@
             "win32": "supported"
         }
     },
-    "gitHead": "9a6ca179c1a74477f23791c5b8f6d5a7bffaee61"
+    "gitHead": "0865008d02b3a10af8152061095378aabe6b9d5d"
 }