vona-module-a-openapi 5.0.47 → 5.0.48

package/dist/bean/bean.openapi.d.ts

@@ -4,4 +4,8 @@ import { BeanBase } from 'vona';
 export declare class BeanOpenapi extends BeanBase {
     generateJsonOfClass<K extends keyof IOpenapiObject>(schemaClass: Constructable, version?: K): Promise<IOpenapiObject[K]>;
     generateJsonOfClasses<K extends keyof IOpenapiObject>(schemaClasses: Constructable[], version?: K): Promise<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]>;
 }

package/dist/index.js

@@ -1,6 +1,7 @@
 import { registerMappedClassMetadataKey, appMetadata, appResource, cast, deepExtend, BeanInfo, BeanBase, LocaleModuleNameSeparator, BeanSimple, BeanScopeBase, useApp, beanFullNameFromOnionName } from 'vona';
 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';
 import { SymbolDecoratorRule, SymbolOpenApiOptions } from 'vona-module-a-openapiutils';
 import { z } from 'zod';
 import { isEmptyObject, isClass, isNil } from '@cabloy/utils';
@@ -9,12 +10,20 @@ import * as ModuleInfo from '@cabloy/module-info';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 import { translateError } from '@cabloy/zod-errors-custom';
 import { getInnerTypeName, coerceWithNil } from '@cabloy/zod-query';
-import { Caching } from 'vona-module-a-caching';
 import { SymbolRequestMappingHandler } from 'vona-module-a-web';
 import { SummerCache, BeanSummerCacheBase } from 'vona-module-a-summer';
 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 getTargetDecoratorRules(target, disableRegisterMetadata) {
   if (!disableRegisterMetadata) {
     registerMappedClassMetadataKey(target, SymbolDecoratorRule, {
@@ -175,10 +184,16 @@ function _createSchemaObject(rules, options) {
   return schema;
 }
 
-var _dec$3, _dec2$3, _class$3;
+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"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class BeanOpenapi extends BeanBase {
+}), _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 {
   // need not cache
   async generateJsonOfClass(schemaClass, version = 'V31') {
     return await this.generateJsonOfClasses([schemaClass], version);
@@ -202,39 +217,6 @@ let BeanOpenapi = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
     this.scope.service.openapi.translate(apiObj, 'rest');
     return apiObj;
   }
-}) || _class$3) || _class$3);
-
-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(),
-    message: z.string(),
-    data: bodySchema
-  });
-}
-
-const SymbolRouteHandlersArgumentsMeta = Symbol('SymbolRouteHandlersArgumentsMeta');
-const SymbolRouteHandlersArgumentsValue = Symbol('SymbolRouteHandlersArgumentsValue');
-
-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$2 = Service(), _dec2$2 = 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$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;
@@ -248,22 +230,40 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     return `${prop}_${beanFullName}_${actionKey}_${version ?? 'V31'}_${locale}`;
   }
   async generateJson(version = 'V31') {
-    const registry = this._collectRegistry();
+    const registry = this.scope.service.openapi.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');
+    this.scope.service.openapi.translate(apiObj, 'api');
     return apiObj;
   }
   async generateJsonOfControllerAction(controller, actionKey, version = 'V31') {
     const registry = new OpenAPIRegistry();
     const beanOptions = appResource.getBean(controller);
     if (!beanOptions) throw new Error('invalid controller');
-    this._collectController(registry, beanOptions.module, controller, actionKey);
+    this.scope.service.openapi.collectController(registry, beanOptions.module, controller, actionKey);
     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');
+    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);
+
+function bodySchemaWrapperDefault(bodySchema) {
+  return z.object({
+    code: z.string(),
+    message: z.string(),
+    data: bodySchema
+  });
+}
+
+const SymbolRouteHandlersArgumentsMeta = Symbol('SymbolRouteHandlersArgumentsMeta');
+const SymbolRouteHandlersArgumentsValue = Symbol('SymbolRouteHandlersArgumentsValue');
+
+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 {
   translate(apiObj, generateJsonScene) {
     // paths
     if (apiObj.paths) {
@@ -344,7 +344,7 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
       obj[key] = this.app.meta.text(obj[key]);
     }
   }
-  _collectRegistry() {
+  collectRegistry() {
     const registry = new OpenAPIRegistry();
     // securitySchemes
     const configSecuritySchemes = this.scope.config.securitySchemes;
@@ -367,11 +367,11 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     }
     // controller
     for (const controller of this.bean.onion.controller.getOnionsEnabled()) {
-      this._collectController(registry, controller.beanOptions.module, controller.beanOptions.beanClass);
+      this.collectController(registry, controller.beanOptions.module, controller.beanOptions.beanClass);
     }
     return registry;
   }
-  _collectController(registry, moduleName, controller, actionKey) {
+  collectController(registry, moduleName, controller, actionKey) {
     // info
     const info = ModuleInfo.parseInfo(moduleName);
     // controller options
@@ -587,7 +587,7 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = 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);
+}) || _class$2) || _class$2);
 
 var _dec$1, _dec2$1, _class$1;
 let SummerCacheJson = (_dec$1 = SummerCache({

package/dist/service/openapi.d.ts

@@ -1,20 +1,17 @@
 import type { OpenAPIObject as OpenAPIObject30 } from 'openapi3-ts/oas30';
 import type { OpenAPIObject as OpenAPIObject31 } from 'openapi3-ts/oas31';
 import type { Constructable } from 'vona';
-import type { IOpenapiObject, TypeGenerateJsonScene } from 'vona-module-a-openapiutils';
+import type { TypeGenerateJsonScene } from 'vona-module-a-openapiutils';
+import { OpenAPIRegistry } from '@cabloy/zod-to-openapi';
 import { BeanBase } from 'vona';
 export declare class ServiceOpenapi extends BeanBase {
-    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]>;
     translate(apiObj: OpenAPIObject30 | OpenAPIObject31, generateJsonScene: TypeGenerateJsonScene): void;
     private _translateSchema;
     private _translateErrorMessages;
     private _translateStrings;
     private _translateString;
-    private _collectRegistry;
-    private _collectController;
+    collectRegistry(): OpenAPIRegistry;
+    collectController(registry: OpenAPIRegistry, moduleName: string, controller: Constructable, actionKey?: string): void;
     private _registerControllerAction;
     private _collectRequest;
     private _collectResponses;

package/package.json

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