vona-module-a-openapi 5.0.20 → 5.0.22

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

@@ -1,20 +1,7 @@
-import type { BeanScopeUtil, TypeLocaleBase, TypeModuleConfig, TypeModuleLocales } from 'vona';
-import type { config } from '../config/config.ts';
-/** service: end */
 /** service: begin */
-/** service: end */
-/** service: begin */
-import type { ServiceOpenapi } from '../service/openapi.ts';
-/** main: end */
-/** scope: begin */
-import { BeanScopeBase } from 'vona';
-/** service: end */
-/** config: begin */
-import 'vona';
-import 'vona';
+export * from '../service/openapi.ts';
 import 'vona';
-export * from '../config/config.ts';
-declare module 'vona-module-a-web' {
+declare module 'vona-module-a-bean' {
     interface IServiceRecord {
         'a-openapi:openapi': never;
     }
@@ -23,17 +10,24 @@ declare module 'vona-module-a-openapi' {
     interface ServiceOpenapi {
     }
 }
+/** service: end */
+/** service: begin */
+import type { ServiceOpenapi } from '../service/openapi.ts';
 export interface IModuleService {
-    openapi: ServiceOpenapi;
+    'openapi': ServiceOpenapi;
 }
+/** service: end */
+/** service: begin */
+import 'vona';
 declare module 'vona' {
     interface IBeanRecordGeneral {
         'a-openapi.service.openapi': ServiceOpenapi;
     }
 }
-/** locale: end */
-/** main: begin */
-export * from '../main.ts';
+/** service: end */
+/** config: begin */
+export * from '../config/config.ts';
+import type { config } from '../config/config.ts';
 export declare const locales: {
     'en-us': {
         ZodError_invalid_input: string;
@@ -194,8 +188,12 @@ export declare const locales: {
         ZodError_types_set: string;
     };
 };
-/** service: begin */
-export * from '../service/openapi.ts';
+/** locale: end */
+/** main: begin */
+export * from '../main.ts';
+/** main: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig, type TypeModuleLocales, type TypeLocaleBase } from 'vona';
 export declare class ScopeModuleAOpenapi extends BeanScopeBase {
 }
 export interface ScopeModuleAOpenapi {
@@ -204,6 +202,7 @@ export interface ScopeModuleAOpenapi {
     locale: TypeModuleLocales<(typeof locales)[TypeLocaleBase]>;
     service: IModuleService;
 }
+import 'vona';
 declare module 'vona' {
     interface IBeanScopeRecord {
         'a-openapi': ScopeModuleAOpenapi;

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

@@ -1,68 +1,17 @@
-import { BeanSimple, appMetadata, appResource, cast, BeanInfo, BeanBase, LocaleModuleNameSeparator, HttpStatus, BeanScopeBase, isClassStrict, registerMappedClassMetadataKey, deepExtend } from 'vona';
-import { Scope } from 'vona-module-a-bean';
-import { locales as locales$1, setErrorMapDefault, setErrorMapSchema } from '@cabloy/zod-errors-custom';
+import { appMetadata, appResource, cast, BeanInfo, BeanBase, LocaleModuleNameSeparator, HttpStatus, BeanSimple, BeanScopeBase, isClassStrict, registerMappedClassMetadataKey, deepExtend } from 'vona';
 import { OpenApiGeneratorV3, OpenApiGeneratorV31, OpenAPIRegistry } from '@asteasolutions/zod-to-openapi';
 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 { SymbolDecoratorRule, SymbolOpenApiOptions, SymbolDecoratorRuleColumn } from 'vona-module-a-openapiutils';
+import { SymbolRequestMappingHandler } from 'vona-module-a-web';
 import { z } from 'zod';
+import { locales as locales$1, setErrorMapDefault, setErrorMapSchema } from '@cabloy/zod-errors-custom';
 import 'openapi3-ts/oas30';
 import 'openapi3-ts/oas31';
 
-var locale_en_us = locales$1['en-us'];
-
-var locale_zh_cn = locales$1['zh-cn'];
-
-function config(_app) {
-  return {
-    defaultVersion: 'V31',
-    generateDocument: {
-      V30: {
-        openapi: '3.0.0',
-        info: {
-          version: '5.0.0',
-          title: 'Vona',
-          description: 'Vona API'
-        }
-      },
-      V31: {
-        openapi: '3.1.0',
-        info: {
-          version: '5.0.0',
-          title: 'Vona',
-          description: 'Vona API'
-        }
-      }
-    },
-    securitySchemes: {
-      bearerAuth: {
-        type: 'http',
-        scheme: 'bearer',
-        bearerFormat: 'JWT'
-      }
-    }
-  };
-}
-
-function errorsAdapter(app) {
-  setErrorMapDefault((text, ...args) => {
-    return app.meta.text(text, ...args);
-  });
-  setErrorMapSchema((text, ...args) => {
-    return app.meta.text(text, ...args);
-  });
-}
-
-class Main extends BeanSimple {
-  async moduleLoading() {}
-  async moduleLoaded() {
-    errorsAdapter(this.app);
-  }
-  async configLoaded(_config) {}
-}
-
 function bodySchemaWrapperDefault(bodySchema) {
   return z.object({
     code: z.string(),
@@ -71,14 +20,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;
@@ -107,7 +48,8 @@ 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;
 const __ArgumentTypes = ['param', 'query', 'body', 'headers', 'fields', 'field', 'files', 'file'];
@@ -432,6 +374,58 @@ let ServiceOpenapi = (_dec$1 = Service(), _dec2$1 = BeanInfo({
   }
 }) || _class$1) || _class$1);
 
+function config(_app) {
+  return {
+    defaultVersion: 'V31',
+    generateDocument: {
+      V30: {
+        openapi: '3.0.0',
+        info: {
+          version: '5.0.0',
+          title: 'Vona',
+          description: 'Vona API'
+        }
+      },
+      V31: {
+        openapi: '3.1.0',
+        info: {
+          version: '5.0.0',
+          title: 'Vona',
+          description: 'Vona API'
+        }
+      }
+    },
+    securitySchemes: {
+      bearerAuth: {
+        type: 'http',
+        scheme: 'bearer',
+        bearerFormat: 'JWT'
+      }
+    }
+  };
+}
+
+var locale_en_us = locales$1['en-us'];
+
+var locale_zh_cn = locales$1['zh-cn'];
+
+function errorsAdapter(app) {
+  setErrorMapDefault((text, ...args) => {
+    return app.meta.text(text, ...args);
+  });
+  setErrorMapSchema((text, ...args) => {
+    return app.meta.text(text, ...args);
+  });
+}
+
+class Main extends BeanSimple {
+  async moduleLoading() {}
+  async moduleLoaded() {
+    errorsAdapter(this.app);
+  }
+  async configLoaded(_config) {}
+}
+
 var _dec, _dec2, _class;
 const locales = {
   'en-us': locale_en_us,
@@ -519,10 +513,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 +795,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, 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/service/openapi.d.ts

@@ -1,5 +1,5 @@
 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];

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';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-openapi",
   "type": "module",
-  "version": "5.0.20",
+  "version": "5.0.22",
   "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';