@umituz/react-native-firebase 1.11.0 → 1.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-firebase",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "Unified Firebase package for React Native apps - Centralized initialization and core services (Analytics, Crashlytics).",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/analytics/infrastructure/adapters/native-analytics.adapter.ts

@@ -1,6 +1,7 @@
 /**
  * Native Analytics Adapter
  * Single Responsibility: Handle Firebase Analytics native implementation
+ * Uses React Native Firebase v22+ modular API
  */
 
 export interface NativeAnalyticsAdapter {
@@ -12,7 +13,15 @@ export interface NativeAnalyticsAdapter {
   setAnalyticsCollectionEnabled(analytics: any, enabled: boolean): Promise<void>;
 }
 
-let nativeAnalyticsModule: any = null;
+// Modular API functions from @react-native-firebase/analytics
+let modularFunctions: {
+  getAnalytics: () => any;
+  logEvent: (analytics: any, name: string, params?: Record<string, any>) => Promise<void>;
+  setUserId: (analytics: any, id: string | null) => Promise<void>;
+  setUserProperties: (analytics: any, properties: Record<string, string | null>) => Promise<void>;
+  resetAnalyticsData: (analytics: any) => Promise<void>;
+  setAnalyticsCollectionEnabled: (analytics: any, enabled: boolean) => Promise<void>;
+} | null = null;
 
 try {
   // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -20,23 +29,17 @@ try {
   // eslint-disable-next-line @typescript-eslint/no-require-imports
   const analyticsModule = require('@react-native-firebase/analytics');
 
-  // @react-native-firebase/analytics returns a factory function via createModuleNamespace
-  // Handle CommonJS (require) and ES6 (import) module formats
-  // The module can be:
-  // 1. Direct function: analyticsModule()
-  // 2. Object with default: analyticsModule.default()
-  // 3. Object with __esModule: analyticsModule.default() or analyticsModule()
-
-  if (typeof analyticsModule === 'function') {
-    // Direct function export
-    nativeAnalyticsModule = analyticsModule;
-  } else if (analyticsModule && typeof analyticsModule.default === 'function') {
-    // ES6 default export in CommonJS format
-    nativeAnalyticsModule = analyticsModule.default;
-  } else if (analyticsModule && typeof analyticsModule === 'object') {
-    // Try to use the module itself if it's callable
-    // Some bundlers wrap the function in an object
-    nativeAnalyticsModule = analyticsModule;
+  // Extract modular functions from the module
+  // React Native Firebase v22+ exports these as named exports
+  if (analyticsModule.getAnalytics && typeof analyticsModule.getAnalytics === 'function') {
+    modularFunctions = {
+      getAnalytics: analyticsModule.getAnalytics,
+      logEvent: analyticsModule.logEvent,
+      setUserId: analyticsModule.setUserId,
+      setUserProperties: analyticsModule.setUserProperties,
+      resetAnalyticsData: analyticsModule.resetAnalyticsData,
+      setAnalyticsCollectionEnabled: analyticsModule.setAnalyticsCollectionEnabled,
+    };
   }
 } catch (error) {
   /* eslint-disable-next-line no-console */
@@ -45,47 +48,35 @@ try {
   }
 }
 
-export const nativeAnalyticsAdapter: NativeAnalyticsAdapter | null =
-  nativeAnalyticsModule && (typeof nativeAnalyticsModule === 'function' || typeof nativeAnalyticsModule === 'object')
-    ? {
+export const nativeAnalyticsAdapter: NativeAnalyticsAdapter | null = modularFunctions
+  ? {
       getAnalytics(): any {
-        // Try calling as function first, then as object method
-        if (typeof nativeAnalyticsModule === 'function') {
-          return nativeAnalyticsModule();
-        }
-        // If it's an object, try calling it directly (some modules are callable objects)
-        if (typeof nativeAnalyticsModule === 'object' && nativeAnalyticsModule.default) {
-          return typeof nativeAnalyticsModule.default === 'function'
-            ? nativeAnalyticsModule.default()
-            : nativeAnalyticsModule.default;
-        }
-        return nativeAnalyticsModule;
+        return modularFunctions!.getAnalytics();
       },
       async logEvent(
         analytics: any,
         eventName: string,
         params?: Record<string, any>,
       ): Promise<void> {
-        await analytics.logEvent(eventName, params);
+        await modularFunctions!.logEvent(analytics, eventName, params);
       },
       async setUserId(analytics: any, userId: string): Promise<void> {
-        await analytics.setUserId(userId);
+        await modularFunctions!.setUserId(analytics, userId);
       },
       async setUserProperties(
         analytics: any,
         properties: Record<string, string>,
       ): Promise<void> {
-        await analytics.setUserProperties(properties);
+        await modularFunctions!.setUserProperties(analytics, properties);
       },
       async resetAnalyticsData(analytics: any): Promise<void> {
-        await analytics.resetAnalyticsData();
+        await modularFunctions!.resetAnalyticsData(analytics);
       },
       async setAnalyticsCollectionEnabled(
         analytics: any,
         enabled: boolean,
       ): Promise<void> {
-        await analytics.setAnalyticsCollectionEnabled(enabled);
+        await modularFunctions!.setAnalyticsCollectionEnabled(analytics, enabled);
       },
     }
-    : null;
-
+  : null;

package/src/crashlytics/infrastructure/adapters/native-crashlytics.adapter.ts

@@ -1,13 +1,11 @@
 /**
  * Native Crashlytics Adapter
  * Single Responsibility: Handle Firebase Crashlytics native implementation
+ * Uses React Native Firebase v22+ modular API
  */
 
 export interface CrashlyticsInstance {
-  setUserId(userId: string): Promise<void>;
-  setAttributes(attributes: Record<string, string>): Promise<void>;
-  recordError(error: Error): Promise<void>;
-  log(message: string): Promise<void>;
+  // Instance is now opaque - methods are called via modular functions
 }
 
 export interface NativeCrashlyticsAdapter {
@@ -18,28 +16,37 @@ export interface NativeCrashlyticsAdapter {
   log(crashlytics: CrashlyticsInstance, message: string): Promise<void>;
 }
 
-interface NativeCrashlyticsModuleFunction {
-  (): CrashlyticsInstance;
-}
-
-interface NativeCrashlyticsModuleObject {
-  default: () => CrashlyticsInstance;
-}
+// Modular API functions from @react-native-firebase/crashlytics
+let modularFunctions: {
+  getCrashlytics: () => CrashlyticsInstance;
+  setUserId: (crashlytics: CrashlyticsInstance, userId: string) => Promise<void>;
+  setAttributes: (crashlytics: CrashlyticsInstance, attributes: Record<string, string>) => Promise<void>;
+  recordError: (crashlytics: CrashlyticsInstance, error: Error) => Promise<void>;
+  log: (crashlytics: CrashlyticsInstance, message: string) => Promise<void>;
+} | null = null;
 
-type NativeCrashlyticsModule = NativeCrashlyticsModuleFunction | NativeCrashlyticsModuleObject;
-
-let nativeCrashlyticsModule: NativeCrashlyticsModule | null = null;
 let isModuleLoaded = false;
 
 function loadCrashlyticsModule(): void {
   if (isModuleLoaded) return;
-  
+
   try {
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     require('@react-native-firebase/app');
     // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const crashlytics = require('@react-native-firebase/crashlytics');
-    nativeCrashlyticsModule = crashlytics;
+    const crashlyticsModule = require('@react-native-firebase/crashlytics');
+
+    // Extract modular functions from the module
+    // React Native Firebase v22+ exports these as named exports
+    if (crashlyticsModule.getCrashlytics && typeof crashlyticsModule.getCrashlytics === 'function') {
+      modularFunctions = {
+        getCrashlytics: crashlyticsModule.getCrashlytics,
+        setUserId: crashlyticsModule.setUserId,
+        setAttributes: crashlyticsModule.setAttributes,
+        recordError: crashlyticsModule.recordError,
+        log: crashlyticsModule.log,
+      };
+    }
   } catch {
     // @react-native-firebase/crashlytics not available
   } finally {
@@ -47,41 +54,22 @@ function loadCrashlyticsModule(): void {
   }
 }
 
-function getCrashlyticsInstance(): CrashlyticsInstance | null {
-  if (!isModuleLoaded) {
-    loadCrashlyticsModule();
-  }
-  
-  if (!nativeCrashlyticsModule) return null;
-
-  try {
-    if (typeof nativeCrashlyticsModule === 'function') {
-      return nativeCrashlyticsModule();
-    }
-    if ('default' in nativeCrashlyticsModule && typeof nativeCrashlyticsModule.default === 'function') {
-      return nativeCrashlyticsModule.default();
-    }
-  } catch (error) {
-    /* eslint-disable-next-line no-console */
-    if (__DEV__) {
-      console.warn('[Crashlytics] Failed to get instance:', error);
-    }
-  }
-  
-  return null;
-}
-
 export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
   getCrashlytics(): CrashlyticsInstance {
-    const instance = getCrashlyticsInstance();
-    if (!instance) {
+    if (!isModuleLoaded) {
+      loadCrashlyticsModule();
+    }
+
+    if (!modularFunctions) {
       throw new Error('Crashlytics not initialized');
     }
-    return instance;
+
+    return modularFunctions.getCrashlytics();
   },
   async setUserId(crashlytics: CrashlyticsInstance, userId: string): Promise<void> {
+    if (!modularFunctions) return;
     try {
-      await crashlytics.setUserId(userId);
+      await modularFunctions.setUserId(crashlytics, userId);
     } catch (error) {
       /* eslint-disable-next-line no-console */
       if (__DEV__) {
@@ -93,8 +81,9 @@ export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
     crashlytics: CrashlyticsInstance,
     attributes: Record<string, string>,
   ): Promise<void> {
+    if (!modularFunctions) return;
     try {
-      await crashlytics.setAttributes(attributes);
+      await modularFunctions.setAttributes(crashlytics, attributes);
     } catch (error) {
       /* eslint-disable-next-line no-console */
       if (__DEV__) {
@@ -103,8 +92,9 @@ export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
     }
   },
   async recordError(crashlytics: CrashlyticsInstance, error: Error): Promise<void> {
+    if (!modularFunctions) return;
     try {
-      await crashlytics.recordError(error);
+      await modularFunctions.recordError(crashlytics, error);
     } catch (err) {
       /* eslint-disable-next-line no-console */
       if (__DEV__) {
@@ -113,8 +103,9 @@ export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
     }
   },
   async log(crashlytics: CrashlyticsInstance, message: string): Promise<void> {
+    if (!modularFunctions) return;
     try {
-      await crashlytics.log(message);
+      await modularFunctions.log(crashlytics, message);
     } catch (error) {
       /* eslint-disable-next-line no-console */
       if (__DEV__) {