Fix mirror can't parse Optional<Value> and Nested Array

Author: iwecon

Sources/Lookup/Mirrors.swift

@@ -4,14 +4,26 @@
 
 import Foundation
 
+protocol OptionalProtocol {
+    var isNil: Bool { get }
+}
+extension Optional: OptionalProtocol {
+    var isNil: Bool { self == nil }
+}
+
 func canMirrorInto(_ reflecting: Any?) -> Bool {
     if let _ = reflecting as? LookupRawValue {
         return false
     }
     guard let ref = reflecting else { return false }
     let mirror = Mirror(reflecting: ref)
     guard let displayStyle = mirror.displayStyle else { return false }
-    return (displayStyle == .class || displayStyle == .struct)
+    switch displayStyle {
+    case .class, .struct:
+        return true
+    default:
+        return canMirrorInto(mirror.children.first?.value)
+    }
 }
 
 func mirrorValue(_ value: Any) -> Any {
@@ -25,6 +37,34 @@ func mirrorValue(_ value: Any) -> Any {
     return "\(value)"
 }
 
+func unwrapValue(_ value: Any) -> Any? {
+    let mirror = Mirror(reflecting: value)
+    if mirror.displayStyle == .optional {
+        return mirror.children.first?.value
+    }
+    return value
+}
+
+func mirrorArray(_ array: [Any], _ each: ((_: String?, _: Any) -> Void)?) -> [Any] {
+    return array.compactMap { item in
+        if let nested = item as? [Any] {
+            let arr = mirrorArray(nested, each)
+            return arr.isEmpty ? nil : arr
+        } else if canMirrorInto(item) {
+            let mirrored = mirrors(reflecting: item, each)
+            return mirrored.isEmpty ? nil : mirrored
+        } else {
+            let value = mirrorValue(item)
+            if let opt = value as? OptionalProtocol, opt.isNil {
+                return nil
+            } else if value is NSNull {
+                return nil
+            }
+            return value
+        }
+    }
+}
+
 public func mirrors(reflecting: Any?, _ each: ((_: String?, _: Any) -> Void)? = nil) -> [String: Any] {
     guard let reflecting = reflecting else { return [:] }
 
@@ -34,9 +74,36 @@ public func mirrors(reflecting: Any?, _ each: ((_: String?, _: Any) -> Void)? =
     for child in mirror.children {
         if let label = child.label, !label.isEmpty {
             if let unwrap = reflecting as? LookupUnwrap, let unwrapped = unwrap.lookupUnwrap(key: label, value: child.value) {
-                map[label] = mirrorValue(unwrapped)
+                let value = mirrorValue(unwrapped)
+                if let opt = value as? OptionalProtocol, opt.isNil {
+                    // skip
+                } else if value is NSNull {
+                    // skip
+                } else {
+                    map[label] = value
+                }
             } else {
-                map[label] = canMirrorInto(child.value) ? mirrors(reflecting: child.value, each) : mirrorValue(child.value)
+                let value = unwrapValue(child.value)
+                if let array = value as? [Any] {
+                    let mirroredArray = mirrorArray(array, each)
+                    if !mirroredArray.isEmpty {
+                        map[label] = mirroredArray
+                    }
+                } else if canMirrorInto(value) {
+                    let mirroredDict = mirrors(reflecting: value, each)
+                    if !mirroredDict.isEmpty {
+                        map[label] = mirroredDict
+                    }
+                } else {
+                    let value = mirrorValue(child.value)
+                    if let opt = value as? OptionalProtocol, opt.isNil {
+                        // skip
+                    } else if value is NSNull {
+                        // skip
+                    } else {
+                        map[label] = value
+                    }
+                }
             }
         }
         each?(child.label, child.value)
@@ -47,9 +114,36 @@ public func mirrors(reflecting: Any?, _ each: ((_: String?, _: Any) -> Void)? =
         for child in superMirror!.children {
             if let label = child.label, !label.isEmpty {
                 if let unwrap = reflecting as? LookupUnwrap, let unwrapped = unwrap.lookupUnwrap(key: label, value: child.value) {
-                    map[label] = mirrorValue(unwrapped)
+                    let value = mirrorValue(unwrapped)
+                    if let opt = value as? OptionalProtocol, opt.isNil {
+                        // skip
+                    } else if value is NSNull {
+                        // skip
+                    } else {
+                        map[label] = value
+                    }
                 } else {
-                    map[label] = canMirrorInto(child.value) ? mirrors(reflecting: child.value, each) : mirrorValue(child.value)
+                    let value = unwrapValue(child.value)
+                    if let array = value as? [Any] {
+                        let mirroredArray = mirrorArray(array, each)
+                        if !mirroredArray.isEmpty {
+                            map[label] = mirroredArray
+                        }
+                    } else if canMirrorInto(value) {
+                        let mirroredDict = mirrors(reflecting: value, each)
+                        if !mirroredDict.isEmpty {
+                            map[label] = mirroredDict
+                        }
+                    } else {
+                        let value = mirrorValue(child.value)
+                        if let opt = value as? OptionalProtocol, opt.isNil {
+                            // skip
+                        } else if value is NSNull {
+                            // skip
+                        } else {
+                            map[label] = value
+                        }
+                    }
                 }
             }
             each?(child.label, child.value)
@@ -58,4 +152,3 @@ public func mirrors(reflecting: Any?, _ each: ((_: String?, _: Any) -> Void)? =
     }
     return map
 }
-

Tests/LookupTests/LookupTests.swift

@@ -31,6 +31,39 @@ open class AnimalClass {
     let intType: AnimalIntType = .dog
 }
 
+struct KeyboardButton: Codable {
+    let text: String
+    let url: String?
+    let callbackData: String?
+    
+    enum CodingKeys: String, CodingKey {
+        case text
+        case url
+        case callbackData = "callback_data"
+    }
+    init(text: String, url: String? = nil, callbackData: String? = nil) {
+        self.text = text
+        self.url = url
+        self.callbackData = callbackData
+    }
+}
+
+struct Markup: Codable {
+    var keyboards: [[KeyboardButton]]
+    init(keyboards buttons: [[KeyboardButton]]) {
+        self.keyboards = buttons
+    }
+    enum CodingKeys: String, CodingKey {
+        case keyboards = "inline_keyboard"
+    }
+}
+
+struct MessageReply: Codable {
+    let text: String
+    let toID: Int
+    let markup: Markup?
+}
+
 final class Species: AnimalClass {
     let start: Date = Date()
 }
@@ -424,6 +457,37 @@ struct LookupTests {
         #expect(encoded?.contains("1") == true)
     }
 
+    @Test("Test ExpressionByDictionary")
+    func testExpressionByDictionary() throws {
+        let lookup = Lookup(["ids": [UUID(), UUID(), UUID()]])
+        #expect(lookup.ids.count == 3)
+    }
+    
+    @Test("Test Nesting Codable")
+    func testNestingCodable() throws {
+        let markup = MessageReply(
+            text: "This is a reply message!",
+            toID: 10086,
+            markup: Markup(
+                keyboards: [
+                    [KeyboardButton(text: "Hang up", callbackData: "/hang-up")],
+                    [KeyboardButton(text: "Recording", callbackData: "/recording")]
+                ]
+            )
+        )
+        let lookup = Lookup(markup)
+        print(lookup.description)
+        #expect(lookup.text.string == "This is a reply message!")
+        #expect(lookup.toID.string == "10086")
+        #expect(lookup.toID.int == 10086)
+        
+        #expect(lookup.markup.keyboards.0.0.text.string == "Hang up")
+        #expect(lookup.markup.keyboards.0.0.callbackData.string == "/hang-up")
+        
+        #expect(lookup.markup.keyboards.1.0.text.string == "Recording")
+        #expect(lookup.markup.keyboards.1.0.callbackData.string == "/recording")
+    }
+    
     @Test("Test Unwrap")
     func testUnwrap() throws {
         let model = UnwrapModel(id: UUID(), age: 1, type: .cat, intType: .cat, date: Date())