Update WebServiceProxy.

Author: gk-brown

.swiftpm/xcode/xcshareddata/xcschemes/Echo.xcscheme

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2600"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Echo"
+               BuildableName = "Echo"
+               BlueprintName = "Echo"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EchoTests"
+               BuildableName = "EchoTests"
+               BlueprintName = "EchoTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "EchoTests/testGetFibonacci()">
+               </Test>
+            </SkippedTests>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Echo"
+            BuildableName = "Echo"
+            BlueprintName = "Echo"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

README.md

@@ -34,25 +34,25 @@ Service operations are initiated via one of the following methods:
 
 ```swift
 public func invoke(_ method: Method, path: String, 
-    arguments: [String: Any] = [:],
+    arguments: [String: Sendable] = [:],
     content: Data? = nil, 
     contentType: String? = nil) async throws { ... }
 
 public func invoke<B: Encodable>(_ method: Method, path: String, 
-    arguments: [String: Any] = [:], 
+    arguments: [String: Sendable] = [:],
     body: B) async throws { ... }
 
 public func invoke<T: Decodable>(_ method: Method, path: String,
-    arguments: [String: Any] = [:],
+    arguments: [String: Sendable] = [:],
     content: Data? = nil, 
     contentType: String? = nil) async throws -> T { ... }
 
 public func invoke<B: Encodable, T: Decodable>(_ method: Method, path: String,
-    arguments: [String: Any] = [:],
+    arguments: [String: Sendable] = [:],
     body: B) async throws -> T { ... }
 
 public func invoke<T>(_ method: Method, path: String,
-    arguments: [String: Any] = [:],
+    arguments: [String: Sendable] = [:],
     content: Data? = nil, 
     contentType: String? = nil,
     responseHandler: @escaping ResponseHandler<T>) async throws -> T { ... }
@@ -78,7 +78,7 @@ Three of the methods accept the following arguments for specifying custom reques
 The other two methods accept a `body` argument of type `B` that is serialized using `JSONEncoder`. JSON data is encoded and decoded using a date strategy of `millisecondsSince1970`.
 
 ## Query Arguments
-Any value may be used as a query argument and will generally be encoded using its string representation. However, `Date` instances are first converted to a 64-bit integer value representing epoch time. Additionally, array instances represent multi-value parameters and behave similarly to `<select multiple>` tags in HTML forms.
+Any sendable value may be used as a query argument and will generally be encoded using its string representation. However, `Date` instances are first converted to a 64-bit integer value representing epoch time. Additionally, array instances represent multi-value parameters and behave similarly to `<select multiple>` tags in HTML forms.
 
 The `undefined` property of the `WebServiceProxy` class can be used to represent unspecified or unknown argument values.
 

Sources/Echo/WebServiceProxy.swift

@@ -63,8 +63,8 @@ public class WebServiceProxy {
     /**
      * Constant representing an unspecified value.
      */
-    public static let undefined = NSNull()
-    
+    public static let undefined: Void = ()
+
     // JSON encoder
     private static let jsonEncoder: JSONEncoder = {
         let jsonEncoder = JSONEncoder()
@@ -95,7 +95,7 @@ public class WebServiceProxy {
      - parameter contentType: The request content type, or `nil` for no content type.
      */
     public func invoke(_ method: Method, path: String,
-        arguments: [String: Any] = [:],
+        arguments: [String: Sendable] = [:],
         content: Data? = nil,
         contentType: String? = nil) async throws {
         try await invoke(method, path: path,
@@ -112,7 +112,7 @@ public class WebServiceProxy {
      - parameter body: The request body.
      */
     public func invoke<B: Encodable>(_ method: Method, path: String,
-        arguments: [String: Any] = [:],
+        arguments: [String: Sendable] = [:],
         body: B) async throws {
         try await invoke(method, path: path,
             arguments: arguments,
@@ -130,7 +130,7 @@ public class WebServiceProxy {
      - returns The response body.
      */
     public func invoke<T: Decodable>(_ method: Method, path: String,
-        arguments: [String: Any] = [:],
+        arguments: [String: Sendable] = [:],
         content: Data? = nil,
         contentType: String? = nil) async throws -> T {
         return try await invoke(method, path: path,
@@ -148,7 +148,7 @@ public class WebServiceProxy {
      - returns The response body.
      */
     public func invoke<B: Encodable, T: Decodable>(_ method: Method, path: String,
-        arguments: [String: Any] = [:],
+        arguments: [String: Sendable] = [:],
         body: B) async throws -> T {
         return try await invoke(method, path: path,
             arguments: arguments,
@@ -167,7 +167,7 @@ public class WebServiceProxy {
      - returns The response body.
      */
     public func invoke<T>(_ method: Method, path: String,
-        arguments: [String: Any] = [:],
+        arguments: [String: Sendable] = [:],
         content: Data? = nil,
         contentType: String? = nil,
         responseHandler: @escaping ResponseHandler<T>) async throws -> T {
@@ -178,8 +178,8 @@ public class WebServiceProxy {
                 throw WebServiceError(errorDescription: "Invalid key.", statusCode: 0)
             }
 
-            for element in argument.value as? [Any] ?? [argument.value] {
-                if (element is NSNull) {
+            for element in argument.value as? [Sendable] ?? [argument.value] {
+                if (element is Void) {
                     continue
                 }
 

Tests/EchoTests/EchoTests.swift

@@ -26,6 +26,7 @@ final class EchoTests: XCTestCase {
         let flag: Bool
         let date: Date
         let dates: [Date]
+        let instant: String?
     }
 
     struct Body: Codable {
@@ -66,7 +67,8 @@ final class EchoTests: XCTestCase {
             "flag": true,
             "dayOfWeek": DayOfWeek.monday,
             "date": now,
-            "dates": [now]
+            "dates": [now],
+            "instant": WebServiceProxy.undefined
         ])
 
         XCTAssert(result.string == "héllo&gøod+bye?")