fix bug + tests

zpopmax (and related) get messed up a by a vsc getter insertion.

memory_stats was teting for strings, but inherent DoubleReply are now returned as numbers by default

Author: sjpotter

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

@@ -24,18 +24,18 @@ describe('MEMORY STATS', () => {
     assert.equal(typeof memoryStats['keys.count'], 'number');
     assert.equal(typeof memoryStats['keys.bytes-per-key'], 'number');
     assert.equal(typeof memoryStats['dataset.bytes'], 'number');
-    assert.equal(typeof memoryStats['dataset.percentage'], 'string');
-    assert.equal(typeof memoryStats['peak.percentage'], 'string');
+    assert.equal(typeof memoryStats['dataset.percentage'], 'number');
+    assert.equal(typeof memoryStats['peak.percentage'], 'number');
     assert.equal(typeof memoryStats['allocator.allocated'], 'number');
     assert.equal(typeof memoryStats['allocator.active'], 'number');
     assert.equal(typeof memoryStats['allocator.resident'], 'number');
-    assert.equal(typeof memoryStats['allocator-fragmentation.ratio'], 'string');
+    assert.equal(typeof memoryStats['allocator-fragmentation.ratio'], 'number', 'allocator-fragmentation.ratio');
     assert.equal(typeof memoryStats['allocator-fragmentation.bytes'], 'number');
-    assert.equal(typeof memoryStats['allocator-rss.ratio'], 'string');
+    assert.equal(typeof memoryStats['allocator-rss.ratio'], 'number', 'allocator-rss.ratio');
     assert.equal(typeof memoryStats['allocator-rss.bytes'], 'number');
-    assert.equal(typeof memoryStats['rss-overhead.ratio'], 'string');
+    assert.equal(typeof memoryStats['rss-overhead.ratio'], 'number', 'rss-overhead.ratio');
     assert.equal(typeof memoryStats['rss-overhead.bytes'], 'number');
-    assert.equal(typeof memoryStats['fragmentation'], 'string');
+    assert.equal(typeof memoryStats['fragmentation'], 'number', 'fragmentation');
     assert.equal(typeof memoryStats['fragmentation.bytes'], 'number');
 
     if (testUtils.isVersionGreaterThan([7])) {

packages/client/lib/commands/MEMORY_STATS.ts

@@ -14,6 +14,7 @@ export type MemoryStatsReply = TuplesToMapReply<[
   [BlobStringReply<'lua.caches'>, NumberReply],
   /** added in 7.0 */
   [BlobStringReply<'functions.caches'>, NumberReply],
+  // FIXME: 'db.0', and perhaps others' is here and is a map that should be handled?
   [BlobStringReply<'overhead.total'>, NumberReply],
   [BlobStringReply<'keys.count'>, NumberReply],
   [BlobStringReply<'keys.bytes-per-key'>, NumberReply],
@@ -45,13 +46,13 @@ export default {
 
       let i = 0;
       while (i < rawReply.length) {
-        switch(i) {
-          case 28:
-          case 30:
-          case 38:
-          case 42:
-          case 46:
-          case 50:
+        switch(rawReply[i].toString()) {
+          case 'dataset.percentage':
+          case 'peak.percentage':
+          case 'allocator-fragmentation.ratio':
+          case 'allocator-rss.ratio':
+          case 'rss-overhead.ratio':
+          case 'fragmentation':
             reply[rawReply[i++] as any] = transformDoubleReply[2](rawReply[i++] as unknown as BlobStringReply, preserve, typeMapping);
             break;
           default:
@@ -60,7 +61,7 @@ export default {
 
       }
 
-      return reply as MemoryStatsReply['DEFAULT'];
+      return reply as MemoryStatsReply;
     },
     3: undefined as unknown as () => MemoryStatsReply
   }

packages/client/lib/commands/ZPOPMAX.ts

@@ -13,13 +13,7 @@ export default {
 
       return {
         value: reply[0],
-        _score: transformDoubleReply[2](reply[1], preserve, typeMapping),
-        get score() {
-          return this._score;
-        },
-        set score(value) {
-          this._score = value;
-        },
+        score: transformDoubleReply[2](reply[1], preserve, typeMapping),
       };
     },
     3: (reply: UnwrapReply<TuplesReply<[] | [BlobStringReply, DoubleReply]>>) => {

packages/client/lib/commands/generic-transformers.ts

@@ -51,7 +51,7 @@ export const transformDoubleReply = {
         return reply as unknown as DoubleReply;
       }
       default: {
-        let ret: Number;
+        let ret: number;
 
         switch (reply.toString()) {
           case 'inf':