npm - koatty_cacheable - Versions diffs - 1.3.7 → 1.4.0 - Mend

koatty_cacheable 1.3.7 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -2,4 +2,16 @@
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+## [1.4.0](https://github.com/thinkkoa/koatty_cacheable/compare/v1.3.8...v1.4.0) (2023-02-18)
+### Bug Fixes
+* cache subkey ([408e3c7](https://github.com/thinkkoa/koatty_cacheable/commit/408e3c709a4dfff6e7d224a22d26e58854a805ac))
+* 启动时链接 ([e7ec709](https://github.com/thinkkoa/koatty_cacheable/commit/e7ec7094be106e4e48783c9b214b8369e8a18297))
+* 支持引入变量做缓存key ([4ce81aa](https://github.com/thinkkoa/koatty_cacheable/commit/4ce81aaaf9610f4a62ddf43e3c4389dd003c2db8))
+* 获取单例 ([0759972](https://github.com/thinkkoa/koatty_cacheable/commit/0759972adf7e86312f60f0bf77604bddf06ce0de))
+### [1.3.8](https://github.com/thinkkoa/koatty_cacheable/compare/v1.3.6...v1.3.8) (2023-01-13)
 ### [1.3.7](https://github.com/thinkkoa/koatty_cacheable/compare/v1.3.6...v1.3.7) (2022-05-27)

package/dist/index.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 /*!
 * @Author: richen
-* @Date: 2022-05-27 11:35:52
+* @Date: 2023-02-19 01:22:50
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
@@ -15,20 +15,50 @@ import { CacheStore } from 'koatty_store';
  *
  * @export
  * @param {string} cacheName cache name
- * @param {number} [timeout=3600] cache timeout
+ * @param {CacheAbleOpt} [opt] cache options
+ * e.g:
+ * {
+ *  params: ["id"],
+ *  timeout: 30
+ * }
+ * Use the 'id' parameters of the method as cache subkeys, the cache expiration time 30s
  * @returns {MethodDecorator}
  */
-export declare function CacheAble(cacheName: string, timeout?: number): MethodDecorator;
+export declare function CacheAble(cacheName: string, opt?: CacheAbleOpt): MethodDecorator;
+/**
+ * @description:
+ * @return {*}
+ */
+export declare interface CacheAbleOpt {
+    params?: string[];
+    timeout?: number;
+}
 /**
  * Decorating the execution of this method will trigger a cache clear operation. Redis server config from db.ts.
  *
  * @export
  * @param {string} cacheName cacheName cache name
- * @param {eventTimes} [eventTime="Before"]
+ * @param {CacheEvictOpt} [opt] cache options
+ * e.g:
+ * {
+ *  params: ["id"],
+ *  eventTime: "Before"
+ * }
+ * Use the 'id' parameters of the method as cache subkeys, and clear the cache before the method executed
  * @returns
  */
-export declare function CacheEvict(cacheName: string, eventTime?: eventTimes): (target: any, methodName: string, descriptor: PropertyDescriptor) => PropertyDescriptor;
+export declare function CacheEvict(cacheName: string, opt?: CacheEvictOpt): (target: any, methodName: string, descriptor: PropertyDescriptor) => PropertyDescriptor;
+/**
+ * @description:
+ * @return {*}
+ */
+export declare interface CacheEvictOpt {
+    params?: string[];
+    eventTime?: "Before";
+}
 /**
  *
@@ -36,7 +66,7 @@ export declare function CacheEvict(cacheName: string, eventTime?: eventTimes): (
 export declare type eventTimes = "Before" | "After";
 /**
- * get instances of cacheStore
+ * get instances of storeCache
  *
  * @export
  * @param {Application} app

package/dist/index.js CHANGED Viewed

@@ -1,52 +1,31 @@
 /*!
 * @Author: richen
-* @Date: 2022-05-27 11:35:38
+* @Date: 2023-02-19 01:22:36
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
 */
 'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-var helper = require('koatty_lib');
+var koatty_lib = require('koatty_lib');
 var koatty_logger = require('koatty_logger');
 var koatty_store = require('koatty_store');
 var koatty_container = require('koatty_container');
-function _interopNamespace(e) {
-    if (e && e.__esModule) return e;
-    var n = Object.create(null);
-    if (e) {
-        Object.keys(e).forEach(function (k) {
-            if (k !== 'default') {
-                var d = Object.getOwnPropertyDescriptor(e, k);
-                Object.defineProperty(n, k, d.get ? d : {
-                    enumerable: true,
-                    get: function () { return e[k]; }
-                });
-            }
-        });
-    }
-    n["default"] = e;
-    return Object.freeze(n);
-}
-var helper__namespace = /*#__PURE__*/_interopNamespace(helper);
 /*
  * @Author: richen
  * @Date: 2020-07-06 19:53:43
- * @LastEditTime: 2021-12-02 16:20:52
+ * @LastEditTime: 2023-02-19 01:16:52
  * @Description:
  * @Copyright (c) - <richenlin(at)gmail.com>
  */
-// cacheStore
-const cacheStore = {
+const PreKey = "k";
+// storeCache
+const storeCache = {
     store: null
 };
 /**
- * get instances of cacheStore
+ * get instances of storeCache
  *
  * @export
  * @param {Application} app
@@ -54,18 +33,19 @@ const cacheStore = {
  */
 async function GetCacheStore(app) {
     var _a;
-    if (cacheStore.store && cacheStore.store.getConnection) {
-        return cacheStore.store;
+    if (storeCache.store && storeCache.store.getConnection) {
+        return storeCache.store;
     }
     const opt = (_a = app.config("CacheStore", "db")) !== null && _a !== void 0 ? _a : {};
-    if (helper__namespace.isEmpty(opt)) {
+    if (koatty_lib.Helper.isEmpty(opt)) {
         koatty_logger.DefaultLogger.Warn(`Missing CacheStore server configuration. Please write a configuration item with the key name 'CacheStore' in the db.ts file.`);
     }
-    cacheStore.store = koatty_store.Store.getInstance(opt);
-    if (!helper__namespace.isFunction(cacheStore.store.getConnection)) {
+    storeCache.store = koatty_store.CacheStore.getInstance(opt);
+    if (!koatty_lib.Helper.isFunction(storeCache.store.getConnection)) {
         throw Error(`CacheStore connection failed. `);
     }
-    return cacheStore.store;
+    await storeCache.store.client.getConnection();
+    return storeCache.store;
 }
 /**
  * initiation CacheStore connection and client.
@@ -84,18 +64,27 @@ async function InitCacheStore() {
  *
  * @export
  * @param {string} cacheName cache name
- * @param {number} [timeout=3600] cache timeout
+ * @param {CacheAbleOpt} [opt] cache options
+ * e.g:
+ * {
+ *  params: ["id"],
+ *  timeout: 30
+ * }
+ * Use the 'id' parameters of the method as cache subkeys, the cache expiration time 30s
  * @returns {MethodDecorator}
  */
-function CacheAble(cacheName, timeout = 3600) {
+function CacheAble(cacheName, opt = {
+    params: [],
+    timeout: 3600,
+}) {
     return (target, methodName, descriptor) => {
         const componentType = koatty_container.IOCContainer.getType(target);
         if (componentType !== "SERVICE" && componentType !== "COMPONENT") {
             throw Error("This decorator only used in the service、component class.");
         }
-        let identifier = koatty_container.IOCContainer.getIdentifier(target);
-        identifier = identifier || (target.constructor ? (target.constructor.name || "") : "");
         const { value, configurable, enumerable } = descriptor;
+        // 获取定义的参数位置
+        const paramIndexes = getParamIndex(opt.params, getArgs(value));
         descriptor = {
             configurable,
             enumerable,
@@ -109,26 +98,35 @@ function CacheAble(cacheName, timeout = 3600) {
                 });
                 if (cacheFlag) {
                     // tslint:disable-next-line: one-variable-per-declaration
-                    let key = "", res;
+                    let key = PreKey;
                     if (props && props.length > 0) {
-                        key = `${identifier}:${methodName}:${helper__namespace.murmurHash(JSON.stringify(props))}`;
+                        for (const item of paramIndexes) {
+                            if (props[item] !== undefined) {
+                                const value = koatty_lib.Helper.toString(props[item]);
+                                key += `:${value}`;
+                            }
+                        }
+                        // 防止key超长
+                        if (key.length > 32) {
+                            key = koatty_lib.Helper.murmurHash(key);
+                        }
                     }
-                    else {
-                        key = `${identifier}:${methodName}`;
-                    }
-                    res = await store.hget(cacheName, key).catch(() => null);
-                    if (!helper__namespace.isEmpty(res)) {
+                    let res = await store.get(`${cacheName}:${key}`).catch(() => null);
+                    if (!koatty_lib.Helper.isEmpty(res)) {
                         return JSON.parse(res);
                     }
                     // tslint:disable-next-line: no-invalid-this
                     res = await value.apply(this, props);
                     // prevent cache penetration
-                    if (helper__namespace.isEmpty(res)) {
+                    if (koatty_lib.Helper.isEmpty(res)) {
                         res = "";
-                        timeout = 60;
+                        opt.timeout = 5;
+                    }
+                    if (!opt.timeout) {
+                        opt.timeout = 3600;
                     }
                     // async set store
-                    store.hset(cacheName, key, JSON.stringify(res), timeout).catch(() => null);
+                    store.set(`${cacheName}:${key}`, JSON.stringify(res), opt.timeout).catch(() => null);
                     return res;
                 }
                 else {
@@ -147,17 +145,26 @@ function CacheAble(cacheName, timeout = 3600) {
  *
  * @export
  * @param {string} cacheName cacheName cache name
- * @param {eventTimes} [eventTime="Before"]
+ * @param {CacheEvictOpt} [opt] cache options
+ * e.g:
+ * {
+ *  params: ["id"],
+ *  eventTime: "Before"
+ * }
+ * Use the 'id' parameters of the method as cache subkeys, and clear the cache before the method executed
  * @returns
  */
-function CacheEvict(cacheName, eventTime = "Before") {
+function CacheEvict(cacheName, opt = {
+    eventTime: "Before",
+}) {
     return (target, methodName, descriptor) => {
         const componentType = koatty_container.IOCContainer.getType(target);
         if (componentType !== "SERVICE" && componentType !== "COMPONENT") {
             throw Error("This decorator only used in the service、component class.");
         }
-        koatty_container.IOCContainer.getIdentifier(target);
         const { value, configurable, enumerable } = descriptor;
+        // 获取定义的参数位置
+        const paramIndexes = getParamIndex(opt.params, getArgs(value));
         descriptor = {
             configurable,
             enumerable,
@@ -170,15 +177,28 @@ function CacheEvict(cacheName, eventTime = "Before") {
                     return null;
                 });
                 if (cacheFlag) {
-                    if (eventTime === "Before") {
-                        await store.del(cacheName).catch(() => null);
+                    let key = PreKey;
+                    if (props && props.length > 0) {
+                        for (const item of paramIndexes) {
+                            if (props[item] !== undefined) {
+                                const value = koatty_lib.Helper.toString(props[item]);
+                                key += `:${value}`;
+                            }
+                        }
+                        // 防止key超长
+                        if (key.length > 32) {
+                            key = koatty_lib.Helper.murmurHash(key);
+                        }
+                    }
+                    if (opt.eventTime === "Before") {
+                        await store.del(`${cacheName}:${key}`).catch(() => null);
                         // tslint:disable-next-line: no-invalid-this
                         return value.apply(this, props);
                     }
                     else {
                         // tslint:disable-next-line: no-invalid-this
                         const res = await value.apply(this, props);
-                        store.del(cacheName).catch(() => null);
+                        store.del(`${cacheName}:${key}`).catch(() => null);
                         return res;
                     }
                 }
@@ -192,6 +212,41 @@ function CacheEvict(cacheName, eventTime = "Before") {
         InitCacheStore();
         return descriptor;
     };
+}
+/**
+ * @description:
+ * @param {*} func
+ * @return {*}
+ */
+function getArgs(func) {
+    // 首先匹配函数括弧里的参数
+    const args = func.toString().match(/.*?\(([^)]*)\)/);
+    if (args.length > 1) {
+        // 分解参数成数组
+        return args[1].split(",").map(function (a) {
+            // 去空格和内联注释
+            return a.replace(/\/\*.*\*\//, "").trim();
+        }).filter(function (ae) {
+            // 确保没有undefineds
+            return ae;
+        });
+    }
+    return [];
+}
+/**
+ * @description:
+ * @param {string} params
+ * @param {string} args
+ * @return {*}
+ */
+function getParamIndex(params, args) {
+    const res = [];
+    for (let i = 0; i < params.length; i++) {
+        if (params.includes(params[i])) {
+            res.push(i);
+        }
+    }
+    return res;
 }
 exports.CacheAble = CacheAble;

package/dist/index.mjs CHANGED Viewed

@@ -1,28 +1,29 @@
 /*!
 * @Author: richen
-* @Date: 2022-05-27 11:35:38
+* @Date: 2023-02-19 01:22:36
 * @License: BSD (3-Clause)
 * @Copyright (c) - <richenlin(at)gmail.com>
 * @HomePage: https://koatty.org/
 */
-import * as helper from 'koatty_lib';
+import { Helper } from 'koatty_lib';
 import { DefaultLogger } from 'koatty_logger';
-import { Store } from 'koatty_store';
+import { CacheStore } from 'koatty_store';
 import { IOCContainer } from 'koatty_container';
 /*
  * @Author: richen
  * @Date: 2020-07-06 19:53:43
- * @LastEditTime: 2021-12-02 16:20:52
+ * @LastEditTime: 2023-02-19 01:16:52
  * @Description:
  * @Copyright (c) - <richenlin(at)gmail.com>
  */
-// cacheStore
-const cacheStore = {
+const PreKey = "k";
+// storeCache
+const storeCache = {
     store: null
 };
 /**
- * get instances of cacheStore
+ * get instances of storeCache
  *
  * @export
  * @param {Application} app
@@ -30,18 +31,19 @@ const cacheStore = {
  */
 async function GetCacheStore(app) {
     var _a;
-    if (cacheStore.store && cacheStore.store.getConnection) {
-        return cacheStore.store;
+    if (storeCache.store && storeCache.store.getConnection) {
+        return storeCache.store;
     }
     const opt = (_a = app.config("CacheStore", "db")) !== null && _a !== void 0 ? _a : {};
-    if (helper.isEmpty(opt)) {
+    if (Helper.isEmpty(opt)) {
         DefaultLogger.Warn(`Missing CacheStore server configuration. Please write a configuration item with the key name 'CacheStore' in the db.ts file.`);
     }
-    cacheStore.store = Store.getInstance(opt);
-    if (!helper.isFunction(cacheStore.store.getConnection)) {
+    storeCache.store = CacheStore.getInstance(opt);
+    if (!Helper.isFunction(storeCache.store.getConnection)) {
         throw Error(`CacheStore connection failed. `);
     }
-    return cacheStore.store;
+    await storeCache.store.client.getConnection();
+    return storeCache.store;
 }
 /**
  * initiation CacheStore connection and client.
@@ -60,18 +62,27 @@ async function InitCacheStore() {
  *
  * @export
  * @param {string} cacheName cache name
- * @param {number} [timeout=3600] cache timeout
+ * @param {CacheAbleOpt} [opt] cache options
+ * e.g:
+ * {
+ *  params: ["id"],
+ *  timeout: 30
+ * }
+ * Use the 'id' parameters of the method as cache subkeys, the cache expiration time 30s
  * @returns {MethodDecorator}
  */
-function CacheAble(cacheName, timeout = 3600) {
+function CacheAble(cacheName, opt = {
+    params: [],
+    timeout: 3600,
+}) {
     return (target, methodName, descriptor) => {
         const componentType = IOCContainer.getType(target);
         if (componentType !== "SERVICE" && componentType !== "COMPONENT") {
             throw Error("This decorator only used in the service、component class.");
         }
-        let identifier = IOCContainer.getIdentifier(target);
-        identifier = identifier || (target.constructor ? (target.constructor.name || "") : "");
         const { value, configurable, enumerable } = descriptor;
+        // 获取定义的参数位置
+        const paramIndexes = getParamIndex(opt.params, getArgs(value));
         descriptor = {
             configurable,
             enumerable,
@@ -85,26 +96,35 @@ function CacheAble(cacheName, timeout = 3600) {
                 });
                 if (cacheFlag) {
                     // tslint:disable-next-line: one-variable-per-declaration
-                    let key = "", res;
+                    let key = PreKey;
                     if (props && props.length > 0) {
-                        key = `${identifier}:${methodName}:${helper.murmurHash(JSON.stringify(props))}`;
+                        for (const item of paramIndexes) {
+                            if (props[item] !== undefined) {
+                                const value = Helper.toString(props[item]);
+                                key += `:${value}`;
+                            }
+                        }
+                        // 防止key超长
+                        if (key.length > 32) {
+                            key = Helper.murmurHash(key);
+                        }
                     }
-                    else {
-                        key = `${identifier}:${methodName}`;
-                    }
-                    res = await store.hget(cacheName, key).catch(() => null);
-                    if (!helper.isEmpty(res)) {
+                    let res = await store.get(`${cacheName}:${key}`).catch(() => null);
+                    if (!Helper.isEmpty(res)) {
                         return JSON.parse(res);
                     }
                     // tslint:disable-next-line: no-invalid-this
                     res = await value.apply(this, props);
                     // prevent cache penetration
-                    if (helper.isEmpty(res)) {
+                    if (Helper.isEmpty(res)) {
                         res = "";
-                        timeout = 60;
+                        opt.timeout = 5;
+                    }
+                    if (!opt.timeout) {
+                        opt.timeout = 3600;
                     }
                     // async set store
-                    store.hset(cacheName, key, JSON.stringify(res), timeout).catch(() => null);
+                    store.set(`${cacheName}:${key}`, JSON.stringify(res), opt.timeout).catch(() => null);
                     return res;
                 }
                 else {
@@ -123,17 +143,26 @@ function CacheAble(cacheName, timeout = 3600) {
  *
  * @export
  * @param {string} cacheName cacheName cache name
- * @param {eventTimes} [eventTime="Before"]
+ * @param {CacheEvictOpt} [opt] cache options
+ * e.g:
+ * {
+ *  params: ["id"],
+ *  eventTime: "Before"
+ * }
+ * Use the 'id' parameters of the method as cache subkeys, and clear the cache before the method executed
  * @returns
  */
-function CacheEvict(cacheName, eventTime = "Before") {
+function CacheEvict(cacheName, opt = {
+    eventTime: "Before",
+}) {
     return (target, methodName, descriptor) => {
         const componentType = IOCContainer.getType(target);
         if (componentType !== "SERVICE" && componentType !== "COMPONENT") {
             throw Error("This decorator only used in the service、component class.");
         }
-        IOCContainer.getIdentifier(target);
         const { value, configurable, enumerable } = descriptor;
+        // 获取定义的参数位置
+        const paramIndexes = getParamIndex(opt.params, getArgs(value));
         descriptor = {
             configurable,
             enumerable,
@@ -146,15 +175,28 @@ function CacheEvict(cacheName, eventTime = "Before") {
                     return null;
                 });
                 if (cacheFlag) {
-                    if (eventTime === "Before") {
-                        await store.del(cacheName).catch(() => null);
+                    let key = PreKey;
+                    if (props && props.length > 0) {
+                        for (const item of paramIndexes) {
+                            if (props[item] !== undefined) {
+                                const value = Helper.toString(props[item]);
+                                key += `:${value}`;
+                            }
+                        }
+                        // 防止key超长
+                        if (key.length > 32) {
+                            key = Helper.murmurHash(key);
+                        }
+                    }
+                    if (opt.eventTime === "Before") {
+                        await store.del(`${cacheName}:${key}`).catch(() => null);
                         // tslint:disable-next-line: no-invalid-this
                         return value.apply(this, props);
                     }
                     else {
                         // tslint:disable-next-line: no-invalid-this
                         const res = await value.apply(this, props);
-                        store.del(cacheName).catch(() => null);
+                        store.del(`${cacheName}:${key}`).catch(() => null);
                         return res;
                     }
                 }
@@ -168,6 +210,41 @@ function CacheEvict(cacheName, eventTime = "Before") {
         InitCacheStore();
         return descriptor;
     };
+}
+/**
+ * @description:
+ * @param {*} func
+ * @return {*}
+ */
+function getArgs(func) {
+    // 首先匹配函数括弧里的参数
+    const args = func.toString().match(/.*?\(([^)]*)\)/);
+    if (args.length > 1) {
+        // 分解参数成数组
+        return args[1].split(",").map(function (a) {
+            // 去空格和内联注释
+            return a.replace(/\/\*.*\*\//, "").trim();
+        }).filter(function (ae) {
+            // 确保没有undefineds
+            return ae;
+        });
+    }
+    return [];
+}
+/**
+ * @description:
+ * @param {string} params
+ * @param {string} args
+ * @return {*}
+ */
+function getParamIndex(params, args) {
+    const res = [];
+    for (let i = 0; i < params.length; i++) {
+        if (params.includes(params[i])) {
+            res.push(i);
+        }
+    }
+    return res;
 }
 export { CacheAble, CacheEvict, GetCacheStore };

package/dist/package.json CHANGED Viewed

@@ -1,89 +1,92 @@
 {
-    "name": "koatty_cacheable",
-    "version": "1.3.7",
-    "description": "Cacheable for koatty.",
-    "scripts": {
-        "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",
-        "build:cp": "node scripts/postBuild && copyfiles package.json LICENSE README.md dist/",
-        "build:js": "del-cli --force dist && npx rollup -c .rollup.config.js",
-        "build:doc": "del-cli --force docs/api && npx api-documenter markdown --input temp --output docs/api",
-        "build:dts": "del-cli --force temp && npx tsc && npx api-extractor run --local --verbose",
-        "eslint": "eslint --ext .ts,.js ./",
-        "prepublishOnly": "npm test && npm run build",
-        "prerelease": "npm test && npm run build",
-        "release": "standard-version",
-        "test": "npm run eslint && jest --passWithNoTests"
-    },
-    "main": "./dist/index.js",
-    "exports": {
-        "require": "./dist/index.js",
-        "import": "./dist/index.mjs"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/thinkkoa/koatty_cacheable.git"
-    },
-    "keywords": [
-        "cache",
-        "store",
-        "koatty",
-        "thinkkoa"
-    ],
-    "engines": {
-        "node": ">10.0.0"
-    },
-    "author": {
-        "name": "richenlin",
-        "email": "richenlin@gmail.com"
-    },
-    "license": "BSD-3-Clause",
-    "bugs": {
-        "url": "https://github.com/thinkkoa/koatty_cacheable/issues"
-    },
-    "homepage": "https://github.com/thinkkoa/koatty_cacheable",
-    "maintainers": [
-        {
-            "name": "richenlin",
-            "email": "richenlin@gmail.com"
-        }
-    ],
-    "devDependencies": {
-        "@commitlint/cli": "^17.x.x",
-        "@commitlint/config-conventional": "^17.x.x",
-        "@microsoft/api-documenter": "^7.x.x",
-        "@microsoft/api-extractor": "^7.x.x",
-        "@rollup/plugin-json": "^4.x.x",
-        "@types/jest": "^27.x.x",
-        "@types/koa": "^2.x.x",
-        "@types/node": "^16.x.x",
-        "@typescript-eslint/eslint-plugin": "^5.x.x",
-        "@typescript-eslint/parser": "^5.x.x",
-        "conventional-changelog-cli": "^2.x.x",
-        "copyfiles": "^2.x.x",
-        "del-cli": "^4.x.x",
-        "eslint": "^8.x.x",
-        "eslint-plugin-jest": "^26.x.x",
-        "husky": "^4.x.x",
-        "jest": "^28.x.x",
-        "jest-html-reporters": "^3.x.x",
-        "rollup": "^2.x.x",
-        "rollup-plugin-typescript2": "^0.x.x",
-        "standard-version": "^9.x.x",
-        "ts-jest": "^28.x.x",
-        "ts-node": "^10.x.x",
-        "typescript": "^4.x.x"
-    },
-    "dependencies": {
-        "koatty_container": "^1.x.x",
-        "koatty_lib": "^1.x.x",
-        "koatty_logger": "^1.x.x",
-        "koatty_store": "^1.x.x",
-        "tslib": "^2.4.0"
-    },
-    "peerDependencies": {
-        "koatty_container": "^1.x.x",
-        "koatty_lib": "^1.x.x",
-        "koatty_logger": "^1.x.x",
-        "koatty_store": "^1.x.x"
+  "name": "koatty_cacheable",
+  "version": "1.4.0",
+  "description": "Cacheable for koatty.",
+  "scripts": {
+    "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",
+    "build:cp": "node scripts/postBuild && copyfiles package.json LICENSE README.md dist/",
+    "build:js": "del-cli --force dist && npx rollup --bundleConfigAsCjs -c .rollup.config.js",
+    "build:doc": "del-cli --force docs/api && npx api-documenter markdown --input temp --output docs/api",
+    "build:dts": "del-cli --force temp && npx tsc && npx api-extractor run --local --verbose",
+    "eslint": "eslint --ext .ts,.js ./",
+    "prepublishOnly": "npm test && npm run build",
+    "prerelease": "npm test && npm run build",
+    "pub": "git push --follow-tags origin && npm publish",
+    "release": "standard-version",
+    "release:pre": "npm run release -- --prerelease",
+    "release:major": "npm run release -- --release-as major",
+    "release:minor": "npm run release -- --release-as minor",
+    "test": "npm run eslint && jest --passWithNoTests"
+  },
+  "main": "./dist/index.js",
+  "exports": {
+    "require": "./dist/index.js",
+    "import": "./dist/index.mjs"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/thinkkoa/koatty_cacheable.git"
+  },
+  "keywords": [
+    "cache",
+    "store",
+    "koatty",
+    "thinkkoa"
+  ],
+  "engines": {
+    "node": ">10.0.0"
+  },
+  "author": {
+    "name": "richenlin",
+    "email": "richenlin@gmail.com"
+  },
+  "license": "BSD-3-Clause",
+  "bugs": {
+    "url": "https://github.com/thinkkoa/koatty_cacheable/issues"
+  },
+  "homepage": "https://github.com/thinkkoa/koatty_cacheable",
+  "maintainers": [
+    {
+      "name": "richenlin",
+      "email": "richenlin@gmail.com"
     }
+  ],
+  "devDependencies": {
+    "@commitlint/cli": "^17.x.x",
+    "@commitlint/config-conventional": "^17.x.x",
+    "@microsoft/api-documenter": "^7.x.x",
+    "@microsoft/api-extractor": "^7.x.x",
+    "@rollup/plugin-json": "^6.x.x",
+    "@types/jest": "^29.x.x",
+    "@types/koa": "^2.x.x",
+    "@types/node": "^18.x.x",
+    "@typescript-eslint/eslint-plugin": "^5.x.x",
+    "@typescript-eslint/parser": "^5.x.x",
+    "conventional-changelog-cli": "^2.x.x",
+    "copyfiles": "^2.x.x",
+    "del-cli": "^4.x.x",
+    "eslint": "^8.x.x",
+    "eslint-plugin-jest": "^27.x.x",
+    "husky": "^4.x.x",
+    "jest": "^29.x.x",
+    "jest-html-reporters": "^3.x.x",
+    "rollup": "^3.x.x",
+    "rollup-plugin-typescript2": "^0.x.x",
+    "standard-version": "^9.x.x",
+    "ts-jest": "^29.x.x",
+    "ts-node": "^10.x.x",
+    "typescript": "^4.x.x"
+  },
+  "dependencies": {
+    "koatty_container": "^1.x.x",
+    "koatty_lib": "^1.x.x",
+    "koatty_logger": "^2.x.x",
+    "koatty_store": "^1.x.x"
+  },
+  "peerDependencies": {
+    "koatty_container": "^1.x.x",
+    "koatty_lib": "^1.x.x",
+    "koatty_logger": "^2.x.x",
+    "koatty_store": "^1.x.x"
+  }
 }

package/package.json CHANGED Viewed

@@ -1,89 +1,92 @@
 {
-    "name": "koatty_cacheable",
-    "version": "1.3.7",
-    "description": "Cacheable for koatty.",
-    "scripts": {
-        "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",
-        "build:cp": "node scripts/postBuild && copyfiles package.json LICENSE README.md dist/",
-        "build:js": "del-cli --force dist && npx rollup -c .rollup.config.js",
-        "build:doc": "del-cli --force docs/api && npx api-documenter markdown --input temp --output docs/api",
-        "build:dts": "del-cli --force temp && npx tsc && npx api-extractor run --local --verbose",
-        "eslint": "eslint --ext .ts,.js ./",
-        "prepublishOnly": "npm test && npm run build",
-        "prerelease": "npm test && npm run build",
-        "release": "standard-version",
-        "test": "npm run eslint && jest --passWithNoTests"
-    },
-    "main": "./dist/index.js",
-    "exports": {
-        "require": "./dist/index.js",
-        "import": "./dist/index.mjs"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/thinkkoa/koatty_cacheable.git"
-    },
-    "keywords": [
-        "cache",
-        "store",
-        "koatty",
-        "thinkkoa"
-    ],
-    "engines": {
-        "node": ">10.0.0"
-    },
-    "author": {
-        "name": "richenlin",
-        "email": "richenlin@gmail.com"
-    },
-    "license": "BSD-3-Clause",
-    "bugs": {
-        "url": "https://github.com/thinkkoa/koatty_cacheable/issues"
-    },
-    "homepage": "https://github.com/thinkkoa/koatty_cacheable",
-    "maintainers": [
-        {
-            "name": "richenlin",
-            "email": "richenlin@gmail.com"
-        }
-    ],
-    "devDependencies": {
-        "@commitlint/cli": "^17.x.x",
-        "@commitlint/config-conventional": "^17.x.x",
-        "@microsoft/api-documenter": "^7.x.x",
-        "@microsoft/api-extractor": "^7.x.x",
-        "@rollup/plugin-json": "^4.x.x",
-        "@types/jest": "^27.x.x",
-        "@types/koa": "^2.x.x",
-        "@types/node": "^16.x.x",
-        "@typescript-eslint/eslint-plugin": "^5.x.x",
-        "@typescript-eslint/parser": "^5.x.x",
-        "conventional-changelog-cli": "^2.x.x",
-        "copyfiles": "^2.x.x",
-        "del-cli": "^4.x.x",
-        "eslint": "^8.x.x",
-        "eslint-plugin-jest": "^26.x.x",
-        "husky": "^4.x.x",
-        "jest": "^28.x.x",
-        "jest-html-reporters": "^3.x.x",
-        "rollup": "^2.x.x",
-        "rollup-plugin-typescript2": "^0.x.x",
-        "standard-version": "^9.x.x",
-        "ts-jest": "^28.x.x",
-        "ts-node": "^10.x.x",
-        "typescript": "^4.x.x"
-    },
-    "dependencies": {
-        "koatty_container": "^1.x.x",
-        "koatty_lib": "^1.x.x",
-        "koatty_logger": "^1.x.x",
-        "koatty_store": "^1.x.x",
-        "tslib": "^2.4.0"
-    },
-    "peerDependencies": {
-        "koatty_container": "^1.x.x",
-        "koatty_lib": "^1.x.x",
-        "koatty_logger": "^1.x.x",
-        "koatty_store": "^1.x.x"
+  "name": "koatty_cacheable",
+  "version": "1.4.0",
+  "description": "Cacheable for koatty.",
+  "scripts": {
+    "build": "npm run build:js && npm run build:dts && npm run build:doc && npm run build:cp",
+    "build:cp": "node scripts/postBuild && copyfiles package.json LICENSE README.md dist/",
+    "build:js": "del-cli --force dist && npx rollup --bundleConfigAsCjs -c .rollup.config.js",
+    "build:doc": "del-cli --force docs/api && npx api-documenter markdown --input temp --output docs/api",
+    "build:dts": "del-cli --force temp && npx tsc && npx api-extractor run --local --verbose",
+    "eslint": "eslint --ext .ts,.js ./",
+    "prepublishOnly": "npm test && npm run build",
+    "prerelease": "npm test && npm run build",
+    "pub": "git push --follow-tags origin && npm publish",
+    "release": "standard-version",
+    "release:pre": "npm run release -- --prerelease",
+    "release:major": "npm run release -- --release-as major",
+    "release:minor": "npm run release -- --release-as minor",
+    "test": "npm run eslint && jest --passWithNoTests"
+  },
+  "main": "./dist/index.js",
+  "exports": {
+    "require": "./dist/index.js",
+    "import": "./dist/index.mjs"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/thinkkoa/koatty_cacheable.git"
+  },
+  "keywords": [
+    "cache",
+    "store",
+    "koatty",
+    "thinkkoa"
+  ],
+  "engines": {
+    "node": ">10.0.0"
+  },
+  "author": {
+    "name": "richenlin",
+    "email": "richenlin@gmail.com"
+  },
+  "license": "BSD-3-Clause",
+  "bugs": {
+    "url": "https://github.com/thinkkoa/koatty_cacheable/issues"
+  },
+  "homepage": "https://github.com/thinkkoa/koatty_cacheable",
+  "maintainers": [
+    {
+      "name": "richenlin",
+      "email": "richenlin@gmail.com"
     }
+  ],
+  "devDependencies": {
+    "@commitlint/cli": "^17.x.x",
+    "@commitlint/config-conventional": "^17.x.x",
+    "@microsoft/api-documenter": "^7.x.x",
+    "@microsoft/api-extractor": "^7.x.x",
+    "@rollup/plugin-json": "^6.x.x",
+    "@types/jest": "^29.x.x",
+    "@types/koa": "^2.x.x",
+    "@types/node": "^18.x.x",
+    "@typescript-eslint/eslint-plugin": "^5.x.x",
+    "@typescript-eslint/parser": "^5.x.x",
+    "conventional-changelog-cli": "^2.x.x",
+    "copyfiles": "^2.x.x",
+    "del-cli": "^4.x.x",
+    "eslint": "^8.x.x",
+    "eslint-plugin-jest": "^27.x.x",
+    "husky": "^4.x.x",
+    "jest": "^29.x.x",
+    "jest-html-reporters": "^3.x.x",
+    "rollup": "^3.x.x",
+    "rollup-plugin-typescript2": "^0.x.x",
+    "standard-version": "^9.x.x",
+    "ts-jest": "^29.x.x",
+    "ts-node": "^10.x.x",
+    "typescript": "^4.x.x"
+  },
+  "dependencies": {
+    "koatty_container": "^1.x.x",
+    "koatty_lib": "^1.x.x",
+    "koatty_logger": "^2.x.x",
+    "koatty_store": "^1.x.x"
+  },
+  "peerDependencies": {
+    "koatty_container": "^1.x.x",
+    "koatty_lib": "^1.x.x",
+    "koatty_logger": "^2.x.x",
+    "koatty_store": "^1.x.x"
+  }
 }