upstash · chronark · Oct 10, 2023 · Oct 10, 2023 · Oct 10, 2023 · Oct 10, 2023
diff --git a/pkg/commands/xadd.test.ts b/pkg/commands/xadd.test.ts
@@ -1,4 +1,7 @@
-import { assert } from "https://deno.land/[email protected]/testing/asserts.ts";
+import {
+  assert,
+  assertEquals,
+} from "https://deno.land/[email protected]/testing/asserts.ts";
 import { keygen, newHttpClient, randomID } from "../test-utils.ts";
 
 import { afterAll } from "https://deno.land/[email protected]/testing/bdd.ts";
@@ -120,6 +123,6 @@ Deno.test("with threshold", async (t) => {
     ]).exec(client);
 
     const xrangeRes = await new XRangeCommand([key, "-", "+"]).exec(client);
-    assert(Object.keys(xrangeRes).length === 1);
+    assertEquals(Object.keys(xrangeRes).length, 2);
   });
 });
diff --git a/pkg/commands/xrange.test.ts b/pkg/commands/xrange.test.ts
@@ -50,3 +50,26 @@ Deno.test("limit", async (t) => {
     });
   });
 });
+
+Deno.test("many fields", async (t) => {
+  await t.step("returns all fields", async () => {
+    const key = newKey();
+
+    const fields: Record<string, string> = {};
+
+    for (let i = 1; i <= 10; i++) {
+      const field = randomID();
+      const value = randomID();
+      fields[field] = value;
+      const id = await new XAddCommand([
+        key,
+        "*",
+        fields,
+      ]).exec(client);
+
+      const res = await new XRangeCommand([key, "-", "+"]).exec(client);
+      assertEquals(Object.keys(res).length, i);
+      assertEquals(res[id], fields);
+    }
+  });
+});
diff --git a/pkg/commands/xrange.ts b/pkg/commands/xrange.ts
@@ -1,27 +1,26 @@
 import { Command, CommandOptions } from "./command.ts";
 
 function deserialize<TData extends Record<string, Record<string, unknown>>>(
-  result: (string | string[])[],
+  result: [string, string[]][],
 ): TData {
-  if (result.length === 0) {
-    return {} as TData;
-  }
   const obj: Record<string, Record<string, unknown>> = {};
-  while (result.length >= 2) {
-    const streamId = result.shift() as string;
-    const entries = result.shift()!;
+  for (const e of result) {
+    while (e.length >= 2) {
+      const streamId = e.shift() as string;
+      const entries = e.shift()!;
 
-    if (!(streamId in obj)) {
-      obj[streamId] = {};
-    }
-    while (entries.length >= 2) {
-      const field = (entries as string[]).shift()! as string;
-      const value = (entries as string[]).shift()! as string;
+      if (!(streamId in obj)) {
+        obj[streamId] = {};
+      }
+      while (entries.length >= 2) {
+        const field = (entries as string[]).shift()! as string;
+        const value = (entries as string[]).shift()! as string;
 
-      try {
-        obj[streamId][field] = JSON.parse(value);
-      } catch {
-        obj[streamId][field] = value;
+        try {
+          obj[streamId][field] = JSON.parse(value);
+        } catch {
+          obj[streamId][field] = value;
+        }
       }
     }
   }
@@ -48,7 +47,7 @@ export class XRangeCommand<
       command.push("COUNT", count);
     }
     super(command, {
-      deserialize: (result) => deserialize<any>(result[0] as any),
+      deserialize: (result) => deserialize<any>(result as any),
       ...opts,
     });
   }