@pi-r/mongodb 0.12.5 → 0.13.0

package/client/index.js

@@ -331,9 +331,10 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
         let queryString = '', cacheCredential, rows, pipeline;
         if (caching && ignoreCache !== true && !streamRow) {
-            const collection = item.client?.collection;
-            const db = item.client?.db;
-            queryString = (name || '') + '_' + table + (item.withFields ? '_' + Db.asString(item.withFields, true) : '') + (sort ? '_' + Db.asString(sort, true) : '') + '_' + (limit > 0 ? limit.toString() : '0') + (db ? Db.asString(db, true) : '') + (collection ? Db.asString(collection, true) : '') + (targetObject && typeof item.cacheObjectKey === 'string' ? targetObject.toString() + item.cacheObjectKey : '');
+            queryString = Db.keyForResult(name, table, item.withFields, sort, Math.max(0, limit));
+            if (item.client) {
+                queryString = Db.keyForResult(queryString, item.client.db, item.client.collection);
+            }
         }
         if (aggregate) {
             pipeline = Array.isArray(aggregate) ? aggregate : aggregate.pipeline;
@@ -345,6 +346,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         if (queryString) {
             const setResult = () => {
                 if (ignoreCache !== 1 && (rows = this.getQueryResult(source, cacheCredential, queryString, cacheValue))) {
+                    if (targetObject) {
+                        rows = targetObject(item, rows);
+                    }
                     ++mongoCache;
                     if (parallel) {
                         tasks[i] = Promise.resolve(rows);
@@ -358,7 +362,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 return false;
             };
             if (pipeline || query || distinct) {
-                queryString += Db.asString(aggregate || query || distinct, true);
+                queryString = Db.keyForResult(queryString, aggregate || query || distinct);
                 cacheCredential = DbPool.sanitize(mongoCredential || credential, sortKeys);
                 if ((aggregate || distinct || !update) && setResult()) {
                     continue;
@@ -512,10 +516,11 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 }
                 if (rows) {
                     this.add(item, 4);
+                    rows = this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue);
                     if (targetObject) {
                         rows = targetObject(item, rows);
                     }
-                    resolve(this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue));
+                    resolve(rows);
                 }
                 else {
                     throw errorMessage(source, "Missing database query");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.12.5",
+  "version": "0.13.0",
   "description": "MongoDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",