A little bit of refactoring

...

Author: helje5

Sources/MacroXmlRpc/RouteKeeper.swift

@@ -21,39 +21,3 @@ public extension RouteKeeper {
     post(xmlrpc.synchronousCall(methodName, execute: execute))
   }
 }
-
-public extension RouteKeeper {
-          
-  @inlinable
-  @discardableResult
-  func rpc<A1, R>(_ methodName: String, execute: @escaping ( A1 ) throws -> R)
-       -> Self
-       where A1 : XmlRpcValueRepresentable,
-             R  : XmlRpcValueRepresentable
-  {
-    rpc(methodName) { call in
-      guard call.parameters.count == 1,
-            let a1 = A1(xmlRpcValue: call.parameters[0])
-       else { throw XmlRpc.Fault(code: 400, reason: "Invalid parameters") }
-      return try execute(a1)
-    }
-  }
-          
-  @inlinable
-  @discardableResult
-  func rpc<A1, A2, R>(_ methodName: String,
-                      execute: @escaping ( A1, A2 ) throws -> R)
-       -> Self
-       where A1 : XmlRpcValueRepresentable,
-             A2 : XmlRpcValueRepresentable,
-             R  : XmlRpcValueRepresentable
-  {
-    rpc(methodName) { call in
-      guard call.parameters.count == 2,
-            let a1 = A1(xmlRpcValue: call.parameters[0]),
-            let a2 = A2(xmlRpcValue: call.parameters[1])
-       else { throw XmlRpc.Fault(code: 400, reason: "Invalid parameters") }
-      return try execute(a1, a2)
-    }
-  }
-}

Sources/MacroXmlRpc/TypedRoutes.swift

@@ -0,0 +1,113 @@
+//
+//  TypedRoutes.swift
+//  MacroXmlRpc
+//
+//  Created by Helge Hess.
+//  Copyright © 2020 ZeeZide GmbH. All rights reserved.
+//
+
+import MacroExpress
+import XmlRpc
+
+public protocol IntrospectibleXmlRpcValue: XmlRpcValueRepresentable {
+  static var xmlRpcValueType : XmlRpc.Value.ValueType { get }
+}
+
+public extension RouteKeeper {
+  
+  // TODO: To finish up introspection, this needs to be decoupled from
+  //       `synchronousCall`.
+  
+  @inlinable
+  @discardableResult
+  func rpc<A1, R>(_ methodName: String, execute: @escaping ( A1 ) throws -> R)
+       -> Self
+       where A1 : IntrospectibleXmlRpcValue,
+             R  : IntrospectibleXmlRpcValue
+  {
+    post(xmlrpc.synchronousCall(methodName) { call in
+      guard call.parameters.count == 1,
+            let a1 = A1(xmlRpcValue: call.parameters[0])
+       else { throw XmlRpc.Fault(code: 400, reason: "Invalid parameters") }
+      return try execute(a1)
+    })
+  }
+          
+  @inlinable
+  @discardableResult
+  func rpc<A1, A2, R>(_ methodName: String,
+                      execute: @escaping ( A1, A2 ) throws -> R)
+       -> Self
+       where A1 : IntrospectibleXmlRpcValue,
+             A2 : IntrospectibleXmlRpcValue,
+             R  : IntrospectibleXmlRpcValue
+  {
+    post(xmlrpc.synchronousCall(methodName) { call in
+      guard call.parameters.count == 2,
+            let a1 = A1(xmlRpcValue: call.parameters[0]),
+            let a2 = A2(xmlRpcValue: call.parameters[1])
+       else { throw XmlRpc.Fault(code: 400, reason: "Invalid parameters") }
+      return try execute(a1, a2)
+    })
+  }
+}
+
+
+// MARK: - IntrospectibleXmlRpcValue types
+
+extension String: IntrospectibleXmlRpcValue {
+  @inlinable
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .string }
+}
+
+extension Int: IntrospectibleXmlRpcValue {
+  @inlinable
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .int }
+}
+
+extension Double: IntrospectibleXmlRpcValue {
+  @inlinable
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .double }
+}
+
+extension Bool: IntrospectibleXmlRpcValue {
+  @inlinable
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .bool }
+}
+
+extension Collection where Element : IntrospectibleXmlRpcValue {
+  @inlinable
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .array }
+}
+
+extension Array   : IntrospectibleXmlRpcValue
+    where Element : IntrospectibleXmlRpcValue
+{
+}
+extension Set     : IntrospectibleXmlRpcValue
+    where Element : IntrospectibleXmlRpcValue
+{
+}
+
+extension Dictionary : IntrospectibleXmlRpcValue
+    where Key       == String,
+          Value      : IntrospectibleXmlRpcValue
+{
+  @inlinable
+  public static var xmlRpcValueType : XmlRpc.Value.ValueType { .dictionary }
+}
+
+#if canImport(Foundation)
+  import struct Foundation.URL
+  import struct Foundation.DateComponents
+  
+  extension DateComponents: IntrospectibleXmlRpcValue {
+    @inlinable
+    public static var xmlRpcValueType : XmlRpc.Value.ValueType { .dateTime }
+  }
+
+  extension URL: IntrospectibleXmlRpcValue {
+    @inlinable
+    public static var xmlRpcValueType : XmlRpc.Value.ValueType { .string }
+  }
+#endif // canImport(Foundation)

Sources/MacroXmlRpc/ValueType.swift

@@ -11,15 +11,17 @@ import protocol XmlRpc.XmlRpcValueRepresentable
 public extension XmlRpc.Value {
 
   /**
-   * The various possible XML-RPC value types.
+   * The various possible XML-RPC value types used in XML-RPC introspection.
+   * Note that those are flat, i.e. arrays and dictionaries are not further
+   * described.
    */
   @frozen
   enum ValueType: Hashable {
     case null
     case string, bool, int, double, dateTime, data
     case array, dictionary
   }
-
+  
   @inlinable
   var xmlRpcValueType: ValueType {
     switch self {