refactor: AnyJSON type

Author: Guilherme Souza

Sources/Helpers/AnyJSON/AnyJSON+Codable.swift

@@ -9,14 +9,19 @@ import Foundation
 
 extension AnyJSON {
   /// The decoder instance used for transforming AnyJSON to some Codable type.
+  @available(
+    *, deprecated, message: "decoder is deprecated, AnyJSON now uses default JSONDecoder()."
+  )
   public static let decoder: JSONDecoder = {
     let decoder = JSONDecoder()
     decoder.dataDecodingStrategy = .base64
     decoder.dateDecodingStrategy = .custom { decoder in
       let container = try decoder.singleValueContainer()
       let dateString = try container.decode(String.self)
 
-      let date = ISO8601DateFormatter.iso8601WithFractionalSeconds.value.date(from: dateString) ?? ISO8601DateFormatter.iso8601.value.date(from: dateString)
+      let date =
+        ISO8601DateFormatter.iso8601WithFractionalSeconds.value.date(from: dateString)
+        ?? ISO8601DateFormatter.iso8601.value.date(from: dateString)
 
       guard let decodedDate = date else {
         throw DecodingError.dataCorruptedError(
@@ -30,6 +35,9 @@ extension AnyJSON {
   }()
 
   /// The encoder instance used for transforming AnyJSON to some Codable type.
+  @available(
+    *, deprecated, message: "encoder is deprecated, AnyJSON now uses default JSONEncoder()."
+  )
   public static let encoder: JSONEncoder = {
     let encoder = JSONEncoder()
     encoder.dataEncodingStrategy = .base64
@@ -47,12 +55,29 @@ extension AnyJSON {
   public init(_ value: some Codable) throws {
     if let value = value as? AnyJSON {
       self = value
+    } else if let string = value as? String {
+      self = .string(string)
+    } else if let bool = value as? Bool {
+      self = .bool(bool)
+    } else if let int = value as? Int {
+      self = .integer(int)
+    } else if let double = value as? Double {
+      self = .double(double)
     } else {
-      let data = try AnyJSON.encoder.encode(value)
-      self = try AnyJSON.decoder.decode(AnyJSON.self, from: data)
+      let data = try JSONEncoder().encode(value)
+      self = try JSONDecoder().decode(AnyJSON.self, from: data)
     }
   }
 
+  /// Decodes self instance as `Decodable` type.
+  public func decode<T: Decodable>(as type: T.Type = T.self) throws -> T {
+    let data = try JSONEncoder().encode(self)
+    return try JSONDecoder().decode(T.self, from: data)
+  }
+
+  @available(
+    *, deprecated, renamed: "decode(as:)", message: "Providing a custom decoder is deprecated."
+  )
   public func decode<T: Decodable>(
     as _: T.Type = T.self,
     decoder: JSONDecoder = AnyJSON.decoder
@@ -63,6 +88,14 @@ extension AnyJSON {
 }
 
 extension JSONArray {
+  /// Decodes self instance as array of `Decodable` type.
+  public func decode<T: Decodable>(as _: T.Type = T.self) throws -> [T] {
+    try AnyJSON.array(self).decode(as: [T].self)
+  }
+
+  @available(
+    *, deprecated, renamed: "decode(as:)", message: "Providing a custom decoder is deprecated."
+  )
   public func decode<T: Decodable>(
     as _: T.Type = T.self,
     decoder: JSONDecoder = AnyJSON.decoder
@@ -72,13 +105,22 @@ extension JSONArray {
 }
 
 extension JSONObject {
+  /// Decodes self instance as `Decodable` type.
+  public func decode<T: Decodable>(as type: T.Type = T.self) throws -> T {
+    try AnyJSON.object(self).decode(as: type)
+  }
+
+  @available(
+    *, deprecated, renamed: "decode(as:)", message: "Providing a custom decoder is deprecated."
+  )
   public func decode<T: Decodable>(
     as _: T.Type = T.self,
     decoder: JSONDecoder = AnyJSON.decoder
   ) throws -> T {
     try AnyJSON.object(self).decode(as: T.self, decoder: decoder)
   }
 
+  /// Initialize JSONObject from a `Codable` type
   public init(_ value: some Codable) throws {
     guard let object = try AnyJSON(value).objectValue else {
       throw DecodingError.typeMismatch(

Tests/HelpersTests/AnyJSONTests.swift

@@ -65,21 +65,20 @@ final class AnyJSONTests: XCTestCase {
 
   func testDecode() throws {
     let data = try XCTUnwrap(jsonString.data(using: .utf8))
-    let decodedJSON = try AnyJSON.decoder.decode(AnyJSON.self, from: data)
+    let decodedJSON = try JSONDecoder().decode(AnyJSON.self, from: data)
 
     expectNoDifference(decodedJSON, jsonObject)
   }
 
-  // Commented out as this is failing on CI.
-  //  func testEncode() throws {
-  //    let encoder = AnyJSON.encoder
-  //    encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
-  //
-  //    let data = try encoder.encode(jsonObject)
-  //    let decodedJSONString = try XCTUnwrap(String(data: data, encoding: .utf8))
-  //
-  //    expectNoDifference(decodedJSONString, jsonString)
-  //  }
+    func testEncode() throws {
+      let encoder = JSONEncoder()
+      encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
+  
+      let data = try encoder.encode(jsonObject)
+      let decodedJSONString = try XCTUnwrap(String(data: data, encoding: .utf8))
+  
+      expectNoDifference(decodedJSONString, jsonString)
+    }
 
   func testInitFromCodable() {
     try expectNoDifference(AnyJSON(jsonObject), jsonObject)