@pi-r/atlas 0.6.0 → 0.6.2

package/README.md

@@ -1,5 +1,7 @@
 ### @pi-r/atlas
 
+https://e-mc.readthedocs.io/en/latest/cloud/atlas.html
+
 ### LICENSE
 
 MIT

package/client/index.js

@@ -18,7 +18,7 @@ function sanitizeCredentials(credential) {
 }
 function validateDatabase(credential, data) {
     const auth = credential.auth;
-    return !!(data.table && (auth?.username || credential.username || Module.isURL(data.uri) && (0, util_1.hasBasicAuth)(data.uri)));
+    return !!(data.table && Module.isURL(data.uri) && (auth?.username || credential.username || (0, util_1.hasBasicAuth)(data.uri)));
 }
 exports.validateDatabase = validateDatabase;
 function createDatabaseClient(credential, data) {
@@ -58,28 +58,45 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             query = getObjectId(id);
             limit = 1;
         }
-        const renewCache = ignoreCache === 0;
         const options = item.options ? length === 1 ? Object.assign(item.options, credential) : { ...item.options, ...credential } : length === 1 ? credential : { ...credential };
-        let rows, queryString = caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache ? (name || '') + '_' + table + '_' + limit + Module.asString(options, true) + (sort ? Module.asString(sort, true) : '') + (client ? Module.asString(client, true) : '') : '', auth, pipeline;
+        let rows, queryString = caching && ignoreCache !== true ? (name || '') + '_' + table + '_' + limit + Module.asString(options, true) + (sort ? Module.asString(sort, true) : '') + (client ? Module.asString(client, true) : '') : '', auth, pipeline;
         if (queryString) {
             sanitizeCredentials(options);
             auth = { uri: item.uri, options };
         }
+        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 getCache = () => {
             if (ignoreCache !== 1) {
-                cacheValue.renewCache = renewCache;
+                cacheValue.renewCache = ignoreCache === 0;
                 return this.getQueryResult(service, auth, queryString, cacheValue);
             }
         };
-        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);
+        cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
         const instance = await createClient(item, options);
         const command = item.command;
         if (command) {
             await Promise.all((!Array.isArray(command) ? [command] : command).map(async (cmd) => runCommand(instance, cmd)))
                 .then(items => items.forEach(output => this.addLog(this.statusType.INFO, output, "atlas" /* STRINGS.MODULE_NAME */, 'runCommand')));
         }
+        const collection = getCollection(instance);
+        if (update && coercing) {
+            (0, types_1.coerceObject)(update);
+        }
+        if (Array.isArray(update)) {
+            const insertOptions = item.execute?.insert;
+            if (insertOptions && coercing) {
+                (0, types_1.coerceObject)(insertOptions);
+            }
+            if (update.length === 1) {
+                await collection.insertOne(update[0], insertOptions);
+            }
+            else if (update.length > 1) {
+                await collection.insertMany(update, insertOptions);
+            }
+            update = undefined;
+        }
         if (aggregate) {
             pipeline = Array.isArray(aggregate) ? aggregate : aggregate.pipeline;
         }
@@ -91,7 +108,6 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     continue;
                 }
             }
-            const collection = getCollection(instance);
             if (pipeline) {
                 const aggregateOptions = (0, types_1.isPlainObject)(aggregate) ? aggregate.options : undefined;
                 if (coercing) {
@@ -110,33 +126,14 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 rows = await items.toArray();
             }
             else {
-                const updateType = item.updateType;
                 const [filter, operation] = (0, mongodb_1.getFilterValue)(query, coercing);
-                if (update && coercing) {
-                    (0, types_1.coerceObject)(update);
-                }
-                if ((0, types_1.isArray)(update)) {
-                    const insertOptions = item.execute?.insert;
-                    if (insertOptions && coercing) {
-                        (0, types_1.coerceObject)(insertOptions);
-                    }
-                    if (update.length === 1) {
-                        await collection.insertOne(update[0], insertOptions);
-                    }
-                    else {
-                        await collection.insertMany(update, insertOptions);
-                    }
-                    update = undefined;
-                }
-                else if (updateType === 1) {
-                    update = undefined;
-                }
+                const updateType = item.updateType;
                 if (limit === 1) {
                     const document = update ? await collection[updateType === 2 ? 'findOneAndReplace' : updateType === 3 ? 'findOneAndDelete' : 'findOneAndUpdate'](filter, update, operation) : await collection.findOne(filter, operation);
                     rows = document ? [document] : [];
                 }
                 else {
-                    if (update) {
+                    if (update && updateType === 1) {
                         const updateOptions = item.execute?.update;
                         if (updateOptions && coercing) {
                             (0, types_1.coerceObject)(updateOptions);
@@ -159,7 +156,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 result[i] = rows;
                 continue;
             }
-            const items = getCollection(instance).find();
+            const items = collection.find();
             if (sort) {
                 items.sort(...(0, mongodb_1.getSortValue)(sort, coercing));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/atlas",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "MongoDB Atlas cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,11 +20,11 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.8.0",
-    "@e-mc/db": "^0.8.0",
-    "@e-mc/module": "^0.8.0",
-    "@e-mc/types": "^0.8.0",
-    "@pi-r/mongodb": "^0.6.0",
+    "@e-mc/cloud": "^0.8.2",
+    "@e-mc/db": "^0.8.2",
+    "@e-mc/module": "^0.8.2",
+    "@e-mc/types": "^0.8.2",
+    "@pi-r/mongodb": "^0.6.2",
     "mongodb": "^6.3.0"
   }
 }