Merge remote-tracking branch 'origin/fix-apple-generic-serialization' into feat-swift-codable-models

Author: abnegate

templates/apple/Sources/Client.swift.twig

@@ -429,18 +429,23 @@ open class Client {
             if param is String
                 || param is Int
                 || param is Float
+                || param is Double
                 || param is Bool
                 || param is [String]
                 || param is [Int]
                 || param is [Float]
+                || param is [Double]
                 || param is [Bool]
                 || param is [String: Any]
                 || param is [Int: Any]
                 || param is [Float: Any]
+                || param is [Double: Any]
                 || param is [Bool: Any] {
                 encodedParams[key] = param
+            } else if let encodable = param as? Encodable {
+                encodedParams[key] = try encodable.toJson()
             } else {
-                encodedParams[key] = try (param as! Encodable).toJson()
+                encodedParams[key] = String(describing: param)
             }
         }
 

templates/swift/Sources/Client.swift.twig

@@ -465,18 +465,23 @@ open class Client {
             if param is String
                 || param is Int
                 || param is Float
+                || param is Double
                 || param is Bool
                 || param is [String]
                 || param is [Int]
                 || param is [Float]
+                || param is [Double]
                 || param is [Bool]
                 || param is [String: Any]
                 || param is [Int: Any]
                 || param is [Float: Any]
+                || param is [Double: Any]
                 || param is [Bool: Any] {
                 encodedParams[key] = param
+            } else if let encodable = param as? Encodable {
+                encodedParams[key] = try encodable.toJson()
             } else {
-                encodedParams[key] = try (param as! Encodable).toJson()
+                encodedParams[key] = String(describing: param)
             }
         }
 

templates/swift/Sources/Enums/Enum.swift.twig

@@ -1,11 +1,15 @@
 import Foundation
 
-public enum {{ enum.name | caseUcfirst | overrideIdentifier }}: String, Codable {
+public enum {{ enum.name | caseUcfirst | overrideIdentifier }}: String, CustomStringConvertible, Codable {
     {%~ for value in enum.enum %}
     {%~ set key = enum.keys is empty ? value : enum.keys[loop.index0] %}
     case {{ key | caseEnumKey | escapeSwiftKeyword }} = "{{ value }}"
     {%~ endfor %}
 
+    public var description: String {
+        return rawValue
+    }
+
     public func encode(to encoder: Encoder) throws {
         var container = encoder.singleValueContainer()
         try container.encode(rawValue)