@react-native-firebase/firestore 22.2.0 → 22.3.0

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [22.3.0](https://github.com/invertase/react-native-firebase/compare/v22.2.1...v22.3.0) (2025-07-08)
+
+### Features
+
+- **firestore:** add support for onSnapshotsInSync ([#8379](https://github.com/invertase/react-native-firebase/issues/8379)) ([f8c1464](https://github.com/invertase/react-native-firebase/commit/f8c1464fc0249864e9c6bf01af7f8679e3d235cf))
+
+### Bug Fixes
+
+- **app:** firebase-js-sdk bump 11.3.1 > 11.10.0 ([29ea831](https://github.com/invertase/react-native-firebase/commit/29ea8310beed3eb0598bda55aacc29c100c7f770))
+- **firestore:** type definitions ([#8378](https://github.com/invertase/react-native-firebase/issues/8378)) ([497c6d1](https://github.com/invertase/react-native-firebase/commit/497c6d153a897226ddf195b4187ee6a3be99d1f2))
+
+## [22.2.1](https://github.com/invertase/react-native-firebase/compare/v22.2.0...v22.2.1) (2025-06-10)
+
+**Note:** Version bump only for package @react-native-firebase/firestore
+
 ## [22.2.0](https://github.com/invertase/react-native-firebase/compare/v22.1.0...v22.2.0) (2025-05-12)
 
 **Note:** Version bump only for package @react-native-firebase/firestore

package/android/src/main/java/io/invertase/firebase/firestore/UniversalFirebaseFirestoreModule.java

@@ -22,10 +22,15 @@ import static io.invertase.firebase.firestore.UniversalFirebaseFirestoreCommon.g
 import static io.invertase.firebase.firestore.UniversalFirebaseFirestoreCommon.instanceCache;
 
 import android.content.Context;
+import android.util.SparseArray;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.firebase.firestore.ListenerRegistration;
 import com.google.firebase.firestore.LoadBundleTask;
+import io.invertase.firebase.common.ReactNativeFirebaseEventEmitter;
 import io.invertase.firebase.common.UniversalFirebaseModule;
 import io.invertase.firebase.common.UniversalFirebasePreferences;
 import java.nio.charset.StandardCharsets;
@@ -34,6 +39,7 @@ import java.util.Map;
 import java.util.Objects;
 
 public class UniversalFirebaseFirestoreModule extends UniversalFirebaseModule {
+  private static SparseArray<ListenerRegistration> onSnapshotInSyncListeners = new SparseArray<>();
 
   private static HashMap<String, String> emulatorConfigs = new HashMap<>();
 
@@ -41,6 +47,35 @@ public class UniversalFirebaseFirestoreModule extends UniversalFirebaseModule {
     super(context, serviceName);
   }
 
+  void addSnapshotsInSync(String appName, String databaseId, int listenerId) {
+
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
+    ListenerRegistration listenerRegistration =
+        firebaseFirestore.addSnapshotsInSyncListener(
+            () -> {
+              ReactNativeFirebaseEventEmitter emitter =
+                  ReactNativeFirebaseEventEmitter.getSharedInstance();
+              WritableMap body = Arguments.createMap();
+              emitter.sendEvent(
+                  new ReactNativeFirebaseFirestoreEvent(
+                      ReactNativeFirebaseFirestoreEvent.SNAPSHOT_IN_SYNC_EVENT_SYNC,
+                      body,
+                      appName,
+                      databaseId,
+                      listenerId));
+            });
+
+    onSnapshotInSyncListeners.put(listenerId, listenerRegistration);
+  }
+
+  void removeSnapshotsInSync(String appName, String databaseId, int listenerId) {
+    ListenerRegistration listenerRegistration = onSnapshotInSyncListeners.get(listenerId);
+    if (listenerRegistration != null) {
+      listenerRegistration.remove();
+      onSnapshotInSyncListeners.remove(listenerId);
+    }
+  }
+
   Task<Void> disableNetwork(String appName, String databaseId) {
     return getFirestoreForApp(appName, databaseId).disableNetwork();
   }

package/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreEvent.java

@@ -26,6 +26,7 @@ public class ReactNativeFirebaseFirestoreEvent implements NativeEvent {
   static final String COLLECTION_EVENT_SYNC = "firestore_collection_sync_event";
   static final String DOCUMENT_EVENT_SYNC = "firestore_document_sync_event";
   static final String TRANSACTION_EVENT_SYNC = "firestore_transaction_event";
+  static final String SNAPSHOT_IN_SYNC_EVENT_SYNC = "firestore_snapshots_in_sync_event";
   private static final String KEY_ID = "listenerId";
   private static final String KEY_BODY = "body";
   private static final String KEY_APP_NAME = "appName";

package/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreModule.java

@@ -193,6 +193,20 @@ public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModul
     promise.resolve(null);
   }
 
+  @ReactMethod
+  public void addSnapshotsInSync(
+      String appName, String databaseId, int listenerId, Promise promise) {
+    module.addSnapshotsInSync(appName, databaseId, listenerId);
+    promise.resolve(null);
+  }
+
+  @ReactMethod
+  public void removeSnapshotsInSync(
+      String appName, String databaseId, int listenerId, Promise promise) {
+    module.removeSnapshotsInSync(appName, databaseId, listenerId);
+    promise.resolve(null);
+  }
+
   private WritableMap taskProgressToWritableMap(LoadBundleTaskProgress progress) {
     WritableMap writableMap = Arguments.createMap();
     writableMap.putDouble("bytesLoaded", progress.getBytesLoaded());

package/ios/RNFBFirestore/RNFBFirestoreModule.m

@@ -16,12 +16,15 @@
  */
 
 #import "RNFBFirestoreModule.h"
+#import <RNFBApp/RNFBRCTEventEmitter.h>
 #import <React/RCTUtils.h>
 #import "FirebaseFirestoreInternal/FIRPersistentCacheIndexManager.h"
 #import "RNFBFirestoreCommon.h"
 #import "RNFBPreferences.h"
 
 NSMutableDictionary *emulatorConfigs;
+static __strong NSMutableDictionary *snapshotsInSyncListeners;
+static NSString *const RNFB_FIRESTORE_SNAPSHOTS_IN_SYNC = @"firestore_snapshots_in_sync_event";
 
 @implementation RNFBFirestoreModule
 #pragma mark -
@@ -240,6 +243,51 @@ RCT_EXPORT_METHOD(persistenceCacheIndexManager
   resolve(nil);
 }
 
+RCT_EXPORT_METHOD(addSnapshotsInSync
+                  : (FIRApp *)firebaseApp
+                  : (NSString *)databaseId
+                  : (nonnull NSNumber *)listenerId
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject) {
+  if (snapshotsInSyncListeners[listenerId]) {
+    resolve(nil);
+    return;
+  }
+
+  FIRFirestore *firestore = [RNFBFirestoreCommon getFirestoreForApp:firebaseApp
+                                                         databaseId:databaseId];
+
+  id<FIRListenerRegistration> listener = [firestore addSnapshotsInSyncListener:^{
+    [[RNFBRCTEventEmitter shared]
+        sendEventWithName:RNFB_FIRESTORE_SNAPSHOTS_IN_SYNC
+                     body:@{
+                       @"appName" : [RNFBSharedUtils getAppJavaScriptName:firebaseApp.name],
+                       @"databaseId" : databaseId,
+                       @"listenerId" : listenerId,
+                       @"body" : @{}
+                     }];
+  }];
+
+  snapshotsInSyncListeners[listenerId] = listener;
+
+  resolve(nil);
+}
+
+RCT_EXPORT_METHOD(removeSnapshotsInSync
+                  : (FIRApp *)firebaseApp
+                  : (NSString *)databaseId
+                  : (nonnull NSNumber *)listenerId
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject) {
+  id<FIRListenerRegistration> listener = snapshotsInSyncListeners[listenerId];
+  if (listener) {
+    [listener remove];
+    [snapshotsInSyncListeners removeObjectForKey:listenerId];
+  }
+
+  resolve(nil);
+}
+
 - (NSMutableDictionary *)taskProgressToDictionary:(FIRLoadBundleTaskProgress *)progress {
   NSMutableDictionary *progressMap = [[NSMutableDictionary alloc] init];
   progressMap[@"bytesLoaded"] = @(progress.bytesLoaded);

package/lib/index.js

@@ -43,6 +43,12 @@ import version from './version';
 import fallBackModule from './web/RNFBFirestoreModule';
 import FirestorePersistentCacheIndexManager from './FirestorePersistentCacheIndexManager';
 
+// react-native at least through 0.77 does not correctly support URL.host, which
+// is needed by firebase-js-sdk. It appears that in 0.80+ it is supported, so this
+// (and the package.json entry for this package) should be removed when the minimum
+// supported version of react-native is 0.80 or higher.
+import 'react-native-url-polyfill/auto';
+
 const namespace = 'firestore';
 
 const nativeModuleName = [
@@ -56,6 +62,7 @@ const nativeEvents = [
   'firestore_collection_sync_event',
   'firestore_document_sync_event',
   'firestore_transaction_event',
+  'firestore_snapshots_in_sync_event',
 ];
 
 class FirebaseFirestoreModule extends FirebaseModule {
@@ -84,6 +91,13 @@ class FirebaseFirestoreModule extends FirebaseModule {
       );
     });
 
+    this.emitter.addListener(this.eventNameForApp('firestore_snapshots_in_sync_event'), event => {
+      this.emitter.emit(
+        this.eventNameForApp(`firestore_snapshots_in_sync_event:${event.listenerId}`),
+        event,
+      );
+    });
+
     this._settings = {
       ignoreUndefinedProperties: false,
       persistence: true,

package/lib/modular/FieldPath.d.ts

@@ -11,3 +11,10 @@ export declare class FieldPath {
 
   isEqual(other: FieldPath): boolean;
 }
+
+/**
+ * Returns a special sentinel FieldPath to refer to the ID of a document
+ * It can be used in queries to sort or filter by the document ID
+ */
+
+export declare function documentId(): FieldPath;

package/lib/modular/FieldPath.js

@@ -1,3 +1,7 @@
 import FirestoreFieldPath from '../FirestoreFieldPath';
 
 export const FieldPath = FirestoreFieldPath;
+
+export function documentId() {
+  return FieldPath.documentId();
+}

package/lib/modular/index.d.ts

@@ -185,11 +185,11 @@ export function doc(
  * a document.
  * @returns The `DocumentReference` instance.
  */
-export function doc<T>(
-  reference: CollectionReference<T>,
+export declare function doc<AppModelType, DbModelType extends DocumentData>(
+  reference: CollectionReference<AppModelType, DbModelType>,
   path?: string,
   ...pathSegments: string[]
-): DocumentReference<T>;
+): DocumentReference<AppModelType, DbModelType>;
 
 /**
  * Gets a `DocumentReference` instance that refers to a document within
@@ -203,11 +203,11 @@ export function doc<T>(
  * a document.
  * @returns The `DocumentReference` instance.
  */
-export function doc(
-  reference: DocumentReference<unknown>,
+export declare function doc<AppModelType, DbModelType extends DocumentData>(
+  reference: DocumentReference<AppModelType, DbModelType>,
   path: string,
   ...pathSegments: string[]
-): DocumentReference<DocumentData>;
+): DocumentReference<DocumentData, DocumentData>;
 
 export function doc<T>(
   parent: Firestore | CollectionReference<T> | DocumentReference<unknown>,
@@ -231,7 +231,7 @@ export function collection(
   firestore: Firestore,
   path: string,
   ...pathSegments: string[]
-): CollectionReference<DocumentData>;
+): CollectionReference<DocumentData, DocumentData>;
 
 /**
  * Gets a `CollectionReference` instance that refers to a subcollection of
@@ -245,11 +245,29 @@ export function collection(
  * to a collection.
  * @returns The `CollectionReference` instance.
  */
-export function collection(
-  reference: CollectionReference<unknown>,
+export declare function collection<AppModelType, DbModelType extends DocumentData>(
+  reference: CollectionReference<AppModelType, DbModelType>,
   path: string,
   ...pathSegments: string[]
-): CollectionReference<DocumentData>;
+): CollectionReference<DocumentData, DocumentData>;
+
+/**
+ * Gets a `CollectionReference` instance that refers to a subcollection of
+ * `reference` at the specified relative path.
+ *
+ * @param reference - A reference to a document.
+ * @param path - A slash-separated path to a collection.
+ * @param pathSegments - Additional path segments to apply relative to the first
+ * argument.
+ * @throws If the final path has an even number of segments and does not point
+ * to a collection.
+ * @returns The `CollectionReference` instance.
+ */
+export declare function collection<AppModelType, DbModelType extends DocumentData>(
+  reference: DocumentReference<AppModelType, DbModelType>,
+  path: string,
+  ...pathSegments: string[]
+): CollectionReference<DocumentData, DocumentData>;
 
 /**
  * Gets a `CollectionReference` instance that refers to a subcollection of
@@ -302,7 +320,10 @@ export declare function refEqual<AppModelType, DbModelType extends DocumentData>
  * will be included. Cannot contain a slash.
  * @returns The created `Query`.
  */
-export function collectionGroup(firestore: Firestore, collectionId: string): Query<DocumentData>;
+export function collectionGroup(
+  firestore: Firestore,
+  collectionId: string,
+): Query<DocumentData, DocumentData>;
 
 /**
  * Writes to the document referred to by this `DocumentReference`. If the
@@ -383,10 +404,10 @@ export function updateDoc(
  * newly created document after it has been written to the backend (Note that it
  * won't resolve while you're offline).
  */
-export function addDoc<T>(
-  reference: CollectionReference<T>,
-  data: WithFieldValue<T>,
-): Promise<DocumentReference<T>>;
+export declare function addDoc<AppModelType, DbModelType extends DocumentData>(
+  reference: CollectionReference<AppModelType, DbModelType>,
+  data: WithFieldValue<AppModelType>,
+): Promise<DocumentReference<AppModelType, DbModelType>>;
 
 /**
  * Re-enables use of the network for this {@link Firestore} instance after a prior
@@ -701,7 +722,7 @@ export function loadBundle(
  * @param name - The name of the query.
  * @returns A named Query.
  */
-export function namedQuery(firestore: Firestore, name: string): Query<DocumentData>;
+export function namedQuery(firestore: Firestore, name: string): Promise<Query | null>;
 
 /**
  * Creates a write batch, used for performing multiple writes as a single

package/lib/modular/index.js

@@ -89,6 +89,24 @@ export function collectionGroup(firestore, collectionId) {
   return firestore.collectionGroup.call(firestore, collectionId, MODULAR_DEPRECATION_ARG);
 }
 
+let _id_SnapshotInSync = 0;
+
+export function onSnapshotsInSync(firestore, callback) {
+  const listenerId = _id_SnapshotInSync++;
+  firestore.native.addSnapshotsInSync(listenerId);
+  const onSnapshotsInSyncSubscription = firestore.emitter.addListener(
+    firestore.eventNameForApp(`firestore_snapshots_in_sync_event:${listenerId}`),
+    () => {
+      callback();
+    },
+  );
+
+  return () => {
+    onSnapshotsInSyncSubscription.remove();
+    firestore.native.removeSnapshotsInSync(listenerId);
+  };
+}
+
 /**
  * @param {DocumentReference} reference
  * @param {import('.').PartialWithFieldValue} data

package/lib/modular/query.d.ts

@@ -100,11 +100,11 @@ export type QueryNonFilterConstraint =
  * @throws if any of the provided query constraints cannot be combined with the
  * existing or new constraints.
  */
-export function query<T>(
-  query: Query<T>,
+export declare function query<AppModelType, DbModelType extends DocumentData>(
+  query: Query<AppModelType, DbModelType>,
   compositeFilter: QueryCompositeFilterConstraint,
   ...queryConstraints: QueryNonFilterConstraint[]
-): Query<T>;
+): Query<AppModelType, DbModelType>;
 
 /**
  * Creates a new immutable instance of {@link Query} that is extended to also
@@ -116,7 +116,10 @@ export function query<T>(
  * @throws if any of the provided query constraints cannot be combined with the
  * existing or new constraints.
  */
-export function query<T>(query: Query<T>, ...queryConstraints: IQueryConstraint[]): Query<T>;
+export declare function query<AppModelType, DbModelType extends DocumentData>(
+  query: Query<AppModelType, DbModelType>,
+  ...queryConstraints: QueryConstraint[]
+): Query<AppModelType, DbModelType>;
 
 export function query<T>(
   query: Query<T>,
@@ -173,7 +176,7 @@ export type OrderByDirection = 'desc' | 'asc';
  */
 export function orderBy(
   fieldPath: string | FieldPath,
-  directionStr: OrderByDirection = 'asc',
+  directionStr?: OrderByDirection = 'asc',
 ): QueryOrderByConstraint;
 
 /**
@@ -285,7 +288,9 @@ export declare function getDocFromServer<T>(
  *
  * @returns A `Promise` that will be resolved with the results of the query.
  */
-export function getDocs<T>(query: Query<T>): Promise<QuerySnapshot<T>>;
+export declare function getDocs<AppModelType, DbModelType extends DocumentData>(
+  query: Query<AppModelType, DbModelType>,
+): Promise<QuerySnapshot<AppModelType, DbModelType>>;
 
 /**
  * Executes the query and returns the results as a `QuerySnapshot` from cache.
@@ -294,7 +299,9 @@ export function getDocs<T>(query: Query<T>): Promise<QuerySnapshot<T>>;
  *
  * @returns A `Promise` that will be resolved with the results of the query.
  */
-export function getDocsFromCache<T>(query: Query<T>): Promise<QuerySnapshot<T>>;
+export declare function getDocsFromCache<AppModelType, DbModelType extends DocumentData>(
+  query: Query<AppModelType, DbModelType>,
+): Promise<QuerySnapshot<AppModelType, DbModelType>>;
 
 /**
  * Executes the query and returns the results as a `QuerySnapshot` from the
@@ -302,7 +309,9 @@ export function getDocsFromCache<T>(query: Query<T>): Promise<QuerySnapshot<T>>;
  *
  * @returns A `Promise` that will be resolved with the results of the query.
  */
-export function getDocsFromServer<T>(query: Query<T>): Promise<QuerySnapshot<T>>;
+export declare function getDocsFromServer<AppModelType, DbModelType extends DocumentData>(
+  query: Query<AppModelType, DbModelType>,
+): Promise<QuerySnapshot<AppModelType, DbModelType>>;
 
 /**
  * Deletes the document referred to by the specified `DocumentReference`.
@@ -311,53 +320,34 @@ export function getDocsFromServer<T>(query: Query<T>): Promise<QuerySnapshot<T>>
  * @returns A Promise resolved once the document has been successfully
  * deleted from the backend (note that it won't resolve while you're offline).
  */
-export function deleteDoc(reference: DocumentReference<unknown>): Promise<void>;
+export declare function deleteDoc<AppModelType, DbModelType extends DocumentData>(
+  reference: DocumentReference<AppModelType, DbModelType>,
+): Promise<void>;
 
 /**
- * Creates a `QueryConstraint` with the specified ending point.
- *
- * Using `startAt()`, `startAfter()`, `endBefore()`, `endAt()` and `equalTo()`
- * allows you to choose arbitrary starting and ending points for your queries.
- *
- * The ending point is inclusive, so children with exactly the specified value
- * will be included in the query. The optional key argument can be used to
- * further limit the range of the query. If it is specified, then children that
- * have exactly the specified value must also have a key name less than or equal
- * to the specified key.
- *
- * You can read more about `endAt()` in
- * {@link https://firebase.google.com/docs/database/web/lists-of-data#filtering_data | Filtering data}.
+ * Creates a QueryEndAtConstraint that modifies the result set to end at the provided fields relative to the order of the query.
+ * The order of the field values must match the order of the order by clauses of the query.
  *
- * @param value - The value to end at. The argument type depends on which
- * `orderBy*()` function was used in this query. Specify a value that matches
- * the `orderBy*()` type. When used in combination with `orderByKey()`, the
- * value must be a string.
- * @param key - The child key to end at, among the children with the previously
- * specified priority. This argument is only allowed if ordering by child,
- * value, or priority.
+ * @param fieldValues
  */
-export function endAt(value: number | string | boolean | null, key?: string): QueryConstraint;
+export declare function endAt(...fieldValues: unknown[]): QueryEndAtConstraint;
 
 /**
- * Creates a `QueryConstraint` with the specified ending point (exclusive).
- *
- * Using `startAt()`, `startAfter()`, `endBefore()`, `endAt()` and `equalTo()`
- * allows you to choose arbitrary starting and ending points for your queries.
- *
- * The ending point is exclusive. If only a value is provided, children
- * with a value less than the specified value will be included in the query.
- * If a key is specified, then children must have a value less than or equal
- * to the specified value and a key name less than the specified key.
+ * reates a QueryEndAtConstraint that modifies the result set to end at the provided document (inclusive).
+ * The end position is relative to the order of the query. The document must contain all of the fields provided in the orderBy of the query.
+ * @param snapshot
+ */
+export function endAt<AppModelType, DbModelType extends DocumentData>(
+  snapshot: DocumentSnapshot<AppModelType, DbModelType>,
+): QueryEndAtConstraint;
+
+/**
+ * Creates a QueryEndAtConstraint that modifies the result set to end before the provided fields relative to the order of the query.
+ * The order of the field values must match the order of the order by clauses of the query.
  *
- * @param value - The value to end before. The argument type depends on which
- * `orderBy*()` function was used in this query. Specify a value that matches
- * the `orderBy*()` type. When used in combination with `orderByKey()`, the
- * value must be a string.
- * @param key - The child key to end before, among the children with the
- * previously specified priority. This argument is only allowed if ordering by
- * child, value, or priority.
+ * @param fieldValues
  */
-export function endBefore(value: number | string | boolean | null, key?: string): QueryConstraint;
+export declare function endBefore(...fieldValues: unknown[]): QueryEndAtConstraint;
 
 /**
  * Creates a new `QueryConstraint` that is limited to return only the last

package/lib/modular/query.js

@@ -130,27 +130,25 @@ export function startAfter(...docOrFields) {
 }
 
 /**
- * @param {number | string | boolean | null} value
- * @param {string?} key
- * @returns {QueryConstraint}
+ * Creates a QueryEndAtConstraint that modifies the result set to end at the provided fields relative to the order of the query.
+ * The order of the field values must match the order of the order by clauses of the query.
+ *
+ * @param {*} ...args Can be either a DocumentSnapshot or an array of field values.
  */
-export function endAt(value, key) {
-  if (!key) {
-    return new QueryConstraint('endAt', value);
-  }
-  return new QueryConstraint('endAt', value, key);
+
+export function endAt(...args) {
+  return new QueryConstraint('endAt', ...args);
 }
 
 /**
- * @param {number | string | boolean | null} value
- * @param {string?} key
- * @returns {QueryConstraint}
+ * Creates a QueryEndAtConstraint that modifies the result set to end before the provided fields relative to the order of the query.
+ * The order of the field values must match the order of the order by clauses of the query.
+ *
+ * @param {*} fieldValues
  */
-export function endBefore(value, key) {
-  if (!key) {
-    return new QueryConstraint('endBefore', value);
-  }
-  return new QueryConstraint('endBefore', value, key);
+
+export function endBefore(...fieldValues) {
+  return new QueryConstraint('endBefore', ...fieldValues);
 }
 
 /**

package/lib/modular/snapshot.d.ts

@@ -117,10 +117,10 @@ export function onSnapshot<T>(
  * @returns An unsubscribe function that can be called to cancel
  * the snapshot listener.
  */
-export function onSnapshot<T>(
-  query: Query<T>,
+export declare function onSnapshot<AppModelType, DbModelType extends DocumentData>(
+  query: Query<AppModelType, DbModelType>,
   observer: {
-    next?: (snapshot: QuerySnapshot<T>) => void;
+    next?: (snapshot: QuerySnapshot<AppModelType, DbModelType>) => void;
     error?: (error: FirestoreError) => void;
     complete?: () => void;
   },
@@ -140,11 +140,11 @@ export function onSnapshot<T>(
  * @returns An unsubscribe function that can be called to cancel
  * the snapshot listener.
  */
-export function onSnapshot<T>(
-  query: Query<T>,
+export declare function onSnapshot<AppModelType, DbModelType extends DocumentData>(
+  query: Query<AppModelType, DbModelType>,
   options: SnapshotListenOptions,
   observer: {
-    next?: (snapshot: QuerySnapshot<T>) => void;
+    next?: (snapshot: QuerySnapshot<AppModelType, DbModelType>) => void;
     error?: (error: FirestoreError) => void;
     complete?: () => void;
   },
@@ -168,9 +168,9 @@ export function onSnapshot<T>(
  * @returns An unsubscribe function that can be called to cancel
  * the snapshot listener.
  */
-export function onSnapshot<T>(
-  query: Query<T>,
-  onNext: (snapshot: QuerySnapshot<T>) => void,
+export declare function onSnapshot<AppModelType, DbModelType extends DocumentData>(
+  query: Query<AppModelType, DbModelType>,
+  onNext: (snapshot: QuerySnapshot<AppModelType, DbModelType>) => void,
   onError?: (error: FirestoreError) => void,
   onCompletion?: () => void,
 ): Unsubscribe;
@@ -194,10 +194,10 @@ export function onSnapshot<T>(
  * @returns An unsubscribe function that can be called to cancel
  * the snapshot listener.
  */
-export function onSnapshot<T>(
-  query: Query<T>,
+export declare function onSnapshot<AppModelType, DbModelType extends DocumentData>(
+  query: Query<AppModelType, DbModelType>,
   options: SnapshotListenOptions,
-  onNext: (snapshot: QuerySnapshot<T>) => void,
+  onNext: (snapshot: QuerySnapshot<AppModelType, DbModelType>) => void,
   onError?: (error: FirestoreError) => void,
   onCompletion?: () => void,
 ): Unsubscribe;
@@ -227,3 +227,30 @@ export declare function queryEqual<AppModelType, DbModelType extends DocumentDat
   left: Query<AppModelType, DbModelType>,
   right: Query<AppModelType, DbModelType>,
 ): boolean;
+
+/**
+ * Attaches a listener for a snapshots-in-sync event.
+ * The snapshots-in-sync event indicates that all listeners affected by a given change have fired, even if
+ * a single server-generated change affects multiple listeners.
+ *
+ * @param firestore
+ * @param observer
+ */
+export declare function onSnapshotsInSync(
+  firestore: Firestore,
+  observer: {
+    next?: (value: void) => void;
+    error?: (error: FirestoreError) => void;
+    complete?: () => void;
+  },
+): Unsubscribe;
+
+/**
+ * Attaches a listener for a snapshots-in-sync event.
+ * The snapshots-in-sync event indicates that all listeners affected by a given change have fired, even if
+ * a single server-generated change affects multiple listeners.
+ *
+ * @param firestore
+ * @param onSync
+ */
+export declare function onSnapshotsInSync(firestore: Firestore, onSync: () => void): Unsubscribe;

package/lib/modular/snapshot.js

@@ -18,3 +18,16 @@ export function onSnapshot(reference, ...args) {
 export function snapshotEqual(left, right) {
   return left.isEqual.call(left, right, MODULAR_DEPRECATION_ARG);
 }
+
+/**
+ * Attaches a listener for a snapshots-in-sync event.
+ * The snapshots-in-sync event indicates that all listeners affected by a given change have fired, even if
+ * a single server-generated change affects multiple listeners.
+ *
+ * @param {*} firestore
+ * @param  {...any} args
+ */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function onSnapshotsInSync(firestore, ...args) {
+  throw new Error('onSnapshotsInSync() is not implemented');
+}

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '22.2.0';
+module.exports = '22.3.0';

package/lib/web/RNFBFirestoreModule.js

@@ -132,6 +132,14 @@ export default {
     return rejectWithCodeAndMessage('unsupported', 'Not supported in the lite SDK.');
   },
 
+  addSnapshotsInSync() {
+    return rejectWithCodeAndMessage('unsupported', 'Not supported in the lite SDK.');
+  },
+
+  removeSnapshotsInSync() {
+    return rejectWithCodeAndMessage('unsupported', 'Not supported in the lite SDK.');
+  },
+
   /**
    * Use the Firestore emulator.
    * @param {string} appName - The app name.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/firestore",
-  "version": "22.2.0",
+  "version": "22.3.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Cloud Firestore is a NoSQL cloud database to store and sync data between your React Native application and Firebase's database. The API matches the Firebase Web SDK whilst taking advantage of the native SDKs performance and offline capabilities.",
   "main": "lib/index.js",
@@ -26,12 +26,15 @@
     "realtime",
     "firestore"
   ],
+  "dependencies": {
+    "react-native-url-polyfill": "2.0.0"
+  },
   "peerDependencies": {
-    "@react-native-firebase/app": "22.2.0"
+    "@react-native-firebase/app": "22.3.0"
   },
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
-  "gitHead": "b302210509ceac8078b5fb9fd0b24e68f0641c6a"
+  "gitHead": "c04f2a3b681460edde5518812646cf5e0dd86627"
 }