fix: support base in getKeys and clear

unjs · May 2, 2023 · a604db5 · a604db5
1 parent 04db51a
commit a604db5
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/drivers/vercel-kv.ts b/src/drivers/vercel-kv.ts
@@ -3,17 +3,15 @@ import type { VercelKV } from "@vercel/kv";
 import type { RedisConfigNodejs } from "@upstash/redis";
 
 import { defineDriver } from "./utils";
+import { joinKeys, normalizeBaseKey } from "../utils";
 
 export interface RedisOptions extends RedisConfigNodejs {
   base?: string;
 }
 
 export default defineDriver<RedisOptions>((opts) => {
-  let base = opts?.base || "";
-  if (base && !base.endsWith(":")) {
-    base += ":";
-  }
-  const r = (key: string) => base + key;
+  const base = normalizeBaseKey(opts?.base);
+  const r = (...keys: string[]) => joinKeys(base, ...keys);
 
   let _connection: VercelKV;
   const getConnection = () => {
@@ -41,11 +39,11 @@ export default defineDriver<RedisOptions>((opts) => {
         .del(r(key))
         .then(() => {});
     },
-    getKeys() {
-      return getConnection().keys(r("*"));
+    getKeys(base) {
+      return getConnection().keys(r(base, "*"));
     },
-    async clear() {
-      const keys = await getConnection().keys(r("*"));
+    async clear(base) {
+      const keys = await getConnection().keys(r(base, "*"));
       if (keys.length === 0) {
         return;
       }