diff --git a/packages/json/lib/commands/ARRAPPEND.spec.ts b/packages/json/lib/commands/ARRAPPEND.spec.ts
index ab53837a00..cd2001d5ea 100644
--- a/packages/json/lib/commands/ARRAPPEND.spec.ts
+++ b/packages/json/lib/commands/ARRAPPEND.spec.ts
@@ -1,30 +1,30 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './ARRAPPEND';
+import ARRAPPEND from './ARRAPPEND';
 
 describe('ARRAPPEND', () => {
-    describe('transformArguments', () => {
-        it('single JSON', () => {
-            assert.deepEqual(
-                transformArguments('key', '$', 1),
-                ['JSON.ARRAPPEND', 'key', '$', '1']
-            );
-        });
-
-        it('multiple JSONs', () => {
-            assert.deepEqual(
-                transformArguments('key', '$', 1, 2),
-                ['JSON.ARRAPPEND', 'key', '$', '1', '2']
-            );
-        });
+  describe('transformArguments', () => {
+    it('single JSON', () => {
+      assert.deepEqual(
+        ARRAPPEND.transformArguments('key', '$', 1),
+        ['JSON.ARRAPPEND', 'key', '$', '1']
+      );
     });
 
-    testUtils.testWithClient('client.json.arrAppend', async client => {
-        await client.json.set('key', '$', []);
+    it('multiple JSONs', () => {
+      assert.deepEqual(
+        ARRAPPEND.transformArguments('key', '$', 1, 2),
+        ['JSON.ARRAPPEND', 'key', '$', '1', '2']
+      );
+    });
+  });
 
-        assert.deepEqual(
-            await client.json.arrAppend('key', '$', 1),
-            [1]
-        );
-    }, GLOBAL.SERVERS.OPEN);
+  testUtils.testWithClient('client.json.arrAppend', async client => {
+    await client.json.set('key', '$', []);
+
+    assert.deepEqual(
+      await client.json.arrAppend('key', '$', 1),
+      [1]
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/json/lib/commands/ARRAPPEND.ts b/packages/json/lib/commands/ARRAPPEND.ts
index 2935d19299..ce80987647 100644
--- a/packages/json/lib/commands/ARRAPPEND.ts
+++ b/packages/json/lib/commands/ARRAPPEND.ts
@@ -1,15 +1,17 @@
 import { RedisJSON, transformRedisJsonArgument } from '.';
+import { RedisArgument, ArrayReply, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
-export const FIRST_KEY_INDEX = 1;
-
-export function transformArguments(key: string, path: string, ...jsons: Array<RedisJSON>): Array<string> {
+export default {
+  FIRST_KEY_INDEX: 1,
+  IS_READ_ONLY: false,
+  transformArguments(key: RedisArgument, path: RedisArgument, ...jsons: Array<RedisJSON>) {
     const args = ['JSON.ARRAPPEND', key, path];
 
     for (const json of jsons) {
-        args.push(transformRedisJsonArgument(json));
+      args.push(transformRedisJsonArgument(json));
     }
 
     return args;
-}
-
-export declare function transformReply(): number | Array<number>;
+  },
+  transformReply: undefined as unknown as () => NumberReply | ArrayReply<NumberReply>
+} as const satisfies Command;
diff --git a/packages/json/lib/commands/ARRINDEX.spec.ts b/packages/json/lib/commands/ARRINDEX.spec.ts
index 7a47d67126..290d0a237f 100644
--- a/packages/json/lib/commands/ARRINDEX.spec.ts
+++ b/packages/json/lib/commands/ARRINDEX.spec.ts
@@ -1,37 +1,37 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './ARRINDEX';
+import ARRINDEX from './ARRINDEX';
 
 describe('ARRINDEX', () => {
-    describe('transformArguments', () => {
-        it('simple', () => {
-            assert.deepEqual(
-                transformArguments('key', '$', 'json'),
-                ['JSON.ARRINDEX', 'key', '$', '"json"']
-            );
-        });
-
-        it('with start', () => {
-            assert.deepEqual(
-                transformArguments('key', '$', 'json', 1),
-                ['JSON.ARRINDEX', 'key', '$', '"json"', '1']
-            );
-        });
-
-        it('with start, end', () => {
-            assert.deepEqual(
-                transformArguments('key', '$', 'json', 1, 2),
-                ['JSON.ARRINDEX', 'key', '$', '"json"', '1', '2']
-            );
-        });
+  describe('transformArguments', () => {
+    it('simple', () => {
+      assert.deepEqual(
+        ARRINDEX.transformArguments('key', '$', 'json'),
+        ['JSON.ARRINDEX', 'key', '$', '"json"']
+      );
     });
 
-    testUtils.testWithClient('client.json.arrIndex', async client => {
-        await client.json.set('key', '$', []);
+    it('with start', () => {
+      assert.deepEqual(
+        ARRINDEX.transformArguments('key', '$', 'json', 1),
+        ['JSON.ARRINDEX', 'key', '$', '"json"', '1']
+      );
+    });
 
-        assert.deepEqual(
-            await client.json.arrIndex('key', '$', 'json'),
-            [-1]
-        );
-    }, GLOBAL.SERVERS.OPEN);
+    it('with start, end', () => {
+      assert.deepEqual(
+        ARRINDEX.transformArguments('key', '$', 'json', 1, 2),
+        ['JSON.ARRINDEX', 'key', '$', '"json"', '1', '2']
+      );
+    });
+  });
+
+  testUtils.testWithClient('client.json.arrIndex', async client => {
+    await client.json.set('key', '$', []);
+
+    assert.deepEqual(
+      await client.json.arrIndex('key', '$', 'json'),
+      [-1]
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/json/lib/commands/ARRINDEX.ts b/packages/json/lib/commands/ARRINDEX.ts
index 5860b59cb3..8c8c9e5df2 100644
--- a/packages/json/lib/commands/ARRINDEX.ts
+++ b/packages/json/lib/commands/ARRINDEX.ts
@@ -1,21 +1,27 @@
+import { RedisArgument, ArrayReply, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { RedisJSON, transformRedisJsonArgument } from '.';
 
-export const FIRST_KEY_INDEX = 1;
-
-export const IS_READ_ONLY = true;
-
-export function transformArguments(key: string, path: string, json: RedisJSON, start?: number, stop?: number): Array<string> {
+export default {
+  FIRST_KEY_INDEX: 1,
+  IS_READ_ONLY: true,
+  transformArguments(
+    key: RedisArgument,
+    path: RedisArgument,
+    json: RedisJSON,
+    start?: number,
+    stop?: number
+  ) {
     const args = ['JSON.ARRINDEX', key, path, transformRedisJsonArgument(json)];
 
     if (start !== undefined && start !== null) {
-        args.push(start.toString());
+      args.push(start.toString());
 
-        if (stop !== undefined && stop !== null) {
-            args.push(stop.toString());
-        }
+      if (stop !== undefined && stop !== null) {
+        args.push(stop.toString());
+      }
     }
 
     return args;
-}
-
-export declare function transformReply(): number | Array<number>;
+  },
+  transformReply: undefined as unknown as () => NumberReply | ArrayReply<NumberReply>
+} as const satisfies Command;
diff --git a/packages/search/lib/commands/DICTDUMP.spec.ts b/packages/search/lib/commands/DICTDUMP.spec.ts
index 9896fb9440..0e50a4a373 100644
--- a/packages/search/lib/commands/DICTDUMP.spec.ts
+++ b/packages/search/lib/commands/DICTDUMP.spec.ts
@@ -1,21 +1,21 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './DICTDUMP';
+import DICTDUMP from './DICTDUMP';
 
 describe('DICTDUMP', () => {
-    it('transformArguments', () => {
-        assert.deepEqual(
-            transformArguments('dictionary'),
-            ['FT.DICTDUMP', 'dictionary']
-        );
-    });
+  it('transformArguments', () => {
+    assert.deepEqual(
+      DICTDUMP.transformArguments('dictionary'),
+      ['FT.DICTDUMP', 'dictionary']
+    );
+  });
 
-    testUtils.testWithClient('client.ft.dictDump', async client => {
-        await client.ft.dictAdd('dictionary', 'string')
+  testUtils.testWithClient('client.ft.dictDump', async client => {
+    await client.ft.dictAdd('dictionary', 'string')
 
-        assert.deepEqual(
-            await client.ft.dictDump('dictionary'),
-            ['string']
-        );
-    }, GLOBAL.SERVERS.OPEN);
+    assert.deepEqual(
+      await client.ft.dictDump('dictionary'),
+      ['string']
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/search/lib/commands/DICTDUMP.ts b/packages/search/lib/commands/DICTDUMP.ts
index 1427bb42cb..f542403cc5 100644
--- a/packages/search/lib/commands/DICTDUMP.ts
+++ b/packages/search/lib/commands/DICTDUMP.ts
@@ -1,5 +1,13 @@
-export function transformArguments(dictionary: string): Array<string> {
-    return ['FT.DICTDUMP', dictionary];
-}
+import { RedisArgument, ArrayReply, SetReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
-export declare function transformReply(): Array<string>;
+export default {
+  FIRST_KEY_INDEX: undefined,
+  IS_READ_ONLY: true,
+  transformArguments(dictionary: RedisArgument) {
+    return ['FT.DICTDUMP', dictionary];
+  },
+  transformReply: {
+    2: undefined as unknown as () => ArrayReply<BlobStringReply>,
+    3: undefined as unknown as () => SetReply<BlobStringReply>
+  }
+} as const satisfies Command;
diff --git a/packages/search/lib/commands/DROPINDEX.spec.ts b/packages/search/lib/commands/DROPINDEX.spec.ts
index 6a60a5d851..cb6ca192cd 100644
--- a/packages/search/lib/commands/DROPINDEX.spec.ts
+++ b/packages/search/lib/commands/DROPINDEX.spec.ts
@@ -1,33 +1,33 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
 import { SchemaFieldTypes } from '.';
-import { transformArguments } from './DROPINDEX';
+import DROPINDEX from './DROPINDEX';
 
 describe('DROPINDEX', () => {
-    describe('transformArguments', () => {
-        it('without options', () => {
-            assert.deepEqual(
-                transformArguments('index'),
-                ['FT.DROPINDEX', 'index']
-            );
-        });
-
-        it('with DD', () => {
-            assert.deepEqual(
-                transformArguments('index', { DD: true }),
-                ['FT.DROPINDEX', 'index', 'DD']
-            );
-        });
+  describe('transformArguments', () => {
+    it('without options', () => {
+      assert.deepEqual(
+        DROPINDEX.transformArguments('index'),
+        ['FT.DROPINDEX', 'index']
+      );
     });
 
-    testUtils.testWithClient('client.ft.dropIndex', async client => {
-        await client.ft.create('index', {
-            field: SchemaFieldTypes.TEXT
-        });
+    it('with DD', () => {
+      assert.deepEqual(
+        DROPINDEX.transformArguments('index', { DD: true }),
+        ['FT.DROPINDEX', 'index', 'DD']
+      );
+    });
+  });
 
-        assert.equal(
-            await client.ft.dropIndex('index'),
-            'OK'
-        );
-    }, GLOBAL.SERVERS.OPEN);
+  testUtils.testWithClient('client.ft.dropIndex', async client => {
+    await client.ft.create('index', {
+      field: SchemaFieldTypes.TEXT
+    });
+
+    assert.equal(
+      await client.ft.dropIndex('index'),
+      'OK'
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/search/lib/commands/DROPINDEX.ts b/packages/search/lib/commands/DROPINDEX.ts
index 7897a9dd82..fe25a79e97 100644
--- a/packages/search/lib/commands/DROPINDEX.ts
+++ b/packages/search/lib/commands/DROPINDEX.ts
@@ -1,15 +1,23 @@
-interface DropIndexOptions {
-    DD?: true;
+import { RedisArgument, SimpleStringReply, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
+
+export interface FtDropIndexOptions {
+  DD?: true;
 }
 
-export function transformArguments(index: string, options?: DropIndexOptions): Array<string> {
+export default {
+  FIRST_KEY_INDEX: undefined,
+  IS_READ_ONLY: false,
+  transformArguments(index: RedisArgument, options?: FtDropIndexOptions) {
     const args = ['FT.DROPINDEX', index];
 
     if (options?.DD) {
-        args.push('DD');
+      args.push('DD');
     }
 
     return args;
-}
-
-export declare function transformReply(): 'OK';
+  },
+  transformReply: {
+    2: undefined as unknown as () => SimpleStringReply<'OK'>,
+    3: undefined as unknown as () => NumberReply
+  }
+} as const satisfies Command;
diff --git a/packages/search/lib/commands/TAGVALS.spec.ts b/packages/search/lib/commands/TAGVALS.spec.ts
index d59bfcfe3e..52bb66c1ce 100644
--- a/packages/search/lib/commands/TAGVALS.spec.ts
+++ b/packages/search/lib/commands/TAGVALS.spec.ts
@@ -1,24 +1,24 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
 import { SchemaFieldTypes } from '.';
-import { transformArguments } from './TAGVALS';
+import TAGVALS from './TAGVALS';
 
 describe('TAGVALS', () => {
-    it('transformArguments', () => {
-        assert.deepEqual(
-            transformArguments('index', '@field'),
-            ['FT.TAGVALS', 'index', '@field']
-        );
+  it('transformArguments', () => {
+    assert.deepEqual(
+      TAGVALS.transformArguments('index', '@field'),
+      ['FT.TAGVALS', 'index', '@field']
+    );
+  });
+
+  testUtils.testWithClient('client.ft.tagVals', async client => {
+    await client.ft.create('index', {
+      field: SchemaFieldTypes.TAG
     });
 
-    testUtils.testWithClient('client.ft.tagVals', async client => {
-        await client.ft.create('index', {
-            field: SchemaFieldTypes.TAG
-        });
-
-        assert.deepEqual(
-            await client.ft.tagVals('index', 'field'),
-            []
-        );
-    }, GLOBAL.SERVERS.OPEN);
+    assert.deepEqual(
+      await client.ft.tagVals('index', 'field'),
+      []
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/search/lib/commands/TAGVALS.ts b/packages/search/lib/commands/TAGVALS.ts
index 54342f0c9e..7c58a1f9d1 100644
--- a/packages/search/lib/commands/TAGVALS.ts
+++ b/packages/search/lib/commands/TAGVALS.ts
@@ -1,5 +1,13 @@
-export function transformArguments(index: string, fieldName: string): Array<string> {
-    return ['FT.TAGVALS', index, fieldName];
-}
+import { RedisArgument, ArrayReply, SetReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
-export declare function transformReply(): Array<string>;
+export default {
+  FIRST_KEY_INDEX: undefined,
+  IS_READ_ONLY: false,
+  transformArguments(index: RedisArgument, fieldName: RedisArgument) {
+    return ['FT.TAGVALS', index, fieldName];
+  },
+  transformReply: {
+    2: undefined as unknown as () => ArrayReply<BlobStringReply>,
+    3: undefined as unknown as () => SetReply<BlobStringReply>
+  }
+} as const satisfies Command;
diff --git a/packages/search/lib/commands/_LIST.spec.ts b/packages/search/lib/commands/_LIST.spec.ts
index 602c29975f..1b468db0d7 100644
--- a/packages/search/lib/commands/_LIST.spec.ts
+++ b/packages/search/lib/commands/_LIST.spec.ts
@@ -1,19 +1,19 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './_LIST';
+import _LIST from './_LIST';
 
 describe('_LIST', () => {
-    it('transformArguments', () => {
-        assert.deepEqual(
-            transformArguments(),
-            ['FT._LIST']
-        );
-    });
+  it('transformArguments', () => {
+    assert.deepEqual(
+      _LIST.transformArguments(),
+      ['FT._LIST']
+    );
+  });
 
-    testUtils.testWithClient('client.ft._list', async client => {
-        assert.deepEqual(
-            await client.ft._list(),
-            []
-        );
-    }, GLOBAL.SERVERS.OPEN);
+  testUtils.testWithClient('client.ft._list', async client => {
+    assert.deepEqual(
+      await client.ft._list(),
+      []
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/search/lib/commands/_LIST.ts b/packages/search/lib/commands/_LIST.ts
index 588ec837c3..efb6c31acc 100644
--- a/packages/search/lib/commands/_LIST.ts
+++ b/packages/search/lib/commands/_LIST.ts
@@ -1,5 +1,13 @@
-export function transformArguments(): Array<string> {
-    return ['FT._LIST'];
-}
+import { ArrayReply, SetReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
-export declare function transformReply(): Array<string>;
+export default {
+  FIRST_KEY_INDEX: undefined,
+  IS_READ_ONLY: true,
+  transformArguments() {
+    return ['FT._LIST'];
+  },
+  transformReply: {
+    2: undefined as unknown as () => ArrayReply<BlobStringReply>,
+    3: undefined as unknown as () => SetReply<BlobStringReply>
+  }
+} as const satisfies Command;