fix commands.ts

Signed-off-by: Chloe Yip <[email protected]>
valkey-io · Aug 9, 2024 · 772356f · 772356f
1 parent 67e1eb5
commit 772356f
Showing 1 changed file with 23 additions and 16 deletions.
diff --git a/node/src/Commands.ts b/node/src/Commands.ts
@@ -441,16 +441,10 @@ export function createHScan(
     cursor: string,
     options?: BaseScanOptions,
 ): command_request.Command {
-    const args: string[] = [key, cursor];
+    let args: string[] = [key, cursor];
 
     if (options) {
-        if (options.match) {
-            args.push("MATCH", options.match);
-        }
-
-        if (options.count !== undefined) {
-            args.push("COUNT", options.count.toString());
-        }
+        args = args.concat(convertBaseScanOptionsToArgsArray(options));
     }
 
     return createCommand(RequestType.HScan, args);
@@ -3368,6 +3362,25 @@ export type BaseScanOptions = {
     readonly count?: number;
 };
 
+/**
+ * @internal
+ */
+export function convertBaseScanOptionsToArgsArray(
+    options: BaseScanOptions,
+): string[] {
+    const args: string[] = [];
+
+    if (options.match) {
+        args.push("MATCH", options.match);
+    }
+
+    if (options.count !== undefined) {
+        args.push("COUNT", options.count.toString());
+    }
+
+    return args;
+}
+
 /**
  * @internal
  */
@@ -3376,16 +3389,10 @@ export function createZScan(
     cursor: string,
     options?: BaseScanOptions,
 ): command_request.Command {
-    const args: string[] = [key, cursor];
+    let args: string[] = [key, cursor];
 
     if (options) {
-        if (options.match) {
-            args.push("MATCH", options.match);
-        }
-
-        if (options.count !== undefined) {
-            args.push("COUNT", options.count.toString());
-        }
+        args = args.concat(convertBaseScanOptionsToArgsArray(options));
     }
 
     return createCommand(RequestType.ZScan, args);