From da040769037255693b40b41bc3009bcd7a5507ab Mon Sep 17 00:00:00 2001 From: Alexander Galabov Date: Wed, 3 Apr 2024 16:17:33 +0300 Subject: [PATCH] change type definitions to account for transform and preprocess --- src/openapi-generator.ts | 5 ++--- src/openapi-registry.ts | 13 +++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/openapi-generator.ts b/src/openapi-generator.ts index e897935..ccc481a 100644 --- a/src/openapi-generator.ts +++ b/src/openapi-generator.ts @@ -17,6 +17,7 @@ import { OpenAPIDefinitions, ResponseConfig, RouteConfig, + RouteParameter, ZodContentObject, ZodRequestBody, } from './openapi-registry'; @@ -543,9 +544,7 @@ export class OpenAPIGenerator { ]; } - private cleanParameter( - schema: AnyZodObject | ZodEffects | undefined - ) { + private cleanParameter(schema: RouteParameter) { if (!schema) { return undefined; } diff --git a/src/openapi-registry.ts b/src/openapi-registry.ts index 9e40819..4e6e6e8 100644 --- a/src/openapi-registry.ts +++ b/src/openapi-registry.ts @@ -102,15 +102,20 @@ export interface ResponseConfig { content?: ZodContentObject; } +export type RouteParameter = + | AnyZodObject + | ZodEffects + | undefined; + export type RouteConfig = Omit & { method: Method; path: string; request?: { body?: ZodRequestBody; - params?: AnyZodObject | ZodEffects; - query?: AnyZodObject | ZodEffects; - cookies?: AnyZodObject | ZodEffects; - headers?: AnyZodObject | ZodEffects | ZodType[]; + params?: RouteParameter; + query?: RouteParameter; + cookies?: RouteParameter; + headers?: RouteParameter | ZodType[]; }; responses: { [statusCode: string]: ResponseConfig;