bugfix

Example/Podfile.lock

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

Example/SmartCodable/Test2ViewController.swift

@@ -16,17 +16,43 @@ class Test2ViewController: BaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let dict = [
-            "name": 1.22222
+        let dict: [String: Any] = [
+            "name": "mccc",
+            "subModel": "mccc111",
+
         ]
         let model = Model.deserialize(from: dict)
-        print(model)
+        print(model?.subModel?.rawValue)
+
+        let dict1 = model?.toDictionary()
+        print(dict1)
 
     }
 
     struct Model: SmartCodable {
         var name: String = ""
+        @SmartPublished
+        var subModel: TestEnum?
 
 
+        static func mappingForValue() -> [SmartValueTransformer]? {
+            [
+                CodingKeys.name <--- FastTransformer<String, String>(fromJSON: { json in
+                    "abc"
+                }),
+                CodingKeys.subModel <--- FastTransformer<TestEnum, String>(fromJSON: { json in
+                    TestEnum.man
+                }),
+            ]
+        }
+    }
+
+    enum TestEnum: String, SmartCaseDefaultable {
+    case man
+    }
+
+    struct SubModel: SmartCodable {
+        var name: String = ""
+
     }
 }

Example/SmartCodable/TestViewController.swift

@@ -14,7 +14,6 @@ import CleanJSON
 import BTPrint
 
 
-
 /** 字典的值情况
  1. @Published 修饰的属性的解析。
  2. 继承关系！！！！
@@ -35,6 +34,38 @@ class TestViewController: BaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        let jsonString = """
+{
+
+    "enjoyCount": 462,
+    "talkCount": null,
+}
+    
+"""
+
+        guard let model = RecommendModel.deserialize(from: jsonString) else {
+            return
+        }
+
+        print(model)
+    }
+
+
+    struct RecommendModel: SmartCodable {
+
+        /// 点赞数
+        var enjoyCount: Int = 0
+        /// 评论数
+        var commentCount: Int = 0
+
 
+
+        static func mappingForKey() -> [SmartKeyTransformer]? {
+            [
+                CodingKeys.commentCount <--- ["commentCount","talkCount","postCommentCount","topicCommentCount","topicTalkCount", "articleCommentCount"],
+                CodingKeys.enjoyCount <--- ["articleEnjoyCount","enjoyCount","topicEnjoyCount","postEnjoyCount"],
+            ]
+        }
     }
+
 }

SmartCodable.podspec

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

SmartCodable/Classes/JSONDecoder/Decoder/Impl/JSONDecoderImpl+KeyedContainer.swift

@@ -290,15 +290,16 @@ extension JSONDecoderImpl.KeyedContainer {
 
         // 如果值可以被成功获取
         if let value = try? getValue(forKey: key) {
-               if let decoded = impl.cache.tranform(value: value, for: key) {
-
-                   // 检查 SmartPublished 包装器类型
-                   if let publishedType = T.self as? any SmartPublishedProtocol.Type,
-                      let publishedValue = publishedType.createInstance(with: decoded) as? T {
-                       return publishedValue
-                   }
-               }
-           }
+            if let decoded = impl.cache.tranform(value: value, for: key) {
+                if let tTypeValue = decoded as? T {
+                    return tTypeValue
+                } else if let publishedType = T.self as? any SmartPublishedProtocol.Type,
+                          let publishedValue = publishedType.createInstance(with: decoded) as? T {
+                    // // 检查 SmartPublished 包装器类型
+                    return publishedValue
+                }
+            }
+        }
 
 
 

SmartCodable/Classes/JSONDecoder/Decoder/KeysMapper.swift

@@ -44,7 +44,7 @@ struct KeysMapper {
         type.mappingForKey()?.forEach { mapping in
             for oldKey in mapping.from {
                 let newKey = mapping.to.stringValue
-                if let value = newDict[oldKey], !(value is NSNull) {
+                if let value = newDict[oldKey] as? JSONValue, value != .null {
                     newDict[newKey] = newDict[oldKey]
                     break
                 } else { // Handles the case of a custom parsing path.

SmartCodable/Classes/Transformer/Transformer.swift

@@ -53,3 +53,46 @@ public protocol ValueTransformable {
 public func <---(location: CodingKey, tranformer: any ValueTransformable) -> SmartValueTransformer {
     SmartValueTransformer.init(location: location, tranformer: tranformer)
 }
+
+
+
+/** 便捷的Transformer
+ static func mappingForValue() -> [SmartValueTransformer]? {
+     [
+         CodingKeys.name <--- FastTransformer<String, String>(fromJSON: { json in
+             "abc"
+         }, toJSON: { object in
+             "123"
+         }),
+         CodingKeys.subModel <--- FastTransformer<TestEnum, String>(fromJSON: { json in
+             TestEnum.man
+         }, toJSON: { object in
+             object?.rawValue
+         }),
+     ]
+ }
+ */
+
+public struct FastTransformer<Object, JSON>: ValueTransformable {
+
+    private let fromJSON: (JSON?) -> Object?
+    private let toJSON: ((Object?) -> JSON?)?
+
+
+    /// 便捷的转换器
+    /// - Parameters:
+    ///   - fromJSON: json 转 object
+    ///   - toJSON:  object 转 json， 如果需要转json，可以不实现。
+    public init(fromJSON: @escaping (JSON?) -> Object?, toJSON: ((Object?) -> JSON?)? = nil) {
+        self.fromJSON = fromJSON
+        self.toJSON = toJSON
+    }
+
+    public func transformFromJSON(_ value: Any) -> Object? {
+        return fromJSON(value as? JSON)
+    }
+
+    public func transformToJSON(_ value: Object) -> JSON? {
+        return toJSON?(value)
+    }
+}