Merge branch 'valkey-io:main' into Go-Implement-Dump-ObjectEncoding-c…

…ommand

CHANGELOG.md

@@ -21,6 +21,9 @@
 
 #### Fixes
 
+* Node: Fix `zrangeWithScores` (disallow `RangeByLex` as it is not supported) ([#2926](https://github.com/valkey-io/valkey-glide/pull/2926))
+* Core: improve fix in #2381 ([#2929](https://github.com/valkey-io/valkey-glide/pull/2929))
+
 #### Operational Enhancements
 
 ## 1.2.1 (2024-12-29)

glide-core/src/client/value_conversion.rs

@@ -13,7 +13,7 @@ pub(crate) enum ExpectedReturnType<'a> {
     // Second parameter is a function which returns true if value needs to be converted
     SingleOrMultiNode(
         &'a Option<ExpectedReturnType<'a>>,
-        Option<fn(Value) -> bool>,
+        Option<&'a (dyn Fn(Value) -> bool + Sync)>,
     ),
     MapOfStringToDouble,
     Double,
@@ -1387,6 +1387,10 @@ fn convert_flat_array_to_array_of_pairs(
     Ok(Value::Array(result))
 }
 
+fn is_array(val: Value) -> bool {
+    matches!(val, Value::Array(_))
+}
+
 pub(crate) fn expected_type_for_cmd(cmd: &Cmd) -> Option<ExpectedReturnType> {
     let command = cmd.command()?;
 
@@ -1403,7 +1407,7 @@ pub(crate) fn expected_type_for_cmd(cmd: &Cmd) -> Option<ExpectedReturnType> {
                 key_type: &None,
                 value_type: &None,
             }),
-            Some(|val| matches!(val, Value::Array(_))),
+            Some(&is_array),
         )),
         b"XCLAIM" => {
             if cmd.position(b"JUSTID").is_some() {
@@ -1497,7 +1501,7 @@ pub(crate) fn expected_type_for_cmd(cmd: &Cmd) -> Option<ExpectedReturnType> {
         ))),
         b"FUNCTION STATS" => Some(ExpectedReturnType::SingleOrMultiNode(
             &Some(ExpectedReturnType::FunctionStatsReturnType),
-            Some(|val| matches!(val, Value::Array(_))),
+            Some(&is_array),
         )),
         b"GEOSEARCH" => {
             if cmd.position(b"WITHDIST").is_some()

node/src/BaseClient.ts

@@ -4443,7 +4443,6 @@ export class BaseClient {
      * @param key - The key of the sorted set.
      * @param rangeQuery - The range query object representing the type of range query to perform.
      * - For range queries by index (rank), use {@link RangeByIndex}.
-     * - For range queries by lexicographical order, use {@link RangeByLex}.
      * - For range queries by score, use {@link RangeByScore}.
      * @param options - (Optional) Additional parameters:
      * - (Optional) `reverse`: if `true`, reverses the sorted set, with index `0` as the element with the highest score.
@@ -4476,7 +4475,7 @@ export class BaseClient {
      */
     public async zrangeWithScores(
         key: GlideString,
-        rangeQuery: RangeByScore | RangeByLex | RangeByIndex,
+        rangeQuery: RangeByScore | RangeByIndex,
         options?: { reverse?: boolean } & DecoderOption,
     ): Promise<SortedSetDataType> {
         return this.createWritePromise<GlideRecord<number>>(

node/src/Transaction.ts

@@ -1989,7 +1989,6 @@ export class BaseTransaction<T extends BaseTransaction<T>> {
      * @param key - The key of the sorted set.
      * @param rangeQuery - The range query object representing the type of range query to perform.
      * - For range queries by index (rank), use {@link RangeByIndex}.
-     * - For range queries by lexicographical order, use {@link RangeByLex}.
      * - For range queries by score, use {@link RangeByScore}.
      * @param reverse - If `true`, reverses the sorted set, with index `0` as the element with the highest score.
      *
@@ -1999,7 +1998,7 @@ export class BaseTransaction<T extends BaseTransaction<T>> {
      */
     public zrangeWithScores(
         key: GlideString,
-        rangeQuery: RangeByScore | RangeByLex | RangeByIndex,
+        rangeQuery: RangeByScore | RangeByIndex,
         reverse = false,
     ): T {
         return this.addAndReturn(