修复SmartHexColor encode bug

Author: iAmMccc

Example/SmartCodable/Smart/1.Introduce(使用介绍)/Introduce_9ViewController.swift

@@ -22,14 +22,15 @@ class Introduce_9ViewController: BaseCompatibilityViewController {
 
         guard let model = Model.deserialize(from: dict) else { return }
         print(model.color as Any)
+        
+        let trans = model.toDictionary()
+        print(trans)
     }
 }
 
-
 extension Introduce_9ViewController {
-    
     struct Model: SmartCodable {
-        @SmartHexColor
+        @SmartHexColor(encodeHexFormat: .rrggbbaa(.hash))
         var color: UIColor? = .white
     }
 }

Sources/SmartCodable/Core/PropertyWrapper/SmartHexColor.swift

@@ -50,7 +50,7 @@ public struct SmartHexColor: PropertyWrapperable {
     }
 
 
-    private var encodeHexFormat: HexFormat?
+    var encodeHexFormat: HexFormat?
 
     public init(wrappedValue: ColorObject?, encodeHexFormat: HexFormat? = nil) {
         self.wrappedValue = wrappedValue
@@ -63,6 +63,14 @@ extension SmartHexColor: Codable {
         let container = try decoder.singleValueContainer()
         let hexString = try container.decode(String.self)
 
+        
+        guard let impl = decoder as? JSONDecoderImpl else {
+            throw DecodingError.dataCorruptedError(
+                in: container,
+                debugDescription: "Cannot decode SmartHexColor from '\(hexString)'. Supported formats: HexFormat."
+            )
+        }
+        
         guard
             let format = SmartHexColor.HexFormat.format(for: hexString),
             let color = SmartHexColor.toColor(from: hexString, format: format)
@@ -72,11 +80,19 @@ extension SmartHexColor: Codable {
                 debugDescription: "Cannot decode SmartHexColor from '\(hexString)'. Supported formats: HexFormat."
             )
         }
+
+        self.wrappedValue = color
 
-        if encodeHexFormat == nil {
-            self.encodeHexFormat = format
+        
+        /**
+         * 虽然初始化赋值时候`public init(wrappedValue: ColorObject?, encodeHexFormat: HexFormat? = nil)` 提供了 `encodeHexFormat`,但是在 `encode` 解析时重新初始化了对象导致赋值的 `encodeHexFormat` 没了。
+         * 通过缓存 `Cache` 获取使用者设置的该值。
+         * 再赋值到新对象的属性上。
+         */
+        if let arr = impl.codingPath.removeFromEnd(1),
+           let hexColor: SmartHexColor = try? impl.cache.initialValue(forKey: impl.codingPath.last, codingPath: arr) {
+            self.encodeHexFormat = hexColor.encodeHexFormat
         }
-        self.wrappedValue = color
     }
 
 

Sources/SmartCodable/Core/Sentinel/LogItem.swift

@@ -90,7 +90,7 @@ extension LogItem {
 }
 
 extension Array {
-    fileprivate func removeFromEnd(_ count: Int) -> [Element]? {
+    func removeFromEnd(_ count: Int) -> [Element]? {
         guard count >= 0 else { return nil }
         let endIndex = self.count - count
         guard endIndex >= 0 else { return nil }