replace SortedSetDataType with ElementAndScore

Signed-off-by: James Xin <[email protected]>

Author: jamesx-improving

node/npm/glide/index.ts

@@ -192,6 +192,7 @@ function initialize() {
         ReturnTypeJson,
         UniversalReturnTypeJson,
         Score,
+        ElementAndScore,
     } = nativeBinding;
 
     module.exports = {
@@ -342,6 +343,7 @@ function initialize() {
         ReturnTypeJson,
         UniversalReturnTypeJson,
         Score,
+        ElementAndScore,
     };
 
     globalObject = Object.assign(global, nativeBinding);

node/src/BaseClient.ts

@@ -352,6 +352,17 @@ export type StreamEntryDataType = Record<string, [GlideString, GlideString][]>;
  */
 export type Score = number | "+inf" | "-inf";
 
+/**
+ * Data type which represents sorted sets data for input parameter of ZADD command,
+ * including elements and their respective scores.
+ */
+export type ElementAndScore = {
+    /** The sorted set element name. */
+    element: GlideString;
+    /** The element score. */
+    score: Score;
+}[];
+
 /**
  * @internal
  * Convert `GlideRecord<number>` recevied after resolving the value pointer into `SortedSetDataType`.
@@ -4024,10 +4035,7 @@ export class BaseClient {
      */
     public async zadd(
         key: GlideString,
-        membersAndScores:
-            | SortedSetDataType
-            | Record<string, number>
-            | Record<string, Score>,
+        membersAndScores: ElementAndScore | Record<string, Score>,
         options?: ZAddOptions,
     ): Promise<number> {
         return this.createWritePromise(

node/src/Commands.ts

@@ -14,6 +14,7 @@ import {
     Score,
     ObjectType,
     SortedSetDataType,
+    ElementAndScore,
 } from "./BaseClient";
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 import { GlideClient } from "./GlideClient";
@@ -1443,10 +1444,7 @@ export function convertElementsAndScores(
  */
 export function createZAdd(
     key: GlideString,
-    membersAndScores:
-        | SortedSetDataType
-        | Record<string, number>
-        | Record<string, Score>,
+    membersAndScores: ElementAndScore | Record<string, Score>,
     options?: ZAddOptions,
     incr = false,
 ): command_request.Command {

node/tests/SharedTests.ts

@@ -54,6 +54,7 @@ import {
     convertGlideRecordToRecord,
     parseInfoResponse,
     Score,
+    ElementAndScore,
 } from "..";
 import { ValkeyCluster } from "../../utils/TestUtils";
 import { Client, GetAndSetRandomValue, getFirstResult } from "./TestUtilities";
@@ -4160,6 +4161,12 @@ export function runBaseTests(config: {
                     negInfMember: "-inf",
                 };
                 expect(await client.zadd(key, infMembersScores)).toEqual(2);
+
+                const infElementAndScore: ElementAndScore = [
+                    { element: "infMemberEAS", score: "+inf" },
+                    { element: "negInfMemberEAS", score: "-inf" },
+                ];
+                expect(await client.zadd(key, infElementAndScore)).toEqual(2);
             }, protocol);
         },
         config.timeout,