@gjsify/rolldown-plugin-gjsify 0.56.0 → 0.57.0

package/lib/app/browser.js

@@ -28,6 +28,7 @@ import { globToEntryPoints } from '../utils/entry-points.js';
 import { gjsImportsEmptyPlugin } from '../plugins/gjs-imports-empty.js';
 import { platformResolvePlugin, browserSuffixChain, BROWSER_REFUSED_SUFFIXES } from '../plugins/platform-resolve.js';
 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 { implicitGlobalAssignPlugin } from '../plugins/implicit-global-assign.js';
@@ -135,7 +136,9 @@ export const setupForBrowser = async (input) => {
         // its bytes and was never parsed by anything. It stays — a `--app browser` build of a
         // GJS app's sources must not start failing on an import that used to resolve — and the
         // exit a browser can actually use is now beside it.
-        blueprintPlugin(),
+        // `./x.blp?template` (ADR 0096 § 4): the tree checked against the renderer this target's
+        // `--gi-renderer` arm names, or a refusal naming the flag. Never the XML string here.
+        blueprintPlugin({ template: blueprintTemplateExit('browser', giRenderer) }),
         // ADR 0079's addendum. The `window` define above replaces an assignment TARGET as
         // readily as a read, so `window = {…}` would emit `globalThis = {…}` — code that
         // replaces the whole global object. This transform runs first and leaves the define

package/lib/app/nativescript.js

@@ -44,6 +44,7 @@ import { ALIASES_NODE_FOR_NATIVESCRIPT, GI_RENDERERS, getDerivedAliasesSync } fr
 import { globToEntryPoints } from '../utils/entry-points.js';
 import { gjsImportsEmptyPlugin } from '../plugins/gjs-imports-empty.js';
 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 { implicitGlobalAssignPlugin } from '../plugins/implicit-global-assign.js';
@@ -159,7 +160,9 @@ export const setupForNativescript = async (input) => {
         // READER of the shared node shape, and the projection is what this target
         // consumes. A `.blp` whose projection loses anything is refused at build time
         // rather than rendered partially; see `SHARED_TREE_QUERY` in the plugin.
-        blueprintPlugin(),
+        // `./x.blp?template` (ADR 0096 § 4): the tree checked against the renderer this target's
+        // `--gi-renderer` arm names, or a refusal naming the flag. Never the XML string here.
+        blueprintPlugin({ template: blueprintTemplateExit('nativescript', giRenderer) }),
         // ADR 0079's addendum, and the `define` comment above is why it is needed here:
         // 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 = …`

package/lib/plugins/gi-renderer.d.ts

@@ -6,6 +6,8 @@ export interface GiRendererOptions {
     renderer: string;
     /** GI namespace → the version this arm answers for, from `@gjsify/resolve-npm`. */
     namespaces: Readonly<Record<string, string>>;
+    /** Namespace → a module whose exports ARE that namespace, when it is not a member of `renderer`'s root barrel. */
+    specifiers?: Readonly<Record<string, string>>;
 }
 /**
  * The runtime shim for one answered namespace.

package/lib/plugins/gi-renderer.js

@@ -68,6 +68,13 @@
 import { GJSIFY_VIRTUAL_PREFIX } from '../utils/virtual-module-id.js';
 import { parseGiSpecifier } from './gjs-gi-node.js';
 const GI_RENDERER_VIRTUAL_PREFIX = `${GJSIFY_VIRTUAL_PREFIX}gi-renderer:`;
+/** A namespace with its own module IS that module; otherwise it is a member of the renderer's root barrel. */
+function importLine(options, namespace) {
+    const own = options.specifiers?.[namespace];
+    return own === undefined
+        ? `import { ${namespace} as namespace } from ${JSON.stringify(options.renderer)};\n`
+        : `import * as namespace from ${JSON.stringify(own)};\n`;
+}
 /**
  * The runtime shim for one answered namespace.
  *
@@ -93,7 +100,7 @@ const GI_RENDERER_VIRTUAL_PREFIX = `${GJSIFY_VIRTUAL_PREFIX}gi-renderer:`;
  * the other twelve sites and the retirement condition are in `status/open-todos/README.md`.
  */
 export function giRendererShimSource(options, namespace, version) {
-    return (`import { ${namespace} as namespace } from ${JSON.stringify(options.renderer)};\n` +
+    return (importLine(options, namespace) +
         `const RENDERER = ${JSON.stringify(options.renderer)};\n` +
         `const APP = ${JSON.stringify(options.app)};\n` +
         `const NS = ${JSON.stringify(namespace)};\n` +

package/lib/utils/blueprint-template-exit.d.ts

@@ -0,0 +1,13 @@
+/**
+ * What `./x.blp?template` means on a target with no GtkBuilder (ADR 0096 § 4): the projected
+ * tree, checked against the renderer the target's `--gi-renderer` arm names, so the import site
+ * writes no `for=`. Without the arm there is no renderer to check against and no reader for the
+ * XML string, so the import is refused at build time, naming the flag.
+ */
+export declare function blueprintTemplateExit(app: string, giRenderer: {
+    renderer: string;
+} | undefined): {
+    renderer: string;
+} | {
+    refusal: string;
+};

package/lib/utils/blueprint-template-exit.js

@@ -0,0 +1,16 @@
+/**
+ * What `./x.blp?template` means on a target with no GtkBuilder (ADR 0096 § 4): the projected
+ * tree, checked against the renderer the target's `--gi-renderer` arm names, so the import site
+ * writes no `for=`. Without the arm there is no renderer to check against and no reader for the
+ * XML string, so the import is refused at build time, naming the flag.
+ */
+export function blueprintTemplateExit(app, giRenderer) {
+    if (giRenderer === undefined) {
+        return {
+            refusal: `On --app ${app} it is the projected tree of the renderer --gi-renderer composes, and ` +
+                'that flag is off. Pass --gi-renderer, or import the file without `?template`.',
+        };
+    }
+    // `for=` names the package without its scope.
+    return { renderer: giRenderer.renderer.replace(/^@gjsify\//, '') };
+}

package/package.json

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