vona-module-a-captcha 5.0.24 → 5.0.26

package/dist/.metadata/locales.d.ts

@@ -7,4 +7,4 @@ export declare const locales: {
         CaptchaInvalid: string;
     };
 };
-export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): import("vona").ILocaleMagic<`a-captcha::${K}`>;
+export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K, ...args: any[]): any;

package/dist/index.js

@@ -1,20 +1,16 @@
 import { BeanInfo, BeanBase, uuidv4, beanFullNameFromOnionName, deepExtend, BeanScopeBase, $makeLocaleMagic, createBeanDecorator } from 'vona';
+import { __decorate, __metadata, __param } from 'tslib';
 import { zodCustomError, getRandomInt } from '@cabloy/utils';
 import { Interceptor } from 'vona-module-a-aspect';
 import { Bean, Scope } from 'vona-module-a-bean';
 import { CacheRedis, BeanCacheRedisBase } from 'vona-module-a-cache';
 import { Api, v } from 'vona-module-a-openapiutils';
-import { Dto, Controller, Web, Arg } from 'vona-module-a-web';
+import { Dto, Web, Arg, Controller } from 'vona-module-a-web';
 import z from 'zod';
 import { Passport } from 'vona-module-a-user';
 import { Hmr } from 'vona-module-a-hmr';
 
-var _dec$8, _dec2$8, _class$8;
-let InterceptorCaptchaVerify = (_dec$8 = Interceptor({
-  bodyField: 'captcha'
-}), _dec2$8 = BeanInfo({
-  module: "a-captcha"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = class InterceptorCaptchaVerify extends BeanBase {
+let InterceptorCaptchaVerify = class InterceptorCaptchaVerify extends BeanBase {
   async execute(options, next) {
     // scene
     const sceneName = options.scene;
@@ -30,17 +26,19 @@ let InterceptorCaptchaVerify = (_dec$8 = Interceptor({
     // next
     return next();
   }
-}) || _class$8) || _class$8);
+};
+InterceptorCaptchaVerify = __decorate([Interceptor({
+  bodyField: 'captcha'
+}), BeanInfo({
+  module: "a-captcha"
+})], InterceptorCaptchaVerify);
 
 const SymbolCacheSceneProviders = Symbol('SymbolCacheSceneProviders');
 function clearAllCacheSceneProviders(app) {
   delete app.meta[SymbolCacheSceneProviders];
 }
 
-var _dec$7, _dec2$7, _class$7;
-let BeanCaptcha = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
-  module: "a-captcha"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class BeanCaptcha extends BeanBase {
+let BeanCaptcha = class BeanCaptcha extends BeanBase {
   async create(sceneName) {
     // resolve provider
     const provider = await this._resolveProvider(sceneName);
@@ -235,103 +233,52 @@ let BeanCaptcha = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
     }
     return providersNew;
   }
-}) || _class$7) || _class$7);
+};
+BeanCaptcha = __decorate([Bean(), BeanInfo({
+  module: "a-captcha"
+})], BeanCaptcha);
 async function resolverDefault(_ctx, providers) {
   const keys = Object.keys(providers);
   const index = getRandomInt(keys.length, 0);
   return keys[index];
 }
 
-var _dec$6, _dec2$6, _class$6;
-let CacheRedisCaptcha = (_dec$6 = CacheRedis({
+let CacheRedisCaptcha = class CacheRedisCaptcha extends BeanCacheRedisBase {};
+CacheRedisCaptcha = __decorate([CacheRedis({
   disableTransactionCompensate: true
-}), _dec2$6 = BeanInfo({
+}), BeanInfo({
   module: "a-captcha"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class CacheRedisCaptcha extends BeanCacheRedisBase {}) || _class$6) || _class$6);
-
-function _applyDecoratedDescriptor(i, e, r, n, l) {
-  var a = {};
-  return Object.keys(n).forEach(function (i) {
-    a[i] = n[i];
-  }), a.enumerable = !!a.enumerable, a.configurable = !!a.configurable, ("value" in a || a.initializer) && (a.writable = true), a = r.slice().reverse().reduce(function (r, n) {
-    return n(i, e, r) || r;
-  }, a), l && void 0 !== a.initializer && (a.value = a.initializer ? a.initializer.call(l) : void 0, a.initializer = void 0), void 0 === a.initializer ? (Object.defineProperty(i, e, a), null) : a;
-}
-function _initializerDefineProperty(e, i, r, l) {
-  r && Object.defineProperty(e, i, {
-    enumerable: r.enumerable,
-    configurable: r.configurable,
-    writable: r.writable,
-    value: r.initializer ? r.initializer.call(l) : void 0
-  });
-}
+})], CacheRedisCaptcha);
 
-var _dec$5, _dec2$5, _dec3$2, _dec4$2, _dec5$2, _dec6$2, _dec7$1, _dec8$1, _dec9$1, _dec0$1, _class$5, _class2$2, _descriptor$1, _descriptor2$1, _descriptor3, _descriptor4;
-let DtoCaptchaData = (_dec$5 = Dto(), _dec2$5 = BeanInfo({
-  module: "a-captcha"
-}), _dec3$2 = Api.field(), _dec4$2 = Reflect.metadata("design:type", String), _dec5$2 = Api.field(z.string()), _dec6$2 = Reflect.metadata("design:type", Object), _dec7$1 = Api.field(v.optional()), _dec8$1 = Reflect.metadata("design:type", Object), _dec9$1 = Api.field(), _dec0$1 = Reflect.metadata("design:type", Object), _dec$5(_class$5 = _dec2$5(_class$5 = (_class2$2 = class DtoCaptchaData {
+let DtoCaptchaData = class DtoCaptchaData {
   constructor() {
-    _initializerDefineProperty(this, "id", _descriptor$1, this);
-    _initializerDefineProperty(this, "provider", _descriptor2$1, this);
-    _initializerDefineProperty(this, "token", _descriptor3, this);
-    _initializerDefineProperty(this, "payload", _descriptor4, this);
+    this.id = void 0;
+    this.provider = void 0;
+    this.token = void 0;
+    this.payload = void 0;
   }
-}, _descriptor$1 = _applyDecoratedDescriptor(_class2$2.prototype, "id", [_dec3$2, _dec4$2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2$1 = _applyDecoratedDescriptor(_class2$2.prototype, "provider", [_dec5$2, _dec6$2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor3 = _applyDecoratedDescriptor(_class2$2.prototype, "token", [_dec7$1, _dec8$1], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor4 = _applyDecoratedDescriptor(_class2$2.prototype, "payload", [_dec9$1, _dec0$1], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _class2$2)) || _class$5) || _class$5);
-
-var _dec$4, _dec2$4, _dec3$1, _dec4$1, _dec5$1, _dec6$1, _class$4, _class2$1, _descriptor, _descriptor2;
-let DtoCaptchaVerify = (_dec$4 = Dto(), _dec2$4 = BeanInfo({
+};
+__decorate([Api.field(), __metadata("design:type", String)], DtoCaptchaData.prototype, "id", void 0);
+__decorate([Api.field(z.string()), __metadata("design:type", Object)], DtoCaptchaData.prototype, "provider", void 0);
+__decorate([Api.field(v.optional()), __metadata("design:type", Object)], DtoCaptchaData.prototype, "token", void 0);
+__decorate([Api.field(), __metadata("design:type", Object)], DtoCaptchaData.prototype, "payload", void 0);
+DtoCaptchaData = __decorate([Dto(), BeanInfo({
   module: "a-captcha"
-}), _dec3$1 = Api.field(), _dec4$1 = Reflect.metadata("design:type", String), _dec5$1 = Api.field(), _dec6$1 = Reflect.metadata("design:type", Object), _dec$4(_class$4 = _dec2$4(_class$4 = (_class2$1 = class DtoCaptchaVerify {
+})], DtoCaptchaData);
+
+let DtoCaptchaVerify = class DtoCaptchaVerify {
   constructor() {
-    _initializerDefineProperty(this, "id", _descriptor, this);
-    _initializerDefineProperty(this, "token", _descriptor2, this);
+    this.id = void 0;
+    this.token = void 0;
   }
-}, _descriptor = _applyDecoratedDescriptor(_class2$1.prototype, "id", [_dec3$1, _dec4$1], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2$1.prototype, "token", [_dec5$1, _dec6$1], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _class2$1)) || _class$4) || _class$4);
-
-var _dec$3, _dec2$3, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec0, _dec1, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _class$3, _class2;
-let ControllerCaptcha = (_dec$3 = Controller('captcha'), _dec2$3 = BeanInfo({
+};
+__decorate([Api.field(), __metadata("design:type", String)], DtoCaptchaVerify.prototype, "id", void 0);
+__decorate([Api.field(), __metadata("design:type", Object)], DtoCaptchaVerify.prototype, "token", void 0);
+DtoCaptchaVerify = __decorate([Dto(), BeanInfo({
   module: "a-captcha"
-}), _dec3 = Web.post('create'), _dec4 = Api.body(DtoCaptchaData), _dec5 = Passport.public(), _dec6 = function (target, key) {
-  return Arg.body('scene')(target, key, 0);
-}, _dec7 = Reflect.metadata("design:type", Function), _dec8 = Reflect.metadata("design:paramtypes", [String]), _dec9 = Web.post('refresh'), _dec0 = Api.body(DtoCaptchaData), _dec1 = Passport.public(), _dec10 = function (target, key) {
-  return Arg.body('id')(target, key, 0);
-}, _dec11 = function (target, key) {
-  return Arg.body('scene')(target, key, 1);
-}, _dec12 = Reflect.metadata("design:type", Function), _dec13 = Reflect.metadata("design:paramtypes", [String, String]), _dec14 = Web.post('verifyImmediate'), _dec15 = Api.body(z.string()), _dec16 = Passport.public(), _dec17 = function (target, key) {
-  return Arg.body('id')(target, key, 0);
-}, _dec18 = function (target, key) {
-  return Arg.body('token')(target, key, 1);
-}, _dec19 = Reflect.metadata("design:type", Function), _dec20 = Reflect.metadata("design:paramtypes", [String, Object]), _dec$3(_class$3 = _dec2$3(_class$3 = (_class2 = class ControllerCaptcha extends BeanBase {
+})], DtoCaptchaVerify);
+
+let ControllerCaptcha = class ControllerCaptcha extends BeanBase {
   async create(scene) {
     return await this.bean.captcha.create(scene);
   }
@@ -343,25 +290,31 @@ let ControllerCaptcha = (_dec$3 = Controller('captcha'), _dec2$3 = BeanInfo({
     if (!verified) this.app.throw(403);
     return verified;
   }
-}, _applyDecoratedDescriptor(_class2.prototype, "create", [_dec3, _dec4, _dec5, _dec6, _dec7, _dec8], Object.getOwnPropertyDescriptor(_class2.prototype, "create"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "refresh", [_dec9, _dec0, _dec1, _dec10, _dec11, _dec12, _dec13], Object.getOwnPropertyDescriptor(_class2.prototype, "refresh"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "verifyImmediate", [_dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20], Object.getOwnPropertyDescriptor(_class2.prototype, "verifyImmediate"), _class2.prototype), _class2)) || _class$3) || _class$3);
-
-var _dec$2, _dec2$2, _class$2;
-let HmrCaptchaProvider = (_dec$2 = Hmr(), _dec2$2 = BeanInfo({
+};
+__decorate([Web.post('create'), Api.body(DtoCaptchaData), Passport.public(), __param(0, Arg.body('scene')), __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", Promise)], ControllerCaptcha.prototype, "create", null);
+__decorate([Web.post('refresh'), Api.body(DtoCaptchaData), Passport.public(), __param(0, Arg.body('id')), __param(1, Arg.body('scene')), __metadata("design:type", Function), __metadata("design:paramtypes", [String, String]), __metadata("design:returntype", Promise)], ControllerCaptcha.prototype, "refresh", null);
+__decorate([Web.post('verifyImmediate'), Api.body(z.string()), Passport.public(), __param(0, Arg.body('id')), __param(1, Arg.body('token')), __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", Promise)], ControllerCaptcha.prototype, "verifyImmediate", null);
+ControllerCaptcha = __decorate([Controller('captcha'), BeanInfo({
   module: "a-captcha"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class HmrCaptchaProvider extends BeanBase {
+})], ControllerCaptcha);
+
+let HmrCaptchaProvider = class HmrCaptchaProvider extends BeanBase {
   async reload(_beanOptions) {
     clearAllCacheSceneProviders(this.app);
   }
-}) || _class$2) || _class$2);
-
-var _dec$1, _dec2$1, _class$1;
-let HmrCaptchaScene = (_dec$1 = Hmr(), _dec2$1 = BeanInfo({
+};
+HmrCaptchaProvider = __decorate([Hmr(), BeanInfo({
   module: "a-captcha"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class HmrCaptchaScene extends BeanBase {
+})], HmrCaptchaProvider);
+
+let HmrCaptchaScene = class HmrCaptchaScene extends BeanBase {
   async reload(_beanOptions) {
     clearAllCacheSceneProviders(this.app);
   }
-}) || _class$1) || _class$1);
+};
+HmrCaptchaScene = __decorate([Hmr(), BeanInfo({
+  module: "a-captcha"
+})], HmrCaptchaScene);
 
 function config(app) {
   const showToken = !app.meta.isProd;
@@ -376,11 +329,10 @@ function config(app) {
   };
 }
 
-var _dec, _dec2, _class;
-let ScopeModuleACaptcha = (_dec = Scope(), _dec2 = BeanInfo({
+let ScopeModuleACaptcha = class ScopeModuleACaptcha extends BeanScopeBase {};
+ScopeModuleACaptcha = __decorate([Scope(), BeanInfo({
   module: "a-captcha"
-}), _dec(_class = _dec2(_class = class ScopeModuleACaptcha extends BeanScopeBase {}) || _class) || _class);
-
+})], ScopeModuleACaptcha);
 /** scope: end */
 
 var locale_en_us = {
@@ -395,8 +347,8 @@ const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn
 };
-function $locale(key) {
-  return $makeLocaleMagic(`a-captcha::${key}`);
+function $locale(key, ...args) {
+  return $makeLocaleMagic(`a-captcha::${key}`, ...args);
 }
 
 function CaptchaProvider(options) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-captcha",
   "type": "module",
-  "version": "5.0.24",
+  "version": "5.0.26",
   "title": "a-captcha",
   "vonaModule": {
     "dependencies": {},