@keyv/mongo 3.0.3 → 3.0.5

package/dist/index.cjs

@@ -34,11 +34,21 @@ __export(index_exports, {
   default: () => index_default
 });
 module.exports = __toCommonJS(index_exports);
-var import_events = __toESM(require("events"), 1);
-var import_buffer = require("buffer");
+var import_node_buffer = require("buffer");
+var import_node_events = __toESM(require("events"), 1);
 var import_mongodb = require("mongodb");
-var keyvMongoKeys = /* @__PURE__ */ new Set(["url", "collection", "namespace", "serialize", "deserialize", "uri", "useGridFS", "dialect", "db"]);
-var KeyvMongo = class extends import_events.default {
+var keyvMongoKeys = /* @__PURE__ */ new Set([
+  "url",
+  "collection",
+  "namespace",
+  "serialize",
+  "deserialize",
+  "uri",
+  "useGridFS",
+  "dialect",
+  "db"
+]);
+var KeyvMongo = class extends import_node_events.default {
   ttlSupport = false;
   opts;
   connect;
@@ -60,16 +70,12 @@ var KeyvMongo = class extends import_events.default {
     };
     delete this.opts.emitErrors;
     const mongoOptions = Object.fromEntries(
-      Object.entries(this.opts).filter(
-        ([k]) => !keyvMongoKeys.has(k)
-      )
+      Object.entries(this.opts).filter(([k]) => !keyvMongoKeys.has(k))
     );
     this.opts = Object.fromEntries(
-      Object.entries(this.opts).filter(
-        ([k]) => keyvMongoKeys.has(k)
-      )
+      Object.entries(this.opts).filter(([k]) => keyvMongoKeys.has(k))
     );
-    this.connect = new Promise(async (resolve, reject) => {
+    this.connect = new Promise(async (resolve, _reject) => {
       try {
         let url2 = "";
         if (this.opts.url) {
@@ -100,8 +106,14 @@ var KeyvMongo = class extends import_events.default {
             collection = this.opts.collection;
           }
           const store = database.collection(collection);
-          await store.createIndex({ key: 1 }, { unique: true, background: true });
-          await store.createIndex({ expiresAt: 1 }, { expireAfterSeconds: 0, background: true });
+          await store.createIndex(
+            { key: 1 },
+            { unique: true, background: true }
+          );
+          await store.createIndex(
+            { expiresAt: 1 },
+            { expireAfterSeconds: 0, background: true }
+          );
           resolve({ store, mongoClient: client });
         }
       } catch (error) {
@@ -112,13 +124,16 @@ var KeyvMongo = class extends import_events.default {
   async get(key) {
     const client = await this.connect;
     if (this.opts.useGridFS) {
-      await client.store.updateOne({
-        filename: key
-      }, {
-        $set: {
-          "metadata.lastAccessed": /* @__PURE__ */ new Date()
+      await client.store.updateOne(
+        {
+          filename: String(key)
+        },
+        {
+          $set: {
+            "metadata.lastAccessed": /* @__PURE__ */ new Date()
+          }
         }
-      });
+      );
       const stream = client.bucket.openDownloadStreamByName(key);
       return new Promise((resolve) => {
         const resp = [];
@@ -126,7 +141,7 @@ var KeyvMongo = class extends import_events.default {
           resolve(void 0);
         });
         stream.on("end", () => {
-          const data = import_buffer.Buffer.concat(resp).toString("utf8");
+          const data = import_node_buffer.Buffer.concat(resp).toString("utf8");
           resolve(data);
         });
         stream.on("data", (chunk) => {
@@ -154,16 +169,22 @@ var KeyvMongo = class extends import_events.default {
       return data;
     }
     const connect = await this.connect;
-    const values = await connect.store.s.db.collection(this.opts.collection).find({ key: { $in: keys } }).project({ _id: 0, value: 1, key: 1 }).toArray();
+    const values = (
+      // @ts-expect-error need to fix this `s`
+      await connect.store.s.db.collection(this.opts.collection).find({ key: { $in: keys } }).project({ _id: 0, value: 1, key: 1 }).toArray()
+    );
     const results = [...keys];
     let i = 0;
     for (const key of keys) {
-      const rowIndex = values.findIndex((row) => row.key === key);
+      const rowIndex = values.findIndex(
+        (row) => row.key === key
+      );
       results[i] = rowIndex > -1 ? values[rowIndex].value : void 0;
       i++;
     }
     return results;
   }
+  // biome-ignore lint/suspicious/noExplicitAny: type format
   async set(key, value, ttl) {
     const expiresAt = typeof ttl === "number" ? new Date(Date.now() + ttl) : null;
     if (this.opts.useGridFS) {
@@ -220,7 +241,10 @@ var KeyvMongo = class extends import_events.default {
       if (files.length === 0) {
         return false;
       }
-      await Promise.all(files.map(async (file) => client.bucket.delete(file._id)));
+      await Promise.all(
+        // biome-ignore lint/style/noNonNullAssertion: need to fix
+        files.map(async (file) => client.bucket.delete(file._id))
+      );
       return true;
     }
     const object = await client.store.deleteMany({ key: { $in: keys } });
@@ -254,7 +278,12 @@ var KeyvMongo = class extends import_events.default {
         "metadata.expiresAt": {
           $lte: new Date(Date.now())
         }
-      }).toArray().then(async (expiredFiles) => Promise.all(expiredFiles.map(async (file) => client.bucket.delete(file._id))).then(() => true));
+      }).toArray().then(
+        async (expiredFiles) => Promise.all(
+          // biome-ignore lint/style/noNonNullAssertion: need to fix
+          expiredFiles.map(async (file) => client.bucket.delete(file._id))
+        ).then(() => true)
+      );
     });
   }
   async clearUnusedFor(seconds) {
@@ -271,7 +300,10 @@ var KeyvMongo = class extends import_events.default {
         $lte: new Date(Date.now() - seconds * 1e3)
       }
     }).toArray();
-    await Promise.all(lastAccessedFiles.map(async (file) => client.bucket.delete(file._id)));
+    await Promise.all(
+      // biome-ignore lint/style/noNonNullAssertion: need to fix
+      lastAccessedFiles.map(async (file) => client.bucket.delete(file._id))
+    );
     return true;
   }
   async *iterator(namespace) {
@@ -279,7 +311,10 @@ var KeyvMongo = class extends import_events.default {
     const regexp = new RegExp(`^${namespace ? namespace + ":" : ".*"}`);
     const iterator = this.opts.useGridFS ? client.store.find({
       filename: regexp
-    }).map(async (x) => [x.filename, await this.get(x.filename)]) : client.store.find({
+    }).map(async (x) => [
+      x.filename,
+      await this.get(x.filename)
+    ]) : client.store.find({
       key: regexp
     }).map((x) => [x.key, x.value]);
     yield* iterator;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import EventEmitter from 'events';
+import EventEmitter from 'node:events';
 import { KeyvStoreAdapter, StoredData } from 'keyv';
 import { ReadPreference, GridFSBucket, Collection, Db, MongoClient } from 'mongodb';
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import EventEmitter from 'events';
+import EventEmitter from 'node:events';
 import { KeyvStoreAdapter, StoredData } from 'keyv';
 import { ReadPreference, GridFSBucket, Collection, Db, MongoClient } from 'mongodb';
 

package/dist/index.js

@@ -1,12 +1,22 @@
 // src/index.ts
-import EventEmitter from "events";
 import { Buffer } from "buffer";
+import EventEmitter from "events";
 import {
-  MongoClient as mongoClient,
   GridFSBucket,
-  MongoServerError
+  MongoServerError,
+  MongoClient as mongoClient
 } from "mongodb";
-var keyvMongoKeys = /* @__PURE__ */ new Set(["url", "collection", "namespace", "serialize", "deserialize", "uri", "useGridFS", "dialect", "db"]);
+var keyvMongoKeys = /* @__PURE__ */ new Set([
+  "url",
+  "collection",
+  "namespace",
+  "serialize",
+  "deserialize",
+  "uri",
+  "useGridFS",
+  "dialect",
+  "db"
+]);
 var KeyvMongo = class extends EventEmitter {
   ttlSupport = false;
   opts;
@@ -29,16 +39,12 @@ var KeyvMongo = class extends EventEmitter {
     };
     delete this.opts.emitErrors;
     const mongoOptions = Object.fromEntries(
-      Object.entries(this.opts).filter(
-        ([k]) => !keyvMongoKeys.has(k)
-      )
+      Object.entries(this.opts).filter(([k]) => !keyvMongoKeys.has(k))
     );
     this.opts = Object.fromEntries(
-      Object.entries(this.opts).filter(
-        ([k]) => keyvMongoKeys.has(k)
-      )
+      Object.entries(this.opts).filter(([k]) => keyvMongoKeys.has(k))
     );
-    this.connect = new Promise(async (resolve, reject) => {
+    this.connect = new Promise(async (resolve, _reject) => {
       try {
         let url2 = "";
         if (this.opts.url) {
@@ -69,8 +75,14 @@ var KeyvMongo = class extends EventEmitter {
             collection = this.opts.collection;
           }
           const store = database.collection(collection);
-          await store.createIndex({ key: 1 }, { unique: true, background: true });
-          await store.createIndex({ expiresAt: 1 }, { expireAfterSeconds: 0, background: true });
+          await store.createIndex(
+            { key: 1 },
+            { unique: true, background: true }
+          );
+          await store.createIndex(
+            { expiresAt: 1 },
+            { expireAfterSeconds: 0, background: true }
+          );
           resolve({ store, mongoClient: client });
         }
       } catch (error) {
@@ -81,13 +93,16 @@ var KeyvMongo = class extends EventEmitter {
   async get(key) {
     const client = await this.connect;
     if (this.opts.useGridFS) {
-      await client.store.updateOne({
-        filename: key
-      }, {
-        $set: {
-          "metadata.lastAccessed": /* @__PURE__ */ new Date()
+      await client.store.updateOne(
+        {
+          filename: String(key)
+        },
+        {
+          $set: {
+            "metadata.lastAccessed": /* @__PURE__ */ new Date()
+          }
         }
-      });
+      );
       const stream = client.bucket.openDownloadStreamByName(key);
       return new Promise((resolve) => {
         const resp = [];
@@ -123,16 +138,22 @@ var KeyvMongo = class extends EventEmitter {
       return data;
     }
     const connect = await this.connect;
-    const values = await connect.store.s.db.collection(this.opts.collection).find({ key: { $in: keys } }).project({ _id: 0, value: 1, key: 1 }).toArray();
+    const values = (
+      // @ts-expect-error need to fix this `s`
+      await connect.store.s.db.collection(this.opts.collection).find({ key: { $in: keys } }).project({ _id: 0, value: 1, key: 1 }).toArray()
+    );
     const results = [...keys];
     let i = 0;
     for (const key of keys) {
-      const rowIndex = values.findIndex((row) => row.key === key);
+      const rowIndex = values.findIndex(
+        (row) => row.key === key
+      );
       results[i] = rowIndex > -1 ? values[rowIndex].value : void 0;
       i++;
     }
     return results;
   }
+  // biome-ignore lint/suspicious/noExplicitAny: type format
   async set(key, value, ttl) {
     const expiresAt = typeof ttl === "number" ? new Date(Date.now() + ttl) : null;
     if (this.opts.useGridFS) {
@@ -189,7 +210,10 @@ var KeyvMongo = class extends EventEmitter {
       if (files.length === 0) {
         return false;
       }
-      await Promise.all(files.map(async (file) => client.bucket.delete(file._id)));
+      await Promise.all(
+        // biome-ignore lint/style/noNonNullAssertion: need to fix
+        files.map(async (file) => client.bucket.delete(file._id))
+      );
       return true;
     }
     const object = await client.store.deleteMany({ key: { $in: keys } });
@@ -223,7 +247,12 @@ var KeyvMongo = class extends EventEmitter {
         "metadata.expiresAt": {
           $lte: new Date(Date.now())
         }
-      }).toArray().then(async (expiredFiles) => Promise.all(expiredFiles.map(async (file) => client.bucket.delete(file._id))).then(() => true));
+      }).toArray().then(
+        async (expiredFiles) => Promise.all(
+          // biome-ignore lint/style/noNonNullAssertion: need to fix
+          expiredFiles.map(async (file) => client.bucket.delete(file._id))
+        ).then(() => true)
+      );
     });
   }
   async clearUnusedFor(seconds) {
@@ -240,7 +269,10 @@ var KeyvMongo = class extends EventEmitter {
         $lte: new Date(Date.now() - seconds * 1e3)
       }
     }).toArray();
-    await Promise.all(lastAccessedFiles.map(async (file) => client.bucket.delete(file._id)));
+    await Promise.all(
+      // biome-ignore lint/style/noNonNullAssertion: need to fix
+      lastAccessedFiles.map(async (file) => client.bucket.delete(file._id))
+    );
     return true;
   }
   async *iterator(namespace) {
@@ -248,7 +280,10 @@ var KeyvMongo = class extends EventEmitter {
     const regexp = new RegExp(`^${namespace ? namespace + ":" : ".*"}`);
     const iterator = this.opts.useGridFS ? client.store.find({
       filename: regexp
-    }).map(async (x) => [x.filename, await this.get(x.filename)]) : client.store.find({
+    }).map(async (x) => [
+      x.filename,
+      await this.get(x.filename)
+    ]) : client.store.find({
       key: regexp
     }).map((x) => [x.key, x.value]);
     yield* iterator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keyv/mongo",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "MongoDB storage adapter for Keyv",
   "type": "module",
   "main": "dist/index.cjs",
@@ -12,27 +12,6 @@
       "import": "./dist/index.js"
     }
   },
-  "xo": {
-    "rules": {
-      "import/no-named-as-default": "off",
-      "unicorn/prefer-module": "off",
-      "unicorn/prefer-event-target": "off",
-      "unicorn/no-array-reduce": "off",
-      "unicorn/prefer-object-from-entries": "off",
-      "unicorn/prefer-node-protocol": "off",
-      "@typescript-eslint/no-unsafe-assignment": "off",
-      "@typescript-eslint/no-unsafe-call": "off",
-      "@typescript-eslint/no-unsafe-return": "off",
-      "@typescript-eslint/no-unsafe-argument": "off",
-      "import/extensions": "off",
-      "@typescript-eslint/consistent-type-imports": "off",
-      "@typescript-eslint/naming-convention": "off",
-      "@typescript-eslint/no-floating-promises": "off",
-      "import/no-extraneous-dependencies": "off",
-      "@typescript-eslint/no-confusing-void-expression": "off",
-      "@typescript-eslint/no-empty-function": "off"
-    }
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/jaredwray/keyv.git"
@@ -56,14 +35,16 @@
   },
   "homepage": "https://github.com/jaredwray/keyv",
   "dependencies": {
-    "mongodb": "^6.8.0"
+    "mongodb": "^6.20.0"
   },
   "devDependencies": {
-    "keyv": "^5.0.0",
+    "@biomejs/biome": "^2.2.5",
     "rimraf": "^6.0.1",
-    "tsd": "^0.31.1",
-    "xo": "^0.59.3",
-    "@keyv/test-suite": "^2.0.7"
+    "tsd": "^0.33.0",
+    "@keyv/test-suite": "^2.1.1"
+  },
+  "peerDependencies": {
+    "keyv": "^5.5.3"
   },
   "tsd": {
     "directory": "test"
@@ -74,8 +55,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",
+    "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"
   }
 }