vona-module-a-openapi 5.0.59 → 5.0.61

package/dist/index.js

@@ -1,4 +1,5 @@
-import { BeanInfo, BeanBase, appResource, beanFullNameFromOnionName, cast, LocaleModuleNameSeparator, appMetadata, BeanSimple, BeanScopeBase } from 'vona';
+import { BeanInfo, BeanBase, appResource, beanFullNameFromOnionName, cast, appMetadata, BeanSimple, BeanScopeBase } from 'vona';
+import { __decorate, __metadata } from 'tslib';
 import { OpenAPIRegistry, OpenApiGeneratorV3, OpenApiGeneratorV31 } from '@cabloy/zod-to-openapi';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
 import { Caching } from 'vona-module-a-caching';
@@ -15,30 +16,12 @@ import { ZodMetadata } from '@cabloy/zod-openapi';
 import 'openapi3-ts/oas30';
 import 'openapi3-ts/oas31';
 
-function _applyDecoratedDescriptor(i, e, r, n, l) {
-  var a = {};
-  return Object.keys(n).forEach(function (i) {
-    a[i] = n[i];
-  }), a.enumerable = !!a.enumerable, a.configurable = !!a.configurable, ("value" in a || a.initializer) && (a.writable = true), a = r.slice().reverse().reduce(function (r, n) {
-    return n(i, e, r) || r;
-  }, a), l && void 0 !== a.initializer && (a.value = a.initializer ? a.initializer.call(l) : void 0, a.initializer = void 0), void 0 === a.initializer ? (Object.defineProperty(i, e, a), null) : a;
-}
-
-var _dec$3, _dec2$3, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class$3, _class2;
-let BeanOpenapi = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
-  module: "a-openapi"
-}), _dec3 = Caching.get({
-  cacheName: 'a-openapi:json',
-  cacheKeyFn: 'generateJsonCacheKey'
-}), _dec4 = Reflect.metadata("design:type", Function), _dec5 = Reflect.metadata("design:paramtypes", [typeof K === "undefined" ? Object : K]), _dec6 = Caching.get({
-  cacheName: 'a-openapi:json',
-  cacheKeyFn: 'generateJsonOfControllerActionCacheKey'
-}), _dec7 = Reflect.metadata("design:type", Function), _dec8 = Reflect.metadata("design:paramtypes", [typeof Constructable === "undefined" ? Object : Constructable, String, typeof K === "undefined" ? Object : K]), _dec$3(_class$3 = _dec2$3(_class$3 = (_class2 = class BeanOpenapi extends BeanBase {
+var _a, _b;
+let BeanOpenapi = class BeanOpenapi extends BeanBase {
   // need not cache
   async generateJsonOfClass(schemaClass, version = 'V31') {
     return await this.generateJsonOfClasses([schemaClass], version);
   }
-
   // need not cache
   async generateJsonOfClasses(schemaClasses, version = 'V31') {
     const registry = new OpenAPIRegistry();
@@ -86,13 +69,22 @@ let BeanOpenapi = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
     this.scope.service.openapi.translate(apiObj, 'rest');
     return apiObj;
   }
-}, _applyDecoratedDescriptor(_class2.prototype, "generateJson", [_dec3, _dec4, _dec5], Object.getOwnPropertyDescriptor(_class2.prototype, "generateJson"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "generateJsonOfControllerAction", [_dec6, _dec7, _dec8], Object.getOwnPropertyDescriptor(_class2.prototype, "generateJsonOfControllerAction"), _class2.prototype), _class2)) || _class$3) || _class$3);
+};
+__decorate([Caching.get({
+  cacheName: 'a-openapi:json',
+  cacheKeyFn: 'generateJsonCacheKey'
+}), __metadata("design:type", Function), __metadata("design:paramtypes", [typeof (_a = typeof K !== "undefined" && K) === "function" ? _a : Object]), __metadata("design:returntype", Promise)], BeanOpenapi.prototype, "generateJson", null);
+__decorate([Caching.get({
+  cacheName: 'a-openapi:json',
+  cacheKeyFn: 'generateJsonOfControllerActionCacheKey'
+}), __metadata("design:type", Function), __metadata("design:paramtypes", [Object, String, typeof (_b = typeof K !== "undefined" && K) === "function" ? _b : Object]), __metadata("design:returntype", Promise)], BeanOpenapi.prototype, "generateJsonOfControllerAction", null);
+BeanOpenapi = __decorate([Bean(), BeanInfo({
+  module: "a-openapi"
+})], BeanOpenapi);
 
-var _dec$2, _dec2$2, _class$2;
 const __ArgumentTypes = ['param', 'query', 'body', 'headers', 'fields', 'field', 'files', 'file'];
-let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
-  module: "a-openapi"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class ServiceOpenapi extends BeanBase {
+const symbolJsxRenderTranslated = Symbol('symbolJsxRenderTranslated');
+let ServiceOpenapi = class ServiceOpenapi extends BeanBase {
   async clearAllCaches() {
     const cacheOpenapiSchema = this.bean.summer.cache(beanFullNameFromOnionName('a-openapi:json', 'summerCache'));
     await cacheOpenapiSchema.clear();
@@ -108,13 +100,16 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
         const pathObj = apiObj.paths[key];
         for (const method in pathObj) {
           const methodObj = pathObj[method];
-          this._translateStrings(methodObj, ['description', 'summary']);
           // parameters
           for (const parameterObj of methodObj.parameters || []) {
-            this._translateSchema(parameterObj.schema, generateJsonScene);
+            if (parameterObj.schema) {
+              parameterObj.schema = this._translateSchema(parameterObj.schema, generateJsonScene);
+            }
           }
           // requestBody
-          this._translateSchema(methodObj.requestBody?.content?.['application/json']?.schema, generateJsonScene);
+          if (methodObj.requestBody?.content?.['application/json']?.schema) {
+            methodObj.requestBody.content['application/json'].schema = this._translateSchema(methodObj.requestBody.content['application/json'].schema, generateJsonScene);
+          }
         }
       }
     }
@@ -122,12 +117,13 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     if (apiObj.components?.schemas) {
       for (const key in apiObj.components.schemas) {
         const schema = apiObj.components.schemas[key];
-        this._translateSchema(schema, generateJsonScene);
+        if (schema) {
+          apiObj.components.schemas[key] = this._translateSchema(schema, generateJsonScene);
+        }
       }
     }
   }
   _translateSchema(schema, generateJsonScene) {
-    if (!schema) return;
     if (schema.type === 'object' && schema.required === undefined) schema.required = [];
     // serializerTransforms
     delete schema.serializerTransforms;
@@ -143,26 +139,31 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
       }
     }
     // schema
-    this._translateStrings(schema, ['title', 'description']);
     if (generateJsonScene === 'api' && !schema.description && schema.title) {
       schema.description = schema.title;
       delete schema.title;
     }
     // errorMessage
     this._translateErrorMessages(schema);
+    // jsxRender
+    this._translateJsxRenders(schema);
     // properties
     const properties = cast(schema).properties;
     if (properties && typeof properties === 'object') {
       for (const prop in properties) {
         const propObj = properties[prop];
-        this._translateSchema(propObj, generateJsonScene);
+        if (propObj) {
+          properties[prop] = this._translateSchema(propObj, generateJsonScene);
+        }
       }
     }
     // items
     const items = cast(schema).items;
     if (items && typeof items === 'object') {
-      this._translateSchema(items, generateJsonScene);
+      cast(schema).items = this._translateSchema(items, generateJsonScene);
     }
+    // ok
+    return schema;
   }
   _translateErrorMessages(obj) {
     if (!obj.errorMessage) return;
@@ -181,16 +182,35 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
       }, error, scope);
     }
   }
-  _translateStrings(obj, keys) {
-    for (const key of keys) {
-      this._translateString(obj, key);
+  _translateJsxRenders(obj) {
+    if (obj.rest?.render) {
+      obj.rest.render = this._translateJsxRender(obj.rest.render);
+    }
+    if (obj.rest?.table?.render) {
+      obj.rest.table.render = this._translateJsxRender(obj.rest.table.render);
+    }
+    if (obj.rest?.form?.render) {
+      obj.rest.form.render = this._translateJsxRender(obj.rest.form.render);
     }
   }
-  _translateString(obj, key) {
-    if (!obj) return;
-    if (obj[key] && obj[key].includes(LocaleModuleNameSeparator)) {
-      obj[key] = this.app.meta.text(obj[key]);
+  _translateJsxRender(component) {
+    if (component[symbolJsxRenderTranslated] === true) return component;
+    const componentNew = {};
+    componentNew[symbolJsxRenderTranslated] = true;
+    componentNew.type = typeof component.type === 'function' ? component.type() : component.type;
+    componentNew.key = component.key;
+    componentNew.props = {
+      ...component.props
+    };
+    const children = componentNew.props.children;
+    if (children) {
+      if (Array.isArray(children)) {
+        componentNew.props.children = children.map(item => this._translateJsxRender(item));
+      } else if (typeof children === 'object' && !children.toJSON) {
+        componentNew.props.children = this._translateJsxRender(children);
+      }
     }
+    return componentNew;
   }
   collectRegistry() {
     const registry = new OpenAPIRegistry();
@@ -243,22 +263,18 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
   _registerControllerAction(registry, info, controller, beanOptions, _controllerBeanFullName, controllerPath, controllerOpenApiOptions, actionKey, _desc) {
     // app
     const app = this.app;
-
     // action options: should not extend controllerOpenApiOptions
     const actionOpenApiOptions = appMetadata.getMetadata(SymbolOpenApiOptions, controller.prototype, actionKey);
     if (actionOpenApiOptions?.exclude) return;
-
     // actionPath/actionMethod
     if (!appMetadata.hasMetadata(SymbolRequestMappingHandler, controller.prototype, actionKey)) return;
     const handlerMetadata = appMetadata.getMetadata(SymbolRequestMappingHandler, controller.prototype, actionKey);
     const actionPath = handlerMetadata.path || '';
     const actionMethod = handlerMetadata.method || 'get';
-
     // routePath
     const routePath = app.util.combineApiPathControllerAndAction(info.relativeName, controllerPath, actionPath, true, true);
     // :id -> {id}
     const routePath2 = routePath.replace(/:([^/]+)/g, '{$1}');
-
     // tags
     let tags = actionOpenApiOptions?.tags ?? controllerOpenApiOptions?.tags;
     if (!tags || tags.length === 0) {
@@ -435,16 +451,19 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     }
     return objHeaders;
   }
-}) || _class$2) || _class$2);
+};
+ServiceOpenapi = __decorate([Service(), BeanInfo({
+  module: "a-openapi"
+})], ServiceOpenapi);
 
-var _dec$1, _dec2$1, _class$1;
-let SummerCacheJson = (_dec$1 = SummerCache({
+let SummerCacheJson = class SummerCacheJson extends BeanSummerCacheBase {
+  async getNative(_key, _options) {}
+};
+SummerCacheJson = __decorate([SummerCache({
   preset: 'mem'
-}), _dec2$1 = BeanInfo({
+}), BeanInfo({
   module: "a-openapi"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class SummerCacheJson extends BeanSummerCacheBase {
-  async getNative(_key, _options) {}
-}) || _class$1) || _class$1);
+})], SummerCacheJson);
 
 function config(_app) {
   return {
@@ -510,11 +529,10 @@ class Main extends BeanSimple {
   async configLoaded(_config) {}
 }
 
-var _dec, _dec2, _class;
-let ScopeModuleAOpenapi = (_dec = Scope(), _dec2 = BeanInfo({
+let ScopeModuleAOpenapi = class ScopeModuleAOpenapi extends BeanScopeBase {};
+ScopeModuleAOpenapi = __decorate([Scope(), BeanInfo({
   module: "a-openapi"
-}), _dec(_class = _dec2(_class = class ScopeModuleAOpenapi extends BeanScopeBase {}) || _class) || _class);
-
+})], ScopeModuleAOpenapi);
 /** scope: end */
 
 export { BeanOpenapi, Main, ScopeModuleAOpenapi, ServiceOpenapi, SummerCacheJson, config, schemaRefCustomAdapter };

package/dist/service/openapi.d.ts

@@ -9,8 +9,8 @@ export declare class ServiceOpenapi extends BeanBase {
     translate(apiObj: OpenAPIObject30 | OpenAPIObject31, generateJsonScene: TypeGenerateJsonScene): void;
     private _translateSchema;
     private _translateErrorMessages;
-    private _translateStrings;
-    private _translateString;
+    private _translateJsxRenders;
+    private _translateJsxRender;
     collectRegistry(): OpenAPIRegistry;
     collectController(registry: OpenAPIRegistry, moduleName: string, controller: Constructable, actionKey?: string): void;
     private _registerControllerAction;

package/dist/types/rest.d.ts

@@ -1,5 +1,6 @@
 import type { ZodOpenAPIMetadata } from '@cabloy/zod-to-openapi';
 import type { CurrencyOptions } from '@zhennann/currency';
+import type { ILocaleMagic } from 'vona';
 import type { IOpenApiOptions } from 'vona-module-a-openapiutils';
 import type { z } from 'zod';
 import type { TypeResourceActionRowRecordRender } from './actions.ts';
@@ -30,7 +31,10 @@ declare module 'openapi3-ts/oas31' {
 export type TypeFieldRenderComponent = (keyof IComponentRecord) | (keyof TypeResourceActionRowRecordRender) | 'text' | 'textarea' | 'select' | 'checkbox' | 'radio' | 'switch' | 'image' | 'file' | 'color' | 'password' | 'email' | 'url';
 export type TypeFieldRenderComponentProvider = (keyof IComponentRecord) | (keyof TypeResourceActionRowRecordRender) | 'input' | 'textarea' | 'select';
 export type TypeSchemaScene = 'table' | 'form';
-export type TypeOpenapiMetadata<T extends z.ZodType = z.ZodType> = Partial<ZodOpenAPIMetadata<z.input<T>>>;
+export type TypeOpenapiMetadata<T extends z.ZodType = z.ZodType> = Omit<Partial<ZodOpenAPIMetadata<z.input<T>>>, 'title' | 'description'> & {
+    title?: string | ILocaleMagic;
+    description?: string | ILocaleMagic;
+};
 export type TypeEntityOptionsFields<T extends {}, More extends string | undefined = never> = {
     [key in ((keyof T) | (More extends string ? More : never))]?: TypeOpenapiMetadata | z.ZodType;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-openapi",
   "type": "module",
-  "version": "5.0.59",
+  "version": "5.0.61",
   "title": "a-openapi",
   "vonaModule": {
     "capabilities": {
@@ -35,9 +35,9 @@
     "dist"
   ],
   "dependencies": {
-    "@cabloy/zod-openapi": "^1.0.7",
+    "@cabloy/zod-openapi": "^1.0.8",
     "@cabloy/zod-query": "^2.0.4",
-    "@cabloy/zod-to-openapi": "^8.1.4",
+    "@cabloy/zod-to-openapi": "^8.1.5",
     "@zhennann/currency": "^2.0.0",
     "openapi3-ts": "^4.5.0",
     "zod": "^4.1.13"