vona-module-a-openapi 5.0.29 → 5.0.30

package/dist/index.js

@@ -381,6 +381,7 @@ let ServiceOpenapi = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     const argsMapIsolate = {};
     let isUpload;
     for (const argMeta of argsMeta) {
+      if (!argMeta) continue;
       if (!__ArgumentTypes.includes(argMeta.type)) continue;
       if (['fields', 'field', 'files', 'file'].includes(argMeta.type)) {
         isUpload = true;
@@ -628,7 +629,7 @@ function $locale(key) {
 }
 /** scope: end */
 
-function Field$1(...schemaLikes) {
+function Field(...schemaLikes) {
   return function (target, prop) {
     // rules
     const rules = getTargetDecoratorRules(target);
@@ -721,7 +722,7 @@ function setHeader(field, val) {
   };
 }
 const Api = {
-  field: Field$1,
+  field: Field,
   httpCode,
   contentType,
   body,
@@ -733,79 +734,6 @@ const Api = {
   setHeader
 };
 
-function createPipesArgumentDecorator(paramType, extractValue) {
-  return function (field, ...schemaLikes) {
-    return function (target, prop, index) {
-      // not inherit
-      const argsMeta = appMetadata.getOwnMetadataArray(false, SymbolRouteHandlersArgumentsMeta, target, prop);
-      const hasParamField = typeof field === 'string';
-      const paramField = hasParamField ? field : undefined;
-      const paramSchemaLikes = hasParamField ? schemaLikes : [field, ...schemaLikes].filter(item => !!item);
-      const paramtypes = appMetadata.getMetadata('design:paramtypes', target, prop);
-      let metaType;
-      if (paramType === 'file') {
-        metaType = z.string().openapi({
-          format: 'binary'
-        });
-      } else if (paramType === 'files') {
-        metaType = z.array(z.string().openapi({
-          format: 'binary'
-        }));
-      } else {
-        metaType = paramtypes[index];
-      }
-      const argSchema = makeSchemaLikes(paramSchemaLikes, metaType);
-      argsMeta.push({
-        index,
-        type: paramType,
-        field: paramField,
-        pipes: [argSchema],
-        schema: argSchema,
-        extractValue
-      });
-    };
-  };
-}
-
-function Param(property, ...schemaLikes) {
-  return createPipesArgumentDecorator('param')(property, ...schemaLikes);
-}
-function Query(property, ...schemaLikes) {
-  return createPipesArgumentDecorator('query')(property, ...schemaLikes);
-}
-function Body(property, ...schemaLikes) {
-  return createPipesArgumentDecorator('body')(property, ...schemaLikes);
-}
-function Headers(property, ...schemaLikes) {
-  return createPipesArgumentDecorator('headers')(property, ...schemaLikes);
-}
-function Fields(property, ...schemaLikes) {
-  return createPipesArgumentDecorator('fields')(property, ...schemaLikes);
-}
-function Field(property, ...schemaLikes) {
-  return createPipesArgumentDecorator('field')(property, ...schemaLikes);
-}
-function Files(property, ...schemaLikes) {
-  return createPipesArgumentDecorator('files')(property, ...schemaLikes);
-}
-function File(property, ...schemaLikes) {
-  return createPipesArgumentDecorator('file')(property, ...schemaLikes);
-}
-function User(...schemaLikes) {
-  return createPipesArgumentDecorator('user')(undefined, ...schemaLikes);
-}
-const Arg = {
-  param: Param,
-  query: Query,
-  body: Body,
-  headers: Headers,
-  fields: Fields,
-  field: Field,
-  files: Files,
-  file: File,
-  user: User
-};
-
 function schemaEmail(message) {
   return function (schema) {
     return schema.email(message);
@@ -908,7 +836,7 @@ function schemaArray(schemaLike, params) {
       val = coerceWithNil(val);
       if (isNil(val)) return val;
       if (typeof val !== 'string') return val;
-      if (isNil(params?.separator) && val[0] === '[') return JSON.parse(val);
+      if (val.startsWith('[') && val.endsWith(']')) return JSON.parse(val);
       return val.split(params?.separator ?? ',');
     }, z.array(makeSchemaLike(schemaLike ?? schema, z.any()), params)
     // z.array(makeSchemaLike(schemaLike, schema), params),
@@ -943,4 +871,4 @@ const OrderBusinessBase = 1000;
 const OrderUnknownBase = 10000;
 const OrderMaxBase = 100000;
 
-export { $locale, $schema, $schemaLazy, Api, Arg, Main, OrderBusinessBase, OrderCoreBase, OrderMaxBase, OrderUnknownBase, ScopeModuleAOpenapi, ServiceOpenapi, SummerCacheJson, SymbolRouteHandlersArgumentsMeta, SymbolRouteHandlersArgumentsValue, SymbolSchemaDynamicRefId, addSchemaDynamic, bodySchemaWrapperDefault, config, createPipesArgumentDecorator, errorsAdapter, getSchemaDynamic, getSchemasDynamic, getTargetDecoratorRuleColumns, getTargetDecoratorRules, locales, makeSchemaLike, makeSchemaLikes, mergeFieldsOpenapiMetadata, prepareClassType, schemaRefCustomAdapter, v };
+export { $locale, $schema, $schemaLazy, Api, Main, OrderBusinessBase, OrderCoreBase, OrderMaxBase, OrderUnknownBase, ScopeModuleAOpenapi, ServiceOpenapi, SummerCacheJson, SymbolRouteHandlersArgumentsMeta, SymbolRouteHandlersArgumentsValue, SymbolSchemaDynamicRefId, addSchemaDynamic, bodySchemaWrapperDefault, config, errorsAdapter, getSchemaDynamic, getSchemasDynamic, getTargetDecoratorRuleColumns, getTargetDecoratorRules, locales, makeSchemaLike, makeSchemaLikes, mergeFieldsOpenapiMetadata, prepareClassType, schemaRefCustomAdapter, v };

package/dist/lib/decorator/index.d.ts

@@ -1,3 +1 @@
 export * from './api.ts';
-export * from './arguments.ts';
-export * from './pipesArgument.ts';

package/dist/types/decorator.d.ts

@@ -8,7 +8,7 @@ export interface RouteHandlerArgumentMetaDecorator {
     index: number;
     type: RouteHandlerArgumentType;
     field?: string;
-    pipes: (Function | z.ZodSchema)[];
+    pipes: Function[];
     schema: z.ZodSchema;
     extractValue?: TypeExtractValue;
 }

package/dist/types/index.d.ts

@@ -4,4 +4,5 @@ export * from './behavior.ts';
 export * from './component.ts';
 export * from './database.ts';
 export * from './decorator.ts';
+export * from './query.ts';
 export * from './rest.ts';

package/dist/types/query.d.ts

@@ -0,0 +1,11 @@
+import type { IModelSelectParamsJoinType, ITableRecord, TypeOpsNormal } from 'vona-module-a-orm';
+export interface ISchemaObjectExtensionFieldQueryJoin {
+    type?: IModelSelectParamsJoinType;
+    table: keyof ITableRecord;
+    on: [string, string];
+}
+export interface ISchemaObjectExtensionFieldQuery {
+    join?: ISchemaObjectExtensionFieldQueryJoin;
+    originalName?: string;
+    op?: TypeOpsNormal;
+}

package/dist/types/rest.d.ts

@@ -4,6 +4,7 @@ import type { IOpenApiOptions } from 'vona-module-a-openapiutils';
 import type { z, ZodTypeAny } from 'zod';
 import type { TypeResourceActionRowRecordRender } from './actions.ts';
 import type { IComponentRecord } from './component.ts';
+import type { ISchemaObjectExtensionFieldQuery } from './query.ts';
 import 'openapi3-ts/oas30';
 import 'openapi3-ts/oas31';
 export interface ISchemaObjectExtensionFieldRest {
@@ -16,6 +17,7 @@ export interface ISchemaObjectExtensionFieldRest {
 }
 export interface ISchemaObjectExtensionField {
     rest?: ISchemaObjectExtensionFieldRest;
+    query?: ISchemaObjectExtensionFieldQuery;
 }
 declare module 'openapi3-ts/oas30' {
     interface SchemaObject extends ISchemaObjectExtensionField {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-openapi",
   "type": "module",
-  "version": "5.0.29",
+  "version": "5.0.30",
   "title": "a-openapi",
   "vonaModule": {
     "capabilities": {
@@ -35,7 +35,7 @@
   "dependencies": {
     "@asteasolutions/zod-to-openapi": "^7.3.0",
     "@cabloy/zod-errors-custom": "^1.0.13",
-    "@cabloy/zod-query": "^1.0.16",
+    "@cabloy/zod-query": "^1.0.17",
     "@zhennann/currency": "^2.0.0",
     "openapi3-ts": "^4.4.0",
     "zod": "^3.25.58"

package/dist/lib/decorator/arguments.d.ts

@@ -1,38 +0,0 @@
-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;
-declare function Query(): ParameterDecorator;
-declare function Query(...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Query(property: string, ...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Body(): ParameterDecorator;
-declare function Body(...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Body(property: string, ...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Headers(): ParameterDecorator;
-declare function Headers(...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Headers(property: string, ...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Fields(): ParameterDecorator;
-declare function Fields(...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Fields(property: string, ...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Field(): ParameterDecorator;
-declare function Field(...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Field(property: string, ...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Files(): ParameterDecorator;
-declare function Files(...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function Files(property: string, ...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function File(): ParameterDecorator;
-declare function File(...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function File(property: string, ...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function User(...schemaLikes: SchemaLike[]): ParameterDecorator;
-export declare const Arg: {
-    param: typeof Param;
-    query: typeof Query;
-    body: typeof Body;
-    headers: typeof Headers;
-    fields: typeof Fields;
-    field: typeof Field;
-    files: typeof Files;
-    file: typeof File;
-    user: typeof User;
-};
-export {};

package/dist/lib/decorator/pipesArgument.d.ts

@@ -1,3 +0,0 @@
-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;