@midwayjs/cache-manager 3.19.2 → 4.0.0-alpha.1

package/dist/base/cacheManager.js

@@ -46,7 +46,7 @@ function createCache(store, args) {
                     await store.set(key, result, cacheTTL);
                     return result;
                 }
-                else if (args === null || args === void 0 ? void 0 : args.refreshThreshold) {
+                else if (args?.refreshThreshold) {
                     const cacheTTL = typeof ttl === 'function' ? ttl(value) : ttl;
                     const remainingTtl = await store.ttl(key);
                     if (remainingTtl !== -1 && remainingTtl < args.refreshThreshold) {
@@ -73,7 +73,7 @@ function createCache(store, args) {
                     await store.set(key, result, cacheTTL);
                     return result;
                 }
-                else if (args === null || args === void 0 ? void 0 : args.refreshThreshold) {
+                else if (args?.refreshThreshold) {
                     const cacheTTL = typeof ttl === 'function' ? ttl(value) : ttl;
                     const remainingTtl = await store.ttl(key);
                     if (remainingTtl !== -1 && remainingTtl < args.refreshThreshold) {

package/dist/base/prmoiseCoalesce.js

@@ -50,8 +50,7 @@ function addCallbackToKey(key, callback) {
     callbacks.set(key, stash);
 }
 function getCallbacksByKey(key) {
-    var _a;
-    return (_a = callbacks.get(key)) !== null && _a !== void 0 ? _a : [];
+    return callbacks.get(key) ?? [];
 }
 function enqueue(key) {
     return new Promise((resolve, reject) => {

package/dist/base/store.js

@@ -13,14 +13,13 @@ function clone(object) {
  * Wrapper for lru-cache.
  */
 function memoryStore(args) {
-    var _a;
-    const shouldCloneBeforeSet = (args === null || args === void 0 ? void 0 : args.shouldCloneBeforeSet) !== false; // clone by default
-    const isCacheable = (_a = args === null || args === void 0 ? void 0 : args.isCacheable) !== null && _a !== void 0 ? _a : (val => val !== undefined);
+    const shouldCloneBeforeSet = args?.shouldCloneBeforeSet !== false; // clone by default
+    const isCacheable = args?.isCacheable ?? (val => val !== undefined);
     const lruOpts = {
         ttlAutopurge: true,
         ...args,
-        max: (args === null || args === void 0 ? void 0 : args.max) || 500,
-        ttl: (args === null || args === void 0 ? void 0 : args.ttl) !== undefined ? args.ttl : 0,
+        max: args?.max || 500,
+        ttl: args?.ttl !== undefined ? args.ttl : 0,
     };
     const lruCache = new LRUCache(lruOpts);
     return {

package/dist/configuration.js

@@ -14,7 +14,11 @@ const core_1 = require("@midwayjs/core");
 const cacheKey_1 = require("./decorator/cacheKey");
 const factory_1 = require("./factory");
 function getClassMethodDefaultCacheKey(target, methodName) {
-    return target.name + '-' + (0, core_1.getProviderUUId)(target) + '-' + methodName;
+    return (target.name +
+        '-' +
+        core_1.DecoratorManager.getProviderUUId(target) +
+        '-' +
+        methodName);
 }
 exports.getClassMethodDefaultCacheKey = getClassMethodDefaultCacheKey;
 let CacheConfiguration = class CacheConfiguration {
@@ -48,11 +52,12 @@ let CacheConfiguration = class CacheConfiguration {
         });
     }
 };
+exports.CacheConfiguration = CacheConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
 ], CacheConfiguration.prototype, "decoratorService", void 0);
-CacheConfiguration = __decorate([
+exports.CacheConfiguration = CacheConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'cacheManager',
         importConfigs: [
@@ -64,5 +69,4 @@ CacheConfiguration = __decorate([
         ],
     })
 ], CacheConfiguration);
-exports.CacheConfiguration = CacheConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/decorator/cacheKey.js

@@ -8,7 +8,7 @@ function Caching(cacheInstanceName, cacheKeyOrTTL, ttl) {
         ttl = cacheKeyOrTTL;
         cacheKeyOrTTL = undefined;
     }
-    return (0, core_1.createCustomMethodDecorator)(exports.CACHE_DECORATOR_KEY, {
+    return core_1.DecoratorManager.createCustomMethodDecorator(exports.CACHE_DECORATOR_KEY, {
         cacheInstanceName,
         cacheKey: cacheKeyOrTTL,
         ttl,

package/dist/factory.js

@@ -70,6 +70,7 @@ let CachingFactory = class CachingFactory extends core_1.ServiceFactory {
         return this.get(cacheKey);
     }
 };
+exports.CachingFactory = CachingFactory;
 __decorate([
     (0, core_1.Config)('cacheManager'),
     __metadata("design:type", Object)
@@ -84,9 +85,8 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], CachingFactory.prototype, "init", null);
-CachingFactory = __decorate([
+exports.CachingFactory = CachingFactory = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], CachingFactory);
-exports.CachingFactory = CachingFactory;
 //# sourceMappingURL=factory.js.map

package/dist/store.js

@@ -13,7 +13,7 @@ function createRedisStore(instanceName) {
 }
 exports.createRedisStore = createRedisStore;
 function createStore(redisCache, options) {
-    const isCacheable = (options === null || options === void 0 ? void 0 : options.isCacheable) || (value => value !== undefined && value !== null);
+    const isCacheable = options?.isCacheable || (value => value !== undefined && value !== null);
     const keys = (pattern) => redisCache.keys(pattern);
     return {
         async get(key) {
@@ -32,14 +32,14 @@ function createStore(redisCache, options) {
         async set(key, value, ttl) {
             if (!isCacheable(value))
                 throw new core_1.MidwayCommonError(`"${value}" is not a cacheable value`);
-            const t = ttl === undefined ? options === null || options === void 0 ? void 0 : options.ttl : ttl;
+            const t = ttl === undefined ? options?.ttl : ttl;
             if (t !== undefined && t !== 0)
                 await redisCache.set(key, getVal(value), 'PX', t);
             else
                 await redisCache.set(key, getVal(value));
         },
         async mset(args, ttl) {
-            const t = ttl === undefined ? options === null || options === void 0 ? void 0 : options.ttl : ttl;
+            const t = ttl === undefined ? options?.ttl : ttl;
             if (t !== undefined && t !== 0) {
                 const multi = redisCache.multi();
                 for (const [key, value] of args) {
@@ -64,7 +64,7 @@ function createStore(redisCache, options) {
                 try {
                     return JSON.parse(x);
                 }
-                catch (_a) {
+                catch {
                     return x;
                 }
             }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/cache-manager",
-  "version": "3.19.2",
+  "version": "4.0.0-alpha.1",
   "description": "midway cache manager",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit"
   },
   "author": "",
   "files": [
@@ -28,9 +28,9 @@
     "node": ">=12"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.19.0",
-    "@midwayjs/mock": "^3.19.2",
-    "@midwayjs/redis": "^3.19.2",
+    "@midwayjs/core": "^4.0.0-alpha.1",
+    "@midwayjs/mock": "^4.0.0-alpha.1",
+    "@midwayjs/redis": "^4.0.0-alpha.1",
     "cache-manager": "6.0.0",
     "cache-manager-ioredis-yet": "2.1.2"
   },
@@ -38,5 +38,5 @@
     "lodash.clonedeep": "4.5.0",
     "lru-cache": "7.18.3"
   },
-  "gitHead": "57fd034be94897fb819b0d9ef776de0b9923ab0f"
+  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
 }