@umituz/react-native-firebase 1.11.0 → 1.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-firebase",
-  "version": "1.11.0",
+  "version": "1.12.1",
   "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,8 +1,18 @@
 /**
  * Native Analytics Adapter
  * Single Responsibility: Handle Firebase Analytics native implementation
+ * Uses React Native Firebase v23+ modular API
  */
 
+import {
+  getAnalytics,
+  logEvent,
+  setUserId,
+  setUserProperties,
+  resetAnalyticsData,
+  setAnalyticsCollectionEnabled,
+} from '@react-native-firebase/analytics';
+
 export interface NativeAnalyticsAdapter {
   getAnalytics(): any;
   logEvent(analytics: any, eventName: string, params?: Record<string, any>): Promise<void>;
@@ -12,80 +22,33 @@ export interface NativeAnalyticsAdapter {
   setAnalyticsCollectionEnabled(analytics: any, enabled: boolean): Promise<void>;
 }
 
-let nativeAnalyticsModule: any = null;
-
-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 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;
-  }
-} catch (error) {
-  /* eslint-disable-next-line no-console */
-  if (__DEV__) {
-    console.warn('⚠️ Firebase Analytics: Native module not available', error);
-  }
-}
-
-export const nativeAnalyticsAdapter: NativeAnalyticsAdapter | null =
-  nativeAnalyticsModule && (typeof nativeAnalyticsModule === 'function' || typeof nativeAnalyticsModule === 'object')
-    ? {
-      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;
-      },
-      async logEvent(
-        analytics: any,
-        eventName: string,
-        params?: Record<string, any>,
-      ): Promise<void> {
-        await analytics.logEvent(eventName, params);
-      },
-      async setUserId(analytics: any, userId: string): Promise<void> {
-        await analytics.setUserId(userId);
-      },
-      async setUserProperties(
-        analytics: any,
-        properties: Record<string, string>,
-      ): Promise<void> {
-        await analytics.setUserProperties(properties);
-      },
-      async resetAnalyticsData(analytics: any): Promise<void> {
-        await analytics.resetAnalyticsData();
-      },
-      async setAnalyticsCollectionEnabled(
-        analytics: any,
-        enabled: boolean,
-      ): Promise<void> {
-        await analytics.setAnalyticsCollectionEnabled(enabled);
-      },
-    }
-    : null;
-
+export const nativeAnalyticsAdapter: NativeAnalyticsAdapter = {
+  getAnalytics(): any {
+    return getAnalytics();
+  },
+  async logEvent(
+    analytics: any,
+    eventName: string,
+    params?: Record<string, any>,
+  ): Promise<void> {
+    await logEvent(analytics, eventName, params);
+  },
+  async setUserId(analytics: any, userId: string): Promise<void> {
+    await setUserId(analytics, userId);
+  },
+  async setUserProperties(
+    analytics: any,
+    properties: Record<string, string>,
+  ): Promise<void> {
+    await setUserProperties(analytics, properties);
+  },
+  async resetAnalyticsData(analytics: any): Promise<void> {
+    await resetAnalyticsData(analytics);
+  },
+  async setAnalyticsCollectionEnabled(
+    analytics: any,
+    enabled: boolean,
+  ): Promise<void> {
+    await setAnalyticsCollectionEnabled(analytics, enabled);
+  },
+};

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

@@ -1,13 +1,18 @@
 /**
  * Native Crashlytics Adapter
  * Single Responsibility: Handle Firebase Crashlytics native implementation
+ * Uses React Native Firebase v23+ modular API
  */
 
+import {
+  getCrashlytics,
+  log,
+  recordError,
+  setAttribute,
+} from '@react-native-firebase/crashlytics';
+
 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,70 +23,14 @@ export interface NativeCrashlyticsAdapter {
   log(crashlytics: CrashlyticsInstance, message: string): Promise<void>;
 }
 
-interface NativeCrashlyticsModuleFunction {
-  (): CrashlyticsInstance;
-}
-
-interface NativeCrashlyticsModuleObject {
-  default: () => CrashlyticsInstance;
-}
-
-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;
-  } catch {
-    // @react-native-firebase/crashlytics not available
-  } finally {
-    isModuleLoaded = true;
-  }
-}
-
-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 = {
+export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter = {
   getCrashlytics(): CrashlyticsInstance {
-    const instance = getCrashlyticsInstance();
-    if (!instance) {
-      throw new Error('Crashlytics not initialized');
-    }
-    return instance;
+    return getCrashlytics() as CrashlyticsInstance;
   },
   async setUserId(crashlytics: CrashlyticsInstance, userId: string): Promise<void> {
     try {
-      await crashlytics.setUserId(userId);
+      // Note: setUserId is a method on the crashlytics instance, not a modular function
+      await (crashlytics as any).setUserId(userId);
     } catch (error) {
       /* eslint-disable-next-line no-console */
       if (__DEV__) {
@@ -94,7 +43,10 @@ export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
     attributes: Record<string, string>,
   ): Promise<void> {
     try {
-      await crashlytics.setAttributes(attributes);
+      // Set each attribute individually using the modular API
+      for (const [key, value] of Object.entries(attributes)) {
+        await setAttribute(crashlytics, key, value);
+      }
     } catch (error) {
       /* eslint-disable-next-line no-console */
       if (__DEV__) {
@@ -104,7 +56,7 @@ export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
   },
   async recordError(crashlytics: CrashlyticsInstance, error: Error): Promise<void> {
     try {
-      await crashlytics.recordError(error);
+      await recordError(crashlytics, error);
     } catch (err) {
       /* eslint-disable-next-line no-console */
       if (__DEV__) {
@@ -114,7 +66,7 @@ export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
   },
   async log(crashlytics: CrashlyticsInstance, message: string): Promise<void> {
     try {
-      await crashlytics.log(message);
+      await log(crashlytics, message);
     } catch (error) {
       /* eslint-disable-next-line no-console */
       if (__DEV__) {

package/LICENSE

@@ -1,33 +0,0 @@
-MIT License
-
-Copyright (c) 2024 Ümit UZ
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-
-
-
-
-
-
-
-
-
-