vona-module-a-web 5.0.38 → 5.0.39

package/cli/controller/metadata/generate.ts

@@ -4,12 +4,16 @@ import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 
 export default async function (options: IMetadataCustomGenerateOptions): Promise<string> {
   const { sceneName, moduleName, globFiles } = options;
+  const contentResources: string[] = [];
   const contentImports: string[] = [];
   const contentActions: string[] = [];
   const contentPaths: Record<string, string[]> = {};
   for (const globFile of globFiles) {
     const { className, beanName, fileNameJSRelative, fileContent } = globFile;
     const opionsName = `IControllerOptions${toUpperCaseFirstChar(beanName)}`;
+    if (fileContent.includes('@Resource()')) {
+      contentResources.push(`'${moduleName}:${beanName}': never;`);
+    }
     contentImports.push(`// @ts-ignore ignore\nimport type { ${className} } from '${fileNameJSRelative}';`);
     contentActions.push(`
     export interface ${opionsName} {
@@ -51,6 +55,13 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
   ${contentRecord}
 }`
     : '';
+  let contentResources2 = contentResources.length > 0 ? `import 'vona-module-a-openapi';
+  declare module 'vona-module-a-openapi' {
+    export interface IResourceRecord {
+      ${contentResources.join('\n')}
+    }
+  }
+  `: '';
   // combine
   const content = `/** ${sceneName}: begin */
 ${contentImports.join('\n')}
@@ -58,6 +69,7 @@ declare module 'vona-module-${moduleName}' {
   ${contentActions.join('\n')}
 }
 ${contentRecord2}
+${contentResources2}
 /** ${sceneName}: end */
 `;
   return content;

package/dist/index.js

@@ -5,7 +5,7 @@ import { ZodMetadata } from '@cabloy/zod-openapi';
 import { Pipe, createArgumentPipe, SymbolCacheComposeGuards, SymbolCacheComposeInterceptors, SymbolCacheComposePipes, SymbolCacheComposeMiddlewares, clearCacheComposesRouter, SymbolCacheComposeMiddlewareSystems, setArgumentPipe } from 'vona-module-a-aspect';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
 import { SymbolUseOnionOptions } from 'vona-module-a-onion';
-import { SymbolRouteHandlersArgumentsValue, SymbolRouteHandlersArgumentsMeta, makeSchemaLikes, $schema, SymbolOpenApiOptions, mergeFieldsOpenapiMetadata } from 'vona-module-a-openapiutils';
+import { SymbolRouteHandlersArgumentsValue, SymbolRouteHandlersArgumentsMeta, makeSchemaLikes, $schema, SymbolOpenApiOptions, SymbolControllerResource, mergeFieldsOpenapiMetadata } from 'vona-module-a-openapiutils';
 import { SymbolUploadValue } from 'vona-module-a-upload';
 import http from 'node:http';
 import { Startup } from 'vona-module-a-startup';
@@ -188,7 +188,6 @@ PipeValid = __decorate([Pipe({
 const ArgValid = createArgumentPipe('a-web:valid');
 
 const SymbolCacheControllerRoutes = Symbol('SymbolCacheControllerRoutes');
-const SymbolControllerOptionsResource = Symbol('SymbolControllerOptionsResource');
 const recordResourceNameToRoutePath = {};
 function getCacheControllerRoutes(app) {
   if (!app.meta[SymbolCacheControllerRoutes]) app.meta[SymbolCacheControllerRoutes] = {};
@@ -475,7 +474,8 @@ let BeanRouter = class BeanRouter extends BeanBase {
       route,
       routeMethod: actionMethod,
       routePath,
-      routePathRaw
+      routePathRaw,
+      routePathOriginal: actionPath
     };
     // fn
     const fn = function (_req, _res, params, _store, searchParams) {
@@ -858,24 +858,25 @@ function Controller(path, options) {
   return createBeanDecorator('controller', options, false, target => {
     // beanOptions
     const beanOptions = appResource.getBean(target);
-    // IOpenApiOptions
+    // IOpenapiOptions
     const optionsMeta = appMetadata.getOwnMetadataMap(false, SymbolOpenApiOptions, target);
-    for (const key of ['exclude', 'tags']) {
-      const option = cast(beanOptions.options)[key];
-      if (option !== undefined) optionsMeta[key] = option;
+    for (const key in cast(beanOptions.options)) {
+      if (key === 'path') continue;
+      optionsMeta[key] = cast(beanOptions.options)[key];
     }
-    // IOpenApiOptions
+    // IOpenapiOptions
     mergeActionsOpenapiMetadata(target);
     // map: resourceName->api path
     const onionName = onionNameFromBeanFullName(beanOptions.beanFullName);
-    const optionsResource = appMetadata.getOwnMetadata(SymbolControllerOptionsResource, target);
-    if (optionsResource) {
+    const controllerResource = appMetadata.getOwnMetadata(SymbolControllerResource, target);
+    if (controllerResource) {
       const app = useApp();
       const apiPath = app.util.combineApiPathControllerAndAction(beanOptions.module, cast(beanOptions.options).path, undefined, true, true);
       const routePathRaw = app.util.combineApiPathControllerAndActionRaw(beanOptions.module, cast(beanOptions.options).path, undefined, true);
       recordResourceNameToRoutePath[onionName] = {
         apiPath,
-        routePathRaw
+        routePathRaw,
+        target
       };
     } else {
       // for hmr
@@ -952,4 +953,4 @@ const Web = {
   head: Head
 };
 
-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 };
+export { Arg, ArgFilterPro, ArgValid, BeanRouter, Controller, Dto, FilterTransform, FilterTransformBase, FilterTransformDateRange, HmrController, HmrDto, Main, PipeFilter, PipeValid, RequestMapping, ScopeModuleAWeb, ServiceWeb, StartupListen, SymbolCacheControllerRoutes, SymbolRequestMappingHandler, Web, config, createPipesArgumentDecorator, getCacheControllerRoutes, mergeActionsOpenapiMetadata, recordResourceNameToRoutePath };

package/dist/lib/const.d.ts

@@ -1,11 +1,11 @@
-import type { VonaApplication } from 'vona';
-import type { IControllerRecord } from '../types/controller.ts';
+import type { Constructable, VonaApplication } from 'vona';
+import type { IResourceRecord } from 'vona-module-a-openapi';
 import type { ContextRoute } from '../types/router.ts';
 export interface IRecordResourceNameToRoutePathItem {
     apiPath: string;
     routePathRaw: string;
+    target: Constructable;
 }
 export declare const SymbolCacheControllerRoutes: unique symbol;
-export declare const SymbolControllerOptionsResource: unique symbol;
-export declare const recordResourceNameToRoutePath: Record<keyof IControllerRecord, IRecordResourceNameToRoutePathItem>;
+export declare const recordResourceNameToRoutePath: Record<keyof IResourceRecord, IRecordResourceNameToRoutePathItem>;
 export declare function getCacheControllerRoutes(app: VonaApplication): Record<string, ContextRoute[]>;

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

@@ -1,17 +1,17 @@
-import type { IOpenApiOptions } from 'vona-module-a-openapiutils';
+import type { IOpenapiOptions } from 'vona-module-a-openapiutils';
 import type { TypeRequestMethod } from '../../types/request.ts';
 export interface RequestMappingMetadata {
     path?: string;
     method?: TypeRequestMethod;
-    options?: IOpenApiOptions;
+    options?: IOpenapiOptions;
 }
 export declare function RequestMapping(metadata?: RequestMappingMetadata): MethodDecorator;
 export declare const Web: {
-    post: (path?: IOpenApiOptions | string, options?: IOpenApiOptions) => MethodDecorator;
-    get: (path?: IOpenApiOptions | string, options?: IOpenApiOptions) => MethodDecorator;
-    delete: (path?: IOpenApiOptions | string, options?: IOpenApiOptions) => MethodDecorator;
-    put: (path?: IOpenApiOptions | string, options?: IOpenApiOptions) => MethodDecorator;
-    patch: (path?: IOpenApiOptions | string, options?: IOpenApiOptions) => MethodDecorator;
-    options: (path?: IOpenApiOptions | string, options?: IOpenApiOptions) => MethodDecorator;
-    head: (path?: IOpenApiOptions | string, options?: IOpenApiOptions) => MethodDecorator;
+    post: (path?: IOpenapiOptions | string, options?: IOpenapiOptions) => MethodDecorator;
+    get: (path?: IOpenapiOptions | string, options?: IOpenapiOptions) => MethodDecorator;
+    delete: (path?: IOpenapiOptions | string, options?: IOpenapiOptions) => MethodDecorator;
+    put: (path?: IOpenapiOptions | string, options?: IOpenapiOptions) => MethodDecorator;
+    patch: (path?: IOpenapiOptions | string, options?: IOpenapiOptions) => MethodDecorator;
+    options: (path?: IOpenapiOptions | string, options?: IOpenapiOptions) => MethodDecorator;
+    head: (path?: IOpenapiOptions | string, options?: IOpenapiOptions) => MethodDecorator;
 };

package/dist/types/controller.d.ts

@@ -1,5 +1,6 @@
 import type { OmitNever } from 'vona';
 import type { ServiceOnion, TypeOnionOptionsEnableSimple } from 'vona-module-a-onion';
+import type { IOpenapiOptionsResourceMeta } from 'vona-module-a-openapi';
 export interface IApiPathRecordMethodMap {
     get: IApiPathGetRecord;
     post: IApiPathPostRecord;
@@ -25,6 +26,7 @@ export interface IDecoratorControllerOptions extends TypeOnionOptionsEnableSimpl
     path?: string;
     exclude?: boolean;
     tags?: string[];
+    resourceMeta?: IOpenapiOptionsResourceMeta;
 }
 declare module 'vona-module-a-onion' {
     interface BeanOnion {

package/dist/types/router.d.ts

@@ -13,6 +13,7 @@ export interface ContextRoute {
     routeMethod: TypeRequestMethod;
     routePath: string;
     routePathRaw: string;
+    routePathOriginal: string;
 }
 declare module 'vona' {
     interface VonaApplication {

package/dist-cli/controller/metadata/generate.js

@@ -2,12 +2,16 @@ import { combineApiPathControllerAndActionRaw } from '@cabloy/utils';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 export default async function (options) {
     const { sceneName, moduleName, globFiles } = options;
+    const contentResources = [];
     const contentImports = [];
     const contentActions = [];
     const contentPaths = {};
     for (const globFile of globFiles) {
         const { className, beanName, fileNameJSRelative, fileContent } = globFile;
         const opionsName = `IControllerOptions${toUpperCaseFirstChar(beanName)}`;
+        if (fileContent.includes('@Resource()')) {
+            contentResources.push(`'${moduleName}:${beanName}': never;`);
+        }
         contentImports.push(`// @ts-ignore ignore\nimport type { ${className} } from '${fileNameJSRelative}';`);
         contentActions.push(`
     export interface ${opionsName} {
@@ -52,6 +56,13 @@ export default async function (options) {
   ${contentRecord}
 }`
         : '';
+    let contentResources2 = contentResources.length > 0 ? `import 'vona-module-a-openapi';
+  declare module 'vona-module-a-openapi' {
+    export interface IResourceRecord {
+      ${contentResources.join('\n')}
+    }
+  }
+  ` : '';
     // combine
     const content = `/** ${sceneName}: begin */
 ${contentImports.join('\n')}
@@ -59,6 +70,7 @@ declare module 'vona-module-${moduleName}' {
   ${contentActions.join('\n')}
 }
 ${contentRecord2}
+${contentResources2}
 /** ${sceneName}: end */
 `;
     return content;

package/package.json

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