@gjsify/rolldown-plugin-gjsify 0.64.16 → 0.64.17

package/lib/app/nativescript.js

@@ -95,10 +95,26 @@ export const setupForNativescript = async (input) => {
     }
     // Legacy / per-target overrides — kept as a separate Record so future
     // mobile-specific shims (e.g. an NS-equivalent of `@gjsify/process`)
-    // have an explicit landing pad. Today: empty. New entries SHOULD go
-    // into `ALIASES_NODE_FOR_NATIVESCRIPT` so the same wiring is reachable
-    // from the Vite-plugin track (`gjsifyNativescript()` preset) too.
-    const nativescriptOverrideAliases = {};
+    // have an explicit landing pad. New entries SHOULD go into
+    // `ALIASES_NODE_FOR_NATIVESCRIPT` so the same wiring is reachable from
+    // the Vite-plugin track (`gjsifyNativescript()` preset) too — this
+    // record exists only for an entry whose ANSWER depends on the platform
+    // the curated table cannot see (`ALIASES_NODE_FOR_NATIVESCRIPT` is one
+    // flat map for the whole `nativescript` target).
+    //
+    // `gettext` is exactly that: the curated table points it at
+    // `@gjsify/node-gi/gettext`, correct on Android (ADR 0110 § 1's real
+    // engine) but not on iOS/visionOS — there is no node-gi payload there
+    // (`engine-target.ios.ts`), and `@gjsify/node-gi/index.js` loads
+    // `libnode_gi.so` at MODULE EVAL, not behind any call, so merely
+    // bundling the real answer crashes the app before anything of its own
+    // runs. An undetected platform gets the same safe default.
+    const nativescriptOverrideAliases = platform === 'android'
+        ? {}
+        : {
+            gettext: '@gjsify/native-platform/gettext-fallback',
+            'node:gettext': '@gjsify/native-platform/gettext-fallback',
+        };
     // Derived `@gjsify/<X>` aliases driven by per-package `gjsify.runtimes`
     // triplet declarations. Merge order: derived (lowest priority) → curated
     // bare/`node:*` Node-builtin map → per-target overrides → user.

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 { workerUrlPlugin, findWorkerUrls, rewriteWorkerUrls, WorkerEntries, WORKER_URL_PLUGIN, } from './plugins/worker-url.js';
+export { workerUrlPlugin, findWorkerUrls, rewriteWorkerUrls, WorkerEntries, bundleSuffix, WORKER_URL_PLUGIN, } from './plugins/worker-url.js';
 export type { WorkerUrlSite } from './plugins/worker-url.js';
 export { gschemaPlugin, parseGschema, GSCHEMA_PLUGIN, GSCHEMA_REGISTER } from './plugins/gschema.js';
 export type { GschemaOut, GschemaKey, GschemaPluginOptions } from './plugins/gschema.js';
@@ -39,7 +39,7 @@ export type { WorkspaceImportGuardOptions, WorkspaceImportGuardTarget, ImportVer
 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';
 export type { NapiNodeAddonPluginOptions, AddonPackageJson } from './plugins/napi-node-addon.js';
 export { nodeNativeExternalPlugin, isNodeAddonPackage, packageNameOf } from './plugins/node-native-external.js';
-export { platformResolvePlugin, nativescriptSuffixChain, desktopSuffixChain, browserSuffixChain, desktopOsSuffix, DESKTOP_OS_SUFFIXES, DESKTOP_REFUSED_SUFFIXES, BROWSER_REFUSED_SUFFIXES, PlatformVariantExternalError, detectNativescriptPlatform, nativescriptPlatformDefines, } from './plugins/platform-resolve.js';
+export { platformResolvePlugin, nativescriptSuffixChain, NATIVESCRIPT_PLATFORMS, desktopSuffixChain, browserSuffixChain, desktopOsSuffix, DESKTOP_OS_SUFFIXES, DESKTOP_REFUSED_SUFFIXES, BROWSER_REFUSED_SUFFIXES, PlatformVariantExternalError, detectNativescriptPlatform, nativescriptPlatformDefines, } from './plugins/platform-resolve.js';
 export type { PlatformResolvePluginOptions, NativescriptPlatform } from './plugins/platform-resolve.js';
 export { rnRouteManifestPlugin, renderRouteManifest, walkRoutes, RouteManifestError, RN_ROUTES_MODULE_ID, MAX_ROUTE_DEPTH, } from './plugins/rn-route-manifest.js';
 export type { RnRouteManifestOptions, FoundRoute } from './plugins/rn-route-manifest.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 { workerUrlPlugin, findWorkerUrls, rewriteWorkerUrls, WorkerEntries, WORKER_URL_PLUGIN, } from './plugins/worker-url.js';
+export { workerUrlPlugin, findWorkerUrls, rewriteWorkerUrls, WorkerEntries, bundleSuffix, WORKER_URL_PLUGIN, } from './plugins/worker-url.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';
@@ -24,7 +24,7 @@ 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';
 export { nodeNativeExternalPlugin, isNodeAddonPackage, packageNameOf } from './plugins/node-native-external.js';
-export { platformResolvePlugin, nativescriptSuffixChain, desktopSuffixChain, browserSuffixChain, desktopOsSuffix, DESKTOP_OS_SUFFIXES, DESKTOP_REFUSED_SUFFIXES, BROWSER_REFUSED_SUFFIXES, PlatformVariantExternalError, detectNativescriptPlatform, nativescriptPlatformDefines, } from './plugins/platform-resolve.js';
+export { platformResolvePlugin, nativescriptSuffixChain, NATIVESCRIPT_PLATFORMS, desktopSuffixChain, browserSuffixChain, desktopOsSuffix, DESKTOP_OS_SUFFIXES, DESKTOP_REFUSED_SUFFIXES, BROWSER_REFUSED_SUFFIXES, PlatformVariantExternalError, detectNativescriptPlatform, nativescriptPlatformDefines, } from './plugins/platform-resolve.js';
 export { rnRouteManifestPlugin, renderRouteManifest, walkRoutes, RouteManifestError, RN_ROUTES_MODULE_ID, MAX_ROUTE_DEPTH, } from './plugins/rn-route-manifest.js';
 export { reactNativeAliasPlugin, classifyReactNativeSpecifier, couldBeSurfaceSpecifier, loadLayer, FALLBACK_SURFACES, REACT_NATIVE_ALIAS_TARGET, REACT_NATIVE_SPECIFIER, ReactNativeDeepImportError, ReactNativeAliasTargetMissingError, SURFACE_MENTION, SURFACE_NAME_PREFIXES, } from './plugins/react-native-alias.js';
 export { reactNativeSupportGatePlugin, loadSupportTable, findSupportViolations, formatSupportViolations, formatOpaqueReference, formatUnreadableModule, SUPPORT_TABLE_SUBPATH, WATCHED_SPECIFIERS, watchedSpecifiers, ReactNativeUnsupportedImportError, SupportTableUnreadableError, } from './plugins/react-native-gate.js';

package/lib/plugins/nativescript-gi-selection.d.ts

@@ -3,6 +3,11 @@ export declare const NATIVESCRIPT_GI_SELECTION_PLUGIN = "gjsify-nativescript-gi-
 export interface NativescriptGiSelectionOptions {
     /** `giNamespaces` as the app declares it, `Ns` or `Ns-Version`. */
     declared: readonly string[];
+    /**
+     * The app's dependency names. When given, a selection that needs an add-on package
+     * (ADR 0117 § 1) fails naming it; left out, only the namespace check runs.
+     */
+    installed?: readonly string[];
 }
 /**
  * Refuse a NativeScript bundle that imports a GI namespace the APK was not told to

package/lib/plugins/nativescript-gi-selection.js

@@ -28,7 +28,7 @@
 // The scan is a LOWER BOUND, so only one direction is fatal — the asymmetry
 // `gi-selection.ts` carries in full.
 import { scanGiNamespaces } from '../utils/gi-namespaces.js';
-import { assertGiNamespaceEntries, planGiSelection } from '../utils/gi-selection.js';
+import { assertGiNamespaceEntries, planGiAddons, planGiSelection } from '../utils/gi-selection.js';
 export const NATIVESCRIPT_GI_SELECTION_PLUGIN = 'gjsify-nativescript-gi-selection';
 /**
  * Refuse a NativeScript bundle that imports a GI namespace the APK was not told to
@@ -64,6 +64,14 @@ export function nativescriptGiSelectionPlugin(options) {
                 const files = [...new Set(origin.values())].sort().join(', ');
                 throw new Error(`${NATIVESCRIPT_GI_SELECTION_PLUGIN}: ${error.message} (read from ${files})`);
             }
+            if (options.installed) {
+                try {
+                    planGiAddons({ selected: selection.selected, installed: options.installed });
+                }
+                catch (error) {
+                    throw new Error(`${NATIVESCRIPT_GI_SELECTION_PLUGIN}: ${error.message}`);
+                }
+            }
             for (const namespace of selection.unscanned) {
                 this.warn(`${NATIVESCRIPT_GI_SELECTION_PLUGIN}: giNamespaces declares ${namespace}, which the bundle ` +
                     'does not appear to import. The APK carries it anyway — drop it if nothing needs it, ' +

package/lib/plugins/platform-resolve.d.ts

@@ -1,5 +1,6 @@
 import type { Plugin } from 'rolldown';
 export type NativescriptPlatform = 'android' | 'ios' | 'visionos';
+export declare const NATIVESCRIPT_PLATFORMS: readonly NativescriptPlatform[];
 /**
  * The desktop suffix for one host OS, keyed by `process.platform`.
  *

package/lib/plugins/platform-resolve.js

@@ -36,12 +36,12 @@
 // gjsify Rolldown/Vite plugin pipeline.
 import { readdirSync } from 'node:fs';
 import { basename, dirname, resolve as resolvePath } from 'node:path';
-const PLATFORMS = ['android', 'ios', 'visionos'];
+export const NATIVESCRIPT_PLATFORMS = ['android', 'ios', 'visionos'];
 // JS/TS extensions a source specifier may carry. Stripped so the platform
 // suffix lands BEFORE the extension (`./foo.js` → `./foo.android`).
 const KNOWN_EXT_RE = /\.(tsx?|jsx?|mts|cts|mjs|cjs)$/;
 function isPlatform(value) {
-    return PLATFORMS.includes(value);
+    return NATIVESCRIPT_PLATFORMS.includes(value);
 }
 /**
  * The desktop suffix for one host OS, keyed by `process.platform`.

package/lib/plugins/worker-url.d.ts

@@ -21,7 +21,10 @@ export declare function findWorkerUrls(code: string, id: string): WorkerUrlSite[
 export declare class WorkerEntries {
     #private;
     readonly extension: string;
-    /** @param extension the main bundle's extension (`.js`, `.mjs`), mirrored so a worker loads like its parent. */
+    /**
+     * @param extension the main bundle's whole suffix (`.js`, `.mjs`, `.gjs.mjs`, see {@link bundleSuffix}),
+     * mirrored so a worker loads like its parent and a per-target build into one dir keeps its own file.
+     */
     constructor(extension?: string);
     /** The file name (no directory) the worker built from `source` gets beside the bundle. */
     register(source: string): string;
@@ -31,6 +34,12 @@ export declare class WorkerEntries {
         fileName: string;
     }[];
 }
+/**
+ * Everything after the first dot of the main outfile's name: `app.gjs.mjs` → `.gjs.mjs`. An app
+ * that builds per target into one dir (`app.gjs.mjs`, `app.node.mjs`) would otherwise get one
+ * `w.worker.mjs` from both builds, the second overwriting the first.
+ */
+export declare function bundleSuffix(outfile: string): string;
 /** `code` with each resolvable worker URL pointed at its emitted file, or null when nothing changed. */
 export declare function rewriteWorkerUrls(code: string, id: string, resolveSource: (specifier: string) => Promise<string | null>, entries: WorkerEntries): Promise<string | null>;
 /**

package/lib/plugins/worker-url.js

@@ -123,7 +123,10 @@ export class WorkerEntries {
     #names = new Map();
     #taken = new Set();
     #built = new Set();
-    /** @param extension the main bundle's extension (`.js`, `.mjs`), mirrored so a worker loads like its parent. */
+    /**
+     * @param extension the main bundle's whole suffix (`.js`, `.mjs`, `.gjs.mjs`, see {@link bundleSuffix}),
+     * mirrored so a worker loads like its parent and a per-target build into one dir keeps its own file.
+     */
     constructor(extension = '.js') {
         this.extension = extension;
     }
@@ -153,6 +156,16 @@ export class WorkerEntries {
         return pending;
     }
 }
+/**
+ * Everything after the first dot of the main outfile's name: `app.gjs.mjs` → `.gjs.mjs`. An app
+ * that builds per target into one dir (`app.gjs.mjs`, `app.node.mjs`) would otherwise get one
+ * `w.worker.mjs` from both builds, the second overwriting the first.
+ */
+export function bundleSuffix(outfile) {
+    const name = basename(outfile).replace(/^\.+/, '');
+    const dot = name.indexOf('.');
+    return dot === -1 ? '.js' : name.slice(dot);
+}
 /** FNV-1a over the path, base 36 — stable across builds and engines, no crypto dependency. */
 function pathHash(path) {
     let hash = 0x811c9dc5;

package/lib/utils/gi-selection.d.ts

@@ -29,3 +29,29 @@ export declare function planGiSelection({ declared, scanned }: {
     declared: string[];
     scanned: string[];
 }): GiSelection;
+/**
+ * The add-on packages that provide namespaces the core AAR does not carry (ADR 0117 § 1).
+ *
+ * A static table, not a read of installed manifests: the whole point is to name an add-on
+ * that is NOT installed. `packages/node-gi/node-gi/test/gi-runtime-android.test.mjs` holds
+ * it equal to each add-on's `gjsify.giRuntime.namespaces`, so it cannot drift.
+ */
+export declare const GI_ADDONS: readonly {
+    package: string;
+    namespaces: readonly string[];
+}[];
+/**
+ * Refuse a selection whose namespaces an add-on provides, when that add-on is not a
+ * dependency of the app. Without it the APK carries no typelib for the namespace and the
+ * import throws on the device, naming a missing file rather than the package to install.
+ *
+ * A selection the core carries alone passes untouched, so today's apps change nothing.
+ *
+ * @param spec.selected {@link GiSelection.selected}
+ * @param spec.installed the app's dependency names
+ * @throws naming each missing add-on and the namespaces that need it
+ */
+export declare function planGiAddons({ selected, installed, }: {
+    selected: readonly string[];
+    installed: readonly string[];
+}): void;

package/lib/utils/gi-selection.js

@@ -92,3 +92,44 @@ export function planGiSelection({ declared, scanned }) {
         .sort();
     return { selected: [...byNamespace.values()].sort(), unscanned };
 }
+/**
+ * The add-on packages that provide namespaces the core AAR does not carry (ADR 0117 § 1).
+ *
+ * A static table, not a read of installed manifests: the whole point is to name an add-on
+ * that is NOT installed. `packages/node-gi/node-gi/test/gi-runtime-android.test.mjs` holds
+ * it equal to each add-on's `gjsify.giRuntime.namespaces`, so it cannot drift.
+ */
+export const GI_ADDONS = [
+    {
+        package: '@gjsify/gi-runtime-android-gtk',
+        namespaces: ['Adw', 'Gdk', 'GdkPixbuf', 'Graphene', 'Gsk', 'Gtk', 'HarfBuzz', 'Pango', 'PangoCairo'],
+    },
+];
+/**
+ * Refuse a selection whose namespaces an add-on provides, when that add-on is not a
+ * dependency of the app. Without it the APK carries no typelib for the namespace and the
+ * import throws on the device, naming a missing file rather than the package to install.
+ *
+ * A selection the core carries alone passes untouched, so today's apps change nothing.
+ *
+ * @param spec.selected {@link GiSelection.selected}
+ * @param spec.installed the app's dependency names
+ * @throws naming each missing add-on and the namespaces that need it
+ */
+export function planGiAddons({ selected, installed, }) {
+    const have = new Set(installed);
+    const wanted = new Set(selected.map(namespaceOf));
+    const problems = [];
+    for (const addon of GI_ADDONS) {
+        if (have.has(addon.package))
+            continue;
+        const needed = addon.namespaces.filter((ns) => wanted.has(ns));
+        if (needed.length > 0)
+            problems.push(`${needed.join(', ')} need ${addon.package}`);
+    }
+    if (problems.length > 0) {
+        throw new Error(`nativescript.giNamespaces selects namespaces the core GI runtime does not carry: ${problems.join('; ')}. ` +
+            "Add the package to the app's dependencies (next to @gjsify/gi-runtime-android, same version), " +
+            'or drop the namespace.');
+    }
+}

package/lib/utils/index.d.ts

@@ -14,5 +14,5 @@ export { staticStringValue, walkModuleAst, importedSpecifier, moduleSpecifiers }
 export type { SpecifierNode, AstNode } from './module-ast.js';
 export { scanGiNamespaces, scanGiRequirements, giSpecifierKey } from './gi-namespaces.js';
 export type { GiRequirements } from './gi-namespaces.js';
-export { planGiSelection, assertGiNamespaceEntries } from './gi-selection.js';
+export { planGiSelection, planGiAddons, assertGiNamespaceEntries, GI_ADDONS } from './gi-selection.js';
 export type { GiSelection } from './gi-selection.js';

package/lib/utils/index.js

@@ -11,4 +11,4 @@ export { locateSurvivingJsx, classifyJsxParseFailure, formatSurvivingJsx } from
 export { wrapInputWithSideEffects } from './entry-wrapper.js';
 export { staticStringValue, walkModuleAst, importedSpecifier, moduleSpecifiers } from './module-ast.js';
 export { scanGiNamespaces, scanGiRequirements, giSpecifierKey } from './gi-namespaces.js';
-export { planGiSelection, assertGiNamespaceEntries } from './gi-selection.js';
+export { planGiSelection, planGiAddons, assertGiNamespaceEntries, GI_ADDONS } from './gi-selection.js';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.64.16",
+    "version": "0.64.17",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.js",
@@ -67,13 +67,13 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@gjsify/console": "^0.64.16",
-        "@gjsify/resolve-npm": "^0.64.16",
-        "@gjsify/rolldown-plugin-deepkit": "^0.64.16",
-        "@gjsify/rolldown-plugin-pnp": "^0.64.16",
-        "@gjsify/utils": "^0.64.16",
-        "@gjsify/vite-plugin-blueprint": "^0.64.16",
-        "@gjsify/vite-plugin-gettext": "^0.64.16",
+        "@gjsify/console": "^0.64.17",
+        "@gjsify/resolve-npm": "^0.64.17",
+        "@gjsify/rolldown-plugin-deepkit": "^0.64.17",
+        "@gjsify/rolldown-plugin-pnp": "^0.64.17",
+        "@gjsify/utils": "^0.64.17",
+        "@gjsify/vite-plugin-blueprint": "^0.64.17",
+        "@gjsify/vite-plugin-gettext": "^0.64.17",
         "@rollup/pluginutils": "^5.4.0",
         "acorn": "^8.17.0",
         "acorn-typescript": "^1.4.13",
@@ -83,7 +83,7 @@
         "sass": "^1.101.0"
     },
     "peerDependencies": {
-        "@gjsify/lightningcss-native": "^0.64.16",
+        "@gjsify/lightningcss-native": "^0.64.17",
         "rolldown": "^1.1.4"
     },
     "peerDependenciesMeta": {
@@ -95,8 +95,8 @@
         }
     },
     "devDependencies": {
-        "@gjsify/cli": "^0.64.16",
-        "@gjsify/unit": "^0.64.16",
+        "@gjsify/cli": "^0.64.17",
+        "@gjsify/unit": "^0.64.17",
         "@types/node": "^25.9.2",
         "rolldown": "^1.1.4",
         "typescript": "^6.0.3"