fix #1802

Author: leibale

packages/json/lib/commands/ARRPOP.spec.ts

@@ -26,12 +26,32 @@ describe('ARRPOP', () => {
         });
     });
 
-    testUtils.testWithClient('client.json.arrPop', async client => {
-        await client.json.set('key', '$', []);
-
-        assert.deepEqual(
-            await client.json.arrPop('key', '$'),
-            [null]
-        );
-    }, GLOBAL.SERVERS.OPEN);
+    describe('client.json.arrPop', () => {
+        testUtils.testWithClient('null', async client => {
+            await client.json.set('key', '.', []);
+
+            assert.equal(
+                await client.json.arrPop('key', '.'),
+                null
+            );
+        }, GLOBAL.SERVERS.OPEN);
+
+        testUtils.testWithClient('with value', async client => {
+            await client.json.set('key', '.', ['value']);
+
+            assert.equal(
+                await client.json.arrPop('key', '.'),
+                'value'
+            );
+        }, GLOBAL.SERVERS.OPEN);
+
+        testUtils.testWithClient('array', async client => {
+            await client.json.set('key', '$', ['value']);
+
+            assert.deepEqual(
+                await client.json.arrPop('key', '$'),
+                ['value']
+            );
+        }, GLOBAL.SERVERS.OPEN);
+    });
 });

packages/json/lib/commands/ARRPOP.ts

@@ -1,3 +1,5 @@
+import { RedisJSON, transformRedisJsonNullReply } from '.';
+
 export const FIRST_KEY_INDEX = 1;
 
 export function transformArguments(key: string, path?: string, index?: number): Array<string> {
@@ -14,4 +16,12 @@ export function transformArguments(key: string, path?: string, index?: number):
     return args;
 }
 
-export { transformRedisJsonNullArrayNullReply as transformReply } from '.';
+export function transformReply(reply: null | string | Array<null | string>): null | RedisJSON | Array<RedisJSON> {
+    if (reply === null) return null;
+
+    if (Array.isArray(reply)) {
+        return reply.map(transformRedisJsonNullReply);
+    }
+
+    return transformRedisJsonNullReply(reply);
+}

packages/json/lib/commands/index.ts

@@ -79,22 +79,12 @@ export function transformRedisJsonReply(json: string): RedisJSON {
     return JSON.parse(json);
 }
 
-export function transformRedisJsonArrayReply(jsons: Array<string>): Array<RedisJSON> {
-    return jsons.map(transformRedisJsonReply)
-}
-
 export function transformRedisJsonNullReply(json: string | null): RedisJSON | null {
     if (json === null) return null;
 
     return transformRedisJsonReply(json);
 }
 
-export function transformRedisJsonNullArrayNullReply(jsons: Array<string | null> | null): Array<RedisJSON | null> | null {
-    if (jsons === null) return null;
-
-    return jsons.map(transformRedisJsonNullReply);
-}
-
 export function transformNumbersReply(reply: string): number | Array<number> {
     return JSON.parse(reply);
 }