Skip to content

Commit 035a01e

Browse files
committed
Merge branch 'master' of github.com:redis/node-redis into 2189-graph
2 parents b0f43c5 + 0abd950 commit 035a01e

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ node-redis is a modern, high performance [Redis](https://redis.io) client for No
2222
| [@redis/bloom](./packages/bloom) | [![Downloads](https://img.shields.io/npm/dm/@redis/bloom.svg)](https://www.npmjs.com/package/@redis/bloom) [![Version](https://img.shields.io/npm/v/@redis/bloom.svg)](https://www.npmjs.com/package/@redis/bloom) [![Docs](https://img.shields.io/badge/-documentation-dc382c)](https://redis.js.org/documentation/bloom/) [Redis Bloom](https://oss.redis.com/redisbloom/) commands |
2323
| [@redis/graph](./packages/graph) | [![Downloads](https://img.shields.io/npm/dm/@redis/graph.svg)](https://www.npmjs.com/package/@redis/graph) [![Version](https://img.shields.io/npm/v/@redis/graph.svg)](https://www.npmjs.com/package/@redis/graph) [![Docs](https://img.shields.io/badge/-documentation-dc382c)](https://redis.js.org/documentation/graph/) [Redis Graph](https://oss.redis.com/redisgraph/) commands |
2424
| [@redis/json](./packages/json) | [![Downloads](https://img.shields.io/npm/dm/@redis/json.svg)](https://www.npmjs.com/package/@redis/json) [![Version](https://img.shields.io/npm/v/@redis/json.svg)](https://www.npmjs.com/package/@redis/json) [![Docs](https://img.shields.io/badge/-documentation-dc382c)](https://redis.js.org/documentation/json/) [Redis JSON](https://oss.redis.com/redisjson/) commands |
25-
| [@redis/search](./packages/search) | [![Downloads](https://img.shields.io/npm/dm/@redis/search.svg)](https://www.npmjs.com/package/@redis/search) [![Version](https://img.shields.io/npm/v/@redis/search.svg)](https://www.npmjs.com/package/@redis/search) [![Docs](https://img.shields.io/badge/-documentation-dc382c)](https://redis.js.org/documentation/search/) [Redis Search](https://oss.redis.com/redisearch/) commands |
25+
| [@redis/search](./packages/search) | [![Downloads](https://img.shields.io/npm/dm/@redis/search.svg)](https://www.npmjs.com/package/@redis/search) [![Version](https://img.shields.io/npm/v/@redis/search.svg)](https://www.npmjs.com/package/@redis/search) [![Docs](https://img.shields.io/badge/-documentation-dc382c)](https://redis.js.org/documentation/search/) [RediSearch](https://oss.redis.com/redisearch/) commands |
2626
| [@redis/time-series](./packages/time-series) | [![Downloads](https://img.shields.io/npm/dm/@redis/time-series.svg)](https://www.npmjs.com/package/@redis/time-series) [![Version](https://img.shields.io/npm/v/@redis/time-series.svg)](https://www.npmjs.com/package/@redis/time-series) [![Docs](https://img.shields.io/badge/-documentation-dc382c)](https://redis.js.org/documentation/time-series/) [Redis Time-Series](https://oss.redis.com/redistimeseries/) commands |
2727

2828
> :warning: In version 4.1.0 we moved our subpackages from `@node-redis` to `@redis`. If you're just using `npm install redis`, you don't need to do anything—it'll upgrade automatically. If you're using the subpackages directly, you'll need to point to the new scope (e.g. `@redis/client` instead of `@node-redis/client`).

docs/clustering.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const value = await cluster.get('key');
4343

4444
## Node Address Map
4545

46-
A node address map is required when a redis cluster is configured with addresses that are inaccessible by the machine running the redis client.
46+
A node address map is required when a Redis cluster is configured with addresses that are inaccessible by the machine running the Redis client.
4747
This is a mapping of addresses and ports, with the values being the accessible address/port combination. Example:
4848

4949
```javascript

packages/client/lib/commander.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
import { ClientCommandOptions } from './client';
23
import { CommandOptions, isCommandOptions } from './command-options';
34
import { RedisCommand, RedisCommandArgument, RedisCommandArguments, RedisCommandReply, RedisFunction, RedisFunctions, RedisModules, RedisScript, RedisScripts } from './commands';
45

@@ -103,7 +104,7 @@ function attachWithNamespaces<C extends RedisCommand>({
103104
return Commander;
104105
}
105106

106-
export function transformCommandArguments<T>(
107+
export function transformCommandArguments<T = ClientCommandOptions>(
107108
command: RedisCommand,
108109
args: Array<unknown>
109110
): {

packages/test-utils/lib/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { RedisModules, RedisFunctions, RedisScripts } from '@redis/client/dist/lib/commands';
2-
import RedisClient, { RedisClientOptions, RedisClientType } from '@redis/client/dist/lib/client';
3-
import RedisCluster, { RedisClusterOptions, RedisClusterType } from '@redis/client/dist/lib/cluster';
4-
import { RedisSocketCommonOptions } from '@redis/client/dist/lib/client/socket';
1+
import { RedisModules, RedisFunctions, RedisScripts } from '@redis/client/lib/commands';
2+
import RedisClient, { RedisClientOptions, RedisClientType } from '@redis/client/lib/client';
3+
import RedisCluster, { RedisClusterOptions, RedisClusterType } from '@redis/client/lib/cluster';
4+
import { RedisSocketCommonOptions } from '@redis/client/lib/client/socket';
55
import { RedisServerDockerConfig, spawnRedisServer, spawnRedisCluster } from './dockers';
66
import yargs from 'yargs';
77
import { hideBin } from 'yargs/helpers';

0 commit comments

Comments
 (0)