From fde8fb1a6fc1d75bb0ccefc92597620ae3a33be0 Mon Sep 17 00:00:00 2001 From: Max Gruenfelder Date: Tue, 2 Jul 2024 13:23:32 +0200 Subject: [PATCH 1/3] shallow copy of this.#options.defaults.socket --- packages/client/lib/cluster/cluster-slots.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/lib/cluster/cluster-slots.ts b/packages/client/lib/cluster/cluster-slots.ts index 489ded4854f..482aac2188c 100644 --- a/packages/client/lib/cluster/cluster-slots.ts +++ b/packages/client/lib/cluster/cluster-slots.ts @@ -272,7 +272,7 @@ export default class RedisClusterSlots< socket = options?.socket ? { ...this.#options.defaults.socket, ...options.socket - } : this.#options.defaults.socket; + } : { ...this.#options.defaults.socket}; } else { socket = options?.socket; } From 44530b643d58fc065fb71f64edf8e55d8c6884e9 Mon Sep 17 00:00:00 2001 From: Max Gruenfelder Date: Tue, 2 Jul 2024 14:25:32 +0200 Subject: [PATCH 2/3] shallow copy of this.#options.defaults.socket --- packages/client/lib/cluster/cluster-slots.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/lib/cluster/cluster-slots.ts b/packages/client/lib/cluster/cluster-slots.ts index 482aac2188c..d097220c3e2 100644 --- a/packages/client/lib/cluster/cluster-slots.ts +++ b/packages/client/lib/cluster/cluster-slots.ts @@ -272,7 +272,7 @@ export default class RedisClusterSlots< socket = options?.socket ? { ...this.#options.defaults.socket, ...options.socket - } : { ...this.#options.defaults.socket}; + } : { ...this.#options.defaults.socket }; } else { socket = options?.socket; } From 8fe047e166ae58fe2a0b795bfd93da8555e8c9a4 Mon Sep 17 00:00:00 2001 From: Leibale Eidelman Date: Tue, 2 Jul 2024 11:49:20 -0400 Subject: [PATCH 3/3] nit --- packages/client/lib/cluster/cluster-slots.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/lib/cluster/cluster-slots.ts b/packages/client/lib/cluster/cluster-slots.ts index d097220c3e2..45c96a80b50 100644 --- a/packages/client/lib/cluster/cluster-slots.ts +++ b/packages/client/lib/cluster/cluster-slots.ts @@ -269,10 +269,10 @@ export default class RedisClusterSlots< if (this.#options.defaults) { let socket; if (this.#options.defaults.socket) { - socket = options?.socket ? { + socket = { ...this.#options.defaults.socket, - ...options.socket - } : { ...this.#options.defaults.socket }; + ...options?.socket + }; } else { socket = options?.socket; }