vona-module-a-openapi 5.0.19 → 5.0.21

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

@@ -1,19 +1,6 @@
-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' {
     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/index.js

@@ -1,6 +1,4 @@
-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';
@@ -8,61 +6,11 @@ import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 import { getTypeName, coerceWithNil } from '@cabloy/zod-query';
 import { Service, SymbolRequestMappingHandler } from 'vona-module-a-web';
 import { z } from 'zod';
+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';
 
-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(),
@@ -432,6 +380,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,

package/dist/types/rest.d.ts

@@ -30,7 +30,7 @@ export type TypeFieldRenderComponentProvider = (keyof IComponentRecord) | (keyof
 export type TypeSchemaScene = 'table' | 'form';
 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 Omit<T, '$table'>) | (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.19",
+  "version": "5.0.21",
   "title": "a-openapi",
   "vonaModule": {
     "capabilities": {