use json methods

Author: tanner0101

Sources/MySQLKit/MySQLDataDecoder.swift

@@ -1,24 +1,32 @@
 import Foundation
 
-#warning("TODO: move to codable kit")
-struct DecoderUnwrapper: Decodable {
+private struct DecoderUnwrapper: Decodable {
     let decoder: Decoder
     init(from decoder: Decoder) {
         self.decoder = decoder
     }
 }
+private struct DoJSON: Error { }
 
 public struct MySQLDataDecoder {
     public init() {}
 
     public func decode<T>(_ type: T.Type, from data: MySQLData) throws -> T
         where T: Decodable
     {
-        return try T.init(from: _Decoder(data: data))
+        do {
+            return try T.init(from: _Decoder(data: data))
+        } catch is DoJSON {
+            guard let value = try data.json(as: T.self) else {
+                throw DecodingError.typeMismatch(T.self, DecodingError.Context.init(
+                    codingPath: [],
+                    debugDescription: "Could not convert from MySQL data: \(T.self)"
+                ))
+            }
+            return value
+        }
     }
 
-    #warning("TODO: finish implementing")
-    
     private final class _Decoder: Decoder {
         var codingPath: [CodingKey] {
             return []
@@ -37,12 +45,10 @@ public struct MySQLDataDecoder {
             fatalError()
         }
 
-        func container<Key>(keyedBy type: Key.Type) throws -> KeyedDecodingContainer<Key> where Key : CodingKey {
-            #warning("TODO: use NIOFoundationCompat")
-            var buffer = self.data.buffer!
-            let data = buffer.readBytes(length: buffer.readableBytes)!
-            let unwrapper = try JSONDecoder().decode(DecoderUnwrapper.self, from: Data(data))
-            return try unwrapper.decoder.container(keyedBy: Key.self)
+        func container<Key>(keyedBy type: Key.Type) throws -> KeyedDecodingContainer<Key>
+            where Key : CodingKey
+        {
+            throw DoJSON()
         }
 
         func singleValueContainer() throws -> SingleValueDecodingContainer {
@@ -66,7 +72,7 @@ public struct MySQLDataDecoder {
         func decode<T>(_ type: T.Type) throws -> T where T : Decodable {
             if let convertible = T.self as? MySQLDataConvertible.Type {
                 guard let value = convertible.init(mysqlData: self.decoder.data) else {
-                    throw DecodingError.typeMismatch(convertible, DecodingError.Context.init(
+                    throw DecodingError.typeMismatch(T.self, DecodingError.Context.init(
                         codingPath: self.codingPath,
                         debugDescription: "Could not convert from MySQL data: \(T.self)"
                     ))

Sources/MySQLKit/MySQLDataEncoder.swift

@@ -12,16 +12,7 @@ public struct MySQLDataEncoder {
                 try type.encode(to: encoder)
                 return encoder.data
             } catch is DoJSON {
-                let json = JSONEncoder()
-                let data = try json.encode(Wrapper(type))
-                var buffer = ByteBufferAllocator().buffer(capacity: data.count)
-                buffer.writeBytes(data)
-                return MySQLData(
-                    type: .string,
-                    format: .text,
-                    buffer: buffer,
-                    isUnsigned: true
-                )
+                return try MySQLData(json: type)
             }
         }
     }
@@ -53,16 +44,6 @@ public struct MySQLDataEncoder {
     }
 
     struct DoJSON: Error {}
-
-    struct Wrapper: Encodable {
-        let encodable: Encodable
-        init(_ encodable: Encodable) {
-            self.encodable = encodable
-        }
-        func encode(to encoder: Encoder) throws {
-            try self.encodable.encode(to: encoder)
-        }
-    }
 
     private struct _KeyedValueEncoder<Key>: KeyedEncodingContainerProtocol where Key: CodingKey {
         var codingPath: [CodingKey] {