add dynamicMemberLookup support

Author: tbxark

Demo/main.swift

@@ -20,21 +20,27 @@ let dict = ["data": ["man": ["age": 10, "name": "Peter", "height": 180.0, "extra
 
 // MARK: - JSONMapper
 print("-- JSONMapper --")
-let map = JSONMapper(data: dict)
+let json = JSONMapper(raw: dict)
 // 直接获取
-if let value = map["data"]["man"]["age"].intValue {
+if let value = json["data"]["man"]["age"].intValue {
     print(value)
 }
 // 使用Key获取
-if let value: Double = map["data"]["man"]["height"].value() {
+if let value = json["data"]["man"]["height"].value(type: Double.self) {
     print(value)
 }
+
+// 使用 dynamicMemberLookup 获取
+if let value = json.data.man.height.value(type: Double.self) {
+    print(value)
+}
+
 // 使用Keypath获取
-if let value = map.value(keyPath: "data.man.name", type: String.self) {
+if let value = json.value(keyPath: "data.man.name", type: String.self) {
     print(value)
 }
 
-if let manDict: Any = map["data"]["man"].value() {
+if let manDict: Any = json["data"]["man"].value() {
     let data = try JSONSerialization.data(withJSONObject: manDict, options: [])
     let man = try JSONDecoder().decode(Human.self, from: data)
     if let value = man.extra.arrayValue {
@@ -45,8 +51,15 @@ if let manDict: Any = map["data"]["man"].value() {
 
     }
 }
-// Output
-// 10
-// ["iPhone", "Blackberry", "Xiaomi"]
-// [Optional(123), Optional("123"), Optional([Optional(123)]), Optional(["123": 123]), Optional(true)]
-// 123
+
+//
+// Output:
+//
+//-- JSONMapper --
+//10
+//180.0
+//180.0
+//Peter
+//[Optional(123), Optional("123"), Optional([Optional(123)]), Optional(["123": 123]), Optional(true)]
+//123
+//Program ended with exit code: 0

JsonMapper/JsonMapper.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 
+@dynamicMemberLookup
 public enum JSONElement: Codable {
 
     case null
@@ -148,8 +149,17 @@ public enum JSONElement: Codable {
         let data = try JSONEncoder().encode(self)
         return try JSONDecoder().decode(T.self, from: data)
     }
+    
+    public subscript(dynamicMember member: String) -> JSONElement {
+        if case .object(let value) = self {
+            return value[member] ?? .null
+        }
+        return .null
+    }
 }
 
+
+@dynamicMemberLookup
 public struct JSONMapper {
 
     private var originData: Any?
@@ -175,11 +185,19 @@ public struct JSONMapper {
         self.originData = obj
     }
 
-    public init(data: Any?) {
-        self.originData = data
+    public init(data: Data) {
+        guard let obj = try? JSONSerialization.jsonObject(with: data, options: .allowFragments) else {
+                self.originData = nil
+                return
+        }
+        self.originData = obj
+    }
+    
+    public init(raw: Any?) {
+        self.originData = raw
     }
 
-    public func value<T>() -> T? {
+    public func value<T>(type: T.Type = T.self) -> T? {
         return originData as? T
     }
 
@@ -194,15 +212,21 @@ public struct JSONMapper {
 
 
     public subscript(key: String) -> JSONMapper {
-        return JSONMapper(data: (originData as? [String: Any])?[key])
+        return JSONMapper(raw: (originData as? [String: Any])?[key])
     }
 
     public subscript(index: Int) -> JSONMapper {
         guard let array = originData as? [Any],
             index < array.count else {
-                return JSONMapper(data: nil)
+                return JSONMapper(raw: nil)
         }
-        return JSONMapper(data: array[index])
+        return JSONMapper(raw: array[index])
+    }
+    
+    public subscript(dynamicMember member: String) -> JSONMapper {
+        guard let v = self.originData,
+            let dict = v as? [String: Any] else { return JSONMapper(raw: nil) }
+        return JSONMapper(raw: dict[member])
     }
 
 }

README.md

@@ -4,6 +4,8 @@
 
 Because `Any` can't be used in `Codable`, it can be replaced with `JSONElement` for properties of type `Any`.
 
+
+
 # Example
 
 ```swift
@@ -20,21 +22,27 @@ let dict = ["data": ["man": ["age": 10, "name": "Peter", "height": 180.0, "extra
 
 // MARK: - JSONMapper
 print("-- JSONMapper --")
-let map = JSONMapper(data: dict)
+let json = JSONMapper(raw: dict)
 // 直接获取
-if let value = map["data"]["man"]["age"].intValue {
+if let value = json["data"]["man"]["age"].intValue {
     print(value)
 }
 // 使用Key获取
-if let value: Double = map["data"]["man"]["height"].value() {
+if let value = json["data"]["man"]["height"].value(type: Double.self) {
     print(value)
 }
+
+// 使用 dynamicMemberLookup 获取
+if let value = json.data.man.height.value(type: Double.self) {
+    print(value)
+}
+
 // 使用Keypath获取
-if let value = map.value(keyPath: "data.man.name", type: String.self) {
+if let value = json.value(keyPath: "data.man.name", type: String.self) {
     print(value)
 }
 
-if let manDict: Any = map["data"]["man"].value() {
+if let manDict: Any = json["data"]["man"].value() {
     let data = try JSONSerialization.data(withJSONObject: manDict, options: [])
     let man = try JSONDecoder().decode(Human.self, from: data)
     if let value = man.extra.arrayValue {
@@ -45,12 +53,18 @@ if let manDict: Any = map["data"]["man"].value() {
 
     }
 }
-// Output
-// 10
-// 180.0
-// Peter
-// [Optional(123), Optional("123"), Optional([Optional(123)]), Optional(["123": 123]), Optional(true)]
-// 123
+
+//
+// Output:
+//
+//-- JSONMapper --
+//10
+//180.0
+//180.0
+//Peter
+//[Optional(123), Optional("123"), Optional([Optional(123)]), Optional(["123": 123]), Optional(true)]
+//123
+//Program ended with exit code: 0
 
 
 

TKJsonMapper.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name     = 'TKJsonMapper'
-	s.version  = '1.0.0'
+	s.version  = '1.1.0'
 
 	s.license  = { :type => 'MIT', :file => 'LICENSE' }
 	s.summary  = 'JSONMapper/JSONElement makes it easier and safer to use JSON'