@tomsd/mongodbclient 2.1.0 → 2.2.1

package/README.md

@@ -7,13 +7,13 @@ npm install @tomsd/mongodbclient
 
 # Usage
 
-``` js
+``` typescript
+import { MClient } from "@tomsd/mongodbclient";
+
 const uri = "mongodb+srv://...";
 const dbname = "mydb";
 const collectionname = "mycollection";
 
-const MClient = require("@tomsd/mongodbclient").MClient;
-
 const mdbc = new MClient(uri, dbname, collectionname);
 
 const items = [
@@ -24,40 +24,49 @@ const items = [
 ];
 
 mdbc.insertMany(items)
-.then((r) => {
-  console.log(r.insertedCount); // 4
-  return mdbc.getCollections();
-})
-.then((collections) => {
-  console.log(collections.some((collection) => collection.s.namespace.db === dbname));
-  return mdbc.read();
-})
-.then((docs) => {
-  console.log(docs.length >= 4);
-  return mdbc.upsert({_id:docs[0]._id, name:"david"});
-})
-.then((r) => {
-  console.log(r.upsertedCount + r.modifiedCount);
-  return mdbc.distinct("name");
-})
-.then((names) => {
-  console.log(names);
-  return mdbc.stats();
-})
-.then((r) => {
-  console.log(r.storageSize);
-  return mdbc.count();
-})
-.then((n) => {
-  console.log(n);
-  return mdbc.remove();
-})
-.then((r) => {
-  console.log(r.deletedCount);
-})
-.catch((e) => {
-  console.error(e);
-});
-
+  .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);
+  });
 
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomsd/mongodbclient",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "",
   "main": "dist/cjs/mongodbclient.js",
   "module": "dist/esm/mongodbclient.js",
@@ -8,7 +8,7 @@
   "scripts": {
     "build": "tsc --project tsconfig.cjs.json && tsc --project tsconfig.esm.json",
     "test": "exit 0",
-    "test_with_dburi": "mocha test/test.js --timeout 20000"
+    "test_with_dburi": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha -r ts-node/register \"test/test.ts\" --timeout 30000"
   },
   "keywords": [
     "mongodb"
@@ -20,9 +20,13 @@
     "mongodb": "^3.6.6"
   },
   "devDependencies": {
+    "@types/mocha": "^9.1.1",
     "@types/mongodb": "^3.5.31",
     "@types/node": "^14.14.5",
+    "@types/uuid": "^8.3.4",
     "mocha": "^7.0.1",
-    "typescript": "^4.0.5"
+    "ts-node": "^10.8.1",
+    "typescript": "^4.0.5",
+    "uuid": "^8.3.2"
   }
 }

package/test/test.ts

@@ -0,0 +1,60 @@
+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 dbName = uuidv4();
+const collName = uuidv4();
+
+const mdbc = new MClient(mongouri, dbName, collName);
+
+const items = [
+  {name:"alice"},
+  {name:"bob"},
+  {name:"charlie"},
+  {name:"alice"}
+];
+
+describe("MClient", () => {
+  it("insertMany()", async () => {
+    const { insertedCount } = (await mdbc.insertMany(items)) as { insertedCount: number };
+    assert.equal(insertedCount, items.length);
+  });
+
+  it("getCollections()", async () => {
+    const collections = await mdbc.getCollections();
+    assert(collections.length > 0);
+  });
+
+  it("read()", async () => {
+    const docs = (await mdbc.read({})) as any[];
+    assert.equal(docs.length, items.length);
+  });
+
+  it("upsert()", async () => {
+    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[];
+    assert.equal(names.length, 4);
+  });
+
+  it("stats()", async () => {
+    const { storageSize } = (await mdbc.stats()) as { storageSize: number };
+    assert(storageSize > 0);
+  });
+
+  it("count()", async () => {
+    const n = await mdbc.count({name:"alice"});
+    assert.equal(n,1);
+  });
+
+  it("remove()", async () => {
+    const { deletedCount } = (await mdbc.remove({})) as { deletedCount: number };
+    assert.equal(deletedCount, items.length);
+  });
+});

package/test/test.js

@@ -1,84 +0,0 @@
-const mongouri = "mongodb+srv://...";
-const dbName = `db${(new Date()).getTime().toString()}`;
-const collName = `col${(new Date()).getTime().toString()}`;
-
-const assert = require("assert");
-const MClient = require("../dist/cjs/mongodbclient.js").MClient;
-
-const mdbc = new MClient(mongouri, dbName, collName);
-
-const items = [
-  {name:"alice"},
-  {name:"bob"},
-  {name:"charlie"},
-  {name:"alice"}
-];
-
-describe("MClient", function(){
-  it("insertMany()",function(done){
-    mdbc.insertMany(items)
-    .then(function(r){
-      assert.equal(r.insertedCount, items.length);
-      done();
-    });
-  });
-
-  it("getCollections()", function(done){
-    mdbc.getCollections()
-    .then(function(collections){
-      assert(collections.length > 0);
-      done();
-    });
-  });
-
-  it("read()", function(done){
-    mdbc.read()
-    .then(function(docs){
-      assert.equal(docs.length, items.length);
-      done();
-    });
-  });
-
-  it("upsert()", function(done){
-    mdbc.read()
-    .then(function(docs){
-      return mdbc.upsert({_id:docs[0]._id, name:"david"});
-    })
-    .then(function(r){
-      assert.equal(r.modifiedCount, 1);
-      done();
-    });
-  });
-
-  it("distinct()", function(done){
-    mdbc.distinct("name")
-    .then(function(names){
-      assert.equal(names.length, 4);
-      done();
-    });
-  });
-
-  it("stats()", function(done){
-    mdbc.stats()
-    .then(function(r){
-      assert(r.storageSize > 0);
-      done();
-    });
-  });
-
-  it("count()", function(done){
-    mdbc.count({name:"alice"})
-    .then(function(n){
-      assert.equal(n,1);
-      done();
-    });
-  });
-
-  it("remove()", function(done){
-    mdbc.remove()
-    .then(function(r){
-      assert.equal(r.deletedCount, items.length);
-      done();
-    });
-  });
-});