@pi-r/mongodb 0.6.7 → 0.7.1

package/README.md

@@ -1,12 +1,9 @@
-# @pi-r/mongodb
+### @pi-r/mongodb
 
-PEP 402 - Forever Dodgers
-
-## Documentation
+https://e-mc.readthedocs.io/en/latest/db/mongodb.html
 
-- [E-mc](https://e-mc.readthedocs.io/en/latest/db/mongodb.html)
-- [squared](https://squared.readthedocs.io)
+PEP 402 - Forever Dodgers
 
-## LICENSE
+### LICENSE
 
 MIT

package/client/index.js

@@ -37,12 +37,11 @@ class MongoDBPool extends DbPool {
         return topology ? super.closeable || topology.s.state === 'closing' : true;
     }
     get closed() {
-        var _a;
         const topology = this.client.topology;
         if (topology && (this.success > 0 || this.failed > 0)) {
             return topology.isDestroyed();
         }
-        return ((_a = this.client.s) === null || _a === void 0 ? void 0 : _a.hasBeenClosed) === true;
+        return this.client.s?.hasBeenClosed === true;
     }
 }
 const POOL_STATE = {};
@@ -55,7 +54,7 @@ function removePoolProperties(credential) {
         for (let i = 0, length = POOL_UNUSED.length; i < length; ++i) {
             const attr = POOL_UNUSED[i];
             if (attr in options) {
-                result || (result = { ...options });
+                result ||= { ...options };
                 delete result[attr];
             }
         }
@@ -67,7 +66,7 @@ function removePoolProperties(credential) {
 }
 function getCacheObject(item) {
     const credential = item.credential;
-    return { uri: item.uri, options: item.options, uuidKey: credential === null || credential === void 0 ? void 0 : credential.uuidKey };
+    return { uri: item.uri, options: item.options, uuidKey: credential?.uuidKey };
 }
 function getPoolKey(credential) {
     const { options, uri } = credential;
@@ -76,19 +75,18 @@ function getPoolKey(credential) {
     }
 }
 function setCredential(item) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const credential = this.getCredential(item);
-    const options = item.options || (item.options = {});
+    const options = item.options ||= {};
     let uri = item.uri;
     if (credential) {
         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 === null || auth === void 0 ? void 0 : auth.username) || username || ((_a = options.auth) === null || _a === void 0 ? void 0 : _a.username);
+            const principal = auth?.username || username || options.auth?.username;
             if ((0, types_1.isString)(principal)) {
                 authentication = encodeURIComponent(principal) + '@';
             }
         }
-        else if (auth === null || auth === void 0 ? void 0 : auth.username) {
+        else if (auth?.username) {
             options.auth = auth;
         }
         if (!uri || !Db.isURL(uri)) {
@@ -104,7 +102,7 @@ function setCredential(item) {
             uri = (protocol || 'mongodb:') + '//' + authentication + server;
         }
         else {
-            options.auth || (options.auth = { username, password });
+            options.auth ||= { username, password };
         }
         if (!uri.includes('?')) {
             uri += (uri.endsWith('/') ? '' : '/') + '?';
@@ -146,7 +144,7 @@ function setCredential(item) {
                 else {
                     throw (0, types_1.errorMessage)("mongodb", 'Missing TLS/SSL credentials');
                 }
-                authSource || (authSource = '$external');
+                authSource ||= '$external';
                 break;
             }
             case 'GSSAPI':
@@ -154,12 +152,12 @@ function setCredential(item) {
                 if ((0, types_1.isObject)(authMechanismProperties)) {
                     options.authMechanismProperties = authMechanismProperties;
                 }
-                authSource || (authSource = '$external');
+                authSource ||= '$external';
                 break;
             }
             case 'PLAIN':
                 uri += '&maxPoolSize=1';
-                authSource || (authSource = '$external');
+                authSource ||= '$external';
                 break;
         }
         if (authSource) {
@@ -176,7 +174,7 @@ function setCredential(item) {
     }
     let username, password, pool;
     if ((0, types_1.isString)(usePool)) {
-        if (username = ((_b = options.auth) === null || _b === void 0 ? void 0 : _b.username) || item.uri && ((_c = (0, util_1.parseConnectionString)(item.uri)) === null || _c === void 0 ? void 0 : _c.username)) {
+        if (username = options.auth?.username || item.uri && (0, util_1.parseConnectionString)(item.uri)?.username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
             if (pool) {
                 pool.add(item, password);
@@ -192,25 +190,25 @@ function setCredential(item) {
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout, socket_timeout } = config;
         if (min >= 0) {
-            (_d = options.minPoolSize) !== null && _d !== void 0 ? _d : (options.minPoolSize = min);
+            options.minPoolSize ??= min;
         }
         if (max > 0) {
-            (_e = options.maxPoolSize) !== null && _e !== void 0 ? _e : (options.maxPoolSize = max);
+            options.maxPoolSize ??= max;
         }
         if (idle >= 0) {
-            (_f = options.maxIdleTimeMS) !== null && _f !== void 0 ? _f : (options.maxIdleTimeMS = idle);
+            options.maxIdleTimeMS ??= idle;
         }
         if (queue_max > 0) {
-            (_g = options.maxConnecting) !== null && _g !== void 0 ? _g : (options.maxConnecting = queue_max);
+            options.maxConnecting ??= queue_max;
         }
         if (queue_idle >= 0) {
-            (_h = options.waitQueueTimeoutMS) !== null && _h !== void 0 ? _h : (options.waitQueueTimeoutMS = queue_idle);
+            options.waitQueueTimeoutMS ??= queue_idle;
         }
         if (timeout > 0) {
-            (_j = options.connectTimeoutMS) !== null && _j !== void 0 ? _j : (options.connectTimeoutMS = timeout);
+            options.connectTimeoutMS ??= timeout;
         }
         if (socket_timeout > 0) {
-            (_k = options.socketTimeoutMS) !== null && _k !== void 0 ? _k : (options.socketTimeoutMS = socket_timeout);
+            options.socketTimeoutMS ??= socket_timeout;
         }
     }
     const poolKey = getPoolKey(item);
@@ -226,7 +224,6 @@ async function executeQuery(item, options) {
 }
 exports.executeQuery = executeQuery;
 async function executeBatchQuery(batch, options = '', outResult) {
-    var _a;
     const length = batch.length;
     if (length === 0) {
         return [];
@@ -249,7 +246,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         parallel = !batch.some(item => item.parallel === false);
     }
     if (!parallel) {
-        outResult || (outResult = new Array(length));
+        outResult ||= new Array(length);
     }
     const caching = this.hasCache("mongodb", sessionKey);
     const tasks = new Array(length);
@@ -288,7 +285,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         item.transactionState &= ~64;
         return client;
     };
-    if ((_a = this.host) === null || _a === void 0 ? void 0 : _a.username) {
+    if (this.host?.username) {
         this.applyCommand(...batch);
     }
     for (let i = 0; i < length; ++i) {
@@ -314,9 +311,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
             continue;
         }
         item.transactionState = 1;
-        const getInstance = (target) => target.db(name, client === null || client === void 0 ? void 0 : client.db);
-        const getCollection = (target) => getInstance(target).collection(table, client === null || client === void 0 ? void 0 : client.collection);
-        const runCommand = async (target, document) => getInstance(target).command(document, client === null || client === void 0 ? void 0 : client.command);
+        const getInstance = (target) => target.db(name, client?.db);
+        const getCollection = (target) => getInstance(target).collection(table, client?.collection);
+        const runCommand = async (target, document) => getInstance(target).command(document, client?.command);
         const credential = mongoCredential || onceCredential || getCacheObject(item);
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
         const coercing = this.hasCoerce("mongodb", 'options', credential.uuidKey);
@@ -374,7 +371,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
             onceCredential = undefined;
         }
         tasks[i] = new Promise(async (resolve, reject) => {
-            var _a, _b;
             let commandType;
             try {
                 const instance = mongoClient || await getConnection(item, credential);
@@ -389,7 +385,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 }
                 if (Array.isArray(update)) {
                     commandType = this.commandType.INSERT;
-                    const insertOptions = (_a = item.execute) === null || _a === void 0 ? void 0 : _a.insert;
+                    const insertOptions = item.execute?.insert;
                     if (insertOptions && coercing) {
                         (0, types_1.coerceObject)(insertOptions);
                     }
@@ -437,7 +433,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         else {
                             if (update && updateType === 1) {
                                 commandType = this.commandType.UPDATE;
-                                const updateOptions = (_b = item.execute) === null || _b === void 0 ? void 0 : _b.update;
+                                const updateOptions = item.execute?.update;
                                 if (updateOptions && coercing) {
                                     (0, types_1.coerceObject)(updateOptions);
                                 }
@@ -526,7 +522,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
     }
     return this.processRows(batch, tasks, {
-        disconnect: () => clients.forEach(async (item) => item.close(true)),
+        disconnect: () => clients.forEach(item => {
+            item.close(true);
+        }),
         parallel
     }, outResult);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.6.7",
+  "version": "0.7.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.8.8",
-    "@e-mc/request": "^0.8.8",
-    "@e-mc/types": "^0.8.8",
-    "mongodb": "^6.5.0"
+    "@e-mc/db": "^0.9.2",
+    "@e-mc/request": "^0.9.2",
+    "@e-mc/types": "^0.9.2",
+    "mongodb": "^6.6.2"
   }
 }

package/types/index.d.ts

@@ -4,7 +4,7 @@ import type { CascadeAction, ServerAuth } from '@e-mc/types/lib/db';
 
 import type { AggregateOptions, CollectionOptions, CommandOperationOptions, DbOptions, Document, Filter, MongoClientOptions, OptionalUnlessRequiredId, RunCommandOptions, Sort, SortDirection, UpdateFilter } from 'mongodb';
 
-export interface MongoDBDataSource extends DbDataSource<Filter<Document> | MongoDBQueryWithOptions, MongoClientOptions, UpdateFilter<Document> | OptionalUnlessRequiredId<unknown>[], string | MongoDBCredential, string>, MongoDBClientDBOptions, CascadeAction {
+export interface MongoDBDataSource extends DbDataSource<Filter<Document> | MongoDBFilterValue, MongoClientOptions, UpdateFilter<Document> | OptionalUnlessRequiredId<unknown>[], MongoDBCredential, string>, MongoDBClientDBOptions, CascadeAction {
     source: "mongodb";
     id?: string;
     updateType?: 0 | 1 | 2 | 3;
@@ -37,11 +37,6 @@ export interface MongoDBClientDBOptions {
     sort?: Sort | string | MongoDBSortValue;
 }
 
-export interface MongoDBQueryWithOptions {
-    value: Filter<Document>;
-    options: CommandOperationOptions;
-}
-
 export interface MongoDBFilterValue {
     value?: Filter<Document>;
     options?: CommandOperationOptions;