@react-native-firebase/database 26.4.0 → 27.1.0

package/ios/RNFBDatabase/RNFBDatabaseNullSentinelDecoder.h

@@ -0,0 +1,36 @@
+/**
+ * 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>
+
+/**
+ * Decodes New Architecture null sentinels before Realtime Database writes. Used by the
+ * reference, onDisconnect and transaction helpers. Foundation only so unit tests can compile it
+ * without the Firebase SDK.
+ */
+@interface RNFBDatabaseNullSentinelDecoder : NSObject
+
+/** Top-level set(null) arrives as props.value = { __rnfbNull: true }. */
++ (id)decodedValueFromProps:(NSDictionary *)props;
+
++ (id)decodedValuesFromProps:(NSDictionary *)props;
+
++ (id)decodedPriorityFromProps:(NSDictionary *)props;
+
++ (id)decodedTransactionValue:(id)value;
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseNullSentinelDecoder.m

@@ -0,0 +1,48 @@
+/**
+ * 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 "RNFBDatabaseNullSentinelDecoder.h"
+
+#if __has_include(<RNFBApp/RNFBApp-Swift.h>)
+#import <RNFBApp/RNFBApp-Swift.h>
+#elif __has_include("RNFBApp-Swift.h")
+#import "RNFBApp-Swift.h"
+#elif __has_include("RNFBHandleMapStorage-Swift.inc")
+#import "RNFBHandleMapStorage-Swift.inc"
+#else
+#error "RNFBApp Swift interface not found"
+#endif
+
+@implementation RNFBDatabaseNullSentinelDecoder
+
++ (id)decodedValueFromProps:(NSDictionary *)props {
+  return [RNFBNullSentinelDecoder decodeNullSentinels:[props valueForKey:@"value"]];
+}
+
++ (id)decodedValuesFromProps:(NSDictionary *)props {
+  return [RNFBNullSentinelDecoder decodeNullSentinels:[props valueForKey:@"values"]];
+}
+
++ (id)decodedPriorityFromProps:(NSDictionary *)props {
+  return [RNFBNullSentinelDecoder decodeNullSentinels:[props valueForKey:@"priority"]];
+}
+
++ (id)decodedTransactionValue:(id)value {
+  return [RNFBNullSentinelDecoder decodeNullSentinels:value];
+}
+
+@end

package/ios/RNFBDatabase/RNFBDatabaseOnDisconnectHelper.m

@@ -24,6 +24,7 @@
 
 #import "RNFBApp/RCTConvert+FIRApp.h"
 #import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseNullSentinelDecoder.h"
 #import "RNFBDatabaseOnDisconnectHelper.h"
 
 @implementation RNFBDatabaseOnDisconnectHelper
@@ -79,14 +80,15 @@
   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]);
-                           }
-                         }];
+  [firDatabaseReference
+      onDisconnectSetValue:[RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props]
+       withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+         if (error != nil) {
+           [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+         } else {
+           resolve([NSNull null]);
+         }
+       }];
 }
 
 + (void)onDisconnectSetWithPriority:(NSString *)app
@@ -100,15 +102,16 @@
   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]);
-                           }
-                         }];
+  [firDatabaseReference
+      onDisconnectSetValue:[RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props]
+               andPriority:[RNFBDatabaseNullSentinelDecoder decodedPriorityFromProps:props]
+       withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+         if (error != nil) {
+           [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+         } else {
+           resolve([NSNull null]);
+         }
+       }];
 }
 
 + (void)onDisconnectUpdate:(NSString *)app
@@ -122,15 +125,15 @@
   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]);
-                                    }
-                                  }];
+  [firDatabaseReference
+      onDisconnectUpdateChildValues:[RNFBDatabaseNullSentinelDecoder decodedValuesFromProps:props]
+                withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+                  if (error != nil) {
+                    [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+                  } else {
+                    resolve([NSNull null]);
+                  }
+                }];
 }
 
 @end

package/ios/RNFBDatabase/RNFBDatabaseQueryHelper.h

@@ -31,6 +31,13 @@
       resolve:(RCTPromiseResolveBlock)resolve
        reject:(RCTPromiseRejectBlock)reject;
 
++ (void)get:(NSString *)app
+        dbURL:(NSString *)dbURL
+         path:(NSString *)path
+    modifiers:(NSArray *)modifiers
+      resolve:(RCTPromiseResolveBlock)resolve
+       reject:(RCTPromiseRejectBlock)reject;
+
 + (void)on:(NSString *)app dbURL:(NSString *)dbURL props:(NSDictionary *)props;
 
 + (void)off:(NSString *)queryKey eventRegistrationKey:(NSString *)eventRegistrationKey;

package/ios/RNFBDatabase/RNFBDatabaseQueryHelper.m

@@ -191,6 +191,26 @@ static NSString *const RNFB_DATABASE_SYNC = @"database_sync_event";
   [self addOnceEventListener:databaseQuery eventType:eventType resolve:resolve reject:reject];
 }
 
++ (void)get:(NSString *)app
+        dbURL:(NSString *)dbURL
+         path:(NSString *)path
+    modifiers:(NSArray *)modifiers
+      resolve:(RCTPromiseResolveBlock)resolve
+       reject:(RCTPromiseRejectBlock)reject {
+  // A single-event observer, not getDataWithCompletionBlock:. FirebaseDatabase's getData
+  // returns a covering ancestor's whole node for a child path (firebase/firebase-ios-sdk#12168),
+  // never completes a get in flight when the socket drops (firebase/firebase-ios-sdk#16717)
+  // and crashes on an error reply without a reason (firebase/firebase-ios-sdk#16718).
+  // Switch this to getData once the SDK RNFB depends on fixes all three.
+  [self once:app
+          dbURL:dbURL
+           path:path
+      modifiers:modifiers
+      eventType:@"value"
+        resolve:resolve
+         reject:reject];
+}
+
 + (void)on:(NSString *)app dbURL:(NSString *)dbURL props:(NSDictionary *)props {
   NSString *key = [props valueForKey:@"key"];
   NSString *path = [props valueForKey:@"path"];

package/ios/RNFBDatabase/RNFBDatabaseQueryModule.mm

@@ -76,6 +76,20 @@ RCT_EXPORT_MODULE(NativeRNFBTurboDatabaseQuery);
                          reject:reject];
 }
 
+- (void)get:(NSString *)app
+        dbURL:(NSString *)dbURL
+         path:(NSString *)path
+    modifiers:(NSArray *)modifiers
+      resolve:(RCTPromiseResolveBlock)resolve
+       reject:(RCTPromiseRejectBlock)reject {
+  [RNFBDatabaseQueryHelper get:app
+                         dbURL:dbURL
+                          path:path
+                     modifiers:modifiers
+                       resolve:resolve
+                        reject:reject];
+}
+
 - (void)on:(NSString *)app dbURL:(NSString *)dbURL props:(NSDictionary *)props {
   [RNFBDatabaseQueryHelper on:app dbURL:dbURL props:props];
 }

package/ios/RNFBDatabase/RNFBDatabaseQueryRegistry.m

@@ -23,12 +23,18 @@
 #import "RNFBApp/RNFBHandleMap.h"
 #endif
 
-@protocol RNFBDatabaseHasListeners
-- (BOOL)hasListeners;
-@end
+#if __has_include(<RNFBDatabase/RNFBDatabase-Swift.h>)
+#import <RNFBDatabase/RNFBDatabase-Swift.h>
+#elif __has_include("RNFBDatabase-Swift.h")
+#import "RNFBDatabase-Swift.h"
+#elif __has_include("RNFBHandleMapStorage-Swift.inc")
+#import "RNFBHandleMapStorage-Swift.inc"
+#else
+#error "RNFBDatabaseQueryRegistryStorage Swift interface not found"
+#endif
 
 @interface RNFBDatabaseQueryRegistry ()
-@property(nonatomic, strong) RNFBHandleMap *map;
+@property(nonatomic, strong) RNFBDatabaseQueryRegistryStorage *storage;
 @end
 
 @implementation RNFBDatabaseQueryRegistry
@@ -36,70 +42,38 @@
 - (instancetype)init {
   self = [super init];
   if (self) {
-    _map = [[RNFBHandleMap alloc] init];
+    _storage = [[RNFBDatabaseQueryRegistryStorage alloc] init];
   }
   return self;
 }
 
-- (void)rnfb_removeAllListeners:(id)query {
-  if (query && [query respondsToSelector:@selector(removeAllEventListeners)]) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-    [query performSelector:@selector(removeAllEventListeners)];
-#pragma clang diagnostic pop
-  }
-}
-
 - (BOOL)put:(id)key value:(id)value error:(NSError **)error {
-  return [self.map put:key value:value error:error];
+  if ([self.storage putIfAbsent:key value:value]) {
+    return YES;
+  }
+  if (error != nil) {
+    NSString *message = [NSString stringWithFormat:@"Handle id already registered: %@", key];
+    *error = [NSError errorWithDomain:RNFBHandleMapErrorDomain
+                                 code:RNFBHandleMapErrorCollision
+                             userInfo:@{NSLocalizedDescriptionKey : message}];
+  }
+  return NO;
 }
 
 - (id)get:(id)key {
-  return [self.map get:key];
+  return [self.storage get:key];
 }
 
 - (id)take:(id)key {
-  return [self.map take:key];
+  return [self.storage take:key];
 }
 
 - (id)takeIfIdle:(id)key {
-  // Read hasListeners outside the HandleMap lock (avoids nesting listener occupancy), then
-  // identity-take and put-back if listeners appeared.
-  id query = [self.map get:key];
-  if (query == nil) {
-    return nil;
-  }
-  if (![query respondsToSelector:@selector(hasListeners)]) {
-    return nil;
-  }
-  if ([(id<RNFBDatabaseHasListeners>)query hasListeners]) {
-    return nil;
-  }
-  id taken = [self.map takeIf:key
-                         when:^BOOL(id value) {
-                           return value == query;
-                         }];
-  if (taken == nil) {
-    return nil;
-  }
-  if ([taken respondsToSelector:@selector(hasListeners)] &&
-      [(id<RNFBDatabaseHasListeners>)taken hasListeners]) {
-    // Prefer put-back so an active query stays registered. If a concurrent put claimed the
-    // slot, putIfAbsent fails and this taken query would be an orphan with listeners — clear
-    // them so SDK callbacks are not left attached outside the registry.
-    if (![self.map putIfAbsent:key value:taken]) {
-      [self rnfb_removeAllListeners:taken];
-    }
-    return nil;
-  }
-  return taken;
+  return [self.storage takeIfIdle:key];
 }
 
 - (void)removeAll {
-  NSArray *queries = [self.map takeAll];
-  for (id query in queries) {
-    [self rnfb_removeAllListeners:query];
-  }
+  [self.storage removeAll];
 }
 
 @end

package/ios/RNFBDatabase/RNFBDatabaseQueryRegistryStorage.swift

@@ -0,0 +1,104 @@
+/**
+ * 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
+
+#if canImport(RNFBApp)
+import RNFBApp
+#endif
+
+/// Cached query map storage. Composes `RNFBHandleMapStorage`.
+/// Unique `put` collision errors stay on the ObjC façade.
+/// `takeIfIdle` reads `hasListeners` outside the HandleMap lock (avoids nesting).
+@objc(RNFBDatabaseQueryRegistryStorage)
+public final class RNFBDatabaseQueryRegistryStorage: NSObject {
+  private static let hasListenersSelector = Selector(("hasListeners"))
+  private static let removeAllEventListenersSelector = Selector(("removeAllEventListeners"))
+
+  private let storage = RNFBHandleMapStorage()
+
+  private func removeAllEventListeners(_ query: AnyObject?) {
+    guard let query = query, query.responds(to: Self.removeAllEventListenersSelector) else {
+      return
+    }
+    _ = query.perform(Self.removeAllEventListenersSelector)
+  }
+
+  /// Calls `-hasListeners` via IMP (avoids Swift protocol cast requiring formal conformance).
+  /// Returns `nil` when the selector is absent.
+  private func queryHasListeners(_ query: AnyObject) -> Bool? {
+    typealias HasListenersIMP = @convention(c) (AnyObject, Selector) -> Bool
+    let sel = Self.hasListenersSelector
+    guard query.responds(to: sel), let method = class_getInstanceMethod(type(of: query), sel)
+    else {
+      return nil
+    }
+    let fn = unsafeBitCast(method_getImplementation(method), to: HasListenersIMP.self)
+    return fn(query, sel)
+  }
+
+  /// First-wins store. Used by façade `put`.
+  @objc(putIfAbsent:value:)
+  public func putIfAbsent(_ key: AnyObject, value: AnyObject) -> Bool {
+    storage.putIfAbsent(key, value: value)
+  }
+
+  @objc(get:)
+  public func get(_ key: AnyObject) -> AnyObject? {
+    storage.get(key)
+  }
+
+  @objc(take:)
+  public func take(_ key: AnyObject) -> AnyObject? {
+    storage.take(key)
+  }
+
+  /// Idle-only take. `hasListeners` is read outside the HandleMap lock; identity-take then
+  /// put-back (or orphan cleanup) if listeners appear after the outside check.
+  @objc(takeIfIdle:)
+  public func takeIfIdle(_ key: AnyObject) -> AnyObject? {
+    guard let query = storage.get(key) else {
+      return nil
+    }
+    guard let hasListeners = queryHasListeners(query) else {
+      return nil
+    }
+    if hasListeners {
+      return nil
+    }
+    guard let taken = storage.takeIf(key, when: { $0 === query }) else {
+      return nil
+    }
+    if queryHasListeners(taken) == true {
+      // Prefer put-back so an active query stays registered. If a concurrent put claimed the
+      // slot, putIfAbsent fails and this taken query would be an orphan with listeners — clear
+      // them so SDK callbacks are not left attached outside the registry.
+      if !storage.putIfAbsent(key, value: taken) {
+        removeAllEventListeners(taken)
+      }
+      return nil
+    }
+    return taken
+  }
+
+  /// Snapshot then clear; `removeAllEventListeners` on each value that responds.
+  @objc
+  public func removeAll() {
+    for query in storage.takeAll() {
+      removeAllEventListeners(query)
+    }
+  }
+}

package/ios/RNFBDatabase/RNFBDatabaseReferenceHelper.m

@@ -24,6 +24,7 @@
 
 #import "RNFBApp/RCTConvert+FIRApp.h"
 #import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseNullSentinelDecoder.h"
 #import "RNFBDatabaseReferenceHelper.h"
 
 @implementation RNFBDatabaseReferenceHelper
@@ -39,7 +40,7 @@
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
 
-  [firDatabaseReference setValue:[props valueForKey:@"value"]
+  [firDatabaseReference setValue:[RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props]
              withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
                if (error != nil) {
                  [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
@@ -60,14 +61,15 @@
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
 
-  [firDatabaseReference updateChildValues:[props valueForKey:@"values"]
-                      withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
-                        if (error != nil) {
-                          [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
-                        } else {
-                          resolve([NSNull null]);
-                        }
-                      }];
+  [firDatabaseReference
+        updateChildValues:[RNFBDatabaseNullSentinelDecoder decodedValuesFromProps:props]
+      withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
+        if (error != nil) {
+          [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
+        } else {
+          resolve([NSNull null]);
+        }
+      }];
 }
 
 + (void)setWithPriority:(NSString *)app
@@ -81,8 +83,8 @@
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
 
-  [firDatabaseReference setValue:[props valueForKey:@"value"]
-                     andPriority:[props valueForKey:@"priority"]
+  [firDatabaseReference setValue:[RNFBDatabaseNullSentinelDecoder decodedValueFromProps:props]
+                     andPriority:[RNFBDatabaseNullSentinelDecoder decodedPriorityFromProps:props]
              withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
                if (error != nil) {
                  [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];
@@ -123,7 +125,7 @@
   FIRDatabaseReference *firDatabaseReference =
       [RNFBDatabaseCommon getReferenceForDatabase:firDatabase path:path];
 
-  [firDatabaseReference setPriority:[props valueForKey:@"priority"]
+  [firDatabaseReference setPriority:[RNFBDatabaseNullSentinelDecoder decodedPriorityFromProps:props]
                 withCompletionBlock:^(NSError *error, FIRDatabaseReference *ref) {
                   if (error != nil) {
                     [RNFBDatabaseCommon promiseRejectDatabaseException:reject error:error];

package/ios/RNFBDatabase/RNFBDatabaseTransactionHelper.m

@@ -25,6 +25,7 @@
 #import "RNFBApp/RCTConvert+FIRApp.h"
 #import "RNFBApp/RNFBSharedUtils.h"
 #import "RNFBDatabaseCommon.h"
+#import "RNFBDatabaseNullSentinelDecoder.h"
 #import "RNFBDatabaseTransactionHelper.h"
 #import "RNFBRCTEventEmitter.h"
 
@@ -163,7 +164,8 @@ static NSString *const RNFB_DATABASE_TRANSACTION_EVENT = @"database_transaction_
   if (abort) {
     [transactionState setValue:@true forKey:@"abort"];
   } else {
-    id newValue = [updates valueForKey:@"value"];
+    id newValue =
+        [RNFBDatabaseNullSentinelDecoder decodedTransactionValue:[updates valueForKey:@"value"]];
     [transactionState setValue:newValue forKey:@"value"];
   }
 

package/ios/RNFBDatabase.xcodeproj/project.pbxproj

@@ -14,6 +14,8 @@
 		8B9DD3C622A11F4F00A16945 /* RNFBDatabaseReferenceModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8B9DD3C522A11F4F00A16945 /* RNFBDatabaseReferenceModule.mm */; };
 		8B9DD3C922A1258B00A16945 /* RNFBDatabaseQueryModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8B9DD3C822A1258B00A16945 /* RNFBDatabaseQueryModule.mm */; };
 		8B9DD3CE22A43D1400A16945 /* RNFBDatabaseTransactionModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8B9DD3CD22A43D1400A16945 /* RNFBDatabaseTransactionModule.mm */; };
+		RNFBDB000000000000000001 /* RNFBDatabaseListenerRegistryStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = RNFBDB000000000000000002 /* RNFBDatabaseListenerRegistryStorage.swift */; };
+		RNFBDB000000000000000003 /* RNFBDatabaseQueryRegistryStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = RNFBDB000000000000000004 /* RNFBDatabaseQueryRegistryStorage.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -44,6 +46,8 @@
 		8B9DD3CA22A1259F00A16945 /* RNFBDatabaseQueryModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBDatabaseQueryModule.h; sourceTree = "<group>"; };
 		8B9DD3CC22A43D0300A16945 /* RNFBDatabaseTransactionModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNFBDatabaseTransactionModule.h; sourceTree = "<group>"; };
 		8B9DD3CD22A43D1400A16945 /* RNFBDatabaseTransactionModule.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNFBDatabaseTransactionModule.mm; sourceTree = "<group>"; };
+		RNFBDB000000000000000002 /* RNFBDatabaseListenerRegistryStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBDatabaseListenerRegistryStorage.swift; path = RNFBDatabase/RNFBDatabaseListenerRegistryStorage.swift; sourceTree = SOURCE_ROOT; };
+		RNFBDB000000000000000004 /* RNFBDatabaseQueryRegistryStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RNFBDatabaseQueryRegistryStorage.swift; path = RNFBDatabase/RNFBDatabaseQueryRegistryStorage.swift; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -70,6 +74,8 @@
 			children = (
 				2744B98421F45429004F8E3F /* RNFBDatabaseModule.h */,
 				2744B98521F45429004F8E3F /* RNFBDatabaseModule.mm */,
+				RNFBDB000000000000000002 /* RNFBDatabaseListenerRegistryStorage.swift */,
+				RNFBDB000000000000000004 /* RNFBDatabaseQueryRegistryStorage.swift */,
 				8B9DD3B822A03C6700A16945 /* RNFBDatabaseQuery.h */,
 				8B9DD3B922A03C7900A16945 /* RNFBDatabaseQuery.m */,
 				8B9DD3BC22A05CEB00A16945 /* RNFBDatabaseOnDisconnectModule.mm */,
@@ -153,6 +159,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				RNFBDB000000000000000001 /* RNFBDatabaseListenerRegistryStorage.swift in Sources */,
+				RNFBDB000000000000000003 /* RNFBDatabaseQueryRegistryStorage.swift in Sources */,
 				8B9DD3BD22A05CEB00A16945 /* RNFBDatabaseOnDisconnectModule.mm in Sources */,
 				8B9DD3C922A1258B00A16945 /* RNFBDatabaseQueryModule.mm in Sources */,
 				8B9DD3CE22A43D1400A16945 /* RNFBDatabaseTransactionModule.mm in Sources */,
@@ -185,6 +193,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEFINES_MODULE = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -201,6 +210,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.10;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -224,6 +234,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEFINES_MODULE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -235,6 +246,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.10;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};