From e129d109529f2c2090a1c0b573e4eb6cb848a042 Mon Sep 17 00:00:00 2001 From: Simon Prickett Date: Wed, 26 Oct 2022 20:29:20 +0100 Subject: [PATCH 1/3] Fixes typo Redis Search -> RediSearch (#2278) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9d48bdd6b2a..0f95142da7a 100644 --- 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`). From 72c0e7bf6702db64ecfde8c2acf226657197eea8 Mon Sep 17 00:00:00 2001 From: Simon Prickett Date: Wed, 26 Oct 2022 20:29:34 +0100 Subject: [PATCH 2/3] Fixed redis -> Redis in a couple places. (#2279) --- docs/clustering.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/clustering.md b/docs/clustering.md index b1b5b82021a..26acfa0a791 100644 --- 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 From 0abd950f03388ec5db7ee96edc74cb677e58cc38 Mon Sep 17 00:00:00 2001 From: Leibale Eidelman Date: Wed, 26 Oct 2022 15:32:19 -0400 Subject: [PATCH 3/3] fix tsbuild (#2307) * fix tsbuild * fix tsbuild * fix tsbuild --- packages/client/lib/commander.ts | 3 ++- packages/test-utils/lib/index.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/client/lib/commander.ts b/packages/client/lib/commander.ts index 661e53cb9b5..1407a80344c 100644 --- 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({ return Commander; } -export function transformCommandArguments( +export function transformCommandArguments( command: RedisCommand, args: Array ): { diff --git a/packages/test-utils/lib/index.ts b/packages/test-utils/lib/index.ts index 1e814c29746..3e33971fddb 100644 --- a/packages/test-utils/lib/index.ts +++ b/packages/test-utils/lib/index.ts @@ -1,6 +1,7 @@ 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'; @@ -21,7 +22,7 @@ interface ClientTestOptions< S extends RedisScripts > extends CommonTestOptions { serverArguments: Array; - clientOptions?: Partial>; + clientOptions?: Partial, 'socket'> & { socket: RedisSocketCommonOptions }>; disableClientSetup?: boolean; }