address leibele's comments + more time series stuff I found in process

sjpotter · sjpotter · commit 6e602335eedf · 2024-06-26T14:29:43.000+03:00
diff --git a/packages/json/lib/commands/TYPE.ts b/packages/json/lib/commands/TYPE.ts
@@ -18,7 +18,7 @@ export default {
   },
   transformReply: {
     2: undefined as unknown as () => NullReply | BlobStringReply | ArrayReply<BlobStringReply>,
-    3: undefined as unknown as () => ArrayReply<NullReply | BlobStringReply | ArrayReply<BlobStringReply>>
+    3: undefined as unknown as () => ArrayReply<NullReply | BlobStringReply | ArrayReply<BlobStringReply | NullReply>>
   },
   unstableResp3Module: true
 } as const satisfies Command;
diff --git a/packages/search/lib/commands/AGGREGATE_WITHCURSOR.ts b/packages/search/lib/commands/AGGREGATE_WITHCURSOR.ts
@@ -1,4 +1,4 @@
-import { RedisArgument, Command, ReplyUnion } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, ReplyUnion, NumberReply } from '@redis/client/dist/lib/RESP/types';
 import AGGREGATE, { AggregateRawReply, AggregateReply, FtAggregateOptions } from './AGGREGATE';
 
 export interface FtAggregateWithCursorOptions extends FtAggregateOptions {
@@ -9,11 +9,11 @@ export interface FtAggregateWithCursorOptions extends FtAggregateOptions {
 
 type AggregateWithCursorRawReply = [
   result: AggregateRawReply,
-  cursor: number
+  cursor: NumberReply
 ];
 
 export interface AggregateWithCursorReply extends AggregateReply {
-  cursor: number;
+  cursor: NumberReply;
 }
 
 export default {
diff --git a/packages/search/lib/commands/CURSOR_DEL.ts b/packages/search/lib/commands/CURSOR_DEL.ts
@@ -1,9 +1,9 @@
-import { SimpleStringReply, Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
+import { SimpleStringReply, Command, RedisArgument, NumberReply, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   FIRST_KEY_INDEX: undefined,
   IS_READ_ONLY: true,
-  transformArguments(index: RedisArgument, cursorId: number) {
+  transformArguments(index: RedisArgument, cursorId: UnwrapReply<NumberReply>) {
     return ['FT.CURSOR', 'DEL', index, cursorId.toString()];
   },
   transformReply: undefined as unknown as () => SimpleStringReply<'OK'>
diff --git a/packages/search/lib/commands/CURSOR_READ.ts b/packages/search/lib/commands/CURSOR_READ.ts
@@ -1,4 +1,4 @@
-import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, UnwrapReply, NumberReply } from '@redis/client/dist/lib/RESP/types';
 import AGGREGATE_WITHCURSOR from './AGGREGATE_WITHCURSOR';
 
 export interface FtCursorReadOptions {
@@ -8,7 +8,7 @@ export interface FtCursorReadOptions {
 export default {
   FIRST_KEY_INDEX: undefined,
   IS_READ_ONLY: true,
-  transformArguments(index: RedisArgument, cursor: number, options?: FtCursorReadOptions) {
+  transformArguments(index: RedisArgument, cursor: UnwrapReply<NumberReply>, options?: FtCursorReadOptions) {
     const args = ['FT.CURSOR', 'READ', index, cursor.toString()];
 
     if (options?.COUNT !== undefined) {
diff --git a/packages/time-series/lib/commands/INFO.spec.ts b/packages/time-series/lib/commands/INFO.spec.ts
@@ -1,12 +1,13 @@
 import { strict as assert } from 'node:assert';
-import { TimeSeriesAggregationType, TimeSeriesDuplicatePolicies } from '.';
+import { TIME_SERIES_DUPLICATE_POLICIES } from '.';
 import testUtils, { GLOBAL } from '../test-utils';
-import { InfoReply, transformArguments } from './INFO';
+import INFO, { InfoReply } from './INFO';
+import { TIME_SERIES_AGGREGATION_TYPE } from './CREATERULE';
 
 describe('TS.INFO', () => {
     it('transformArguments', () => {
         assert.deepEqual(
-            transformArguments('key'),
+            INFO.transformArguments('key'),
             ['TS.INFO', 'key']
         );
     });
@@ -15,10 +16,10 @@ describe('TS.INFO', () => {
         await Promise.all([
             client.ts.create('key', {
                 LABELS: { id: '1' },
-                DUPLICATE_POLICY: TimeSeriesDuplicatePolicies.LAST
+                DUPLICATE_POLICY: TIME_SERIES_DUPLICATE_POLICIES.LAST
             }),
             client.ts.create('key2'),
-            client.ts.createRule('key', 'key2', TimeSeriesAggregationType.COUNT, 5),
+            client.ts.createRule('key', 'key2', TIME_SERIES_AGGREGATION_TYPE.COUNT, 5),
             client.ts.add('key', 1, 10)
         ]);
 
diff --git a/packages/time-series/lib/commands/INFO_DEBUG.spec.ts b/packages/time-series/lib/commands/INFO_DEBUG.spec.ts
@@ -1,25 +1,26 @@
 import { strict as assert } from 'node:assert';
-import { TimeSeriesAggregationType, TimeSeriesDuplicatePolicies } from '.';
+import { TIME_SERIES_DUPLICATE_POLICIES } from '.';
 import testUtils, { GLOBAL } from '../test-utils';
 import { assertInfo } from './INFO.spec';
-import { transformArguments } from './INFO_DEBUG';
+import INFO_DEBUG from './INFO_DEBUG';
+import { TIME_SERIES_AGGREGATION_TYPE } from './CREATERULE';
 
 describe('TS.INFO_DEBUG', () => {
     it('transformArguments', () => {
         assert.deepEqual(
-            transformArguments('key'),
+            INFO_DEBUG.transformArguments('key'),
             ['TS.INFO', 'key', 'DEBUG']
         );
     });
 
-    testUtils.testWithClient('client.ts.get', async client => {
+    testUtils.testWithClient('client.ts.infoDebug', async client => {
         await Promise.all([
             client.ts.create('key', {
                 LABELS: { id: '1' },
-                DUPLICATE_POLICY: TimeSeriesDuplicatePolicies.LAST
+                DUPLICATE_POLICY: TIME_SERIES_DUPLICATE_POLICIES.LAST
             }),
             client.ts.create('key2'),
-            client.ts.createRule('key', 'key2', TimeSeriesAggregationType.COUNT, 5),
+            client.ts.createRule('key', 'key2', TIME_SERIES_AGGREGATION_TYPE.COUNT, 5),
             client.ts.add('key', 1, 10)
         ]);
 
diff --git a/packages/time-series/lib/commands/INFO_DEBUG.ts b/packages/time-series/lib/commands/INFO_DEBUG.ts
@@ -20,7 +20,7 @@ type InfoDebugRawReply = [
   ]>
 ];
 
-interface InfoDebugReply extends InfoReply {
+export interface InfoDebugReply extends InfoReply {
   keySelfName: BlobStringReply,
   chunks: Array<{
     startTimestamp: NumberReply;
@@ -31,28 +31,27 @@ interface InfoDebugReply extends InfoReply {
   }>;
 }
 
-
 export default {
-    FIRST_KEY_INDEX: INFO.FIRST_KEY_INDEX,
-    IS_READ_ONLY: INFO.IS_READ_ONLY,
-    transformArguments(key: string) {
-      const args = INFO.transformArguments(key);
-      args.push('DEBUG');
-			return args;
-    },
-    transformReply: {
-      2: (rawReply: InfoDebugRawReply): InfoDebugReply => {
-  			const reply = INFO.transformReply[2](rawReply as unknown as InfoRawReply);
-	  		(reply as InfoDebugReply).keySelfName = rawReply[25];
-		  	(reply as InfoDebugReply).chunks = rawReply[27].map(chunk => ({
-			  	startTimestamp: chunk[1],
-  				endTimestamp: chunk[3],
-	  		  samples: chunk[5],
-		  	  size: chunk[7],
-			    bytesPerSample: chunk[9]
-			  }));
-			  return reply as InfoDebugReply;
-		  },
-      3: undefined as unknown as () => InfoDebugReply
-    }
-  } as const satisfies Command;
+  FIRST_KEY_INDEX: INFO.FIRST_KEY_INDEX,
+  IS_READ_ONLY: INFO.IS_READ_ONLY,
+  transformArguments(key: string) {
+    const args = INFO.transformArguments(key);
+    args.push('DEBUG');
+		return args;
+  },
+  transformReply: {
+    2: (rawReply: InfoDebugRawReply): InfoDebugReply => {
+  		const reply = INFO.transformReply[2](rawReply as unknown as InfoRawReply);
+	  	(reply as InfoDebugReply).keySelfName = rawReply[25];
+		  (reply as InfoDebugReply).chunks = rawReply[27].map(chunk => ({
+			  startTimestamp: chunk[1],
+  			endTimestamp: chunk[3],
+	  		samples: chunk[5],
+		    size: chunk[7],
+		    bytesPerSample: chunk[9]
+		  }));
+		  return reply as InfoDebugReply;
+		},
+    3: undefined as unknown as () => InfoDebugReply
+  }
+} as const satisfies Command;
diff --git a/packages/time-series/lib/commands/MGET.ts b/packages/time-series/lib/commands/MGET.ts
@@ -1,4 +1,4 @@
-import { CommandArguments, Command } from '@redis/client/dist/lib/RESP/types';
+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 '.';
 
@@ -19,25 +19,25 @@ export function pushFilterArgument(args: CommandArguments, filter: RedisVariadic
   return pushVariadicArguments(args, filter);
 }
 
-export type MGetRawReply2 = Array<[
-  key: string,
+export type MGetRawReply2 = ArrayReply<[
+  key: BlobStringReply,
   labels: RawLabels,
   sample: SampleRawReply2
 ]>;
 
-export type MGetRawReply3 = Array<[
-  key: string,
+export type MGetRawReply3 = ArrayReply<[
+  key: BlobStringReply,
   labels: RawLabels,
   sample: SampleRawReply3
 ]>;
 
 export interface MGetReply2 {
-  key: string;
+  key: BlobStringReply;
   sample: SampleReply2;
 }
 
 export interface MGetReply3 {
-  key: string;
+  key: BlobStringReply;
   sample: SampleReply3;
 }
 
@@ -49,13 +49,13 @@ export default {
     return pushFilterArgument(args, filter);
   },
   transformReply: {
-    2(reply: MGetRawReply2): Array<MGetReply2> {
+    2(reply: UnwrapReply<MGetRawReply2>): Array<MGetReply2> {
       return reply.map(([key, _, sample]) => ({
         key,
-        sample: transformSampleReply[2](sample)
+        sample: transformSampleReply[2](sample as unknown as UnwrapReply<SampleRawReply2>)
       }));
     },
-    3(reply: MGetRawReply3): Array<MGetReply3> {
+    3(reply: UnwrapReply<MGetRawReply3>): Array<MGetReply3> {
       return reply.map(([key, _, sample]) => ({
         key,
         sample: transformSampleReply[3](sample)
diff --git a/packages/time-series/lib/commands/MGET_WITHLABELS.ts b/packages/time-series/lib/commands/MGET_WITHLABELS.ts
@@ -1,7 +1,7 @@
-import { Command, ReplyUnion } from '@redis/client/dist/lib/RESP/types';
+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, pushWithLabelsArgument, transformLablesReply, transformSampleReply } from '.';
+import { Labels, SampleRawReply2, pushWithLabelsArgument, transformLablesReply, transformSampleReply } from '.';
 
 export interface TsMGetWithLabelsOptions extends TsMGetOptions {
   SELECTED_LABELS?: RedisVariadicArgument;
@@ -20,11 +20,11 @@ export default {
     return pushFilterArgument(args, filter);
   },
   transformReply: {
-    2: (reply: MGetRawReply2): Array<MGetWithLabelsReply2> => {
+    2: (reply: UnwrapReply<MGetRawReply2>): Array<MGetWithLabelsReply2> => {
       return reply.map(([key, labels, sample]) => ({
           key,
           labels: transformLablesReply(labels),
-          sample: transformSampleReply[2](sample)
+          sample: transformSampleReply[2](sample as unknown as UnwrapReply<SampleRawReply2>)
       }));
     },
     3: undefined as unknown as () => ReplyUnion
diff --git a/packages/time-series/lib/commands/MRANGE.spec.ts b/packages/time-series/lib/commands/MRANGE.spec.ts
@@ -1,7 +1,7 @@
 import { strict as assert } from 'node:assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import MRANGE from './MRANGE';
-import { TimeSeriesAggregationType, TimeSeriesReducers } from '.';
+import MRANGE, { TIME_SERIES_REDUCERS } from './MRANGE';
+import { TIME_SERIES_AGGREGATION_TYPE } from './CREATERULE';
 
 describe('TS.MRANGE', () => {
   it('transformArguments', () => {
@@ -15,12 +15,12 @@ describe('TS.MRANGE', () => {
         COUNT: 1,
         ALIGN: '-',
         AGGREGATION: {
-          type: TimeSeriesAggregationType.AVERAGE,
+          type: TIME_SERIES_AGGREGATION_TYPE.AVG,
           timeBucket: 1
         },
         GROUPBY: {
           label: 'label',
-          reducer: TimeSeriesReducers.SUM
+          reducer: TIME_SERIES_REDUCERS.SUM
         },
       }),
       [
diff --git a/packages/time-series/lib/commands/MRANGE.ts b/packages/time-series/lib/commands/MRANGE.ts
@@ -1,6 +1,6 @@
-import { RedisArgument, Command, CommandArguments, ReplyUnion } from '@redis/client/dist/lib/RESP/types';
+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, SampleRawReply2, SampleReply2, Timestamp, transformSamplesReply } from '.';
 import { TsRangeOptions, pushRangeArguments } from './RANGE';
 import { pushFilterArgument } from './MGET';
 
@@ -58,14 +58,14 @@ export function transformMRangeArguments(
   return pushGroupByArgument(args, options?.GROUPBY);
 }
 
-export type MRangeRawReply2 = Array<[
-  key: string,
+export type MRangeRawReply2 = ArrayReply<[
+  key: BlobStringReply,
   labels: RawLabels,
-  samples: Array<SampleRawReply2>
+  samples: ArrayReply<SampleRawReply2>
 ]>;
 
 export interface MRangeReplyItem2 {
-  key: string;
+  key: BlobStringReply;
   samples: Array<SampleReply2>;
 }
 
@@ -74,13 +74,13 @@ export default {
   IS_READ_ONLY: true,
   transformArguments: transformMRangeArguments.bind(undefined, 'TS.MRANGE'),
   transformReply: {
-    2: (reply: MRangeRawReply2): Array<MRangeReplyItem2> => {
+    2: (reply: UnwrapReply<MRangeRawReply2>): Array<MRangeReplyItem2> => {
       const args = [];
   
-      for (const [key, _, sample] of reply) {
+      for (const [key, _, samples] of reply) {        
         args.push({
           key,
-          samples: sample.map(transformSampleReply[2])
+          samples: transformSamplesReply(samples as unknown as UnwrapReply<ArrayReply<SampleRawReply2>>)
         });
       }
   
diff --git a/packages/time-series/lib/commands/MRANGE_WITHLABELS.ts b/packages/time-series/lib/commands/MRANGE_WITHLABELS.ts
@@ -1,7 +1,7 @@
-import { RedisArgument, Command, ReplyUnion } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, ReplyUnion, UnwrapReply, ArrayReply } 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, Timestamp, pushWithLabelsArgument, transformLablesReply, transformSampleReply } from '.';
+import { Labels, SampleRawReply2, Timestamp, pushWithLabelsArgument, transformLablesReply, transformSamplesReply } from '.';
 import { pushFilterArgument } from './MGET';
 import { pushRangeArguments } from './RANGE';
 
@@ -31,14 +31,14 @@ export default {
   IS_READ_ONLY: true,
   transformArguments: transformMRangeWithLabelsArguments.bind(undefined, 'TS.MRANGE'),
   transformReply: {
-    2(reply: MRangeRawReply2): Array<MRangeWithLabelsReplyItem2> {
+    2(reply: UnwrapReply<MRangeRawReply2>): Array<MRangeWithLabelsReplyItem2> {
       const args = [];
   
       for (const [key, labels, samples] of reply) {
         args.push({
           key,
           labels: transformLablesReply(labels),
-          samples: samples.map(transformSampleReply[2])
+          samples: transformSamplesReply(samples as unknown as UnwrapReply<ArrayReply<SampleRawReply2>>)
         });
       }
   
diff --git a/packages/time-series/lib/commands/MREVRANGE.spec.ts b/packages/time-series/lib/commands/MREVRANGE.spec.ts
@@ -1,12 +1,13 @@
 import { strict as assert } from 'node:assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './MREVRANGE';
-import { TimeSeriesAggregationType, TimeSeriesReducers } from '.';
+import MREVRANGE from './MREVRANGE';
+import { TIME_SERIES_AGGREGATION_TYPE } from './CREATERULE';
+import { TIME_SERIES_REDUCERS } from './MRANGE';
 
 describe('TS.MREVRANGE', () => {
   it('transformArguments', () => {
     assert.deepEqual(
-      transformArguments('-', '+', 'label=value', {
+      MREVRANGE.transformArguments('-', '+', 'label=value', {
         FILTER_BY_TS: [0],
         FILTER_BY_VALUE: {
           min: 0,
@@ -15,12 +16,12 @@ describe('TS.MREVRANGE', () => {
         COUNT: 1,
         ALIGN: '-',
         AGGREGATION: {
-          type: TimeSeriesAggregationType.AVERAGE,
+          type: TIME_SERIES_AGGREGATION_TYPE.AVG,
           timeBucket: 1
         },
         GROUPBY: {
           label: 'label',
-          reducer: TimeSeriesReducers.SUM
+          reducer: TIME_SERIES_REDUCERS.SUM
         },
       }),
       [
diff --git a/packages/time-series/lib/commands/MREVRANGE_WITHLABELS.spec.ts b/packages/time-series/lib/commands/MREVRANGE_WITHLABELS.spec.ts
diff --git a/packages/time-series/lib/commands/RANGE.ts b/packages/time-series/lib/commands/RANGE.ts
diff --git a/packages/time-series/lib/commands/index.ts b/packages/time-series/lib/commands/index.ts
