fix: only json supports dictionary, array and string types

iwill · iwill · commit c3c1d9c09dcf · 2021-02-18T22:57:48.000+08:00
diff --git a/Sources/ExCodable/ExCodable.swift b/Sources/ExCodable/ExCodable.swift
@@ -383,21 +383,21 @@ public extension Encodable {
         return try? encoder.encode(self)
     }
     
-    func encoded(using encoder: DataEncoder = JSONEncoder()) -> [String: Any]? {
+    func encoded(using encoder: JSONEncoder = JSONEncoder()) -> [String: Any]? {
         if let data = encoded(using: encoder) as Data? {
             return try? JSONSerialization.jsonObject(with: data, options: .fragmentsAllowed) as? [String: Any]
         }
         return nil
     }
     
-    func encoded(using encoder: DataEncoder = JSONEncoder()) -> [Any]? {
+    func encoded(using encoder: JSONEncoder = JSONEncoder()) -> [Any]? {
         if let data = encoded(using: encoder) as Data? {
             return try? JSONSerialization.jsonObject(with: data, options: .fragmentsAllowed) as? [Any]
         }
         return nil
     }
     
-    func encoded(using encoder: DataEncoder = JSONEncoder()) -> String? {
+    func encoded(using encoder: JSONEncoder = JSONEncoder()) -> String? {
         if let data = encoded(using: encoder) as Data? {
             return String(data: data, encoding: .utf8)
         }
@@ -414,23 +414,23 @@ public extension Decodable {
         return try? decoder.decode(type, from: data)
     }
     
-    static func decoded(from json: [String: Any], using decoder: DataDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {
+    static func decoded(from json: [String: Any], using decoder: JSONDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {
         if JSONSerialization.isValidJSONObject(json),
            let data = try? JSONSerialization.data(withJSONObject: json, options: .fragmentsAllowed) {
             return try? decoder.decode(type, from: data)
         }
         return nil
     }
     
-    static func decoded(from jsonArray: [Any], using decoder: DataDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {
+    static func decoded(from jsonArray: [Any], using decoder: JSONDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {
         if JSONSerialization.isValidJSONObject(jsonArray),
            let data = try? JSONSerialization.data(withJSONObject: jsonArray, options: .fragmentsAllowed) {
             return try? decoder.decode(type, from: data)
         }
         return nil
     }
     
-    static func decoded(from string: String, using decoder: DataDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {
+    static func decoded(from string: String, using decoder: JSONDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {
         let data = Data(string.utf8)
         return try? decoder.decode(type, from: data)
     }
@@ -446,7 +446,7 @@ public extension Data {
 }
 
 public extension Dictionary {
-    func decoded<T: Decodable>(using decoder: DataDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {
+    func decoded<T: Decodable>(using decoder: JSONDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {
         guard JSONSerialization.isValidJSONObject(self),
               let data = try? JSONSerialization.data(withJSONObject: self, options: .fragmentsAllowed) else {
             return nil
@@ -456,7 +456,7 @@ public extension Dictionary {
 }
 
 public extension Array {
-    func decoded<T: Decodable>(using decoder: DataDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {
+    func decoded<T: Decodable>(using decoder: JSONDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {
         guard JSONSerialization.isValidJSONObject(self),
               let data = try? JSONSerialization.data(withJSONObject: self, options: .fragmentsAllowed) else {
             return nil
@@ -466,7 +466,7 @@ public extension Array {
 }
 
 public extension String {
-    func decoded<T: Decodable>(using decoder: DataDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {
+    func decoded<T: Decodable>(using decoder: JSONDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {
         return Data(self.utf8).decoded(using: decoder, as: type)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -383,21 +383,21 @@ public extension Encodable {`
`383`	`383`	`return try? encoder.encode(self)`
`384`	`384`	`}`
`385`	`385`
`386`		`- func encoded(using encoder: DataEncoder = JSONEncoder()) -> [String: Any]? {`
	`386`	`+ func encoded(using encoder: JSONEncoder = JSONEncoder()) -> [String: Any]? {`
`387`	`387`	`if let data = encoded(using: encoder) as Data? {`
`388`	`388`	`return try? JSONSerialization.jsonObject(with: data, options: .fragmentsAllowed) as? [String: Any]`
`389`	`389`	`}`
`390`	`390`	`return nil`
`391`	`391`	`}`
`392`	`392`
`393`		`- func encoded(using encoder: DataEncoder = JSONEncoder()) -> [Any]? {`
	`393`	`+ func encoded(using encoder: JSONEncoder = JSONEncoder()) -> [Any]? {`
`394`	`394`	`if let data = encoded(using: encoder) as Data? {`
`395`	`395`	`return try? JSONSerialization.jsonObject(with: data, options: .fragmentsAllowed) as? [Any]`
`396`	`396`	`}`
`397`	`397`	`return nil`
`398`	`398`	`}`
`399`	`399`
`400`		`- func encoded(using encoder: DataEncoder = JSONEncoder()) -> String? {`
	`400`	`+ func encoded(using encoder: JSONEncoder = JSONEncoder()) -> String? {`
`401`	`401`	`if let data = encoded(using: encoder) as Data? {`
`402`	`402`	`return String(data: data, encoding: .utf8)`
`403`	`403`	`}`
`@@ -414,23 +414,23 @@ public extension Decodable {`
`414`	`414`	`return try? decoder.decode(type, from: data)`
`415`	`415`	`}`
`416`	`416`
`417`		`- static func decoded(from json: [String: Any], using decoder: DataDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {`
	`417`	`+ static func decoded(from json: [String: Any], using decoder: JSONDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {`
`418`	`418`	`if JSONSerialization.isValidJSONObject(json),`
`419`	`419`	`let data = try? JSONSerialization.data(withJSONObject: json, options: .fragmentsAllowed) {`
`420`	`420`	`return try? decoder.decode(type, from: data)`
`421`	`421`	`}`
`422`	`422`	`return nil`
`423`	`423`	`}`
`424`	`424`
`425`		`- static func decoded(from jsonArray: [Any], using decoder: DataDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {`
	`425`	`+ static func decoded(from jsonArray: [Any], using decoder: JSONDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {`
`426`	`426`	`if JSONSerialization.isValidJSONObject(jsonArray),`
`427`	`427`	`let data = try? JSONSerialization.data(withJSONObject: jsonArray, options: .fragmentsAllowed) {`
`428`	`428`	`return try? decoder.decode(type, from: data)`
`429`	`429`	`}`
`430`	`430`	`return nil`
`431`	`431`	`}`
`432`	`432`
`433`		`- static func decoded(from string: String, using decoder: DataDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {`
	`433`	`+ static func decoded(from string: String, using decoder: JSONDecoder = JSONDecoder(), as type: Self.Type = Self.self) -> Self? {`
`434`	`434`	`let data = Data(string.utf8)`
`435`	`435`	`return try? decoder.decode(type, from: data)`
`436`	`436`	`}`
`@@ -446,7 +446,7 @@ public extension Data {`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`public extension Dictionary {`
`449`		`- func decoded<T: Decodable>(using decoder: DataDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {`
	`449`	`+ func decoded<T: Decodable>(using decoder: JSONDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {`
`450`	`450`	`guard JSONSerialization.isValidJSONObject(self),`
`451`	`451`	`let data = try? JSONSerialization.data(withJSONObject: self, options: .fragmentsAllowed) else {`
`452`	`452`	`return nil`
`@@ -456,7 +456,7 @@ public extension Dictionary {`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`public extension Array {`
`459`		`- func decoded<T: Decodable>(using decoder: DataDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {`
	`459`	`+ func decoded<T: Decodable>(using decoder: JSONDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {`
`460`	`460`	`guard JSONSerialization.isValidJSONObject(self),`
`461`	`461`	`let data = try? JSONSerialization.data(withJSONObject: self, options: .fragmentsAllowed) else {`
`462`	`462`	`return nil`
`@@ -466,7 +466,7 @@ public extension Array {`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	`public extension String {`
`469`		`- func decoded<T: Decodable>(using decoder: DataDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {`
	`469`	`+ func decoded<T: Decodable>(using decoder: JSONDecoder = JSONDecoder(), as type: T.Type = T.self) -> T? {`
`470`	`470`	`return Data(self.utf8).decoded(using: decoder, as: type)`
`471`	`471`	`}`
`472`	`472`	`}`