@pi-r/mongodb 0.2.2 → 0.3.0

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 {
@@ -58,18 +59,26 @@ class MongoDBPool extends DbPool {
     }
 }
 const POOL_STATE = {};
+const POOL_UNUSED = ['maxPoolSize', 'minPoolSize', 'maxConnecting', 'maxIdleTimeMS', 'waitQueueTimeoutMS', 'serverSelectionTimeoutMS', 'heartbeatFrequencyMS', 'minHeartbeatFrequencyMS', 'keepAliveInitialDelay', 'compressors', 'zlibCompressionLevel', 'srvMaxHosts'];
 function removePoolProperties(credential) {
-    let options = credential.options;
+    const options = credential.options;
     if (options && !credential.uuidKey) {
+        let result;
         if (MONGODB_V360) {
-            if ('maxPoolSize' in options || 'minPoolSize' in options || 'maxConnecting' in options || 'maxIdleTimeMS' in options || 'waitQueueTimeoutMS' in options || 'serverSelectionTimeoutMS' in options) {
-                options = { ...options, maxPoolSize: undefined, minPoolSize: undefined, maxConnecting: undefined, maxIdleTimeMS: undefined, waitQueueTimeoutMS: undefined, serverSelectionTimeoutMS: undefined };
+            for (let i = 0, length = POOL_UNUSED.length; i < length; ++i) {
+                const attr = POOL_UNUSED[i];
+                if (attr in credential) {
+                    result || (result = { ...options });
+                    delete result[attr];
+                }
             }
         }
         else if ('poolSize' in options || 'minSize' in options) {
-            options = { ...options, poolSize: undefined, minSize: undefined };
+            result = { ...options, poolSize: undefined, minSize: undefined };
+        }
+        if (result) {
+            return { uri: credential.uri, options: result };
         }
-        return { uri: credential.uri, options };
     }
     return credential;
 }
@@ -334,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);
@@ -356,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);
@@ -404,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;
@@ -453,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) {
@@ -524,11 +531,14 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         if ((0, types_1.isArray)(update)) {
                             commandType = this.commandType.INSERT;
                             const insertOptions = item.execute?.insert;
-                            if (insertOptions) {
-                                await collection.insertMany(update, coercing ? (0, types_1.coerceObject)(insertOptions) : insertOptions);
+                            if (insertOptions && coercing) {
+                                (0, types_1.coerceObject)(insertOptions);
+                            }
+                            if (update.length === 1) {
+                                await collection.insertOne(update[0], insertOptions);
                             }
                             else {
-                                await collection.insertMany(update);
+                                await collection.insertMany(update, insertOptions);
                             }
                             update = undefined;
                         }
@@ -550,7 +560,11 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         else {
                             if (update) {
                                 commandType = this.commandType.UPDATE;
-                                await collection.updateMany(filter, update);
+                                const updateOptions = item.execute?.update;
+                                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.2",
+  "version": "0.3.0",
   "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.5.0"
+    "@e-mc/db": "^0.6.0",
+    "@e-mc/request": "^0.6.0",
+    "@e-mc/types": "^0.6.0",
+    "mongodb": "^5.7.0"
   }
 }

package/types/index.d.ts

@@ -2,7 +2,7 @@ import type { DbDataSource } from '@e-mc/types/lib/squared';
 
 import type { CascadeAction, ServerAuth } from '@e-mc/types/lib/db';
 
-import type { AggregateOptions, BulkWriteOptions, CollectionOptions, CommandOperationOptions, DbOptions, Document, Filter, MongoClientOptions, OptionalUnlessRequiredId, Sort, SortDirection, UpdateFilter } from 'mongodb';
+import type { AggregateOptions, CollectionOptions, CommandOperationOptions, DbOptions, Document, Filter, MongoClientOptions, OptionalUnlessRequiredId, Sort, SortDirection, UpdateFilter } from 'mongodb';
 
 export interface MongoDBDataSource extends DbDataSource<Filter<Document> | MongoDBQueryWithOptions, MongoClientOptions, UpdateFilter<Document> | OptionalUnlessRequiredId<unknown>[], string | MongoDBCredential, string>, MongoDBClientDBOptions, CascadeAction {
     source: "mongodb";
@@ -28,7 +28,8 @@ export interface MongoDBClientDBOptions {
         collection?: CollectionOptions;
     };
     execute?: {
-        insert?: BulkWriteOptions;
+        insert?: CommandOperationOptions;
+        update?: CommandOperationOptions;
     };
     aggregate?: MongoDBAggregate;
     sort?: Sort | string | MongoDBSortValue;