vona-module-a-web 5.0.36 → 5.0.38

package/dist/.metadata/index.d.ts

@@ -126,10 +126,12 @@ declare module 'vona-module-a-web' {
 /** filterTransform: end */
 /** hmr: begin */
 export * from '../bean/hmr.controller.ts';
+export * from '../bean/hmr.dto.ts';
 import 'vona';
 declare module 'vona' {
     interface IHmrRecord {
         'a-web:controller': never;
+        'a-web:dto': never;
     }
 }
 declare module 'vona-module-a-web' {
@@ -139,6 +141,12 @@ declare module 'vona-module-a-web' {
         get $beanFullName(): 'a-web.hmr.controller';
         get $onionName(): 'a-web:controller';
     }
+    interface HmrDto {
+    }
+    interface HmrDto {
+        get $beanFullName(): 'a-web.hmr.dto';
+        get $onionName(): 'a-web:dto';
+    }
 }
 /** hmr: end */
 /** config: begin */

package/dist/bean/hmr.dto.d.ts

@@ -0,0 +1,6 @@
+import type { IDecoratorBeanOptionsBase } from 'vona';
+import type { IHmrReload } from 'vona-module-a-hmr';
+import { BeanBase } from 'vona';
+export declare class HmrDto extends BeanBase implements IHmrReload {
+    reload(_beanOptions: IDecoratorBeanOptionsBase): Promise<void>;
+}

package/dist/index.js

@@ -1,4 +1,5 @@
 import { BeanInfo, BeanBase, cast, beanFullNameFromOnionName, appMetadata, appResource, deepExtend, compose, createBeanDecorator, BeanSimple, BeanScopeBase, onionNameFromBeanFullName, useApp } from 'vona';
+import { __decorate } from 'tslib';
 import { isNil, isNilOrEmptyString } from '@cabloy/utils';
 import { ZodMetadata } from '@cabloy/zod-openapi';
 import { Pipe, createArgumentPipe, SymbolCacheComposeGuards, SymbolCacheComposeInterceptors, SymbolCacheComposePipes, SymbolCacheComposeMiddlewares, clearCacheComposesRouter, SymbolCacheComposeMiddlewareSystems, setArgumentPipe } from 'vona-module-a-aspect';
@@ -15,17 +16,8 @@ import Router from 'find-my-way';
 import { SymbolRouterMiddleware } from 'vona-module-a-executor';
 import { z } from 'zod';
 
-var _dec$8, _dec2$8, _class$8;
 const __FieldsSystem = ['columns', 'where', 'orders', 'pageNo', 'pageSize'];
-let PipeFilter = (_dec$8 = Pipe({
-  // ValidatorOptions
-  disableErrorMessages: false,
-  errorHttpStatusCode: 400,
-  loose: false,
-  strict: false
-}), _dec2$8 = BeanInfo({
-  module: "a-web"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = class PipeFilter extends BeanBase {
+let PipeFilter = class PipeFilter extends BeanBase {
   async transform(value, metadata, options) {
     if (!options.schema) throw new Error(`should specify the schema of pipeFilter: ${metadata.controller.name}.${metadata.method}#${metadata.index}`);
     // validateSchema
@@ -45,7 +37,6 @@ let PipeFilter = (_dec$8 = Pipe({
     // ok
     return params;
   }
-
   // system: columns/where/orders/pageNo/pageSize
   _transformSystem(value) {
     const params = {};
@@ -164,19 +155,19 @@ let PipeFilter = (_dec$8 = Pipe({
       await this._transformField(key, value[key], params, value, options);
     }
   }
-}) || _class$8) || _class$8);
-const ArgFilterPro = createArgumentPipe('a-web:filter');
-
-var _dec$7, _dec2$7, _class$7;
-let PipeValid = (_dec$7 = Pipe({
+};
+PipeFilter = __decorate([Pipe({
   // ValidatorOptions
   disableErrorMessages: false,
   errorHttpStatusCode: 400,
   loose: false,
   strict: false
-}), _dec2$7 = BeanInfo({
+}), BeanInfo({
   module: "a-web"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class PipeValid extends BeanBase {
+})], PipeFilter);
+const ArgFilterPro = createArgumentPipe('a-web:filter');
+
+let PipeValid = class PipeValid extends BeanBase {
   async transform(value, metadata, options) {
     if (options.schema) {
       // validateSchema
@@ -184,7 +175,16 @@ let PipeValid = (_dec$7 = Pipe({
     }
     return value;
   }
-}) || _class$7) || _class$7);
+};
+PipeValid = __decorate([Pipe({
+  // ValidatorOptions
+  disableErrorMessages: false,
+  errorHttpStatusCode: 400,
+  loose: false,
+  strict: false
+}), BeanInfo({
+  module: "a-web"
+})], PipeValid);
 const ArgValid = createArgumentPipe('a-web:valid');
 
 const SymbolCacheControllerRoutes = Symbol('SymbolCacheControllerRoutes');
@@ -295,11 +295,9 @@ async function middlewarePipe(ctx, next) {
 async function _transformArguments(app, route) {
   const paramtypes = appMetadata.getMetadata('design:paramtypes', route.controller.prototype, route.action);
   if (!paramtypes) return;
-
   // meta
   const argsMeta = appMetadata.getMetadata(SymbolRouteHandlersArgumentsMeta, route.controller.prototype, route.action);
   if (!argsMeta) return;
-
   // args
   const args = Array.from({
     length: paramtypes.length
@@ -393,7 +391,6 @@ function _collectArgumentMiddlewares(onionPipe, argMeta) {
 }
 
 const SymbolRequestMappingHandler = Symbol('SymbolRequestMappingHandler');
-
 // export enum RequestMethod {
 //   GET = 'get',
 //   POST = 'post',
@@ -404,10 +401,7 @@ const SymbolRequestMappingHandler = Symbol('SymbolRequestMappingHandler');
 //   HEAD = 'head',
 // }
 
-var _dec$6, _dec2$6, _class$6;
-let BeanRouter = (_dec$6 = Bean(), _dec2$6 = BeanInfo({
-  module: "a-web"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class BeanRouter extends BeanBase {
+let BeanRouter = class BeanRouter extends BeanBase {
   reRegisterController(beanFullName) {
     const app = this.app;
     // remove
@@ -458,7 +452,6 @@ let BeanRouter = (_dec$6 = Bean(), _dec2$6 = BeanInfo({
   _registerControllerAction(moduleName, controller, controllerBeanFullName, controllerPath, controllerMiddlewaresOptions, actionKey, desc) {
     // app
     const app = this.app;
-
     // actionPath/actionMethod
     if (!appMetadata.hasMetadata(SymbolRequestMappingHandler, controller.prototype, actionKey)) return;
     const handlerMetadata = appMetadata.getMetadata(SymbolRequestMappingHandler, controller.prototype, actionKey);
@@ -467,15 +460,12 @@ let BeanRouter = (_dec$6 = Bean(), _dec2$6 = BeanInfo({
     // routePath
     const routePath = app.util.combineApiPathControllerAndAction(moduleName, controllerPath, actionPath, true, true);
     const routePathRaw = app.util.combineApiPathControllerAndActionRaw(moduleName, controllerPath, actionPath, true);
-
     // middlewares options
     const actionMiddlewaresOptions = appMetadata.getMetadata(SymbolUseOnionOptions, controller.prototype, actionKey);
-
     // route
     const route = {
       meta: deepExtend({}, controllerMiddlewaresOptions, actionMiddlewaresOptions)
     };
-
     // route
     const _route = {
       controller,
@@ -487,7 +477,6 @@ let BeanRouter = (_dec$6 = Bean(), _dec2$6 = BeanInfo({
       routePath,
       routePathRaw
     };
-
     // fn
     const fn = function (_req, _res, params, _store, searchParams) {
       const ctx = this;
@@ -496,18 +485,19 @@ let BeanRouter = (_dec$6 = Bean(), _dec2$6 = BeanInfo({
       ctx.request.query = searchParams;
       return _composeMiddlewares(this.app, _route)(ctx);
     };
-
     // add
     const cacheControllerRoutes = getCacheControllerRoutes(this.app);
     if (!cacheControllerRoutes[controllerBeanFullName]) {
       cacheControllerRoutes[controllerBeanFullName] = [];
     }
     cacheControllerRoutes[controllerBeanFullName].push(_route);
-
     // register
     app.router.on(_route.routeMethod.toUpperCase(), _route.routePath, fn);
   }
-}) || _class$6) || _class$6);
+};
+BeanRouter = __decorate([Bean(), BeanInfo({
+  module: "a-web"
+})], BeanRouter);
 function _composeMiddlewares(app, route) {
   // compose
   if (!app.meta[SymbolCacheComposeMiddlewares]) app.meta[SymbolCacheComposeMiddlewares] = {};
@@ -552,10 +542,7 @@ async function routeTailDoneMiddleware(ctx, next) {
   return res;
 }
 
-var _dec$5, _dec2$5, _class$5;
-let ServiceWeb = (_dec$5 = Service(), _dec2$5 = BeanInfo({
-  module: "a-web"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class ServiceWeb extends BeanBase {
+let ServiceWeb = class ServiceWeb extends BeanBase {
   combineControllerActionApiPath(controller, actionKey, prefix, simplify) {
     // beanOptions
     const beanOptions = appResource.getBean(controller);
@@ -569,14 +556,12 @@ let ServiceWeb = (_dec$5 = Service(), _dec2$5 = BeanInfo({
     // combine
     return this.app.util.combineApiPathControllerAndAction(beanOptions.module, controllerPath, actionPath, prefix, simplify);
   }
-}) || _class$5) || _class$5);
-
-var _dec$4, _dec2$4, _class$4;
-let StartupListen = (_dec$4 = Startup({
-  after: true
-}), _dec2$4 = BeanInfo({
+};
+ServiceWeb = __decorate([Service(), BeanInfo({
   module: "a-web"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class StartupListen extends BeanBase {
+})], ServiceWeb);
+
+let StartupListen = class StartupListen extends BeanBase {
   async execute() {
     if (!this.app.config.server.listen.disable) {
       this.app.server = this._listen(this.app.config.server.listen.port, this.app.config.server.listen.hostname);
@@ -602,16 +587,18 @@ let StartupListen = (_dec$4 = Startup({
       }); // not set instanceName
     };
   }
-}) || _class$4) || _class$4);
+};
+StartupListen = __decorate([Startup({
+  after: true
+}), BeanInfo({
+  module: "a-web"
+})], StartupListen);
 
 function FilterTransform(options) {
   return createBeanDecorator('filterTransform', options);
 }
 
-var _dec$3, _dec2$3, _class$3;
-let FilterTransformBase = (_dec$3 = FilterTransform(), _dec2$3 = BeanInfo({
-  module: "a-web"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class FilterTransformBase extends BeanBase {
+let FilterTransformBase = class FilterTransformBase extends BeanBase {
   async where(info, _options) {
     const {
       value,
@@ -636,14 +623,12 @@ let FilterTransformBase = (_dec$3 = FilterTransform(), _dec2$3 = BeanInfo({
     }
     return where;
   }
-}) || _class$3) || _class$3);
-
-var _dec$2, _dec2$2, _class$2;
-let FilterTransformDateRange = (_dec$2 = FilterTransform({
-  separator: '~'
-}), _dec2$2 = BeanInfo({
+};
+FilterTransformBase = __decorate([FilterTransform(), BeanInfo({
   module: "a-web"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class FilterTransformDateRange extends BeanBase {
+})], FilterTransformBase);
+
+let FilterTransformDateRange = class FilterTransformDateRange extends BeanBase {
   async where(info, options) {
     const {
       value
@@ -668,18 +653,32 @@ let FilterTransformDateRange = (_dec$2 = FilterTransform({
     }
     return where;
   }
-}) || _class$2) || _class$2);
-
-var _dec$1, _dec2$1, _class$1;
-let HmrController = (_dec$1 = Hmr(), _dec2$1 = BeanInfo({
+};
+FilterTransformDateRange = __decorate([FilterTransform({
+  separator: '~'
+}), BeanInfo({
   module: "a-web"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class HmrController extends BeanBase {
+})], FilterTransformDateRange);
+
+let HmrController = class HmrController extends BeanBase {
   async reload(beanOptions) {
     clearCacheComposesRouter(this.app);
     this.bean.router.reRegisterController(beanOptions.beanFullName);
     await this.$scope.openapi.service.openapi.clearAllCaches();
   }
-}) || _class$1) || _class$1);
+};
+HmrController = __decorate([Hmr(), BeanInfo({
+  module: "a-web"
+})], HmrController);
+
+let HmrDto = class HmrDto extends BeanBase {
+  async reload(_beanOptions) {
+    this.app.bean.worker.reload();
+  }
+};
+HmrDto = __decorate([Hmr(), BeanInfo({
+  module: "a-web"
+})], HmrDto);
 
 function config(_app) {
   return {
@@ -763,11 +762,10 @@ function _wrapOnion(app, item) {
   return fn;
 }
 
-var _dec, _dec2, _class;
-let ScopeModuleAWeb = (_dec = Scope(), _dec2 = BeanInfo({
+let ScopeModuleAWeb = class ScopeModuleAWeb extends BeanScopeBase {};
+ScopeModuleAWeb = __decorate([Scope(), BeanInfo({
   module: "a-web"
-}), _dec(_class = _dec2(_class = class ScopeModuleAWeb extends BeanScopeBase {}) || _class) || _class);
-
+})], ScopeModuleAWeb);
 /** scope: end */
 
 function createPipesArgumentDecorator(paramType, extractValue) {
@@ -954,4 +952,4 @@ const Web = {
   head: Head
 };
 
-export { Arg, ArgFilterPro, ArgValid, BeanRouter, Controller, Dto, FilterTransform, FilterTransformBase, FilterTransformDateRange, HmrController, Main, PipeFilter, PipeValid, RequestMapping, ScopeModuleAWeb, ServiceWeb, StartupListen, SymbolCacheControllerRoutes, SymbolControllerOptionsResource, SymbolRequestMappingHandler, Web, config, createPipesArgumentDecorator, getCacheControllerRoutes, mergeActionsOpenapiMetadata, recordResourceNameToRoutePath };
+export { Arg, ArgFilterPro, ArgValid, BeanRouter, Controller, Dto, FilterTransform, FilterTransformBase, FilterTransformDateRange, HmrController, HmrDto, Main, PipeFilter, PipeValid, RequestMapping, ScopeModuleAWeb, ServiceWeb, StartupListen, SymbolCacheControllerRoutes, SymbolControllerOptionsResource, SymbolRequestMappingHandler, Web, config, createPipesArgumentDecorator, getCacheControllerRoutes, mergeActionsOpenapiMetadata, recordResourceNameToRoutePath };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-web",
   "type": "module",
-  "version": "5.0.36",
+  "version": "5.0.38",
   "title": "a-web",
   "vonaModule": {
     "capabilities": {