@infilectorg/infiviz-shots-react-sdk 1.2.3 → 1.2.5

package/ios/InfivizShotsReactSdk.swift

@@ -194,6 +194,7 @@ class InfivizShotsReactSdk:  RCTEventEmitter {
             case .success(let value):
                 // Convert any value to a clean dictionary that handles Optionals properly
                 let cleanDict = self.convertToCleanDictionary(value)
+                print(value)
                 // Return the dictionary directly instead of JSON string
                 resolve(cleanDict)
             case .failure(let error):
@@ -202,21 +203,14 @@ class InfivizShotsReactSdk:  RCTEventEmitter {
         }
     }
     
-    // Helper method to convert any value to a clean dictionary that handles Optionals
-    // MARK: - Convert Any Value to Clean Dictionary
+    // MARK: - Convert Any to Clean Dictionary
     private func convertToCleanDictionary(_ value: Any) -> [String: Any] {
         if let dict = value as? [String: Any] {
             return cleanDictionary(dict)
-        } else if let dict = value as? [AnyHashable: Any] {
-            var result: [String: Any] = [:]
-            for (k, v) in dict {
-                result[String(describing: k)] = unwrapOptional(v)
-            }
-            return result
         } else {
-            // Try to convert to dictionary using Mirror reflection
             let mirror = Mirror(reflecting: value)
             var result: [String: Any] = [:]
+            
             for child in mirror.children {
                 if let label = child.label {
                     result[label] = unwrapOptional(child.value)
@@ -225,7 +219,7 @@ class InfivizShotsReactSdk:  RCTEventEmitter {
             return result
         }
     }
-    
+
     // MARK: - Recursively Clean Dictionary
     private func cleanDictionary(_ dict: [String: Any]) -> [String: Any] {
         var cleaned: [String: Any] = [:]
@@ -234,74 +228,83 @@ class InfivizShotsReactSdk:  RCTEventEmitter {
         }
         return cleaned
     }
-    
-    // MARK: - Unwrap Optionals and Clean Nested Structures
+
+    // MARK: - Unwrap Optionals and Flatten SDK Values
     private func unwrapOptional(_ value: Any) -> Any {
-        let mirror = Mirror(reflecting: value)
-        
         // 1. Handle Optional
-        let typeName = String(describing: type(of: value))
-        if typeName.hasPrefix("Optional<") {
+        let mirror = Mirror(reflecting: value)
+        if mirror.displayStyle == .optional {
             if let unwrapped = mirror.children.first?.value {
                 return unwrapOptional(unwrapped)
             } else {
                 return NSNull()
             }
         }
-        
-        // 2. Strings cleanup
-        if let str = value as? String {
-            return str.replacingOccurrences(of: "Optional\\(|\\)",
-                                            with: "",
-                                            options: .regularExpression)
+
+        // 2. Handle JSONValue directly
+        if let jsonValue = value as? InfivizShotSDK.JSONValue {
+            switch jsonValue {
+            case .string(let str): return str
+            case .bool(let b): return b
+            case .int(let i): return i
+            case .double(let d): return d
+            case .dictionary(let dict):
+                var cleaned: [String: Any] = [:]
+                for (k, v) in dict {
+                    cleaned[k] = unwrapOptional(v)
+                }
+                return cleaned
+            case .array(let arr):
+                return arr.map { unwrapOptional($0) }
+            case .null:
+                return NSNull()
+            @unknown default:
+                return NSNull()
+            }
         }
-        
+
         // 3. Arrays
         if let array = value as? [Any] {
             return array.map { unwrapOptional($0) }
         }
-        
+
         // 4. Dictionaries
         if let dict = value as? [String: Any] {
-            // 👇 Detect special case: metadata dictionaries
-            if dict.keys.count == 1, let firstKey = dict.keys.first {
-                if ["string", "bool", "int", "double", "float"].contains(firstKey.lowercased()) {
-                    return unwrapOptional(dict[firstKey]!)
-                }
-            }
-            return cleanDictionary(dict)
-        } else if let dict = value as? [AnyHashable: Any] {
-            var result: [String: Any] = [:]
+            var cleaned: [String: Any] = [:]
             for (k, v) in dict {
-                result[String(describing: k)] = unwrapOptional(v)
+                cleaned[k] = unwrapOptional(v)
             }
-            return result
+            return cleaned
         }
-        
-        // 5. Dates
+
+        // 5. Enum like SessionSyncStateEnum
+        let typeName = String(describing: type(of: value))
+        if typeName.contains("InfivizShotSDK.SessionSyncStateEnum") {
+            return String(describing: value)
+        }
+
+        // 6. Date
         if let date = value as? Date {
             let formatter = DateFormatter()
             formatter.dateFormat = "yyyy-MM-dd HH:mm:ss Z"
             return formatter.string(from: date)
         }
-        
-        // 6. Custom objects
-        let objectMirror = Mirror(reflecting: value)
-        if !objectMirror.children.isEmpty {
+
+        // 7. Custom objects
+        if !mirror.children.isEmpty {
             var result: [String: Any] = [:]
-            for child in objectMirror.children {
+            for child in mirror.children {
                 if let label = child.label {
                     result[label] = unwrapOptional(child.value)
                 }
             }
             return result
         }
-        
-        // 7. Primitives
+
+        // 8. Primitive
         return value
     }
 
-    
     // MARK: - Logout
     @objc
     func logout(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
@@ -602,7 +605,7 @@ class InfivizShotsReactSdk:  RCTEventEmitter {
         controller.retakeImage(
             imageURL: imageURL,
             sessionID: temporarySessionId as String,
-            metaData: metaData as? [String: Any]
+            metaData: [:] as? [String: Any]
         ) { result in
             switch result {
             case .success(let newImageId):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infilectorg/infiviz-shots-react-sdk",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "React Native package for native libraries",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

package/react-native-infiviz-shots.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'react-native-infiviz-shots'
-  s.version          = '1.2.3'
+  s.version          = '1.1.5'
   s.summary          = 'InfivizShots React Native SDK'
   s.homepage         = 'https://your-repo-link.com'  # ← replace with your real URL
   s.license          = { :type => 'MIT' }