akanjs 2.2.7-rc.0 → 2.2.7-rc.2

package/client/translator.ts

@@ -9,51 +9,62 @@ export interface AllDictionary {
   [key: string]: Dictionary;
 }
 
-export class Translator {
-  static #langDictionaryMap = new Map<string, Dictionary>();
+interface TranslatorState {
+  langDictionaryMap: Map<string, Dictionary>;
 
-  static #seededDicts = new WeakSet<object>();
+  seededDicts: WeakSet<object>;
 
-  static #activeLocale: string | undefined;
-  static setActiveLocale(lang: string | undefined) {
-    if (lang) Translator.#activeLocale = lang;
-  }
-  static getActiveLocale(): string | undefined {
-    return Translator.#activeLocale;
-  }
+  activeLocale?: string;
+}
+
+const TRANSLATOR_STATE_KEY = "__AKAN_TRANSLATOR_STATE__";
+const getTranslatorState = (): TranslatorState => {
+  const globalScope = globalThis as typeof globalThis & {
+    [TRANSLATOR_STATE_KEY]?: TranslatorState;
+  };
+  globalScope[TRANSLATOR_STATE_KEY] ??= {
+    langDictionaryMap: new Map<string, Dictionary>(),
+    seededDicts: new WeakSet<object>(),
+  };
+  return globalScope[TRANSLATOR_STATE_KEY];
+};
+
+export class Translator {
   constructor(dictionary: Record<string, Record<string, Record<string, unknown>>>) {
-    Object.entries(dictionary).forEach(([lang, dictionary]) => {
-      this.#setDictionary(lang, dictionary);
+    Object.entries(dictionary).forEach(([lang, dict]) => {
+      Translator.seed(lang, dict as Dictionary);
     });
   }
   hasDictionary(lang: string) {
-    return Translator.#langDictionaryMap.has(lang);
+    return getTranslatorState().langDictionaryMap.has(lang);
+  }
+  static setActiveLocale(lang: string | undefined) {
+    if (lang) getTranslatorState().activeLocale = lang;
+  }
+  static getActiveLocale(): string | undefined {
+    return getTranslatorState().activeLocale;
   }
 
   static seed(lang: string, dict: Dictionary | undefined) {
     if (!dict) return;
-    
-    if (Translator.#seededDicts.has(dict)) return;
-    Translator.#seededDicts.add(dict);
-    const existingDictionary = Translator.#langDictionaryMap.get(lang) ?? {};
+    const state = getTranslatorState();
+    if (state.seededDicts.has(dict)) return;
+    state.seededDicts.add(dict);
+    const existingDictionary = state.langDictionaryMap.get(lang) ?? {};
     Object.entries(dict).forEach(([key, modelDict]) => {
       if (existingDictionary[key]) Object.assign(existingDictionary[key], modelDict);
       else existingDictionary[key] = modelDict as Dictionary[string];
     });
-    Translator.#langDictionaryMap.set(lang, existingDictionary);
-  }
-  #setDictionary(lang: string, dict: Dictionary) {
-    Translator.seed(lang, dict);
-    return Translator.#langDictionaryMap.get(lang) as Dictionary;
+    state.langDictionaryMap.set(lang, existingDictionary);
   }
   translate(lang: string, key: string, param?: Record<string, string | number>): string {
-    const dictionary = Translator.#langDictionaryMap.get(lang);
+    const dictionary = getTranslatorState().langDictionaryMap.get(lang);
     if (!dictionary) return key;
     const msg = (pathGet(key, dictionary, ".", { t: key }) as { t: string }).t;
     return param ? msg.replace(/{([^}]+)}/g, (_, key: string) => param[key] as string) : msg;
   }
   async getDictionary(lang: string) {
-    const dictionary = Translator.#langDictionaryMap.get(lang);
+    const dictionary = getTranslatorState().langDictionaryMap.get(lang);
     if (!dictionary) throw new Error(`Dictionary for language ${lang} not found`);
     return dictionary;
   }

package/fetch/client/fetchClient.ts

@@ -390,7 +390,6 @@ export class FetchClient {
     return endpoint;
   }
   #registerModelBaseEndpoint(refName: string, signal: SerializedSignal) {
-    const cnst = ConstantRegistry.getDatabase(refName);
     const capRefName = capitalize(refName);
     const names = {
       createModel: `create${capRefName}`,
@@ -416,6 +415,7 @@ export class FetchClient {
         names.viewModel,
         () =>
           (async (id: string, option?: FetchPolicy) => {
+            const cnst = ConstantRegistry.getDatabase(refName);
             const modelFn = this.#requireHandler(names.model, names.viewModel);
             const modelObj = await modelFn(id, { ...option, crystalize: false });
             const model = new cnst.full(modelObj as object);
@@ -438,6 +438,7 @@ export class FetchClient {
         names.editModel,
         () =>
           (async (id: string, option?: FetchPolicy) => {
+            const cnst = ConstantRegistry.getDatabase(refName);
             const modelFn = this.#requireHandler(names.model, names.editModel);
             const modelObj = await modelFn(id, { ...option, crystalize: false });
             const model = new cnst.full(modelObj as object);
@@ -516,7 +517,6 @@ export class FetchClient {
     return endpoint;
   }
   #registerSlice(refName: string, suffix: string, slice: SerializedSlice, prefix?: string) {
-    const cnst = ConstantRegistry.getDatabase(refName);
     const capSuffix = capitalize(suffix);
     const sliceName = `${refName}${capSuffix}`;
     const capRefName = capitalize(refName);
@@ -535,6 +535,7 @@ export class FetchClient {
     const argLength = slice.args.length;
     this.slice[sliceName] = { refName, sliceName, argLength };
     this.#handlerFactory.set(names.init, () => async (...argData: unknown[]) => {
+      const cnst = ConstantRegistry.getDatabase(refName);
       const queryArgs = normalizeQueryArgs(
         Array.from({ length: Math.min(argData.length, argLength) }, (_, idx) => argData[idx]),
         slice.args,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.2.7-rc.0",
+  "version": "2.2.7-rc.2",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/types/client/translator.d.ts

@@ -7,11 +7,10 @@ export interface AllDictionary {
     [key: string]: Dictionary;
 }
 export declare class Translator {
-    #private;
-    static setActiveLocale(lang: string | undefined): void;
-    static getActiveLocale(): string | undefined;
     constructor(dictionary: Record<string, Record<string, Record<string, unknown>>>);
     hasDictionary(lang: string): boolean;
+    static setActiveLocale(lang: string | undefined): void;
+    static getActiveLocale(): string | undefined;
     static seed(lang: string, dict: Dictionary | undefined): void;
     translate(lang: string, key: string, param?: Record<string, string | number>): string;
     getDictionary(lang: string): Promise<Dictionary>;