add prefix in keys

package-lock.json

@@ -13,7 +13,7 @@
         "better-lock": "^2.0.3",
         "class-transformer": "^0.5.1",
         "encoded-buffer": "^0.2.6",
-        "ioredis": "^5.2.2",
+        "ioredis": "^5.2.3",
         "lodash": "^4.17.21",
         "lru-cache": "^7.13.1",
         "typed-reflector": "^1.0.11"
@@ -2725,9 +2725,9 @@
       "dev": true
     },
     "node_modules/ioredis": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.2.2.tgz",
-      "integrity": "sha512-wryKc1ur8PcCmNwfcGkw5evouzpbDXxxkMkzPK8wl4xQfQf7lHe11Jotell5ikMVAtikXJEu/OJVaoV51BggRQ==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.2.3.tgz",
+      "integrity": "sha512-gQNcMF23/NpvjCaa1b5YycUyQJ9rBNH2xP94LWinNpodMWVUPP5Ai/xXANn/SM7gfIvI62B5CCvZxhg5pOgyMw==",
       "dependencies": {
         "@ioredis/commands": "^1.1.1",
         "cluster-key-slot": "^1.1.0",
@@ -6934,9 +6934,9 @@
       "dev": true
     },
     "ioredis": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.2.2.tgz",
-      "integrity": "sha512-wryKc1ur8PcCmNwfcGkw5evouzpbDXxxkMkzPK8wl4xQfQf7lHe11Jotell5ikMVAtikXJEu/OJVaoV51BggRQ==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.2.3.tgz",
+      "integrity": "sha512-gQNcMF23/NpvjCaa1b5YycUyQJ9rBNH2xP94LWinNpodMWVUPP5Ai/xXANn/SM7gfIvI62B5CCvZxhg5pOgyMw==",
       "requires": {
         "@ioredis/commands": "^1.1.1",
         "cluster-key-slot": "^1.1.0",

package.json

@@ -58,7 +58,7 @@
     "better-lock": "^2.0.3",
     "class-transformer": "^0.5.1",
     "encoded-buffer": "^0.2.6",
-    "ioredis": "^5.2.2",
+    "ioredis": "^5.2.3",
     "lodash": "^4.17.21",
     "lru-cache": "^7.13.1",
     "typed-reflector": "^1.0.11"

src/aragami.ts

@@ -126,20 +126,20 @@ export class Aragami {
     );
   }
 
-  async clear(base: AnyClass | string) {
-    return this.driver.clear(this.getBaseKey(base));
+  async clear(base: AnyClass | string, prefix?: string) {
+    return this.driver.clear(this.getBaseKey(base), prefix);
   }
 
-  async keys(base: AnyClass | string) {
-    return this.driver.keys(this.getBaseKey(base));
+  async keys(base: AnyClass | string, prefix?: string) {
+    return this.driver.keys(this.getBaseKey(base), prefix);
   }
 
-  async values<T>(cl: ClassType<T>) {
-    const buffers = await this.driver.values(this.getBaseKey(cl));
+  async values<T>(cl: ClassType<T>, prefix?: string) {
+    const buffers = await this.driver.values(this.getBaseKey(cl), prefix);
     return buffers.map((buf) => this.decode(cl, buf));
   }
 
-  async entries<T>(cl: ClassType<T>): Promise<[string, T][]> {
+  async entries<T>(cl: ClassType<T>, prefix?: string): Promise<[string, T][]> {
     const entries = await this.driver.entries(this.getBaseKey(cl));
     return entries.map(([key, buf]) => [key, this.decode(cl, buf)]);
   }

src/base-driver.ts

@@ -22,24 +22,24 @@ export class BaseDriver {
     return false;
   }
 
-  async keys(baseKey: string): Promise<string[]> {
+  async keys(baseKey: string, prefix?: string): Promise<string[]> {
     return [];
   }
 
-  async values(baseKey: string): Promise<Buffer[]> {
-    const keys = await this.keys(baseKey);
+  async values(baseKey: string, prefix?: string): Promise<Buffer[]> {
+    const keys = await this.keys(baseKey, prefix);
     return Promise.all(keys.map((key) => this.get(baseKey, key)));
   }
 
-  async entries(baseKey: string): Promise<[string, Buffer][]> {
-    const keys = await this.keys(baseKey);
+  async entries(baseKey: string, prefix?: string): Promise<[string, Buffer][]> {
+    const keys = await this.keys(baseKey, prefix);
     return Promise.all(
       keys.map(async (key) => [key, await this.get(baseKey, key)]),
     );
   }
 
-  async clear(baseKey: string) {
-    const keys = await this.keys(baseKey);
+  async clear(baseKey: string, prefix?: string) {
+    const keys = await this.keys(baseKey, prefix);
     await Promise.all(keys.map((key) => this.del(baseKey, key)));
   }
 

src/drivers/memory.ts

@@ -47,14 +47,27 @@ export class MemoryDriver extends BaseDriver {
     return cache.delete(key);
   }
 
-  override async keys(baseKey: string): Promise<string[]> {
+  override async keys(baseKey: string, prefix?: string): Promise<string[]> {
     const cache = this.getCacheInstance(baseKey);
-    return Array.from(cache.keys());
+    let keys = Array.from(cache.keys());
+    if (prefix) {
+      keys = keys.filter((key) => key.startsWith(prefix));
+    }
+    return keys;
   }
 
-  override async clear(baseKey: string): Promise<void> {
+  override async clear(baseKey: string, prefix?: string): Promise<void> {
     const cache = this.getCacheInstance(baseKey);
-    cache.clear();
+    if (prefix) {
+      const keys = Array.from(cache.keys());
+      for (const key of keys) {
+        if (key.startsWith(prefix)) {
+          cache.delete(key);
+        }
+      }
+    } else {
+      cache.clear();
+    }
   }
 
   override lock<R>(keys: string[], cb: () => Promise<R>): Promise<R> {

src/drivers/redis.ts

@@ -38,17 +38,17 @@ export class RedisDriver extends BaseDriver {
     return !!this.redis.del(this.usingKey(baseKey, key));
   }
 
-  private originalKeys(baseKey: string) {
-    return this.redis.keys(this.usingKey(baseKey, '*'));
+  private originalKeys(baseKey: string, prefix = '') {
+    return this.redis.keys(this.usingKey(baseKey, `${prefix}*`));
   }
 
-  override async keys(baseKey: string): Promise<string[]> {
-    const keys = await this.originalKeys(baseKey);
+  override async keys(baseKey: string, prefix?: string): Promise<string[]> {
+    const keys = await this.originalKeys(baseKey, prefix ?? '');
     return keys.map((key) => key.slice(baseKey.length + 1));
   }
 
-  override async clear(baseKey: string): Promise<void> {
-    const keys = await this.originalKeys(baseKey);
+  override async clear(baseKey: string, prefix?: string): Promise<void> {
+    const keys = await this.originalKeys(baseKey, prefix);
     if (!keys.length) {
       return;
     }

tests/sample.spec.ts

@@ -7,7 +7,7 @@ describe('Aragami.', () => {
 
   beforeEach(() => {
     aragami = new Aragami({
-      redis: { uri: 'redis://localhost:6379' },
+      redis: process.env.REDIS ? { uri: 'redis://localhost:6379' } : undefined,
     });
   });
 
@@ -45,6 +45,7 @@ describe('Aragami.', () => {
     expect(userGet).toEqual({ name: 'John', age: 30 });
     expect(userGet).toBeInstanceOf(User);
     await expect(aragami.keys(User)).resolves.toEqual(['n.John']);
+    await expect(aragami.keys(User, 'n.J')).resolves.toEqual(['n.John']);
     await expect(aragami.values(User)).resolves.toEqual([
       { name: 'John', age: 30 },
     ]);