Fix up some optional return types

Author: adam-fowler

Sources/RedisCommands/BitmapCommands.swift

@@ -15,8 +15,8 @@
 // This file is autogenerated by RedisCommandsBuilder
 
 import NIOCore
-import RESP
 import Redis
+import RESP
 
 #if canImport(FoundationEssentials)
 import FoundationEssentials
@@ -302,13 +302,13 @@ extension RESPCommand {
     /// - Response: One of the following:
     ///     * [Integer](https:/redis.io/docs/reference/protocol-spec#integers): the position of the first bit set to 1 or 0 according to the request
     ///     * [Integer](https:/redis.io/docs/reference/protocol-spec#integers): `-1`. In case the `bit` argument is 1 and the string is empty or composed of just zero bytes
-    ///
+    ///     
     ///     If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is returned.
-    ///
+    ///     
     ///     If we look for clear bits (the bit argument is 0) and the string only contains bits set to 1, the function returns the first bit not part of the string on the right. So if the string is three bytes set to the value `0xff` the command `BITPOS key 0` will return 24, since up to bit 23 all the bits are 1.
-    ///
+    ///     
     ///     The function considers the right of the string as padded with zeros if you look for clear bits and specify no range or the _start_ argument **only**.
-    ///
+    ///     
     ///     However, this behavior changes if you are looking for clear bits and specify a range with both _start_ and _end_.
     ///     If a clear bit isn't found in the specified range, the function returns -1 as the user specified a clear range and there are no 0 bits in that range.
     @inlinable
@@ -442,13 +442,13 @@ extension RedisConnection {
     /// - Returns: One of the following:
     ///     * [Integer](https:/redis.io/docs/reference/protocol-spec#integers): the position of the first bit set to 1 or 0 according to the request
     ///     * [Integer](https:/redis.io/docs/reference/protocol-spec#integers): `-1`. In case the `bit` argument is 1 and the string is empty or composed of just zero bytes
-    ///
+    ///     
     ///     If we look for set bits (the bit argument is 1) and the string is empty or composed of just zero bytes, -1 is returned.
-    ///
+    ///     
     ///     If we look for clear bits (the bit argument is 0) and the string only contains bits set to 1, the function returns the first bit not part of the string on the right. So if the string is three bytes set to the value `0xff` the command `BITPOS key 0` will return 24, since up to bit 23 all the bits are 1.
-    ///
+    ///     
     ///     The function considers the right of the string as padded with zeros if you look for clear bits and specify no range or the _start_ argument **only**.
-    ///
+    ///     
     ///     However, this behavior changes if you are looking for clear bits and specify a range with both _start_ and _end_.
     ///     If a clear bit isn't found in the specified range, the function returns -1 as the user specified a clear range and there are no 0 bits in that range.
     @inlinable

Sources/RedisCommands/ConnectionCommands.swift

@@ -798,7 +798,7 @@ extension RedisConnection {
     /// - Returns: [Map](https:/redis.io/docs/reference/protocol-spec#maps): a list of tracking information sections and their respective values.
     @inlinable
     public func clientTrackinginfo() async throws -> RESPToken {
-        try await send("CLIENT", "TRACKINGINFO").converting()
+        try await send("CLIENT", "TRACKINGINFO")
     }
 
     /// Unblocks a client blocked by a blocking command from a different connection.

Sources/RedisCommands/GenericCommands.swift

@@ -903,8 +903,8 @@ extension RedisConnection {
     ///     [Integer](https:/redis.io/docs/reference/protocol-spec#integers): the counter's value.
     ///     [Null](https:/redis.io/docs/reference/protocol-spec#nulls): if _key_ doesn't exist.
     @inlinable
-    public func objectFreq(key: RedisKey) async throws -> RESPToken {
-        try await send("OBJECT", "FREQ", key)
+    public func objectFreq(key: RedisKey) async throws -> Int? {
+        try await send("OBJECT", "FREQ", key).converting()
     }
 
     /// Returns helpful text about the different subcommands.
@@ -929,8 +929,8 @@ extension RedisConnection {
     ///     [Integer](https:/redis.io/docs/reference/protocol-spec#integers): the idle time in seconds.
     ///     [Null](https:/redis.io/docs/reference/protocol-spec#nulls): if _key_ doesn't exist.
     @inlinable
-    public func objectIdletime(key: RedisKey) async throws -> RESPToken {
-        try await send("OBJECT", "IDLETIME", key)
+    public func objectIdletime(key: RedisKey) async throws -> Int? {
+        try await send("OBJECT", "IDLETIME", key).converting()
     }
 
     /// Returns the reference count of a value of a key.
@@ -943,8 +943,8 @@ extension RedisConnection {
     ///     [Integer](https:/redis.io/docs/reference/protocol-spec#integers): the number of references.
     ///     [Null](https:/redis.io/docs/reference/protocol-spec#nulls): if _key_ doesn't exist.
     @inlinable
-    public func objectRefcount(key: RedisKey) async throws -> RESPToken {
-        try await send("OBJECT", "REFCOUNT", key)
+    public func objectRefcount(key: RedisKey) async throws -> Int? {
+        try await send("OBJECT", "REFCOUNT", key).converting()
     }
 
     /// Removes the expiration time of a key.

Sources/RedisCommands/HashCommands.swift

@@ -377,7 +377,7 @@ extension RedisConnection {
     /// - Returns: [Map](https:/redis.io/docs/reference/protocol-spec#maps): a map of fields and their values stored in the hash, or an empty list when key does not exist.
     @inlinable
     public func hgetall(key: RedisKey) async throws -> RESPToken {
-        try await send("HGETALL", key).converting()
+        try await send("HGETALL", key)
     }
 
     /// Increments the integer value of a field in a hash by a number. Uses 0 as initial value if the field doesn't exist.

Sources/RedisCommands/ScriptingCommands.swift

@@ -665,7 +665,7 @@ extension RedisConnection {
     /// - Returns: [Map](https:/redis.io/docs/reference/protocol-spec#maps): information about the function that's currently running and information about the available execution engines.
     @inlinable
     public func functionStats() async throws -> RESPToken {
-        try await send("FUNCTION", "STATS").converting()
+        try await send("FUNCTION", "STATS")
     }
 
     /// Sets the debug mode of server-side Lua scripts.

Sources/RedisCommands/ServerCommands.swift

@@ -1491,7 +1491,7 @@ extension RedisConnection {
     /// - Returns: [Map](https:/redis.io/docs/reference/protocol-spec#maps): a map where each key is a command name, and each value is the documentary information.
     @inlinable
     public func commandDocs(commandName: String? = nil) async throws -> RESPToken {
-        try await send("COMMAND", "DOCS", commandName).converting()
+        try await send("COMMAND", "DOCS", commandName)
     }
 
     /// Returns documentary information about one, multiple or all commands.
@@ -1503,7 +1503,7 @@ extension RedisConnection {
     /// - Returns: [Map](https:/redis.io/docs/reference/protocol-spec#maps): a map where each key is a command name, and each value is the documentary information.
     @inlinable
     public func commandDocs(commandNames: [String]) async throws -> RESPToken {
-        try await send("COMMAND", "DOCS", commandNames).converting()
+        try await send("COMMAND", "DOCS", commandNames)
     }
 
     /// Extracts the key names from an arbitrary command.
@@ -1611,7 +1611,7 @@ extension RedisConnection {
     /// - Returns: [Map](https:/redis.io/docs/reference/protocol-spec#maps): a list of configuration parameters matching the provided arguments.
     @inlinable
     public func configGet(parameter: String) async throws -> RESPToken {
-        try await send("CONFIG", "GET", parameter).converting()
+        try await send("CONFIG", "GET", parameter)
     }
 
     /// Returns the effective values of configuration parameters.
@@ -1623,7 +1623,7 @@ extension RedisConnection {
     /// - Returns: [Map](https:/redis.io/docs/reference/protocol-spec#maps): a list of configuration parameters matching the provided arguments.
     @inlinable
     public func configGet(parameters: [String]) async throws -> RESPToken {
-        try await send("CONFIG", "GET", parameters).converting()
+        try await send("CONFIG", "GET", parameters)
     }
 
     /// Returns helpful text about the different subcommands.
@@ -1819,7 +1819,7 @@ extension RedisConnection {
     /// - Returns: [Map](https:/redis.io/docs/reference/protocol-spec#maps): a map where each key is a command name, and each value is a map with the total calls, and an inner map of the histogram time buckets.
     @inlinable
     public func latencyHistogram(command: String? = nil) async throws -> RESPToken {
-        try await send("LATENCY", "HISTOGRAM", command).converting()
+        try await send("LATENCY", "HISTOGRAM", command)
     }
 
     /// Returns the cumulative distribution of latencies of a subset or all commands.
@@ -1831,7 +1831,7 @@ extension RedisConnection {
     /// - Returns: [Map](https:/redis.io/docs/reference/protocol-spec#maps): a map where each key is a command name, and each value is a map with the total calls, and an inner map of the histogram time buckets.
     @inlinable
     public func latencyHistogram(commands: [String]) async throws -> RESPToken {
-        try await send("LATENCY", "HISTOGRAM", commands).converting()
+        try await send("LATENCY", "HISTOGRAM", commands)
     }
 
     /// Returns timestamp-latency samples for an event.
@@ -1950,7 +1950,7 @@ extension RedisConnection {
     /// - Returns: [Map](https:/redis.io/docs/reference/protocol-spec#maps): memory usage metrics and their values.
     @inlinable
     public func memoryStats() async throws -> RESPToken {
-        try await send("MEMORY", "STATS").converting()
+        try await send("MEMORY", "STATS")
     }
 
     /// Estimates the memory usage of a key.

Sources/RedisCommands/SortedSetCommands.swift

@@ -1450,8 +1450,8 @@ extension RedisConnection {
     ///     * [Double](https:/redis.io/docs/reference/protocol-spec#doubles): the score of the member (a double-precision floating point number).
     ///     * [Nil](https:/redis.io/docs/reference/protocol-spec#bulk-strings): if _member_ does not exist in the sorted set, or the key does not exist.
     @inlinable
-    public func zscore(key: RedisKey, member: String) async throws -> RESPToken {
-        try await send("ZSCORE", key, member)
+    public func zscore(key: RedisKey, member: String) async throws -> Double? {
+        try await send("ZSCORE", key, member).converting()
     }
 
     /// Returns the union of multiple sorted sets.

Sources/RedisCommands/StreamCommands.swift

@@ -800,7 +800,7 @@ extension RedisConnection {
     ///     * [Map](https:/redis.io/docs/reference/protocol-spec#maps): when the _FULL_ argument was given, a list of information about a stream in extended form.
     @inlinable
     public func xinfoStream(key: RedisKey, fullBlock: RESPCommand.XINFOSTREAMFullBlock? = nil) async throws -> RESPToken {
-        try await send("XINFO", "STREAM", key, fullBlock).converting()
+        try await send("XINFO", "STREAM", key, fullBlock)
     }
 
     /// Return the number of messages in a stream.

Sources/RedisCommands/StringCommands.swift

@@ -493,8 +493,8 @@ extension RedisConnection {
     /// - Returns: [Bulk string](https:/redis.io/docs/reference/protocol-spec#bulk-strings): the value of `key`
     ///     [Null](https:/redis.io/docs/reference/protocol-spec#nulls): if `key` does not exist.
     @inlinable
-    public func getex(key: RedisKey, expiration: RESPCommand.GETEXExpiration? = nil) async throws -> RESPToken {
-        try await send("GETEX", key, expiration)
+    public func getex(key: RedisKey, expiration: RESPCommand.GETEXExpiration? = nil) async throws -> String? {
+        try await send("GETEX", key, expiration).converting()
     }
 
     /// Returns a substring of the string stored at a key.

Sources/RedisCommandsBuilder/RedisCommandsRender.swift

@@ -157,10 +157,13 @@ extension String {
         let arguments = (command.arguments ?? [])
         var converting: Bool = false
         var returnType: String = " -> RESPToken"
+        if name == "OBJECT REFCOUNT" {
+            print("sdf")
+        }
         if let type = getReturnType(reply: reply) {
             if type == "Void" {
                 returnType = ""
-            } else {
+            } else if type != "RESPToken" {
                 converting = true
                 returnType = " -> \(type)"
             }
@@ -286,10 +289,10 @@ private func getReturnType(reply replies: [String]) -> String? {
     if replies.count == 1 {
         return getReturnType(reply: replies[0])
     } else if replies.count > 1 {
-        var returnType = getReturnType(reply: replies[0].dropFirst(2))
+        var returnType = getReturnType(reply: replies[0].dropPrefix("* "))
         var `optional` = false
         for value in replies.dropFirst(1) {
-            if let returnType2 = getReturnType(reply: value.dropFirst(2)) {
+            if let returnType2 = getReturnType(reply: value.dropPrefix("* ")) {
                 if returnType == "Void" {
                     returnType = returnType2
                     optional = true
@@ -333,7 +336,7 @@ private func getReturnType(reply: some StringProtocol) -> String? {
                 }
             }
             return "[RESPToken]"
-        } else if reply.hasPrefix("[Null") {
+        } else if reply.hasPrefix("[Null") || reply.hasPrefix("[Nil") {
             return "Void"
         } else if reply.hasPrefix("[Simple error") {
             return nil