@gjsify/rolldown-plugin-gjsify 0.59.1 → 0.61.0

package/lib/app/browser.js

@@ -31,6 +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 { implicitGlobalAssignPlugin } from '../plugins/implicit-global-assign.js';
 export const setupForBrowser = async (input) => {
     const userExternal = input.userExternal ?? [];
@@ -143,6 +144,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' }),
         implicitGlobalAssignPlugin(),
         cssAsStringPlugin(),
         // `order: 'post'` — see app/gjs.ts. The browser target's whole job is to

package/lib/app/gjs.js

@@ -21,6 +21,7 @@ import { nodeModulesPathRewritePlugin, getBundleDirFromOutput } from '../plugins
 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 { implicitGlobalAssignPlugin } from '../plugins/implicit-global-assign.js';
 import { shebangPlugin, resolveShebangLine, inputShebangStripPlugin } from '../plugins/shebang.js';
 import { wrapInputWithSideEffects } from '../utils/entry-wrapper.js';
@@ -201,6 +202,7 @@ export const setupForGjs = async (input) => {
         // define in `transform.define` replaces the assignment TARGET, emitting
         // `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' }),
         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.d.ts

@@ -16,4 +16,5 @@ export interface NativescriptFactoryInput {
     userAliases?: Record<string, string>;
     pluginOptions: PluginOptions;
 }
+export declare const NATIVESCRIPT_CORE_EXTERNAL_PLUGIN = "gjsify-nativescript-core-external";
 export declare const setupForNativescript: (input: NativescriptFactoryInput) => Promise<NativescriptBuildConfig>;

package/lib/app/nativescript.js

@@ -47,15 +47,31 @@ 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 { 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
 // the workspace install, it was not resolvable either — every UI-widget bridge failed to build.
 const NATIVESCRIPT_CORE = /^@nativescript\/core(?:\/|$)/;
+export const NATIVESCRIPT_CORE_EXTERNAL_PLUGIN = 'gjsify-nativescript-core-external';
+/**
+ * Externalize `@nativescript/core` and its subpaths as a resolveId hook rather than as a RegExp
+ * in `external`. The native rolldown engine — which is what the GJS-hosted `gjsify` CLI uses, so
+ * every `gjsify build --app nativescript` outside a Node host — accepts only exact strings there
+ * and FAILS THE BUILD on a RegExp: "`external` entries must be exact string names under the
+ * native rolldown engine". A subpath set cannot be enumerated, and dropping the subpath arm would
+ * bundle a second core instance, so the hook is the only shape that holds on both engines.
+ */
+const nativescriptCoreExternalPlugin = () => ({
+    name: NATIVESCRIPT_CORE_EXTERNAL_PLUGIN,
+    resolveId: (id) => (NATIVESCRIPT_CORE.test(id) ? { id, external: true } : null),
+});
 export const setupForNativescript = async (input) => {
     const userExternal = input.userExternal ?? [];
-    const external = [...userExternal, NATIVESCRIPT_CORE];
-    const isExternal = (id) => external.some((entry) => (typeof entry === 'string' ? entry === id : entry.test(id)));
+    // Only the caller's EXACT names go to the engine; the core subpath set is a hook (see
+    // `nativescriptCoreExternalPlugin`). `isExternal` still has to know about both, or the
+    // unresolved-workspace guard would report a `@nativescript/core/x` the build externalizes.
+    const isExternal = (id) => userExternal.some((entry) => entry === id) || NATIVESCRIPT_CORE.test(id);
     const exclude = input.pluginOptions.exclude ?? [];
     const entryPoints = await globToEntryPoints(input.input, exclude);
     // The arm is composed only when asked for. `config.ts` already refuses the flag
@@ -100,7 +116,7 @@ export const setupForNativescript = async (input) => {
         // host environment is provided by the NS runtime at load time, not
         // by V8 itself.
         platform: 'browser',
-        external,
+        external: userExternal,
         resolve: {
             mainFields: ['nativescript', 'module', 'main'],
             conditionNames: ['import', 'nativescript'],
@@ -140,6 +156,10 @@ export const setupForNativescript = async (input) => {
     // transform can strip the annotations out from under it (see `GjsifyConfig`).
     const prePlugins = [deepkitPlugin({ reflection: input.pluginOptions.reflection })];
     const plugins = [
+        // FIRST: `@nativescript/core` must leave as an import before any other resolver can
+        // claim it — `aliasPlugin` and the platform-suffix chain both match on specifier
+        // shape and would otherwise pull a second core instance into the bundle.
+        nativescriptCoreExternalPlugin(),
         // ADR 0034 stage 9 — the `gi://` arm, ahead of the empty redirect so it
         // claims the specifier first, exactly as `gjsGiNodePlugin` does on the node
         // target. `emptyGirs` follows it: with the arm on, `@girs/<ns>-<ver>` must
@@ -167,6 +187,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' }),
         implicitGlobalAssignPlugin(),
         // NO cssAsStringPlugin — NS ships its own CSS pipeline via
         // @nativescript/core; .css imports are handled by the consuming

package/lib/app/node.js

@@ -11,6 +11,7 @@ import { cssAsStringPlugin } from '../plugins/css-as-string.js';
 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 { implicitGlobalAssignPlugin } from '../plugins/implicit-global-assign.js';
 import { unresolvedWorkspaceImportPlugin } from '../plugins/unresolved-workspace-import.js';
 import { nodeNativeExternalPlugin } from '../plugins/node-native-external.js';
@@ -351,6 +352,7 @@ export const setupForNode = async (input) => {
         // in a strict module body that write is a `ReferenceError` (map-editor#300).
         // `globalThis.window = {…}` is the same statement, the guard is untouched, and
         // nothing defines `window`.
+        gschemaPlugin({ mode: 'ignore' }),
         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

@@ -13,6 +13,8 @@ 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 type { GschemaOut, GschemaKey, GschemaPluginOptions } from './plugins/gschema.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';
@@ -21,6 +23,7 @@ export type { ShebangPluginOptions } from './plugins/shebang.js';
 export { aliasPlugin } from './plugins/alias.js';
 export type { AliasPluginOptions } from './plugins/alias.js';
 export { gjsImportsEmptyPlugin } from './plugins/gjs-imports-empty.js';
+export { giRendererPlugin } from './plugins/gi-renderer.js';
 export { externalsPlugin } from './plugins/externals.js';
 export type { ExternalsPredicate, ExternalsPluginOptions } from './plugins/externals.js';
 export { unresolvedWorkspaceImportPlugin, classifyImport, isWorkspaceSpecifier, formatUnresolvedWorkspaceImport, buildReverseAliasIndex, UnresolvedWorkspaceImportError, } from './plugins/unresolved-workspace-import.js';

package/lib/index.js

@@ -9,11 +9,13 @@ 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 { 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';
 export { aliasPlugin } from './plugins/alias.js';
 export { gjsImportsEmptyPlugin } from './plugins/gjs-imports-empty.js';
+export { giRendererPlugin } from './plugins/gi-renderer.js';
 export { externalsPlugin } from './plugins/externals.js';
 export { unresolvedWorkspaceImportPlugin, classifyImport, isWorkspaceSpecifier, formatUnresolvedWorkspaceImport, buildReverseAliasIndex, UnresolvedWorkspaceImportError, } from './plugins/unresolved-workspace-import.js';
 export { napiNodeAddonPlugin, resolveAddonPath, enumerateAddonTargets, nearestPackageRoot, classifySpecifier, directNodeShim, nodeGypBuildShim, bindingsShim, napiRsShim, ADDON_FILTER_RE, isNapiRsPackageJson, isNapiRsSibling, isGjsifyNativeBridge, detectNapiRsEntry, hostNapiRsTriple, AddonNotBuiltError, } from './plugins/napi-node-addon.js';

package/lib/plugins/gschema.d.ts

@@ -0,0 +1,17 @@
+import type { Plugin } from 'rolldown';
+export declare const GSCHEMA_PLUGIN = "gjsify-gschema";
+export interface GschemaKey {
+    type: 'b' | 'i' | 'u' | 'd' | 's';
+    default: boolean | number | string;
+}
+export interface GschemaOut {
+    id: string;
+    path: string;
+    keys: Record<string, GschemaKey>;
+}
+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';
+}
+export declare function gschemaPlugin({ mode }: GschemaPluginOptions): Plugin;

package/lib/plugins/gschema.js

@@ -0,0 +1,116 @@
+// `./x.gschema.xml?schema` (ADR 0099 § 1): the schema a `Settings` is registered with.
+//
+// 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`.
+//
+// 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
+// `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 REFUSED_TAGS = ['range', 'choices', 'enum', 'flags', 'child', 'override'];
+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);
+}
+function unescapeXml(s) {
+    return s
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&quot;/g, '"')
+        .replace(/&apos;/g, "'")
+        .replace(/&amp;/g, '&');
+}
+/** GVariant text format for the five supported types. */
+function parseDefault(raw, type, where) {
+    const text = unescapeXml(raw.trim());
+    if (type === 'b') {
+        if (text === 'true' || text === 'false')
+            return text === 'true';
+    }
+    else if (type === 's') {
+        const m = /^(?:'((?:[^'\\]|\\.)*)'|"((?:[^"\\]|\\.)*)")$/.exec(text);
+        if (m)
+            return (m[1] ?? m[2]).replace(/\\(.)/g, '$1');
+    }
+    else {
+        const n = Number(text);
+        if (text !== '' && Number.isFinite(n) && (type === 'd' || Number.isInteger(n)) && !(type === 'u' && n < 0)) {
+            return n;
+        }
+    }
+    throw new Error(`${where}: default '${text}' is not a valid '${type}' value`);
+}
+export function parseGschema(xml, file) {
+    const source = xml.replace(/<!--[\s\S]*?-->/g, (c) => c.replace(/[^\n]/g, ' '));
+    for (const tag of REFUSED_TAGS) {
+        const hit = new RegExp(`<${tag}[\\s>/]`).exec(source);
+        if (hit) {
+            throw new Error(`${file}:${lineOf(source, hit.index)}: <${tag}> is not part of the Gio.Settings subset (ADR 0099 § 1)`);
+        }
+    }
+    const schemas = [...source.matchAll(/<schema\b[^>]*>/g)];
+    if (schemas.length !== 1) {
+        throw new Error(`${file}: expected exactly one <schema>, found ${schemas.length} (ADR 0099 § 1)`);
+    }
+    const head = schemas[0];
+    const id = attr(head[0], 'id');
+    const path = attr(head[0], 'path');
+    const at = `${file}:${lineOf(source, head.index)}`;
+    if (!id)
+        throw new Error(`${at}: <schema> has no id`);
+    if (!path)
+        throw new Error(`${at}: <schema id="${id}"> has no path; the browser and Android need one to build a storage key`);
+    const keys = {};
+    for (const m of source.matchAll(/<key\b([^>]*)>([\s\S]*?)<\/key>/g)) {
+        const where = `${file}:${lineOf(source, m.index)}`;
+        const name = attr(m[1], 'name');
+        const type = attr(m[1], 'type');
+        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`);
+        }
+        const def = /<default\b[^>]*>([\s\S]*?)<\/default>/.exec(m[2]);
+        if (!def)
+            throw new Error(`${where}: key '${name}' has no <default>`);
+        keys[name] = {
+            type: type,
+            default: parseDefault(def[1], type, `${where}: key '${name}'`),
+        };
+    }
+    return { id, path, keys };
+}
+const SUFFIX = /\.gschema\.xml\?schema(?:&|$)/;
+export function gschemaPlugin({ mode }) {
+    return {
+        name: GSCHEMA_PLUGIN,
+        async resolveId(source, importer) {
+            if (!SUFFIX.test(source))
+                return null;
+            const file = source.slice(0, source.indexOf('?'));
+            const resolved = await this.resolve(file, importer, { skipSelf: true });
+            return resolved === null ? null : `${resolved.id}${source.slice(source.indexOf('?'))}`;
+        },
+        async load(id) {
+            if (!SUFFIX.test(id))
+                return null;
+            const file = id.slice(0, id.indexOf('?'));
+            if (mode === 'ignore')
+                return `export default ${JSON.stringify(file)};`;
+            const schema = parseGschema(await readFile(file, 'utf8'), file);
+            this.addWatchFile(file);
+            return `export default ${JSON.stringify(schema)};`;
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.59.1",
+    "version": "0.61.0",
     "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.59.1",
-        "@gjsify/resolve-npm": "^0.59.1",
-        "@gjsify/rolldown-plugin-deepkit": "^0.59.1",
-        "@gjsify/rolldown-plugin-pnp": "^0.59.1",
-        "@gjsify/utils": "^0.59.1",
-        "@gjsify/vite-plugin-blueprint": "^0.59.1",
+        "@gjsify/console": "^0.61.0",
+        "@gjsify/resolve-npm": "^0.61.0",
+        "@gjsify/rolldown-plugin-deepkit": "^0.61.0",
+        "@gjsify/rolldown-plugin-pnp": "^0.61.0",
+        "@gjsify/utils": "^0.61.0",
+        "@gjsify/vite-plugin-blueprint": "^0.61.0",
         "@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.59.1",
+        "@gjsify/lightningcss-native": "^0.61.0",
         "rolldown": "^1.1.4"
     },
     "peerDependenciesMeta": {
@@ -90,8 +90,8 @@
         }
     },
     "devDependencies": {
-        "@gjsify/cli": "^0.59.1",
-        "@gjsify/unit": "^0.59.1",
+        "@gjsify/cli": "^0.61.0",
+        "@gjsify/unit": "^0.61.0",
         "@types/node": "^25.9.2",
         "rolldown": "^1.1.4",
         "typescript": "^6.0.3"