vona-module-a-web 5.0.12 → 5.0.14

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}['_fieldsMore_']>;
     }`);
   }
   if (contentFields.length === 0) return '';

package/dist/index.js

@@ -523,10 +523,13 @@ function Controller(path, options) {
     options = path || {};
   }
   return createBeanDecorator('controller', options, false, false, target => {
+    // beanOptions
+    const beanOptions = appResource.getBean(target);
     // IOpenApiOptions
     const optionsMeta = appMetadata.getOwnMetadataMap(false, SymbolOpenApiOptions, target);
     for (const key of ['exclude', 'tags']) {
-      if (options[key] !== undefined) optionsMeta[key] = options[key];
+      const option = cast(beanOptions?.options)[key];
+      if (option !== undefined) optionsMeta[key] = option;
     }
     // IOpenApiOptions
     mergeActionsOpenAPIMetadata(target);

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

@@ -4,5 +4,5 @@ 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?: T): ClassDecorator;
+export declare function Dto<T extends IDecoratorDtoOptions<any>>(options?: Omit<T, '_fieldsMore_'>): ClassDecorator;
 export declare function mergeActionsOpenAPIMetadata(target: Constructable): void;

package/dist/types/dto.d.ts

@@ -6,7 +6,7 @@ export interface IDtoRecord {
 export interface IDecoratorDtoOptions<FieldsMore = never> {
     independent?: boolean;
     openapi?: TypeOpenAPIMetadata;
-    fieldsMore?: FieldsMore;
+    _fieldsMore_?: FieldsMore;
 }
 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.12",
+  "version": "5.0.14",
   "title": "a-web",
   "vonaModule": {
     "capabilities": {
@@ -11,6 +11,7 @@
     "onions": {
       "dto": {
         "sceneIsolate": true,
+        "optionsCustomInterfaceTemplate": "Omit<{{optionsCustomInterface}}, '_fieldsMore_'>",
         "optionsGlobalInterfaceName": "IDecoratorDtoOptions",
         "optionsGlobalInterfaceFrom": "vona-module-a-web",
         "boilerplate": "cli/dto/boilerplate",