♻️ refactor bridgeInputForEncode and bridgeUndefinedPreservingOrder to use Set<ObjectIdentifier> for cycle detection instead of NSHashTable

Author: techouse

Sources/QsObjC/QsBridge.swift

@@ -139,12 +139,13 @@
         ///   throw `EncodeError.cyclicObject`, which we relay as `NSError`.
         @inline(__always)
         internal static func bridgeInputForEncode(_ input: Any) -> Any {
-            let seen = NSHashTable<AnyObject>.weakObjects()
-            return _bridgeInputForEncode(input, seen: seen)
+            var seen = Set<ObjectIdentifier>()
+            return _bridgeInputForEncode(input, seen: &seen)
         }
 
         @inline(__always)
-        private static func _bridgeInputForEncode(_ input: Any, seen: NSHashTable<AnyObject>) -> Any
+        private static func _bridgeInputForEncode(_ input: Any, seen: inout Set<ObjectIdentifier>)
+            -> Any
         {
             switch input {
             // Strings
@@ -155,49 +156,51 @@
             case let od as OrderedDictionary<String, Any>:
                 var out = OrderedDictionary<String, Any>()
                 out.reserveCapacity(od.count)
-                for (k, v) in od { out[k] = _bridgeInputForEncode(v, seen: seen) }
+                for (k, v) in od { out[k] = _bridgeInputForEncode(v, seen: &seen) }
                 return out
 
             // Already ordered Swift dict (NSString keys)
             case let od as OrderedDictionary<NSString, Any>:
                 var out = OrderedDictionary<String, Any>()
                 out.reserveCapacity(od.count)
-                for (k, v) in od { out[k as String] = _bridgeInputForEncode(v, seen: seen) }
+                for (k, v) in od { out[k as String] = _bridgeInputForEncode(v, seen: &seen) }
                 return out
 
             // NSDictionary → OrderedDictionary<String, Any> (stringify keys)
             case let d as NSDictionary:
                 let obj = d as AnyObject
-                if seen.contains(obj) {
+                let id = ObjectIdentifier(obj)
+                if seen.contains(id) {
                     // Cycle detected: keep the original reference so the core can report cyclicObject.
                     return d
                 }
-                seen.add(obj)
+                seen.insert(id)
 
                 var out = OrderedDictionary<String, Any>()
                 out.reserveCapacity(d.count)
                 d.forEach { (k, v) in
-                    out[stringifyKey(k)] = _bridgeInputForEncode(v, seen: seen)
+                    out[stringifyKey(k)] = _bridgeInputForEncode(v, seen: &seen)
                 }
                 return out
 
             // NSArray → [Any]
             case let a as NSArray:
                 let obj = a as AnyObject
-                if seen.contains(obj) { return a }
-                seen.add(obj)
-                return a.map { _bridgeInputForEncode($0, seen: seen) }
+                let id = ObjectIdentifier(obj)
+                if seen.contains(id) { return a }
+                seen.insert(id)
+                return a.map { _bridgeInputForEncode($0, seen: &seen) }
 
             // Plain Swift dict → OrderedDictionary<String, Any>
             case let d as [String: Any]:
                 var out = OrderedDictionary<String, Any>()
                 out.reserveCapacity(d.count)
-                for (k, v) in d { out[k] = _bridgeInputForEncode(v, seen: seen) }
+                for (k, v) in d { out[k] = _bridgeInputForEncode(v, seen: &seen) }
                 return out
 
             // Plain Swift array
             case let a as [Any]:
-                return a.map { _bridgeInputForEncode($0, seen: seen) }
+                return a.map { _bridgeInputForEncode($0, seen: &seen) }
 
             // Scalars / everything else
             default:
@@ -214,16 +217,14 @@
         /// - **Identity cycles** (returns the original Foundation object when revisiting it)
         @inline(__always)
         internal static func bridgeUndefinedPreservingOrder(_ v: Any?) -> Any? {
-            let seen = NSHashTable<AnyObject>.weakObjects()
-            return _bridgeUndefinedPreservingOrder(v, seen: seen)
+            var seen = Set<ObjectIdentifier>()
+            return _bridgeUndefinedPreservingOrder(v, seen: &seen)
         }
 
         @inline(__always)
         internal static func _bridgeUndefinedPreservingOrder(
-            _ v: Any?, seen: NSHashTable<AnyObject>
-        )
-            -> Any?
-        {
+            _ v: Any?, seen: inout Set<ObjectIdentifier>
+        ) -> Any? {
             switch v {
             // ObjC sentinel → Swift sentinel
             case is UndefinedObjC:
@@ -234,7 +235,7 @@
                 var out = OrderedDictionary<String, Any>()
                 out.reserveCapacity(od.count)
                 for (k, val) in od {
-                    out[k] = _bridgeUndefinedPreservingOrder(val, seen: seen) ?? val
+                    out[k] = _bridgeUndefinedPreservingOrder(val, seen: &seen) ?? val
                 }
                 return out
 
@@ -243,41 +244,43 @@
                 var out = OrderedDictionary<String, Any>()
                 out.reserveCapacity(od.count)
                 for (k, val) in od {
-                    out[k as String] = _bridgeUndefinedPreservingOrder(val, seen: seen) ?? val
+                    out[k as String] = _bridgeUndefinedPreservingOrder(val, seen: &seen) ?? val
                 }
                 return out
 
             // NSDictionary → OrderedDictionary<String, Any>
             case let d as NSDictionary:
                 let obj = d as AnyObject
-                if seen.contains(obj) { return d }  // keep cycles
-                seen.add(obj)
+                let id = ObjectIdentifier(obj)
+                if seen.contains(id) { return d }  // keep cycles
+                seen.insert(id)
                 var out = OrderedDictionary<String, Any>()
                 out.reserveCapacity(d.count)
                 d.forEach { (k, val) in
-                    out[stringifyKey(k)] = _bridgeUndefinedPreservingOrder(val, seen: seen) ?? val
+                    out[stringifyKey(k)] = _bridgeUndefinedPreservingOrder(val, seen: &seen) ?? val
                 }
                 return out
 
             // NSArray → [Any]
             case let a as NSArray:
                 let obj = a as AnyObject
-                if seen.contains(obj) { return a }
-                seen.add(obj)
-                return a.map { _bridgeUndefinedPreservingOrder($0, seen: seen) ?? $0 }
+                let id = ObjectIdentifier(obj)
+                if seen.contains(id) { return a }
+                seen.insert(id)
+                return a.map { _bridgeUndefinedPreservingOrder($0, seen: &seen) ?? $0 }
 
             // Plain Swift dict → OrderedDictionary<String, Any>
             case let d as [String: Any]:
                 var out = OrderedDictionary<String, Any>()
                 out.reserveCapacity(d.count)
                 for (k, val) in d {
-                    out[k] = _bridgeUndefinedPreservingOrder(val, seen: seen) ?? val
+                    out[k] = _bridgeUndefinedPreservingOrder(val, seen: &seen) ?? val
                 }
                 return out
 
             // Plain Swift array
             case let a as [Any]:
-                return a.map { _bridgeUndefinedPreservingOrder($0, seen: seen) ?? $0 }
+                return a.map { _bridgeUndefinedPreservingOrder($0, seen: &seen) ?? $0 }
 
             // Scalars / everything else
             default: