fix: ZodType issues

Author: omermecitoglu

src/core/body.ts

@@ -4,10 +4,10 @@ import { resolveContent } from "./content";
 import { safeParse } from "./zod-error-handler";
 import type { ExampleObject } from "@omer-x/openapi-types/example";
 import type { RequestBodyObject } from "@omer-x/openapi-types/request-body";
-import type { ZodError, ZodType, ZodTypeDef } from "zod";
+import type { ZodError, ZodType } from "zod";
 
 export function resolveRequestBody<I, O>(
-  source?: ZodType<O, ZodTypeDef, I> | string,
+  source?: ZodType<O, I> | string,
   isFormData: boolean = false,
   customExample?: NoInfer<O>,
   customExamples?: Record<string, ExampleObject<NoInfer<O>>>,
@@ -23,7 +23,7 @@ export function resolveRequestBody<I, O>(
 export async function parseRequestBody<I, O>(
   request: FixedRequest<NoInfer<I>>,
   method: HttpMethod,
-  schema?: ZodType<O, ZodTypeDef, I> | string,
+  schema?: ZodType<O, I> | string,
   isFormData: boolean = false,
 ): Promise<O | null> {
   if (!schema || typeof schema === "string") return null;

src/core/content.ts

@@ -3,10 +3,10 @@ import createMediaType from "./createMediaType";
 import convertToOpenAPI from "./zod-to-openapi";
 import type { ExampleObject } from "@omer-x/openapi-types/example";
 import type { RequestBodyObject } from "@omer-x/openapi-types/request-body";
-import type { ZodType, ZodTypeDef } from "zod";
+import type { ZodType } from "zod";
 
 export function resolveContent<I, O>(
-  source?: ZodType<O, ZodTypeDef, I> | string,
+  source?: ZodType<O, I> | string,
   isArray: boolean = false,
   isFormData: boolean = false,
   customExample?: NoInfer<O>,

src/core/definer.ts

@@ -9,7 +9,7 @@ import { addBadRequest, bundleResponses } from "./responses";
 import parseSearchParams from "./search-params";
 import type { ExampleObject } from "@omer-x/openapi-types/example";
 import type { OperationObject } from "@omer-x/openapi-types/operation";
-import type { ZodIssue, ZodType, ZodTypeDef } from "zod";
+import type { ZodIssue, ZodType } from "zod";
 
 type ActionSource<PathParams, QueryParams, RequestBody> = {
   pathParams: PathParams,
@@ -27,7 +27,7 @@ type RouteWithoutBody = {
 
 type RouteWithBody<I, O> = {
   method: Exclude<HttpMethod, "GET" | "DELETE" | "HEAD">,
-  requestBody?: ZodType<O, ZodTypeDef, I> | string,
+  requestBody?: ZodType<O, I> | string,
   requestBodyExample?: NoInfer<O>,
   requestBodyExamples?: Record<string, ExampleObject<NoInfer<O>>>,
   hasFormData?: boolean,
@@ -50,8 +50,8 @@ type RouteOptions<
   summary: string,
   description: string,
   tags: string[],
-  pathParams?: ZodType<PathParamsOutput, ZodTypeDef, PathParamsInput>,
-  queryParams?: ZodType<QueryParamsOutput, ZodTypeDef, QueryParamsInput>,
+  pathParams?: ZodType<PathParamsOutput, PathParamsInput>,
+  queryParams?: ZodType<QueryParamsOutput, QueryParamsInput>,
   action: (
     source: ActionSource<PathParamsOutput, QueryParamsOutput, RequestBodyOutput>,
     request: Req

src/core/path-params.ts

@@ -1,7 +1,7 @@
 import { safeParse } from "./zod-error-handler";
-import type { ZodError, ZodType, ZodTypeDef } from "zod";
+import type { ZodError, ZodType } from "zod";
 
-export default function parsePathParams<I, O>(source?: I, schema?: ZodType<O, ZodTypeDef, I>) {
+export default function parsePathParams<I, O>(source?: I, schema?: ZodType<O, I>) {
   if (!schema) return null;
   if (!source) throw new Error("UNNECESSARY_PATH_PARAMS");
   try {

src/core/search-params.ts

@@ -1,8 +1,8 @@
 import { serializeArray } from "~/utils/array-serialization";
 import { safeParse } from "./zod-error-handler";
-import type { ZodError, ZodType, ZodTypeDef } from "zod";
+import type { ZodError, ZodType } from "zod";
 
-export default function parseSearchParams<I, O>(source: URLSearchParams, schema?: ZodType<O, ZodTypeDef, I>) {
+export default function parseSearchParams<I, O>(source: URLSearchParams, schema?: ZodType<O, I>) {
   if (!schema) return null;
   const sourceKeys = Array.from(new Set(source.keys()));
   const params = sourceKeys.reduce((collection, key) => {

src/types/response.ts

@@ -1,14 +1,14 @@
 import type { ExampleObject } from "@omer-x/openapi-types/example";
 import type { MediaTypeObject } from "@omer-x/openapi-types/media-type";
-import type { ZodType, ZodTypeDef } from "zod";
+import type { ZodType } from "zod";
 
 export type ResponseDefinition<O, I = O> = {
   description: string,
   isArray?: boolean,
   example?: NoInfer<O>,
   examples?: Record<string, ExampleObject<NoInfer<O>>>,
 } & ({
-  content?: ZodType<O, ZodTypeDef, I> | string,
+  content?: ZodType<O, I> | string,
   customContent?: never,
 } | {
   content?: never,