redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-04 15:02:09 +03:00
Code Activity

fix: fix various command import issues (#2944)

Browse Source 
* fix: fix various command import issues

there was some sort of a circular dependency
in <module>/lib/commands/index.ts for various modules

fixes #2937 fixes #2941

* remove redundant definition
This commit is contained in:
Nikolay Karadzhov
2025-05-07 16:10:35 +03:00
committed by GitHub
parent bc4b2101ee
commit 7b737821b2
42 changed files with 416 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/json/lib/commands/ARRAPPEND.ts
View File

@@ -1,5 +1,5 @@
import { CommandParser } from '@redis/client/dist/lib/client/parser';
import { RedisJSON, transformRedisJsonArgument } from '.';
import { RedisJSON, transformRedisJsonArgument } from './helpers';
import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
export default {

2
packages/json/lib/commands/ARRINDEX.ts
View File

@@ -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 '.';
import { RedisJSON, transformRedisJsonArgument } from './helpers';
export interface JsonArrIndexOptions {
range?: {

2
packages/json/lib/commands/ARRINSERT.ts
View File

@@ -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 '.';
import { RedisJSON, transformRedisJsonArgument } from './helpers';
export default {
IS_READ_ONLY: false,

2
packages/json/lib/commands/ARRPOP.ts
View File

@@ -1,7 +1,7 @@
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 '.';
import { transformRedisJsonNullReply } from './helpers';
export interface RedisArrPopOptions {
path: RedisArgument;

6
packages/json/lib/commands/GET.spec.ts
View File

@@ -34,5 +34,11 @@ describe('JSON.GET', () => {
await client.json.get('key'),
null
);
await client.json.set('noderedis:users:1', '$', { name: 'Alice', age: 32, })
const res = await client.json.get('noderedis:users:1');
assert.equal(typeof res, 'object')
assert.deepEqual(res, { name: 'Alice', age: 32, })
}, GLOBAL.SERVERS.OPEN);
});

12
packages/json/lib/commands/GET.ts
View File

@@ -1,7 +1,7 @@
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 '.';
import { transformRedisJsonNullReply } from './helpers';
export interface JsonGetOptions {
path?: RedisVariadicArgument;
@@ -9,12 +9,16 @@ export interface JsonGetOptions {
export default {
IS_READ_ONLY: false,
parseCommand(parser: CommandParser, key: RedisArgument, options?: JsonGetOptions) {
parseCommand(
parser: CommandParser,
key: RedisArgument,
options?: JsonGetOptions
) {
parser.push('JSON.GET');
parser.pushKey(key);
if (options?.path !== undefined) {
parser.pushVariadic(options.path)
parser.pushVariadic(options.path);
}
},
transformReply: transformRedisJsonNullReply
} as const satisfies Command;
} as const satisfies Command;

2
packages/json/lib/commands/MERGE.ts
View File

@@ -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 '.';
import { RedisJSON, transformRedisJsonArgument } from './helpers';
export default {
IS_READ_ONLY: false,

2
packages/json/lib/commands/MGET.ts
View File

@@ -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 '.';
import { transformRedisJsonNullReply } from './helpers';
export default {
IS_READ_ONLY: true,

2
packages/json/lib/commands/MSET.ts
View File

@@ -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 '.';
import { RedisJSON, transformRedisJsonArgument } from './helpers';
export interface JsonMSetItem {
key: RedisArgument;

2
packages/json/lib/commands/SET.ts
View File

@@ -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 '.';
import { RedisJSON, transformRedisJsonArgument } from './helpers';
export interface JsonSetOptions {
condition?: 'NX' | 'XX';

2
packages/json/lib/commands/STRAPPEND.ts
View File

@@ -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 '.';
import { transformRedisJsonArgument } from './helpers';
export interface JsonStrAppendOptions {
path?: RedisArgument;

22
packages/json/lib/commands/helpers.ts Normal file
View File

@@ -0,0 +1,22 @@
import { isNullReply } from "@redis/client/dist/lib/commands/generic-transformers";
import { BlobStringReply, NullReply, UnwrapReply } from "@redis/client/dist/lib/RESP/types";
export function transformRedisJsonNullReply(json: NullReply | BlobStringReply): NullReply | RedisJSON {
console.log('transformRedisJsonNullReply', json)
return isNullReply(json) ? json : transformRedisJsonReply(json);
}
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());
console.log('transformRedisJsonReply', json, res)
return res;
}

20
packages/json/lib/commands/index.ts
View File

@@ -1,4 +1,3 @@
import { BlobStringReply, NullReply, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
import ARRAPPEND from './ARRAPPEND';
import ARRINDEX from './ARRINDEX';
import ARRINSERT from './ARRINSERT';
@@ -23,7 +22,8 @@ import STRAPPEND from './STRAPPEND';
import STRLEN from './STRLEN';
import TOGGLE from './TOGGLE';
import TYPE from './TYPE';
import { isNullReply } from '@redis/client/dist/lib/commands/generic-transformers';
export * from './helpers';
export default {
ARRAPPEND,
@@ -82,19 +82,3 @@ export default {
type: TYPE
};
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 {
return JSON.parse((json as unknown as UnwrapReply<typeof json>).toString());
}
export function transformRedisJsonNullReply(json: NullReply | BlobStringReply): NullReply | RedisJSON {
return isNullReply(json) ? json : transformRedisJsonReply(json);
}