@umituz/react-native-firebase 1.12.0 → 1.12.2

package/package.json

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

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

@@ -1,9 +1,18 @@
 /**
  * Native Analytics Adapter
  * Single Responsibility: Handle Firebase Analytics native implementation
- * Uses React Native Firebase v22+ modular API
+ * 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>;
@@ -13,70 +22,33 @@ export interface NativeAnalyticsAdapter {
   setAnalyticsCollectionEnabled(analytics: any, enabled: boolean): Promise<void>;
 }
 
-// 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
-  require('@react-native-firebase/app');
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const analyticsModule = require('@react-native-firebase/analytics');
-
-  // 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 */
-  if (__DEV__) {
-    console.warn('⚠️ Firebase Analytics: Native module not available', error);
-  }
-}
-
-export const nativeAnalyticsAdapter: NativeAnalyticsAdapter | null = modularFunctions
-  ? {
-      getAnalytics(): any {
-        return modularFunctions!.getAnalytics();
-      },
-      async logEvent(
-        analytics: any,
-        eventName: string,
-        params?: Record<string, any>,
-      ): Promise<void> {
-        await modularFunctions!.logEvent(analytics, eventName, params);
-      },
-      async setUserId(analytics: any, userId: string): Promise<void> {
-        await modularFunctions!.setUserId(analytics, userId);
-      },
-      async setUserProperties(
-        analytics: any,
-        properties: Record<string, string>,
-      ): Promise<void> {
-        await modularFunctions!.setUserProperties(analytics, properties);
-      },
-      async resetAnalyticsData(analytics: any): Promise<void> {
-        await modularFunctions!.resetAnalyticsData(analytics);
-      },
-      async setAnalyticsCollectionEnabled(
-        analytics: any,
-        enabled: boolean,
-      ): Promise<void> {
-        await modularFunctions!.setAnalyticsCollectionEnabled(analytics, 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,12 +1,19 @@
 /**
  * Native Crashlytics Adapter
  * Single Responsibility: Handle Firebase Crashlytics native implementation
- * Uses React Native Firebase v22+ modular API
+ * Uses React Native Firebase v23+ modular API
  */
 
-export interface CrashlyticsInstance {
-  // Instance is now opaque - methods are called via modular functions
-}
+import {
+  getCrashlytics,
+  log,
+  recordError,
+  setAttribute,
+  setUserId,
+} from '@react-native-firebase/crashlytics';
+import type { FirebaseCrashlyticsTypes } from '@react-native-firebase/crashlytics';
+
+export type CrashlyticsInstance = FirebaseCrashlyticsTypes.Module;
 
 export interface NativeCrashlyticsAdapter {
   getCrashlytics(): CrashlyticsInstance;
@@ -16,60 +23,13 @@ export interface NativeCrashlyticsAdapter {
   log(crashlytics: CrashlyticsInstance, message: string): Promise<void>;
 }
 
-// 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;
-
-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 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 {
-    isModuleLoaded = true;
-  }
-}
-
-export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
+export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter = {
   getCrashlytics(): CrashlyticsInstance {
-    if (!isModuleLoaded) {
-      loadCrashlyticsModule();
-    }
-
-    if (!modularFunctions) {
-      throw new Error('Crashlytics not initialized');
-    }
-
-    return modularFunctions.getCrashlytics();
+    return getCrashlytics();
   },
   async setUserId(crashlytics: CrashlyticsInstance, userId: string): Promise<void> {
-    if (!modularFunctions) return;
     try {
-      await modularFunctions.setUserId(crashlytics, userId);
+      await setUserId(crashlytics, userId);
     } catch (error) {
       /* eslint-disable-next-line no-console */
       if (__DEV__) {
@@ -81,9 +41,11 @@ export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
     crashlytics: CrashlyticsInstance,
     attributes: Record<string, string>,
   ): Promise<void> {
-    if (!modularFunctions) return;
     try {
-      await modularFunctions.setAttributes(crashlytics, 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__) {
@@ -92,9 +54,8 @@ export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
     }
   },
   async recordError(crashlytics: CrashlyticsInstance, error: Error): Promise<void> {
-    if (!modularFunctions) return;
     try {
-      await modularFunctions.recordError(crashlytics, error);
+      await recordError(crashlytics, error);
     } catch (err) {
       /* eslint-disable-next-line no-console */
       if (__DEV__) {
@@ -103,9 +64,8 @@ export const nativeCrashlyticsAdapter: NativeCrashlyticsAdapter | null = {
     }
   },
   async log(crashlytics: CrashlyticsInstance, message: string): Promise<void> {
-    if (!modularFunctions) return;
     try {
-      await modularFunctions.log(crashlytics, 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.
-
-
-
-
-
-
-
-
-
-
-
-