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

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;
@@ -15,3 +17,4 @@ export interface GschemaPluginOptions {
     mode: 'emit' | 'ignore';
 }
 export declare function gschemaPlugin({ mode }: GschemaPluginOptions): Plugin;
+export {};

package/lib/plugins/gschema.js

@@ -7,12 +7,12 @@
 // the no-op `Settings.register`.
 //
 // 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 +31,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 +124,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)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.64.2",
+    "version": "0.64.3-next.258",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.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.258",
+        "@gjsify/resolve-npm": "0.64.3-next.258",
+        "@gjsify/rolldown-plugin-deepkit": "0.64.3-next.258",
+        "@gjsify/rolldown-plugin-pnp": "0.64.3-next.258",
+        "@gjsify/utils": "0.64.3-next.258",
+        "@gjsify/vite-plugin-blueprint": "0.64.3-next.258",
         "@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.258",
         "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.258",
+        "@gjsify/unit": "0.64.3-next.258",
         "@types/node": "^25.9.2",
         "rolldown": "^1.1.4",
         "typescript": "^6.0.3"
@@ -107,5 +107,6 @@
             "darwin": "supported",
             "win32": "supported"
         }
-    }
+    },
+    "gitHead": "6d2fc430ffaa180a765c59d33c8fa1d5b410b364"
 }