attempt to implement leibele's suggestion to clean up code

Author: sjpotter

packages/time-series/lib/commands/MGET.ts

@@ -1,6 +1,7 @@
 import { CommandArguments, Command, BlobStringReply, ArrayReply, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
 import { RedisVariadicArgument, pushVariadicArguments } from '@redis/client/dist/lib/commands/generic-transformers';
-import { RawLabels, SampleRawReply2, SampleRawReply3, SampleReply2, SampleReply3, transformSampleReply } from '.';
+import { RawLabels, SampleRawReply, transformSampleReply } from '.';
+import { Resp2Reply } from '@redis/client/dist/lib/RESP/types';
 
 export interface TsMGetOptions {
   LATEST?: boolean;
@@ -22,23 +23,23 @@ export function pushFilterArgument(args: CommandArguments, filter: RedisVariadic
 export type MGetRawReply2 = ArrayReply<[
   key: BlobStringReply,
   labels: RawLabels,
-  sample: SampleRawReply2
+  sample: Resp2Reply<SampleRawReply>
 ]>;
 
 export type MGetRawReply3 = ArrayReply<[
   key: BlobStringReply,
   labels: RawLabels,
-  sample: SampleRawReply3
+  sample: SampleRawReply
 ]>;
 
 export interface MGetReply2 {
   key: BlobStringReply;
-  sample: SampleReply2;
+  sample: ReturnType<typeof transformSampleReply[2]>;
 }
 
 export interface MGetReply3 {
   key: BlobStringReply;
-  sample: SampleReply3;
+  sample: ReturnType<typeof transformSampleReply[3]>;
 }
 
 export default {
@@ -52,13 +53,13 @@ export default {
     2(reply: UnwrapReply<MGetRawReply2>): Array<MGetReply2> {
       return reply.map(([key, _, sample]) => ({
         key,
-        sample: transformSampleReply[2](sample as unknown as UnwrapReply<SampleRawReply2>)
+        sample: transformSampleReply[2](sample as unknown as Resp2Reply<SampleRawReply>)
       }));
     },
     3(reply: UnwrapReply<MGetRawReply3>): Array<MGetReply3> {
       return reply.map(([key, _, sample]) => ({
         key,
-        sample: transformSampleReply[3](sample as unknown as UnwrapReply<SampleRawReply3>)
+        sample: transformSampleReply[3](sample as unknown as SampleRawReply)
       }));
     }
   }

packages/time-series/lib/commands/MGET_WITHLABELS.ts

@@ -1,7 +1,8 @@
 import { Command, ReplyUnion, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
 import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { TsMGetOptions, pushLatestArgument, pushFilterArgument, MGetReply2, MGetRawReply2 } from './MGET';
-import { Labels, SampleRawReply2, pushWithLabelsArgument, transformLablesReply, transformSampleReply } from '.';
+import { Labels, SampleRawReply, pushWithLabelsArgument, transformLablesReply, transformSampleReply } from '.';
+import { Resp2Reply } from '@redis/client/dist/lib/RESP/types';
 
 export interface TsMGetWithLabelsOptions extends TsMGetOptions {
   SELECTED_LABELS?: RedisVariadicArgument;
@@ -24,7 +25,7 @@ export default {
       return reply.map(([key, labels, sample]) => ({
           key,
           labels: transformLablesReply(labels),
-          sample: transformSampleReply[2](sample as unknown as UnwrapReply<SampleRawReply2>)
+          sample: transformSampleReply[2](sample as unknown as Resp2Reply<SampleRawReply>)
       }));
     },
     3: undefined as unknown as () => ReplyUnion

packages/time-series/lib/commands/MRANGE.ts

@@ -1,8 +1,9 @@
 import { RedisArgument, Command, CommandArguments, ReplyUnion, UnwrapReply, ArrayReply, BlobStringReply } from '@redis/client/dist/lib/RESP/types';
 import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
-import { RawLabels, SampleRawReply2, SampleReply2, Timestamp, transformSampleReply } from '.';
+import { RawLabels, SampleRawReply, SamplesRawReply, Timestamp, transformSampleReply, transformSamplesReply } from '.';
 import { TsRangeOptions, pushRangeArguments } from './RANGE';
 import { pushFilterArgument } from './MGET';
+import { Resp2Reply } from '@redis/client/dist/lib/RESP/types';
 
 export const TIME_SERIES_REDUCERS = {
   AVG: 'AVG',
@@ -61,12 +62,12 @@ export function transformMRangeArguments(
 export type MRangeRawReply2 = ArrayReply<[
   key: BlobStringReply,
   labels: RawLabels,
-  samples: ArrayReply<SampleRawReply2>
+  samples: ArrayReply<Resp2Reply<SampleRawReply>>
 ]>;
 
 export interface MRangeReplyItem2 {
   key: BlobStringReply;
-  samples: Array<SampleReply2>;
+  samples: Array<ReturnType<typeof transformSampleReply[2]>>;
 }
 
 export default {
@@ -78,11 +79,9 @@ export default {
       const args = [];
 
       for (const [key, _, samples] of reply) {
-        const uSamples = samples as unknown as UnwrapReply<ArrayReply<SampleRawReply2>>;
-
         args.push({
           key,
-          samples: uSamples.map(sample => transformSampleReply['2'](sample as unknown as UnwrapReply<SampleRawReply2>))
+          samples: transformSamplesReply[2](samples as unknown as Resp2Reply<SamplesRawReply>)
         });
       }
 

packages/time-series/lib/commands/MRANGE_WITHLABELS.ts

@@ -1,7 +1,7 @@
-import { RedisArgument, Command, ReplyUnion, UnwrapReply, ArrayReply } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, ReplyUnion, UnwrapReply, Resp2Reply } from '@redis/client/dist/lib/RESP/types';
 import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { MRangeRawReply2, MRangeReplyItem2, TsMRangeOptions, pushGroupByArgument } from './MRANGE';
-import { Labels, SampleRawReply2, Timestamp, pushWithLabelsArgument, transformLablesReply, transformSampleReply } from '.';
+import { Labels, SamplesRawReply, Timestamp, pushWithLabelsArgument, transformLablesReply, transformSamplesReply } from '.';
 import { pushFilterArgument } from './MGET';
 import { pushRangeArguments } from './RANGE';
 
@@ -34,13 +34,11 @@ export default {
     2(reply: UnwrapReply<MRangeRawReply2>): Array<MRangeWithLabelsReplyItem2> {
       const args = [];
 
-      for (const [key, labels, samples] of reply) {
-        const uSamples = samples as unknown as UnwrapReply<ArrayReply<SampleRawReply2>>;
-        
+      for (const [key, labels, samples] of reply) {       
         args.push({
           key,
           labels: transformLablesReply(labels),
-          samples: uSamples.map(sample => transformSampleReply['2'](sample as unknown as UnwrapReply<SampleRawReply2>))
+          samples: transformSamplesReply[2](samples as unknown as Resp2Reply<SamplesRawReply>)
         });
       }
 

packages/time-series/lib/commands/RANGE.ts

@@ -1,6 +1,7 @@
-import { CommandArguments, RedisArgument, ArrayReply, UnwrapReply, Command } from '@redis/client/dist/lib/RESP/types';
-import { Timestamp, transformTimestampArgument, transformSampleReply, SampleRawReply2, SampleRawReply3 } from '.';
+import { CommandArguments, RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { Timestamp, transformTimestampArgument, SamplesRawReply, transformSamplesReply } from '.';
 import { TimeSeriesAggregationType } from './CREATERULE';
+import { Resp2Reply } from '@redis/client/dist/lib/RESP/types';
 
 export const TIME_SERIES_BUCKET_TIMESTAMP = {
   LOW: '-',
@@ -108,11 +109,11 @@ export default {
   IS_READ_ONLY: true,
   transformArguments: transformRangeArguments.bind(undefined, 'TS.RANGE'),
   transformReply: {
-    2(reply: UnwrapReply<ArrayReply<SampleRawReply2>>) {
-      return reply.map(sample => transformSampleReply['2'](sample as unknown as UnwrapReply<SampleRawReply2>));
+    2(reply: SamplesRawReply) {
+      return transformSamplesReply[2](reply as unknown as Resp2Reply<SamplesRawReply>);
     },
-    3(reply: UnwrapReply<ArrayReply<SampleRawReply3>>) {
-      return reply.map(sample => transformSampleReply['3'](sample as unknown as UnwrapReply<SampleRawReply3>));
+    3(reply: SamplesRawReply) {
+      return transformSamplesReply[3](reply);
     }
   }
 } as const satisfies Command;

packages/time-series/lib/commands/index.ts

@@ -1,4 +1,4 @@
-import type { BlobStringReply, CommandArguments, DoubleReply, NumberReply, RedisArgument, RedisCommands, TuplesReply, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
+import type { CommandArguments, DoubleReply, NumberReply, RedisArgument, RedisCommands, TuplesReply, UnwrapReply, Resp2Reply, ArrayReply } from '@redis/client/dist/lib/RESP/types';
 import ADD from './ADD';
 import ALTER from './ALTER';
 import CREATE from './CREATE';
@@ -139,35 +139,37 @@ export function pushLabelsArgument(args: Array<RedisArgument>, labels?: Labels)
   return args;
 }
 
-export type SampleRawReply2 = TuplesReply<[timestamp: NumberReply, value: BlobStringReply]>;
-
-export type SampleRawReply3 = TuplesReply<[timestamp: NumberReply, value: DoubleReply]>;
-
-export interface SampleReply2 {
-  timestamp: NumberReply;
-  value: number;
-}
-
-export interface SampleReply3 {
-  timestamp: NumberReply;
-  value: DoubleReply;
-}
+export type SampleRawReply = TuplesReply<[timestamp: NumberReply, value: DoubleReply]>;
 
 export const transformSampleReply = {
-  2(reply: UnwrapReply<SampleRawReply2>): SampleReply2 {
+  2(reply: Resp2Reply<SampleRawReply>) {
+    const [ timestamp, value ] = reply as unknown as UnwrapReply<typeof reply>;
     return {
-      timestamp: reply[0],
-      value: Number(reply[1])
+      timestamp,
+      value: Number(value)
     };
   },
-  3(reply: UnwrapReply<SampleRawReply3>): SampleReply3 {
+  3(reply: SampleRawReply) {
+    const [ timestamp, value ] = reply as unknown as UnwrapReply<typeof reply>;
     return {
-      timestamp: reply[0],
-      value: reply[1]
+      timestamp,
+      value
     };
   }
 };
 
+export type SamplesRawReply = ArrayReply<SampleRawReply>;
+
+export const transformSamplesReply = {
+  2(reply: Resp2Reply<SamplesRawReply>) {
+    return (reply as unknown as UnwrapReply<typeof reply>)
+      .map(sample => transformSampleReply[2](sample));
+  },
+  3(reply: SamplesRawReply) {
+    return (reply as unknown as UnwrapReply<typeof reply>)
+      .map(sample => transformSampleReply[3](sample));  }
+};
+
 export function transformLablesReply(reply: RawLabels): Labels {
   const labels: Labels = {};