vona-module-a-caching 5.0.4 → 5.0.6

package/dist/bean/aopMethod.cachingDel.js

@@ -4,17 +4,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { isNil } from '@cabloy/utils';
 import { BeanAopMethodBase, beanFullNameFromOnionName } from 'vona';
 import { AopMethod } from 'vona-module-a-aspect';
-import { combineCachingKey } from "../lib/utils.js";
+import { combineCachingKey, isCachingKeyValid } from "../lib/utils.js";
 let AopMethodCachingDel = class AopMethodCachingDel extends BeanAopMethodBase {
     async execute(options, args, next, receiver, prop) {
         // next
         const value = await next();
         // key
         const key = combineCachingKey(options, args, receiver, prop);
-        if (isNil(key) || key === false || key === '')
+        if (!isCachingKeyValid(key))
             return value;
         // cache
         const cache = this.bean.summer.cache(beanFullNameFromOnionName(options.cacheName, 'summerCache'));

package/dist/bean/aopMethod.cachingGet.js

@@ -4,15 +4,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { isNil } from '@cabloy/utils';
 import { BeanAopMethodBase, beanFullNameFromOnionName } from 'vona';
 import { AopMethod } from 'vona-module-a-aspect';
-import { combineCachingKey } from "../lib/utils.js";
+import { combineCachingKey, isCachingKeyValid } from "../lib/utils.js";
 let AopMethodCachingGet = class AopMethodCachingGet extends BeanAopMethodBase {
     async execute(options, args, next, receiver, prop) {
         // key
         const key = combineCachingKey(options, args, receiver, prop);
-        if (isNil(key) || key === false || key === '')
+        if (!isCachingKeyValid(key))
             return next();
         // cache
         const cache = this.bean.summer.cache(beanFullNameFromOnionName(options.cacheName, 'summerCache'));

package/dist/bean/aopMethod.cachingSet.js

@@ -4,17 +4,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { isNil } from '@cabloy/utils';
 import { BeanAopMethodBase, beanFullNameFromOnionName } from 'vona';
 import { AopMethod } from 'vona-module-a-aspect';
-import { combineCachingKey, combineCachingValue } from "../lib/utils.js";
+import { combineCachingKey, combineCachingValue, isCachingKeyValid } from "../lib/utils.js";
 let AopMethodCachingSet = class AopMethodCachingSet extends BeanAopMethodBase {
     async execute(options, args, next, receiver, prop) {
         // next
         const value = await next();
         // key
         const key = combineCachingKey(options, args, receiver, prop);
-        if (isNil(key) || key === false || key === '')
+        if (!isCachingKeyValid(key))
             return value;
         // value
         const cacheValue = combineCachingValue(options, args, receiver, prop, value);

package/dist/lib/utils.d.ts

@@ -3,3 +3,4 @@ import type { IAopMethodOptionsCachingSet } from '../bean/aopMethod.cachingSet.t
 import type { TypeCachingActionOptions } from '../types/caching.ts';
 export declare function combineCachingKey(options: TypeCachingActionOptions, args: [], receiver: BeanBase, prop: string): any;
 export declare function combineCachingValue(options: IAopMethodOptionsCachingSet, args: [], receiver: BeanBase, prop: string, value: any): any;
+export declare function isCachingKeyValid(key: any): boolean;

package/dist/lib/utils.js

@@ -19,6 +19,8 @@ export function combineCachingKey(options, args, receiver, prop) {
             prop,
             options,
             self: receiver,
+            app: cast(receiver).app,
+            ctx: cast(receiver).ctx,
         });
     }
     // default
@@ -43,8 +45,13 @@ export function combineCachingValue(options, args, receiver, prop, value) {
             prop,
             options,
             self: receiver,
+            app: cast(receiver).app,
+            ctx: cast(receiver).ctx,
         });
     }
     // default
     return value;
 }
+export function isCachingKeyValid(key) {
+    return !isNil(key) && key !== false && key !== '';
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-caching",
   "type": "module",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "title": "a-caching",
   "vonaModule": {
     "dependencies": {}