Updated logging

Author: colemancda

Sources/CodingKey.swift

@@ -55,13 +55,7 @@ public extension TLVCodingKey where Self: CaseIterable, Self: RawRepresentable,
 
 internal extension TLVTypeCode {
 
-    enum CodingKeyError: Error {
-        
-        case missingIntegerValue
-        case invalidIntegerValue(Int)
-    }
-    
-    init<K: CodingKey> (codingKey: K) throws {
+    init? <K: CodingKey> (codingKey: K) {
 
         if let tlvCodingKey = codingKey as? TLVCodingKey {
 
@@ -71,7 +65,7 @@ internal extension TLVTypeCode {
 
             guard intValue <= Int(UInt8.max),
                 intValue >= Int(UInt8.min)
-                else { throw CodingKeyError.invalidIntegerValue(intValue) }
+                else { return nil }
 
             self.init(rawValue: UInt8(intValue))
 
@@ -82,7 +76,7 @@ internal extension TLVTypeCode {
 
         } else {
 
-            throw CodingKeyError.missingIntegerValue
+            return nil
         }
     }
 }
@@ -94,3 +88,17 @@ internal extension Sequence where Element == CodingKey {
         return reduce("", { $0 + "\($0.isEmpty ? "" : ".")" + $1.stringValue })
     }
 }
+
+internal extension CodingKey {
+    
+    static var sanitizedName: String {
+        
+        let rawName = String(reflecting: self)
+        var elements = rawName.split(separator: ".")
+        guard elements.count > 2
+            else { return rawName }
+        elements.removeFirst()
+        elements.removeAll { $0.contains("(unknown context") }
+        return elements.reduce("", { $0 + ($0.isEmpty ? "" : ".") + $1 })
+    }
+}

Sources/Decoder.swift

@@ -122,7 +122,7 @@ internal extension TLVDecoder {
 
         func container <Key: CodingKey> (keyedBy type: Key.Type) throws -> KeyedDecodingContainer<Key> {
 
-            log?("Requested container keyed by \(String(reflecting: type)) for path \"\(codingPath.path)\"")
+            log?("Requested container keyed by \(type.sanitizedName) for path \"\(codingPath.path)\"")
 
             let container = self.stack.top
 
@@ -530,8 +530,7 @@ internal struct TLVSingleValueDecodingContainer: SingleValueDecodingContainer {
 
     func decode(_ type: Int.Type) throws -> Int {
 
-        let value = try self.decoder.unbox(container.value, as: Int32.self)
-        
+        let value = try self.decoder.unboxNumeric(container.value, as: Int32.self)
         return Int(value)
     }
 
@@ -542,23 +541,22 @@ internal struct TLVSingleValueDecodingContainer: SingleValueDecodingContainer {
 
     func decode(_ type: Int16.Type) throws -> Int16 {
 
-        return try self.decoder.unbox(container.value, as: type)
+        return try self.decoder.unboxNumeric(container.value, as: type)
     }
 
     func decode(_ type: Int32.Type) throws -> Int32 {
 
-        return try self.decoder.unbox(container.value, as: type)
+        return try self.decoder.unboxNumeric(container.value, as: type)
     }
 
     func decode(_ type: Int64.Type) throws -> Int64 {
 
-        return try self.decoder.unbox(container.value, as: type)
+        return try self.decoder.unboxNumeric(container.value, as: type)
     }
 
     func decode(_ type: UInt.Type) throws -> UInt {
 
-        let value = try self.decoder.unbox(container.value, as: UInt32.self)
-        
+        let value = try self.decoder.unboxNumeric(container.value, as: UInt32.self)
         return UInt(value)
     }
 
@@ -569,27 +567,29 @@ internal struct TLVSingleValueDecodingContainer: SingleValueDecodingContainer {
 
     func decode(_ type: UInt16.Type) throws -> UInt16 {
 
-        return try self.decoder.unbox(container.value, as: type)
+        return try self.decoder.unboxNumeric(container.value, as: type)
     }
 
     func decode(_ type: UInt32.Type) throws -> UInt32 {
 
-        return try self.decoder.unbox(container.value, as: type)
+        return try self.decoder.unboxNumeric(container.value, as: type)
     }
 
     func decode(_ type: UInt64.Type) throws -> UInt64 {
 
-        return try self.decoder.unbox(container.value, as: type)
+        return try self.decoder.unboxNumeric(container.value, as: type)
     }
 
     func decode(_ type: Float.Type) throws -> Float {
 
-        fatalError()
+        let value = try self.decoder.unboxNumeric(container.value, as: UInt32.self)
+        return Float(bitPattern: value)
     }
 
     func decode(_ type: Double.Type) throws -> Double {
 
-        fatalError()
+        let value = try self.decoder.unboxNumeric(container.value, as: UInt64.self)
+        return Double(bitPattern: value)
     }
 
     func decode(_ type: String.Type) throws -> String {
@@ -636,7 +636,7 @@ internal struct TLVUnkeyedDecodingContainer: UnkeyedDecodingContainer {
         return _count
     }
 
-    var _count: Int {
+    private var _count: Int {
         return container.count
     }
 

Sources/Encoder.swift

@@ -91,7 +91,7 @@ internal extension TLVEncoder {
 
         func container<Key>(keyedBy type: Key.Type) -> KeyedEncodingContainer<Key> where Key : CodingKey {
 
-            log?("Requested container keyed by \(type) for path \"\(codingPath.path)\"")
+            log?("Requested container keyed by \(type.sanitizedName) for path \"\(codingPath.path)\"")
 
             let stackContainer = ItemsContainer()
             self.stack.push(.items(stackContainer))