Merge branch 'v5-search-broken' into cmd-parser-with-commands

Author: sjpotter

packages/client/lib/RESP/types.ts

@@ -285,7 +285,7 @@ export type Command = {
   parseCommand(this: void, parser: CommandParser, ...args: Array<any>): void;
   TRANSFORM_LEGACY_REPLY?: boolean;
   transformReply: TransformReply | Record<RespVersions, TransformReply>;
-  unstableResp3SearchModule?: boolean;
+  unstableResp3?: boolean;
 };
 
 export type RedisCommands = Record<string, Command>;
@@ -319,7 +319,7 @@ export interface CommanderConfig<
   /**
    * TODO
    */
-  unstableResp3SearchModule?: boolean;
+  unstableResp3?: boolean;
 }
 
 type Resp2Array<T> = (

packages/client/lib/cluster/index.ts

@@ -66,10 +66,6 @@ export interface RedisClusterOptions<
    * Useful when the cluster is running on another network
    */
   nodeAddressMap?: NodeAddressMap;
-  /**
-   * TODO
-   */
-  unstableResp3SearchModule?: boolean;
 }
 
 // remove once request & response policies are ready

packages/client/lib/commander.ts

@@ -45,7 +45,7 @@ export function attachConfig<
     for (const [moduleName, module] of Object.entries(config.modules)) {
       const fns = Object.create(null);
       for (const [name, command] of Object.entries(module)) {
-        if (config.RESP == 3 && command.unstableResp3SearchModule && !config.unstableResp3SearchModule) {
+        if (config.RESP == 3 && command.unstableResp3 && !config.unstableResp3) {
           fns[name] = throwResp3SearchModuleUnstableError;
         } else {
           fns[name] = createModuleCommand(command, RESP);

packages/client/lib/commands/XREAD.spec.ts

@@ -101,6 +101,14 @@ describe('XREAD', () => {
       }),
     ])
 
+    const arr = ['key', [{
+      'id': id,
+      'message': [
+        'field',
+        'value',
+      ]
+    }]];
+
     const obj = Object.assign(Object.create(null), {
       'key': [{
         id: id,
@@ -114,7 +122,7 @@ describe('XREAD', () => {
       }]
     });
 
-    assert.deepStrictEqual(reply, obj);
+    assert.deepStrictEqual(reply, arr);
   }, {
     client: GLOBAL.SERVERS.OPEN,
     cluster: GLOBAL.CLUSTERS.OPEN

packages/client/lib/commands/XREAD.ts

@@ -1,6 +1,6 @@
 import { CommandParser } from '../client/parser';
-import { Command, RedisArgument } from '../RESP/types';
-import { transformStreamsMessagesReplyResp2, transformStreamsMessagesReplyResp3 } from './generic-transformers';
+import { Command, RedisArgument, ReplyUnion } from '../RESP/types';
+import { transformStreamsMessagesReplyResp2 } from './generic-transformers';
 
 export interface XReadStream {
   key: RedisArgument;
@@ -47,6 +47,7 @@ export default {
   },
   transformReply: {
     2: transformStreamsMessagesReplyResp2,
-    3: transformStreamsMessagesReplyResp3
-  }
+    3: undefined as unknown as () => ReplyUnion
+  },
+  unstableResp3: true
 } as const satisfies Command;

packages/client/lib/commands/XREADGROUP.spec.ts

@@ -124,6 +124,14 @@ describe('XREADGROUP', () => {
       })
     ]);
 
+    const arr = ['key', [{
+      'id': id,
+      'message': [
+        'field',
+        'value',
+      ]
+    }]];    
+
     const obj = Object.assign(Object.create(null), {
       'key': [{
         id: id,
@@ -137,7 +145,7 @@ describe('XREADGROUP', () => {
       }]
     });
 
-    assert.deepStrictEqual(readGroupReply, obj);
+    assert.deepStrictEqual(readGroupReply, arr);
   }, {
     client: GLOBAL.SERVERS.OPEN,
     cluster: GLOBAL.CLUSTERS.OPEN

packages/client/lib/commands/XREADGROUP.ts

@@ -1,7 +1,7 @@
 import { CommandParser } from '../client/parser';
-import { Command, RedisArgument } from '../RESP/types';
+import { Command, RedisArgument, ReplyUnion } from '../RESP/types';
 import { XReadStreams, pushXReadStreams } from './XREAD';
-import { transformStreamsMessagesReplyResp2, transformStreamsMessagesReplyResp3 } from './generic-transformers';
+import { transformStreamsMessagesReplyResp2 } from './generic-transformers';
 
 export interface XReadGroupOptions {
   COUNT?: number;
@@ -36,6 +36,7 @@ export default {
   },
   transformReply: {
     2: transformStreamsMessagesReplyResp2,
-    3: transformStreamsMessagesReplyResp3
-  }
+    3: undefined as unknown as () => ReplyUnion
+  },
+  unstableResp3: true,
 } as const satisfies Command;

packages/client/lib/commands/generic-transformers.ts

@@ -557,6 +557,7 @@ export function transformStreamsMessagesReplyResp2(
   if (reply === null) return null as unknown as NullReply;
 
   switch (typeMapping? typeMapping[RESP_TYPES.MAP] : undefined) {
+/*    
     case Map: {
       const ret = new Map<string, StreamMessagesReply>();
 
@@ -571,6 +572,14 @@ export function transformStreamsMessagesReplyResp2(
     
       return ret as unknown as MapReply<string, StreamMessagesReply>;
     }
+*/
+    /* work around for now */
+    default:
+      if (!typeMapping) {
+        typeMapping = {};
+      }
+      // console.log("forcing map type map to array");
+      // typeMapping[RESP_TYPES.MAP] = Array;
     case Array: {
       const ret: Array<BlobStringReply | StreamMessagesReply> = [];
 
@@ -581,11 +590,12 @@ export function transformStreamsMessagesReplyResp2(
         const rawMessages = stream[1];
 
         ret.push(name); 
-        ret.push(transformStreamMessagesReply(rawMessages));
+        ret.push(transformStreamMessagesReply(rawMessages, typeMapping));
       }
 
       return ret as unknown as MapReply<string, StreamMessagesReply>;
     }
+/*    
     default: {
       const ret: Record<string, StreamMessagesReply> = Object.create(null);
 
@@ -600,6 +610,7 @@ export function transformStreamsMessagesReplyResp2(
     
       return ret as unknown as MapReply<string, StreamMessagesReply>;
     }
+*/
   }
 }
 

packages/client/lib/sentinel/types.ts

@@ -59,10 +59,6 @@ export interface RedisSentinelOptions<
    * When `false`, the sentinel object will wait for the first available client from the pool.
    */
   reserveClient?: boolean;
-  /**
-   * TODO
-   */
-  unstableResp3SearchModule?: boolean;
 }
 
 export interface SentinelCommander<

packages/search/lib/commands/AGGREGATE.ts

@@ -160,7 +160,7 @@ export default {
     },
     3: undefined as unknown as () => ReplyUnion
   },
-  unstableResp3SearchModule: true
+  unstableResp3: true
 } as const satisfies Command;
 
 export function parseAggregateOptions(parser: CommandParser , options?: FtAggregateOptions) {