vona-module-a-web 5.0.35 → 5.0.36

package/dist/index.js

@@ -1,4 +1,4 @@
-import { BeanInfo, BeanBase, cast, beanFullNameFromOnionName, appMetadata, appResource, deepExtend, compose, createBeanDecorator, BeanSimple, BeanScopeBase } from 'vona';
+import { BeanInfo, BeanBase, cast, beanFullNameFromOnionName, appMetadata, appResource, deepExtend, compose, createBeanDecorator, BeanSimple, BeanScopeBase, onionNameFromBeanFullName, useApp } from 'vona';
 import { isNil, isNilOrEmptyString } from '@cabloy/utils';
 import { ZodMetadata } from '@cabloy/zod-openapi';
 import { Pipe, createArgumentPipe, SymbolCacheComposeGuards, SymbolCacheComposeInterceptors, SymbolCacheComposePipes, SymbolCacheComposeMiddlewares, clearCacheComposesRouter, SymbolCacheComposeMiddlewareSystems, setArgumentPipe } from 'vona-module-a-aspect';
@@ -188,6 +188,8 @@ let PipeValid = (_dec$7 = 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] = {};
   return app.meta[SymbolCacheControllerRoutes];
@@ -411,10 +413,11 @@ let BeanRouter = (_dec$6 = Bean(), _dec2$6 = BeanInfo({
     // remove
     const cacheControllerRoutes = getCacheControllerRoutes(this.app);
     const routes = cacheControllerRoutes[beanFullName];
-    if (!routes) return;
-    delete cacheControllerRoutes[beanFullName];
-    for (const route of routes) {
-      app.router.off(route.routeMethod.toUpperCase(), route.routePath);
+    if (routes) {
+      delete cacheControllerRoutes[beanFullName];
+      for (const route of routes) {
+        app.router.off(route.routeMethod.toUpperCase(), route.routePath);
+      }
     }
     // register
     this.registerController(beanFullName);
@@ -860,11 +863,26 @@ function Controller(path, options) {
     // IOpenApiOptions
     const optionsMeta = appMetadata.getOwnMetadataMap(false, SymbolOpenApiOptions, target);
     for (const key of ['exclude', 'tags']) {
-      const option = cast(beanOptions?.options)[key];
+      const option = cast(beanOptions.options)[key];
       if (option !== undefined) optionsMeta[key] = option;
     }
     // IOpenApiOptions
     mergeActionsOpenapiMetadata(target);
+    // map: resourceName->api path
+    const onionName = onionNameFromBeanFullName(beanOptions.beanFullName);
+    const optionsResource = appMetadata.getOwnMetadata(SymbolControllerOptionsResource, target);
+    if (optionsResource) {
+      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
+      };
+    } else {
+      // for hmr
+      delete recordResourceNameToRoutePath[onionName];
+    }
   });
 }
 function Dto(options) {
@@ -936,4 +954,4 @@ const Web = {
   head: Head
 };
 
-export { Arg, ArgFilterPro, ArgValid, BeanRouter, Controller, Dto, FilterTransform, FilterTransformBase, FilterTransformDateRange, HmrController, Main, PipeFilter, PipeValid, RequestMapping, ScopeModuleAWeb, ServiceWeb, StartupListen, SymbolCacheControllerRoutes, SymbolRequestMappingHandler, Web, config, createPipesArgumentDecorator, getCacheControllerRoutes, mergeActionsOpenapiMetadata };
+export { Arg, ArgFilterPro, ArgValid, BeanRouter, Controller, Dto, FilterTransform, FilterTransformBase, FilterTransformDateRange, HmrController, Main, PipeFilter, PipeValid, RequestMapping, ScopeModuleAWeb, ServiceWeb, StartupListen, SymbolCacheControllerRoutes, SymbolControllerOptionsResource, SymbolRequestMappingHandler, Web, config, createPipesArgumentDecorator, getCacheControllerRoutes, mergeActionsOpenapiMetadata, recordResourceNameToRoutePath };

package/dist/lib/const.d.ts

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

package/package.json

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