more work on review comments

Author: sjpotter

packages/client/lib/RESP/types.ts

@@ -128,11 +128,15 @@ export interface MapReply<K, V> extends RespType<
   Map<any, any> | Array<any>
 > {}
 
-type MapKeyValue = [key: SimpleStringReply, value: unknown];
+type MapKeyValue = [key: BlobStringReply | SimpleStringReply, value: unknown];
 
 type MapTuples = Array<MapKeyValue>;
 
-type ExtractMapKey<T> = T extends SimpleStringReply<infer S> ? S : never;
+type ExtractMapKey<T> = (
+    T extends BlobStringReply<infer S> ? S :
+    T extends SimpleStringReply<infer S> ? S :
+    never
+);
 
 export interface TuplesToMapReply<T extends MapTuples> extends RespType<
   RESP_TYPES['MAP'],

packages/json/lib/commands/TYPE.ts

@@ -17,7 +17,7 @@ export default {
     return args;
   },
   transformReply: {
-    2: undefined as unknown as () => NullReply | BlobStringReply | ArrayReply<BlobStringReply>,
+    2: undefined as unknown as () => NullReply | BlobStringReply | ArrayReply<BlobStringReply | NullReply>,
     3: undefined as unknown as () => ArrayReply<NullReply | BlobStringReply | ArrayReply<BlobStringReply | NullReply>>
   },
   unstableResp3Module: true

packages/search/lib/commands/EXPLAIN.spec.ts

@@ -1,5 +1,7 @@
 import { strict as assert } from 'node:assert';
 import EXPLAIN from './EXPLAIN';
+import testUtils, { GLOBAL } from '../test-utils';
+import { SCHEMA_FIELD_TYPE } from './CREATE';
 
 describe('EXPLAIN', () => {
   describe('transformArguments', () => {
@@ -30,4 +32,15 @@ describe('EXPLAIN', () => {
       );
     });
   });
+
+  testUtils.testWithClient('client.ft.dropIndex', async client => {
+    const [, reply] = await Promise.all([
+      client.ft.create('index', {
+        field: SCHEMA_FIELD_TYPE.TEXT
+      }),
+      client.ft.explain('index', '*')
+    ]);
+
+    assert.equal('<WILDCARD>}\n', reply);
+  }, GLOBAL.SERVERS.OPEN);
 });

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

@@ -58,7 +58,7 @@ export default {
     3(reply: UnwrapReply<MGetRawReply3>): Array<MGetReply3> {
       return reply.map(([key, _, sample]) => ({
         key,
-        sample: transformSampleReply[3](sample)
+        sample: transformSampleReply[3](sample as unknown as UnwrapReply<SampleRawReply3>)
       }));
     }
   }

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

@@ -1,6 +1,6 @@
 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, transformSamplesReply } from '.';
+import { RawLabels, SampleRawReply2, SampleReply2, Timestamp, transformSampleReply } from '.';
 import { TsRangeOptions, pushRangeArguments } from './RANGE';
 import { pushFilterArgument } from './MGET';
 
@@ -77,10 +77,12 @@ export default {
     2: (reply: UnwrapReply<MRangeRawReply2>): Array<MRangeReplyItem2> => {
       const args = [];
 
-      for (const [key, _, samples] of reply) {        
+      for (const [key, _, samples] of reply) {
+        const uSamples = samples as unknown as UnwrapReply<ArrayReply<SampleRawReply2>>;
+
         args.push({
           key,
-          samples: transformSamplesReply(samples as unknown as UnwrapReply<ArrayReply<SampleRawReply2>>)
+          samples: uSamples.map(sample => transformSampleReply['2'](sample as unknown as UnwrapReply<SampleRawReply2>))
         });
       }
 

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 { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { MRangeRawReply2, MRangeReplyItem2, TsMRangeOptions, pushGroupByArgument } from './MRANGE';
-import { Labels, SampleRawReply2, Timestamp, pushWithLabelsArgument, transformLablesReply, transformSamplesReply } from '.';
+import { Labels, SampleRawReply2, Timestamp, pushWithLabelsArgument, transformLablesReply, transformSampleReply } from '.';
 import { pushFilterArgument } from './MGET';
 import { pushRangeArguments } from './RANGE';
 
@@ -35,10 +35,12 @@ export default {
       const args = [];
 
       for (const [key, labels, samples] of reply) {
+        const uSamples = samples as unknown as UnwrapReply<ArrayReply<SampleRawReply2>>;
+        
         args.push({
           key,
           labels: transformLablesReply(labels),
-          samples: transformSamplesReply(samples as unknown as UnwrapReply<ArrayReply<SampleRawReply2>>)
+          samples: uSamples.map(sample => transformSampleReply['2'](sample as unknown as UnwrapReply<SampleRawReply2>))
         });
       }
 

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

@@ -112,7 +112,7 @@ export default {
       return reply.map(sample => transformSampleReply['2'](sample as unknown as UnwrapReply<SampleRawReply2>));
     },
     3(reply: UnwrapReply<ArrayReply<SampleRawReply3>>) {
-      return reply.map(sample => transformSampleReply['3'](sample));
+      return reply.map(sample => transformSampleReply['3'](sample as unknown as UnwrapReply<SampleRawReply3>));
     }
   }
 } as const satisfies Command;

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

@@ -1,4 +1,4 @@
-import type { ArrayReply, BlobStringReply, CommandArguments, DoubleReply, NumberReply, RedisArgument, RedisCommands, TuplesReply, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
+import type { BlobStringReply, CommandArguments, DoubleReply, NumberReply, RedisArgument, RedisCommands, TuplesReply, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
 import ADD from './ADD';
 import ALTER from './ALTER';
 import CREATE from './CREATE';
@@ -141,10 +141,7 @@ export function pushLabelsArgument(args: Array<RedisArgument>, labels?: Labels)
 
 export type SampleRawReply2 = TuplesReply<[timestamp: NumberReply, value: BlobStringReply]>;
 
-export interface SampleRawReply3 {
-  timestamp: NumberReply
-  value: DoubleReply
-}
+export type SampleRawReply3 = TuplesReply<[timestamp: NumberReply, value: DoubleReply]>;
 
 export interface SampleReply2 {
   timestamp: NumberReply;
@@ -156,27 +153,17 @@ export interface SampleReply3 {
   value: DoubleReply;
 }
 
-export function transformSamplesReply(samples: UnwrapReply<ArrayReply<SampleRawReply2>>): Array<SampleReply2> {
-  const reply = [];
-
-  for (const sample of samples) {
-    reply.push(transformSampleReply[2](sample as unknown as UnwrapReply<SampleRawReply2>));
-  }
-
-  return reply;
-}
-
 export const transformSampleReply = {
   2(reply: UnwrapReply<SampleRawReply2>): SampleReply2 {
     return {
       timestamp: reply[0],
       value: Number(reply[1])
     };
   },
-  3(reply: SampleRawReply3): SampleReply3 {
+  3(reply: UnwrapReply<SampleRawReply3>): SampleReply3 {
     return {
-      timestamp: reply.timestamp,
-      value: reply.value
+      timestamp: reply[0],
+      value: reply[1]
     };
   }
 };