@pi-r/mongodb 0.6.5 → 0.7.0

package/README.md

@@ -1,10 +1,7 @@
-# @pi-r/mongodb
+### @pi-r/mongodb
 
-## 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)
-
-## LICENSE
+### LICENSE
 
 MIT

package/client/index.js

@@ -1,5 +1,4 @@
 "use strict";
-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");
@@ -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];
             }
         }
@@ -77,7 +76,7 @@ function getPoolKey(credential) {
 }
 function setCredential(item) {
     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 = '';
@@ -103,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('/') ? '' : '/') + '?';
@@ -145,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':
@@ -153,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) {
@@ -191,25 +190,25 @@ function setCredential(item) {
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout, socket_timeout } = config;
         if (min >= 0) {
-            options.minPoolSize ?? (options.minPoolSize = min);
+            options.minPoolSize ??= min;
         }
         if (max > 0) {
-            options.maxPoolSize ?? (options.maxPoolSize = max);
+            options.maxPoolSize ??= max;
         }
         if (idle >= 0) {
-            options.maxIdleTimeMS ?? (options.maxIdleTimeMS = idle);
+            options.maxIdleTimeMS ??= idle;
         }
         if (queue_max > 0) {
-            options.maxConnecting ?? (options.maxConnecting = queue_max);
+            options.maxConnecting ??= queue_max;
         }
         if (queue_idle >= 0) {
-            options.waitQueueTimeoutMS ?? (options.waitQueueTimeoutMS = queue_idle);
+            options.waitQueueTimeoutMS ??= queue_idle;
         }
         if (timeout > 0) {
-            options.connectTimeoutMS ?? (options.connectTimeoutMS = timeout);
+            options.connectTimeoutMS ??= timeout;
         }
         if (socket_timeout > 0) {
-            options.socketTimeoutMS ?? (options.socketTimeoutMS = socket_timeout);
+            options.socketTimeoutMS ??= socket_timeout;
         }
     }
     const poolKey = getPoolKey(item);
@@ -247,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);
@@ -523,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.5",
+  "version": "0.7.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.8.6",
-    "@e-mc/request": "^0.8.6",
-    "@e-mc/types": "^0.8.6",
-    "mongodb": "^6.4.0"
+    "@e-mc/db": "^0.9.0",
+    "@e-mc/request": "^0.9.0",
+    "@e-mc/types": "^0.9.0",
+    "mongodb": "^6.5.0"
   }
 }

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;