@vaadin/hilla-react-i18n 24.4.0-alpha8 → 24.4.0-alpha9

package/backend.d.ts

@@ -0,0 +1,8 @@
+import type { Translations } from './types.js';
+export interface I18nBackend {
+    loadTranslations(language: string): Promise<Translations>;
+}
+export declare class DefaultBackend implements I18nBackend {
+    loadTranslations(language: string): Promise<Translations>;
+}
+//# sourceMappingURL=backend.d.ts.map

package/backend.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["src/backend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,WAAW;IAC1B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC3D;AAED,qBAAa,cAAe,YAAW,WAAW;IAC1C,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAShE"}

package/backend.js

@@ -0,0 +1,15 @@
+class DefaultBackend {
+  async loadTranslations(language) {
+    const url = `./?v-r=i18n&langtag=${language}`;
+    return fetch(url).then(async (response) => {
+      if (response.status === 200) {
+        return response.json();
+      }
+      return Promise.reject(new Error(`Failed to load translations for language: ${language}`));
+    });
+  }
+}
+export {
+  DefaultBackend
+};
+//# sourceMappingURL=backend.js.map

package/backend.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["src/backend.ts"],
+  "sourcesContent": ["import type { Translations } from './types.js';\n\nexport interface I18nBackend {\n  loadTranslations(language: string): Promise<Translations>;\n}\n\nexport class DefaultBackend implements I18nBackend {\n  async loadTranslations(language: string): Promise<Translations> {\n    const url = `./?v-r=i18n&langtag=${language}`;\n    return fetch(url).then(async (response) => {\n      if (response.status === 200) {\n        return response.json();\n      }\n      return Promise.reject(new Error(`Failed to load translations for language: ${language}`));\n    });\n  }\n}\n"],
+  "mappings": "AAMO,MAAM,eAAsC;AAAA,EACjD,MAAM,iBAAiB,UAAyC;AAC9D,UAAM,MAAM,uBAAuB,QAAQ;AAC3C,WAAO,MAAM,GAAG,EAAE,KAAK,OAAO,aAAa;AACzC,UAAI,SAAS,WAAW,KAAK;AAC3B,eAAO,SAAS,KAAK;AAAA,MACvB;AACA,aAAO,QAAQ,OAAO,IAAI,MAAM,6CAA6C,QAAQ,EAAE,CAAC;AAAA,IAC1F,CAAC;AAAA,EACH;AACF;",
+  "names": []
+}

package/index.d.ts

@@ -1,4 +1,14 @@
+import { type Signal } from '@vaadin/hilla-react-signals';
+import type { I18nOptions } from './types.js';
 export declare class I18n {
+    #private;
+    get language(): Signal<string | undefined>;
+    configure(options?: I18nOptions): Promise<void>;
+    setLanguage(newLanguage: string): Promise<void>;
+    private updateLanguage;
+    private loadTranslations;
     translate(key: string): string;
 }
+export declare const i18n: I18n;
+export declare function translate(key: string): string;
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,qBAAa,IAAI;IAEf,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAG/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAGzE,OAAO,KAAK,EAAE,WAAW,EAAgB,MAAM,YAAY,CAAC;AAgB5D,qBAAa,IAAI;;IAMf,IAAI,QAAQ,IAAI,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,CAEzC;IAEK,SAAS,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAK/C,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAIvC,cAAc;YAmBd,gBAAgB;IAU9B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAG/B;AAED,eAAO,MAAM,IAAI,MAAa,CAAC;AAE/B,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C"}

package/index.js

@@ -1,10 +1,64 @@
+import { batch, signal } from "@vaadin/hilla-react-signals";
+import { DefaultBackend } from "./backend.js";
+import { getLanguageSettings, updateLanguageSettings } from "./settings.js";
+function determineInitialLanguage(options) {
+  if (options?.language) {
+    return options.language;
+  }
+  const settings = getLanguageSettings();
+  if (settings?.language) {
+    return settings.language;
+  }
+  return navigator.language;
+}
 class I18n {
-  // eslint-disable-next-line @typescript-eslint/class-methods-use-this
+  #backend = new DefaultBackend();
+  #language = signal(void 0);
+  #translations = signal({});
+  get language() {
+    return this.#language;
+  }
+  async configure(options) {
+    const initialLanguage = determineInitialLanguage(options);
+    await this.updateLanguage(initialLanguage);
+  }
+  async setLanguage(newLanguage) {
+    await this.updateLanguage(newLanguage, true);
+  }
+  async updateLanguage(newLanguage, updateSettings = false) {
+    if (this.#language.value === newLanguage) {
+      return;
+    }
+    const newTranslations = await this.loadTranslations(newLanguage);
+    batch(() => {
+      this.#translations.value = newTranslations;
+      this.#language.value = newLanguage;
+      if (updateSettings) {
+        updateLanguageSettings({
+          language: newLanguage
+        });
+      }
+    });
+  }
+  async loadTranslations(newLanguage) {
+    try {
+      return await this.#backend.loadTranslations(newLanguage);
+    } catch (e) {
+      console.error(`Failed to load translations for language: ${newLanguage}`, e);
+      return {};
+    }
+  }
   translate(key) {
-    return key;
+    return this.#translations.value[key] || key;
   }
 }
+const i18n = new I18n();
+function translate(key) {
+  return i18n.translate(key);
+}
 export {
-  I18n
+  I18n,
+  i18n,
+  translate
 };
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["src/index.ts"],
-  "sourcesContent": ["export class I18n {\n  // eslint-disable-next-line @typescript-eslint/class-methods-use-this\n  translate(key: string): string {\n    return key;\n  }\n}\n"],
-  "mappings": "AAAO,MAAM,KAAK;AAAA;AAAA,EAEhB,UAAU,KAAqB;AAC7B,WAAO;AAAA,EACT;AACF;",
+  "sourcesContent": ["import { batch, signal, type Signal } from '@vaadin/hilla-react-signals';\nimport { DefaultBackend, type I18nBackend } from './backend.js';\nimport { getLanguageSettings, updateLanguageSettings } from './settings.js';\nimport type { I18nOptions, Translations } from './types.js';\n\nfunction determineInitialLanguage(options?: I18nOptions): string {\n  // Use explicitly configured language if defined\n  if (options?.language) {\n    return options.language;\n  }\n  // Use last used language as fallback\n  const settings = getLanguageSettings();\n  if (settings?.language) {\n    return settings.language;\n  }\n  // Otherwise use browser language\n  return navigator.language;\n}\n\nexport class I18n {\n  readonly #backend: I18nBackend = new DefaultBackend();\n\n  readonly #language: Signal<string | undefined> = signal(undefined);\n  readonly #translations: Signal<Translations> = signal({});\n\n  get language(): Signal<string | undefined> {\n    return this.#language;\n  }\n\n  async configure(options?: I18nOptions): Promise<void> {\n    const initialLanguage = determineInitialLanguage(options);\n    await this.updateLanguage(initialLanguage);\n  }\n\n  async setLanguage(newLanguage: string): Promise<void> {\n    await this.updateLanguage(newLanguage, true);\n  }\n\n  private async updateLanguage(newLanguage: string, updateSettings = false) {\n    if (this.#language.value === newLanguage) {\n      return;\n    }\n\n    const newTranslations = await this.loadTranslations(newLanguage);\n    // Update all signals together to avoid triggering side effects multiple times\n    batch(() => {\n      this.#translations.value = newTranslations;\n      this.#language.value = newLanguage;\n\n      if (updateSettings) {\n        updateLanguageSettings({\n          language: newLanguage,\n        });\n      }\n    });\n  }\n\n  private async loadTranslations(newLanguage: string) {\n    try {\n      return await this.#backend.loadTranslations(newLanguage);\n    } catch (e) {\n      // TODO proper error handling, maybe allow developer to hook into this\n      console.error(`Failed to load translations for language: ${newLanguage}`, e);\n      return {};\n    }\n  }\n\n  translate(key: string): string {\n    return this.#translations.value[key] || key;\n  }\n}\n\nexport const i18n = new I18n();\n\nexport function translate(key: string): string {\n  return i18n.translate(key);\n}\n"],
+  "mappings": "AAAA,SAAS,OAAO,cAA2B;AAC3C,SAAS,sBAAwC;AACjD,SAAS,qBAAqB,8BAA8B;AAG5D,SAAS,yBAAyB,SAA+B;AAE/D,MAAI,SAAS,UAAU;AACrB,WAAO,QAAQ;AAAA,EACjB;AAEA,QAAM,WAAW,oBAAoB;AACrC,MAAI,UAAU,UAAU;AACtB,WAAO,SAAS;AAAA,EAClB;AAEA,SAAO,UAAU;AACnB;AAEO,MAAM,KAAK;AAAA,EACP,WAAwB,IAAI,eAAe;AAAA,EAE3C,YAAwC,OAAO,MAAS;AAAA,EACxD,gBAAsC,OAAO,CAAC,CAAC;AAAA,EAExD,IAAI,WAAuC;AACzC,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,MAAM,UAAU,SAAsC;AACpD,UAAM,kBAAkB,yBAAyB,OAAO;AACxD,UAAM,KAAK,eAAe,eAAe;AAAA,EAC3C;AAAA,EAEA,MAAM,YAAY,aAAoC;AACpD,UAAM,KAAK,eAAe,aAAa,IAAI;AAAA,EAC7C;AAAA,EAEA,MAAc,eAAe,aAAqB,iBAAiB,OAAO;AACxE,QAAI,KAAK,UAAU,UAAU,aAAa;AACxC;AAAA,IACF;AAEA,UAAM,kBAAkB,MAAM,KAAK,iBAAiB,WAAW;AAE/D,UAAM,MAAM;AACV,WAAK,cAAc,QAAQ;AAC3B,WAAK,UAAU,QAAQ;AAEvB,UAAI,gBAAgB;AAClB,+BAAuB;AAAA,UACrB,UAAU;AAAA,QACZ,CAAC;AAAA,MACH;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,MAAc,iBAAiB,aAAqB;AAClD,QAAI;AACF,aAAO,MAAM,KAAK,SAAS,iBAAiB,WAAW;AAAA,IACzD,SAAS,GAAG;AAEV,cAAQ,MAAM,6CAA6C,WAAW,IAAI,CAAC;AAC3E,aAAO,CAAC;AAAA,IACV;AAAA,EACF;AAAA,EAEA,UAAU,KAAqB;AAC7B,WAAO,KAAK,cAAc,MAAM,GAAG,KAAK;AAAA,EAC1C;AACF;AAEO,MAAM,OAAO,IAAI,KAAK;AAEtB,SAAS,UAAU,KAAqB;AAC7C,SAAO,KAAK,UAAU,GAAG;AAC3B;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-i18n",
-  "version": "24.4.0-alpha8",
+  "version": "24.4.0-alpha9",
   "description": "Hilla I18n utils for React",
   "main": "index.js",
   "module": "index.js",
@@ -45,6 +45,10 @@
   "publishConfig": {
     "access": "public"
   },
+  "dependencies": {
+    "@vaadin/hilla-frontend": "24.4.0-alpha9",
+    "@vaadin/hilla-react-signals": "24.4.0-alpha9"
+  },
   "peerDependencies": {
     "react": "^18"
   },
@@ -62,6 +66,7 @@
     "@types/validator": "^13.11.2",
     "chai-as-promised": "^7.1.1",
     "chai-dom": "^1.11.0",
+    "fetch-mock": "^9.11.0",
     "sinon": "^16.0.0",
     "sinon-chai": "^3.7.0",
     "typescript": "5.3.2"

package/settings.d.ts

@@ -0,0 +1,7 @@
+export declare const VAADIN_LANGUAGE_SETTINGS_COOKIE_NAME = "vaadinLanguageSettings";
+export interface LanguageSettings {
+    language?: string;
+}
+export declare function getLanguageSettings(): LanguageSettings | undefined;
+export declare function updateLanguageSettings(updates: Partial<LanguageSettings>): void;
+//# sourceMappingURL=settings.d.ts.map

package/settings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["src/settings.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oCAAoC,2BAA2B,CAAC;AAE7E,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,mBAAmB,IAAI,gBAAgB,GAAG,SAAS,CAUlE;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAQ/E"}

package/settings.js

@@ -0,0 +1,27 @@
+import CookieManager from "@vaadin/hilla-frontend/CookieManager.js";
+const VAADIN_LANGUAGE_SETTINGS_COOKIE_NAME = "vaadinLanguageSettings";
+function getLanguageSettings() {
+  const cookie = CookieManager.get(VAADIN_LANGUAGE_SETTINGS_COOKIE_NAME);
+  if (!cookie)
+    return void 0;
+  try {
+    return JSON.parse(cookie);
+  } catch (e) {
+    return void 0;
+  }
+}
+function updateLanguageSettings(updates) {
+  const settings = getLanguageSettings() ?? {};
+  const newSettings = {
+    ...settings,
+    ...updates
+  };
+  const json = JSON.stringify(newSettings);
+  CookieManager.set(VAADIN_LANGUAGE_SETTINGS_COOKIE_NAME, json);
+}
+export {
+  VAADIN_LANGUAGE_SETTINGS_COOKIE_NAME,
+  getLanguageSettings,
+  updateLanguageSettings
+};
+//# sourceMappingURL=settings.js.map

package/settings.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["src/settings.ts"],
+  "sourcesContent": ["import CookieManager from '@vaadin/hilla-frontend/CookieManager.js';\n\nexport const VAADIN_LANGUAGE_SETTINGS_COOKIE_NAME = 'vaadinLanguageSettings';\n\nexport interface LanguageSettings {\n  language?: string;\n}\n\nexport function getLanguageSettings(): LanguageSettings | undefined {\n  const cookie = CookieManager.get(VAADIN_LANGUAGE_SETTINGS_COOKIE_NAME);\n  if (!cookie) return undefined;\n\n  try {\n    return JSON.parse(cookie);\n  } catch (e) {\n    // Ignore\n    return undefined;\n  }\n}\n\nexport function updateLanguageSettings(updates: Partial<LanguageSettings>): void {\n  const settings = getLanguageSettings() ?? {};\n  const newSettings = {\n    ...settings,\n    ...updates,\n  };\n  const json = JSON.stringify(newSettings);\n  CookieManager.set(VAADIN_LANGUAGE_SETTINGS_COOKIE_NAME, json);\n}\n"],
+  "mappings": "AAAA,OAAO,mBAAmB;AAEnB,MAAM,uCAAuC;AAM7C,SAAS,sBAAoD;AAClE,QAAM,SAAS,cAAc,IAAI,oCAAoC;AACrE,MAAI,CAAC;AAAQ,WAAO;AAEpB,MAAI;AACF,WAAO,KAAK,MAAM,MAAM;AAAA,EAC1B,SAAS,GAAG;AAEV,WAAO;AAAA,EACT;AACF;AAEO,SAAS,uBAAuB,SAA0C;AAC/E,QAAM,WAAW,oBAAoB,KAAK,CAAC;AAC3C,QAAM,cAAc;AAAA,IAClB,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACA,QAAM,OAAO,KAAK,UAAU,WAAW;AACvC,gBAAc,IAAI,sCAAsC,IAAI;AAC9D;",
+  "names": []
+}

package/types.d.ts

@@ -0,0 +1,5 @@
+export type Translations = Record<string, string>;
+export interface I18nOptions {
+    language?: string;
+}
+//# sourceMappingURL=types.d.ts.map

package/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAElD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}

package/types.js

@@ -0,0 +1 @@
+//# sourceMappingURL=types.js.map

package/types.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
+}