Only implement WATCH, UNWATCH on ValkeyConnection (#157)

Author: adam-fowler

Sources/Valkey/Commands/ServerCommands.swift

@@ -2203,6 +2203,7 @@ extension ValkeyConnectionProtocol {
     /// - Available: 2.8.12
     /// - Complexity: O(1)
     @inlinable
+    @discardableResult
     public func role() async throws -> ROLE.Response {
         try await send(command: ROLE())
     }

Sources/Valkey/Commands/TransactionsCommands.swift

@@ -120,24 +120,4 @@ extension ValkeyConnection {
         _ = try await send(command: MULTI())
     }
 
-    /// Forgets about watched keys of a transaction.
-    ///
-    /// - Documentation: [UNWATCH](https://valkey.io/commands/unwatch)
-    /// - Available: 2.2.0
-    /// - Complexity: O(1)
-    @inlinable
-    public func unwatch() async throws {
-        _ = try await send(command: UNWATCH())
-    }
-
-    /// Monitors changes to keys to determine the execution of a transaction.
-    ///
-    /// - Documentation: [WATCH](https://valkey.io/commands/watch)
-    /// - Available: 2.2.0
-    /// - Complexity: O(1) for every key.
-    @inlinable
-    public func watch(keys: [ValkeyKey]) async throws {
-        _ = try await send(command: WATCH(keys: keys))
-    }
-
 }

Sources/Valkey/Connection/ValkeyConnection.swift

@@ -379,6 +379,30 @@ public final actor ValkeyConnection: ValkeyConnectionProtocol, Sendable {
     #endif
 }
 
+/// Add WATCH, UNWATCH commands to ValkeyConnection.
+@available(valkeySwift 1.0, *)
+extension ValkeyConnection {
+    /// Forgets about watched keys of a transaction.
+    ///
+    /// - Documentation: [UNWATCH](https://valkey.io/commands/unwatch)
+    /// - Available: 2.2.0
+    /// - Complexity: O(1)
+    @inlinable
+    public func unwatch() async throws {
+        _ = try await send(command: UNWATCH())
+    }
+
+    /// Monitors changes to keys to determine the execution of a transaction.
+    ///
+    /// - Documentation: [WATCH](https://valkey.io/commands/watch)
+    /// - Available: 2.2.0
+    /// - Complexity: O(1) for every key.
+    @inlinable
+    public func watch(keys: [ValkeyKey]) async throws {
+        _ = try await send(command: WATCH(keys: keys))
+    }
+}
+
 // Used in ValkeyConnection.pipeline
 @usableFromInline
 struct AutoIncrementingInteger {

Sources/_ValkeyCommandsBuilder/ValkeyCommandsRender.swift

@@ -120,7 +120,8 @@ func renderValkeyCommands(_ commands: [String: ValkeyCommand], fullCommandList:
     }
 
     /// Remove subscribe functions as we implement our own versions in code
-    let subscribeFunctions = ["SUBSCRIBE", "PSUBSCRIBE", "SSUBSCRIBE", "UNSUBSCRIBE", "PUNSUBSCRIBE", "SUNSUBSCRIBE"]
+    /// Remove watch functions as they are only valid on a single connection
+    let subscribeFunctions = ["SUBSCRIBE", "PSUBSCRIBE", "SSUBSCRIBE", "UNSUBSCRIBE", "PUNSUBSCRIBE", "SUNSUBSCRIBE", "UNWATCH", "WATCH"]
     keys.removeAll { subscribeFunctions.contains($0) }
 
     // transaction commands should be added to ValkeyConnection as they require a single connection.