vona-module-a-web 5.0.18 → 5.0.21

package/cli/dto/metadata/generate.ts

@@ -11,7 +11,7 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
     contentImports.push(`import type { ${className} } from '${fileNameJSRelative}';`);
     contentFields.push(`
     export interface ${opionsName} {
-      fields?: TypeEntityOptionsFields<${className}, ${opionsName}['_fieldsMore_']>;
+      fields?: TypeEntityOptionsFields<${className}, ${opionsName}[TypeSymbolKeyFieldsMore]>;
     }`);
   }
   if (contentFields.length === 0) return '';

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

@@ -28,6 +28,10 @@ declare module 'vona-module-a-bean' {
 declare module 'vona-module-a-web' {
     interface ServiceWeb {
     }
+    interface ServiceWeb {
+        get $beanFullName(): 'a-web.service.web';
+        get $onionName(): 'a-web:web';
+    }
 }
 /** service: end */
 /** service: begin */
@@ -55,6 +59,10 @@ declare module 'vona-module-a-startup' {
 declare module 'vona-module-a-web' {
     interface StartupListen {
     }
+    interface StartupListen {
+        get $beanFullName(): 'a-web.startup.listen';
+        get $onionName(): 'a-web:listen';
+    }
 }
 /** startup: end */
 /** config: begin */

package/dist/index.js

@@ -2,7 +2,7 @@ import { appMetadata, BeanInfo, BeanBase, appResource, deepExtend, compose, cast
 import * as ModuleInfo from '@cabloy/module-info';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
 import { SymbolUseOnionOptions } from 'vona-module-a-onion';
-import { SymbolRouteHandlersArgumentsValue, SymbolRouteHandlersArgumentsMeta, 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';
@@ -522,7 +522,7 @@ function Controller(path, options) {
   } else {
     options = path || {};
   }
-  return createBeanDecorator('controller', options, false, false, target => {
+  return createBeanDecorator('controller', options, false, target => {
     // beanOptions
     const beanOptions = appResource.getBean(target);
     // IOpenApiOptions
@@ -532,15 +532,15 @@ function Controller(path, options) {
       if (option !== undefined) optionsMeta[key] = option;
     }
     // IOpenApiOptions
-    mergeActionsOpenAPIMetadata(target);
+    mergeActionsOpenapiMetadata(target);
   });
 }
 function Dto(options) {
-  return createBeanDecorator('dto', options, false, false, target => {
-    mergeFieldsOpenAPIMetadata(target);
+  return createBeanDecorator('dto', options, false, target => {
+    mergeFieldsOpenapiMetadata(target);
   });
 }
-function mergeActionsOpenAPIMetadata(target) {
+function mergeActionsOpenapiMetadata(target) {
   // beanOptions
   const beanOptions = appResource.getBean(target);
   const actions = cast(beanOptions?.options)?.actions;
@@ -611,4 +611,4 @@ function $apiPathAndCombineParamsAndQuery(path, options) {
   return combineParamsAndQuery(path, options);
 }
 
-export { $apiPath, $apiPathAndCombineParamsAndQuery, BeanRouter, Controller, Dto, Main, RequestMapping, ScopeModuleAWeb, 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,5 +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 Dto<T extends IDecoratorDtoOptions<any>>(options?: Omit<T, '_fieldsMore_'>): ClassDecorator;
-export declare function mergeActionsOpenAPIMetadata(target: Constructable): void;
+export declare function Dto<T extends IDecoratorDtoOptions<any>>(options?: T): ClassDecorator;
+export declare function mergeActionsOpenapiMetadata(target: Constructable): void;

package/dist/types/dto.d.ts

@@ -1,12 +1,13 @@
 import type { OmitNever } from 'vona';
 import type { ServiceOnion } from 'vona-module-a-onion';
-import type { TypeOpenAPIMetadata } from 'vona-module-a-openapi';
+import type { TypeOpenapiMetadata } from 'vona-module-a-openapi';
+import type { SymbolKeyFieldsMore } from 'vona-module-a-orm';
 export interface IDtoRecord {
 }
 export interface IDecoratorDtoOptions<FieldsMore = never> {
+    [SymbolKeyFieldsMore]?: FieldsMore;
     independent?: boolean;
-    openapi?: TypeOpenAPIMetadata;
-    _fieldsMore_?: FieldsMore;
+    openapi?: TypeOpenapiMetadata;
 }
 declare module 'vona-module-a-onion' {
     interface BeanOnion {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-web",
   "type": "module",
-  "version": "5.0.18",
+  "version": "5.0.21",
   "title": "a-web",
   "vonaModule": {
     "capabilities": {
@@ -11,7 +11,6 @@
     "onions": {
       "dto": {
         "sceneIsolate": true,
-        "optionsCustomInterfaceTemplate": "Omit<{{optionsCustomInterface}}, '_fieldsMore_'>",
         "optionsGlobalInterfaceName": "IDecoratorDtoOptions",
         "optionsGlobalInterfaceFrom": "vona-module-a-web",
         "boilerplate": "cli/dto/boilerplate",