@umituz/react-native-firebase 1.13.111 → 1.13.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-firebase",
-  "version": "1.13.111",
+  "version": "1.13.114",
   "description": "Unified Firebase package for React Native apps - Auth and Firestore services using Firebase JS SDK (no native modules).",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -62,6 +62,7 @@
     "expo-apple-authentication": "^8.0.8",
     "expo-application": "^7.0.8",
     "expo-clipboard": "^8.0.8",
+    "expo-constants": "^18.0.13",
     "expo-crypto": "^15.0.8",
     "expo-device": "^8.0.10",
     "expo-file-system": "^19.0.21",

package/src/firestore/index.ts

@@ -120,6 +120,8 @@ export {
   withFirestoreBool,
   createErrorResult,
   createSuccessResult,
+  runTransaction,
+  serverTimestamp,
 } from './utils/firestore-helper';
 export type { FirestoreResult, NoDbResult } from './utils/firestore-helper';
 

package/src/firestore/infrastructure/config/initializers/FirebaseFirestoreInitializer.ts

@@ -33,7 +33,7 @@ export class FirebaseFirestoreInitializer {
       return initializeFirestore(app, {
         localCache: memoryLocalCache(),
       });
-    } catch (error: unknown) {
+    } catch {
       // If already initialized, get existing instance
       return getFirestore(app);
     }

package/src/firestore/infrastructure/repositories/BasePaginatedRepository.ts

@@ -42,7 +42,9 @@ export abstract class BasePaginatedRepository extends BaseQueryRepository {
       limit(fetchLimit),
     );
 
+    let cursorKey = 'start';
     if (helper.hasCursor(params) && params?.cursor) {
+      cursorKey = params.cursor;
       const cursorDoc = await getDoc(doc(db, collectionName, params.cursor));
       if (cursorDoc.exists()) {
         q = query(
@@ -54,9 +56,19 @@ export abstract class BasePaginatedRepository extends BaseQueryRepository {
       }
     }
 
-    const snapshot = await getDocs(q);
-    this.trackRead(collectionName, snapshot.docs.length, snapshot.metadata.fromCache);
-    return snapshot.docs;
+    // Generate a unique key for deduplication
+    const uniqueKey = `${collectionName}_list_${orderByField}_${orderDirection}_${fetchLimit}_${cursorKey}`;
+
+    return this.executeQuery(
+      collectionName,
+      q,
+      async () => {
+        const snapshot = await getDocs(q);
+        return snapshot.docs;
+      },
+      false, // Default to false as we don't know yet
+      uniqueKey
+    );
   }
 
   /**

package/src/firestore/infrastructure/repositories/BaseQueryRepository.ts

@@ -16,34 +16,41 @@ export abstract class BaseQueryRepository extends BaseRepository {
    * Prevents duplicate queries and tracks quota usage
    *
    * @param collection - Collection name
-   * @param query - Firestore query
+   * @param query - Firestore query (kept for interface compatibility)
    * @param queryFn - Function to execute the query
    * @param cached - Whether the result is from cache
+   * @param uniqueKey - Unique key for deduplication (critical for correct caching)
    * @returns Query result
    */
   protected async executeQuery<T>(
     collection: string,
-    query: Query,
+    _query: Query,
     queryFn: () => Promise<T>,
     cached: boolean = false,
+    uniqueKey?: string
   ): Promise<T> {
+    // FIX: query.toString() returns "[object Object]" which breaks deduplication
+    // We must rely on the caller providing a uniqueKey or fallback to a collection-based key (less efficient but safe)
+    const safeKey = uniqueKey || `${collection}_generic_query_${Date.now()}`;
+
     const queryKey = {
       collection,
-      filters: query.toString(),
+      filters: safeKey, // Use the unique key as the filter identifier
       limit: undefined,
       orderBy: undefined,
     };
 
     return queryDeduplicationMiddleware.deduplicate(queryKey, async () => {
-      return quotaTrackingMiddleware.trackOperation(
-        {
-          type: 'read',
-          collection,
-          count: 1,
-          cached,
-        },
-        queryFn,
-      );
+      // Execute the query function
+      const result = await queryFn();
+      
+      // Track the operation after successful execution
+      // We calculate count based on result if possible, otherwise default to 1 (for list/count queries)
+      const count = Array.isArray(result) ? result.length : 1;
+      
+      this.trackRead(collection, count, cached);
+      
+      return result;
     });
   }
 

package/src/firestore/utils/firestore-helper.ts

@@ -90,3 +90,35 @@ export function createErrorResult<T>(message: string, code: string): FirestoreRe
 export function createSuccessResult<T>(data?: T): FirestoreResult<T> {
   return { success: true, data };
 }
+
+// ---------------------------------------------------------------------------
+// Transaction & Timestamp Wrappers (Facade Pattern)
+// ---------------------------------------------------------------------------
+
+import { 
+  runTransaction as fbRunTransaction, 
+  serverTimestamp as fbServerTimestamp,
+  type Transaction 
+} from "firebase/firestore";
+
+/**
+ * Execute a transaction with automatic DB instance check.
+ * Wraps the Firebase runTransaction to ensure the DB is initialized.
+ */
+export async function runTransaction<T>(
+  updateFunction: (transaction: Transaction) => Promise<T>
+): Promise<T> {
+  const db = getDb();
+  if (!db) {
+    throw new Error("[runTransaction] Firestore not initialized");
+  }
+  return fbRunTransaction(db, updateFunction);
+}
+
+/**
+ * Get the server timestamp (Sentinel value).
+ * Wraps Firebase serverTimestamp to avoid direct dependency.
+ */
+export function serverTimestamp() {
+  return fbServerTimestamp();
+}

package/src/index.ts

@@ -86,7 +86,16 @@ export {
 export { BaseRepository } from "./firestore/infrastructure/repositories/BaseRepository";
 export { FirestorePathResolver } from "./firestore/utils/path-resolver";
 export { PaginationHelper } from "./firestore/utils/pagination.helper";
-export type { Timestamp } from "firebase/firestore";
+
+export { Timestamp } from "firebase/firestore";
+export type {
+  Transaction,
+  DocumentReference,
+  WriteBatch,
+  DocumentSnapshot,
+  QuerySnapshot,
+  Firestore,
+} from "firebase/firestore";
 
 // Firestore Helper Utilities
 export {
@@ -96,6 +105,8 @@ export {
   withFirestoreBool,
   createErrorResult,
   createSuccessResult,
+  runTransaction,
+  serverTimestamp,
 } from "./firestore/utils/firestore-helper";
 export type { FirestoreResult, NoDbResult } from "./firestore/utils/firestore-helper";
 

package/src/infrastructure/config/FirebaseConfigLoader.ts

@@ -37,6 +37,7 @@ function getEnvValue(key: ConfigKey): string {
  */
 function loadExpoConfig(): Record<string, string> {
   try {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     const Constants = require('expo-constants');
     const expoConfig = Constants?.expoConfig || Constants?.default?.expoConfig;
     return expoConfig?.extra || {};