vona-module-a-web 5.0.16 → 5.0.18

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

@@ -17,23 +17,10 @@ declare module 'vona' {
     }
 }
 /** 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;
-    }
-}
-declare module 'vona-module-a-web' {
-    interface StartupListen {
-    }
-}
-/** startup: end */
 /** service: begin */
 export * from '../service/web.ts';
 import 'vona';
-declare module 'vona-module-a-web' {
+declare module 'vona-module-a-bean' {
     interface IServiceRecord {
         'a-web:web': never;
     }
@@ -57,6 +44,19 @@ declare module 'vona' {
     }
 }
 /** service: 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;
+    }
+}
+declare module 'vona-module-a-web' {
+    interface StartupListen {
+    }
+}
+/** startup: end */
 /** config: begin */
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';

package/dist/index.js

@@ -1,15 +1,15 @@
 import { appMetadata, BeanInfo, BeanBase, appResource, deepExtend, compose, cast, BeanSimple, BeanScopeBase, createBeanDecorator } from 'vona';
 import * as ModuleInfo from '@cabloy/module-info';
-import { Bean, Scope } from 'vona-module-a-bean';
+import { Bean, Service, Scope } from 'vona-module-a-bean';
 import { SymbolUseOnionOptions } from 'vona-module-a-onion';
-import { SymbolRouteHandlersArgumentsValue, SymbolRouteHandlersArgumentsMeta, SymbolOpenApiOptions, mergeFieldsOpenAPIMetadata } from 'vona-module-a-openapi';
+import { SymbolRouteHandlersArgumentsValue, SymbolRouteHandlersArgumentsMeta, 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 { SymbolOpenApiOptions } from 'vona-module-a-openapiutils';
 import { combineParamsAndQuery } from '@cabloy/utils';
 
 async function middlewareGuard(ctx, next) {
@@ -383,11 +383,30 @@ async function routeTailDoneMiddleware(ctx, next) {
 // }
 
 var _dec$2, _dec2$2, _class$2;
-let StartupListen = (_dec$2 = Startup({
+let ServiceWeb = (_dec$2 = Service(), _dec2$2 = BeanInfo({
+  module: "a-web"
+}), _dec$2(_class$2 = _dec2$2(_class$2 = 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, controller.prototype, actionKey);
+    const actionPath = handlerMetadata.path || '';
+    // combine
+    return this.app.util.combineApiPathControllerAndAction(beanOptions.module, controllerPath, actionPath, prefix, simplify);
+  }
+}) || _class$2) || _class$2);
+
+var _dec$1, _dec2$1, _class$1;
+let StartupListen = (_dec$1 = Startup({
   after: true
-}), _dec2$2 = BeanInfo({
+}), _dec2$1 = BeanInfo({
   module: "a-web"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class StartupListen extends BeanBase {
+}), _dec$1(_class$1 = _dec2$1(_class$1 = 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);
@@ -413,25 +432,6 @@ let StartupListen = (_dec$2 = Startup({
       }); // not set instanceName
     };
   }
-}) || _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) {
@@ -535,9 +535,6 @@ function Controller(path, options) {
     mergeActionsOpenAPIMetadata(target);
   });
 }
-function Service() {
-  return createBeanDecorator('service');
-}
 function Dto(options) {
   return createBeanDecorator('dto', options, false, false, target => {
     mergeFieldsOpenAPIMetadata(target);
@@ -614,4 +611,4 @@ function $apiPathAndCombineParamsAndQuery(path, options) {
   return combineParamsAndQuery(path, options);
 }
 
-export { $apiPath, $apiPathAndCombineParamsAndQuery, BeanRouter, Controller, Dto, Main, RequestMapping, ScopeModuleAWeb, Service, ServiceWeb, StartupListen, SymbolRequestMappingHandler, Web, config, mergeActionsOpenAPIMetadata };
+export { $apiPath, $apiPathAndCombineParamsAndQuery, BeanRouter, Controller, Dto, Main, RequestMapping, ScopeModuleAWeb, ServiceWeb, StartupListen, SymbolRequestMappingHandler, Web, config, mergeActionsOpenAPIMetadata };

package/dist/lib/decorator/bean.d.ts

@@ -3,6 +3,5 @@ import type { IDecoratorControllerOptions } from '../../types/controller.ts';
 import type { IDecoratorDtoOptions } from '../../types/dto.ts';
 export declare function Controller<T extends IDecoratorControllerOptions>(options?: T): ClassDecorator;
 export declare function Controller<T extends IDecoratorControllerOptions>(path?: string, options?: Omit<T, 'path'>): ClassDecorator;
-export declare function Service(): ClassDecorator;
 export declare function Dto<T extends IDecoratorDtoOptions<any>>(options?: Omit<T, '_fieldsMore_'>): ClassDecorator;
 export declare function mergeActionsOpenAPIMetadata(target: Constructable): void;

package/dist/lib/decorator/request.d.ts

@@ -1,4 +1,4 @@
-import type { IOpenApiOptions } from 'vona-module-a-openapi';
+import type { IOpenApiOptions } from 'vona-module-a-openapiutils';
 import type { TypeRequestMethod } from '../../types/request.ts';
 export interface RequestMappingMetadata {
     path?: string;

package/dist/types/controller.d.ts

@@ -1,6 +1,5 @@
 import type { OmitNever } from 'vona';
-import type { ServiceOnion } from 'vona-module-a-onion';
-import type { IOnionOptionsEnable } from 'vona-module-a-onion';
+import type { ServiceOnion, TypeOnionOptionsEnableSimple } from 'vona-module-a-onion';
 export interface IApiPathRecordMethodMap {
     get: IApiPathGetRecord;
     post: IApiPathPostRecord;
@@ -22,7 +21,7 @@ export interface IApiPathPatchRecord {
 }
 export interface IControllerRecord {
 }
-export interface IDecoratorControllerOptions extends IOnionOptionsEnable<'instanceName'> {
+export interface IDecoratorControllerOptions extends TypeOnionOptionsEnableSimple {
     path?: string;
     exclude?: boolean;
     tags?: string[];

package/dist/types/index.d.ts

@@ -3,4 +3,3 @@ export * from './dto.ts';
 export * from './request.ts';
 export * from './response.ts';
 export * from './router.ts';
-export * from './service.ts';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-web",
   "type": "module",
-  "version": "5.0.16",
+  "version": "5.0.18",
   "title": "a-web",
   "vonaModule": {
     "capabilities": {
@@ -17,13 +17,6 @@
         "boilerplate": "cli/dto/boilerplate",
         "metadataCustom": "cli/dto/metadata/generate.ts"
       },
-      "service": {
-        "sceneIsolate": true,
-        "scopeResource": true,
-        "beanGeneral": true,
-        "optionsGlobalInterfaceFrom": "vona-module-a-web",
-        "boilerplate": "cli/service/boilerplate"
-      },
       "controller": {
         "sceneIsolate": true,
         "optionsGlobalInterfaceName": "IDecoratorControllerOptions",

package/cli/service/boilerplate/{{beanName}}.ts_

@@ -1,5 +0,0 @@
-import { BeanBase } from 'vona';
-import { Service } from 'vona-module-a-web';
-
-@Service()
-export class Service<%=argv.beanNameCapitalize%> extends BeanBase {}

package/dist/types/service.d.ts

@@ -1,13 +0,0 @@
-import type { ServiceOnion } from 'vona-module-a-onion';
-export interface IServiceRecord {
-}
-declare module 'vona-module-a-onion' {
-    interface BeanOnion {
-        service: ServiceOnion<never, keyof IServiceRecord>;
-    }
-}
-declare module 'vona' {
-    interface IBeanSceneRecord {
-        service: never;
-    }
-}