From 8160fa7d6555bd6e012e7c33ae23ea09d2b676d2 Mon Sep 17 00:00:00 2001
From: Leibale Eidelman <leibale1998@gmail.com>
Date: Mon, 31 Jan 2022 08:35:24 -0500
Subject: [PATCH] fix #1865 - add defaults to RedisModules and RedisScripts
 (#1885)

---
 packages/client/lib/client/index.ts  | 15 ++++++++++-----
 packages/client/lib/cluster/index.ts | 13 +++++++++----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/client/lib/client/index.ts b/packages/client/lib/client/index.ts
index 51fbde91c1..2ce93773e9 100644
--- a/packages/client/lib/client/index.ts
+++ b/packages/client/lib/client/index.ts
@@ -15,7 +15,10 @@ import { ClientClosedError, DisconnectsClientError, AuthError } from '../errors'
 import { URL } from 'url';
 import { TcpSocketConnectOpts } from 'net';
 
-export interface RedisClientOptions<M extends RedisModules, S extends RedisScripts> extends RedisPlugins<M, S> {
+export interface RedisClientOptions<
+    M extends RedisModules = Record<string, never>,
+    S extends RedisScripts = Record<string, never>
+> extends RedisPlugins<M, S> {
     url?: string;
     socket?: RedisSocketOptions;
     username?: string;
@@ -73,8 +76,10 @@ export type WithScripts<S extends RedisScripts> = {
     [P in keyof S as ExcludeMappedString<P>]: RedisClientCommandSignature<S[P]>;
 };
 
-export type RedisClientType<M extends RedisModules, S extends RedisScripts> =
-    RedisClient<M, S> & WithCommands & WithModules<M> & WithScripts<S>;
+export type RedisClientType<
+    M extends RedisModules = Record<string, never>,
+    S extends RedisScripts = Record<string, never>
+> = RedisClient<M, S> & WithCommands & WithModules<M> & WithScripts<S>;
 
 export type InstantiableRedisClient<M extends RedisModules, S extends RedisScripts> =
     new (options?: RedisClientOptions<M, S>) => RedisClientType<M, S>;
@@ -112,10 +117,10 @@ export default class RedisClient<M extends RedisModules, S extends RedisScripts>
         return new (RedisClient.extend(options))(options);
     }
 
-    static parseURL(url: string): RedisClientOptions<Record<string, never>, Record<string, never>> {
+    static parseURL(url: string): RedisClientOptions {
         // https://www.iana.org/assignments/uri-schemes/prov/redis
         const { hostname, port, protocol, username, password, pathname } = new URL(url),
-            parsed: RedisClientOptions<Record<string, never>, Record<string, never>> = {
+            parsed: RedisClientOptions = {
                 socket: {
                     host: hostname
                 }
diff --git a/packages/client/lib/cluster/index.ts b/packages/client/lib/cluster/index.ts
index 10288158e4..4f2f3f98d3 100644
--- a/packages/client/lib/cluster/index.ts
+++ b/packages/client/lib/cluster/index.ts
@@ -7,9 +7,12 @@ import { EventEmitter } from 'events';
 import RedisClusterMultiCommand, { RedisClusterMultiCommandType } from './multi-command';
 import { RedisMultiQueuedCommand } from '../multi-command';
 
-export type RedisClusterClientOptions = Omit<RedisClientOptions<Record<string, never>, Record<string, never>>, 'modules' | 'scripts'>;
+export type RedisClusterClientOptions = Omit<RedisClientOptions, 'modules' | 'scripts'>;
 
-export interface RedisClusterOptions<M extends RedisModules, S extends RedisScripts> extends RedisPlugins<M, S> {
+export interface RedisClusterOptions<
+    M extends RedisModules = Record<string, never>,
+    S extends RedisScripts = Record<string, never>
+> extends RedisPlugins<M, S> {
     rootNodes: Array<RedisClusterClientOptions>;
     defaults?: Partial<RedisClusterClientOptions>;
     useReplicas?: boolean;
@@ -20,8 +23,10 @@ type WithCommands = {
     [P in keyof typeof COMMANDS]: RedisClientCommandSignature<(typeof COMMANDS)[P]>;
 };
 
-export type RedisClusterType<M extends RedisModules, S extends RedisScripts> =
-    RedisCluster<M, S> & WithCommands & WithModules<M> & WithScripts<S>;
+export type RedisClusterType<
+    M extends RedisModules = Record<string, never>,
+    S extends RedisScripts = Record<string, never>
+> = RedisCluster<M, S> & WithCommands & WithModules<M> & WithScripts<S>;
 
 export default class RedisCluster<M extends RedisModules, S extends RedisScripts> extends EventEmitter {
     static extractFirstKey(command: RedisCommand, originalArgs: Array<unknown>, redisArgs: RedisCommandArguments): RedisCommandArgument | undefined {