优化SmartFlat

Author: Mccc

Example/Podfile.lock

@@ -8,7 +8,7 @@ PODS:
   - FBSnapshotTestCase/SwiftSupport (2.1.4):
     - FBSnapshotTestCase/Core
   - HandyJSON (5.0.0-beta.1)
-  - SmartCodable (4.3.7)
+  - SmartCodable (4.3.7-beta)
   - SnapKit (5.6.0)
 
 DEPENDENCIES:
@@ -39,7 +39,7 @@ SPEC CHECKSUMS:
   CleanJSON: 910a36465ce4829e264a902ccf6d1455fdd9f980
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
   HandyJSON: 582477127ab3ab65bd2e471815f1a7b846856978
-  SmartCodable: 56babd0a912588ce299f2d0799633126f4c427c2
+  SmartCodable: a20b3bde2d0475de940386a902030f60804a1f66
   SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
 
 PODFILE CHECKSUM: 7f3af03f81934df0c035518074a7abbec8fa9d3f

Example/Pods/Local Podspecs/SmartCodable.podspec.json

@@ -35,44 +35,35 @@ class TestViewController: BaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-      
-    }
-    
-   
-    
-    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
-
         let dict: [String: Any] =
         [
-          "data" : [
-            "enableJson" : "111",
-          ],
+            "location" : "suzhou",
+            "name": "Mccc",
+            "age": 18
         ]
-        
-
 
-        let model = ResultModel.deserialize(from: dict)
-        print(model?.data?.enableJson)
+        guard let model = Model.deserialize(from: dict) else { return }
 
+        let transDict = model.toDictionary() ?? [:]
+        print(transDict)
     }
+    
+   
+    
+    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
 
-    public struct ResultModel: SmartCodable {
-        public init() {}
 
-//        //后台返回字段
-        @SmartAny
-        public var data: NotifyEnableModel?
     }
 
-
-    struct NotifyEnableModel: SmartCodable {
-//        required init() {}
-        // 服务器返回 Json
-        var enableJson: String = ""
+    struct Model: SmartCodable {
+        var location: String = ""
 
-        mutating func didFinishMapping() {
-            enableJson = "2222"
-           print("NotifyEnableModel_didFinishMapping")
-        }
+        @SmartFlat
+        var model: BaseModel?
+    }
+    
+    struct BaseModel: SmartCodable {
+        var name: String = ""
+        var age: Int = 0
     }
 }

Example/Pods/Manifest.lock

@@ -12,7 +12,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SmartCodable'
-  s.version          = '4.3.7'
+  s.version          = '4.3.7-beta'
   s.summary          = 'Swift数据解析库'
 
   s.homepage         = 'https://github.com/intsig171'

Example/SmartCodable/TestViewController.swift

@@ -72,8 +72,17 @@ extension _SpecialTreatmentEncoder {
             let encoder = self.getEncoder(for: additionalKey)
             try encodable.encode(to: encoder)
 
+            // 如果是被SmartFlat修饰的，需要向上层encode，让数据恢复原样。
+            if encodable is FlatType {
+                if let object = encoder.value?.object {
+                    for (key, value) in object {
+                        self.impl.object?.set(value, for: key)
+                    }
+                    return nil
+                }
+            }
+        
             impl.cache.removeSnapshot(for: E.self)
-            
             return encoder.value
         }
     }