@keyv/postgres 2.1.6 → 2.2.0

package/dist/index.cjs

@@ -35,7 +35,7 @@ __export(index_exports, {
   default: () => index_default
 });
 module.exports = __toCommonJS(index_exports);
-var import_events = __toESM(require("events"), 1);
+var import_node_events = __toESM(require("events"), 1);
 var import_keyv = __toESM(require("keyv"), 1);
 
 // src/pool.ts
@@ -51,12 +51,12 @@ var pool = (uri, options = {}) => {
   return postgresPool;
 };
 var endPool = async () => {
-  await postgresPool.end();
+  await postgresPool?.end();
   globalUri = void 0;
 };
 
 // src/index.ts
-var KeyvPostgres = class extends import_events.default {
+var KeyvPostgres = class extends import_node_events.default {
   ttlSupport;
   opts;
   query;
@@ -77,13 +77,6 @@ var KeyvPostgres = class extends import_events.default {
         ...options
       };
     }
-    const connect = async () => {
-      const conn = pool(options.uri, options);
-      return async (sql, values) => {
-        const data = await conn.query(sql, values);
-        return data.rows;
-      };
-    };
     this.opts = {
       table: "keyv",
       schema: "public",
@@ -94,7 +87,7 @@ var KeyvPostgres = class extends import_events.default {
     if (this.opts.schema !== "public") {
       createTable = `CREATE SCHEMA IF NOT EXISTS ${this.opts.schema}; ${createTable}`;
     }
-    const connected = connect().then(async (query) => {
+    const connected = this.connect().then(async (query) => {
       try {
         await query(createTable);
       } catch (error) {
@@ -123,6 +116,7 @@ var KeyvPostgres = class extends import_events.default {
     }
     return results;
   }
+  // biome-ignore lint/suspicious/noExplicitAny: type format
   async set(key, value) {
     const upsert = `INSERT INTO ${this.opts.schema}.${this.opts.table} (key, value)
       VALUES($1, $2) 
@@ -158,7 +152,12 @@ var KeyvPostgres = class extends import_events.default {
     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, [`${namespace ? namespace + ":" : ""}%`, limit, offset]);
+      const entries = await query(select, [
+        // biome-ignore lint/style/useTemplate: need to fix
+        `${namespace ? namespace + ":" : ""}%`,
+        limit,
+        offset
+      ]);
       if (entries.length === 0) {
         return;
       }
@@ -175,6 +174,13 @@ var KeyvPostgres = class extends import_events.default {
     const rows = await this.query(exists, [key]);
     return rows[0].exists;
   }
+  async connect() {
+    const conn = pool(this.opts.uri, this.opts);
+    return async (sql, values) => {
+      const data = await conn.query(sql, values);
+      return data.rows;
+    };
+  }
   async disconnect() {
     await endPool();
   }

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import EventEmitter from 'events';
+import EventEmitter from 'node:events';
 import Keyv, { KeyvStoreAdapter } from 'keyv';
 import { PoolConfig } from 'pg';
 
@@ -28,6 +28,7 @@ declare class KeyvPostgres extends EventEmitter implements KeyvStoreAdapter {
     clear(): Promise<void>;
     iterator(namespace?: string): AsyncGenerator<any, void, any>;
     has(key: string): Promise<any>;
+    connect(): Promise<(sql: string, values?: any) => Promise<any[]>>;
     disconnect(): Promise<void>;
 }
 declare const createKeyv: (options?: KeyvPostgresOptions) => Keyv<any>;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import EventEmitter from 'events';
+import EventEmitter from 'node:events';
 import Keyv, { KeyvStoreAdapter } from 'keyv';
 import { PoolConfig } from 'pg';
 
@@ -28,6 +28,7 @@ declare class KeyvPostgres extends EventEmitter implements KeyvStoreAdapter {
     clear(): Promise<void>;
     iterator(namespace?: string): AsyncGenerator<any, void, any>;
     has(key: string): Promise<any>;
+    connect(): Promise<(sql: string, values?: any) => Promise<any[]>>;
     disconnect(): Promise<void>;
 }
 declare const createKeyv: (options?: KeyvPostgresOptions) => Keyv<any>;

package/dist/index.js

@@ -15,7 +15,7 @@ var pool = (uri, options = {}) => {
   return postgresPool;
 };
 var endPool = async () => {
-  await postgresPool.end();
+  await postgresPool?.end();
   globalUri = void 0;
 };
 
@@ -41,13 +41,6 @@ var KeyvPostgres = class extends EventEmitter {
         ...options
       };
     }
-    const connect = async () => {
-      const conn = pool(options.uri, options);
-      return async (sql, values) => {
-        const data = await conn.query(sql, values);
-        return data.rows;
-      };
-    };
     this.opts = {
       table: "keyv",
       schema: "public",
@@ -58,7 +51,7 @@ var KeyvPostgres = class extends EventEmitter {
     if (this.opts.schema !== "public") {
       createTable = `CREATE SCHEMA IF NOT EXISTS ${this.opts.schema}; ${createTable}`;
     }
-    const connected = connect().then(async (query) => {
+    const connected = this.connect().then(async (query) => {
       try {
         await query(createTable);
       } catch (error) {
@@ -87,6 +80,7 @@ var KeyvPostgres = class extends EventEmitter {
     }
     return results;
   }
+  // biome-ignore lint/suspicious/noExplicitAny: type format
   async set(key, value) {
     const upsert = `INSERT INTO ${this.opts.schema}.${this.opts.table} (key, value)
       VALUES($1, $2) 
@@ -122,7 +116,12 @@ var KeyvPostgres = class extends EventEmitter {
     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, [`${namespace ? namespace + ":" : ""}%`, limit, offset]);
+      const entries = await query(select, [
+        // biome-ignore lint/style/useTemplate: need to fix
+        `${namespace ? namespace + ":" : ""}%`,
+        limit,
+        offset
+      ]);
       if (entries.length === 0) {
         return;
       }
@@ -139,6 +138,13 @@ var KeyvPostgres = class extends EventEmitter {
     const rows = await this.query(exists, [key]);
     return rows[0].exists;
   }
+  async connect() {
+    const conn = pool(this.opts.uri, this.opts);
+    return async (sql, values) => {
+      const data = await conn.query(sql, values);
+      return data.rows;
+    };
+  }
   async disconnect() {
     await endPool();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keyv/postgres",
-  "version": "2.1.6",
+  "version": "2.2.0",
   "description": "PostgreSQL storage adapter for Keyv",
   "type": "module",
   "main": "dist/index.cjs",
@@ -12,23 +12,6 @@
       "import": "./dist/index.js"
     }
   },
-  "xo": {
-    "rules": {
-      "import/no-named-as-default": "off",
-      "import/extensions": "off",
-      "n/file-extension-in-import": "off",
-      "unicorn/prefer-event-target": "off",
-      "promise/prefer-await-to-then": "off",
-      "unicorn/prefer-module": "off",
-      "@typescript-eslint/use-unknown-in-catch-callback-variable": "off",
-      "unicorn/prefer-node-protocol": "off",
-      "@typescript-eslint/no-unsafe-return": "off",
-      "@typescript-eslint/no-confusing-void-expression": "off",
-      "import/no-extraneous-dependencies": "off",
-      "@typescript-eslint/no-unnecessary-type-assertion": "off",
-      "@typescript-eslint/no-unnecessary-type-arguments": "off"
-    }
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/jaredwray/keyv.git"
@@ -53,19 +36,19 @@
   },
   "homepage": "https://github.com/jaredwray/keyv",
   "dependencies": {
-    "pg": "^8.16.2"
+    "pg": "^8.16.3"
   },
   "peerDependencies": {
-    "keyv": "^5.3.4"
+    "keyv": "^5.5.4"
   },
   "devDependencies": {
-    "@types/pg": "^8.15.4",
+    "@biomejs/biome": "^2.2.6",
+    "@types/pg": "^8.15.5",
     "@vitest/coverage-v8": "^3.2.4",
     "rimraf": "^6.0.1",
-    "tsd": "^0.32.0",
+    "tsd": "^0.33.0",
     "vitest": "^3.2.4",
-    "xo": "^1.1.0",
-    "@keyv/test-suite": "^2.0.8"
+    "@keyv/test-suite": "^2.1.1"
   },
   "tsd": {
     "directory": "test"
@@ -79,8 +62,10 @@
   ],
   "scripts": {
     "build": "rimraf ./dist && tsup src/index.ts --format cjs,esm --dts --clean",
-    "test": "xo --fix && vitest run --coverage",
-    "test:ci": "xo && vitest --run --sequence.setupFiles=list --coverage",
+    "lint": "biome check --write --error-on-warnings",
+    "lint:ci": "biome check --error-on-warnings",
+    "test": "pnpm lint && vitest run --coverage",
+    "test:ci": "pnpm lint:ci && vitest --run --sequence.setupFiles=list --coverage",
     "clean": "rimraf ./node_modules ./coverage ./dist"
   }
 }