@gjsify/rolldown-plugin-gjsify 0.64.2 → 0.64.3-next.259

package/README.md

@@ -53,7 +53,7 @@ For a GJS build the bundle records the addon's **package identity**, not a path
 
 ## `.gresource.xml` imports
 
-`import bytes from './data/app.data.gresource.xml'` yields the compiled GResource as a `Uint8Array` ([ADR 0116](../../../docs/adr/0116-app-gresources-are-embedded-at-build-time-for-web-and-nativescript.md)). To type it, add `"@gjsify/rolldown-plugin-gjsify/types"` to your `tsconfig.json` `compilerOptions.types`.
+`import bytes from './data/app.data.gresource.xml'` yields the compiled GResource as a `Uint8Array` ([ADR 0116](../../../docs/adr/0116-app-gresources-are-embedded-at-build-time-for-web-and-nativescript.md)). To type it, add `"@gjsify/rolldown-plugin-gjsify/types"` to your `tsconfig.json` `compilerOptions.types`. The same entry declares `*.gschema.xml?schema` ([ADR 0099](../../../docs/adr/0099-gio-settings-runs-on-the-browser-and-nativescript.md) § 1).
 
 ## License
 

package/lib/app/browser.js

@@ -31,7 +31,7 @@ import { giRendererPlugin } from '../plugins/gi-renderer.js';
 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 { GSCHEMA_REGISTER, gschemaPlugin } from '../plugins/gschema.js';
 import { gresourcePlugin } from '../plugins/gresource.js';
 import { implicitGlobalAssignPlugin } from '../plugins/implicit-global-assign.js';
 export const setupForBrowser = async (input) => {
@@ -145,7 +145,7 @@ export const setupForBrowser = async (input) => {
         // readily as a read, so `window = {…}` would emit `globalThis = {…}` — code that
         // 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' }),
+        gschemaPlugin({ mode: 'emit', register: GSCHEMA_REGISTER.browser }),
         gresourcePlugin({ compressed: 'strip' }),
         implicitGlobalAssignPlugin(),
         cssAsStringPlugin(),

package/lib/app/nativescript.js

@@ -47,7 +47,7 @@ import { giRendererPlugin } from '../plugins/gi-renderer.js';
 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 { GSCHEMA_REGISTER, 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
@@ -188,7 +188,7 @@ export const setupForNativescript = async (input) => {
         // a NativeScript app gates on the absence of `window`, but a WRITE to it is a
         // `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' }),
+        gschemaPlugin({ mode: 'emit', register: GSCHEMA_REGISTER.nativescript }),
         gresourcePlugin({ compressed: 'strip' }),
         implicitGlobalAssignPlugin(),
         // NO cssAsStringPlugin — NS ships its own CSS pipeline via

package/lib/index.d.ts

@@ -13,7 +13,7 @@ export type { GiSystemProbe } from './plugins/gi-runtime-paths.js';
 export type { ProcessStubPluginOptions } from './plugins/process-stub.js';
 export { findImplicitGlobalAssignments, rewriteImplicitGlobalAssignments, implicitGlobalAssignPlugin, IMPLICIT_GLOBAL_ASSIGN_PLUGIN, } from './plugins/implicit-global-assign.js';
 export type { ImplicitGlobalAssignment } from './plugins/implicit-global-assign.js';
-export { gschemaPlugin, parseGschema, GSCHEMA_PLUGIN } from './plugins/gschema.js';
+export { gschemaPlugin, parseGschema, GSCHEMA_PLUGIN, GSCHEMA_REGISTER } 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';

package/lib/index.js

@@ -9,7 +9,7 @@ export { giRuntimePathsStub } from './plugins/gi-runtime-paths.js';
 export { giOptionalPlugin, giOptionalShimSource, giOptionalNodeShimSource, giOptionalMarkerSource, parseOptionalGiSpecifier, GI_OPTIONAL_FLAG, GI_OPTIONAL_MARKER, } from './plugins/gi-optional.js';
 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 { gschemaPlugin, parseGschema, GSCHEMA_PLUGIN, GSCHEMA_REGISTER } 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';

package/lib/plugins/gschema.d.ts

@@ -1,8 +1,10 @@
 import type { Plugin } from 'rolldown';
 export declare const GSCHEMA_PLUGIN = "gjsify-gschema";
+type BasicType = 'b' | 'i' | 'u' | 'd' | 's';
+type BasicValue = boolean | number | string;
 export interface GschemaKey {
-    type: 'b' | 'i' | 'u' | 'd' | 's';
-    default: boolean | number | string;
+    type: BasicType | `a${BasicType}`;
+    default: BasicValue | BasicValue[];
 }
 export interface GschemaOut {
     id: string;
@@ -13,5 +15,17 @@ export declare function parseGschema(xml: string, file: string): GschemaOut;
 export interface GschemaPluginOptions {
     /** `emit`: the schema object (browser, NativeScript). `ignore`: the file path, for GJS/Node. */
     mode: 'emit' | 'ignore';
+    /**
+     * `emit` only: the module whose `Settings` the schema registers with, so the import alone is
+     * the registration and the app keeps to GIO's names. The port's `Gio` barrel re-exports the
+     * same `Settings`, so `new Gio.Settings(...)` finds the schema.
+     */
+    register?: string;
 }
-export declare function gschemaPlugin({ mode }: GschemaPluginOptions): Plugin;
+/** The `Settings` each port's `Gio` barrel re-exports (ADR 0099). */
+export declare const GSCHEMA_REGISTER: {
+    readonly browser: "@gjsify/app-settings/browser";
+    readonly nativescript: "@gjsify/app-settings/nativescript";
+};
+export declare function gschemaPlugin({ mode, register }: GschemaPluginOptions): Plugin;
+export {};

package/lib/plugins/gschema.js

@@ -3,16 +3,17 @@
 // The `.gschema.xml` stays the single source. On the targets with no Gio.Settings (browser,
 // NativeScript) the build reads it and emits `{ id, path, keys: { name: { type, default } } }`;
 // the runtime never parses XML. On GJS and Node the compiled schema is what GSettings reads
-// (`gjsify gsettings` builds it), so the import evaluates to the file's path and is ignored by
-// the no-op `Settings.register`.
+// (`gjsify gsettings` builds it), so the import evaluates to the file's path. The app builds
+// register the schema as the module evaluates (`register`), so importing it once, before the first
+// `new Gio.Settings`, is all an app does on every target.
 //
 // What the subset cannot honour is refused HERE, naming the key and the line, rather than
-// compiled into a schema that behaves differently from GNOME's: a key type outside `b i u d s`,
-// `<range>`, `<choices>`, `<enum>`, `<flags>`, `<child>`, `<override>`, and a schema without
+// compiled into a schema that behaves differently from GNOME's: a key type outside `b i u d s`
+// and the arrays of them (`ab ai au ad as`, ADR 0118 § 3), `<range>`, `<choices>`, `<enum>`, `<flags>`, `<child>`, `<override>`, and a schema without
 // `path` (the storage key is `<path><key>`).
 import { readFile } from 'node:fs/promises';
 export const GSCHEMA_PLUGIN = 'gjsify-gschema';
-const KEY_TYPES = new Set(['b', 'i', 'u', 'd', 's']);
+const KEY_TYPES = new Set(['b', 'i', 'u', 'd', 's', 'ab', 'ai', 'au', 'ad', 'as']);
 const REFUSED_TAGS = ['range', 'choices', 'enum', 'flags', 'child', 'override'];
 function lineOf(xml, index) {
     return xml.slice(0, index).split('\n').length;
@@ -31,9 +32,54 @@ function unescapeXml(s) {
         .replace(/&apos;/g, "'")
         .replace(/&amp;/g, '&');
 }
-/** GVariant text format for the five supported types. */
+/**
+ * The elements of an array default: `[]`, `@ai []` or `[a, b, …]`. Restricted to what a schema
+ * default of `ab ai au ad as` holds; the runtime reads stored values with adwaita-core's
+ * `GLibVariant.parseText`, which this build step cannot depend on.
+ */
+function splitArray(text, type) {
+    const body = text.replace(new RegExp(`^@${type}\\s+`), '');
+    if (!body.startsWith('[') || !body.endsWith(']'))
+        return undefined;
+    const inner = body.slice(1, -1).trim();
+    if (inner === '')
+        return [];
+    const items = [];
+    let start = 0;
+    let quote = '';
+    for (let i = 0; i < inner.length; i++) {
+        const c = inner[i];
+        if (quote) {
+            if (c === '\\')
+                i++;
+            else if (c === quote)
+                quote = '';
+        }
+        else if (c === "'" || c === '"')
+            quote = c;
+        else if (c === ',') {
+            items.push(inner.slice(start, i).trim());
+            start = i + 1;
+        }
+    }
+    if (quote)
+        return undefined;
+    items.push(inner.slice(start).trim());
+    return items.includes('') ? undefined : items;
+}
+/** GVariant text format for the supported types. */
 function parseDefault(raw, type, where) {
     const text = unescapeXml(raw.trim());
+    if (type.length === 2) {
+        const items = splitArray(text, type);
+        const element = type[1];
+        if (items)
+            return items.map((item) => parseBasic(item, element, where));
+        throw new Error(`${where}: default '${text}' is not a valid '${type}' value`);
+    }
+    return parseBasic(text, type, where);
+}
+function parseBasic(text, type, where) {
     if (type === 'b') {
         if (text === 'true' || text === 'false')
             return text === 'true';
@@ -79,7 +125,7 @@ export function parseGschema(xml, file) {
         if (!name)
             throw new Error(`${where}: <key> has no name`);
         if (!type || !KEY_TYPES.has(type)) {
-            throw new Error(`${where}: key '${name}' has type '${type}'; the subset supports b, i, u, d, s`);
+            throw new Error(`${where}: key '${name}' has type '${type}'; the subset supports b, i, u, d, s and arrays of them`);
         }
         const def = /<default\b[^>]*>([\s\S]*?)<\/default>/.exec(m[2]);
         if (!def)
@@ -92,7 +138,12 @@ export function parseGschema(xml, file) {
     return { id, path, keys };
 }
 const SUFFIX = /\.gschema\.xml\?schema(?:&|$)/;
-export function gschemaPlugin({ mode }) {
+/** The `Settings` each port's `Gio` barrel re-exports (ADR 0099). */
+export const GSCHEMA_REGISTER = {
+    browser: '@gjsify/app-settings/browser',
+    nativescript: '@gjsify/app-settings/nativescript',
+};
+export function gschemaPlugin({ mode, register }) {
     return {
         name: GSCHEMA_PLUGIN,
         async resolveId(source, importer) {
@@ -110,7 +161,14 @@ export function gschemaPlugin({ mode }) {
                 return `export default ${JSON.stringify(file)};`;
             const schema = parseGschema(await readFile(file, 'utf8'), file);
             this.addWatchFile(file);
-            return `export default ${JSON.stringify(schema)};`;
+            if (register === undefined)
+                return `export default ${JSON.stringify(schema)};`;
+            return [
+                `import { Settings } from ${JSON.stringify(register)};`,
+                `const schema = ${JSON.stringify(schema)};`,
+                'Settings.register(schema);',
+                'export default schema;',
+            ].join('\n');
         },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.64.2",
+    "version": "0.64.3-next.259",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.js",
@@ -20,7 +20,7 @@
             "default": "./lib/utils/runtime.js"
         },
         "./types": {
-            "types": "./types/gresource.d.ts"
+            "types": "./types/index.d.ts"
         },
         "./shims/console-gjs": {
             "default": "./lib/shims/console-gjs.js"
@@ -67,12 +67,12 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@gjsify/console": "^0.64.2",
-        "@gjsify/resolve-npm": "^0.64.2",
-        "@gjsify/rolldown-plugin-deepkit": "^0.64.2",
-        "@gjsify/rolldown-plugin-pnp": "^0.64.2",
-        "@gjsify/utils": "^0.64.2",
-        "@gjsify/vite-plugin-blueprint": "^0.64.2",
+        "@gjsify/console": "0.64.3-next.259",
+        "@gjsify/resolve-npm": "0.64.3-next.259",
+        "@gjsify/rolldown-plugin-deepkit": "0.64.3-next.259",
+        "@gjsify/rolldown-plugin-pnp": "0.64.3-next.259",
+        "@gjsify/utils": "0.64.3-next.259",
+        "@gjsify/vite-plugin-blueprint": "0.64.3-next.259",
         "@rollup/pluginutils": "^5.4.0",
         "acorn": "^8.17.0",
         "acorn-typescript": "^1.4.13",
@@ -82,7 +82,7 @@
         "sass": "^1.101.0"
     },
     "peerDependencies": {
-        "@gjsify/lightningcss-native": "^0.64.2",
+        "@gjsify/lightningcss-native": "0.64.3-next.259",
         "rolldown": "^1.1.4"
     },
     "peerDependenciesMeta": {
@@ -94,8 +94,8 @@
         }
     },
     "devDependencies": {
-        "@gjsify/cli": "^0.64.2",
-        "@gjsify/unit": "^0.64.2",
+        "@gjsify/cli": "0.64.3-next.259",
+        "@gjsify/unit": "0.64.3-next.259",
         "@types/node": "^25.9.2",
         "rolldown": "^1.1.4",
         "typescript": "^6.0.3"
@@ -107,5 +107,6 @@
             "darwin": "supported",
             "win32": "supported"
         }
-    }
+    },
+    "gitHead": "84f8ece003be30456a8ace70115e480bf3220d47"
 }

package/types/index.d.ts

@@ -0,0 +1,20 @@
+/**
+ * `import bytes from './data/<app-id>.data.gresource.xml'` (ADR 0116 § 1): the loader in
+ * `plugins/gresource.ts` compiles the descriptor with `glib-compile-resources` and the module's
+ * default export is the compiled GResource, for `Gio.Resource.new_from_data(bytes)`.
+ */
+declare module '*.gresource.xml' {
+    const bytes: Uint8Array;
+    export default bytes;
+}
+
+/**
+ * `import './<app-id>.gschema.xml?schema'` (ADR 0099 § 1): on the browser and NativeScript the
+ * loader in `plugins/gschema.ts` parses the schema at build time and registers it with the
+ * `Gio.Settings` subset; on GJS and Node the import is the file's path and GSettings reads the
+ * compiled schema.
+ */
+declare module '*.gschema.xml?schema' {
+    const schema: unknown;
+    export default schema;
+}

package/types/gresource.d.ts

@@ -1,9 +0,0 @@
-/**
- * `import bytes from './data/<app-id>.data.gresource.xml'` (ADR 0116 § 1): the loader in
- * `plugins/gresource.ts` compiles the descriptor with `glib-compile-resources` and the module's
- * default export is the compiled GResource, for `Gio.Resource.new_from_data(bytes)`.
- */
-declare module '*.gresource.xml' {
-    const bytes: Uint8Array;
-    export default bytes;
-}