@keyv/postgres 2.2.2 → 2.2.3

package/dist/index.cjs

@@ -56,6 +56,9 @@ var endPool = async () => {
 };
 
 // src/index.ts
+function escapeIdentifier(identifier) {
+  return `"${identifier.replace(/"/g, '""')}"`;
+}
 var KeyvPostgres = class extends import_node_events.default {
   ttlSupport;
   opts;
@@ -159,24 +162,44 @@ var KeyvPostgres = class extends import_node_events.default {
   }
   async *iterator(namespace) {
     const limit = Number.parseInt(String(this.opts.iterationLimit), 10) || 10;
-    async function* iterate(offset, options, query) {
-      const select = `SELECT * FROM ${options.schema}.${options.table} WHERE key LIKE $1 LIMIT $2 OFFSET $3`;
-      const entries = await query(select, [
-        // biome-ignore lint/style/useTemplate: need to fix
-        `${namespace ? namespace + ":" : ""}%`,
-        limit,
-        offset
-      ]);
+    const escapedNamespace = namespace ? `${namespace.replace(/[%_\\]/g, "\\$&")}:` : "";
+    const pattern = `${escapedNamespace}%`;
+    let lastKey = null;
+    while (true) {
+      let entries;
+      try {
+        let select;
+        let params;
+        if (lastKey === null) {
+          select = `SELECT * FROM ${escapeIdentifier(this.opts.schema)}.${escapeIdentifier(this.opts.table)} WHERE key LIKE $1 ORDER BY key LIMIT $2`;
+          params = [pattern, limit];
+        } else {
+          select = `SELECT * FROM ${escapeIdentifier(this.opts.schema)}.${escapeIdentifier(this.opts.table)} WHERE key LIKE $1 AND key > $2 ORDER BY key LIMIT $3`;
+          params = [pattern, lastKey, limit];
+        }
+        entries = await this.query(select, params);
+      } catch (error) {
+        this.emit(
+          "error",
+          new Error(
+            `Iterator failed at cursor ${lastKey ?? "start"}: ${error.message}`
+          )
+        );
+        return;
+      }
       if (entries.length === 0) {
         return;
       }
       for (const entry of entries) {
-        offset += 1;
-        yield [entry.key, entry.value];
+        if (entry.key !== void 0 && entry.key !== null) {
+          yield [entry.key, entry.value];
+        }
+      }
+      lastKey = entries[entries.length - 1].key;
+      if (entries.length < limit) {
+        return;
       }
-      yield* iterate(offset, options, query);
     }
-    yield* iterate(0, this.opts, this.query);
   }
   async has(key) {
     const exists = `SELECT EXISTS ( SELECT * FROM ${this.opts.schema}.${this.opts.table} WHERE key = $1 )`;

package/dist/index.d.cts

@@ -27,7 +27,7 @@ declare class KeyvPostgres extends EventEmitter implements KeyvStoreAdapter {
     delete(key: string): Promise<boolean>;
     deleteMany(keys: string[]): Promise<boolean>;
     clear(): Promise<void>;
-    iterator(namespace?: string): AsyncGenerator<any, void, any>;
+    iterator(namespace?: string): AsyncGenerator<string[], void, unknown>;
     has(key: string): Promise<any>;
     connect(): Promise<(sql: string, values?: any) => Promise<any[]>>;
     disconnect(): Promise<void>;

package/dist/index.d.ts

@@ -27,7 +27,7 @@ declare class KeyvPostgres extends EventEmitter implements KeyvStoreAdapter {
     delete(key: string): Promise<boolean>;
     deleteMany(keys: string[]): Promise<boolean>;
     clear(): Promise<void>;
-    iterator(namespace?: string): AsyncGenerator<any, void, any>;
+    iterator(namespace?: string): AsyncGenerator<string[], void, unknown>;
     has(key: string): Promise<any>;
     connect(): Promise<(sql: string, values?: any) => Promise<any[]>>;
     disconnect(): Promise<void>;

package/dist/index.js

@@ -20,6 +20,9 @@ var endPool = async () => {
 };
 
 // src/index.ts
+function escapeIdentifier(identifier) {
+  return `"${identifier.replace(/"/g, '""')}"`;
+}
 var KeyvPostgres = class extends EventEmitter {
   ttlSupport;
   opts;
@@ -123,24 +126,44 @@ var KeyvPostgres = class extends EventEmitter {
   }
   async *iterator(namespace) {
     const limit = Number.parseInt(String(this.opts.iterationLimit), 10) || 10;
-    async function* iterate(offset, options, query) {
-      const select = `SELECT * FROM ${options.schema}.${options.table} WHERE key LIKE $1 LIMIT $2 OFFSET $3`;
-      const entries = await query(select, [
-        // biome-ignore lint/style/useTemplate: need to fix
-        `${namespace ? namespace + ":" : ""}%`,
-        limit,
-        offset
-      ]);
+    const escapedNamespace = namespace ? `${namespace.replace(/[%_\\]/g, "\\$&")}:` : "";
+    const pattern = `${escapedNamespace}%`;
+    let lastKey = null;
+    while (true) {
+      let entries;
+      try {
+        let select;
+        let params;
+        if (lastKey === null) {
+          select = `SELECT * FROM ${escapeIdentifier(this.opts.schema)}.${escapeIdentifier(this.opts.table)} WHERE key LIKE $1 ORDER BY key LIMIT $2`;
+          params = [pattern, limit];
+        } else {
+          select = `SELECT * FROM ${escapeIdentifier(this.opts.schema)}.${escapeIdentifier(this.opts.table)} WHERE key LIKE $1 AND key > $2 ORDER BY key LIMIT $3`;
+          params = [pattern, lastKey, limit];
+        }
+        entries = await this.query(select, params);
+      } catch (error) {
+        this.emit(
+          "error",
+          new Error(
+            `Iterator failed at cursor ${lastKey ?? "start"}: ${error.message}`
+          )
+        );
+        return;
+      }
       if (entries.length === 0) {
         return;
       }
       for (const entry of entries) {
-        offset += 1;
-        yield [entry.key, entry.value];
+        if (entry.key !== void 0 && entry.key !== null) {
+          yield [entry.key, entry.value];
+        }
+      }
+      lastKey = entries[entries.length - 1].key;
+      if (entries.length < limit) {
+        return;
       }
-      yield* iterate(offset, options, query);
     }
-    yield* iterate(0, this.opts, this.query);
   }
   async has(key) {
     const exists = `SELECT EXISTS ( SELECT * FROM ${this.opts.schema}.${this.opts.table} WHERE key = $1 )`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keyv/postgres",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "PostgreSQL storage adapter for Keyv",
   "type": "module",
   "main": "./dist/index.js",
@@ -42,18 +42,19 @@
   },
   "homepage": "https://github.com/jaredwray/keyv",
   "dependencies": {
-    "pg": "^8.16.3"
+    "pg": "^8.17.1"
   },
   "peerDependencies": {
-    "keyv": "^5.5.4"
+    "keyv": "^5.6.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.6",
-    "@types/pg": "^8.15.6",
-    "@vitest/coverage-v8": "^4.0.10",
-    "rimraf": "^6.1.0",
+    "@biomejs/biome": "^2.3.11",
+    "@faker-js/faker": "^10.2.0",
+    "@types/pg": "^8.16.0",
+    "@vitest/coverage-v8": "^4.0.17",
+    "rimraf": "^6.1.2",
     "tsd": "^0.33.0",
-    "vitest": "^4.0.10",
+    "vitest": "^4.0.17",
     "@keyv/test-suite": "^2.1.2"
   },
   "tsd": {