Skip to content

Commit 5bc06e0

Browse files
committed
address most of my review comments
1 parent 6e7a558 commit 5bc06e0

14 files changed

+22
-29
lines changed

packages/client/lib/commands/COMMAND_GETKEYS.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default {
66
IS_READ_ONLY: true,
77
parseCommand(parser: CommandParser, args: Array<RedisArgument>) {
88
parser.push('COMMAND', 'GETKEYS');
9-
parser.pushVariadic(args);
9+
parser.push(...args);
1010
},
1111
transformReply: undefined as unknown as () => ArrayReply<BlobStringReply>
1212
} as const satisfies Command;

packages/client/lib/commands/COMMAND_GETKEYSANDFLAGS.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default {
1111
IS_READ_ONLY: true,
1212
parseCommand(parser: CommandParser, args: Array<RedisArgument>) {
1313
parser.push('COMMAND', 'GETKEYSANDFLAGS');
14-
parser.pushVariadic(args);
14+
parser.push(...args);
1515
},
1616
transformReply(reply: UnwrapReply<CommandGetKeysAndFlagsRawReply>) {
1717
return reply.map(entry => {

packages/client/lib/commands/COMMAND_INFO.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ export default {
66
NOT_KEYED_COMMAND: true,
77
IS_READ_ONLY: true,
88
parseCommand(parser: CommandParser, commands: Array<string>) {
9-
parser.push('COMMAND', 'INFO');
10-
parser.pushVariadic(commands);
9+
parser.push('COMMAND', 'INFO', ...commands);
1110
},
1211
// TODO: This works, as we don't currently handle any of the items returned as a map
1312
transformReply(reply: UnwrapReply<ArrayReply<CommandRawReply>>): Array<CommandReply | null> {

packages/client/lib/commands/EVAL.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export function parseEvalArguments(
1919
}
2020

2121
if (options?.arguments) {
22-
parser.pushVariadic(options.arguments)
22+
parser.push(...options.arguments)
2323
}
2424
}
2525

packages/client/lib/commands/GEORADIUSBYMEMBER_WITH.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export function parseGeoRadiusByMemberWithArguments(
1717
parser.push(from, radius.toString(), unit);
1818
parseGeoSearchOptions(parser, options);
1919

20-
parser.pushVariadic(replyWith);
20+
parser.push(...replyWith);
2121
parser.setPreserve(replyWith);
2222
}
2323

packages/client/lib/commands/GEOSEARCH_WITH.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
options?: GeoSearchOptions
3232
) {
3333
GEOSEARCH.parseCommand(parser, key, from, by, options);
34-
parser.pushVariadic(replyWith);
34+
parser.push(...replyWith);
3535
parser.setPreserve(replyWith);
3636
},
3737
transformReply(

packages/client/lib/commands/GETRANGE.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ export default {
77
parser.setCachable();
88
parser.push('GETRANGE');
99
parser.pushKey(key);
10-
parser.push(start.toString());
11-
parser.push(end.toString());
10+
parser.push(start.toString(), end.toString());
1211
},
1312
transformReply: undefined as unknown as () => BlobStringReply | NullReply
1413
} as const satisfies Command;

packages/client/lib/commands/MODULE_LOAD.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default {
88
parser.push('MODULE', 'LOAD', path);
99

1010
if (moduleArguments) {
11-
parser.pushVariadic(moduleArguments);
11+
parser.push(...moduleArguments);
1212
}
1313
},
1414
transformReply: undefined as unknown as () => SimpleStringReply<'OK'>

packages/client/lib/commands/UNLINK.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default {
66
IS_READ_ONLY: false,
77
parseCommand(parser: CommandParser, keys: RedisVariadicArgument) {
88
parser.push('UNLINK');
9-
parser.pushVariadic(keys);
9+
parser.pushKeys(keys);
1010
},
1111
transformReply: undefined as unknown as () => NumberReply
1212
} as const satisfies Command;

packages/client/lib/commands/ZCOUNT.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default {
1212
) {
1313
parser.setCachable();
1414
parser.push('ZCOUNT');
15-
parser.push(key);
15+
parser.pushKey(key);
1616
parser.push(
1717
transformStringDoubleArgument(min),
1818
transformStringDoubleArgument(max)
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
import { CommandParser } from '../client/parser';
21
import { Command } from '../RESP/types';
3-
import { Tail, transformSortedSetReply } from './generic-transformers';
2+
import { transformSortedSetReply } from './generic-transformers';
43
import ZINTER from './ZINTER';
54

65

76
export default {
87
IS_READ_ONLY: ZINTER.IS_READ_ONLY,
9-
parseCommand(parser: CommandParser, ...args: Tail<Parameters<typeof ZINTER.parseCommand>>) {
10-
ZINTER.parseCommand(parser, ...args);
11-
parser.push('WITHSCORES');
8+
parseCommand(...args: Parameters<typeof ZINTER.parseCommand>) {
9+
ZINTER.parseCommand(...args);
10+
args[0].push('WITHSCORES');
1211
},
1312
transformReply: transformSortedSetReply
1413
} as const satisfies Command;

packages/client/lib/commands/ZRANGEBYLEX.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default {
2323
parser.pushKey(key);
2424
parser.push(
2525
transformStringDoubleArgument(min),
26-
transformStringDoubleArgument(max),
26+
transformStringDoubleArgument(max)
2727
);
2828

2929
if (options?.LIMIT) {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -347,13 +347,13 @@ export function transformCommandReply(
347347
[name, arity, flags, firstKeyIndex, lastKeyIndex, step, categories]: CommandRawReply
348348
): CommandReply {
349349
return {
350-
name,
351-
arity,
352-
flags: new Set(flags),
353-
firstKeyIndex,
354-
lastKeyIndex,
355-
step,
356-
categories: new Set(categories)
350+
name,
351+
arity,
352+
flags: new Set(flags),
353+
firstKeyIndex,
354+
lastKeyIndex,
355+
step,
356+
categories: new Set(categories)
357357
};
358358
}
359359

packages/client/lib/commands/index.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,3 @@ export default {
10301030
ZUNIONSTORE,
10311031
zUnionStore: ZUNIONSTORE
10321032
} as const satisfies RedisCommands;
1033-
/**
1034-
* @readonly
1035-
* @enum {number}
1036-
*/

0 commit comments

Comments
 (0)