fix resp2 floats

Author: nkaradzhov

packages/client/lib/commands/GEORADIUSBYMEMBER_RO_WITH.spec.ts

@@ -34,10 +34,10 @@ describe('GEORADIUSBYMEMBER_RO WITH', () => {
 
     assert.equal(reply.length, 1);
     assert.equal(reply[0].member, 'member');
-    assert.equal(typeof reply[0].distance, 'string');
+    assert.equal(typeof reply[0].distance, 'number');
     assert.equal(typeof reply[0].hash, 'number');
-    assert.equal(typeof reply[0].coordinates?.longitude, 'string');
-    assert.equal(typeof reply[0].coordinates?.latitude, 'string');
+    assert.equal(typeof reply[0].coordinates?.longitude, 'number');
+    assert.equal(typeof reply[0].coordinates?.latitude, 'number');
   }, {
     client: GLOBAL.SERVERS.OPEN,
     cluster: GLOBAL.CLUSTERS.OPEN

packages/client/lib/commands/GEORADIUSBYMEMBER_WITH.spec.ts

@@ -34,10 +34,10 @@ describe('GEORADIUSBYMEMBER WITH', () => {
 
     assert.equal(reply.length, 1);
     assert.equal(reply[0].member, 'member');
-    assert.equal(typeof reply[0].distance, 'string');
+    assert.equal(typeof reply[0].distance, 'number');
     assert.equal(typeof reply[0].hash, 'number');
-    assert.equal(typeof reply[0].coordinates!.longitude, 'string');
-    assert.equal(typeof reply[0].coordinates!.latitude, 'string');
+    assert.equal(typeof reply[0].coordinates!.longitude, 'number');
+    assert.equal(typeof reply[0].coordinates!.latitude, 'number');
   }, {
     client: GLOBAL.SERVERS.OPEN,
     cluster: GLOBAL.CLUSTERS.OPEN

packages/client/lib/commands/GEORADIUS_RO_WITH.spec.ts

@@ -19,6 +19,23 @@ describe('GEORADIUS_RO WITH', () => {
     );
   });
 
+  it('transformReply should parse RESP2 floating-point strings', () => {
+    const reply = GEORADIUS_RO_WITH.transformReply([
+      ['member', '0.5', 1, ['1.23', '4.56']]
+    ] as any, [
+      GEO_REPLY_WITH.DISTANCE,
+      GEO_REPLY_WITH.HASH,
+      GEO_REPLY_WITH.COORDINATES
+    ]);
+
+    assert.equal(reply.length, 1);
+    assert.equal(reply[0].member, 'member');
+    assert.equal(reply[0].distance, 0.5);
+    assert.equal(reply[0].hash, 1);
+    assert.equal(reply[0].coordinates!.longitude, 1.23);
+    assert.equal(reply[0].coordinates!.latitude, 4.56);
+  });
+
   testUtils.testAll('geoRadiusRoWith', async client => {
     const [, reply] = await Promise.all([
       client.geoAdd('key', {
@@ -38,10 +55,10 @@ describe('GEORADIUS_RO WITH', () => {
 
     assert.equal(reply.length, 1);
     assert.equal(reply[0].member, 'member');
-    assert.equal(typeof reply[0].distance, 'string');
+    assert.equal(typeof reply[0].distance, 'number');
     assert.equal(typeof reply[0].hash, 'number');
-    assert.equal(typeof reply[0].coordinates!.longitude, 'string');
-    assert.equal(typeof reply[0].coordinates!.latitude, 'string');
+    assert.equal(typeof reply[0].coordinates!.longitude, 'number');
+    assert.equal(typeof reply[0].coordinates!.latitude, 'number');
   }, {
     client: GLOBAL.SERVERS.OPEN,
     cluster: GLOBAL.CLUSTERS.OPEN

packages/client/lib/commands/GEORADIUS_WITH.spec.ts

@@ -38,10 +38,10 @@ describe('GEORADIUS WITH', () => {
 
     assert.equal(reply.length, 1);
     assert.equal(reply[0].member, 'member');
-    assert.equal(typeof reply[0].distance, 'string');
+    assert.equal(typeof reply[0].distance, 'number');
     assert.equal(typeof reply[0].hash, 'number');
-    assert.equal(typeof reply[0].coordinates?.longitude, 'string');
-    assert.equal(typeof reply[0].coordinates?.latitude, 'string');
+    assert.equal(typeof reply[0].coordinates?.longitude, 'number');
+    assert.equal(typeof reply[0].coordinates?.latitude, 'number');
   }, {
     client: GLOBAL.SERVERS.OPEN,
     cluster: GLOBAL.CLUSTERS.OPEN

packages/client/lib/commands/GEOSEARCH_WITH.spec.ts

@@ -39,10 +39,10 @@ describe('GEOSEARCH WITH', () => {
 
     assert.equal(reply.length, 1);
     assert.equal(reply[0].member, 'member');
-    assert.equal(typeof reply[0].distance, 'string');
+    assert.equal(typeof reply[0].distance, 'number');
     assert.equal(typeof reply[0].hash, 'number');
-    assert.equal(typeof reply[0].coordinates!.longitude, 'string');
-    assert.equal(typeof reply[0].coordinates!.latitude, 'string');
+    assert.equal(typeof reply[0].coordinates!.longitude, 'number');
+    assert.equal(typeof reply[0].coordinates!.latitude, 'number');
   }, {
     client: GLOBAL.SERVERS.OPEN,
     cluster: GLOBAL.CLUSTERS.OPEN

packages/client/lib/commands/GEOSEARCH_WITH.ts

@@ -1,6 +1,7 @@
 import { CommandParser } from '../client/parser';
-import { RedisArgument, ArrayReply, TuplesReply, BlobStringReply, NumberReply, DoubleReply, UnwrapReply, Command } from '../RESP/types';
+import { RedisArgument, ArrayReply, TuplesReply, BlobStringReply, NumberReply, DoubleReply, UnwrapReply, Command, TypeMapping } from '../RESP/types';
 import GEOSEARCH, { GeoSearchBy, GeoSearchFrom, GeoSearchOptions } from './GEOSEARCH';
+import { transformDoubleReply } from './generic-transformers';
 
 export const GEO_REPLY_WITH = {
   DISTANCE: 'WITHDIST',
@@ -12,7 +13,7 @@ export type GeoReplyWith = typeof GEO_REPLY_WITH[keyof typeof GEO_REPLY_WITH];
 
 export interface GeoReplyWithMember {
   member: BlobStringReply;
-  distance?: BlobStringReply;
+  distance?: DoubleReply;
   hash?: NumberReply;
   coordinates?: {
     longitude: DoubleReply;
@@ -45,14 +46,23 @@ export default {
   },
   transformReply(
     reply: UnwrapReply<ArrayReply<TuplesReply<[BlobStringReply, ...Array<any>]>>>,
-    replyWith: Array<GeoReplyWith>
+    replyWith: Array<GeoReplyWith>,
+    typeMapping?: TypeMapping
   ) {
     const replyWithSet = new Set(replyWith);
     let index = 0;
     const distanceIndex = replyWithSet.has(GEO_REPLY_WITH.DISTANCE) && ++index,
       hashIndex = replyWithSet.has(GEO_REPLY_WITH.HASH) && ++index,
       coordinatesIndex = replyWithSet.has(GEO_REPLY_WITH.COORDINATES) && ++index;
-    
+
+    const parseDouble = (value: unknown) => {
+      return (
+        typeof value === 'number' ?
+          value as unknown as DoubleReply :
+          transformDoubleReply[2](value as BlobStringReply, undefined, typeMapping)
+      );
+    };
+
     return reply.map(raw => {
       const unwrapped = raw as unknown as UnwrapReply<typeof raw>;
 
@@ -61,18 +71,18 @@ export default {
       };
 
       if (distanceIndex) {
-        item.distance = unwrapped[distanceIndex];
+        item.distance = parseDouble(unwrapped[distanceIndex]);
       }
-  
+
       if (hashIndex) {
         item.hash = unwrapped[hashIndex];
       }
-  
+
       if (coordinatesIndex) {
         const [longitude, latitude] = unwrapped[coordinatesIndex];
         item.coordinates = {
-          longitude,
-          latitude
+          longitude: parseDouble(longitude),
+          latitude: parseDouble(latitude)
         };
       }