@gjsify/node-gi 0.64.4 → 0.64.5

package/gi.js

@@ -17,6 +17,7 @@ import {
     clearInterval,
     runtimeProcess,
     windowingEnvWrites,
+    bundledLocaleDir,
     FOREIGN_PARENT_CLASSES,
 } from '#host';
 import { createGioDBus } from './overrides/gio-dbus.js';
@@ -1289,6 +1290,7 @@ function flushPropertiesToJsSetters(instance, handle, reg) {
 // process loop) — for concurrent runtime-loop + GLib work there, drive GLib with
 // startMainContextPump instead of a blocking run.
 function applicationRunAsync(handle) {
+    armBundledTextDomains(handle);
     return new Promise((resolve, reject) => {
         setImmediate(() => {
             try {
@@ -1300,6 +1302,37 @@ function applicationRunAsync(handle) {
     });
 }
 
+// ---- the GTK runtime bundle's own catalogs ----
+//
+// gtk_init, adw_init, gtk_source_init and GLib's first translated message each call
+// bindtextdomain(<domain>, <dir compiled into the build host>) — on the darwin bundle a
+// Homebrew Cellar path a user's Mac does not have, so GTK's own strings (Adw widgets, entry
+// context menus, shortcuts) stayed English under a German locale. Measured: the domains read
+// /opt/homebrew/Cellar/{gtk4,libadwaita}/… in a `startup` handler and NOT before `run()`, so
+// any earlier binding is undone. Armed on `register` and `run` (either emits `startup`), the
+// handler runs right after GApplication's
+// RUN_FIRST class closure (where those inits happen) and before `activate` builds the UI.
+// An app that builds widgets in its OWN startup handler connected before `run()` sees them
+// first, untranslated. Armed only when the loader found catalogs in the bundle.
+const BUNDLED_TEXT_DOMAINS = ['gtk40', 'libadwaita', 'glib20', 'gtksourceview-5'];
+const textDomainsArmed = new WeakSet();
+
+function armBundledTextDomains(handle) {
+    const dir = bundledLocaleDir();
+    if (dir === undefined || textDomainsArmed.has(handle)) return;
+    // `run` is not only GApplication's (GtkDialog, GTask, …), and only it emits `startup`.
+    if (!native.isInstanceOf(handle, 'Gio', 'Application')) return;
+    textDomainsArmed.add(handle);
+    native.connectSignal(
+        handle,
+        'startup',
+        wrapSignalCallback(() => {
+            for (const domain of BUNDLED_TEXT_DOMAINS) native.bindtextdomain(domain, dir);
+        }),
+        false,
+    );
+}
+
 // ---- portable GLib main-context pump (Bun/Deno) ----
 //
 // On Node the uv-in-GLib bridge co-pumps libuv during a blocking GLib loop, so a
@@ -1676,7 +1709,10 @@ function wrapInstance(handle, userProto) {
         let thunk = giMethodThunks[prop];
         if (thunk === undefined) {
             thunk = instanceHasMethod(handle, prop)
-                ? (...args) => wrapReturn(native.callMethod(handle, prop, unwrapArgs(args)))
+                ? (...args) => {
+                      if (prop === 'run' || prop === 'register') armBundledTextDomains(handle);
+                      return wrapReturn(native.callMethod(handle, prop, unwrapArgs(args)));
+                  }
                 : null;
             giMethodThunks[prop] = thunk;
         }
@@ -1979,6 +2015,7 @@ function makeGiMethod(where, method, arity) {
         // the registration is honoured here, where the instance is known.
         const promisified = promisifiedMethods.size === 0 ? undefined : resolveRegistered(handle, method);
         if (promisified !== undefined) return promisified.apply(this, args);
+        if (method === 'run' || method === 'register') armBundledTextDomains(handle);
         return wrapReturn(native.callMethod(handle, method, unwrapArgs(args)));
     };
     nativeThunks.add(fn);

package/gtk-runtime.js

@@ -46,6 +46,14 @@ let windowingEnvWritesMade = [];
  * Empty off win32 (POSIX `setenv()` has one environment) and empty when the wiring no-opped.
  * @returns {Array<[string, string]>}
  */
+/** Where the windowing bundle's own catalogs live, or `undefined` (see `armBundledTextDomains` in gi.js). */
+let bundleLocaleDir;
+
+/** @returns {string | undefined} */
+export function bundledLocaleDir() {
+    return bundleLocaleDir;
+}
+
 export function windowingEnvWrites() {
     return process.platform === 'win32' ? windowingEnvWritesMade.slice() : [];
 }
@@ -484,6 +492,14 @@ export function maybeWireGtkWindowingEnv() {
         }
     }
 
+    // The catalogs the bundle ships for its own libraries. Binding them HERE would be undone:
+    // gtk_init, adw_init and GLib's first translated message each call
+    // bindtextdomain(<domain>, <path compiled into the build host>) themselves, and that path
+    // does not exist on a Mac without Homebrew. So only the directory is recorded here;
+    // gi.js re-binds the domains once those inits have run (armBundledTextDomains).
+    const localeDir = join(bundle.dir, 'share', 'locale');
+    bundleLocaleDir = existsSync(localeDir) ? localeDir : undefined;
+
     const fontsConf = join(bundle.dir, 'etc', 'fonts', 'fonts.conf');
     if (existsSync(fontsConf)) {
         setIfUnset('FONTCONFIG_PATH', join(bundle.dir, 'etc', 'fonts'));

package/host.nativescript.js

@@ -99,6 +99,10 @@ export function windowingEnvWrites() {
     return [];
 }
 
+export function bundledLocaleDir() {
+    return undefined;
+}
+
 // NativeScript's runtime class hands out the Application without @nativescript/core
 // (android.app.ActivityThread is a hidden API and absent from the metadata).
 function deriveAppDir() {

package/host.node.js

@@ -18,6 +18,7 @@ import {
     maybeReexecForGtkRuntime,
     maybeWireGtkWindowingEnv,
     windowingEnvWrites,
+    bundledLocaleDir,
 } from './gtk-runtime.js';
 import { activateNativePrebuilds } from './native-prebuilds.js';
 // From node:timers, not the globals, for two reasons: setImmediate is a Node/Bun global
@@ -31,7 +32,7 @@ import { setImmediate, setInterval, clearInterval } from 'node:timers';
 // loop-liveness hooks in gi.js would silently never fire.
 import runtimeProcess from 'node:process';
 
-export { setImmediate, setInterval, clearInterval, runtimeProcess, windowingEnvWrites };
+export { setImmediate, setInterval, clearInterval, runtimeProcess, windowingEnvWrites, bundledLocaleDir };
 
 const require = createRequire(import.meta.url);
 const here = packageRoot;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/node-gi",
-  "version": "0.64.4",
+  "version": "0.64.5",
   "description": "GObject-Introspection runtime for Node.js — load gi:// namespaces (GLib/GObject/Gio/…) with GJS-compatible semantics. Vendored + rewritten from node-gtk under MIT.",
   "type": "module",
   "license": "MIT",