@react-native-firebase/database 26.0.0 → 26.1.0

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [26.1.0](https://github.com/invertase/react-native-firebase/compare/v26.0.0...v26.1.0) (2026-08-03)
+
+### Features
+
+- **ios:** add SPM dependency resolution support alongside CocoaPods ([#8933](https://github.com/invertase/react-native-firebase/issues/8933)) ([44a7a9a](https://github.com/invertase/react-native-firebase/commit/44a7a9ae7b404f412e9766c0417f1df8fa971a0b))
+
 ## [26.0.0](https://github.com/invertase/react-native-firebase/compare/v25.1.0...v26.0.0) (2026-07-29)
 
 ### ⚠ BREAKING CHANGES

package/RNFBDatabase.podspec

@@ -1,4 +1,5 @@
 require 'json'
+require_relative '../app/firebase_spm'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 appPackage = JSON.parse(File.read(File.join('..', 'app', 'package.json')))
 
@@ -57,7 +58,7 @@ Pod::Spec.new do |s|
   end
 
   # Firebase dependencies
-  s.dependency          'Firebase/Database', firebase_sdk_version
+  firebase_dependency(s, firebase_sdk_version, ['FirebaseDatabase'], 'Firebase/Database')
 
   if defined?($RNFirebaseAsStaticFramework)
     Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"

package/dist/module/version.js

@@ -1,5 +1,5 @@
 "use strict";
 
 // Generated by genversion.
-export const version = '26.0.0';
+export const version = '26.1.0';
 //# sourceMappingURL=version.js.map

package/dist/typescript/lib/index.d.ts

@@ -1,7 +1,7 @@
 import type { FirebaseApp } from '@react-native-firebase/app';
 import './types/internal';
 import type { Database, DatabaseReference, EmulatorMockTokenOptions } from './types/database';
-export declare const SDK_VERSION = "26.0.0";
+export declare const SDK_VERSION = "26.1.0";
 export declare function getDatabase(app?: FirebaseApp, url?: string): Database;
 export declare function connectDatabaseEmulator(db: Database, host: string, port: number, options?: {
     mockUserToken?: EmulatorMockTokenOptions | string;

package/dist/typescript/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "26.0.0";
+export declare const version = "26.1.0";
 //# sourceMappingURL=version.d.ts.map

package/ios/RNFBDatabase/RNFBDatabaseCommon.h

@@ -15,15 +15,26 @@
  *
  */
 
+#if __has_include(<Firebase/Firebase.h>)
 #import <Firebase/Firebase.h>
+#elif __has_include(<FirebaseDatabase/FirebaseDatabase-Swift.h>)
+// SPM: the declared product is the thin Swift wrapper `FirebaseDatabase`
+// (which depends on `FirebaseDatabaseInternal`, not exposed to us directly).
+// Its generated ObjC interface header is what's importable here.
+#import <FirebaseCore/FirebaseCore.h>
+#import <FirebaseDatabase/FirebaseDatabase-Swift.h>
+#else
+@import FirebaseCore;
+@import FirebaseDatabaseInternal;
+#endif
 #import <React/RCTBridgeModule.h>
 
+#import "RNFBDatabaseConstants.h"
+
 @interface RNFBDatabaseCommon : NSObject
 
 + (FIRDatabase *)getDatabaseForApp:(FIRApp *)firebaseApp dbURL:(NSString *)dbURL;
 
-+ (dispatch_queue_t)getDispatchQueue;
-
 + (void)setDatabaseConfig:(FIRDatabase *)firDatabase dbURL:(NSString *)dbURL;
 
 + (FIRDatabaseReference *)getReferenceForDatabase:(FIRDatabase *)firebaseDatabase
@@ -49,7 +60,3 @@
 + (NSMutableArray *)getSnapshotChildKeys:(FIRDataSnapshot *)dataSnapshot;
 
 @end
-
-extern NSString *const DATABASE_PERSISTENCE_ENABLED;
-extern NSString *const DATABASE_LOGGING_ENABLED;
-extern NSString *const DATABASE_PERSISTENCE_CACHE_SIZE;

package/ios/RNFBDatabase/RNFBDatabaseCommon.m

@@ -17,6 +17,7 @@
 
 #import "RNFBDatabaseCommon.h"
 #import "RNFBApp/RNFBSharedUtils.h"
+#import "RNFBDatabaseQueue.h"
 #import "RNFBPreferences.h"
 
 static __strong NSMutableDictionary *references;
@@ -36,15 +37,6 @@ NSString *const childKeysKey = @"childKeys";
   configSettingsLock = [NSMutableDictionary dictionary];
 }
 
-+ (dispatch_queue_t)getDispatchQueue {
-  static dispatch_once_t once;
-  __strong static dispatch_queue_t sharedInstance;
-  dispatch_once(&once, ^{
-    sharedInstance = dispatch_queue_create("io.invertase.firebase.database", DISPATCH_QUEUE_SERIAL);
-  });
-  return sharedInstance;
-}
-
 + (FIRDatabase *)getDatabaseForApp:(FIRApp *)firebaseApp dbURL:(NSString *)dbURL {
   FIRDatabase *firDatabase;
 
@@ -75,7 +67,7 @@ NSString *const childKeysKey = @"childKeys";
   RNFBPreferences *preferences = [RNFBPreferences shared];
 
   @try {
-    firDatabase.callbackQueue = [RNFBDatabaseCommon getDispatchQueue];
+    firDatabase.callbackQueue = [RNFBDatabaseQueue getDispatchQueue];
     // Persistence enabled
     BOOL *persistenceEnabled = (BOOL *)[preferences getBooleanValue:DATABASE_PERSISTENCE_ENABLED
                                                        defaultValue:false];

package/ios/RNFBDatabase/RNFBDatabaseConstants.h

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+// Deliberately Firebase-free (see RNFBDatabaseQueue.h) so Objective-C++
+// (.mm) modules can reference these preference keys without importing
+// Firebase Database headers. Defined in RNFBDatabaseCommon.m.
+extern NSString *const DATABASE_PERSISTENCE_ENABLED;
+extern NSString *const DATABASE_LOGGING_ENABLED;
+extern NSString *const DATABASE_PERSISTENCE_CACHE_SIZE;

package/ios/RNFBDatabase/RNFBDatabaseModule.mm

@@ -15,16 +15,22 @@
  *
  */
 
-#import <Firebase/Firebase.h>
 #import <React/RCTUtils.h>
 
-#import "RNFBApp/RCTConvert+FIRApp.h"
-#import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseConstants.h"
 #import "RNFBDatabaseModule.h"
+#import "RNFBDatabaseModuleHelper.h"
+#import "RNFBDatabaseQueue.h"
 #import "RNFBDatabaseTurboModules.h"
 #import "RNFBPreferences.h"
 
-static __strong NSMutableDictionary *emulatorSettings;
+// NOTE: This module deliberately never imports Firebase Database headers -
+// `FirebaseDatabase` is a Swift-only SPM product, and `@import` for
+// Swift-only products cannot be used from Objective-C++ (.mm) files when
+// C++ modules are disabled (required for compatibility with React Native's
+// JSI headers). All Firebase Database calls are delegated to the plain
+// Objective-C `RNFBDatabaseModuleHelper`. See docs/ios-spm.mdx and
+// okf-bundle/ios-spm-native-imports.md for details.
 
 @interface RNFBDatabaseModule () <NativeRNFBTurboDatabaseSpec, RCTBridgeModule>
 @end
@@ -45,41 +51,25 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabase);
 }
 
 - (dispatch_queue_t)methodQueue {
-  return [RNFBDatabaseCommon getDispatchQueue];
+  return [RNFBDatabaseQueue getDispatchQueue];
 }
 
 #pragma mark -
 #pragma mark Firebase Database
 
 - (void)goOnline:(NSString *)app dbURL:(NSString *)dbURL {
-  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
-  [[RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL] goOnline];
+  [RNFBDatabaseModuleHelper goOnline:app dbURL:dbURL];
 }
 
 - (void)goOffline:(NSString *)app dbURL:(NSString *)dbURL {
-  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
-  [[RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL] goOffline];
+  [RNFBDatabaseModuleHelper goOffline:app dbURL:dbURL];
 }
 
 - (void)useEmulator:(NSString *)app
               dbURL:(NSString *)dbURL
                host:(NSString *)host
                port:(double)port {
-  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
-  if (emulatorSettings == nil) {
-    emulatorSettings = [NSMutableDictionary dictionary];
-  }
-
-  NSMutableString *configKey = [firebaseApp.name mutableCopy];
-  if (dbURL != nil && dbURL.length > 0) {
-    [configKey appendString:dbURL];
-  }
-
-  if (!emulatorSettings[configKey]) {
-    [[RNFBDatabaseCommon getDatabaseForApp:firebaseApp
-                                     dbURL:dbURL] useEmulatorWithHost:host port:(NSInteger)port];
-    emulatorSettings[configKey] = @YES;
-  }
+  [RNFBDatabaseModuleHelper useEmulator:app dbURL:dbURL host:host port:(NSInteger)port];
 }
 
 - (void)setPersistenceEnabled:(NSString *)app dbURL:(NSString *)dbURL enabled:(BOOL)enabled {

package/ios/RNFBDatabase/RNFBDatabaseModuleHelper.h

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+
+// Plain Objective-C helper (see docs/ios-spm.mdx and
+// okf-bundle/ios-spm-native-imports.md) that owns every call touching
+// `FIRDatabase`/`FIRDatabaseReference` for the main database module. This
+// keeps `RNFBDatabaseModule.mm` free of Firebase Database imports, which is
+// required because `FirebaseDatabase` is a Swift-only SPM product and
+// `@import` for Swift-only products is unusable from Objective-C++ (.mm)
+// files when C++ modules are disabled (required by React Native's JSI
+// headers).
+@interface RNFBDatabaseModuleHelper : NSObject
+
++ (void)goOnline:(NSString *)app dbURL:(NSString *)dbURL;
+
++ (void)goOffline:(NSString *)app dbURL:(NSString *)dbURL;
+
++ (void)useEmulator:(NSString *)app
+              dbURL:(NSString *)dbURL
+               host:(NSString *)host
+               port:(NSInteger)port;
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseModuleHelper.m

@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#if __has_include(<Firebase/Firebase.h>)
+#import <Firebase/Firebase.h>
+#else
+@import FirebaseCore;
+@import FirebaseDatabaseInternal;
+#endif
+
+#import "RNFBApp/RCTConvert+FIRApp.h"
+#import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseModuleHelper.h"
+
+static __strong NSMutableDictionary *emulatorSettings;
+
+@implementation RNFBDatabaseModuleHelper
+
++ (void)goOnline:(NSString *)app dbURL:(NSString *)dbURL {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
+  [[RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL] goOnline];
+}
+
++ (void)goOffline:(NSString *)app dbURL:(NSString *)dbURL {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
+  [[RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL] goOffline];
+}
+
++ (void)useEmulator:(NSString *)app
+              dbURL:(NSString *)dbURL
+               host:(NSString *)host
+               port:(NSInteger)port {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
+  if (emulatorSettings == nil) {
+    emulatorSettings = [NSMutableDictionary dictionary];
+  }
+
+  NSMutableString *configKey = [firebaseApp.name mutableCopy];
+  if (dbURL != nil && dbURL.length > 0) {
+    [configKey appendString:dbURL];
+  }
+
+  if (!emulatorSettings[configKey]) {
+    [[RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL] useEmulatorWithHost:host
+                                                                                   port:port];
+    emulatorSettings[configKey] = @YES;
+  }
+}
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseOnDisconnectHelper.h

@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <React/RCTBridgeModule.h>
+
+// See RNFBDatabaseModuleHelper.h for rationale: plain Objective-C helper
+// that owns all `onDisconnect*` `FIRDatabaseReference` calls for
+// RNFBDatabaseOnDisconnectModule.
+@interface RNFBDatabaseOnDisconnectHelper : NSObject
+
++ (void)onDisconnectCancel:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject;
+
++ (void)onDisconnectRemove:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject;
+
++ (void)onDisconnectSet:(NSString *)app
+                  dbURL:(NSString *)dbURL
+                   path:(NSString *)path
+                  props:(NSDictionary *)props
+                resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject;
+
++ (void)onDisconnectSetWithPriority:(NSString *)app
+                              dbURL:(NSString *)dbURL
+                               path:(NSString *)path
+                              props:(NSDictionary *)props
+                            resolve:(RCTPromiseResolveBlock)resolve
+                             reject:(RCTPromiseRejectBlock)reject;
+
++ (void)onDisconnectUpdate:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                     props:(NSDictionary *)props
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject;
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseOnDisconnectHelper.m

@@ -0,0 +1,136 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#if __has_include(<Firebase/Firebase.h>)
+#import <Firebase/Firebase.h>
+#else
+@import FirebaseCore;
+@import FirebaseDatabaseInternal;
+#endif
+
+#import "RNFBApp/RCTConvert+FIRApp.h"
+#import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseOnDisconnectHelper.h"
+
+@implementation RNFBDatabaseOnDisconnectHelper
+
++ (void)onDisconnectCancel:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
+  FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
+  FIRDatabaseReference *firDatabaseReference =
+      [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+
+  [firDatabaseReference
+      cancelDisconnectOperationsWithCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+        if (error != nil) {
+          [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+        } else {
+          resolve([NSNull null]);
+        }
+      }];
+}
+
++ (void)onDisconnectRemove:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
+  FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
+  FIRDatabaseReference *firDatabaseReference =
+      [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+
+  [firDatabaseReference
+      onDisconnectRemoveValueWithCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+        if (error != nil) {
+          [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+        } else {
+          resolve([NSNull null]);
+        }
+      }];
+}
+
++ (void)onDisconnectSet:(NSString *)app
+                  dbURL:(NSString *)dbURL
+                   path:(NSString *)path
+                  props:(NSDictionary *)props
+                resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
+  FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
+  FIRDatabaseReference *firDatabaseReference =
+      [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+
+  [firDatabaseReference onDisconnectSetValue:[props valueForKey:@"value"]
+                         withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+                           if (error != nil) {
+                             [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+                           } else {
+                             resolve([NSNull null]);
+                           }
+                         }];
+}
+
++ (void)onDisconnectSetWithPriority:(NSString *)app
+                              dbURL:(NSString *)dbURL
+                               path:(NSString *)path
+                              props:(NSDictionary *)props
+                            resolve:(RCTPromiseResolveBlock)resolve
+                             reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
+  FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
+  FIRDatabaseReference *firDatabaseReference =
+      [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+
+  [firDatabaseReference onDisconnectSetValue:[props valueForKey:@"value"]
+                                 andPriority:[props valueForKey:@"priority"]
+                         withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+                           if (error != nil) {
+                             [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+                           } else {
+                             resolve([NSNull null]);
+                           }
+                         }];
+}
+
++ (void)onDisconnectUpdate:(NSString *)app
+                     dbURL:(NSString *)dbURL
+                      path:(NSString *)path
+                     props:(NSDictionary *)props
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject {
+  FIRApp *firebaseApp = [RCTConvert firAppFromString:app];
+  FIRDatabase *firDatabase = [RNFBDatabaseCommon getDatabaseForApp:firebaseApp dbURL:dbURL];
+  FIRDatabaseReference *firDatabaseReference =
+      [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
+
+  [firDatabaseReference onDisconnectUpdateChildValues:[props valueForKey:@"values"]
+                                  withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+                                    if (error != nil) {
+                                      [RNFBDatabaseCommon promiseRejectDatabaseException:reject
+                                                                                   error:error];
+                                    } else {
+                                      resolve([NSNull null]);
+                                    }
+                                  }];
+}
+
+@end