Add custom BLMPOP response, remove SPOP response. (#205)

Signed-off-by: Adam Fowler <[email protected]>

Author: adam-fowler

Sources/Valkey/Commands/Custom/ListCustomCommands.swift

@@ -31,3 +31,10 @@ extension LMPOP {
     }
     public typealias Response = OptionalResponse?
 }
+
+extension BLMPOP {
+    /// - Returns: One of the following
+    ///     * [Null]: If no element could be popped.
+    ///     * [Array]: List key from which elements were popped.
+    public typealias Response = LMPOP.Response
+}

Sources/Valkey/Commands/Custom/SetCustomCommands.swift

@@ -5,10 +5,6 @@
 // See LICENSE.txt for license information
 // SPDX-License-Identifier: Apache-2.0
 //
-extension SPOP {
-    public typealias Response = [RESPToken]?
-}
-
 extension SSCAN {
     public struct Response: RESPTokenDecodable, Sendable {
         public let cursor: Int

Sources/Valkey/Commands/ListCommands.swift

@@ -93,8 +93,6 @@ public struct BLMPOP: ValkeyCommand {
             }
         }
     }
-    public typealias Response = RESPToken.Array?
-
     @inlinable public static var name: String { "BLMPOP" }
 
     public var timeout: Double
@@ -312,7 +310,6 @@ public struct LMOVE: ValkeyCommand {
             }
         }
     }
-
     @inlinable public static var name: String { "LMOVE" }
 
     public var source: ValkeyKey
@@ -688,7 +685,7 @@ extension ValkeyClientProtocol {
     ///     * [Array]: The key from which elements were popped and the popped elements
     @inlinable
     @discardableResult
-    public func blmpop(timeout: Double, keys: [ValkeyKey], where: BLMPOP.Where, count: Int? = nil) async throws -> RESPToken.Array? {
+    public func blmpop(timeout: Double, keys: [ValkeyKey], where: BLMPOP.Where, count: Int? = nil) async throws -> BLMPOP.Response {
         try await execute(BLMPOP(timeout: timeout, keys: keys, where: `where`, count: count))
     }
 

Sources/Valkey/Commands/SetCommands.swift

@@ -268,6 +268,8 @@ public struct SMOVE<Member: RESPStringRenderable>: ValkeyCommand {
 /// Returns one or more random members from a set after removing them. Deletes the set if the last member was popped.
 @_documentation(visibility: internal)
 public struct SPOP: ValkeyCommand {
+    public typealias Response = RESPToken?
+
     @inlinable public static var name: String { "SPOP" }
 
     public var key: ValkeyKey
@@ -547,7 +549,7 @@ extension ValkeyClientProtocol {
     ///     * [Array]: List to the removed members when 'COUNT' is given.
     @inlinable
     @discardableResult
-    public func spop(_ key: ValkeyKey, count: Int? = nil) async throws -> SPOP.Response {
+    public func spop(_ key: ValkeyKey, count: Int? = nil) async throws -> RESPToken? {
         try await execute(SPOP(key, count: count))
     }
 

Sources/_ValkeyCommandsBuilder/ValkeyCommandsRender.swift

@@ -8,6 +8,7 @@
 /// List of functions where the Response calculation has been disabled because we want
 /// to override the response in the Valkey library
 private let disableResponseCalculationCommands: Set<String> = [
+    "BLMPOP",
     "BZMPOP",
     "BZPOPMAX",
     "BZPOPMIN",
@@ -18,7 +19,6 @@ private let disableResponseCalculationCommands: Set<String> = [
     "ROLE",
     "LMOVE",
     "LMPOP",
-    "SPOP",
     "SSCAN",
     "XAUTOCLAIM",
     "XCLAIM",