@midwayjs/captcha 3.20.5 → 4.0.0-beta.1

package/dist/configuration.js

@@ -12,7 +12,8 @@ const cacheComponent = require("@midwayjs/cache-manager");
 const DefaultConfig = require("./config/config.default");
 let CaptchaConfiguration = class CaptchaConfiguration {
 };
-CaptchaConfiguration = __decorate([
+exports.CaptchaConfiguration = CaptchaConfiguration;
+exports.CaptchaConfiguration = CaptchaConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'captcha',
         imports: [cacheComponent],
@@ -23,5 +24,4 @@ CaptchaConfiguration = __decorate([
         ],
     })
 ], CaptchaConfiguration);
-exports.CaptchaConfiguration = CaptchaConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/service.js

@@ -22,7 +22,6 @@ const DEFAULT_IMAGE_IGNORE_CHARS = {
 };
 let CaptchaService = class CaptchaService {
     async image(options, cacheOption) {
-        var _a;
         // const { expirationTime, idPrefix } = this.captcha;
         const { type, ...others } = {
             ...this.captcha.default,
@@ -30,7 +29,7 @@ let CaptchaService = class CaptchaService {
             ...options,
         };
         const { data, text } = svgCaptcha.create({
-            ignoreChars: (_a = DEFAULT_IMAGE_IGNORE_CHARS[type]) !== null && _a !== void 0 ? _a : '',
+            ignoreChars: DEFAULT_IMAGE_IGNORE_CHARS[type] ?? '',
             ...others,
         });
         const id = await this.set(text, cacheOption);
@@ -74,9 +73,8 @@ let CaptchaService = class CaptchaService {
         return { id, text };
     }
     async set(text, cacheOptions) {
-        var _a;
         const id = (0, nanoid_1.nanoid)();
-        await this.captchaCaching.set(this.getStoreId(id, cacheOptions), (text || '').toLowerCase(), ((_a = cacheOptions === null || cacheOptions === void 0 ? void 0 : cacheOptions.expirationTime) !== null && _a !== void 0 ? _a : this.captcha.expirationTime) * 1000);
+        await this.captchaCaching.set(this.getStoreId(id, cacheOptions), (text || '').toLowerCase(), (cacheOptions?.expirationTime ?? this.captcha.expirationTime) * 1000);
         return id;
     }
     async check(id, value, cacheOptions) {
@@ -92,14 +90,14 @@ let CaptchaService = class CaptchaService {
         return true;
     }
     getStoreId(id, cacheOptions) {
-        var _a;
-        const idPrefix = (_a = cacheOptions === null || cacheOptions === void 0 ? void 0 : cacheOptions.idPrefix) !== null && _a !== void 0 ? _a : this.captcha.idPrefix;
+        const idPrefix = cacheOptions?.idPrefix ?? this.captcha.idPrefix;
         if (!idPrefix) {
             return id;
         }
         return `${idPrefix}:${id}`;
     }
 };
+exports.CaptchaService = CaptchaService;
 __decorate([
     (0, core_1.InjectClient)(cache_manager_1.CachingFactory, 'captcha'),
     __metadata("design:type", Object)
@@ -108,9 +106,8 @@ __decorate([
     (0, core_1.Config)('captcha'),
     __metadata("design:type", Object)
 ], CaptchaService.prototype, "captcha", void 0);
-CaptchaService = __decorate([
+exports.CaptchaService = CaptchaService = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], CaptchaService);
-exports.CaptchaService = CaptchaService;
 //# sourceMappingURL=service.js.map

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/captcha",
-  "version": "3.20.5",
+  "version": "4.0.0-beta.1",
   "description": "Midway Component for Captcha(Verification Code)",
   "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",
     "ci": "npm run test"
   },
   "keywords": [],
@@ -22,15 +22,15 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/cache-manager": "^3.20.4",
+    "@midwayjs/cache-manager": "^4.0.0-beta.1",
     "mini-svg-data-uri": "1.4.4",
     "nanoid": "3.3.11",
     "svg-captcha-fixed": "1.5.2"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/koa": "^3.20.5",
-    "@midwayjs/mock": "^3.20.4"
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/koa": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1"
   },
-  "gitHead": "7ce57281bd3ef5d18dc50b47ff9bffb8a27c071e"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }