extract json helper functions in client package

nkaradzhov · nkaradzhov · commit b1a321e6f688 · 2025-06-18T11:02:10.000+03:00
diff --git a/packages/client/lib/commands/VADD.ts b/packages/client/lib/commands/VADD.ts
@@ -1,5 +1,5 @@
 import { CommandParser } from '../client/parser';
-import { RedisArgument, NumberReply, Command, BooleanReply } from '../RESP/types';
+import { RedisArgument, Command } from '../RESP/types';
 import { transformBooleanReply, transformDoubleArgument } from './generic-transformers';
 
 export interface VAddOptions {
diff --git a/packages/client/lib/commands/generic-transformers.ts b/packages/client/lib/commands/generic-transformers.ts
@@ -662,3 +662,21 @@ export function transformStreamsMessagesReplyResp3(reply: UnwrapReply<StreamsMes
     return ret as unknown as MapReply<BlobStringReply, StreamMessagesReply>
   }
 }
+
+export type RedisJSON = null | boolean | number | string | Date | Array<RedisJSON> | {
+  [key: string]: RedisJSON;
+  [key: number]: RedisJSON;
+};
+
+export function transformRedisJsonArgument(json: RedisJSON): string {
+  return JSON.stringify(json);
+}
+
+export function transformRedisJsonReply(json: BlobStringReply): RedisJSON {
+  const res = JSON.parse((json as unknown as UnwrapReply<typeof json>).toString());
+  return res;
+}
+
+export function transformRedisJsonNullReply(json: NullReply | BlobStringReply): NullReply | RedisJSON {
+  return isNullReply(json) ? json : transformRedisJsonReply(json);
+}
diff --git a/packages/json/lib/commands/ARRAPPEND.ts b/packages/json/lib/commands/ARRAPPEND.ts
@@ -1,5 +1,5 @@
 import { CommandParser } from '@redis/client/dist/lib/client/parser';
-import { RedisJSON, transformRedisJsonArgument } from './helpers';
+import { RedisJSON, transformRedisJsonArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
diff --git a/packages/json/lib/commands/ARRINDEX.ts b/packages/json/lib/commands/ARRINDEX.ts
@@ -1,6 +1,6 @@
 import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
-import { RedisJSON, transformRedisJsonArgument } from './helpers';
+import { RedisJSON, transformRedisJsonArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface JsonArrIndexOptions {
   range?: {
diff --git a/packages/json/lib/commands/ARRINSERT.ts b/packages/json/lib/commands/ARRINSERT.ts
@@ -1,6 +1,6 @@
 import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
-import { RedisJSON, transformRedisJsonArgument } from './helpers';
+import { RedisJSON, transformRedisJsonArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/json/lib/commands/ARRPOP.ts b/packages/json/lib/commands/ARRPOP.ts
@@ -1,7 +1,6 @@
 import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { RedisArgument, ArrayReply, NullReply, BlobStringReply, Command, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
-import { isArrayReply } from '@redis/client/dist/lib/commands/generic-transformers';
-import { transformRedisJsonNullReply } from './helpers';
+import { isArrayReply, transformRedisJsonNullReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface RedisArrPopOptions {
   path: RedisArgument;
diff --git a/packages/json/lib/commands/GET.ts b/packages/json/lib/commands/GET.ts
@@ -1,7 +1,6 @@
 import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
-import { transformRedisJsonNullReply } from './helpers';
+import { RedisVariadicArgument, transformRedisJsonNullReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface JsonGetOptions {
   path?: RedisVariadicArgument;
diff --git a/packages/json/lib/commands/MERGE.ts b/packages/json/lib/commands/MERGE.ts
@@ -1,6 +1,6 @@
 import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { SimpleStringReply, Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
-import { RedisJSON, transformRedisJsonArgument } from './helpers';
+import { RedisJSON, transformRedisJsonArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/json/lib/commands/MGET.ts b/packages/json/lib/commands/MGET.ts
@@ -1,6 +1,6 @@
 import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { RedisArgument, UnwrapReply, ArrayReply, NullReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
-import { transformRedisJsonNullReply } from './helpers';
+import { transformRedisJsonNullReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/json/lib/commands/MSET.ts b/packages/json/lib/commands/MSET.ts
@@ -1,6 +1,6 @@
 import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
-import { RedisJSON, transformRedisJsonArgument } from './helpers';
+import { RedisJSON, transformRedisJsonArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface JsonMSetItem {
   key: RedisArgument;
diff --git a/packages/json/lib/commands/SET.ts b/packages/json/lib/commands/SET.ts
@@ -1,6 +1,6 @@
 import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { RedisArgument, SimpleStringReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
-import { RedisJSON, transformRedisJsonArgument } from './helpers';
+import { RedisJSON, transformRedisJsonArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface JsonSetOptions {
   condition?: 'NX' | 'XX';
diff --git a/packages/json/lib/commands/STRAPPEND.ts b/packages/json/lib/commands/STRAPPEND.ts
@@ -1,6 +1,6 @@
 import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { RedisArgument, Command, NullReply, NumberReply, ArrayReply } from '@redis/client/dist/lib/RESP/types';
-import { transformRedisJsonArgument } from './helpers';
+import { transformRedisJsonArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface JsonStrAppendOptions {
   path?: RedisArgument;
diff --git a/packages/json/lib/commands/helpers.ts b/packages/json/lib/commands/helpers.ts
diff --git a/packages/json/lib/commands/index.ts b/packages/json/lib/commands/index.ts
@@ -23,7 +23,9 @@ import STRLEN from './STRLEN';
 import TOGGLE from './TOGGLE';
 import TYPE from './TYPE';
 
-export * from './helpers';
+// Re-export helper types and functions from client package
+export type { RedisJSON } from '@redis/client/dist/lib/commands/generic-transformers';
+export { transformRedisJsonArgument, transformRedisJsonReply, transformRedisJsonNullReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   ARRAPPEND,
