baja-lite 1.8.2 → 1.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/baja-lite",
   "repository": {

package/sql.d.ts

@@ -2139,7 +2139,7 @@ export declare function clearMethodCache(key: string): Promise<void>;
  */
 export declare function excuteWithCache<T>(config: {
     /** 返回缓存key,参数=方法的参数+当前用户对象，可以用来清空缓存。 */
-    key: string;
+    key: ((...args: any[]) => string) | string;
     /** 返回缓存清除key,参数=方法的参数+当前用户对象，可以用来批量清空缓存 */
     clearKey?: string[];
     /** 自动清空缓存的时间，单位分钟 */

package/sql.js

@@ -1916,7 +1916,11 @@ function P(skipConn = false) {
                         resolve(result);
                     }
                     catch (error) {
-                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
+                        let args = '';
+                        if (args.length > 0 && args[0].params) {
+                            args = JSON.stringify(args[0].params);
+                        }
+                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${args}`);
                         reject(error);
                     }
                     finally {
@@ -1946,7 +1950,11 @@ function P(skipConn = false) {
                         resolve(result);
                     }
                     catch (error) {
-                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
+                        let args = '';
+                        if (args.length > 0 && args[0].params) {
+                            args = JSON.stringify(args[0].params);
+                        }
+                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${args}`);
                         reject(error);
                     }
                     finally {
@@ -1976,7 +1984,11 @@ function P(skipConn = false) {
                         resolve(result);
                     }
                     catch (error) {
-                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`);
+                        let args = '';
+                        if (args.length > 0 && args[0].params) {
+                            args = JSON.stringify(args[0].params);
+                        }
+                        console.error(`${option.sqlId ?? option.tableName} service ${propertyKey} have an error:${error}, it's argumens: ${args}`);
                         reject(error);
                     }
                     finally {
@@ -5154,7 +5166,7 @@ export async function GetRedisLock(key, lockMaxActive) {
 ;
 /** 对FN加锁、缓存执行 */
 export async function excuteWithLock(config, fn__) {
-    const key = `[lock]${typeof config.key === 'function' ? config.key() : config.key}`;
+    const key = config.key_real ? `[lock]${config.key_real}` : `[lock]${typeof config.key === 'function' ? config.key() : config.key}`;
     const db = getRedisDB();
     let wait_time = 0;
     const fn = async () => {
@@ -5190,7 +5202,7 @@ export function MethodLock(config) {
     return function (target, _propertyKey, descriptor) {
         const fn__ = descriptor.value;
         descriptor.value = async function (...args) {
-            config.key = typeof config.key === 'function' ? config.key.call(target, ...args) : config.key;
+            config.key_real = typeof config.key === 'function' ? config.key.call(target, ...args) : config.key;
             return await excuteWithLock(config, async () => await fn__.call(this, ...args));
         };
     };
@@ -5271,16 +5283,17 @@ async function clearParent(clearKey) {
  */
 export async function excuteWithCache(config, fn) {
     const db = getRedisDB();
-    const cache = await db.get(`[cache]${config.key}`);
+    const key = typeof config.key === 'function' ? config.key() : config.key;
+    const cache = await db.get(`[cache]${key}`);
     if (cache) {
-        globalThis[_LoggerService].debug?.(`cache ${config.key} hit!`);
+        globalThis[_LoggerService].debug?.(`cache ${key} hit!`);
         return JSON.parse(cache);
     }
     else {
-        globalThis[_LoggerService].debug?.(`cache ${config.key} miss!`);
         const result = await fn();
+        globalThis[_LoggerService].debug?.(`cache ${key} miss!`);
         await setMethodCache({
-            key: config.key,
+            key,
             clearKey: config.clearKey,
             autoClearTime: config.autoClearTime,
             result