move tuples to map to requiring simple string for map key

sjpotter · sjpotter · commit 5daf11b9271c · 2024-06-04T00:22:29.000+03:00
adjust all usages of it to SimpleStringReply
diff --git a/packages/bloom/lib/commands/bloom/INFO.ts b/packages/bloom/lib/commands/bloom/INFO.ts
@@ -1,11 +1,11 @@
-import { RedisArgument, Command, UnwrapReply, NullReply, BlobStringReply, NumberReply, TuplesToMapReply, Resp2Reply } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, UnwrapReply, NullReply, NumberReply, TuplesToMapReply, Resp2Reply, SimpleStringReply } from '@redis/client/dist/lib/RESP/types';
 
 export type BfInfoReplyMap = TuplesToMapReply<[
-  [BlobStringReply<'Capacity'>, NumberReply],
-  [BlobStringReply<'Size'>, NumberReply],
-  [BlobStringReply<'Number of filters'>, NumberReply],
-  [BlobStringReply<'Number of items inserted'>, NumberReply],
-  [BlobStringReply<'Expansion rate'>, NullReply | NumberReply] 
+  [SimpleStringReply<'Capacity'>, NumberReply],
+  [SimpleStringReply<'Size'>, NumberReply],
+  [SimpleStringReply<'Number of filters'>, NumberReply],
+  [SimpleStringReply<'Number of items inserted'>, NumberReply],
+  [SimpleStringReply<'Expansion rate'>, NullReply | NumberReply] 
 ]>;
 
 export interface BfInfoReply {
diff --git a/packages/bloom/lib/commands/count-min-sketch/INFO.ts b/packages/bloom/lib/commands/count-min-sketch/INFO.ts
@@ -1,9 +1,9 @@
-import { RedisArgument, TuplesToMapReply, BlobStringReply, NumberReply, UnwrapReply, Resp2Reply, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, TuplesToMapReply, NumberReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply } from '@redis/client/dist/lib/RESP/types';
 
 export type CmsInfoReplyMap = TuplesToMapReply<[
-  [BlobStringReply<'width'>, NumberReply],
-  [BlobStringReply<'depth'>, NumberReply],
-  [BlobStringReply<'count'>, NumberReply]
+  [SimpleStringReply<'width'>, NumberReply],
+  [SimpleStringReply<'depth'>, NumberReply],
+  [SimpleStringReply<'count'>, NumberReply]
 ]>;
 
 export interface CmsInfoReply {
diff --git a/packages/bloom/lib/commands/cuckoo/INFO.ts b/packages/bloom/lib/commands/cuckoo/INFO.ts
@@ -1,14 +1,14 @@
-import { RedisArgument, Command, NumberReply, BlobStringReply, TuplesToMapReply, UnwrapReply, Resp2Reply } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply } from '@redis/client/dist/lib/RESP/types';
 
 export type CfInfoReplyMap = TuplesToMapReply<[
-  [BlobStringReply<'Size'>, NumberReply],
-  [BlobStringReply<'Number of buckets'>, NumberReply],
-  [BlobStringReply<'Number of filters'>, NumberReply],
-  [BlobStringReply<'Number of items inserted'>, NumberReply],
-  [BlobStringReply<'Number of items deleted'>, NumberReply],
-  [BlobStringReply<'Bucket size'>, NumberReply],
-  [BlobStringReply<'Expansion rate'>, NumberReply],
-  [BlobStringReply<'Max iterations'>, NumberReply]
+  [SimpleStringReply<'Size'>, NumberReply],
+  [SimpleStringReply<'Number of buckets'>, NumberReply],
+  [SimpleStringReply<'Number of filters'>, NumberReply],
+  [SimpleStringReply<'Number of items inserted'>, NumberReply],
+  [SimpleStringReply<'Number of items deleted'>, NumberReply],
+  [SimpleStringReply<'Bucket size'>, NumberReply],
+  [SimpleStringReply<'Expansion rate'>, NumberReply],
+  [SimpleStringReply<'Max iterations'>, NumberReply]
 ]>;
 
 export interface CfInfoReply {
diff --git a/packages/bloom/lib/commands/t-digest/INFO.ts b/packages/bloom/lib/commands/t-digest/INFO.ts
@@ -1,15 +1,15 @@
-import { RedisArgument, Command, BlobStringReply, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply } from '@redis/client/dist/lib/RESP/types';
 
 export type TdInfoReplyMap = TuplesToMapReply<[
-  [BlobStringReply<'Compression'>, NumberReply],
-  [BlobStringReply<'Capacity'>, NumberReply],
-  [BlobStringReply<'Merged nodes'>, NumberReply],
-  [BlobStringReply<'Unmerged nodes'>, NumberReply],
-  [BlobStringReply<'Merged weight'>, NumberReply],
-  [BlobStringReply<'Unmerged weight'>, NumberReply],
-  [BlobStringReply<'Observations'>, NumberReply],
-  [BlobStringReply<'Total compressions'>, NumberReply],
-  [BlobStringReply<'Memory usage'>, NumberReply]
+  [SimpleStringReply<'Compression'>, NumberReply],
+  [SimpleStringReply<'Capacity'>, NumberReply],
+  [SimpleStringReply<'Merged nodes'>, NumberReply],
+  [SimpleStringReply<'Unmerged nodes'>, NumberReply],
+  [SimpleStringReply<'Merged weight'>, NumberReply],
+  [SimpleStringReply<'Unmerged weight'>, NumberReply],
+  [SimpleStringReply<'Observations'>, NumberReply],
+  [SimpleStringReply<'Total compressions'>, NumberReply],
+  [SimpleStringReply<'Memory usage'>, NumberReply]
 ]>;
 
 export interface TdInfoReply {
diff --git a/packages/bloom/lib/commands/top-k/INFO.ts b/packages/bloom/lib/commands/top-k/INFO.ts
@@ -1,10 +1,10 @@
-import { RedisArgument, TuplesToMapReply, BlobStringReply, NumberReply, DoubleReply, UnwrapReply, Resp2Reply, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, TuplesToMapReply, NumberReply, DoubleReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply } from '@redis/client/dist/lib/RESP/types';
 
 export type TopKInfoReplyMap = TuplesToMapReply<[
-  [BlobStringReply<'k'>, NumberReply],
-  [BlobStringReply<'width'>, NumberReply],
-  [BlobStringReply<'depth'>, NumberReply],
-  [BlobStringReply<'decay'>, DoubleReply]
+  [SimpleStringReply<'k'>, NumberReply],
+  [SimpleStringReply<'width'>, NumberReply],
+  [SimpleStringReply<'depth'>, NumberReply],
+  [SimpleStringReply<'decay'>, DoubleReply]
 ]>;
 
 export type TkInfoReply = {
diff --git a/packages/client/lib/RESP/types.ts b/packages/client/lib/RESP/types.ts
@@ -128,11 +128,11 @@ export interface MapReply<K, V> extends RespType<
   Map<any, any> | Array<any>
 > {}
 
-type MapKeyValue = [key: BlobStringReply, value: unknown];
+type MapKeyValue = [key: SimpleStringReply, value: unknown];
 
 type MapTuples = Array<MapKeyValue>;
 
-type ExtractMapKey<T> = T extends BlobStringReply<infer S> ? S : never;
+type ExtractMapKey<T> = T extends SimpleStringReply<infer S> ? S : never;
 
 export interface TuplesToMapReply<T extends MapTuples> extends RespType<
   RESP_TYPES['MAP'],
diff --git a/packages/client/lib/commands/ACL_GETUSER.ts b/packages/client/lib/commands/ACL_GETUSER.ts
@@ -1,18 +1,18 @@
-import { RedisArgument, TuplesToMapReply, BlobStringReply, ArrayReply, UnwrapReply, Resp2Reply, Command } from '../RESP/types';
+import { RedisArgument, TuplesToMapReply, BlobStringReply, ArrayReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply } from '../RESP/types';
 
 type AclUser = TuplesToMapReply<[
-  [BlobStringReply<'flags'>, ArrayReply<BlobStringReply>],
-  [BlobStringReply<'passwords'>, ArrayReply<BlobStringReply>],
-  [BlobStringReply<'commands'>, BlobStringReply],
+  [SimpleStringReply<'flags'>, ArrayReply<BlobStringReply>],
+  [SimpleStringReply<'passwords'>, ArrayReply<BlobStringReply>],
+  [SimpleStringReply<'commands'>, BlobStringReply],
   /** changed to BlobStringReply in 7.0 */
-  [BlobStringReply<'keys'>, ArrayReply<BlobStringReply> | BlobStringReply],
+  [SimpleStringReply<'keys'>, ArrayReply<BlobStringReply> | BlobStringReply],
   /** added in 6.2, changed to BlobStringReply in 7.0 */
-  [BlobStringReply<'channels'>, ArrayReply<BlobStringReply> | BlobStringReply],
+  [SimpleStringReply<'channels'>, ArrayReply<BlobStringReply> | BlobStringReply],
   /** added in 7.0 */
-  [BlobStringReply<'selectors'>, ArrayReply<TuplesToMapReply<[
-    [BlobStringReply<'commands'>, BlobStringReply],
-    [BlobStringReply<'keys'>, BlobStringReply],
-    [BlobStringReply<'channels'>, BlobStringReply]
+  [SimpleStringReply<'selectors'>, ArrayReply<TuplesToMapReply<[
+    [SimpleStringReply<'commands'>, BlobStringReply],
+    [SimpleStringReply<'keys'>, BlobStringReply],
+    [SimpleStringReply<'channels'>, BlobStringReply]
   ]>>],
 ]>;
 
diff --git a/packages/client/lib/commands/ACL_LOG.ts b/packages/client/lib/commands/ACL_LOG.ts
@@ -1,19 +1,19 @@
-import { ArrayReply, TuplesToMapReply, BlobStringReply, NumberReply, DoubleReply, UnwrapReply, Resp2Reply, Command } from '../RESP/types';
+import { ArrayReply, TuplesToMapReply, BlobStringReply, NumberReply, DoubleReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply } from '../RESP/types';
 
 export type AclLogReply = ArrayReply<TuplesToMapReply<[
-  [BlobStringReply<'count'>, NumberReply],
-  [BlobStringReply<'reason'>, BlobStringReply],
-  [BlobStringReply<'context'>, BlobStringReply],
-  [BlobStringReply<'object'>, BlobStringReply],
-  [BlobStringReply<'username'>, BlobStringReply],
-  [BlobStringReply<'age-seconds'>, DoubleReply],
-  [BlobStringReply<'client-info'>, BlobStringReply],
+  [SimpleStringReply<'count'>, NumberReply],
+  [SimpleStringReply<'reason'>, BlobStringReply],
+  [SimpleStringReply<'context'>, BlobStringReply],
+  [SimpleStringReply<'object'>, BlobStringReply],
+  [SimpleStringReply<'username'>, BlobStringReply],
+  [SimpleStringReply<'age-seconds'>, DoubleReply],
+  [SimpleStringReply<'client-info'>, BlobStringReply],
   /** added in 7.0 */
-  [BlobStringReply<'entry-id'>, NumberReply],
+  [SimpleStringReply<'entry-id'>, NumberReply],
   /** added in 7.0 */
-  [BlobStringReply<'timestamp-created'>, NumberReply],
+  [SimpleStringReply<'timestamp-created'>, NumberReply],
   /** added in 7.0 */
-  [BlobStringReply<'timestamp-last-updated'>, NumberReply]
+  [SimpleStringReply<'timestamp-last-updated'>, NumberReply]
 ]>>;
 
 export default {
diff --git a/packages/client/lib/commands/CLIENT_TRACKINGINFO.ts b/packages/client/lib/commands/CLIENT_TRACKINGINFO.ts
@@ -1,9 +1,9 @@
-import { TuplesToMapReply, BlobStringReply, SetReply, NumberReply, ArrayReply, UnwrapReply, Resp2Reply, Command } from '../RESP/types';
+import { TuplesToMapReply, BlobStringReply, SetReply, NumberReply, ArrayReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply } from '../RESP/types';
 
 type TrackingInfo = TuplesToMapReply<[
-  [BlobStringReply<'flags'>, SetReply<BlobStringReply>],
-  [BlobStringReply<'redirect'>, NumberReply],
-  [BlobStringReply<'prefixes'>, ArrayReply<BlobStringReply>]
+  [SimpleStringReply<'flags'>, SetReply<BlobStringReply>],
+  [SimpleStringReply<'redirect'>, NumberReply],
+  [SimpleStringReply<'prefixes'>, ArrayReply<BlobStringReply>]
 ]>;
 
 export default {
diff --git a/packages/client/lib/commands/CLUSTER_LINKS.ts b/packages/client/lib/commands/CLUSTER_LINKS.ts
@@ -1,12 +1,12 @@
-import { ArrayReply, TuplesToMapReply, BlobStringReply, NumberReply, UnwrapReply, Resp2Reply, Command } from '../RESP/types';
+import { ArrayReply, TuplesToMapReply, BlobStringReply, NumberReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply } from '../RESP/types';
 
 type ClusterLinksReply = ArrayReply<TuplesToMapReply<[
-  [BlobStringReply<'direction'>, BlobStringReply],
-  [BlobStringReply<'node'>, BlobStringReply],
-  [BlobStringReply<'create-time'>, NumberReply],
-  [BlobStringReply<'events'>, BlobStringReply],
-  [BlobStringReply<'send-buffer-allocated'>, NumberReply],
-  [BlobStringReply<'send-buffer-used'>, NumberReply],
+  [SimpleStringReply<'direction'>, BlobStringReply],
+  [SimpleStringReply<'node'>, BlobStringReply],
+  [SimpleStringReply<'create-time'>, NumberReply],
+  [SimpleStringReply<'events'>, BlobStringReply],
+  [SimpleStringReply<'send-buffer-allocated'>, NumberReply],
+  [SimpleStringReply<'send-buffer-used'>, NumberReply],
 ]>>;
 
 export default {
diff --git a/packages/client/lib/commands/FUNCTION_LIST.ts b/packages/client/lib/commands/FUNCTION_LIST.ts
@@ -1,16 +1,16 @@
-import { RedisArgument, TuplesToMapReply, BlobStringReply, ArrayReply, NullReply, SetReply, UnwrapReply, Resp2Reply, CommandArguments, Command } from '../RESP/types';
+import { RedisArgument, TuplesToMapReply, BlobStringReply, ArrayReply, NullReply, SetReply, UnwrapReply, Resp2Reply, CommandArguments, Command, SimpleStringReply } from '../RESP/types';
 
 export interface FunctionListOptions {
   LIBRARYNAME?: RedisArgument;
 }
 
 export type FunctionListReplyItem = [
-  [BlobStringReply<'library_name'>, BlobStringReply | NullReply],
-  [BlobStringReply<'engine'>, BlobStringReply],
-  [BlobStringReply<'functions'>, ArrayReply<TuplesToMapReply<[
-    [BlobStringReply<'name'>, BlobStringReply],
-    [BlobStringReply<'description'>, BlobStringReply | NullReply],
-    [BlobStringReply<'flags'>, SetReply<BlobStringReply>],
+  [SimpleStringReply<'library_name'>, BlobStringReply | NullReply],
+  [SimpleStringReply<'engine'>, BlobStringReply],
+  [SimpleStringReply<'functions'>, ArrayReply<TuplesToMapReply<[
+    [SimpleStringReply<'name'>, BlobStringReply],
+    [SimpleStringReply<'description'>, BlobStringReply | NullReply],
+    [SimpleStringReply<'flags'>, SetReply<BlobStringReply>],
   ]>>]
 ];
 
diff --git a/packages/client/lib/commands/FUNCTION_LIST_WITHCODE.ts b/packages/client/lib/commands/FUNCTION_LIST_WITHCODE.ts
@@ -1,9 +1,9 @@
-import { TuplesToMapReply, BlobStringReply, ArrayReply, UnwrapReply, Resp2Reply, Command } from '../RESP/types';
+import { TuplesToMapReply, BlobStringReply, ArrayReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply } from '../RESP/types';
 import FUNCTION_LIST, { FunctionListReplyItem } from './FUNCTION_LIST';
 
 export type FunctionListWithCodeReply = ArrayReply<TuplesToMapReply<[
   ...FunctionListReplyItem,
-  [BlobStringReply<'library_code'>, BlobStringReply],
+  [SimpleStringReply<'library_code'>, BlobStringReply],
 ]>>;
 
 export default {
diff --git a/packages/client/lib/commands/FUNCTION_STATS.ts b/packages/client/lib/commands/FUNCTION_STATS.ts
@@ -1,22 +1,22 @@
-import { Command, TuplesToMapReply, BlobStringReply, NullReply, NumberReply, MapReply, Resp2Reply, UnwrapReply } from '../RESP/types';
+import { Command, TuplesToMapReply, BlobStringReply, NullReply, NumberReply, MapReply, Resp2Reply, UnwrapReply, SimpleStringReply } from '../RESP/types';
 import { isNullReply } from './generic-transformers';
 
 type RunningScript = NullReply | TuplesToMapReply<[
-  [BlobStringReply<'name'>, BlobStringReply],
-  [BlobStringReply<'command'>, BlobStringReply],
-  [BlobStringReply<'duration_ms'>, NumberReply]
+  [SimpleStringReply<'name'>, BlobStringReply],
+  [SimpleStringReply<'command'>, BlobStringReply],
+  [SimpleStringReply<'duration_ms'>, NumberReply]
 ]>;
 
 type Engine = TuplesToMapReply<[
-  [BlobStringReply<'libraries_count'>, NumberReply],
-  [BlobStringReply<'functions_count'>, NumberReply]
+  [SimpleStringReply<'libraries_count'>, NumberReply],
+  [SimpleStringReply<'functions_count'>, NumberReply]
 ]>;
 
 type Engines = MapReply<BlobStringReply, Engine>;
 
 type FunctionStatsReply = TuplesToMapReply<[
-  [BlobStringReply<'running_script'>, RunningScript],
-  [BlobStringReply<'engines'>, Engines]
+  [SimpleStringReply<'running_script'>, RunningScript],
+  [SimpleStringReply<'engines'>, Engines]
 ]>;
 
 export default {
diff --git a/packages/client/lib/commands/HELLO.ts b/packages/client/lib/commands/HELLO.ts
@@ -1,4 +1,4 @@
-import { RedisArgument, RespVersions, TuplesToMapReply, BlobStringReply, NumberReply, ArrayReply, UnwrapReply, Resp2Reply, Command } from '../RESP/types';
+import { RedisArgument, RespVersions, TuplesToMapReply, BlobStringReply, NumberReply, ArrayReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply } from '../RESP/types';
 
 export interface HelloOptions {
   protover?: RespVersions;
@@ -10,13 +10,13 @@ export interface HelloOptions {
 }
 
 export type HelloReply = TuplesToMapReply<[
-  [BlobStringReply<'server'>, BlobStringReply],
-  [BlobStringReply<'version'>, BlobStringReply],
-  [BlobStringReply<'proto'>, NumberReply<RespVersions>],
-  [BlobStringReply<'id'>, NumberReply],
-  [BlobStringReply<'mode'>, BlobStringReply],
-  [BlobStringReply<'role'>, BlobStringReply],
-  [BlobStringReply<'modules'>, ArrayReply<BlobStringReply>]
+  [SimpleStringReply<'server'>, BlobStringReply],
+  [SimpleStringReply<'version'>, BlobStringReply],
+  [SimpleStringReply<'proto'>, NumberReply<RespVersions>],
+  [SimpleStringReply<'id'>, NumberReply],
+  [SimpleStringReply<'mode'>, BlobStringReply],
+  [SimpleStringReply<'role'>, BlobStringReply],
+  [SimpleStringReply<'modules'>, ArrayReply<BlobStringReply>]
 ]>;
 
 export default {
diff --git a/packages/client/lib/commands/LCS_IDX.ts b/packages/client/lib/commands/LCS_IDX.ts
@@ -1,4 +1,4 @@
-import { RedisArgument, TuplesToMapReply, BlobStringReply, ArrayReply, NumberReply, UnwrapReply, Resp2Reply, Command, TuplesReply } from '../RESP/types';
+import { RedisArgument, TuplesToMapReply, ArrayReply, NumberReply, UnwrapReply, Resp2Reply, Command, TuplesReply, SimpleStringReply } from '../RESP/types';
 import LCS from './LCS';
 
 export interface LcsIdxOptions {
@@ -18,8 +18,8 @@ export type LcsIdxMatches = ArrayReply<
 >;
 
 export type LcsIdxReply = TuplesToMapReply<[
-  [BlobStringReply<'matches'>, LcsIdxMatches],
-  [BlobStringReply<'len'>, NumberReply]
+  [SimpleStringReply<'matches'>, LcsIdxMatches],
+  [SimpleStringReply<'len'>, NumberReply]
 ]>;
 
 export default {
diff --git a/packages/client/lib/commands/LCS_IDX_WITHMATCHLEN.ts b/packages/client/lib/commands/LCS_IDX_WITHMATCHLEN.ts
@@ -1,4 +1,4 @@
-import { RedisArgument, TuplesToMapReply, BlobStringReply, ArrayReply, TuplesReply, NumberReply, UnwrapReply, Resp2Reply, Command } from '../RESP/types';
+import { RedisArgument, TuplesToMapReply, ArrayReply, TuplesReply, NumberReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply } from '../RESP/types';
 import LCS_IDX, { LcsIdxOptions, LcsIdxRange } from './LCS_IDX';
 
 export type LcsIdxWithMatchLenMatches = ArrayReply<
@@ -10,8 +10,8 @@ export type LcsIdxWithMatchLenMatches = ArrayReply<
 >;
 
 export type LcsIdxWithMatchLenReply = TuplesToMapReply<[
-  [BlobStringReply<'matches'>, LcsIdxWithMatchLenMatches],
-  [BlobStringReply<'len'>, NumberReply]
+  [SimpleStringReply<'matches'>, LcsIdxWithMatchLenMatches],
+  [SimpleStringReply<'len'>, NumberReply]
 ]>;
 
 export default {
diff --git a/packages/client/lib/commands/MEMORY_STATS.ts b/packages/client/lib/commands/MEMORY_STATS.ts
diff --git a/packages/client/lib/commands/MODULE_LIST.ts b/packages/client/lib/commands/MODULE_LIST.ts
diff --git a/packages/client/lib/commands/XINFO_CONSUMERS.ts b/packages/client/lib/commands/XINFO_CONSUMERS.ts
diff --git a/packages/client/lib/commands/XINFO_GROUPS.ts b/packages/client/lib/commands/XINFO_GROUPS.ts
diff --git a/packages/client/lib/commands/XINFO_STREAM.ts b/packages/client/lib/commands/XINFO_STREAM.ts
