feat: move keys function to not generator

Author: Oscaner

src/index.test.ts

@@ -53,9 +53,9 @@ test.it("Async Iterator single element test", async (t) => {
 
 test.it("Async Keys single element test", async (t) => {
   await sqliteKeyv.set("foo", "bar");
-  const keys = sqliteKeyv.keys();
+  const keys = await sqliteKeyv.keys();
 
-  for await (const key of keys) {
+  for (const key of keys) {
     t.expect(key).toBe("foo");
   }
 });
@@ -85,9 +85,9 @@ test.it("Async Keys multiple element test", async (t) => {
   await sqliteKeyv.set("foo2", "bar2");
 
   const expectedKeys = ["foo", "foo1", "foo2"];
-  const keys = sqliteKeyv.keys();
+  const keys = await sqliteKeyv.keys();
   let i = 0;
-  for await (const key of keys) {
+  for (const key of keys) {
     const expectedKey = expectedKeys[i++];
     t.expect(key).toBe(expectedKey);
   }
@@ -116,16 +116,8 @@ test.it("Async Keys multiple elements with limit=1 test", async (t) => {
   await sqliteKeyv.set("foo", "bar");
   await sqliteKeyv.set("foo1", "bar1");
   await sqliteKeyv.set("foo2", "bar2");
-  const keys = sqliteKeyv.keys();
-  let key = await keys.next();
-  let k = key.value
-  t.expect(k).toBe("foo");
-  key = await keys.next();
-  k = key.value
-  t.expect(k).toBe("foo1");
-  key = await keys.next();
-  k = key.value
-  t.expect(k).toBe("foo2");
+  const keys = await sqliteKeyv.keys();
+  t.expect(keys).toStrictEqual(["foo", "foo1", "foo2"]);
 });
 
 test.it("Async Iterator 0 element test", async (t) => {
@@ -135,9 +127,8 @@ test.it("Async Iterator 0 element test", async (t) => {
 });
 
 test.it("Async Keys 0 element test", async (t) => {
-  const keys = sqliteKeyv.keys("keyv");
-  const key = await keys.next();
-  t.expect(key.value).toBe(undefined);
+  const keys = await sqliteKeyv.keys("keyv");
+  t.expect(keys.length).toBe(0);
 });
 
 test.it("Async Keys with pattern test", async (t) => {
@@ -146,7 +137,7 @@ test.it("Async Keys with pattern test", async (t) => {
   await sqliteKeyv.set("foo2", "bar1");
   await sqliteKeyv.set("foo3", "bar2");
 
-  for await (const key of sqliteKeyv.keys("foo*")) {
+  for (const key of await sqliteKeyv.keys("foo*")) {
     t.expect(key).not.toBe("other");
   }
 });

src/index.ts

@@ -33,7 +33,7 @@ export class KeyvSqlite extends EventEmitter implements KeyvStoreAdapter {
   updateCatches: (args: [string, unknown][], ttl?: number) => void;
   emptyCaches: () => void;
   findCaches: (namespace: string | undefined, limit: number, offset: number, expiredAt: number) => CacheObject[];
-  findKeys: (pattern: string | undefined, limit: number, offset: number, expiredAt: number) => CacheObject[];
+  findKeys: (pattern: string | undefined, expiredAt: number) => CacheObject[];
 
   constructor(options?: KeyvSqliteOptions) {
     super();
@@ -73,8 +73,8 @@ CREATE INDEX IF NOT EXISTS idx_expired_caches ON ${tableName}(expiredAt);
     const finderStatement = this.sqlite.prepare<[string, number, number, number], CacheObject>(
       `SELECT * FROM ${tableName} WHERE cacheKey LIKE ? AND (expiredAt = -1 OR expiredAt > ?) LIMIT ? OFFSET ?`,
     );
-    const findKeysStatement = this.sqlite.prepare<[string, number, number, number], CacheObject>(
-      `SELECT cacheKey FROM ${tableName} WHERE cacheKey LIKE ? AND (expiredAt = -1 OR expiredAt > ?) LIMIT ? OFFSET ?`,
+    const findKeysStatement = this.sqlite.prepare<[string, number], CacheObject>(
+      `SELECT cacheKey FROM ${tableName} WHERE cacheKey LIKE ? AND (expiredAt = -1 OR expiredAt > ?)`,
     );
     const purgeStatement = this.sqlite.prepare(`DELETE FROM ${tableName} WHERE expiredAt != -1 AND expiredAt < ?`);
     const emptyStatement = this.sqlite.prepare(`DELETE FROM ${tableName} WHERE cacheKey LIKE ?`);
@@ -145,10 +145,10 @@ CREATE INDEX IF NOT EXISTS idx_expired_caches ON ${tableName}(expiredAt);
         .filter((data) => data !== undefined);
     };
 
-    this.findKeys = (pattern, limit, offset, expiredAt) => {
+    this.findKeys = (pattern, expiredAt) => {
       const _pattern = pattern?.replaceAll("*", "%") ?? ""
       return findKeysStatement
-        .all(_pattern ? `%${pattern}%` : '%', expiredAt, limit, offset)
+        .all(_pattern ? `%${pattern}%` : '%', expiredAt)
         .filter((data) => data !== undefined);
     };
   }
@@ -225,29 +225,8 @@ CREATE INDEX IF NOT EXISTS idx_expired_caches ON ${tableName}(expiredAt);
     yield* iterate(0);
   }
 
-  async *keys(pattern?: string) {
-    const limit = Number.parseInt(this.opts.iterationLimit! as string, 10) || 10;
-    const time = now();
-    const find = this.findKeys;
-
-    // @ts-expect-error - iterate
-    const iterate = async function* (offset: number) {
-      const entries = find(pattern, limit, offset, time);
-
-      if (entries.length === 0) {
-        return;
-      }
-
-      for (const entry of entries) {
-        // biome-ignore lint: <explanation>
-        offset += 1;
-        yield entry.cacheKey;
-      }
-
-      yield* iterate(offset);
-    };
-
-    yield* iterate(0);
+  async keys(pattern?: string): Promise<string[]> {
+    return this.findKeys(pattern, now()).map((entry) => entry.cacheKey);
   }
 
   async disconnect() {