vona-module-a-openapi 5.0.31 → 5.0.32

package/dist/index.js

@@ -6,7 +6,7 @@ import { getInnerTypeName, coerceWithNil } from '@cabloy/zod-query';
 import { OpenApiGeneratorV3, OpenApiGeneratorV31, OpenAPIRegistry } from '@cabloy/zod-to-openapi';
 import { Service, Scope } from 'vona-module-a-bean';
 import { Caching } from 'vona-module-a-caching';
-import { SymbolDecoratorRule, SymbolDecoratorRuleColumn, SymbolOpenApiOptions } from 'vona-module-a-openapiutils';
+import { SymbolDecoratorRule, SymbolOpenApiOptions } from 'vona-module-a-openapiutils';
 import { SymbolRequestMappingHandler } from 'vona-module-a-web';
 import { z } from 'zod';
 import { ZodMetadata } from '@cabloy/zod-openapi';
@@ -31,17 +31,27 @@ function bodySchemaWrapperDefault(bodySchema) {
   });
 }
 
-function getTargetDecoratorRules(target) {
-  registerMappedClassMetadataKey(target, SymbolDecoratorRule, {
-    partialClass: meta => {
-      return meta.optional();
-    }
-  });
+function getTargetDecoratorRules(target, disableRegisterMetadata) {
+  if (!disableRegisterMetadata) {
+    registerMappedClassMetadataKey(target, SymbolDecoratorRule, {
+      partialClass: meta => {
+        return meta.optional();
+      }
+    });
+  }
   return appMetadata.getOwnMetadataMap(true, SymbolDecoratorRule, target);
 }
 function getTargetDecoratorRuleColumns(target) {
-  registerMappedClassMetadataKey(target, SymbolDecoratorRuleColumn);
-  return appMetadata.getOwnMetadataMap(true, SymbolDecoratorRuleColumn, target);
+  const rules = getTargetDecoratorRules(target, true);
+  return Object.keys(rules);
+}
+function getTargetDecoratorRuleColumnsMap(target) {
+  const columns = getTargetDecoratorRuleColumns(target);
+  const map = {};
+  for (const column of columns) {
+    map[column] = column;
+  }
+  return map;
 }
 function mergeFieldsOpenapiMetadata(target) {
   // rules
@@ -623,9 +633,6 @@ function Field(...schemaLikes) {
     // rule
     const metaType = appMetadata.getDesignType(target, prop);
     rules[prop] = makeSchemaLikes(schemaLikes, metaType);
-    //
-    const columns = getTargetDecoratorRuleColumns(target);
-    columns[prop] = prop;
   };
 }
 
@@ -962,4 +969,4 @@ const OrderBusinessBase = 1000;
 const OrderUnknownBase = 10000;
 const OrderMaxBase = 100000;
 
-export { $schema, $schemaLazy, Api, Main, OrderBusinessBase, OrderCoreBase, OrderMaxBase, OrderUnknownBase, ScopeModuleAOpenapi, ServiceOpenapi, SummerCacheJson, SymbolRouteHandlersArgumentsMeta, SymbolRouteHandlersArgumentsValue, SymbolSchemaDynamicRefId, addSchemaDynamic, bodySchemaWrapperDefault, config, getSchemaDynamic, getSchemasDynamic, getTargetDecoratorRuleColumns, getTargetDecoratorRules, makeSchemaLike, makeSchemaLikes, mergeFieldsOpenapiMetadata, prepareClassType, schemaRefCustomAdapter, v };
+export { $schema, $schemaLazy, Api, Main, OrderBusinessBase, OrderCoreBase, OrderMaxBase, OrderUnknownBase, ScopeModuleAOpenapi, ServiceOpenapi, SummerCacheJson, SymbolRouteHandlersArgumentsMeta, SymbolRouteHandlersArgumentsValue, SymbolSchemaDynamicRefId, addSchemaDynamic, bodySchemaWrapperDefault, config, getSchemaDynamic, getSchemasDynamic, getTargetDecoratorRuleColumns, getTargetDecoratorRuleColumnsMap, getTargetDecoratorRules, makeSchemaLike, makeSchemaLikes, mergeFieldsOpenapiMetadata, prepareClassType, schemaRefCustomAdapter, v };

package/dist/lib/utils.d.ts

@@ -1,6 +1,7 @@
 import type { Constructable } from 'vona';
 import type { TypeDecoratorRules } from 'vona-module-a-openapiutils';
-export declare function getTargetDecoratorRules(target: object): TypeDecoratorRules;
-export declare function getTargetDecoratorRuleColumns(target: object): Record<PropertyKey, unknown>;
+export declare function getTargetDecoratorRules(target: object, disableRegisterMetadata?: boolean): TypeDecoratorRules;
+export declare function getTargetDecoratorRuleColumns(target: object): string[];
+export declare function getTargetDecoratorRuleColumnsMap(target: object): Record<string, string>;
 export declare function mergeFieldsOpenapiMetadata(target: Constructable): void;
 export declare function prepareClassType<T>(classType: (() => Constructable<T>) | Constructable<T>): Constructable<T>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-openapi",
   "type": "module",
-  "version": "5.0.31",
+  "version": "5.0.32",
   "title": "a-openapi",
   "vonaModule": {
     "capabilities": {
@@ -35,7 +35,7 @@
     "static"
   ],
   "dependencies": {
-    "@cabloy/zod-errors-custom": "^2.0.1",
+    "@cabloy/zod-errors-custom": "^2.0.2",
     "@cabloy/zod-openapi": "^1.0.1",
     "@cabloy/zod-query": "^2.0.1",
     "@cabloy/zod-to-openapi": "^8.1.1",