@tomsd/mongodbclient 2.2.2 → 2.5.0

package/dist/cjs/mongodbclient.d.ts

@@ -25,8 +25,8 @@ export declare class MClient {
     connect(): Promise<MongoConnection>;
     protected getConnected(): Promise<MongoConnection>;
     upsert(pobj: any): Promise<unknown>;
-    read(condition: any, opt?: any): Promise<unknown>;
-    distinct(key: string, condition: any): Promise<unknown>;
+    read(condition?: any, opt?: any): Promise<unknown>;
+    distinct(key: string, condition?: any): Promise<unknown>;
     remove(condition: any): Promise<unknown>;
     stats(): Promise<unknown>;
     count(condition: any): Promise<number>;

package/dist/cjs/mongodbclient.js

@@ -9,7 +9,7 @@ exports.MClient = exports.MongoConnection = void 0;
 const MongoClient = require("mongodb").MongoClient;
 const Db = require("mongodb").Db;
 const { Collection, UpdateWriteOpResult, deleteWriteOpResult, insertWriteOpResult } = require("mongodb");
-const rand = require("@tomsd/rand").default;
+const uuid_1 = require("uuid");
 class MongoConnection {
     constructor(client, db, collection) {
         this._client = client;
@@ -62,7 +62,7 @@ class MClient {
     }
     upsert(pobj) {
         const that = this;
-        pobj._id = "_id" in pobj ? pobj._id : rand.id(rand.char());
+        pobj._id = "_id" in pobj ? pobj._id : uuid_1.v4();
         return new Promise(function (resolve, reject) {
             that.getConnected()
                 .then(function (conn) {
@@ -78,7 +78,7 @@ class MClient {
             }, reject);
         });
     }
-    read(condition, opt) {
+    read(condition = {}, opt) {
         const that = this;
         return new Promise(function (resolve, reject) {
             that.getConnected()
@@ -96,7 +96,7 @@ class MClient {
             });
         });
     }
-    distinct(key, condition) {
+    distinct(key, condition = {}) {
         const that = this;
         return new Promise(function (resolve, reject) {
             that.getConnected()
@@ -167,7 +167,7 @@ class MClient {
     insertMany(items) {
         const that = this;
         items.forEach(function (item) {
-            item._id = item._id ? item._id : rand.id(rand.char());
+            item._id = item._id ? item._id : uuid_1.v4();
         });
         return new Promise(function (resolve, reject) {
             that.getConnected()

package/dist/esm/mongodbclient.d.ts

@@ -25,8 +25,8 @@ export declare class MClient {
     connect(): Promise<MongoConnection>;
     protected getConnected(): Promise<MongoConnection>;
     upsert(pobj: any): Promise<unknown>;
-    read(condition: any, opt?: any): Promise<unknown>;
-    distinct(key: string, condition: any): Promise<unknown>;
+    read(condition?: any, opt?: any): Promise<unknown>;
+    distinct(key: string, condition?: any): Promise<unknown>;
     remove(condition: any): Promise<unknown>;
     stats(): Promise<unknown>;
     count(condition: any): Promise<number>;

package/dist/esm/mongodbclient.js

@@ -6,7 +6,7 @@
 const MongoClient = require("mongodb").MongoClient;
 const Db = require("mongodb").Db;
 const { Collection, UpdateWriteOpResult, deleteWriteOpResult, insertWriteOpResult } = require("mongodb");
-const rand = require("@tomsd/rand").default;
+import { v4 as uuidv4 } from "uuid";
 export class MongoConnection {
     constructor(client, db, collection) {
         this._client = client;
@@ -58,7 +58,7 @@ export class MClient {
     }
     upsert(pobj) {
         const that = this;
-        pobj._id = "_id" in pobj ? pobj._id : rand.id(rand.char());
+        pobj._id = "_id" in pobj ? pobj._id : uuidv4();
         return new Promise(function (resolve, reject) {
             that.getConnected()
                 .then(function (conn) {
@@ -74,7 +74,7 @@ export class MClient {
             }, reject);
         });
     }
-    read(condition, opt) {
+    read(condition = {}, opt) {
         const that = this;
         return new Promise(function (resolve, reject) {
             that.getConnected()
@@ -92,7 +92,7 @@ export class MClient {
             });
         });
     }
-    distinct(key, condition) {
+    distinct(key, condition = {}) {
         const that = this;
         return new Promise(function (resolve, reject) {
             that.getConnected()
@@ -163,7 +163,7 @@ export class MClient {
     insertMany(items) {
         const that = this;
         items.forEach(function (item) {
-            item._id = item._id ? item._id : rand.id(rand.char());
+            item._id = item._id ? item._id : uuidv4();
         });
         return new Promise(function (resolve, reject) {
             that.getConnected()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomsd/mongodbclient",
-  "version": "2.2.2",
+  "version": "2.5.0",
   "description": "",
   "main": "dist/cjs/mongodbclient.js",
   "module": "dist/esm/mongodbclient.js",
@@ -16,7 +16,6 @@
   "author": "tom",
   "license": "MIT",
   "dependencies": {
-    "@tomsd/rand": "^3.0.0",
     "mongodb": "^3.6.6",
     "uuid": "^8.3.2"
   },
@@ -25,6 +24,7 @@
     "@types/mongodb": "^3.5.31",
     "@types/node": "^14.14.5",
     "@types/uuid": "^8.3.4",
+    "dotenv": "^16.0.1",
     "mocha": "^7.0.1",
     "ts-node": "^10.8.1",
     "typescript": "^4.0.5"

package/test/test.ts

@@ -1,9 +1,13 @@
+// @ts-ignore
+import dotenv from "dotenv";
+dotenv.config();
+
 import {describe, it } from "mocha";
 import { MClient } from "../src/mongodbclient";
 import { strict as assert } from "assert";
 import { v4 as uuidv4 } from "uuid";
 
-const mongouri = "mongodb+srv://...";
+const mongouri = process.env.MONGODB_URI as string;
 const dbName = uuidv4();
 const collName = uuidv4();
 
@@ -28,18 +32,18 @@ describe("MClient", () => {
   });
 
   it("read()", async () => {
-    const docs = (await mdbc.read({})) as any[];
+    const docs = (await mdbc.read()) as any[];
     assert.equal(docs.length, items.length);
   });
 
   it("upsert()", async () => {
-    const docs = (await mdbc.read({})) as any[];
+    const docs = (await mdbc.read()) as any[];
     const { modifiedCount } = (await mdbc.upsert({ _id: docs[0]._id, name: "david" })) as { modifiedCount: number };
     assert.equal(modifiedCount, 1);
   });
 
   it("distinct()", async () => {
-    const names = (await mdbc.distinct("name", {})) as string[];
+    const names = (await mdbc.distinct("name")) as string[];
     assert.equal(names.length, 4);
   });