@tomsd/mongodbclient 3.0.14 → 4.0.1

package/README.md

@@ -3,12 +3,17 @@
 It's a handy mongodb client for easy-use.  
 See [mongodbclient.netlify.app](https://mongodbclient.netlify.app/) for details.
 
-![npm](https://img.shields.io/npm/v/@tomsd/mongodbclient)
-![NPM](https://img.shields.io/npm/l/@tomsd/mongodbclient)
-![npms.io (quality)](https://img.shields.io/npms-io/quality-score/@tomsd/mongodbclient)
-![Libraries.io dependency status for latest release](https://img.shields.io/librariesio/release/npm/@tomsd/mongodbclient)
-![Maintenance](https://img.shields.io/maintenance/yes/2024)
-![depends on mongodb@4](https://img.shields.io/badge/depends%20on-mongodb@4-informational)
+![npm](https://img.shields.io/npm/v/@tomsd/mongodbclient?style=for-the-badge&logo=npm)
+![NPM](https://img.shields.io/npm/l/@tomsd/mongodbclient?style=for-the-badge&logo=npm)
+![release date](https://img.shields.io/github/release-date/tomsdoo/mongodbclient?style=for-the-badge&logo=npm)
+![Libraries.io dependency status for latest release](https://img.shields.io/librariesio/release/npm/@tomsd/mongodbclient?style=for-the-badge&logo=npm)
+
+![ci](https://img.shields.io/github/actions/workflow/status/tomsdoo/mongodbclient/ci.yml?style=social&logo=github)
+![checks](https://img.shields.io/github/check-runs/tomsdoo/mongodbclient/main?style=social&logo=github)
+![top language](https://img.shields.io/github/languages/top/tomsdoo/mongodbclient?style=social&logo=typescript)
+![Maintenance](https://img.shields.io/maintenance/yes/2024?style=social&logo=github)
+![depends on mongodb@6](https://img.shields.io/badge/mongodb-mongodb@6-informational?style=social&logo=mongodb)
+![depends on node greater or equal 18](https://img.shields.io/badge/node.js-%3E%3D%2018-lightyellow?style=social&logo=nodedotjs)
 
 ## Installation
 ``` sh
@@ -49,9 +54,6 @@ const items = [
   const names = await mdbc.distinct("name");
   console.log(`distinct names: ${names.length}`); // 4
 
-  const { storageSize } = await mdbc.stats();
-  console.log(`storageSize: ${storageSize}`);
-
   const itemLength = await mdbc.count();
   console.log(`count: ${itemLength}`); // 4
 

package/dist/mongodbclient.cjs.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -24,8 +25,8 @@ __export(mongodbclient_exports, {
   default: () => mongodbclient_default
 });
 module.exports = __toCommonJS(mongodbclient_exports);
+var import_mongodb = require("mongodb");
 var import_uuid = require("uuid");
-var MongoClient = require("mongodb").MongoClient;
 var MongoConnection = class {
   _client;
   _db;
@@ -67,8 +68,10 @@ var MClient = class {
     return await this.getConnected();
   }
   async getConnected() {
-    const client = new MongoClient(this.m_uri, { useUnifiedTopology: true });
-    return client.connect().then((client2) => {
+    const client = new import_mongodb.MongoClient(this.m_uri, {
+      serverApi: import_mongodb.ServerApiVersion.v1
+    });
+    return await client.connect().then((client2) => {
       const db = client2.db(this.m_db);
       const collection = db.collection(this.m_collection);
       return new MongoConnection(client2, db, collection);
@@ -87,15 +90,18 @@ var MClient = class {
         { upsert: true, writeConcern: { w: 1 } }
       );
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async read(condition = {}, opt) {
     const connection = await this.getConnected();
     try {
-      return await connection.collection.find(condition, opt).toArray();
+      return await connection.collection.find(
+        condition,
+        opt
+      ).toArray();
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async distinct(key, condition = {}) {
@@ -103,40 +109,57 @@ var MClient = class {
     try {
       return await connection.collection.distinct(
         key,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         condition
       );
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async remove(condition) {
     const connection = await this.getConnected();
     try {
-      return await connection.collection.deleteMany(condition, {
-        writeConcern: { w: 1 }
-      });
+      return await connection.collection.deleteMany(
+        condition,
+        {
+          writeConcern: { w: 1 }
+        }
+      );
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async stats() {
     const connection = await this.getConnected();
     try {
-      return await connection.collection.stats();
+      const [collStats] = await connection.collection.aggregate([
+        {
+          $collStats: {
+            latencyStats: {
+              histograms: true
+            },
+            count: {},
+            queryExecStats: {},
+            storageStats: {
+              scale: 1
+            }
+          }
+        }
+      ]).toArray();
+      return collStats;
+    } catch (_) {
+      return null;
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async count(condition = {}) {
     const connection = await this.getConnected();
     try {
       return await connection.collection.countDocuments(
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         condition
       );
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async insertMany(items) {
@@ -146,11 +169,15 @@ var MClient = class {
       ...item
     }));
     try {
-      return await connection.collection.insertMany(savingItems, {
-        writeConcern: { w: 1 }
-      });
+      return await connection.collection.insertMany(
+        // biome-ignore lint: Array<T>
+        savingItems,
+        {
+          writeConcern: { w: 1 }
+        }
+      );
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async dbStats() {
@@ -158,7 +185,7 @@ var MClient = class {
     try {
       return await connection.db.stats();
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async getCollections() {
@@ -166,7 +193,7 @@ var MClient = class {
     try {
       return await connection.db.collections();
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
 };
@@ -176,8 +203,3 @@ var mongodbclient_default = MClient;
   MClient,
   MongoConnection
 });
-/*!
- * @license mongodbclient
- * (c) 2020 tom
- * License: MIT
- */

package/dist/mongodbclient.d.mts

@@ -0,0 +1,33 @@
+import { MongoClient, Db, Collection, UpdateResult, WithId, Document, DeleteResult, InsertManyResult } from 'mongodb';
+
+declare class MongoConnection {
+    private readonly _client;
+    private readonly _db;
+    private readonly _collection;
+    constructor(client: MongoClient, db: Db, collection: Collection);
+    get client(): MongoClient;
+    get db(): Db;
+    get collection(): Collection;
+}
+declare class MClient {
+    private readonly m_uri;
+    private readonly m_db;
+    private readonly m_collection;
+    constructor(uri: string, db: string, collection: string);
+    get uri(): string;
+    get db(): string;
+    get collection(): string;
+    connect(): Promise<MongoConnection>;
+    protected getConnected(): Promise<MongoConnection>;
+    upsert(pobj: any): Promise<UpdateResult>;
+    read(condition?: any, opt?: any): Promise<WithId<Document>[]>;
+    distinct(key: string, condition?: any): Promise<any[]>;
+    remove(condition: any): Promise<DeleteResult>;
+    stats(): Promise<Document | null>;
+    count(condition?: any): Promise<number>;
+    insertMany(items: any[]): Promise<InsertManyResult<Document>>;
+    dbStats(): Promise<Document>;
+    getCollections(): Promise<Collection[]>;
+}
+
+export { MClient, MongoConnection, MClient as default };

package/dist/{esm/mongodbclient.d.ts → mongodbclient.d.ts}

@@ -1,20 +1,15 @@
-/*!
- * @license mongodbclient
- * (c) 2020 tom
- * License: MIT
- */
-import type { Db, Collection, CollStats, DeleteResult, Document, InsertManyResult, UpdateResult, WithId } from "mongodb";
-declare const MongoClient: any;
-export declare class MongoConnection {
+import { MongoClient, Db, Collection, UpdateResult, WithId, Document, DeleteResult, InsertManyResult } from 'mongodb';
+
+declare class MongoConnection {
     private readonly _client;
     private readonly _db;
     private readonly _collection;
-    constructor(client: typeof MongoClient, db: Db, collection: Collection);
-    get client(): typeof MongoClient;
+    constructor(client: MongoClient, db: Db, collection: Collection);
+    get client(): MongoClient;
     get db(): Db;
     get collection(): Collection;
 }
-export declare class MClient {
+declare class MClient {
     private readonly m_uri;
     private readonly m_db;
     private readonly m_collection;
@@ -25,13 +20,14 @@ export declare class MClient {
     connect(): Promise<MongoConnection>;
     protected getConnected(): Promise<MongoConnection>;
     upsert(pobj: any): Promise<UpdateResult>;
-    read(condition?: any, opt?: any): Promise<Array<WithId<Document>>>;
+    read(condition?: any, opt?: any): Promise<WithId<Document>[]>;
     distinct(key: string, condition?: any): Promise<any[]>;
     remove(condition: any): Promise<DeleteResult>;
-    stats(): Promise<CollStats>;
+    stats(): Promise<Document | null>;
     count(condition?: any): Promise<number>;
     insertMany(items: any[]): Promise<InsertManyResult<Document>>;
     dbStats(): Promise<Document>;
     getCollections(): Promise<Collection[]>;
 }
-export default MClient;
+
+export { MClient, MongoConnection, MClient as default };

package/dist/mongodbclient.esm.js

@@ -1,14 +1,6 @@
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
 // src/mongodbclient.ts
+import { MongoClient, ServerApiVersion } from "mongodb";
 import { v4 as uuidv4 } from "uuid";
-var MongoClient = __require("mongodb").MongoClient;
 var MongoConnection = class {
   _client;
   _db;
@@ -50,8 +42,10 @@ var MClient = class {
     return await this.getConnected();
   }
   async getConnected() {
-    const client = new MongoClient(this.m_uri, { useUnifiedTopology: true });
-    return client.connect().then((client2) => {
+    const client = new MongoClient(this.m_uri, {
+      serverApi: ServerApiVersion.v1
+    });
+    return await client.connect().then((client2) => {
       const db = client2.db(this.m_db);
       const collection = db.collection(this.m_collection);
       return new MongoConnection(client2, db, collection);
@@ -70,15 +64,18 @@ var MClient = class {
         { upsert: true, writeConcern: { w: 1 } }
       );
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async read(condition = {}, opt) {
     const connection = await this.getConnected();
     try {
-      return await connection.collection.find(condition, opt).toArray();
+      return await connection.collection.find(
+        condition,
+        opt
+      ).toArray();
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async distinct(key, condition = {}) {
@@ -86,40 +83,57 @@ var MClient = class {
     try {
       return await connection.collection.distinct(
         key,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         condition
       );
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async remove(condition) {
     const connection = await this.getConnected();
     try {
-      return await connection.collection.deleteMany(condition, {
-        writeConcern: { w: 1 }
-      });
+      return await connection.collection.deleteMany(
+        condition,
+        {
+          writeConcern: { w: 1 }
+        }
+      );
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async stats() {
     const connection = await this.getConnected();
     try {
-      return await connection.collection.stats();
+      const [collStats] = await connection.collection.aggregate([
+        {
+          $collStats: {
+            latencyStats: {
+              histograms: true
+            },
+            count: {},
+            queryExecStats: {},
+            storageStats: {
+              scale: 1
+            }
+          }
+        }
+      ]).toArray();
+      return collStats;
+    } catch (_) {
+      return null;
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async count(condition = {}) {
     const connection = await this.getConnected();
     try {
       return await connection.collection.countDocuments(
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         condition
       );
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async insertMany(items) {
@@ -129,11 +143,15 @@ var MClient = class {
       ...item
     }));
     try {
-      return await connection.collection.insertMany(savingItems, {
-        writeConcern: { w: 1 }
-      });
+      return await connection.collection.insertMany(
+        // biome-ignore lint: Array<T>
+        savingItems,
+        {
+          writeConcern: { w: 1 }
+        }
+      );
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async dbStats() {
@@ -141,7 +159,7 @@ var MClient = class {
     try {
       return await connection.db.stats();
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
   async getCollections() {
@@ -149,7 +167,7 @@ var MClient = class {
     try {
       return await connection.db.collections();
     } finally {
-      connection.client.close();
+      await connection.client.close();
     }
   }
 };
@@ -159,8 +177,3 @@ export {
   MongoConnection,
   mongodbclient_default as default
 };
-/*!
- * @license mongodbclient
- * (c) 2020 tom
- * License: MIT
- */

package/package.json

@@ -1,36 +1,34 @@
 {
   "name": "@tomsd/mongodbclient",
-  "version": "3.0.14",
+  "version": "4.0.1",
   "description": "It's a handy mongodb client for easy-use.",
-  "main": "dist/mongodbclient.cjs.js",
-  "module": "dist/mongodbclient.esm.js",
-  "types": "dist/esm/mongodbclient.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/mongodbclient.d.ts",
+      "import": "./dist/mongodbclient.esm.js",
+      "require": "./dist/mogodbclient.cjs.js"
+    }
+  },
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "tsup && tsc --project tsconfig.esm.json",
-    "format": "npm run format:src && npm run format:test",
-    "format:document": "prettier --write docs/**/*.html",
-    "format:src": "prettier --write src/**/*.ts",
-    "format:test": "prettier --write __test__/**/*.ts",
-    "lint:src": "ESLINT_USE_FLAT_CONFIG=false eslint src/**/*.ts",
-    "lint:test": "ESLINT_USE_FLAT_CONFIG=false eslint __test__/**/*.ts",
+    "build": "tsup",
+    "lint": "biome check",
     "prepare": "husky",
     "serve:doc": "mdbook --serve --directory docs",
+    "test:local": "docker run --name mongodb-mongodbclient --rm -d -p 27017:27017 -e MONGO_INITDB_ROOT_USERNAME=user -e MONGO_INITDB_ROOT_PASSWORD=password mongodb/mongodb-community-server:6.0.3-ubuntu2204 && npx vitest run && docker container stop mongodb-mongodbclient",
     "test": "vitest"
   },
   "lint-staged": {
     "docs/**/*.html": [
-      "npm run format:document"
+      "npm run lint"
     ],
     "src/**/*.ts": [
-      "npm run lint:src",
-      "npm run format:src"
+      "npm run lint"
     ],
     "__test__/**/*.ts": [
-      "npm run lint:test",
-      "npm run format:test"
+      "npm run lint"
     ]
   },
   "keywords": [
@@ -43,25 +41,19 @@
     "url": "https://github.com/tomsdoo/mongodbclient"
   },
   "dependencies": {
-    "mongodb": "4.7.0",
-    "uuid": "9.0.1"
+    "mongodb": "6.11.0",
+    "uuid": "11.0.3"
   },
   "devDependencies": {
-    "@tomsd/md-book": "1.2.0",
-    "@types/node": "20.12.12",
-    "@types/uuid": "9.0.8",
-    "@typescript-eslint/eslint-plugin": "7.9.0",
+    "@biomejs/biome": "1.9.4",
+    "@tomsd/md-book": "1.3.3",
+    "@types/node": "22.9.3",
+    "@types/uuid": "10.0.0",
     "dotenv": "16.4.5",
-    "eslint": "8.57.0",
-    "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-n": "17.7.0",
-    "eslint-plugin-promise": "6.1.1",
-    "husky": "9.0.11",
-    "lint-staged": "15.2.2",
-    "prettier": "3.2.5",
-    "tsup": "8.0.2",
-    "typescript": "5.4.5",
-    "vitest": "1.6.0"
+    "husky": "9.1.7",
+    "lint-staged": "15.2.10",
+    "tsup": "8.3.5",
+    "typescript": "5.7.2",
+    "vitest": "2.1.5"
   }
 }

package/dist/esm/mongodbclient.js

@@ -1,175 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { v4 as uuidv4 } from "uuid";
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const MongoClient = require("mongodb").MongoClient;
-export class MongoConnection {
-    constructor(client, db, collection) {
-        this._client = client;
-        this._db = db;
-        this._collection = collection;
-    }
-    get client() {
-        return this._client;
-    }
-    get db() {
-        return this._db;
-    }
-    get collection() {
-        return this._collection;
-    }
-}
-export class MClient {
-    constructor(uri, db, collection) {
-        this.m_uri = uri;
-        this.m_db = db;
-        this.m_collection = collection;
-    }
-    get uri() {
-        return this.m_uri;
-    }
-    get db() {
-        return this.m_db;
-    }
-    get collection() {
-        return this.m_collection;
-    }
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.getConnected();
-        });
-    }
-    getConnected() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const client = new MongoClient(this.m_uri, { useUnifiedTopology: true });
-            return client.connect().then((client) => {
-                const db = client.db(this.m_db);
-                const collection = db.collection(this.m_collection);
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                return new MongoConnection(client, db, collection);
-            });
-        });
-    }
-    upsert(pobj) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const savingObj = Object.assign({ _id: uuidv4() }, pobj);
-            const connection = yield this.getConnected();
-            try {
-                return yield connection.collection.updateOne({ _id: savingObj._id }, { $set: savingObj }, { upsert: true, writeConcern: { w: 1 } });
-            }
-            finally {
-                connection.client.close();
-            }
-        });
-    }
-    read() {
-        return __awaiter(this, arguments, void 0, function* (condition = {}, opt) {
-            const connection = yield this.getConnected();
-            try {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                return yield connection.collection.find(condition, opt).toArray();
-            }
-            finally {
-                connection.client.close();
-            }
-        });
-    }
-    distinct(key_1) {
-        return __awaiter(this, arguments, void 0, function* (key, condition = {}) {
-            const connection = yield this.getConnected();
-            try {
-                // eslint-disable-next-line
-                return (yield connection.collection.distinct(key, 
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                condition));
-            }
-            finally {
-                connection.client.close();
-            }
-        });
-    }
-    remove(condition) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnected();
-            try {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                return yield connection.collection.deleteMany(condition, {
-                    writeConcern: { w: 1 },
-                });
-            }
-            finally {
-                connection.client.close();
-            }
-        });
-    }
-    stats() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnected();
-            try {
-                return yield connection.collection.stats();
-            }
-            finally {
-                connection.client.close();
-            }
-        });
-    }
-    count() {
-        return __awaiter(this, arguments, void 0, function* (condition = {}) {
-            const connection = yield this.getConnected();
-            try {
-                // eslint-disable-next-line
-                return (yield connection.collection.countDocuments(
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                condition));
-            }
-            finally {
-                connection.client.close();
-            }
-        });
-    }
-    insertMany(items) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnected();
-            const savingItems = items.map((item) => (Object.assign({ _id: uuidv4() }, item)));
-            try {
-                // eslint-disable-next-line
-                return yield connection.collection.insertMany(savingItems, {
-                    writeConcern: { w: 1 },
-                });
-            }
-            finally {
-                connection.client.close();
-            }
-        });
-    }
-    dbStats() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnected();
-            try {
-                return yield connection.db.stats();
-            }
-            finally {
-                connection.client.close();
-            }
-        });
-    }
-    getCollections() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const connection = yield this.getConnected();
-            try {
-                return yield connection.db.collections();
-            }
-            finally {
-                connection.client.close();
-            }
-        });
-    }
-}
-export default MClient;