@pi-r/mongodb 0.2.2 → 0.2.3

package/client/index.js

@@ -58,18 +58,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;
 }
@@ -524,11 +532,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 +561,10 @@ 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);
+                                }
                             }
                             cursor = collection.find(filter, command);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "MongoDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -24,6 +24,6 @@
     "@e-mc/db": "^0.5.3",
     "@e-mc/request": "^0.5.3",
     "@e-mc/types": "^0.5.3",
-    "mongodb": "^5.5.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;