vona-module-a-openapi 5.0.27 → 5.0.29

package/dist/index.js

@@ -1,4 +1,4 @@
-import { registerMappedClassMetadataKey, appMetadata, appResource, cast, deepExtend, BeanInfo, BeanBase, LocaleModuleNameSeparator, HttpStatus, BeanSimple, BeanScopeBase } from 'vona';
+import { registerMappedClassMetadataKey, appMetadata, appResource, cast, deepExtend, BeanInfo, BeanBase, LocaleModuleNameSeparator, HttpStatus, BeanSimple, BeanScopeBase, useApp } from 'vona';
 import { OpenApiGeneratorV3, OpenApiGeneratorV31, OpenAPIRegistry } from '@asteasolutions/zod-to-openapi';
 import * as ModuleInfo from '@cabloy/module-info';
 import { isClass, isEmptyObject, isNil } from '@cabloy/utils';
@@ -200,6 +200,30 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     this._translate(apiObj, 'rest');
     return apiObj;
   }
+
+  // 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();
+    // schema: independent
+    let counter = 0;
+    for (const schemaClass of schemaClasses) {
+      const schema = $schema(schemaClass);
+      let beanFullName = appResource.getBeanFullName(schemaClass);
+      if (!beanFullName) {
+        beanFullName = `${schemaClass.name}_${counter++}`;
+      }
+      registry.register(beanFullName, schema);
+    }
+    const generator = version === 'V30' ? new OpenApiGeneratorV3(registry.definitions) : new OpenApiGeneratorV31(registry.definitions);
+    const apiObj = generator.generateDocument(this.scope.config.generateDocument[version]);
+    this._translate(apiObj, 'rest');
+    return apiObj;
+  }
   _translate(apiObj, generateJsonScene) {
     // paths
     if (apiObj.paths) {
@@ -813,8 +837,16 @@ function schemaMax(max, message) {
   };
 }
 function schemaTableIdentity() {
+  const app = useApp();
+  const ormConfig = app.util.getModuleConfigRaw('a-orm');
+  const _identityType = ormConfig?.table.identityType ?? 'string';
   return function (_schema) {
-    return z.union([z.string(), z.number()]);
+    if (_identityType === 'string') {
+      return z.string();
+    } else if (_identityType === 'number') {
+      return z.number();
+    }
+    throw new Error('not support');
   };
 }
 function schemaBigNumber() {

package/dist/service/openapi.d.ts

@@ -6,6 +6,8 @@ export declare class ServiceOpenapi extends BeanBase {
     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]>;
+    generateJsonOfClass<K extends keyof IOpenapiObject>(schemaClass: Constructable, version?: K): Promise<IOpenapiObject[K]>;
+    generateJsonOfClasses<K extends keyof IOpenapiObject>(schemaClasses: Constructable[], version?: K): Promise<IOpenapiObject[K]>;
     private _translate;
     private _translateSchema;
     private _translateStrings;

package/package.json

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