vona-module-a-web 5.0.14 → 5.0.16

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

@@ -1,38 +1,25 @@
-import type { BeanScopeUtil, TypeModuleConfig } from 'vona';
-import type { IDecoratorStartupOptions } from 'vona-module-a-startup';
-/** bean: end */
-/** bean: begin */
-import type { BeanRouter } from '../bean/bean.router.ts';
-import type { config } from '../config/config.ts';
-/** service: end */
-/** service: begin */
-import type { ServiceWeb } from '../service/web.ts';
-/** main: end */
-/** scope: begin */
-import { BeanScopeBase } from 'vona';
-/** service: end */
-/** service: begin */
 /** bean: begin */
-import 'vona';
-import 'vona';
-import 'vona';
-import 'vona';
-import 'vona';
 export * from '../bean/bean.router.ts';
+import 'vona';
 declare module 'vona' {
 }
 declare module 'vona-module-a-web' {
     interface BeanRouter {
     }
 }
+/** bean: end */
+/** bean: begin */
+import type { BeanRouter } from '../bean/bean.router.ts';
+import 'vona';
 declare module 'vona' {
     interface IBeanRecordGlobal {
-        router: BeanRouter;
+        'router': BeanRouter;
     }
 }
 /** bean: end */
 /** startup: begin */
 export * from '../bean/startup.listen.ts';
+import { type IDecoratorStartupOptions } from 'vona-module-a-startup';
 declare module 'vona-module-a-startup' {
     interface IStartupRecord {
         'a-web:listen': IDecoratorStartupOptions;
@@ -42,9 +29,10 @@ declare module 'vona-module-a-web' {
     interface StartupListen {
     }
 }
-/** service: end */
-/** config: begin */
-export * from '../config/config.ts';
+/** startup: end */
+/** service: begin */
+export * from '../service/web.ts';
+import 'vona';
 declare module 'vona-module-a-web' {
     interface IServiceRecord {
         'a-web:web': never;
@@ -54,20 +42,30 @@ declare module 'vona-module-a-web' {
     interface ServiceWeb {
     }
 }
+/** service: end */
+/** service: begin */
+import type { ServiceWeb } from '../service/web.ts';
 export interface IModuleService {
-    web: ServiceWeb;
+    'web': ServiceWeb;
 }
+/** service: end */
+/** service: begin */
+import 'vona';
 declare module 'vona' {
     interface IBeanRecordGeneral {
         'a-web.service.web': ServiceWeb;
     }
 }
+/** service: end */
+/** config: begin */
+export * from '../config/config.ts';
+import type { config } from '../config/config.ts';
 /** config: end */
 /** main: begin */
 export * from '../main.ts';
-/** startup: end */
-/** service: begin */
-export * from '../service/web.ts';
+/** main: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig } from 'vona';
 export declare class ScopeModuleAWeb extends BeanScopeBase {
 }
 export interface ScopeModuleAWeb {
@@ -75,6 +73,7 @@ export interface ScopeModuleAWeb {
     config: TypeModuleConfig<typeof config>;
     service: IModuleService;
 }
+import 'vona';
 declare module 'vona' {
     interface IBeanScopeRecord {
         'a-web': ScopeModuleAWeb;

package/dist/index.js

@@ -1,15 +1,15 @@
 import { appMetadata, BeanInfo, BeanBase, appResource, deepExtend, compose, cast, BeanSimple, BeanScopeBase, createBeanDecorator } from 'vona';
-import { Bean, Scope } from 'vona-module-a-bean';
 import * as ModuleInfo from '@cabloy/module-info';
+import { Bean, Scope } from 'vona-module-a-bean';
 import { SymbolUseOnionOptions } from 'vona-module-a-onion';
 import { SymbolRouteHandlersArgumentsValue, SymbolRouteHandlersArgumentsMeta, SymbolOpenApiOptions, mergeFieldsOpenAPIMetadata } from 'vona-module-a-openapi';
 import { valid } from 'vona-module-a-validation';
 import { SymbolUploadValue } from 'vona-module-a-upload';
 import http from 'node:http';
 import { Startup } from 'vona-module-a-startup';
+import { Service as Service$1, SymbolRequestMappingHandler as SymbolRequestMappingHandler$1 } from 'vona-module-a-web';
 import Router from 'find-my-way';
 import { SymbolRouterMiddleware } from 'vona-module-a-executor';
-import { Service as Service$1, SymbolRequestMappingHandler as SymbolRequestMappingHandler$1 } from 'vona-module-a-web';
 import { combineParamsAndQuery } from '@cabloy/utils';
 
 async function middlewareGuard(ctx, next) {
@@ -415,6 +415,25 @@ let StartupListen = (_dec$2 = Startup({
   }
 }) || _class$2) || _class$2);
 
+var _dec$1, _dec2$1, _class$1;
+let ServiceWeb = (_dec$1 = Service$1(), _dec2$1 = BeanInfo({
+  module: "a-web"
+}), _dec$1(_class$1 = _dec2$1(_class$1 = class ServiceWeb extends BeanBase {
+  combineControllerActionApiPath(controller, actionKey, prefix, simplify) {
+    // beanOptions
+    const beanOptions = appResource.getBean(controller);
+    if (!beanOptions) return undefined;
+    // controllerPath
+    const controllerOptions = beanOptions.options;
+    const controllerPath = controllerOptions.path;
+    // actionPath
+    const handlerMetadata = appMetadata.getMetadata(SymbolRequestMappingHandler$1, controller.prototype, actionKey);
+    const actionPath = handlerMetadata.path || '';
+    // combine
+    return this.app.util.combineApiPathControllerAndAction(beanOptions.module, controllerPath, actionPath, prefix, simplify);
+  }
+}) || _class$1) || _class$1);
+
 function config(_app) {
   return {
     router: {
@@ -488,25 +507,6 @@ function routerMiddleware(router) {
   };
 }
 
-var _dec$1, _dec2$1, _class$1;
-let ServiceWeb = (_dec$1 = Service$1(), _dec2$1 = BeanInfo({
-  module: "a-web"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class ServiceWeb extends BeanBase {
-  combineControllerActionApiPath(controller, actionKey, prefix, simplify) {
-    // beanOptions
-    const beanOptions = appResource.getBean(controller);
-    if (!beanOptions) return undefined;
-    // controllerPath
-    const controllerOptions = beanOptions.options;
-    const controllerPath = controllerOptions.path;
-    // actionPath
-    const handlerMetadata = appMetadata.getMetadata(SymbolRequestMappingHandler$1, controller.prototype, actionKey);
-    const actionPath = handlerMetadata.path || '';
-    // combine
-    return this.app.util.combineApiPathControllerAndAction(beanOptions.module, controllerPath, actionPath, prefix, simplify);
-  }
-}) || _class$1) || _class$1);
-
 var _dec, _dec2, _class;
 let ScopeModuleAWeb = (_dec = Scope(), _dec2 = BeanInfo({
   module: "a-web"

package/dist/types/controller.d.ts

@@ -22,7 +22,7 @@ export interface IApiPathPatchRecord {
 }
 export interface IControllerRecord {
 }
-export interface IDecoratorControllerOptions extends IOnionOptionsEnable {
+export interface IDecoratorControllerOptions extends IOnionOptionsEnable<'instanceName'> {
     path?: string;
     exclude?: boolean;
     tags?: string[];

package/package.json

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