diff --git a/packages/json/lib/commands/ARRINSERT.spec.ts b/packages/json/lib/commands/ARRINSERT.spec.ts
index 4b9d58b2ca..6adb3cd767 100644
--- a/packages/json/lib/commands/ARRINSERT.spec.ts
+++ b/packages/json/lib/commands/ARRINSERT.spec.ts
@@ -1,30 +1,30 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './ARRINSERT';
+import ARRINSERT from './ARRINSERT';
 
 describe('ARRINSERT', () => {
-    describe('transformArguments', () => {
-        it('single JSON', () => {
-            assert.deepEqual(
-                transformArguments('key', '$', 0, 'json'),
-                ['JSON.ARRINSERT', 'key', '$', '0', '"json"']
-            );
-        });
-
-        it('multiple JSONs', () => {
-            assert.deepEqual(
-                transformArguments('key', '$', 0, '1', '2'),
-                ['JSON.ARRINSERT', 'key', '$', '0', '"1"', '"2"']
-            );
-        });
+  describe('transformArguments', () => {
+    it('single JSON', () => {
+      assert.deepEqual(
+        ARRINSERT.transformArguments('key', '$', 0, 'json'),
+        ['JSON.ARRINSERT', 'key', '$', '0', '"json"']
+      );
     });
 
-    testUtils.testWithClient('client.json.arrInsert', async client => {
-        await client.json.set('key', '$', []);
+    it('multiple JSONs', () => {
+      assert.deepEqual(
+        ARRINSERT.transformArguments('key', '$', 0, '1', '2'),
+        ['JSON.ARRINSERT', 'key', '$', '0', '"1"', '"2"']
+      );
+    });
+  });
 
-        assert.deepEqual(
-            await client.json.arrInsert('key', '$', 0, 'json'),
-            [1]
-        );
-    }, GLOBAL.SERVERS.OPEN);
+  testUtils.testWithClient('client.json.arrInsert', async client => {
+    await client.json.set('key', '$', []);
+
+    assert.deepEqual(
+      await client.json.arrInsert('key', '$', 0, 'json'),
+      [1]
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/json/lib/commands/ARRINSERT.ts b/packages/json/lib/commands/ARRINSERT.ts
index 8585765701..66663c646f 100644
--- a/packages/json/lib/commands/ARRINSERT.ts
+++ b/packages/json/lib/commands/ARRINSERT.ts
@@ -1,15 +1,17 @@
+import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { RedisJSON, transformRedisJsonArgument } from '.';
 
-export const FIRST_KEY_INDEX = 1;
-
-export function transformArguments(key: string, path: string, index: number, ...jsons: Array<RedisJSON>): Array<string> {
+export default {
+  FIRST_KEY_INDEX: 1,
+  IS_READ_ONLY: false,
+  transformArguments(key: RedisArgument, path: RedisArgument, index: number, ...jsons: Array<RedisJSON>) {
     const args = ['JSON.ARRINSERT', key, path, index.toString()];
 
     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 | NullReply | ArrayReply<NumberReply | NullReply>
+} as const satisfies Command;
diff --git a/packages/json/lib/commands/ARRLEN.spec.ts b/packages/json/lib/commands/ARRLEN.spec.ts
index f0a3ec40a4..d14531f038 100644
--- a/packages/json/lib/commands/ARRLEN.spec.ts
+++ b/packages/json/lib/commands/ARRLEN.spec.ts
@@ -1,30 +1,30 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './ARRLEN';
+import ARRLEN from './ARRLEN';
 
 describe('ARRLEN', () => {
-    describe('transformArguments', () => {
-        it('without path', () => {
-            assert.deepEqual(
-                transformArguments('key'),
-                ['JSON.ARRLEN', 'key']
-            );
-        });
-
-        it('with path', () => {
-            assert.deepEqual(
-                transformArguments('key', '$'),
-                ['JSON.ARRLEN', 'key', '$']
-            );
-        });
+  describe('transformArguments', () => {
+    it('without path', () => {
+      assert.deepEqual(
+        ARRLEN.transformArguments('key'),
+        ['JSON.ARRLEN', 'key']
+      );
     });
 
-    testUtils.testWithClient('client.json.arrLen', async client => {
-        await client.json.set('key', '$', []);
+    it('with path', () => {
+      assert.deepEqual(
+        ARRLEN.transformArguments('key', '$'),
+        ['JSON.ARRLEN', 'key', '$']
+      );
+    });
+  });
 
-        assert.deepEqual(
-            await client.json.arrLen('key', '$'),
-            [0]
-        );
-    }, GLOBAL.SERVERS.OPEN);
+  testUtils.testWithClient('client.json.arrLen', async client => {
+    await client.json.set('key', '$', []);
+
+    assert.deepEqual(
+      await client.json.arrLen('key', '$'),
+      [0]
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/json/lib/commands/ARRLEN.ts b/packages/json/lib/commands/ARRLEN.ts
index 818397b7f8..26155a109d 100644
--- a/packages/json/lib/commands/ARRLEN.ts
+++ b/packages/json/lib/commands/ARRLEN.ts
@@ -1,15 +1,16 @@
-export const FIRST_KEY_INDEX = 1;
+import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
-export const IS_READ_ONLY = true;
-
-export function transformArguments(key: string, path?: string): Array<string> {
+export default {
+  FIRST_KEY_INDEX: 1,
+  IS_READ_ONLY: true,
+  transformArguments(key: RedisArgument, path?: RedisArgument) {
     const args = ['JSON.ARRLEN', key];
 
     if (path) {
-        args.push(path);
+      args.push(path);
     }
 
     return args;
-}
-
-export declare function transformReply(): number | Array<number>;
+  },
+  transformReply: undefined as unknown as () => NumberReply | NullReply | ArrayReply<NumberReply | NullReply>
+} as const satisfies Command;
diff --git a/packages/json/lib/commands/ARRTRIM.spec.ts b/packages/json/lib/commands/ARRTRIM.spec.ts
index c254e1b6a0..0d44c88ccd 100644
--- a/packages/json/lib/commands/ARRTRIM.spec.ts
+++ b/packages/json/lib/commands/ARRTRIM.spec.ts
@@ -1,21 +1,21 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './ARRTRIM';
+import ARRTRIM from './ARRTRIM';
 
 describe('ARRTRIM', () => {
-    it('transformArguments', () => {
-        assert.deepEqual(
-            transformArguments('key', '$', 0, 1),
-            ['JSON.ARRTRIM', 'key', '$', '0', '1']
-        );
-    });
+  it('transformArguments', () => {
+    assert.deepEqual(
+      ARRTRIM.transformArguments('key', '$', 0, 1),
+      ['JSON.ARRTRIM', 'key', '$', '0', '1']
+    );
+  });
 
-    testUtils.testWithClient('client.json.arrTrim', async client => {
-        await client.json.set('key', '$', []);
+  testUtils.testWithClient('client.json.arrTrim', async client => {
+    await client.json.set('key', '$', []);
 
-        assert.deepEqual(
-            await client.json.arrTrim('key', '$', 0, 1),
-            [0]
-        );
-    }, GLOBAL.SERVERS.OPEN);
+    assert.deepEqual(
+      await client.json.arrTrim('key', '$', 0, 1),
+      [0]
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/json/lib/commands/ARRTRIM.ts b/packages/json/lib/commands/ARRTRIM.ts
index 2de444eeeb..a3de83fff1 100644
--- a/packages/json/lib/commands/ARRTRIM.ts
+++ b/packages/json/lib/commands/ARRTRIM.ts
@@ -1,7 +1,10 @@
-export const FIRST_KEY_INDEX = 1;
+import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
-export function transformArguments(key: string, path: string, start: number, stop: number): Array<string> {
+export default {
+  FIRST_KEY_INDEX: 1,
+  IS_READ_ONLY: false,
+  transformArguments(key: RedisArgument, path: RedisArgument, start: number, stop: number) {
     return ['JSON.ARRTRIM', key, path, start.toString(), stop.toString()];
-}
-
-export declare function transformReply(): number | Array<number>;
+  },
+  transformReply: undefined as unknown as () => NumberReply | NullReply | ArrayReply<NumberReply | NullReply>
+} as const satisfies Command;
diff --git a/packages/json/lib/commands/OBJLEN.spec.ts b/packages/json/lib/commands/OBJLEN.spec.ts
index 35b6589c87..316a3ebf0e 100644
--- a/packages/json/lib/commands/OBJLEN.spec.ts
+++ b/packages/json/lib/commands/OBJLEN.spec.ts
@@ -1,28 +1,28 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './OBJLEN';
+import OBJLEN from './OBJLEN';
 
 describe('OBJLEN', () => {
-    describe('transformArguments', () => {
-        it('without path', () => {
-            assert.deepEqual(
-                transformArguments('key'),
-                ['JSON.OBJLEN', 'key']
-            );
-        });
-
-        it('with path', () => {
-            assert.deepEqual(
-                transformArguments('key', '$'),
-                ['JSON.OBJLEN', 'key', '$']
-            );
-        });
+  describe('transformArguments', () => {
+    it('without path', () => {
+      assert.deepEqual(
+        OBJLEN.transformArguments('key'),
+        ['JSON.OBJLEN', 'key']
+      );
     });
 
-    // testUtils.testWithClient('client.json.objLen', async client => {
-    //     assert.equal(
-    //         await client.json.objLen('key', '$'),
-    //         [null]
-    //     );
-    // }, GLOBAL.SERVERS.OPEN);
+    it('with path', () => {
+      assert.deepEqual(
+        OBJLEN.transformArguments('key', '$'),
+        ['JSON.OBJLEN', 'key', '$']
+      );
+    });
+  });
+
+  // testUtils.testWithClient('client.json.objLen', async client => {
+  //   assert.equal(
+  //     await client.json.objLen('key', '$'),
+  //     [null]
+  //   );
+  // }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/json/lib/commands/OBJLEN.ts b/packages/json/lib/commands/OBJLEN.ts
index aa800e97f7..4063feea39 100644
--- a/packages/json/lib/commands/OBJLEN.ts
+++ b/packages/json/lib/commands/OBJLEN.ts
@@ -1,13 +1,16 @@
-export const FIRST_KEY_INDEX = 1;
+import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
-export function transformArguments(key: string, path?: string): Array<string> {
+export default {
+  FIRST_KEY_INDEX: 1,
+  IS_READ_ONLY: false,
+  transformArguments(key: RedisArgument, path?: RedisArgument) {
     const args = ['JSON.OBJLEN', key];
 
     if (path) {
-        args.push(path);
+      args.push(path);
     }
 
     return args;
-}
-
-export declare function transformReply(): number | null | Array<number | null>;
+  },
+  transformReply: undefined as unknown as () => NumberReply | NullReply | ArrayReply<NumberReply | NullReply>
+} as const satisfies Command;
diff --git a/packages/json/lib/commands/STRAPPEND.spec.ts b/packages/json/lib/commands/STRAPPEND.spec.ts
index a37eaa1d91..06e6b60b10 100644
--- a/packages/json/lib/commands/STRAPPEND.spec.ts
+++ b/packages/json/lib/commands/STRAPPEND.spec.ts
@@ -1,30 +1,30 @@
-import { strict as assert } from 'assert';
-import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './STRAPPEND';
+// import { strict as assert } from 'assert';
+// import testUtils, { GLOBAL } from '../test-utils';
+// import { transformArguments } from './STRAPPEND';
 
-describe('STRAPPEND', () => {
-    describe('transformArguments', () => {
-        it('without path', () => {
-            assert.deepEqual(
-                transformArguments('key', 'append'),
-                ['JSON.STRAPPEND', 'key', '"append"']
-            );
-        });
+// describe('STRAPPEND', () => {
+//     describe('transformArguments', () => {
+//         it('without path', () => {
+//             assert.deepEqual(
+//                 transformArguments('key', 'append'),
+//                 ['JSON.STRAPPEND', 'key', '"append"']
+//             );
+//         });
 
-        it('with path', () => {
-            assert.deepEqual(
-                transformArguments('key', '$', 'append'),
-                ['JSON.STRAPPEND', 'key', '$', '"append"']
-            );
-        });
-    });
+//         it('with path', () => {
+//             assert.deepEqual(
+//                 transformArguments('key', '$', 'append'),
+//                 ['JSON.STRAPPEND', 'key', '$', '"append"']
+//             );
+//         });
+//     });
 
-    testUtils.testWithClient('client.json.strAppend', async client => {
-        await client.json.set('key', '$', '');
+//     testUtils.testWithClient('client.json.strAppend', async client => {
+//         await client.json.set('key', '$', '');
 
-        assert.deepEqual(
-            await client.json.strAppend('key', '$', 'append'),
-            [6]
-        );
-    }, GLOBAL.SERVERS.OPEN);
-});
+//         assert.deepEqual(
+//             await client.json.strAppend('key', '$', 'append'),
+//             [6]
+//         );
+//     }, GLOBAL.SERVERS.OPEN);
+// });
diff --git a/packages/json/lib/commands/STRAPPEND.ts b/packages/json/lib/commands/STRAPPEND.ts
index eea384c93f..9f3ef316fd 100644
--- a/packages/json/lib/commands/STRAPPEND.ts
+++ b/packages/json/lib/commands/STRAPPEND.ts
@@ -1,21 +1,21 @@
-import { transformRedisJsonArgument } from '.';
+// import { transformRedisJsonArgument } from '.';
 
-export const FIRST_KEY_INDEX = 1;
+// export const FIRST_KEY_INDEX = 1;
 
-type AppendArguments = [key: string, append: string];
+// type AppendArguments = [key: string, append: string];
 
-type AppendWithPathArguments = [key: string, path: string, append: string];
+// type AppendWithPathArguments = [key: string, path: string, append: string];
 
-export function transformArguments(...[key, pathOrAppend, append]: AppendArguments | AppendWithPathArguments): Array<string> {
-    const args = ['JSON.STRAPPEND', key];
+// export function transformArguments(...[key, pathOrAppend, append]: AppendArguments | AppendWithPathArguments): Array<string> {
+//     const args = ['JSON.STRAPPEND', key];
 
-    if (append !== undefined && append !== null) {
-        args.push(pathOrAppend, transformRedisJsonArgument(append));
-    } else {
-        args.push(transformRedisJsonArgument(pathOrAppend));
-    }
+//     if (append !== undefined && append !== null) {
+//         args.push(pathOrAppend, transformRedisJsonArgument(append));
+//     } else {
+//         args.push(transformRedisJsonArgument(pathOrAppend));
+//     }
 
-    return args;
-}
+//     return args;
+// }
 
-export declare function transformReply(): number | Array<number>;
+// export declare function transformReply(): number | Array<number>;
diff --git a/packages/json/lib/commands/STRLEN.spec.ts b/packages/json/lib/commands/STRLEN.spec.ts
index cf163d3c19..97a14542fb 100644
--- a/packages/json/lib/commands/STRLEN.spec.ts
+++ b/packages/json/lib/commands/STRLEN.spec.ts
@@ -1,30 +1,30 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './STRLEN';
+import STRLEN from './STRLEN';
 
 describe('STRLEN', () => {
-    describe('transformArguments', () => {
-        it('without path', () => {
-            assert.deepEqual(
-                transformArguments('key'),
-                ['JSON.STRLEN', 'key']
-            );
-        });
-
-        it('with path', () => {
-            assert.deepEqual(
-                transformArguments('key', '$'),
-                ['JSON.STRLEN', 'key', '$']
-            );
-        });
+  describe('transformArguments', () => {
+    it('without path', () => {
+      assert.deepEqual(
+        STRLEN.transformArguments('key'),
+        ['JSON.STRLEN', 'key']
+      );
     });
 
-    testUtils.testWithClient('client.json.strLen', async client => {
-        await client.json.set('key', '$', '');
+    it('with path', () => {
+      assert.deepEqual(
+        STRLEN.transformArguments('key', '$'),
+        ['JSON.STRLEN', 'key', '$']
+      );
+    });
+  });
 
-        assert.deepEqual(
-            await client.json.strLen('key', '$'),
-            [0]
-        );
-    }, GLOBAL.SERVERS.OPEN);
+  testUtils.testWithClient('client.json.strLen', async client => {
+    await client.json.set('key', '$', '');
+
+    assert.deepEqual(
+      await client.json.strLen('key', '$'),
+      [0]
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });
diff --git a/packages/json/lib/commands/STRLEN.ts b/packages/json/lib/commands/STRLEN.ts
index 93f5d563ba..a2bab3b1f4 100644
--- a/packages/json/lib/commands/STRLEN.ts
+++ b/packages/json/lib/commands/STRLEN.ts
@@ -1,15 +1,16 @@
-export const FIRST_KEY_INDEX = 1;
+import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
-export const IS_READ_ONLY = true;
-
-export function transformArguments(key: string, path?: string): Array<string> {
+export default {
+  FIRST_KEY_INDEX: 1,
+  IS_READ_ONLY: false,
+  transformArguments(key: RedisArgument, path?: RedisArgument) {
     const args = ['JSON.STRLEN', key];
 
     if (path) {
-        args.push(path);
+      args.push(path);
     }
 
     return args;
-}
-
-export declare function transformReply(): number;
+  },
+  transformReply: undefined as unknown as () => NumberReply | NullReply | ArrayReply<NumberReply | NullReply>
+} as const satisfies Command;
diff --git a/packages/json/lib/commands/TOGGLE.spec.ts b/packages/json/lib/commands/TOGGLE.spec.ts
new file mode 100644
index 0000000000..0be05e0ccd
--- /dev/null
+++ b/packages/json/lib/commands/TOGGLE.spec.ts
@@ -0,0 +1,30 @@
+import { strict as assert } from 'assert';
+import testUtils, { GLOBAL } from '../test-utils';
+import TOGGLE from './TOGGLE';
+
+describe('TOGGLE', () => {
+  describe('transformArguments', () => {
+    it('without path', () => {
+      assert.deepEqual(
+        TOGGLE.transformArguments('key'),
+        ['JSON.TOGGLE', 'key']
+      );
+    });
+
+    it('with path', () => {
+      assert.deepEqual(
+        TOGGLE.transformArguments('key', '$'),
+        ['JSON.TOGGLE', 'key', '$']
+      );
+    });
+  });
+
+  testUtils.testWithClient('client.json.toggle', async client => {
+    await client.json.set('key', '$', '');
+
+    assert.deepEqual(
+      await client.json.toggle('key', '$'),
+      [0]
+    );
+  }, GLOBAL.SERVERS.OPEN);
+});
diff --git a/packages/json/lib/commands/TOGGLE.ts b/packages/json/lib/commands/TOGGLE.ts
new file mode 100644
index 0000000000..45b632952a
--- /dev/null
+++ b/packages/json/lib/commands/TOGGLE.ts
@@ -0,0 +1,14 @@
+import { RedisArgument, ArrayReply, NumberReply, NullReply, Command, } from '@redis/client/dist/lib/RESP/types';
+
+export default {
+  FIRST_KEY_INDEX: undefined,
+  IS_READ_ONLY: false,
+  transformArguments(key: RedisArgument, path?: RedisArgument) {
+    const args = ['JSON.TOGGLE', key]
+
+    if (path) args.push(path);
+
+    return args;
+  },
+  transformReply: undefined as unknown as () => NumberReply | NullReply | ArrayReply<NumberReply | NullReply>
+} as const satisfies Command;