@umituz/react-native-localization 1.2.0 → 1.2.2

package/src/infrastructure/storage/LocalizationStore.ts

@@ -1,23 +1,13 @@
 /**
  * Localization Store
  * Zustand state management for language preferences with AsyncStorage persistence
- *
- * REFACTORED: Now uses centralized AsyncStorageWrapper for DRY compliance
- * - Eliminates duplicate AsyncStorage calls
- * - Consistent error handling and logging
- * - Type-safe storage operations
  */
 
-import { create } from "zustand";
-import { StorageWrapper, STORAGE_KEYS } from "./AsyncStorageWrapper";
-import i18n from "../config/i18n";
-import {
-  SUPPORTED_LANGUAGES,
-  DEFAULT_LANGUAGE,
-  getLanguageByCode,
-  getDeviceLocale,
-} from "../config/languages";
-import type { Language } from "../../domain/repositories/ILocalizationRepository";
+import { create } from 'zustand';
+import { StorageWrapper, STORAGE_KEYS } from './AsyncStorageWrapper';
+import i18n from '../config/i18n';
+import { SUPPORTED_LANGUAGES, DEFAULT_LANGUAGE, getLanguageByCode, getDeviceLocale } from '../config/languages';
+import type { Language } from '../../domain/repositories/ILocalizationRepository';
 
 interface LocalizationState {
   currentLanguage: string;
@@ -42,115 +32,37 @@ export const useLocalizationStore = create<LocalizationState>((set, get) => ({
    * - Fallback: English (en-US) if device locale not supported
    */
   initialize: async () => {
-    try {
-      /* eslint-disable-next-line no-console */
-      if (__DEV__)
-        console.log("[LocalizationStore] Starting initialization...");
-
-      // ✅ CRITICAL FIX: Don't reset isInitialized if already initialized
-      // This prevents UI flash on re-initialization
-      const { isInitialized: alreadyInitialized } = get();
-      if (alreadyInitialized) {
-        /* eslint-disable-next-line no-console */
-        if (__DEV__)
-          console.log("[LocalizationStore] Already initialized, skipping");
-        return;
-      }
-
-      /* eslint-disable-next-line no-console */
-      if (__DEV__)
-        console.log("[LocalizationStore] Getting saved language preference...");
-      // ✅ Get saved language preference (returns null if not exists)
-      const savedLanguage = await StorageWrapper.getString(
-        STORAGE_KEYS.LANGUAGE,
-        DEFAULT_LANGUAGE,
-      );
-      /* eslint-disable-next-line no-console */
-      if (__DEV__)
-        console.log("[LocalizationStore] Saved language:", savedLanguage);
-
-      // ✅ DEVICE LOCALE DETECTION: Use device locale on first launch
-      let languageCode: string;
-      if (savedLanguage && savedLanguage !== DEFAULT_LANGUAGE) {
-        // User has previously selected a language → Use their choice
-        languageCode = savedLanguage;
-        /* eslint-disable-next-line no-console */
-        if (__DEV__)
-          console.log(
-            "[LocalizationStore] Using saved language:",
-            languageCode,
-          );
-      } else {
-        /* eslint-disable-next-line no-console */
-        if (__DEV__)
-          console.log(
-            "[LocalizationStore] First launch, detecting device locale...",
-          );
-        // First launch → Detect device locale automatically
-        languageCode = getDeviceLocale();
-        /* eslint-disable-next-line no-console */
-        if (__DEV__)
-          console.log(
-            "[LocalizationStore] Detected device locale:",
-            languageCode,
-          );
-        // Save detected locale for future launches
-        await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
-      }
-
-      /* eslint-disable-next-line no-console */
-      if (__DEV__)
-        console.log("[LocalizationStore] Validating language code...");
-      // ✅ DEFENSIVE: Validate language exists, fallback to default
-      const language = getLanguageByCode(languageCode);
-      const finalLanguage = language ? languageCode : DEFAULT_LANGUAGE;
-      const finalLanguageObj = getLanguageByCode(finalLanguage);
-      /* eslint-disable-next-line no-console */
-      if (__DEV__)
-        console.log("[LocalizationStore] Final language:", finalLanguage);
-
-      /* eslint-disable-next-line no-console */
-      if (__DEV__) console.log("[LocalizationStore] Changing i18n language...");
-      // Only change language if i18n is available
-      if (i18n && typeof i18n.changeLanguage === "function") {
-        await i18n.changeLanguage(finalLanguage);
-        /* eslint-disable-next-line no-console */
-        if (__DEV__) console.log("[LocalizationStore] i18n language changed");
-      } else {
-        /* eslint-disable-next-line no-console */
-        if (__DEV__)
-          console.warn(
-            "[LocalizationStore] i18n not available, skipping language change",
-          );
-      }
-
-      set({
-        currentLanguage: finalLanguage,
-        isRTL: finalLanguageObj?.rtl || false,
-        isInitialized: true, // ✅ Always set true to unblock UI
-      });
-      /* eslint-disable-next-line no-console */
-      if (__DEV__)
-        console.log(
-          "[LocalizationStore] Initialization completed successfully",
-        );
-    } catch (error) {
-      /* eslint-disable-next-line no-console */
-      if (__DEV__)
-        console.error("[LocalizationStore] Initialization error:", error);
-      /* eslint-disable-next-line no-console */
-      if (__DEV__)
-        console.error("[LocalizationStore] Error details:", {
-          message: error instanceof Error ? error.message : String(error),
-          stack: error instanceof Error ? error.stack : "No stack",
-          name: error instanceof Error ? error.name : "Unknown",
-        });
-      // Set initialized even on error to prevent blocking UI
-      set({
-        isInitialized: true,
-      });
-      throw error;
+    // ✅ CRITICAL FIX: Don't reset isInitialized if already initialized
+    // This prevents UI flash on re-initialization
+    const { isInitialized: alreadyInitialized } = get();
+    if (alreadyInitialized) return;
+
+    // Get saved language preference
+    const savedLanguage = await StorageWrapper.getString(STORAGE_KEYS.LANGUAGE, DEFAULT_LANGUAGE);
+
+    // ✅ DEVICE LOCALE DETECTION: Use device locale on first launch
+    let languageCode: string;
+    if (savedLanguage && savedLanguage !== DEFAULT_LANGUAGE) {
+      // User has previously selected a language → Use their choice
+      languageCode = savedLanguage;
+    } else {
+      // First launch → Detect device locale automatically
+      languageCode = getDeviceLocale();
+      // Save detected locale for future launches
+      await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
     }
+
+    // ✅ DEFENSIVE: Validate language exists, fallback to default
+    const language = getLanguageByCode(languageCode);
+    const finalLanguage = language ? languageCode : DEFAULT_LANGUAGE;
+    const finalLanguageObj = getLanguageByCode(finalLanguage);
+
+    await i18n.changeLanguage(finalLanguage);
+    set({
+      currentLanguage: finalLanguage,
+      isRTL: finalLanguageObj?.rtl || false,
+      isInitialized: true, // ✅ Always set true to unblock UI
+    });
   },
 
   /**
@@ -163,10 +75,8 @@ export const useLocalizationStore = create<LocalizationState>((set, get) => ({
     // ✅ DEFENSIVE: Early return if unsupported language
     if (!language) return;
 
-    // Update i18n (only if available)
-    if (i18n && typeof i18n.changeLanguage === "function") {
-      await i18n.changeLanguage(languageCode);
-    }
+    // Update i18n
+    await i18n.changeLanguage(languageCode);
 
     // Update state
     set({
@@ -174,7 +84,7 @@ export const useLocalizationStore = create<LocalizationState>((set, get) => ({
       isRTL: language.rtl || false,
     });
 
-    // ✅ DRY: Single line replaces try/catch/logging
+    // Persist language preference
     await StorageWrapper.setString(STORAGE_KEYS.LANGUAGE, languageCode);
   },
 }));
@@ -195,19 +105,8 @@ export const useLocalization = () => {
 
   const currentLanguageObject = getLanguageByCode(currentLanguage);
 
-  // Safe translation function - returns key if i18n not available
-  const t = (key: string, options?: any): string => {
-    if (i18n && typeof i18n.t === "function") {
-      const result = i18n.t(key, options);
-      // i18n.t can return string or object, ensure we return string
-      return typeof result === "string" ? result : key;
-    }
-    // Fallback: return key if i18n not available
-    return key;
-  };
-
   return {
-    t,
+    t: i18n.t.bind(i18n), // Translation function
     currentLanguage,
     currentLanguageObject,
     isRTL,