move bloom* info commands to not error out if map type mapping is used

sjpotter · sjpotter · commit 2ac09644d9fe · 2024-08-19T13:13:15.000+03:00
diff --git a/packages/bloom/lib/commands/bloom/INFO.ts b/packages/bloom/lib/commands/bloom/INFO.ts
@@ -9,11 +9,11 @@ export type BfInfoReplyMap = TuplesToMapReply<[
 ]>;
 
 export interface BfInfoReply {
-  capacity?: NumberReply;
-  size?: NumberReply;
-  numberOfFilters?: NumberReply;
-  numberOfInsertedItems?: NumberReply;
-  expansionRate?: NullReply | NumberReply;
+  capacity: NumberReply;
+  size: NumberReply;
+  numberOfFilters: NumberReply;
+  numberOfInsertedItems: NumberReply;
+  expansionRate: NullReply | NumberReply;
 }
 
 export default {
@@ -34,27 +34,21 @@ export default {
     },
     3(reply: UnwrapReply<BfInfoReplyMap>): BfInfoReply {
       if (reply instanceof Map) {
-        throw new Error("BF.INFO shouldn't be used with type mapping to map or array");
-/*
         return {
-          capacity: reply.get("Capacity" as unknown as BlobStringReply<'Capacity'>),
-          size: reply.get("Size" as unknown as BlobStringReply<"Size">),
-          numberOfFilters: reply.get("Number of filters" as unknown as BlobStringReply<"Number of filters">),
-          numberOfInsertedItems: reply.get('Number of items inserted' as unknown as BlobStringReply<'Number of items inserted'>),
-          expansionRate: reply.get('Expansion rate' as unknown as BlobStringReply<'Expansion rate'>),
+          capacity: reply.get('Capacity') as NumberReply,
+          size: reply.get('Size') as NumberReply,
+          numberOfFilters: reply.get('Number of filters') as NumberReply,
+          numberOfInsertedItems: reply.get('Number of items inserted') as NumberReply,
+          expansionRate: reply.get('Expansion rate') as NullReply | NumberReply
         }
-*/
       } else if (reply instanceof Array) {
-        throw new Error("BF.INFO shouldn't be used with type mapping to map or array");
-/*
         return {
           capacity: reply[1],
           size: reply[3],
           numberOfFilters: reply[5],
           numberOfInsertedItems: reply[7],
           expansionRate: reply[9]
         }
-*/
       } else {
         return {
           capacity: reply["Capacity"],
diff --git a/packages/bloom/lib/commands/count-min-sketch/INFO.ts b/packages/bloom/lib/commands/count-min-sketch/INFO.ts
@@ -7,9 +7,9 @@ export type CmsInfoReplyMap = TuplesToMapReply<[
 ]>;
 
 export interface CmsInfoReply {
-  width?: NumberReply;
-  depth?: NumberReply;
-  count?: NumberReply;
+  width: NumberReply;
+  depth: NumberReply;
+  count: NumberReply;
 }
  
 export default {
@@ -28,23 +28,18 @@ export default {
     },
     3(reply: UnwrapReply<CmsInfoReplyMap>): CmsInfoReply {
       if (reply instanceof Map) {
-        throw new Error("CMS.INFO shouldn't be used with type mapping to map or array");
-/*
         return {
-          width: reply.get("width" as unknown as BlobStringReply<'width'>),
-          depth: reply.get("depth" as unknown as BlobStringReply<"depth">),
-          count: reply.get("count" as unknown as BlobStringReply<"count">)
+          width: reply.get('width') as NumberReply,
+          depth: reply.get('depth') as NumberReply,
+          count: reply.get('count') as NumberReply,
         }
-*/
+
       } else if (reply instanceof Array) {
-        throw new Error("CMS.INFO shouldn't be used with type mapping to map or array");
-/*
         return {
           width: reply[1],
           depth: reply[3],
           count: reply[5]
         }
-*/
       } else {
         return {
           width: reply['width'],
diff --git a/packages/bloom/lib/commands/cuckoo/INFO.ts b/packages/bloom/lib/commands/cuckoo/INFO.ts
@@ -43,22 +43,17 @@ export default {
     },
     3: (reply: UnwrapReply<CfInfoReplyMap>): CfInfoReply => {
       if (reply instanceof Map) {
-        throw new Error("CF.INFO shouldn't be used with type mapping to map or array");
-/*
         return {
-          size: reply.get("Size" as unknown as BlobStringReply<"Size">)!,
-          numberOfBuckets: reply.get('Number of buckets' as unknown as BlobStringReply<'Number of buckets'>)!,
-          numberOfFilters: reply.get('Number of filters' as unknown as BlobStringReply<"Number of filters">)!,
-          numberOfInsertedItems: reply.get('Number of items inserted' as unknown as BlobStringReply<'Number of items inserted'>)!,
-          numberOfDeletedItems: reply.get('Number of items deleted' as unknown as BlobStringReply<'Number of items deleted'>)!,
-          bucketSize: reply.get('Bucket size' as unknown as BlobStringReply<'Bucket size'>)!,
-          expansionRate: reply.get('Expansion rate' as unknown as BlobStringReply<'Expansion rate'>)!,
-          maxIteration: reply.get('Max iterations' as unknown as BlobStringReply<'Max iterations'>)!
+          size: reply.get('Size') as NumberReply,
+          numberOfBuckets: reply.get('Number of buckets') as NumberReply,
+          numberOfFilters: reply.get('Number of filters') as NumberReply,
+          numberOfInsertedItems: reply.get('Number of items inserted') as NumberReply,
+          numberOfDeletedItems: reply.get('Number of items deleted') as NumberReply,
+          bucketSize: reply.get('Bucket size') as NumberReply,
+          expansionRate: reply.get('Expansion rate') as NumberReply,
+          maxIteration: reply.get('Max iterations') as NumberReply
         }
-*/
       } else if (reply instanceof Array) {
-        throw new Error("CF.INFO shouldn't be used with type mapping to map or array");
-/*
         return {
           size: reply[1],
           numberOfBuckets: reply[3],
@@ -69,7 +64,6 @@ export default {
           expansionRate: reply[13],
           maxIteration: reply[15]
         }
-*/
       } else {
         return {
           size: reply['Size'],
diff --git a/packages/bloom/lib/commands/t-digest/INFO.ts b/packages/bloom/lib/commands/t-digest/INFO.ts
@@ -13,15 +13,15 @@ export type TdInfoReplyMap = TuplesToMapReply<[
 ]>;
 
 export interface TdInfoReply {
-  compression?: NumberReply;
-  capacity?: NumberReply;
-  mergedNodes?: NumberReply;
-  unmergedNodes?: NumberReply;
-  mergedWeight?: NumberReply;
-  unmergedWeight?: NumberReply;
-  observations?: NumberReply,
-  totalCompression?: NumberReply;
-  memoryUsage?: NumberReply;
+  compression: NumberReply;
+  capacity: NumberReply;
+  mergedNodes: NumberReply;
+  unmergedNodes: NumberReply;
+  mergedWeight: NumberReply;
+  unmergedWeight: NumberReply;
+  observations: NumberReply,
+  totalCompression: NumberReply;
+  memoryUsage: NumberReply;
 }
 
 export default {
@@ -46,23 +46,18 @@ export default {
     },
     3(reply: UnwrapReply<TdInfoReplyMap>): TdInfoReply {
       if (reply instanceof Map) {
-        throw new Error("TDIGEST.INFO shouldn't be used with type mapping to map or array");
-/*
         return {
-          compression: reply.get('Compression' as unknown as BlobStringReply<any>),
-          capacity: reply.get('Capacity' as unknown as BlobStringReply<any>),
-          mergedNodes: reply.get('Merged nodes' as unknown as BlobStringReply<any>),
-          unmergedNodes: reply.get('Unmerged nodes' as unknown as BlobStringReply<any>),
-          mergedWeight: reply.get('Merged weight' as unknown as BlobStringReply<any>),
-          unmergedWeight: reply.get('Unmerged weight' as unknown as BlobStringReply<any>),
-          observations: reply.get('Observations' as unknown as BlobStringReply<any>),
-          totalCompression: reply.get('Total compressions' as unknown as BlobStringReply<any>),
-          memoryUsage: reply.get('Memory usage' as unknown as BlobStringReply<any>)
+          compression: reply.get('Compression') as NumberReply,
+          capacity: reply.get('Capacity') as NumberReply,
+          mergedNodes: reply.get('Merged nodes') as NumberReply,
+          unmergedNodes: reply.get('Unmerged nodes') as NumberReply,
+          mergedWeight: reply.get('Merged weight') as NumberReply,
+          unmergedWeight: reply.get('Unmerged weight') as NumberReply,
+          observations: reply.get('Observations') as NumberReply,
+          totalCompression: reply.get('Total compressions') as NumberReply,
+          memoryUsage: reply.get('Memory usage') as NumberReply
         };
-*/
       } else if (reply instanceof Array) {
-        throw new Error("TDIGEST.INFO shouldn't be used with type mapping to map or array");
-/*
         return {
           compression: reply[1],
           capacity: reply[3],
@@ -74,7 +69,6 @@ export default {
           totalCompression: reply[15],
           memoryUsage: reply[17]
         };
-*/
       } else {
         return {
           compression: reply['Compression'],
diff --git a/packages/bloom/lib/commands/top-k/INFO.ts b/packages/bloom/lib/commands/top-k/INFO.ts
@@ -31,25 +31,19 @@ export default {
     },
     3: (reply: UnwrapReply<TopKInfoReplyMap>): TkInfoReply => {
       if (reply instanceof Map) {
-        throw new Error("TOPK.INFO shouldn't be used with type mapping to map or array");
-/*
         return {
-          k: reply.get('k' as unknown as BlobStringReply<'k'>) as NumberReply,
-          width: reply.get('width' as unknown as BlobStringReply<'width'>) as NumberReply,
-          depth: reply.get('depth' as unknown as BlobStringReply<'depth'>) as NumberReply,
-          decay: Number(reply.get('decay' as unknown as BlobStringReply<'decay'>) as DoubleReply)
+          k: reply.get('k') as NumberReply,
+          width: reply.get('width') as NumberReply,
+          depth: reply.get('depth') as NumberReply,
+          decay: Number(reply.get('decay') as DoubleReply)
         };
-*/
       } else if (reply instanceof Array) {
-        throw new Error("TOPK.INFO shouldn't be used with type mapping to map or array");
-/*
         return {
           k: reply[1],
           width: reply[3],
           depth: reply[5],
           decay: Number(reply[7])
         };
-*/
       } else {
         return {
           k: reply['k'],
