@pi-r/mongodb 0.2.2 → 0.2.8

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Mile Square Park
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,5 +1,7 @@
-### @pi-r/mongodb
+# @pi-r/mongodb
 
-### LICENSE
+PEP 402 - Forever
+
+## LICENSE
 
 MIT

package/client/index.js

@@ -7,10 +7,10 @@ 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", 1, 4);
+const MONGODB_V330 = Db.checkSemVer("mongodb", '3.3.0');
+const MONGODB_V333 = Db.checkSemVer("mongodb", '3.3.0', '3.3.3');
+const MONGODB_V360 = Db.checkSemVer("mongodb", '3.6.0');
 const MONGODB_TOPOLOGY = MONGODB_V3 && MONGODB_V330;
 const MONGODB_NOPOOL = MONGODB_V3 && !MONGODB_V330;
 class MongoDBPool extends DbPool {
@@ -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;
 }
@@ -124,7 +132,7 @@ function setCredential(item) {
     const options = item.options || (item.options = {});
     let uri = item.uri;
     if (credential) {
-        let { protocol, server, hostname, port, username, password } = (0, util_1.parseServerAuth)(credential, 27017 /* VALUES.PORT */), { auth, authMechanism = 'DEFAULT', authSource, authMechanismProperties } = credential, authentication = '';
+        let { protocol, server, hostname, port, username, password } = (0, util_1.parseServerAuth)(credential, 27017), { auth, authMechanism = 'DEFAULT', authSource, authMechanismProperties } = credential, authentication = '';
         if (authMechanism === 'GSSAPI') {
             const principal = auth?.username || username || options.auth?.username;
             if ((0, types_1.isString)(principal)) {
@@ -145,10 +153,10 @@ function setCredential(item) {
                 authentication = (0, util_1.getBasicAuth)(username, password);
             }
             if (!server && hostname) {
-                server = hostname + ':' + (port || 27017 /* VALUES.PORT */);
+                server = hostname + ':' + (port || 27017);
             }
             if (!server) {
-                throw (0, types_1.errorMessage)("mongodb" /* STRINGS.MODULE_NAME */, 'Not defined - server address');
+                throw (0, types_1.errorMessage)("mongodb", 'Not defined - server address');
             }
             uri = (protocol || 'mongodb:') + '//' + authentication + server;
         }
@@ -244,7 +252,7 @@ function setCredential(item) {
                     }
                 }
                 if (!valid) {
-                    throw (0, types_1.errorMessage)("mongodb" /* STRINGS.MODULE_NAME */, 'Missing TLS/SSL credentials');
+                    throw (0, types_1.errorMessage)("mongodb", 'Missing TLS/SSL credentials');
                 }
                 authSource || (authSource = '$external');
                 break;
@@ -262,7 +270,7 @@ function setCredential(item) {
                 else if ((0, types_1.isString)(authMechanismProperties)) {
                     serviceName = authMechanismProperties;
                 }
-                serviceName || (serviceName = "mongodb" /* STRINGS.MODULE_NAME */);
+                serviceName || (serviceName = "mongodb");
                 uri += !MONGODB_V3 ? '&authMechanismProperties=' + encodeURIComponent('SERVICE_NAME:' + serviceName) : '&gssapiServiceName=' + encodeURIComponent(serviceName);
                 break;
             }
@@ -283,7 +291,7 @@ function setCredential(item) {
         item.uri = uri;
     }
     else if (!(0, types_1.isString)(uri)) {
-        throw (0, types_1.errorMessage)("mongodb" /* STRINGS.MODULE_NAME */, 'Not defined - credentials');
+        throw (0, types_1.errorMessage)("mongodb", 'Not defined - credentials');
     }
     if (MONGODB_TOPOLOGY) {
         options.useUnifiedTopology = true;
@@ -305,7 +313,7 @@ function setCredential(item) {
         const poolKey = getPoolKey(item);
         if (poolKey) {
             if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-                const config = this.getPoolConfig("mongodb" /* STRINGS.MODULE_NAME */, password);
+                const config = this.getPoolConfig("mongodb", password);
                 if (config) {
                     const { min, max, idle, queue_max, queue_idle } = config;
                     if (MONGODB_V360) {
@@ -334,7 +342,7 @@ function setCredential(item) {
                         }
                     }
                 }
-                const db = require("mongodb" /* STRINGS.PACKAGE_NAME */);
+                const db = require("mongodb");
                 new MongoDBPool(new db.MongoClient(item.uri, options), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
             }
             else {
@@ -356,7 +364,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("mongodb" /* STRINGS.PACKAGE_NAME */);
+    const db = require("mongodb");
     let parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -377,12 +385,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (!parallel) {
         outResult || (outResult = new Array(length));
     }
-    const caching = this.hasCache("mongodb" /* STRINGS.MODULE_NAME */, sessionKey);
+    const caching = this.hasCache("mongodb", sessionKey);
     const tasks = new Array(length);
     const clients = [];
     let mongoClient, mongoCredential, mongoCache = 0, onceCredential = connectOnce ? getCacheObject(batch[0]) : undefined;
     const getConnection = async (item, credential) => {
-        item.transactionState = 64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState = 64;
         const pool = item.usePool && DbPool.findKey(POOL_STATE, item.usePool, getPoolKey(connectOnce ? batch[0] : item), ...connectOnce ? [item, batch[0]] : [item]);
         let client;
         if (pool) {
@@ -410,7 +418,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             mongoClient = client;
             mongoCredential = credential;
         }
-        item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState &= ~64;
         return client;
     };
     for (let i = 0; i < length; ++i) {
@@ -418,7 +426,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const { source, name, table, id, aggregate, sort, client, cacheObjectKey, ignoreCache } = item;
         let { query, update, streamRow, limit = 0 } = item;
         if (!table) {
-            const error = (0, types_1.errorMessage)(source, "Missing database table" /* ERR_DB.TABLE */);
+            const error = (0, types_1.errorMessage)(source, "Missing database table");
             ++mongoCache;
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
@@ -435,12 +443,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             continue;
         }
-        item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
+        item.transactionState = 1;
         const getCollection = (target) => target.db(name, client?.db).collection(table, client?.collection);
         const credential = mongoCredential || onceCredential || getCacheObject(item);
         const renewCache = ignoreCache === 0;
         const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
-        const coercing = this.hasCoerce("mongodb" /* STRINGS.MODULE_NAME */, 'options', credential.uuidKey);
+        const coercing = this.hasCoerce("mongodb", 'options', credential.uuidKey);
         const targetObject = typeof checkObject === 'string' ? coercing && (0, types_1.asFunction)(checkObject) : checkObject;
         if (typeof streamRow === 'string') {
             streamRow = coercing && (0, types_1.asFunction)(streamRow);
@@ -466,7 +474,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     else {
                         outResult[i] = rows;
                     }
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */ | 128 /* DB_TRANSACTION.CACHE */);
+                    this.add(item, 4 | 128);
                     return true;
                 }
                 return false;
@@ -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);
                         }
@@ -594,7 +608,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                 reject(error);
                             }
                             else {
-                                this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                                this.add(item, 4);
                                 resolve(!error ? this.setQueryResult(source, removePoolProperties(mongoCredential || credential), queryString, rows, cacheValue) : rows);
                             }
                         })
@@ -605,14 +619,14 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     }
                 }
                 if (rows) {
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                    this.add(item, 4);
                     if (targetObject) {
                         rows = targetObject(item, rows);
                     }
                     resolve(this.setQueryResult(source, removePoolProperties(mongoCredential || credential), queryString, rows, cacheValue));
                 }
                 else {
-                    throw (0, types_1.errorMessage)(source, "Missing database query" /* ERR_DB.QUERY */);
+                    throw (0, types_1.errorMessage)(source, "Missing database query");
                 }
             }
             catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.2.2",
+  "version": "0.2.8",
   "description": "MongoDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/db/mongodb"
   },
   "keywords": [
@@ -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.5.4",
+    "@e-mc/request": "^0.5.4",
+    "@e-mc/types": "^0.5.4",
+    "mongodb": "^5.9.2"
   }
 }

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;