@upstash/redis 1.0.0-alpha.2 → 1.0.0-alpha.3

package/pkg/commands/zincrby.test.ts

@@ -1,20 +0,0 @@
-import { keygen, newHttpClient } from "../test-utils"
-import { it, expect, afterAll } from "@jest/globals"
-import { ZIncrByComand } from "./zincrby"
-import { ZAddCommand } from "./zadd"
-import { randomUUID } from "crypto"
-
-const client = newHttpClient()
-
-const { newKey, cleanup } = keygen()
-afterAll(cleanup)
-
-it("increments and existing value", async () => {
-  const key = newKey()
-  const score = 1
-  const member = randomUUID()
-  await new ZAddCommand(key, { score, member }).exec(client)
-  const res = await new ZIncrByComand(key, 2, member).exec(client)
-
-  expect(res).toEqual(3)
-})

package/pkg/commands/zincrby.ts

@@ -1,9 +0,0 @@
-import { Command } from "../command"
-/**
- * @see https://redis.io/commands/zincrby
- */
-export class ZIncrByComand<TData> extends Command<number, number> {
-  constructor(key: string, increment: number, member: TData) {
-    super(["zincrby", key, increment, member])
-  }
-}

package/pkg/commands/zinterstore.test.ts

@@ -1,239 +0,0 @@
-import { keygen, newHttpClient } from "../test-utils"
-import { randomUUID } from "crypto"
-import { describe, it, expect, afterAll } from "@jest/globals"
-import { ZInterStoreCommand } from "./zinterstore"
-import { ZAddCommand } from "./zadd"
-
-const client = newHttpClient()
-
-const { newKey, cleanup } = keygen()
-afterAll(cleanup)
-
-describe("command format", () => {
-  describe("without options", () => {
-    it("builds the correct command", () => {
-      expect(new ZInterStoreCommand("destination", 1, "key").command).toEqual([
-        "zinterstore",
-        "destination",
-        "1",
-        "key",
-      ])
-    })
-  })
-  describe("with multiple keys", () => {
-    it("builds the correct command", () => {
-      expect(new ZInterStoreCommand("destination", 2, ["key1", "key2"]).command).toEqual([
-        "zinterstore",
-        "destination",
-        "2",
-        "key1",
-        "key2",
-      ])
-    })
-  })
-  describe("with single weight", () => {
-    it("builds the correct command", () => {
-      expect(new ZInterStoreCommand("destination", 1, "key", { weight: 4 }).command).toEqual([
-        "zinterstore",
-        "destination",
-        "1",
-        "key",
-        "weights",
-        "4",
-      ])
-    })
-  })
-  describe("with multiple weights", () => {
-    it("builds the correct command", () => {
-      expect(
-        new ZInterStoreCommand("destination", 2, ["key1", "key2"], { weights: [2, 3] }).command,
-      ).toEqual(["zinterstore", "destination", "2", "key1", "key2", "weights", "2", "3"])
-    })
-    describe("with aggregate", () => {
-      describe("sum", () => {
-        it("builds the correct command", () => {
-          expect(
-            new ZInterStoreCommand("destination", 1, "key", { aggregate: "sum" }).command,
-          ).toEqual(["zinterstore", "destination", "1", "key", "aggregate", "sum"])
-        })
-      })
-      describe("min", () => {
-        it("builds the correct command", () => {
-          expect(
-            new ZInterStoreCommand("destination", 1, "key", { aggregate: "min" }).command,
-          ).toEqual(["zinterstore", "destination", "1", "key", "aggregate", "min"])
-        })
-      })
-      describe("max", () => {
-        it("builds the correct command", () => {
-          expect(
-            new ZInterStoreCommand("destination", 1, "key", { aggregate: "max" }).command,
-          ).toEqual(["zinterstore", "destination", "1", "key", "aggregate", "max"])
-        })
-      })
-    })
-    describe("complex", () => {
-      it("builds the correct command", () => {
-        expect(
-          new ZInterStoreCommand("destination", 2, ["key1", "key2"], {
-            weights: [4, 2],
-            aggregate: "max",
-          }).command,
-        ).toEqual([
-          "zinterstore",
-          "destination",
-          "2",
-          "key1",
-          "key2",
-          "weights",
-          "4",
-          "2",
-          "aggregate",
-          "max",
-        ])
-      })
-    })
-  })
-})
-
-describe("without options", () => {
-  it("returns the number of elements in the new set ", async () => {
-    const destination = newKey()
-    const key1 = newKey()
-    const key2 = newKey()
-    const score1 = 1
-    const member1 = randomUUID()
-    const score2 = 2
-    const member2 = randomUUID()
-
-    await new ZAddCommand(key1, { score: score1, member: member1 }).exec(client)
-    await new ZAddCommand(
-      key2,
-      { score: score1, member: member1 },
-      { score: score2, member: member2 },
-    ).exec(client)
-
-    const res = await new ZInterStoreCommand(destination, 2, [key1, key2]).exec(client)
-    expect(res).toBe(1)
-  })
-})
-
-describe("with weights", () => {
-  describe("single weight", () => {
-    it("returns the number of elements in the new set ", async () => {
-      const destination = newKey()
-      const key1 = newKey()
-      const key2 = newKey()
-      const score1 = 1
-      const member1 = randomUUID()
-      const score2 = 2
-      const member2 = randomUUID()
-
-      await new ZAddCommand(key1, { score: score1, member: member1 }).exec(client)
-      await new ZAddCommand(
-        key2,
-        { score: score1, member: member1 },
-        { score: score2, member: member2 },
-      ).exec(client)
-
-      const res = await new ZInterStoreCommand(destination, 2, [key1, key2], {
-        weights: [2, 3],
-      }).exec(client)
-      expect(res).toBe(1)
-    })
-  })
-  describe("multiple weight", () => {
-    it("returns the number of elements in the new set ", async () => {
-      const destination = newKey()
-      const key1 = newKey()
-      const key2 = newKey()
-      const score1 = 1
-      const member1 = randomUUID()
-      const score2 = 2
-      const member2 = randomUUID()
-
-      await new ZAddCommand(key1, { score: score1, member: member1 }).exec(client)
-      await new ZAddCommand(
-        key2,
-        { score: score1, member: member1 },
-        { score: score2, member: member2 },
-      ).exec(client)
-
-      const res = await new ZInterStoreCommand(destination, 2, [key1, key2], {
-        weights: [1, 2],
-      }).exec(client)
-      expect(res).toBe(1)
-    })
-  })
-})
-describe("aggregate", () => {
-  describe("sum", () => {
-    it("returns the number of elements in the new set ", async () => {
-      const destination = newKey()
-      const key1 = newKey()
-      const key2 = newKey()
-      const score1 = 1
-      const member1 = randomUUID()
-      const score2 = 2
-      const member2 = randomUUID()
-
-      await new ZAddCommand(key1, { score: score1, member: member1 }).exec(client)
-      await new ZAddCommand(
-        key2,
-        { score: score1, member: member1 },
-        { score: score2, member: member2 },
-      ).exec(client)
-
-      const res = await new ZInterStoreCommand(destination, 2, [key1, key2], {
-        aggregate: "sum",
-      }).exec(client)
-      expect(res).toBe(1)
-    })
-  })
-  describe("min", () => {
-    it("returns the number of elements in the new set ", async () => {
-      const destination = newKey()
-      const key1 = newKey()
-      const key2 = newKey()
-      const score1 = 1
-      const member1 = randomUUID()
-      const score2 = 2
-      const member2 = randomUUID()
-
-      await new ZAddCommand(key1, { score: score1, member: member1 }).exec(client)
-      await new ZAddCommand(
-        key2,
-        { score: score1, member: member1 },
-        { score: score2, member: member2 },
-      ).exec(client)
-
-      const res = await new ZInterStoreCommand(destination, 2, [key1, key2], {
-        aggregate: "min",
-      }).exec(client)
-      expect(res).toBe(1)
-    })
-  })
-  describe("max", () => {
-    it("returns the number of elements in the new set ", async () => {
-      const destination = newKey()
-      const key1 = newKey()
-      const key2 = newKey()
-      const score1 = 1
-      const member1 = randomUUID()
-      const score2 = 2
-      const member2 = randomUUID()
-
-      await new ZAddCommand(key1, { score: score1, member: member1 }).exec(client)
-      await new ZAddCommand(
-        key2,
-        { score: score1, member: member1 },
-        { score: score2, member: member2 },
-      ).exec(client)
-
-      const res = await new ZInterStoreCommand(destination, 2, [key1, key2], {
-        aggregate: "max",
-      }).exec(client)
-      expect(res).toBe(1)
-    })
-  })
-})

package/pkg/commands/zinterstore.ts

@@ -1,55 +0,0 @@
-import { Command } from "../command"
-
-export type ZInterStoreCommandOptions = {
-  aggregate?: "sum" | "min" | "max"
-} & (
-  | {
-      weight: number
-      weights?: never
-    }
-  | {
-      weight?: never
-      weights: number[]
-    }
-  | {
-      weight?: never
-      weights?: never
-    }
-)
-
-/**
- * @see https://redis.io/commands/zInterstore
- */
-export class ZInterStoreCommand extends Command<number, number> {
-  constructor(destination: string, numKeys: 1, key: string, opts?: ZInterStoreCommandOptions)
-  constructor(
-    destination: string,
-    numKeys: number,
-    keys: string[],
-    opts?: ZInterStoreCommandOptions,
-  )
-  constructor(
-    destination: string,
-    numKeys: number,
-    keyOrKeys: string | string[],
-    opts?: ZInterStoreCommandOptions,
-  ) {
-    const command: unknown[] = ["zinterstore", destination, numKeys]
-    if (Array.isArray(keyOrKeys)) {
-      command.push(...keyOrKeys)
-    } else {
-      command.push(keyOrKeys)
-    }
-    if (opts) {
-      if ("weights" in opts && opts.weights) {
-        command.push("weights", ...opts.weights)
-      } else if ("weight" in opts && typeof opts.weight === "number") {
-        command.push("weights", opts.weight)
-      }
-      if ("aggregate" in opts) {
-        command.push("aggregate", opts.aggregate)
-      }
-    }
-    super(command)
-  }
-}

package/pkg/commands/zlexcount.test.ts

@@ -1,22 +0,0 @@
-import { keygen, newHttpClient } from "../test-utils"
-import { it, expect, afterAll } from "@jest/globals"
-import { ZAddCommand } from "./zadd"
-import { ZLexCountCommand } from "./zlexcount"
-const client = newHttpClient()
-
-const { newKey, cleanup } = keygen()
-afterAll(cleanup)
-
-it("returns the number of elements in the specified score range", async () => {
-  const key = newKey()
-  await new ZAddCommand(
-    key,
-    { score: 0, member: "a" },
-    { score: 0, member: "b" },
-    { score: 0, member: "c" },
-    { score: 0, member: "d" },
-    { score: 0, member: "e" },
-  ).exec(client)
-  const res = await new ZLexCountCommand(key, "[b", "[f").exec(client)
-  expect(res).toBe(4)
-})

package/pkg/commands/zlexcount.ts

@@ -1,9 +0,0 @@
-import { Command } from "../command"
-/**
- * @see https://redis.io/commands/zlexcount
- */
-export class ZLexCountCommand extends Command<number, number> {
-  constructor(key: string, min: string, max: string) {
-    super(["zlexcount", key, min, max])
-  }
-}

package/pkg/commands/zpopmax.test.ts

@@ -1,45 +0,0 @@
-import { keygen, newHttpClient } from "../test-utils"
-import { randomUUID } from "crypto"
-import { describe, it, expect, afterAll } from "@jest/globals"
-import { ZAddCommand } from "./zadd"
-import { ZPopMaxCommand } from "./zpopmax"
-const client = newHttpClient()
-
-const { newKey, cleanup } = keygen()
-afterAll(cleanup)
-
-describe("without options", () => {
-  it("returns the max", async () => {
-    const key = newKey()
-    const score1 = 1
-    const member1 = randomUUID()
-    const score2 = 2
-    const member2 = randomUUID()
-    await new ZAddCommand(
-      key,
-      { score: score1, member: member1 },
-      { score: score2, member: member2 },
-    ).exec(client)
-    const res = await new ZPopMaxCommand(key).exec(client)
-    expect(res).toHaveLength(2)
-    expect(res![0]).toEqual(member2)
-    expect(res![1]).toEqual(score2)
-  })
-})
-
-describe("with count", () => {
-  it("returns the n max members", async () => {
-    const key = newKey()
-    const score1 = 1
-    const member1 = randomUUID()
-    const score2 = 2
-    const member2 = randomUUID()
-    await new ZAddCommand(
-      key,
-      { score: score1, member: member1 },
-      { score: score2, member: member2 },
-    ).exec(client)
-    const res = await new ZPopMaxCommand(key, 2).exec(client)
-    expect(res).toEqual([member2, score2, member1, score1])
-  })
-})

package/pkg/commands/zpopmax.ts

@@ -1,13 +0,0 @@
-import { Command } from "../command"
-/**
- * @see https://redis.io/commands/zpopmax
- */
-export class ZPopMaxCommand<TData> extends Command<TData[], string[]> {
-  constructor(key: string, count?: number) {
-    const command: unknown[] = ["zpopmax", key]
-    if (typeof count === "number") {
-      command.push(count)
-    }
-    super(command)
-  }
-}

package/pkg/commands/zpopmin.test.ts

@@ -1,49 +0,0 @@
-import { keygen, newHttpClient } from "../test-utils"
-import { randomUUID } from "crypto"
-import { describe, it, expect, afterAll } from "@jest/globals"
-import { ZAddCommand } from "./zadd"
-import { ZPopMinCommand } from "./zpopmin"
-const client = newHttpClient()
-
-const { newKey, cleanup } = keygen()
-afterAll(cleanup)
-
-describe("without options", () => {
-  it("returns the popped elements", async () => {
-    const key = newKey()
-    const score1 = 1
-    const member1 = randomUUID()
-    const score2 = 2
-    const member2 = randomUUID()
-    const score3 = 3
-    const member3 = randomUUID()
-    await new ZAddCommand(
-      key,
-      { score: score1, member: member1 },
-      { score: score2, member: member2 },
-      { score: score3, member: member3 },
-    ).exec(client)
-    const res = await new ZPopMinCommand(key).exec(client)
-    expect(res).toEqual([member1, score1])
-  })
-})
-
-describe("with count", () => {
-  it("returns the popped elements", async () => {
-    const key = newKey()
-    const score1 = 1
-    const member1 = randomUUID()
-    const score2 = 2
-    const member2 = randomUUID()
-    const score3 = 3
-    const member3 = randomUUID()
-    await new ZAddCommand(
-      key,
-      { score: score1, member: member1 },
-      { score: score2, member: member2 },
-      { score: score3, member: member3 },
-    ).exec(client)
-    const res = await new ZPopMinCommand(key, 2).exec(client)
-    expect(res).toEqual([member1, score1, member2, score2])
-  })
-})

package/pkg/commands/zpopmin.ts

@@ -1,13 +0,0 @@
-import { Command } from "../command"
-/**
- * @see https://redis.io/commands/zpopmin
- */
-export class ZPopMinCommand<TData> extends Command<TData[], string[]> {
-  constructor(key: string, count?: number) {
-    const command: unknown[] = ["zpopmin", key]
-    if (typeof count === "number") {
-      command.push(count)
-    }
-    super(command)
-  }
-}

package/pkg/commands/zrange.test.ts

@@ -1,52 +0,0 @@
-import { keygen, newHttpClient } from "../test-utils"
-import { randomUUID } from "crypto"
-import { describe, it, expect, afterAll } from "@jest/globals"
-import { ZAddCommand } from "./zadd"
-import { ZRangeCommand } from "./zrange"
-const client = newHttpClient()
-
-const { newKey, cleanup } = keygen()
-afterAll(cleanup)
-
-describe("without options", () => {
-  it("returns the set", async () => {
-    const key = newKey()
-    const score1 = 2
-    const member1 = randomUUID()
-
-    const score2 = 5
-    const member2 = randomUUID()
-
-    await new ZAddCommand(
-      key,
-      { score: score1, member: member1 },
-      { score: score2, member: member2 },
-    ).exec(client)
-
-    const res = await new ZRangeCommand(key, 1, 3).exec(client)
-    expect(res).toHaveLength(1)
-    expect(res![0]).toEqual(member2)
-  })
-})
-
-describe("withscores", () => {
-  it("returns the set", async () => {
-    const key = newKey()
-    const score1 = 2
-    const member1 = randomUUID()
-
-    const score2 = 5
-    const member2 = randomUUID()
-
-    await new ZAddCommand(
-      key,
-      { score: score1, member: member1 },
-      { score: score2, member: member2 },
-    ).exec(client)
-
-    const res = await new ZRangeCommand(key, 1, 3, { withScores: true }).exec(client)
-    expect(res).toHaveLength(2)
-    expect(res![0]).toEqual(member2)
-    expect(res![1]).toEqual(score2)
-  })
-})

package/pkg/commands/zrange.ts

@@ -1,22 +0,0 @@
-import { Command } from "../command"
-export type ZRangeCommandOptions = {
-  withScores?: boolean
-}
-
-/**
- * @see https://redis.io/commands/zrange
- */
-export class ZRangeCommand<TData extends unknown[]> extends Command<TData, string[]> {
-  constructor(
-    key: string,
-    min: number | `(${number}`,
-    max: number | `(${number}`,
-    opts?: ZRangeCommandOptions,
-  ) {
-    const command: unknown[] = ["zrange", key, min, max]
-    if (opts?.withScores) {
-      command.push("withscores")
-    }
-    super(command)
-  }
-}

package/pkg/commands/zrank.test.ts

@@ -1,22 +0,0 @@
-import { keygen, newHttpClient } from "../test-utils"
-import { it, expect, afterAll } from "@jest/globals"
-import { ZAddCommand } from "./zadd"
-import { ZRankCommand } from "./zrank"
-const client = newHttpClient()
-
-const { newKey, cleanup } = keygen()
-afterAll(cleanup)
-
-it("returns the rank", async () => {
-  const key = newKey()
-
-  await new ZAddCommand(
-    key,
-    { score: 1, member: "member1" },
-    { score: 2, member: "member2" },
-    { score: 3, member: "member3" },
-  ).exec(client)
-
-  const res = await new ZRankCommand(key, "member2").exec(client)
-  expect(res).toBe(1)
-})

package/pkg/commands/zrank.ts

@@ -1,10 +0,0 @@
-import { Command } from "../command"
-/**
- *  @see https://redis.io/commands/zrank
- */
-
-export class ZRankCommand<TData> extends Command<number | null, number | null> {
-  constructor(key: string, member: TData) {
-    super(["zrank", key, member])
-  }
-}

package/pkg/commands/zrem.test.ts

@@ -1,20 +0,0 @@
-import { keygen, newHttpClient } from "../test-utils"
-import { randomUUID } from "crypto"
-import { it, expect, afterAll } from "@jest/globals"
-import { ZAddCommand } from "./zadd"
-import { ZRemCommand } from "./zrem"
-const client = newHttpClient()
-
-const { newKey, cleanup } = keygen()
-afterAll(cleanup)
-
-it("returns the number of removed members", async () => {
-  const key = newKey()
-  const member1 = randomUUID()
-  const member2 = randomUUID()
-  await new ZAddCommand(key, { score: 1, member: member1 }, { score: 2, member: member2 }).exec(
-    client,
-  )
-  const res = await new ZRemCommand(key, member1, member2).exec(client)
-  expect(res).toBe(2)
-})

package/pkg/commands/zrem.ts

@@ -1,10 +0,0 @@
-import { NonEmptyArray } from "../types"
-import { Command } from "../command"
-/**
- * @see https://redis.io/commands/zrem
- */
-export class ZRemCommand<TData = string> extends Command<number, number> {
-  constructor(key: string, ...members: NonEmptyArray<TData>) {
-    super(["zrem", key, ...members])
-  }
-}

package/pkg/commands/zremrangebylex.test.ts

@@ -1,26 +0,0 @@
-import { keygen, newHttpClient } from "../test-utils"
-import { it, expect, afterAll } from "@jest/globals"
-import { ZAddCommand } from "./zadd"
-import { ZRemRangeByLexCommand } from "./zremrangebylex"
-const client = newHttpClient()
-
-const { newKey, cleanup } = keygen()
-afterAll(cleanup)
-
-it("returns the number of elements removed", async () => {
-  const key = newKey()
-  await new ZAddCommand(
-    key,
-    {
-      score: 0,
-      member: "aaaa",
-    },
-    { score: 0, member: "b" },
-    { score: 0, member: "c" },
-    { score: 0, member: "d" },
-    { score: 0, member: "e" },
-  ).exec(client)
-
-  const res = await new ZRemRangeByLexCommand(key, "[b", "[e").exec(client)
-  expect(res).toBe(4)
-})

package/pkg/commands/zremrangebylex.ts

@@ -1,9 +0,0 @@
-import { Command } from "../command"
-/**
- * @see https://redis.io/commands/zremrangebylex
- */
-export class ZRemRangeByLexCommand extends Command<number, number> {
-  constructor(key: string, min: string, max: string) {
-    super(["zremrangebylex", key, min, max])
-  }
-}