@pi-r/mongodb 0.10.0 → 0.10.2

package/client/index.d.ts

@@ -7,7 +7,7 @@ import type { MongoDBDataSource, MongoDBFilterValue, MongoDBSortValue } from '..
 import type { Collection, CommandOperationOptions, Document, Filter, MongoClient, Sort, SortDirection } from 'mongodb';
 
 declare const MongoDB: IDbSourceClient<MongoDBDataSource> & {
-    getFilterValue(query: Filter<Document> | MongoDBFilterValue, coerce?: boolean): [Filter<Document>, CommandOperationOptions?];
+    getFilterValue(query: Filter<Document> | MongoDBFilterValue, coerce?: boolean): [Filter<Document>, (CommandOperationOptions & { sort?: Sort })?];
     getSortValue(sort: Sort | string | MongoDBSortValue, coerce?: boolean): [Sort | string, SortDirection?];
     initCollection(this: IModule, target: MongoClient, item: Pick<MongoDBDataSource, "bulkWrite" | "client" | "command" | "name" | "table">): Promise<Collection>;
 };

package/client/index.js

@@ -66,11 +66,9 @@ function setCredential(item) {
                         }
                         else if (Request.isCert(value)) {
                             if (attr === 'tlsCertificateKeyFile') {
-                                const pattern = /-+([^-]+)-+\s+[^-]+-+[^-]+-+/g;
                                 const key = [];
                                 const cert = [];
-                                let match;
-                                while (match = pattern.exec(value)) {
+                                for (const match of value.matchAll(/-+([^-]+)-+\s+[^-]+-+[^-]+-+/g)) {
                                     if (match[1].includes('BEGIN')) {
                                         if (match[1].includes('KEY')) {
                                             key.push(match[0]);
@@ -205,6 +203,9 @@ function setCredential(item) {
         return;
     }
     const client = new mongodb.MongoClient(item.uri, options);
+    if (item.driverInfo) {
+        client.appendMetadata(item.driverInfo);
+    }
     new DbPool(client, poolKey, username && password ? { username, password } : undefined)
         .add(item)
         .parent = POOL_STATE;
@@ -264,7 +265,11 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     credential.options.maxPoolSize = size;
                 }
             }
-            clients.push(client = await new mongodb.MongoClient(credential.uri, credential.options).connect());
+            client = new mongodb.MongoClient(credential.uri, credential.options);
+            if (item.driverInfo) {
+                client.appendMetadata(item.driverInfo);
+            }
+            clients.push(client = await client.connect());
         }
         if (connectOnce) {
             mongoClient = client;
@@ -278,7 +283,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { source, name, table, id, aggregate, sort, client, cacheObjectKey, ignoreCache } = item;
+        const { source, name, table, id, aggregate, distinct, sort, client, cacheObjectKey, ignoreCache } = item;
         let { query, update, streamRow, limit = 0 } = item;
         if (!table) {
             const error = (0, types_1.errorMessage)(source, "Missing database table");
@@ -332,9 +337,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 }
                 return false;
             };
-            if (pipeline || query) {
-                queryString += Db.asString(aggregate || query, true);
-                if ((aggregate || !update) && setResult()) {
+            if (pipeline || query || distinct) {
+                queryString += Db.asString(aggregate || query || distinct, true);
+                if ((aggregate || distinct || !update) && setResult()) {
                     continue;
                 }
             }
@@ -398,13 +403,15 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                     }
                     else {
-                        const [filter, operation] = getFilterValue(query, coercing);
-                        const updateType = item.updateType;
+                        const [filter, operation = {}] = getFilterValue(query, coercing);
+                        if (sort) {
+                            operation.sort = getSortValue(sort, coercing)[0];
+                        }
                         if (limit === 1) {
                             let document;
                             if (update) {
                                 commandType = this.commandType.UPDATE;
-                                document = await collection[updateType === 2 ? 'findOneAndReplace' : updateType === 3 ? 'findOneAndDelete' : 'findOneAndUpdate'](filter, update, operation);
+                                document = await collection[item.updateType === 2 ? 'findOneAndReplace' : item.updateType === 3 ? 'findOneAndDelete' : 'findOneAndUpdate'](filter, update, operation);
                             }
                             else {
                                 commandType = this.commandType.SELECT;
@@ -413,7 +420,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             rows = document ? [document] : [];
                         }
                         else {
-                            if (update && updateType === 1) {
+                            if (update && item.updateType === 1) {
                                 commandType = this.commandType.UPDATE;
                                 const updateOptions = item.execute?.update;
                                 if (updateOptions && coercing) {
@@ -425,6 +432,10 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                     }
                 }
+                else if (distinct) {
+                    const [a, b, c] = Array.isArray(distinct) ? distinct : [distinct];
+                    rows = await (b ? c ? collection.distinct(a, b, c) : collection.distinct(a, b) : collection.distinct(a));
+                }
                 else if (!aggregate) {
                     cursor = collection.find();
                 }
@@ -503,7 +514,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
     }
-    return this.processRows(batch, tasks, {
+    return this.processRows(batch, tasks, clients.length === 0 ? parallel : {
         parallel,
         disconnect() {
             for (const item of clients) {

package/client/pool.js

@@ -50,7 +50,7 @@ class MongoDBPool extends DbPool {
         const topology = this.client.topology;
         if (topology) {
             const name = Object.getOwnPropertySymbols(topology).find(sym => sym.toString() === 'Symbol(waitQueue)');
-            return (0, util_1.checkEmpty)(name ? topology[name] : topology.s.servers);
+            return (0, util_1.checkEmpty)(name ? topology[name] : topology.waitQueue || topology.s.servers);
         }
         return false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "MongoDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.12.0",
-    "@e-mc/request": "^0.12.0",
-    "@e-mc/types": "^0.12.0",
-    "mongodb": "^6.16.0"
+    "@e-mc/db": "^0.12.5",
+    "@e-mc/request": "^0.12.5",
+    "@e-mc/types": "^0.12.5",
+    "mongodb": "^6.18.0"
   }
 }

package/types/index.d.ts

@@ -3,12 +3,13 @@ import type { DbDataSource } from '@e-mc/types/lib/squared';
 import type { IdentifierAction } from '@e-mc/types/lib/core';
 import type { CascadeAction, ServerAuth } from '@e-mc/types/lib/db';
 
-import type { AggregateOptions, ClientBulkWriteModel, ClientBulkWriteOptions, CollectionOptions, CommandOperationOptions, DbOptions, Document, Filter, MongoClientOptions, OptionalUnlessRequiredId, RunCommandOptions, Sort, SortDirection, UpdateFilter } from 'mongodb';
+import type { AggregateOptions, ClientBulkWriteModel, ClientBulkWriteOptions, CollectionOptions, CommandOperationOptions, DbOptions, DistinctOptions, Document, DriverInfo, Filter, MongoClientOptions, OptionalUnlessRequiredId, RunCommandOptions, Sort, SortDirection, UpdateFilter, WithId } from 'mongodb';
 
 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;
+    driverInfo?: DriverInfo;
 }
 
 export interface MongoDBCredential extends ServerAuth, Pick<MongoClientOptions, "auth" | "authMechanism" | "authSource" | "tlsCertificateKeyFile" | "tlsCertificateKeyFilePassword" | "tlsCAFile" | "tlsCRLFile" | "tlsAllowInvalidHostnames" | "tlsAllowInvalidCertificates" | "tlsInsecure"> {}
@@ -35,6 +36,7 @@ export interface MongoDBClientDBOptions {
         update?: CommandOperationOptions;
     };
     command?: Document | Document[];
+    distinct?: keyof WithId<Document> | [keyof WithId<Document>, Filter<Document>?, DistinctOptions?];
     bulkWrite?: ClientBulkWriteModel[];
     aggregate?: MongoDBAggregate | Document[];
     sort?: Sort | string | MongoDBSortValue;