From 4d79db5637ca0887739f77929fdd21c4228e809c Mon Sep 17 00:00:00 2001
From: Vantroy <vimutti@outlook.com>
Date: Mon, 22 Aug 2022 18:51:36 +0700
Subject: [PATCH 1/4] zscore should be nullable

---
 bin/returnTypes.js             | 2 +-
 lib/utils/RedisCommander.ts    | 2 +-
 test/typing/commands.test-d.ts | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/returnTypes.js b/bin/returnTypes.js
index cdbe6147..346b6610 100644
--- a/bin/returnTypes.js
+++ b/bin/returnTypes.js
@@ -317,7 +317,7 @@ module.exports = {
   zrevrange: "string[]",
   zrevrangebyscore: "string[]",
   zrevrank: "number | null",
-  zscore: "string",
+  zscore: "string | null",
   zunion: "string[]",
   zmscore: "(string | null)[]",
   zunionstore: "number",
diff --git a/lib/utils/RedisCommander.ts b/lib/utils/RedisCommander.ts
index 681710b8..6e05d3d9 100644
--- a/lib/utils/RedisCommander.ts
+++ b/lib/utils/RedisCommander.ts
@@ -13854,7 +13854,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
   zscore(
     key: RedisKey,
     member: string | Buffer | number,
-    callback?: Callback<string>
+    callback?: Callback<string | null>
   ): Result<string, Context>;
   zscoreBuffer(
     key: RedisKey,
diff --git a/test/typing/commands.test-d.ts b/test/typing/commands.test-d.ts
index 4e5fcdb6..51991ad6 100644
--- a/test/typing/commands.test-d.ts
+++ b/test/typing/commands.test-d.ts
@@ -88,6 +88,9 @@ expectType<Promise<number>>(redis.zadd("key", "CH", 1, "member"));
 expectType<Promise<string | null>>(redis.zrandmember("key"));
 expectType<Promise<string[]>>(redis.zrandmember("key", 20));
 
+// ZSCORE
+expectType<Promise<string | null>>(redis.zscore("key", "member"));
+
 // GETRANGE
 expectType<Promise<Buffer>>(redis.getrangeBuffer("foo", 0, 1));
 

From 4d9787cf8dfc570db0ff79de848028cb37a11047 Mon Sep 17 00:00:00 2001
From: Vantroy <vimutti@outlook.com>
Date: Mon, 22 Aug 2022 18:53:46 +0700
Subject: [PATCH 2/4] fix invalid code

---
 lib/utils/RedisCommander.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/utils/RedisCommander.ts b/lib/utils/RedisCommander.ts
index 6e05d3d9..ce1c9d41 100644
--- a/lib/utils/RedisCommander.ts
+++ b/lib/utils/RedisCommander.ts
@@ -13854,8 +13854,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
   zscore(
     key: RedisKey,
     member: string | Buffer | number,
-    callback?: Callback<string | null>
-  ): Result<string, Context>;
+    callback?: Callback<string>
+  ): Result<string | null, Context>;
   zscoreBuffer(
     key: RedisKey,
     member: string | Buffer | number,

From 3fb36795cce40b2c16cc30464002ee2b23dc9e72 Mon Sep 17 00:00:00 2001
From: Vantroy <vimutti@outlook.com>
Date: Mon, 22 Aug 2022 18:54:55 +0700
Subject: [PATCH 3/4] callback also nullable

---
 lib/utils/RedisCommander.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/RedisCommander.ts b/lib/utils/RedisCommander.ts
index ce1c9d41..ac90f3b9 100644
--- a/lib/utils/RedisCommander.ts
+++ b/lib/utils/RedisCommander.ts
@@ -13854,7 +13854,7 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
   zscore(
     key: RedisKey,
     member: string | Buffer | number,
-    callback?: Callback<string>
+    callback?: Callback<string | null>
   ): Result<string | null, Context>;
   zscoreBuffer(
     key: RedisKey,

From d7ca741d256656c253b495fc00b27f9637e61143 Mon Sep 17 00:00:00 2001
From: Vantroy <vimutti@outlook.com>
Date: Mon, 22 Aug 2022 19:03:42 +0700
Subject: [PATCH 4/4] zscoreBuffer also nullable

---
 lib/utils/RedisCommander.ts    | 4 ++--
 test/typing/commands.test-d.ts | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/utils/RedisCommander.ts b/lib/utils/RedisCommander.ts
index ac90f3b9..49388d8e 100644
--- a/lib/utils/RedisCommander.ts
+++ b/lib/utils/RedisCommander.ts
@@ -13859,8 +13859,8 @@ interface RedisCommander<Context extends ClientContext = { type: "default" }> {
   zscoreBuffer(
     key: RedisKey,
     member: string | Buffer | number,
-    callback?: Callback<Buffer>
-  ): Result<Buffer, Context>;
+    callback?: Callback<Buffer | null>
+  ): Result<Buffer | null, Context>;
 
   /**
    * Add multiple sorted sets
diff --git a/test/typing/commands.test-d.ts b/test/typing/commands.test-d.ts
index 51991ad6..ad4a5e96 100644
--- a/test/typing/commands.test-d.ts
+++ b/test/typing/commands.test-d.ts
@@ -90,6 +90,7 @@ expectType<Promise<string[]>>(redis.zrandmember("key", 20));
 
 // ZSCORE
 expectType<Promise<string | null>>(redis.zscore("key", "member"));
+expectType<Promise<Buffer | null>>(redis.zscoreBuffer("key", "member"));
 
 // GETRANGE
 expectType<Promise<Buffer>>(redis.getrangeBuffer("foo", 0, 1));