@tomsd/mongodbclient 2.8.0 → 3.0.1

package/README.md

@@ -11,62 +11,51 @@ npm install @tomsd/mongodbclient
 import { MClient } from "@tomsd/mongodbclient";
 
 const uri = "mongodb+srv://...";
-const dbname = "mydb";
-const collectionname = "mycollection";
+const dbName = "mydb";
+const collectionName = "mycollection";
 
-const mdbc = new MClient(uri, dbname, collectionname);
+const mdbc = new MClient(uri, dbName, collectionName);
 
 const items = [
-  {name:"alice"},
-  {name:"bob"},
-  {name:"charlie"},
-  {name:"alice"}
+  { name: "alice" },
+  { name: "bob" },
+  { name: "charlie" },
+  { name: "alice" }
 ];
 
-mdbc.insertMany(items)
-  .then((r: any) => {
-    console.log(r.insertedCount); // 4
-    return mdbc.getCollections();
-  })
-  .then((collections) => {
-    console.log(
-      collections.find(
-        collection => collection.s.namespace.db === dbname
-      )
-    );
-    return mdbc.read({});
-  })
-  .then((docs: any) => {
-    console.log({
-      docs,
-      state: docs.length >= 4
-    });
-    return mdbc.upsert({
-      _id:docs[0]._id,
-      name:"david"
-    });
-  })
-  .then((r: any) => {
-    console.log(r.upsertedCount + r.modifiedCount);
-    return mdbc.distinct("name", {});
-  })
-  .then((names) => {
-    console.log(names);
-    return mdbc.stats();
-  })
-  .then((r: any) => {
-    console.log(r.storageSize);
-    return mdbc.count({});
-  })
-  .then((n) => {
-    console.log(n);
-    return mdbc.remove({});
-  })
-  .then((r: any) => {
-    console.log(r.deletedCount);
-  })
-  .catch((e) => {
-    console.error(e);
+(async () => {
+  const { insertedCount } = await mdbc.insertMany(items);
+  console.log(insertedCount); // 4
+
+  const collections = await mdbc.getCollections();
+  console.log(
+    collections.some(
+      // @ts-ignore
+      collection => collection.s.namespace.db === dbName
+    )
+  ); // true
+
+  const docs = await mdbc.read();
+  console.log(docs);
+
+  const { upsertedCount, modifiedCount } = await mdbc.upsert({
+    ...docs[0],
+    name: "david"
   });
+  console.log(`upsertedCount: ${upsertedCount}, modifiedCount: ${modifiedCount}`);
+
+  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
+
+  const { deletedCount } = await mdbc.remove({});
+  console.log(`deletedCount: ${deletedCount}`); // 4
+
+})();
 
 ```

package/dist/cjs/mongodbclient.d.ts

@@ -4,15 +4,15 @@
  * License: MIT
 */
 declare const MongoClient: any;
-declare const Db: any;
+import { Db, Collection, CollStats, WithId, Document, InsertManyResult, UpdateResult, DeleteResult } from "mongodb";
 export declare class MongoConnection {
     private _client;
     private _db;
     private _collection;
-    constructor(client: typeof MongoClient, db: typeof Db, collection: any);
+    constructor(client: typeof MongoClient, db: Db, collection: Collection);
     get client(): typeof MongoClient;
-    get db(): typeof Db;
-    get collection(): any;
+    get db(): Db;
+    get collection(): Collection;
 }
 export declare class MClient {
     private m_uri;
@@ -22,16 +22,16 @@ export declare class MClient {
     get uri(): string;
     get db(): string;
     get collection(): string;
-    connect(): Promise<any>;
-    protected getConnected(): Promise<any>;
-    upsert(pobj: any): Promise<any>;
-    read<T = any>(condition?: any, opt?: any): Promise<T[]>;
-    distinct(key: string, condition?: any): Promise<any>;
-    remove(condition: any): Promise<any>;
-    stats(): Promise<any>;
+    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<CollStats>;
     count(condition?: any): Promise<number>;
-    insertMany(items: any[]): Promise<any>;
-    dbStats(): Promise<any>;
-    getCollections(): Promise<any>;
+    insertMany(items: any[]): Promise<InsertManyResult<Document>>;
+    dbStats(): Promise<Document>;
+    getCollections(): Promise<Collection[]>;
 }
 export default MClient;

package/dist/cjs/mongodbclient.js

@@ -16,8 +16,6 @@ exports.MClient = exports.MongoConnection = void 0;
  * License: MIT
 */
 const MongoClient = require("mongodb").MongoClient;
-const Db = require("mongodb").Db;
-const { Collection, UpdateWriteOpResult, deleteWriteOpResult, insertWriteOpResult } = require("mongodb");
 const uuid_1 = require("uuid");
 class MongoConnection {
     constructor(client, db, collection) {
@@ -52,7 +50,9 @@ class MClient {
         return this.m_collection;
     }
     connect() {
-        return this.getConnected();
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.getConnected();
+        });
     }
     getConnected() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -68,7 +68,7 @@ class MClient {
     }
     upsert(pobj) {
         return __awaiter(this, void 0, void 0, function* () {
-            const savingObj = Object.assign({ _id: uuid_1.v4() }, pobj);
+            const savingObj = Object.assign({ _id: (0, uuid_1.v4)() }, pobj);
             const connection = yield this.getConnected();
             try {
                 return yield connection.collection.updateOne({ _id: savingObj._id }, { $set: savingObj }, { upsert: true, writeConcern: { w: 1 } });
@@ -102,7 +102,7 @@ class MClient {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield this.getConnected();
             try {
-                return yield connection.collection.distinct(key, condition);
+                return (yield connection.collection.distinct(key, condition));
             }
             catch (e) {
                 throw e;
@@ -144,7 +144,7 @@ class MClient {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield this.getConnected();
             try {
-                return yield connection.collection.countDocuments(condition);
+                return (yield connection.collection.countDocuments(condition));
             }
             catch (e) {
                 throw e;
@@ -157,7 +157,7 @@ class MClient {
     insertMany(items) {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield this.getConnected();
-            const savingItems = items.map(item => (Object.assign({ _id: uuid_1.v4() }, item)));
+            const savingItems = items.map(item => (Object.assign({ _id: (0, uuid_1.v4)() }, item)));
             try {
                 return yield connection.collection
                     .insertMany(savingItems, { writeConcern: { w: 1 } });

package/dist/esm/mongodbclient.d.ts

@@ -4,15 +4,15 @@
  * License: MIT
 */
 declare const MongoClient: any;
-declare const Db: any;
+import { Db, Collection, CollStats, WithId, Document, InsertManyResult, UpdateResult, DeleteResult } from "mongodb";
 export declare class MongoConnection {
     private _client;
     private _db;
     private _collection;
-    constructor(client: typeof MongoClient, db: typeof Db, collection: any);
+    constructor(client: typeof MongoClient, db: Db, collection: Collection);
     get client(): typeof MongoClient;
-    get db(): typeof Db;
-    get collection(): any;
+    get db(): Db;
+    get collection(): Collection;
 }
 export declare class MClient {
     private m_uri;
@@ -22,16 +22,16 @@ export declare class MClient {
     get uri(): string;
     get db(): string;
     get collection(): string;
-    connect(): Promise<any>;
-    protected getConnected(): Promise<any>;
-    upsert(pobj: any): Promise<any>;
-    read<T = any>(condition?: any, opt?: any): Promise<T[]>;
-    distinct(key: string, condition?: any): Promise<any>;
-    remove(condition: any): Promise<any>;
-    stats(): Promise<any>;
+    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<CollStats>;
     count(condition?: any): Promise<number>;
-    insertMany(items: any[]): Promise<any>;
-    dbStats(): Promise<any>;
-    getCollections(): Promise<any>;
+    insertMany(items: any[]): Promise<InsertManyResult<Document>>;
+    dbStats(): Promise<Document>;
+    getCollections(): Promise<Collection[]>;
 }
 export default MClient;

package/dist/esm/mongodbclient.js

@@ -13,8 +13,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
  * License: MIT
 */
 const MongoClient = require("mongodb").MongoClient;
-const Db = require("mongodb").Db;
-const { Collection, UpdateWriteOpResult, deleteWriteOpResult, insertWriteOpResult } = require("mongodb");
 import { v4 as uuidv4 } from "uuid";
 export class MongoConnection {
     constructor(client, db, collection) {
@@ -48,7 +46,9 @@ export class MClient {
         return this.m_collection;
     }
     connect() {
-        return this.getConnected();
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.getConnected();
+        });
     }
     getConnected() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -98,7 +98,7 @@ export class MClient {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield this.getConnected();
             try {
-                return yield connection.collection.distinct(key, condition);
+                return (yield connection.collection.distinct(key, condition));
             }
             catch (e) {
                 throw e;
@@ -140,7 +140,7 @@ export class MClient {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield this.getConnected();
             try {
-                return yield connection.collection.countDocuments(condition);
+                return (yield connection.collection.countDocuments(condition));
             }
             catch (e) {
                 throw e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomsd/mongodbclient",
-  "version": "2.8.0",
+  "version": "3.0.1",
   "description": "",
   "main": "dist/cjs/mongodbclient.js",
   "module": "dist/esm/mongodbclient.js",
@@ -16,17 +16,16 @@
   "author": "tom",
   "license": "MIT",
   "dependencies": {
-    "mongodb": "^3.6.6",
+    "mongodb": "^4.7.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
-    "@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"
+    "typescript": "^4.7.4"
   }
 }

package/test/test.ts

@@ -13,9 +13,7 @@ const collName = uuidv4();
 
 const mdbc = new MClient(mongouri, dbName, collName);
 
-type Seed = { name: string; };
-
-const items: Seed[] = [
+const items = [
   {name:"alice"},
   {name:"bob"},
   {name:"charlie"},
@@ -24,7 +22,7 @@ const items: Seed[] = [
 
 describe("MClient", () => {
   it("insertMany()", async () => {
-    const { insertedCount } = (await mdbc.insertMany(items)) as { insertedCount: number };
+    const { insertedCount } = await mdbc.insertMany(items);
     assert.equal(insertedCount, items.length);
   });
 
@@ -34,30 +32,30 @@ describe("MClient", () => {
   });
 
   it("read()", async () => {
-    const docs = await mdbc.read<Seed & { _id: string; }>();
-    const getNames = (items: Seed[]) =>
+    const docs = await mdbc.read();
+    const getNames = (items: any[]) =>
       Array.from(new Set(items.map(({ name }) => name))).sort().join("\n");
     assert.equal(getNames(docs), getNames(docs));
   });
 
   it("upsert()", async () => {
-    const docs = (await mdbc.read()) as any[];
-    const { modifiedCount } = (await mdbc.upsert({ _id: docs[0]._id, name: "david" })) as { modifiedCount: number };
+    const docs = await mdbc.read();
+    const { modifiedCount } = await mdbc.upsert({ _id: docs[0]._id, name: "david" });
     assert.equal(modifiedCount, 1);
   });
 
   it("distinct()", async () => {
-    const names = (await mdbc.distinct("name")) as string[];
+    const names = await mdbc.distinct("name");
     assert.equal(names.length, 4);
   });
 
   it("dbStats()", async () => {
-    const { storageSize } = (await mdbc.dbStats()) as { storageSize: number };
+    const { storageSize } = await mdbc.dbStats();
     assert(storageSize > 0);
   });
 
   it("stats()", async () => {
-    const { storageSize } = (await mdbc.stats()) as { storageSize: number };
+    const { storageSize } = await mdbc.stats();
     assert(storageSize > 0);
   });
 
@@ -67,7 +65,7 @@ describe("MClient", () => {
   });
 
   it("remove()", async () => {
-    const { deletedCount } = (await mdbc.remove({})) as { deletedCount: number };
+    const { deletedCount } = await mdbc.remove({});
     assert.equal(deletedCount, items.length);
   });
 });