Make "is map entry tombstoned" check referenced object per RTLM14c

Author: lawrence-forooghian

Sources/AblyLiveObjects/Internal/InternalDefaultLiveMap.swift

@@ -138,7 +138,7 @@ internal final class InternalDefaultLiveMap: Sendable {
         return convertEntryToLiveMapValue(entry, delegate: delegate)
     }
 
-    internal func size(coreSDK: CoreSDK) throws(ARTErrorInfo) -> Int {
+    internal func size(coreSDK: CoreSDK, delegate: LiveMapObjectPoolDelegate) throws(ARTErrorInfo) -> Int {
         // RTLM10c: If the channel is in the DETACHED or FAILED state, the library should throw an ErrorInfo error with statusCode 400 and code 90001
         let currentChannelState = coreSDK.channelState
         if currentChannelState == .detached || currentChannelState == .failed {
@@ -152,7 +152,7 @@ internal final class InternalDefaultLiveMap: Sendable {
         return mutex.withLock {
             // RTLM10d: Returns the number of non-tombstoned entries (per RTLM14) in the internal data map
             mutableState.data.values.count { entry in
-                !Self.isEntryTombstoned(entry)
+                !Self.isEntryTombstoned(entry, delegate: delegate)
             }
         }
     }
@@ -173,7 +173,7 @@ internal final class InternalDefaultLiveMap: Sendable {
             // RTLM11d1: Pairs with tombstoned entries (per RTLM14) are not returned
             var result: [(key: String, value: InternalLiveMapValue)] = []
 
-            for (key, entry) in mutableState.data where !Self.isEntryTombstoned(entry) {
+            for (key, entry) in mutableState.data where !Self.isEntryTombstoned(entry, delegate: delegate) {
                 // Convert entry to LiveMapValue using the same logic as get(key:)
                 if let value = convertEntryToLiveMapValue(entry, delegate: delegate) {
                     result.append((key: key, value: value))
@@ -779,9 +779,21 @@ internal final class InternalDefaultLiveMap: Sendable {
     // MARK: - Helper Methods
 
     /// Returns whether a map entry should be considered tombstoned, per the check described in RTLM14.
-    private static func isEntryTombstoned(_ entry: InternalObjectsMapEntry) -> Bool {
-        // RTLM14a, RTLM14b
-        entry.tombstone == true
+    private static func isEntryTombstoned(_ entry: InternalObjectsMapEntry, delegate: LiveMapObjectPoolDelegate) -> Bool {
+        // RTLM14a
+        if entry.tombstone {
+            return true
+        }
+
+        // RTLM14c
+        if let objectId = entry.data.objectId {
+            if let poolEntry = delegate.getObjectFromPool(id: objectId), poolEntry.isTombstone {
+                return false
+            }
+        }
+
+        // RTLM14b
+        return false
     }
 
     /// Converts an InternalObjectsMapEntry to LiveMapValue using the same logic as get(key:)

Sources/AblyLiveObjects/Public/Public Proxy Objects/PublicDefaultLiveMap.swift

@@ -34,7 +34,7 @@ internal final class PublicDefaultLiveMap: LiveMap {
 
     internal var size: Int {
         get throws(ARTErrorInfo) {
-            try proxied.size(coreSDK: coreSDK)
+            try proxied.size(coreSDK: coreSDK, delegate: delegate)
         }
     }
 

Tests/AblyLiveObjectsTests/InternalDefaultLiveMapTests.swift

@@ -284,7 +284,7 @@ struct InternalDefaultLiveMapTests {
 
             // Define actions to test
             let actions: [(String, () throws -> Any)] = [
-                ("size", { try map.size(coreSDK: coreSDK) }),
+                ("size", { try map.size(coreSDK: coreSDK, delegate: delegate) }),
                 ("entries", { try map.entries(coreSDK: coreSDK, delegate: delegate) }),
                 ("keys", { try map.keys(coreSDK: coreSDK, delegate: delegate) }),
                 ("values", { try map.values(coreSDK: coreSDK, delegate: delegate) }),
@@ -330,7 +330,7 @@ struct InternalDefaultLiveMapTests {
             )
 
             // Test size - should only count non-tombstoned entries
-            let size = try map.size(coreSDK: coreSDK)
+            let size = try map.size(coreSDK: coreSDK, delegate: delegate)
             #expect(size == 1)
 
             // Test entries - should only return non-tombstoned entries
@@ -372,7 +372,7 @@ struct InternalDefaultLiveMapTests {
                 clock: MockSimpleClock(),
             )
 
-            let size = try map.size(coreSDK: coreSDK)
+            let size = try map.size(coreSDK: coreSDK, delegate: delegate)
             let entries = try map.entries(coreSDK: coreSDK, delegate: delegate)
             let keys = try map.keys(coreSDK: coreSDK, delegate: delegate)
             let values = try map.values(coreSDK: coreSDK, delegate: delegate)
@@ -422,7 +422,7 @@ struct InternalDefaultLiveMapTests {
                 clock: MockSimpleClock(),
             )
 
-            let size = try map.size(coreSDK: coreSDK)
+            let size = try map.size(coreSDK: coreSDK, delegate: delegate)
             let entries = try map.entries(coreSDK: coreSDK, delegate: delegate)
             let keys = try map.keys(coreSDK: coreSDK, delegate: delegate)
             let values = try map.values(coreSDK: coreSDK, delegate: delegate)