vona-module-a-openapi 5.0.21 → 5.0.24

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

@@ -1,7 +1,7 @@
 /** service: begin */
 export * from '../service/openapi.ts';
 import 'vona';
-declare module 'vona-module-a-web' {
+declare module 'vona-module-a-bean' {
     interface IServiceRecord {
         'a-openapi:openapi': never;
     }
@@ -25,6 +25,25 @@ declare module 'vona' {
     }
 }
 /** service: end */
+/** summerCache: begin */
+export * from '../bean/summerCache.json.ts';
+import { type IDecoratorSummerCacheOptions } from 'vona-module-a-summer';
+declare module 'vona-module-a-summer' {
+    interface ISummerCacheRecord {
+        'a-openapi:json': IDecoratorSummerCacheOptions;
+    }
+}
+declare module 'vona-module-a-openapi' {
+    interface SummerCacheJson {
+    }
+}
+/** summerCache: end */
+/** summerCache: begin */
+import type { SummerCacheJson } from '../bean/summerCache.json.ts';
+export interface IModuleSummerCache {
+    'json': SummerCacheJson;
+}
+/** summerCache: end */
 /** config: begin */
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';
@@ -201,6 +220,7 @@ export interface ScopeModuleAOpenapi {
     config: TypeModuleConfig<typeof config>;
     locale: TypeModuleLocales<(typeof locales)[TypeLocaleBase]>;
     service: IModuleService;
+    summerCache: IModuleSummerCache;
 }
 import 'vona';
 declare module 'vona' {

package/dist/bean/summerCache.json.d.ts

@@ -0,0 +1,7 @@
+import type { ISummerCacheGet, TSummerCacheActionOptions } from 'vona-module-a-summer';
+import { BeanSummerCacheBase } from 'vona-module-a-summer';
+export type TSummerCacheJsonKey = any;
+export type TSummerCacheJsonData = any;
+export declare class SummerCacheJson extends BeanSummerCacheBase<TSummerCacheJsonKey, TSummerCacheJsonData> implements ISummerCacheGet<TSummerCacheJsonKey, TSummerCacheJsonData> {
+    getNative(_key?: TSummerCacheJsonKey, _options?: TSummerCacheActionOptions<TSummerCacheJsonKey, TSummerCacheJsonData>): Promise<TSummerCacheJsonData | null | undefined>;
+}

package/dist/config/config.d.ts

@@ -1,7 +1,7 @@
 import type { OpenAPIObjectConfig as OpenAPIObjectConfigV30 } from '@asteasolutions/zod-to-openapi/dist/v3.0/openapi-generator.ts';
 import type { OpenAPIObjectConfigV31 } from '@asteasolutions/zod-to-openapi/dist/v3.1/openapi-generator.ts';
 import type { VonaApplication } from 'vona';
-import type { TypeOpenApiVersion, TypeSecuritySchemes } from '../types/api.ts';
+import type { TypeOpenApiVersion, TypeSecuritySchemes } from 'vona-module-a-openapiutils';
 export declare function config(_app: VonaApplication): {
     defaultVersion: TypeOpenApiVersion;
     generateDocument: {

package/dist/index.js

@@ -4,13 +4,25 @@ import * as ModuleInfo from '@cabloy/module-info';
 import { isEmptyObject, isNil } from '@cabloy/utils';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 import { getTypeName, coerceWithNil } from '@cabloy/zod-query';
-import { Service, SymbolRequestMappingHandler } from 'vona-module-a-web';
+import { Service, Scope } from 'vona-module-a-bean';
+import { Caching } from 'vona-module-a-caching';
+import { SymbolDecoratorRule, SymbolOpenApiOptions, SymbolDecoratorRuleColumn } from 'vona-module-a-openapiutils';
+import { SymbolRequestMappingHandler } from 'vona-module-a-web';
 import { z } from 'zod';
+import { SummerCache, BeanSummerCacheBase } from 'vona-module-a-summer';
 import { locales as locales$1, setErrorMapDefault, setErrorMapSchema } from '@cabloy/zod-errors-custom';
-import { Scope } from 'vona-module-a-bean';
 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;
+}
+
 function bodySchemaWrapperDefault(bodySchema) {
   return z.object({
     code: z.string(),
@@ -19,14 +31,6 @@ function bodySchemaWrapperDefault(bodySchema) {
   });
 }
 
-const SymbolDecoratorRule = Symbol('SymbolDecoratorRule');
-const SymbolDecoratorRuleColumn = Symbol('SymbolDecoratorRuleColumn');
-
-// not use z.ZodSchema
-
-const SymbolRouteHandlersArgumentsMeta = Symbol('SymbolRouteHandlersArgumentsMeta');
-const SymbolRouteHandlersArgumentsValue = Symbol('SymbolRouteHandlersArgumentsValue');
-
 function $schema(classType, options) {
   if (!classType) return z.any();
   if (classType.parseAsync) return classType;
@@ -55,21 +59,40 @@ function $schema(classType, options) {
   return schema;
 }
 
-const SymbolOpenApiOptions = Symbol('SymbolOpenApiOptions');
+const SymbolRouteHandlersArgumentsMeta = Symbol('SymbolRouteHandlersArgumentsMeta');
+const SymbolRouteHandlersArgumentsValue = Symbol('SymbolRouteHandlersArgumentsValue');
 
-var _dec$1, _dec2$1, _class$1;
+var _dec$2, _dec2$2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _class$2, _class2;
 const __ArgumentTypes = ['param', 'query', 'body', 'headers', 'fields', 'field', 'files', 'file'];
-let ServiceOpenapi = (_dec$1 = Service(), _dec2$1 = BeanInfo({
+let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
   module: "a-openapi"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class ServiceOpenapi extends BeanBase {
-  generateJson(version = 'V31') {
+}), _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$2(_class$2 = _dec2$2(_class$2 = (_class2 = class ServiceOpenapi extends BeanBase {
+  generateJsonCacheKey(args, prop) {
+    const version = args[0] ?? 'V31';
+    const locale = this.ctx.locale;
+    return `${prop}_${version}_${locale}`;
+  }
+  generateJsonOfControllerActionCacheKey(args, prop) {
+    const [controller, actionKey, version] = args;
+    const beanOptions = appResource.getBean(controller);
+    const beanFullName = beanOptions.beanFullName;
+    const locale = this.ctx.locale;
+    return `${prop}_${beanFullName}_${actionKey}_${version ?? 'V31'}_${locale}`;
+  }
+  async generateJson(version = 'V31') {
     const registry = this._collectRegistry();
     const generator = version === 'V30' ? new OpenApiGeneratorV3(registry.definitions) : new OpenApiGeneratorV31(registry.definitions);
     const apiObj = generator.generateDocument(this.scope.config.generateDocument[version]);
     this._translate(apiObj, 'api');
     return apiObj;
   }
-  generateJsonOfControllerAction(controller, actionKey, version = 'V31') {
+  async generateJsonOfControllerAction(controller, actionKey, version = 'V31') {
     const registry = new OpenAPIRegistry();
     const beanOptions = appResource.getBean(controller);
     if (!beanOptions) throw new Error('invalid controller');
@@ -284,7 +307,7 @@ let ServiceOpenapi = (_dec$1 = Service(), _dec2$1 = BeanInfo({
         if (!schema) continue;
         // check schema
         if (getTypeName(schema) === 'ZodAny') {
-          throw new Error(`Invalid OpenAPI argument type: ${info.relativeName}:${controller.name}.${actionKey}#${argumentType}`);
+          throw new Error(`Invalid Openapi argument type: ${info.relativeName}:${controller.name}.${actionKey}#${argumentType}`);
         }
         // record
         if (argumentType === 'body') {
@@ -378,6 +401,13 @@ let ServiceOpenapi = (_dec$1 = Service(), _dec2$1 = BeanInfo({
     }
     return objHeaders;
   }
+}, _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$2) || _class$2);
+
+var _dec$1, _dec2$1, _class$1;
+let SummerCacheJson = (_dec$1 = SummerCache(), _dec2$1 = BeanInfo({
+  module: "a-openapi"
+}), _dec$1(_class$1 = _dec2$1(_class$1 = class SummerCacheJson extends BeanSummerCacheBase {
+  async getNative(_key, _options) {}
 }) || _class$1) || _class$1);
 
 function config(_app) {
@@ -481,7 +511,7 @@ function getTargetDecoratorRuleColumns(target) {
   registerMappedClassMetadataKey(target, SymbolDecoratorRuleColumn);
   return appMetadata.getOwnMetadataMap(true, SymbolDecoratorRuleColumn, target);
 }
-function mergeFieldsOpenAPIMetadata(target) {
+function mergeFieldsOpenapiMetadata(target) {
   // rules
   const rules = getTargetDecoratorRules(target.prototype);
   // beanOptions
@@ -519,10 +549,6 @@ function Field$1(...schemaLikes) {
   };
 }
 
-function setPublic(target, prop, _descriptor, value) {
-  const options = appMetadata.getOwnMetadataMap(false, SymbolOpenApiOptions, target, prop);
-  options.public = value;
-}
 function httpCode(httpCode) {
   return function (target, prop, descriptor) {
     const options = appMetadata.getOwnMetadataMap(false, SymbolOpenApiOptions, target, prop);
@@ -805,4 +831,4 @@ const OrderBusinessBase = 1000;
 const OrderUnknownBase = 10000;
 const OrderMaxBase = 100000;
 
-export { $locale, $schema, Api, Arg, Main, OrderBusinessBase, OrderCoreBase, OrderMaxBase, OrderUnknownBase, ScopeModuleAOpenapi, ServiceOpenapi, SymbolDecoratorRule, SymbolDecoratorRuleColumn, SymbolOpenApiOptions, SymbolRouteHandlersArgumentsMeta, SymbolRouteHandlersArgumentsValue, bodySchemaWrapperDefault, config, createPipesArgumentDecorator, errorsAdapter, getTargetDecoratorRuleColumns, getTargetDecoratorRules, locales, makeSchemaLike, makeSchemaLikes, mergeFieldsOpenAPIMetadata, setPublic, v };
+export { $locale, $schema, Api, Arg, Main, OrderBusinessBase, OrderCoreBase, OrderMaxBase, OrderUnknownBase, ScopeModuleAOpenapi, ServiceOpenapi, SummerCacheJson, SymbolRouteHandlersArgumentsMeta, SymbolRouteHandlersArgumentsValue, bodySchemaWrapperDefault, config, createPipesArgumentDecorator, errorsAdapter, getTargetDecoratorRuleColumns, getTargetDecoratorRules, locales, makeSchemaLike, makeSchemaLikes, mergeFieldsOpenapiMetadata, v };

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

@@ -1,8 +1,5 @@
-import type { MetadataKey } from 'vona';
-import type { IOpenApiHeader, TypeResponseContentType } from '../../types/api.ts';
-import type { SchemaLike, SchemaLikeCreate } from '../../types/decorator.ts';
+import type { IOpenApiHeader, SchemaLike, SchemaLikeCreate, TypeResponseContentType } from 'vona-module-a-openapiutils';
 import { Field } from './field.ts';
-export declare function setPublic(target: object, prop?: MetadataKey, _descriptor?: PropertyDescriptor, value?: boolean): void;
 declare function httpCode(httpCode: number): MethodDecorator;
 declare function contentType(contentType: TypeResponseContentType): MethodDecorator;
 declare function body(...schemaLikes: SchemaLike[]): MethodDecorator;

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

@@ -1,4 +1,4 @@
-import type { SchemaLike } from '../../types/decorator.ts';
+import type { SchemaLike } from 'vona-module-a-openapiutils';
 declare function Param(): ParameterDecorator;
 declare function Param(...schemaLikes: SchemaLike[]): ParameterDecorator;
 declare function Param(property: string, ...schemaLikes: SchemaLike[]): ParameterDecorator;

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

@@ -1,2 +1,2 @@
-import type { SchemaLike } from '../../types/decorator.ts';
+import type { SchemaLike } from 'vona-module-a-openapiutils';
 export declare function Field(...schemaLikes: SchemaLike[]): PropertyDecorator;

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

@@ -1,2 +1,3 @@
-import type { RouteHandlerArgumentType, SchemaLike, TypeExtractValue } from '../../types/decorator.ts';
+import type { SchemaLike } from 'vona-module-a-openapiutils';
+import type { RouteHandlerArgumentType, TypeExtractValue } from '../../types/decorator.ts';
 export declare function createPipesArgumentDecorator(paramType: RouteHandlerArgumentType, extractValue?: TypeExtractValue): (field?: string | SchemaLike, ...schemaLikes: SchemaLike[]) => ParameterDecorator;

package/dist/lib/schema/makeSchemaLikes.d.ts

@@ -1,4 +1,4 @@
+import type { SchemaLike } from 'vona-module-a-openapiutils';
 import type { z } from 'zod';
-import type { SchemaLike } from '../../types/decorator.ts';
 export declare function makeSchemaLikes(schemaLikes: SchemaLike[], typeInit: any): z.ZodSchema;
 export declare function makeSchemaLike(schemaLike: SchemaLike | undefined, schemaPrevious: z.ZodSchema): z.ZodSchema;

package/dist/lib/schema/v/system.d.ts

@@ -1,5 +1,6 @@
 import type { Constructable } from 'vona';
-import type { ISchemaObjectOptions, SchemaLike } from '../../../types/decorator.ts';
+import type { SchemaLike } from 'vona-module-a-openapiutils';
+import type { ISchemaObjectOptions } from '../../../types/decorator.ts';
 import { z } from 'zod';
 export declare function schemaDefault<T>(defaultValue: T): (schema: z.ZodSchema) => z.ZodSchema;
 export declare function schemaOptional(): (schema: z.ZodSchema) => z.ZodSchema;

package/dist/lib/utils.d.ts

@@ -1,4 +1,4 @@
 import type { Constructable } from 'vona';
 export declare function getTargetDecoratorRules(target: object): Record<PropertyKey, unknown>;
 export declare function getTargetDecoratorRuleColumns(target: object): Record<PropertyKey, unknown>;
-export declare function mergeFieldsOpenAPIMetadata(target: Constructable): void;
+export declare function mergeFieldsOpenapiMetadata(target: Constructable): void;

package/dist/service/openapi.d.ts

@@ -1,9 +1,11 @@
 import type { Constructable } from 'vona';
-import type { IOpenAPIObject } from '../types/api.ts';
+import type { IOpenapiObject } from 'vona-module-a-openapiutils';
 import { BeanBase } from 'vona';
 export declare class ServiceOpenapi extends BeanBase {
-    generateJson<K extends keyof IOpenAPIObject>(version?: K): IOpenAPIObject[K];
-    generateJsonOfControllerAction<K extends keyof IOpenAPIObject>(controller: Constructable, actionKey: string, version?: K): IOpenAPIObject[K];
+    protected generateJsonCacheKey(args: any[], prop: string): string;
+    protected generateJsonOfControllerActionCacheKey(args: any[], prop: string): string;
+    generateJson<K extends keyof IOpenapiObject>(version?: K): Promise<IOpenapiObject[K]>;
+    generateJsonOfControllerAction<K extends keyof IOpenapiObject>(controller: Constructable, actionKey: string, version?: K): Promise<IOpenapiObject[K]>;
     private _translate;
     private _translateSchema;
     private _translateStrings;

package/dist/types/decorator.d.ts

@@ -1,9 +1,5 @@
 import type { Constructable, Type, VonaContext } from 'vona';
 import type { z } from 'zod';
-export declare const SymbolDecoratorRule: unique symbol;
-export declare const SymbolDecoratorRuleColumn: unique symbol;
-export type SchemaLikeCreate = (schema: any) => any;
-export type SchemaLike = SchemaLikeCreate | z.ZodSchema | Constructable;
 export interface ISchemaObjectOptions {
     passthrough?: boolean;
     strict?: boolean;

package/dist/types/index.d.ts

@@ -1,6 +1,5 @@
 import '@cabloy/zod-query';
 export * from './actions.ts';
-export * from './api.ts';
 export * from './behavior.ts';
 export * from './component.ts';
 export * from './database.ts';

package/dist/types/rest.d.ts

@@ -1,8 +1,8 @@
 import type { ZodOpenAPIMetadata } from '@asteasolutions/zod-to-openapi';
 import type { CurrencyOptions } from '@zhennann/currency';
+import type { IOpenApiOptions } from 'vona-module-a-openapiutils';
 import type { z, ZodTypeAny } from 'zod';
 import type { TypeResourceActionRowRecordRender } from './actions.ts';
-import type { IOpenApiOptions } from './api.ts';
 import type { IComponentRecord } from './component.ts';
 import 'openapi3-ts/oas30';
 import 'openapi3-ts/oas31';
@@ -28,9 +28,9 @@ 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 ZodTypeAny = ZodTypeAny> = Partial<ZodOpenAPIMetadata<z.input<T>>>;
+export type TypeOpenapiMetadata<T extends ZodTypeAny = ZodTypeAny> = Partial<ZodOpenAPIMetadata<z.input<T>>>;
 export type TypeEntityOptionsFields<T extends {}, More extends string | undefined = never> = {
-    [key in ((keyof T) | (More extends string ? More : never))]?: TypeOpenAPIMetadata | z.ZodSchema;
+    [key in ((keyof T) | (More extends string ? More : never))]?: TypeOpenapiMetadata | z.ZodSchema;
 };
 export type TypeControllerOptionsActions<T extends {}> = {
     [key in (keyof T)]?: IOpenApiOptions;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-openapi",
   "type": "module",
-  "version": "5.0.21",
+  "version": "5.0.24",
   "title": "a-openapi",
   "vonaModule": {
     "capabilities": {

package/dist/types/api.d.ts

@@ -1,39 +0,0 @@
-import type { OpenAPIObject as OpenAPIObject30, SchemaObject as SchemaObject30 } from 'openapi3-ts/oas30';
-import type { OpenAPIObject as OpenAPIObject31, SchemaObject as SchemaObject31 } from 'openapi3-ts/oas31';
-import type { VonaApplication } from 'vona';
-import type { z } from 'zod';
-import type { SchemaLikeCreate } from './decorator.ts';
-export declare const SymbolOpenApiOptions: unique symbol;
-export interface IOpenApiHeader {
-    name: string;
-    description?: string;
-}
-export interface IResponseHeaders {
-    [key: string]: string | string[];
-}
-export interface IOpenApiOptions {
-    public?: boolean;
-    description?: string;
-    summary?: string;
-    httpCode?: number;
-    contentType?: TypeResponseContentType;
-    bodySchema?: z.ZodSchema;
-    bodySchemaWrapper?: SchemaLikeCreate | false;
-    exclude?: boolean;
-    tags?: string[];
-    operationId?: string;
-    headers?: IOpenApiHeader[];
-    setHeaders?: IResponseHeaders;
-}
-export type TypeGenerateJsonScene = 'api' | 'rest';
-export type TypeOpenApiVersion = 'V30' | 'V31';
-export interface IOpenAPIObject {
-    V30: OpenAPIObject30;
-    V31: OpenAPIObject31;
-}
-export interface IOpenAPISchemaObject {
-    V30: SchemaObject30;
-    V31: SchemaObject31;
-}
-export type TypeSecuritySchemes = Record<string, ((this: VonaApplication) => object) | object>;
-export type TypeResponseContentType = 'application/json' | 'application/xml' | 'application/x-www-form-urlencoded' | 'multipart/form-data' | 'text/plain' | 'text/html' | 'application/octet-stream' | 'application/pdf' | 'image/png' | 'image/jpeg' | 'image/gif' | 'image/webp' | 'image/svg+xml' | 'image/bmp' | 'image/tiff' | 'image/vnd.microsoft.icon' | 'image/vnd.wap.wbmp' | 'image/x-icon' | 'image/x-jng' | 'image/x-ms-bmp' | 'image/x-portable-bitmap' | 'image/x-portable-graymap' | 'image/x-portable-pixmap' | 'image/x-xbitmap' | 'image/x-xpixmap' | 'image/x-xwindowdump' | 'image/bmp' | 'image/x-bmp' | 'image/x-xbitmap' | 'image/x-win-bitmap' | 'image/x-windows-bmp' | 'image/ms-bmp' | 'image/x-ms-bmp' | 'image/x-icon' | 'image/x-ico' | 'image/vnd.microsoft.icon' | 'image/ico' | 'image/icon' | 'text/css' | 'text/csv' | 'text/html' | 'text/javascript' | 'text/plain' | 'text/xml' | 'application/javascript' | 'application/ecmascript' | 'application/json' | 'application/ld+json' | 'application/manifest+json' | 'application/javascript' | 'application/x-javascript' | 'application/x-json' | 'application/x-ms-application';