module commands to be marked as unstable and require clients to opt in

.github/workflows/tests.yml

@@ -5,19 +5,20 @@ on:
     branches:
       - master
       - v4.0
+      - v5
   pull_request:
     branches:
       - master
       - v4.0
-
+      - v5
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         node-version: ['18', '20']
-        redis-version: ['5', '6.0', '6.2', '7.0', '7.2']
+        redis-version: ['6.2.6-v17', '7.2.0-v13', '7.4.0-v1']
     steps:
       - uses: actions/checkout@v4
         with:
@@ -32,7 +33,7 @@ jobs:
       - name: Install Packages
         run: npm ci
       - name: Build
-        run: npm run build -- ./packages/client ./packages/test-utils
+        run: npm run build
       - name: Run Tests
         run: npm run test -ws --if-present -- --forbid-only --redis-version=${{ matrix.redis-version }}
       - name: Upload to Codecov

packages/bloom/lib/commands/bloom/INFO.spec.ts

@@ -17,10 +17,10 @@ describe('BF.INFO', () => {
     ]);
 
     assert.equal(typeof reply, 'object');
-    assert.equal(reply.capacity, 100);
-    assert.equal(typeof reply.size, 'number');
-    assert.equal(typeof reply.numberOfFilters, 'number');
-    assert.equal(typeof reply.numberOfInsertedItems, 'number');
-    assert.equal(typeof reply.expansionRate, 'number');
+    assert.equal(reply['Capacity'], 100);
+    assert.equal(typeof reply['Size'], 'number');
+    assert.equal(typeof reply['Number of filters'], 'number');
+    assert.equal(typeof reply['Number of items inserted'], 'number');
+    assert.equal(typeof reply['Expansion rate'], 'number');
   }, GLOBAL.SERVERS.OPEN);
 });

packages/bloom/lib/commands/bloom/INFO.ts

@@ -1,11 +1,32 @@
-import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, UnwrapReply, NullReply, NumberReply, TuplesToMapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { transformInfoV2Reply } from '.';
+
+export type BfInfoReplyMap = TuplesToMapReply<[
+  [SimpleStringReply<'Capacity'>, NumberReply],
+  [SimpleStringReply<'Size'>, NumberReply],
+  [SimpleStringReply<'Number of filters'>, NumberReply],
+  [SimpleStringReply<'Number of items inserted'>, NumberReply],
+  [SimpleStringReply<'Expansion rate'>, NullReply | NumberReply] 
+]>;
+
+export interface BfInfoReply {
+  capacity: NumberReply;
+  size: NumberReply;
+  numberOfFilters: NumberReply;
+  numberOfInsertedItems: NumberReply;
+  expansionRate: NullReply | NumberReply;
+}
 
 export default {
   FIRST_KEY_INDEX: 1,
   IS_READ_ONLY: true,
   transformArguments(key: RedisArgument) {
     return ['BF.INFO', key];
   },
-  // TODO
-  transformReply: undefined as unknown as () => any
+  transformReply: {
+    2: (reply: UnwrapReply<Resp2Reply<BfInfoReplyMap>>, _, typeMapping?: TypeMapping): BfInfoReplyMap => {
+      return transformInfoV2Reply<BfInfoReplyMap>(reply, typeMapping);
+    },
+    3: undefined as unknown as () => BfInfoReplyMap
+  }
 } as const satisfies Command;

packages/bloom/lib/commands/bloom/index.ts

@@ -1,4 +1,5 @@
-import type { RedisCommands } from '@redis/client/dist/lib/RESP/types';
+import type { RedisCommands, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+
 import ADD from './ADD';
 import CARD from './CARD';
 import EXISTS from './EXISTS';
@@ -9,6 +10,7 @@ import MADD from './MADD';
 import MEXISTS from './MEXISTS';
 import RESERVE from './RESERVE';
 import SCANDUMP from './SCANDUMP';
+import { RESP_TYPES } from '@redis/client';
 
 export default {
   ADD,
@@ -32,3 +34,31 @@ export default {
   SCANDUMP,
   scanDump: SCANDUMP
 } as const satisfies RedisCommands;
+
+export function transformInfoV2Reply<T>(reply: Array<any>, typeMapping?: TypeMapping): T {
+  const mapType = typeMapping ? typeMapping[RESP_TYPES.MAP] : undefined;
+
+  switch (mapType) {
+    case Array: {
+      return reply as unknown as T;
+    }
+    case Map: {
+      const ret = new Map<string, any>();
+
+      for (let i = 0; i < reply.length; i += 2) {
+        ret.set(reply[i].toString(), reply[i + 1]);
+      }
+
+      return ret as unknown as T;
+    }
+    default: {
+      const ret = Object.create(null);
+
+      for (let i = 0; i < reply.length; i += 2) {
+        ret[reply[i].toString()] = reply[i + 1];
+      }
+
+      return ret as unknown as T;
+    }
+  }
+}

packages/bloom/lib/commands/count-min-sketch/INFO.spec.ts

@@ -18,10 +18,11 @@ describe('CMS.INFO', () => {
         client.cms.info('key')
       ]);
 
-    assert.deepEqual(reply, {
-      width,
-      depth,
-      count: 0
-    });
+    const expected = Object.create(null);
+    expected['width'] = width;
+    expected['depth'] = depth;
+    expected['count'] = 0;
+
+    assert.deepEqual(reply, expected);
   }, GLOBAL.SERVERS.OPEN);
 });

packages/bloom/lib/commands/count-min-sketch/INFO.ts

@@ -1,10 +1,17 @@
-import { RedisArgument, TuplesToMapReply, BlobStringReply, NumberReply, UnwrapReply, Resp2Reply, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, TuplesToMapReply, NumberReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { transformInfoV2Reply } from '../bloom';
 
-export type BfInfoReply = TuplesToMapReply<[
-  [BlobStringReply<'width'>, NumberReply],
-  [BlobStringReply<'depth'>, NumberReply],
-  [BlobStringReply<'count'>, NumberReply]
+export type CmsInfoReplyMap = TuplesToMapReply<[
+  [SimpleStringReply<'width'>, NumberReply],
+  [SimpleStringReply<'depth'>, NumberReply],
+  [SimpleStringReply<'count'>, NumberReply]
 ]>;
+
+export interface CmsInfoReply {
+  width: NumberReply;
+  depth: NumberReply;
+  count: NumberReply;
+}
 
 export default {
   FIRST_KEY_INDEX: 1,
@@ -13,11 +20,9 @@ export default {
     return ['CMS.INFO', key];
   },
   transformReply: {
-    2: (reply: UnwrapReply<Resp2Reply<BfInfoReply>>) => ({
-      width: reply[1],
-      depth: reply[3],
-      count: reply[5]
-    }),
-    3: undefined as unknown as () => BfInfoReply
+    2: (reply: UnwrapReply<Resp2Reply<CmsInfoReplyMap>>, _, typeMapping?: TypeMapping): CmsInfoReply => {
+      return transformInfoV2Reply<CmsInfoReply>(reply, typeMapping);
+    },
+    3: undefined as unknown as () => CmsInfoReply
   }
 } as const satisfies Command;

packages/bloom/lib/commands/cuckoo/INFO.spec.ts

@@ -17,13 +17,13 @@ describe('CF.INFO', () => {
     ]);
 
     assert.equal(typeof reply, 'object');
-    assert.equal(typeof reply.size, 'number');
-    assert.equal(typeof reply.numberOfBuckets, 'number');
-    assert.equal(typeof reply.numberOfFilters, 'number');
-    assert.equal(typeof reply.numberOfInsertedItems, 'number');
-    assert.equal(typeof reply.numberOfDeletedItems, 'number');
-    assert.equal(typeof reply.bucketSize, 'number');
-    assert.equal(typeof reply.expansionRate, 'number');
-    assert.equal(typeof reply.maxIteration, 'number');
+    assert.equal(typeof reply['Size'], 'number');
+    assert.equal(typeof reply['Number of buckets'], 'number');
+    assert.equal(typeof reply['Number of filters'], 'number');
+    assert.equal(typeof reply['Number of items inserted'], 'number');
+    assert.equal(typeof reply['Number of items deleted'], 'number');
+    assert.equal(typeof reply['Bucket size'], 'number');
+    assert.equal(typeof reply['Expansion rate'], 'number');
+    assert.equal(typeof reply['Max iterations'], 'number');
   }, GLOBAL.SERVERS.OPEN);
 });

packages/bloom/lib/commands/cuckoo/INFO.ts

@@ -1,53 +1,27 @@
-import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { transformInfoV2Reply } from '../bloom';
+
+export type CfInfoReplyMap = TuplesToMapReply<[
+  [SimpleStringReply<'Size'>, NumberReply],
+  [SimpleStringReply<'Number of buckets'>, NumberReply],
+  [SimpleStringReply<'Number of filters'>, NumberReply],
+  [SimpleStringReply<'Number of items inserted'>, NumberReply],
+  [SimpleStringReply<'Number of items deleted'>, NumberReply],
+  [SimpleStringReply<'Bucket size'>, NumberReply],
+  [SimpleStringReply<'Expansion rate'>, NumberReply],
+  [SimpleStringReply<'Max iterations'>, NumberReply]
+]>;
 
 export default {
   FIRST_KEY_INDEX: 1,
   IS_READ_ONLY: true,
   transformArguments(key: RedisArgument) {
     return ['CF.INFO', key];
   },
-  // TODO
-  // export type InfoRawReply = [
-  //     _: string,
-  //     size: number,
-  //     _: string,
-  //     numberOfBuckets: number,
-  //     _: string,
-  //     numberOfFilters: number,
-  //     _: string,
-  //     numberOfInsertedItems: number,
-  //     _: string,
-  //     numberOfDeletedItems: number,
-  //     _: string,
-  //     bucketSize: number,
-  //     _: string,
-  //     expansionRate: number,
-  //     _: string,
-  //     maxIteration: number
-  // ];
-
-  // export interface InfoReply {
-  //     size: number;
-  //     numberOfBuckets: number;
-  //     numberOfFilters: number;
-  //     numberOfInsertedItems: number;
-  //     numberOfDeletedItems: number;
-  //     bucketSize: number;
-  //     expansionRate: number;
-  //     maxIteration: number;
-  // }
-
-  // export function transformReply(reply: InfoRawReply): InfoReply {
-  //     return {
-  //         size: reply[1],
-  //         numberOfBuckets: reply[3],
-  //         numberOfFilters: reply[5],
-  //         numberOfInsertedItems: reply[7],
-  //         numberOfDeletedItems: reply[9],
-  //         bucketSize: reply[11],
-  //         expansionRate: reply[13],
-  //         maxIteration: reply[15]
-  //     };
-  // }
-  transformReply: undefined as unknown as () => any
+  transformReply: {
+    2: (reply: UnwrapReply<Resp2Reply<CfInfoReplyMap>>, _, typeMapping?: TypeMapping): CfInfoReplyMap => {
+      return transformInfoV2Reply<CfInfoReplyMap>(reply, typeMapping);
+    },
+    3: undefined as unknown as () => CfInfoReplyMap
+  }
 } as const satisfies Command;