@pi-r/mongodb 0.2.3 → 0.3.1

package/client/index.js

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.getSortValue = exports.getFilterValue = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = void 0;
 const path = require("path");
+const mongodb = require("mongodb");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/db/util");
 const Db = require("@e-mc/db");
 const Request = require("@e-mc/request");
 const DbPool = require('@e-mc/db/pool');
-const MONGODB_V3 = Db.checkSemVer("mongodb" /* STRINGS.PACKAGE_NAME */, 1, 4);
-const MONGODB_V330 = Db.checkSemVer("mongodb" /* STRINGS.PACKAGE_NAME */, '3.3.0');
-const MONGODB_V333 = Db.checkSemVer("mongodb" /* STRINGS.PACKAGE_NAME */, '3.3.0', '3.3.3');
-const MONGODB_V360 = Db.checkSemVer("mongodb" /* STRINGS.PACKAGE_NAME */, '3.6.0');
+const MONGODB_V3 = Db.checkSemVer("mongodb" /* STRINGS.MODULE_NAME */, 1, 4);
+const MONGODB_V330 = Db.checkSemVer("mongodb" /* STRINGS.MODULE_NAME */, '3.3.0');
+const MONGODB_V333 = Db.checkSemVer("mongodb" /* STRINGS.MODULE_NAME */, '3.3.0', '3.3.3');
+const MONGODB_V360 = Db.checkSemVer("mongodb" /* STRINGS.MODULE_NAME */, '3.6.0');
 const MONGODB_TOPOLOGY = MONGODB_V3 && MONGODB_V330;
 const MONGODB_NOPOOL = MONGODB_V3 && !MONGODB_V330;
 class MongoDBPool extends DbPool {
@@ -36,7 +37,7 @@ class MongoDBPool extends DbPool {
                     return (0, util_1.checkEmpty)(topology[name]);
                 }
             }
-            return (0, util_1.checkEmpty)(topology.s?.sessions);
+            return (0, util_1.checkEmpty)(topology.s?.sessions) && (0, util_1.checkEmpty)(topology.s?.servers);
         }
         return false;
     }
@@ -342,8 +343,7 @@ function setCredential(item) {
                         }
                     }
                 }
-                const db = require("mongodb" /* STRINGS.PACKAGE_NAME */);
-                new MongoDBPool(new db.MongoClient(item.uri, options), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+                new MongoDBPool(new mongodb.MongoClient(item.uri, options), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
             }
             else {
                 pool.add(item);
@@ -364,7 +364,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("mongodb" /* STRINGS.PACKAGE_NAME */);
     let parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -412,7 +411,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     credential.options.maxPoolSize = size;
                 }
             }
-            clients.push(client = await new db.MongoClient(credential.uri, credential.options).connect());
+            clients.push(client = await new mongodb.MongoClient(credential.uri, credential.options).connect());
         }
         if (connectOnce) {
             mongoClient = client;
@@ -461,7 +460,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             pipeline = Array.isArray(aggregate) ? aggregate : aggregate.pipeline;
         }
         if (id && (!query || limit === 1) && !pipeline) {
-            query = { '_id': new db.ObjectId(id) };
+            query = { '_id': new mongodb.ObjectId(id) };
             limit = 1;
         }
         if (queryString) {
@@ -565,6 +564,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                 if (updateOptions && coercing) {
                                     (0, types_1.coerceObject)(updateOptions);
                                 }
+                                await collection.updateMany(filter, update, updateOptions);
                             }
                             cursor = collection.find(filter, command);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.2.3",
+  "version": "0.3.1",
   "description": "MongoDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,9 +21,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.5.3",
-    "@e-mc/request": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "mongodb": "^5.7.0"
+    "@e-mc/db": "^0.6.0",
+    "@e-mc/request": "^0.6.0",
+    "@e-mc/types": "^0.6.0",
+    "mongodb": "^5.9.1"
   }
 }