decoding strings and arrays

OpenKitten · Oct 23, 2017 · 801f4fa · 801f4fa
1 parent bda835f
commit 801f4fa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/Sources/Cheetah/Codable.swift b/Sources/Cheetah/Codable.swift
@@ -374,9 +374,21 @@ public class JSONDecoder {
         return try T(from: decoder)
     }
 
+    public func decode<T : Decodable>(_ type: T.Type, from array: JSONArray) throws -> T {
+        let decoder = _JSONDecoder(target: .array(array))
+        return try T(from: decoder)
+    }
+
     public func decode<T : Decodable>(_ type: T.Type, from string: String) throws -> T {
-        let object = try JSONObject(from: string)
-        let decoder = _JSONDecoder(target: .object(object))
+        let decoder: _JSONDecoder
+
+        if let object = try? JSONObject(from: string) {
+            decoder = _JSONDecoder(target: .object(object))
+        } else {
+            let array = try JSONArray(from: string)
+            decoder = _JSONDecoder(target: .array(array))
+        }
+
         return try T(from: decoder)
     }
 }

diff --git a/Tests/CheetahTests/ParserTests.swift b/Tests/CheetahTests/ParserTests.swift
@@ -92,6 +92,11 @@ class ParsingTests: XCTestCase {
         XCTAssertEqual(Bool(obj1["other"]), false)
         XCTAssertEqual(Bool(obj2["other"]), false)
         XCTAssertEqual(Bool(obj3["other"]), true)
+
+        let encoded = array0.serializedString()
+        let values = try JSONDecoder().decode([User].self, from: encoded)
+
+        XCTAssertEqual(values.count, 4)
     }
 
     func testEncodeArrayJSON() throws {