Merge branch 'master' of github.com:redis/node-redis into 2189-graph

redis · Oct 26, 2022 · 035a01e · 035a01e
2 parents b0f43c5 + 0abd950
commit 035a01e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ node-redis is a modern, high performance [Redis](https://redis.io) client for No
 | [@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                                          |
 | [@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                                          |
 | [@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                                                 |
-| [@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                                    |
+| [@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                                    |
 | [@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 |
 
 > :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`).

diff --git a/docs/clustering.md b/docs/clustering.md
@@ -43,7 +43,7 @@ const value = await cluster.get('key');
 
 ## Node Address Map
 
-A node address map is required when a redis cluster is configured with addresses that are inaccessible by the machine running the redis client.
+A node address map is required when a Redis cluster is configured with addresses that are inaccessible by the machine running the Redis client.
 This is a mapping of addresses and ports, with the values being the accessible address/port combination. Example:
 
 ```javascript

diff --git a/packages/client/lib/commander.ts b/packages/client/lib/commander.ts
@@ -1,4 +1,5 @@
 
+import { ClientCommandOptions } from './client';
 import { CommandOptions, isCommandOptions } from './command-options';
 import { RedisCommand, RedisCommandArgument, RedisCommandArguments, RedisCommandReply, RedisFunction, RedisFunctions, RedisModules, RedisScript, RedisScripts } from './commands';
 
@@ -103,7 +104,7 @@ function attachWithNamespaces<C extends RedisCommand>({
     return Commander;
 }
 
-export function transformCommandArguments<T>(
+export function transformCommandArguments<T = ClientCommandOptions>(
     command: RedisCommand,
     args: Array<unknown>
 ): {

diff --git a/packages/test-utils/lib/index.ts b/packages/test-utils/lib/index.ts
@@ -1,7 +1,7 @@
-import { RedisModules, RedisFunctions, RedisScripts } from '@redis/client/dist/lib/commands';
-import RedisClient, { RedisClientOptions, RedisClientType } from '@redis/client/dist/lib/client';
-import RedisCluster, { RedisClusterOptions, RedisClusterType } from '@redis/client/dist/lib/cluster';
-import { RedisSocketCommonOptions } from '@redis/client/dist/lib/client/socket';
+import { RedisModules, RedisFunctions, RedisScripts } from '@redis/client/lib/commands';
+import RedisClient, { RedisClientOptions, RedisClientType } from '@redis/client/lib/client';
+import RedisCluster, { RedisClusterOptions, RedisClusterType } from '@redis/client/lib/cluster';
+import { RedisSocketCommonOptions } from '@redis/client/lib/client/socket';
 import { RedisServerDockerConfig, spawnRedisServer, spawnRedisCluster } from './dockers';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';