@pi-r/redis 0.11.3 → 0.11.4

package/client/index.js

@@ -116,9 +116,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    let parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss;
+    let parallel, checkObject, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss;
     if (types.isPlainObject(options)) {
-        ({ parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
+        ({ parallel, checkObject, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss } = options);
     }
     else {
         if (typeof options === 'string') {
@@ -174,9 +174,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { source, key, format = 'HASH', search, aggregate, streams, options: clientOptions = {}, ignoreCache } = item;
+        const { source, key, search, aggregate, streams, options: clientOptions = {}, ignoreCache } = item;
         let credential = (redisCredential || onceCredential), error;
-        if (!credential && !types.isPlainObject(credential = clientOptions.client) && (error = types.errorMessage(source, "Invalid credentials")) || !(types.isString(key) || types.isArray(key) || types.isPlainObject(search) && (types.isPlainObject(search.schema) || types.isString(search.query)) || types.isPlainObject(aggregate) && (types.isPlainObject(aggregate.schema) || types.isString(aggregate.query))) && (error = types.errorMessage(source, "Missing database query", item.uri))) {
+        if (!credential && !types.isPlainObject(credential = clientOptions.client) && (error = types.errorMessage(source, "Invalid credentials")) || !(types.isString(key) || types.isArray(key) || streams || types.isPlainObject(search) && (types.isPlainObject(search.schema) || types.isString(search.query)) || types.isPlainObject(aggregate) && (types.isPlainObject(aggregate.schema) || types.isString(aggregate.query))) && (error = types.errorMessage(source, "Missing database query", item.uri))) {
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
                     tasks.length = 0;
@@ -196,6 +196,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const uuidKey = credential.uuidKey ||= (onceCredential ? batch[0] : item).credential?.uuidKey;
         const targetObject = typeof checkObject === 'string' ? this.hasCoerce("redis", 'options', uuidKey) && types.asFunction(checkObject) : checkObject;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
+        const format = (key ? item.format?.toUpperCase() || 'HASH' : undefined);
         let queryString = '', rows;
         if (caching && ignoreCache !== true) {
             if (types.isObject(search)) {
@@ -207,14 +208,11 @@ async function executeBatchQuery(batch, options = '', outResult) {
             else if (streams) {
                 queryString = Db.asString(streams, true);
             }
-            else if (!targetObject) {
-                queryString = Db.asString(key, true);
-            }
-            else if (item.cacheObjectKey) {
-                queryString = Db.asString(key, true) + '_' + targetObject.toString() + item.cacheObjectKey;
-            }
-            if (queryString) {
-                queryString += '_' + format;
+            else if (key) {
+                queryString = Db.asString(key, true) + '_' + format;
+                if (targetObject && typeof item.cacheObjectKey === 'string') {
+                    queryString += '_' + targetObject.toString() + item.cacheObjectKey;
+                }
             }
             if (ignoreCache !== 1) {
                 rows = this.getQueryResult(source, DbPool.sanitize(credential), queryString, cacheValue);
@@ -537,15 +535,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     }
                 }
                 else if (streams) {
-                    const data = await client.xRead(streams, clientOptions.xread);
-                    if (data) {
-                        rows = data;
-                    }
+                    rows = await client.xRead(streams, clientOptions.xread);
                 }
                 else if (key) {
                     let data;
                     if (Array.isArray(key)) {
-                        switch (format.toUpperCase()) {
+                        switch (format) {
                             case 'HKEYS':
                                 data = await Promise.all(key.map(async (k) => client.hKeys(k)));
                                 break;
@@ -567,7 +562,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                     }
                     else {
-                        switch (format.toUpperCase()) {
+                        switch (format) {
                             case 'HKEYS':
                                 data = await client.hKeys(key);
                                 break;
@@ -637,6 +632,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     return this.processRows(batch, tasks, {
         parallel,
+        errorAsEmpty,
         disconnect() {
             for (const item of clients) {
                 item.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/redis",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "Redis client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.13.10",
-    "@e-mc/types": "^0.13.10",
+    "@e-mc/db": "^0.13.12",
+    "@e-mc/types": "^0.13.12",
     "redis": "^5.12.1"
   }
 }