@pi-r/atlas 0.10.0 → 0.10.2

package/client/index.js

@@ -62,7 +62,16 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const coercing = this.hasCoerce("atlas", 'options');
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     const createClient = async (item, options) => {
-        return clients[length > 1 ? (0, types_1.hashKey)(item.uri + Cloud.asString(options, true)) : '_'] ||= await createDatabaseClient.call(this, options, item).connect();
+        const key = length > 1 ? (0, types_1.hashKey)(item.uri + Cloud.asString(options, true)) : '_';
+        let client = clients[key];
+        if (client) {
+            return client;
+        }
+        client = createDatabaseClient.call(this, options, item);
+        if (item.driverInfo) {
+            client.appendMetadata(item.driverInfo);
+        }
+        return clients[key] ||= await client.connect();
     };
     const closeClient = () => {
         for (const key in clients) {
@@ -71,7 +80,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     };
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { service, name, table, id, aggregate, sort, client, ignoreCache } = item;
+        const { service, name, table, id, aggregate, distinct, sort, client, ignoreCache } = item;
         if (!table) {
             closeClient();
             throw (0, util_1.formatError)(item, "Missing database table");
@@ -137,14 +146,16 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 rows = await items.toArray();
             }
             else {
-                const [filter, operation] = (0, mongodb_1.getFilterValue)(query, coercing);
-                const updateType = item.updateType;
+                const [filter, operation = {}] = (0, mongodb_1.getFilterValue)(query, coercing);
+                if (sort) {
+                    operation.sort = (0, mongodb_1.getSortValue)(sort, coercing)[0];
+                }
                 if (limit === 1) {
-                    const document = update ? await collection[updateType === 2 ? 'findOneAndReplace' : updateType === 3 ? 'findOneAndDelete' : 'findOneAndUpdate'](filter, update, operation) : await collection.findOne(filter, operation);
+                    const document = update ? await collection[item.updateType === 2 ? 'findOneAndReplace' : item.updateType === 3 ? 'findOneAndDelete' : 'findOneAndUpdate'](filter, update, operation) : await collection.findOne(filter, operation);
                     rows = document ? [document] : [];
                 }
                 else {
-                    if (update && updateType === 1) {
+                    if (update && item.updateType === 1) {
                         const updateOptions = item.execute?.update;
                         if (updateOptions && coercing) {
                             (0, types_1.coerceObject)(updateOptions);
@@ -162,6 +173,17 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
             }
         }
+        else if (distinct) {
+            if (queryString) {
+                queryString += Cloud.asString(distinct, true);
+                if (rows = this.getCacheResult(service, auth, queryString, cacheValue, ignoreCache)) {
+                    result[i] = rows;
+                    continue;
+                }
+            }
+            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) {
             if (queryString && (rows = this.getCacheResult(service, auth, queryString, cacheValue, ignoreCache))) {
                 result[i] = rows;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/atlas",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "MongoDB Atlas cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -19,11 +19,11 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.12.0",
-    "@e-mc/db": "^0.12.0",
-    "@e-mc/module": "^0.12.0",
-    "@e-mc/types": "^0.12.0",
-    "@pi-r/mongodb": "^0.10.0",
-    "mongodb": "^6.16.0"
+    "@e-mc/cloud": "^0.12.5",
+    "@e-mc/db": "^0.12.5",
+    "@e-mc/module": "^0.12.5",
+    "@e-mc/types": "^0.12.5",
+    "@pi-r/mongodb": "^0.10.2",
+    "mongodb": "^6.18.0"
   }
 }

package/types/index.d.ts

@@ -3,13 +3,14 @@ import type { AuthValue } from '@e-mc/types/lib/http';
 
 import type { MongoDBClientDBOptions, MongoDBFilterValue } from '@pi-r/mongodb/types';
 
-import type { Document, Filter, MongoClientOptions, OptionalUnlessRequiredId, UpdateFilter } from 'mongodb';
+import type { Document, DriverInfo, Filter, MongoClientOptions, OptionalUnlessRequiredId, UpdateFilter } from 'mongodb';
 
 export interface AtlasDatabaseQuery extends CloudDatabase<Filter<Document> | MongoDBFilterValue, MongoClientOptions, UpdateFilter<Document> | OptionalUnlessRequiredId<unknown>[], AtlasDatabaseCredential>, MongoDBClientDBOptions {
     source: "cloud";
     service: "atlas";
     uri: string;
     updateType?: 0 | 1 | 2 | 3;
+    driverInfo?: DriverInfo;
 }
 
 export interface AtlasDatabaseCredential extends AuthValue, MongoClientOptions {}