small tweaks

Author: sjpotter

packages/client/lib/client/index.ts

@@ -581,7 +581,7 @@ export default class RedisClient<
     transformReply: TransformReply | undefined,
   ) {
     const reply = await this.sendCommand(parser.redisArgs, commandOptions);
-      
+
     if (transformReply) {
       return transformReply(reply, parser.preserve, commandOptions?.typeMapping);
     }

packages/client/lib/client/parser.ts

@@ -22,7 +22,7 @@ export interface CommandParser {
 
 export class BasicCommandParser implements CommandParser {
   #redisArgs: Array<RedisArgument> = [];
-  #keys: Array<RedisArgument> = []; 
+  #keys: Array<RedisArgument> = [];
   #respVersion: RespVersions;
   #preserve: unknown;
   #cachable: boolean = false;

packages/client/lib/commands/BZPOPMAX.ts

@@ -1,25 +1,13 @@
 import { CommandParser } from '../client/parser';
-import { RedisArgument, NullReply, TuplesReply, BlobStringReply, DoubleReply, UnwrapReply, Command, TypeMapping } from '../RESP/types';
-import { RedisVariadicArgument, pushVariadicArguments, transformDoubleReply } from './generic-transformers';
-
-export function transformBZPopArguments(
-  command: RedisArgument,
-  key: RedisVariadicArgument,
-  timeout: number
-) {
-  const args = pushVariadicArguments([command], key);
-  args.push(timeout.toString());
-  return args;
-}
-
-export type BZPopArguments = typeof transformBZPopArguments extends (_: any, ...args: infer T) => any ? T : never;
+import { NullReply, TuplesReply, BlobStringReply, DoubleReply, UnwrapReply, Command, TypeMapping } from '../RESP/types';
+import { RedisVariadicArgument, transformDoubleReply } from './generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
-  parseCommand(parser: CommandParser, ...args: BZPopArguments) {
+  parseCommand(parser: CommandParser, keys: RedisVariadicArgument, timeout: number) {
     parser.push('BZPOPMAX');
-    parser.pushKeys(args[0]);
-    parser.push(args[1].toString());
+    parser.pushKeys(keys);
+    parser.push(timeout.toString());
   },
   transformReply: {
     2(

packages/client/lib/commands/BZPOPMIN.ts

@@ -1,13 +1,14 @@
 import { CommandParser } from '../client/parser';
 import { Command } from '../RESP/types';
-import BZPOPMAX, { BZPopArguments } from './BZPOPMAX';
+import { RedisVariadicArgument } from './generic-transformers';
+import BZPOPMAX from './BZPOPMAX';
 
 export default {
   IS_READ_ONLY: BZPOPMAX.IS_READ_ONLY,
-  parseCommand(parser: CommandParser, ...args: BZPopArguments) {
+  parseCommand(parser: CommandParser, keys: RedisVariadicArgument, timeout: number) {
     parser.push('BZPOPMIN');
-    parser.pushKeys(args[0]);
-    parser.push(args[1].toString());
+    parser.pushKeys(keys);
+    parser.push(timeout.toString());
   },
   transformReply: BZPOPMAX.transformReply
 } as const satisfies Command;

packages/client/lib/commands/CLUSTER_ADDSLOTSRANGE.ts

@@ -1,13 +1,13 @@
 import { CommandParser } from '../client/parser';
 import { SimpleStringReply, Command } from '../RESP/types';
-import { pushSlotRangesArguments, SlotRange } from './generic-transformers';
+import { parseSlotRangesArguments, SlotRange } from './generic-transformers';
 
 export default {
   NOT_KEYED_COMMAND: true,
   IS_READ_ONLY: true,
   parseCommand(parser: CommandParser, ranges: SlotRange | Array<SlotRange>) {
     parser.push('CLUSTER', 'ADDSLOTSRANGE');
-    pushSlotRangesArguments(parser, ranges);
+    parseSlotRangesArguments(parser, ranges);
   },
   transformReply: undefined as unknown as () => SimpleStringReply<'OK'>
 } as const satisfies Command;

packages/client/lib/commands/CLUSTER_DELSLOTSRANGE.ts

@@ -1,13 +1,13 @@
 import { CommandParser } from '../client/parser';
 import { SimpleStringReply, Command } from '../RESP/types';
-import { pushSlotRangesArguments, SlotRange } from './generic-transformers';
+import { parseSlotRangesArguments, SlotRange } from './generic-transformers';
 
 export default {
   NOT_KEYED_COMMAND: true,
   IS_READ_ONLY: true,
   parseCommand(parser:CommandParser, ranges: SlotRange | Array<SlotRange>) {
     parser.push('CLUSTER', 'DELSLOTSRANGE');
-    pushSlotRangesArguments(parser, ranges);
+    parseSlotRangesArguments(parser, ranges);
   },
   transformReply: undefined as unknown as () => SimpleStringReply<'OK'>
 } as const satisfies Command;

packages/client/lib/commands/generic-transformers.ts

@@ -407,7 +407,7 @@ export interface SlotRange {
   end: number;
 }
 
-function pushSlotRangeArguments(
+function parseSlotRangeArguments(
   parser: CommandParser,
   range: SlotRange
 ): void {
@@ -417,16 +417,16 @@ function pushSlotRangeArguments(
   );
 }
 
-export function pushSlotRangesArguments(
+export function parseSlotRangesArguments(
   parser: CommandParser,
   ranges: SlotRange | Array<SlotRange>
 ) {
   if (Array.isArray(ranges)) {
     for (const range of ranges) {
-      pushSlotRangeArguments(parser, range);
+      parseSlotRangeArguments(parser, range);
     }
   } else {
-    pushSlotRangeArguments(parser, ranges);
+    parseSlotRangeArguments(parser, ranges);
   }
 }