@efebia/fastify-zod-reply 1.4.2 → 1.5.0

package/lib/cjs/index.d.ts

@@ -1,4 +1,61 @@
-export type StatusCode<TCode> = {
+export type CodePayload<TReply, TCode extends number, TFallback = unknown> = TReply extends {
+    send(payload?: infer TMap): any;
+} ? TMap extends Record<TCode, infer T> ? T : TFallback : TFallback;
+export type ResponseParam<TReply, TCode extends number> = CodePayload<TReply, TCode> extends Record<PropertyKey, unknown> ? CodePayload<TReply, TCode> & Record<string, unknown> : CodePayload<TReply, TCode>;
+export type ValidateResponseParam<TThis, TCode extends number> = CodePayload<TThis, TCode, never> extends never ? string : CodePayload<TThis, TCode, never> extends {
+    message: infer M;
+} ? M & string : never;
+export type ErrorMethodParam<TThis, TCode extends number> = ValidateResponseParam<TThis, TCode> | ResponseParam<TThis, TCode>;
+export type ErrorCodePayload<TVal> = [TVal] extends [string] ? {
+    message: TVal;
+} : TVal;
+type DefaultArgs<TReply, TCode extends number, TParam> = CodePayload<TReply, TCode, never> extends never ? [val?: undefined] : [val: TParam];
+declare module "fastify" {
+    interface FastifyReply {
+        ok(...args: DefaultArgs<this, 200, ResponseParam<this, 200>>): CodePayload<this, 200, {
+            message: "ok";
+        }>;
+        ok(val: ResponseParam<this, 200>): CodePayload<this, 200>;
+        created(...args: DefaultArgs<this, 201, ResponseParam<this, 201>>): CodePayload<this, 201, {
+            message: "created";
+        }>;
+        created(val: ResponseParam<this, 201>): CodePayload<this, 201>;
+        accepted(...args: DefaultArgs<this, 202, ResponseParam<this, 202>>): CodePayload<this, 202, {
+            message: "accepted";
+        }>;
+        accepted(val: ResponseParam<this, 202>): CodePayload<this, 202>;
+        noContent(): CodePayload<this, 204, void>;
+        badRequest(...args: DefaultArgs<this, 400, ErrorMethodParam<this, 400>>): CodePayload<this, 400, {
+            message: "badRequest";
+        }>;
+        badRequest<TVal extends ErrorMethodParam<this, 400>>(val: TVal): ErrorCodePayload<TVal>;
+        unauthorized(...args: DefaultArgs<this, 401, ErrorMethodParam<this, 401>>): CodePayload<this, 401, {
+            message: "unauthorized";
+        }>;
+        unauthorized<TVal extends ErrorMethodParam<this, 401>>(val: TVal): ErrorCodePayload<TVal>;
+        forbidden(...args: DefaultArgs<this, 403, ErrorMethodParam<this, 403>>): CodePayload<this, 403, {
+            message: "forbidden";
+        }>;
+        forbidden<TVal extends ErrorMethodParam<this, 403>>(val: TVal): ErrorCodePayload<TVal>;
+        notFound(...args: DefaultArgs<this, 404, ErrorMethodParam<this, 404>>): CodePayload<this, 404, {
+            message: "notFound";
+        }>;
+        notFound<TVal extends ErrorMethodParam<this, 404>>(val: TVal): ErrorCodePayload<TVal>;
+        notAcceptable(...args: DefaultArgs<this, 406, ErrorMethodParam<this, 406>>): CodePayload<this, 406, {
+            message: "notAcceptable";
+        }>;
+        notAcceptable<TVal extends ErrorMethodParam<this, 406>>(val: TVal): ErrorCodePayload<TVal>;
+        conflict(...args: DefaultArgs<this, 409, ErrorMethodParam<this, 409>>): CodePayload<this, 409, {
+            message: "conflict";
+        }>;
+        conflict<TVal extends ErrorMethodParam<this, 409>>(val: TVal): ErrorCodePayload<TVal>;
+        internalServerError(...args: DefaultArgs<this, 500, ErrorMethodParam<this, 500>>): CodePayload<this, 500, {
+            message: "internalServerError";
+        }>;
+        internalServerError<TVal extends ErrorMethodParam<this, 500>>(val: TVal): ErrorCodePayload<TVal>;
+    }
+}
+export type StatusCode<TCode extends number> = {
     statusCode: TCode;
     payload: any;
 };
@@ -18,15 +75,8 @@ export interface FastifyStatusCode {
 export type FastifyReplyPluginOptions = {
     statusCodes?: {
         [key in keyof FastifyStatusCode]?: FastifyStatusCode[key];
-    };
-};
-export type DecoratedReply = {
-    [key in keyof FastifyStatusCode]: <T>(val?: T) => T;
+    } & Record<string, StatusCode<any>>;
 };
-declare module "fastify" {
-    interface FastifyReply extends DecoratedReply {
-    }
-}
 declare const _default: import("fastify").FastifyPluginCallback<FastifyReplyPluginOptions, import("fastify").RawServerDefault, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
 export default _default;
 export { buildHTTPErrorObject, FastifyZodReplyError } from "./error.js";

package/lib/cjs/index.js

@@ -33,10 +33,7 @@ const defaultOptions = {
         notFound: { statusCode: 404, payload: { message: "notFound" } },
         notAcceptable: { statusCode: 406, payload: { message: "notAcceptable" } },
         conflict: { statusCode: 409, payload: { message: "conflict" } },
-        internalServerError: {
-            statusCode: 500,
-            payload: { message: "internalServerError" },
-        },
+        internalServerError: { statusCode: 500, payload: { message: "internalServerError" } },
     },
 };
 exports.default = (0, fastify_plugin_1.default)(async (fastify, opts) => {

package/lib/cjs/routeHelpers.d.ts

@@ -15,3 +15,14 @@ export declare const strictifySchema: (schema: z.ZodType, strict: boolean) => an
 export declare const parseStrict: (tag: keyof Exclude<NonNullable<RouteV4Options["strict"]>, boolean>, value: NonNullable<RouteV4Options["strict"]>) => boolean;
 export declare const findStatusCode: (statusCode: number, availableStatusCodes: [string | number, any][]) => [string | number, any] | undefined;
 export declare const mapZodError: (zodError: z.ZodError, prefix: string) => string;
+export declare const buildZodJsonSchemaParams: (io: "input" | "output") => {
+    io: "input" | "output";
+    reused: "inline";
+    target: "draft-7";
+    unrepresentable: "any";
+    override(ctx: {
+        zodSchema: z.core.$ZodTypes;
+        jsonSchema: z.core.JSONSchema.BaseSchema;
+        path: (string | number)[];
+    }): void;
+};

package/lib/cjs/routeHelpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapZodError = exports.findStatusCode = exports.parseStrict = exports.strictifySchema = exports.parse = void 0;
+exports.buildZodJsonSchemaParams = exports.mapZodError = exports.findStatusCode = exports.parseStrict = exports.strictifySchema = exports.parse = void 0;
 const parse = async (schema, payload, tag) => {
     const result = await schema.safeParseAsync(payload);
     return Object.assign(Object.assign({}, result), { tag });
@@ -9,9 +9,7 @@ exports.parse = parse;
 const strictifySchema = (schema, strict) => {
     if (!strict)
         return schema;
-    return "strict" in schema && typeof schema["strict"] === "function"
-        ? schema.strict()
-        : schema;
+    return "strict" in schema && typeof schema["strict"] === "function" ? schema.strict() : schema;
 };
 exports.strictifySchema = strictifySchema;
 const parseStrict = (tag, value) => {
@@ -42,3 +40,18 @@ const mapZodError = (zodError, prefix) => {
         .join("\n");
 };
 exports.mapZodError = mapZodError;
+const buildZodJsonSchemaParams = (io) => {
+    return {
+        io,
+        reused: "inline",
+        target: "draft-7",
+        unrepresentable: "any",
+        override(ctx) {
+            const def = ctx.zodSchema._zod.def;
+            if (def.type === "date") {
+                ctx.jsonSchema.type = "string";
+            }
+        },
+    };
+};
+exports.buildZodJsonSchemaParams = buildZodJsonSchemaParams;

package/lib/cjs/routeV4.d.ts

@@ -14,11 +14,16 @@ export type BaseZodV4Schema = {
     Summary?: string;
     Notes?: string;
 };
+type ErrorReplyFallback<TReply> = {
+    [K in Exclude<400 | 401 | 403 | 404 | 406 | 409 | 500, keyof TReply>]?: {
+        message: string;
+    };
+};
 export type FastifyZodV4Schema<TZodSchema extends BaseZodV4Schema> = {
     Body: TZodSchema["Body"] extends z.ZodTypeAny ? z.output<TZodSchema["Body"]> : undefined;
     Params: TZodSchema["Params"] extends z.ZodTypeAny ? z.output<TZodSchema["Params"]> : undefined;
     Querystring: TZodSchema["Query"] extends z.ZodTypeAny ? z.output<TZodSchema["Query"]> : undefined;
-    Reply: TZodSchema["Reply"] extends z.ZodTypeAny ? z.input<TZodSchema["Reply"]>[keyof z.input<TZodSchema["Reply"]>] : undefined;
+    Reply: TZodSchema["Reply"] extends z.ZodTypeAny ? z.input<TZodSchema["Reply"]> & ErrorReplyFallback<z.input<TZodSchema["Reply"]>> : undefined;
 };
 export type RouteV4Options = {
     strict?: boolean | {
@@ -28,9 +33,10 @@ export type RouteV4Options = {
         headers: boolean;
     };
 };
-export declare const createRouteV4: <RequestAugmentation extends object = {}, ReplyAugmentation extends object = {}>({ strict: globalStrict }?: RouteV4Options) => <TSchema extends BaseZodV4Schema, FastifySchema extends FastifyZodV4Schema<TSchema> = FastifyZodV4Schema<TSchema>>(schema: TSchema, handler: NoInfer<APIHandler<FastifySchema, RequestAugmentation, ReplyAugmentation>>, options?: RouteV4Options) => APIOptions<FastifySchema> & {
+export declare const createRouteV4: <RequestAugmentation extends object = {}, ReplyAugmentation extends object = {}>({ strict: globalStrict, }?: RouteV4Options) => <TSchema extends BaseZodV4Schema, FastifySchema extends FastifyZodV4Schema<TSchema> = FastifyZodV4Schema<TSchema>>(schema: TSchema, handler: NoInfer<APIHandler<FastifySchema, RequestAugmentation, ReplyAugmentation>>, options?: RouteV4Options) => APIOptions<FastifySchema> & {
     handler: APIHandler<FastifySchema>;
 };
 export declare const routeV4: <TSchema extends BaseZodV4Schema, FastifySchema extends FastifyZodV4Schema<TSchema> = FastifyZodV4Schema<TSchema>>(schema: TSchema, handler: NoInfer<APIHandler<FastifySchema, {}, {}>>, options?: RouteV4Options) => APIOptions<FastifySchema> & {
     handler: APIHandler<FastifySchema>;
 };
+export {};

package/lib/cjs/routeV4.js

@@ -4,20 +4,17 @@ exports.routeV4 = exports.createRouteV4 = void 0;
 const v4_1 = require("zod/v4");
 const error_js_1 = require("./error.js");
 const routeHelpers_js_1 = require("./routeHelpers.js");
-const createRouteV4 = ({ strict: globalStrict = false } = {}) => (schema, handler, options) => {
+const createRouteV4 = ({ strict: globalStrict = false, } = {}) => (schema, handler, options) => {
     const strict = typeof (options === null || options === void 0 ? void 0 : options.strict) !== "undefined" ? options === null || options === void 0 ? void 0 : options.strict : globalStrict;
     const finalResult = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (schema.Body && {
-        body: v4_1.z.toJSONSchema((0, routeHelpers_js_1.strictifySchema)(schema.Body, (0, routeHelpers_js_1.parseStrict)("body", strict)), { reused: "inline", target: "draft-7", io: "input" }),
+        body: v4_1.z.toJSONSchema((0, routeHelpers_js_1.strictifySchema)(schema.Body, (0, routeHelpers_js_1.parseStrict)("body", strict)), (0, routeHelpers_js_1.buildZodJsonSchemaParams)('input')),
     })), (schema.Params && {
-        params: v4_1.z.toJSONSchema((0, routeHelpers_js_1.strictifySchema)(schema.Params, (0, routeHelpers_js_1.parseStrict)("params", strict)), { reused: "inline", target: "draft-7", io: "input" }),
+        params: v4_1.z.toJSONSchema((0, routeHelpers_js_1.strictifySchema)(schema.Params, (0, routeHelpers_js_1.parseStrict)("params", strict)), (0, routeHelpers_js_1.buildZodJsonSchemaParams)('input')),
     })), (schema.Query && {
-        querystring: v4_1.z.toJSONSchema((0, routeHelpers_js_1.strictifySchema)(schema.Query, (0, routeHelpers_js_1.parseStrict)("query", strict)), { reused: "inline", target: "draft-7", io: "input" }),
+        querystring: v4_1.z.toJSONSchema((0, routeHelpers_js_1.strictifySchema)(schema.Query, (0, routeHelpers_js_1.parseStrict)("query", strict)), (0, routeHelpers_js_1.buildZodJsonSchemaParams)('input')),
     })), (schema.Headers && {
-        headers: v4_1.z.toJSONSchema((0, routeHelpers_js_1.strictifySchema)(schema.Headers, (0, routeHelpers_js_1.parseStrict)("headers", strict)), { reused: "inline", target: "draft-7", io: "input" }),
-    })), { response: v4_1.z.toJSONSchema(schema.Reply.partial(), {
-            reused: "inline",
-            target: "draft-7",
-        })["properties"] }), (schema.Security && { security: schema.Security })), (schema.Tags && { tags: schema.Tags })), (schema.Description && { description: schema.Description })), (schema.Summary && { summary: schema.Summary })), (schema.Notes && { notes: schema.Notes }));
+        headers: v4_1.z.toJSONSchema((0, routeHelpers_js_1.strictifySchema)(schema.Headers, (0, routeHelpers_js_1.parseStrict)("headers", strict)), (0, routeHelpers_js_1.buildZodJsonSchemaParams)('input')),
+    })), { response: v4_1.z.toJSONSchema(schema.Reply.partial(), (0, routeHelpers_js_1.buildZodJsonSchemaParams)('output'))["properties"] }), (schema.Security && { security: schema.Security })), (schema.Tags && { tags: schema.Tags })), (schema.Description && { description: schema.Description })), (schema.Summary && { summary: schema.Summary })), (schema.Notes && { notes: schema.Notes }));
     return {
         schema: finalResult,
         handler,
@@ -25,12 +22,8 @@ const createRouteV4 = ({ strict: globalStrict = false } = {}) => (schema, handle
             var _a, _b, _c;
             const results = await Promise.all([
                 ...(schema.Body ? [(0, routeHelpers_js_1.parse)(schema.Body, request.body, "body")] : []),
-                ...(schema.Params
-                    ? [(0, routeHelpers_js_1.parse)(schema.Params, request.params, "params")]
-                    : []),
-                ...(schema.Query
-                    ? [(0, routeHelpers_js_1.parse)(schema.Query, request.query, "query")]
-                    : []),
+                ...(schema.Params ? [(0, routeHelpers_js_1.parse)(schema.Params, request.params, "params")] : []),
+                ...(schema.Query ? [(0, routeHelpers_js_1.parse)(schema.Query, request.query, "query")] : []),
             ]);
             for (const result of results) {
                 if (!result.success) {
@@ -42,12 +35,9 @@ const createRouteV4 = ({ strict: globalStrict = false } = {}) => (schema, handle
                     });
                 }
             }
-            request.body =
-                ((_a = results.find((r) => r.tag === "body")) === null || _a === void 0 ? void 0 : _a.data) || {};
-            request.params =
-                ((_b = results.find((r) => r.tag === "params")) === null || _b === void 0 ? void 0 : _b.data) || {};
-            request.query =
-                ((_c = results.find((r) => r.tag === "query")) === null || _c === void 0 ? void 0 : _c.data) || {};
+            request.body = ((_a = results.find((r) => r.tag === "body")) === null || _a === void 0 ? void 0 : _a.data) || {};
+            request.params = ((_b = results.find((r) => r.tag === "params")) === null || _b === void 0 ? void 0 : _b.data) || {};
+            request.query = ((_c = results.find((r) => r.tag === "query")) === null || _c === void 0 ? void 0 : _c.data) || {};
         },
         preSerialization: (request, reply, payload, done) => {
             const foundSchema = (0, routeHelpers_js_1.findStatusCode)(reply.statusCode, Object.entries(schema.Reply.shape));

package/lib/esm/index.d.ts

@@ -1,4 +1,61 @@
-export type StatusCode<TCode> = {
+export type CodePayload<TReply, TCode extends number, TFallback = unknown> = TReply extends {
+    send(payload?: infer TMap): any;
+} ? TMap extends Record<TCode, infer T> ? T : TFallback : TFallback;
+export type ResponseParam<TReply, TCode extends number> = CodePayload<TReply, TCode> extends Record<PropertyKey, unknown> ? CodePayload<TReply, TCode> & Record<string, unknown> : CodePayload<TReply, TCode>;
+export type ValidateResponseParam<TThis, TCode extends number> = CodePayload<TThis, TCode, never> extends never ? string : CodePayload<TThis, TCode, never> extends {
+    message: infer M;
+} ? M & string : never;
+export type ErrorMethodParam<TThis, TCode extends number> = ValidateResponseParam<TThis, TCode> | ResponseParam<TThis, TCode>;
+export type ErrorCodePayload<TVal> = [TVal] extends [string] ? {
+    message: TVal;
+} : TVal;
+type DefaultArgs<TReply, TCode extends number, TParam> = CodePayload<TReply, TCode, never> extends never ? [val?: undefined] : [val: TParam];
+declare module "fastify" {
+    interface FastifyReply {
+        ok(...args: DefaultArgs<this, 200, ResponseParam<this, 200>>): CodePayload<this, 200, {
+            message: "ok";
+        }>;
+        ok(val: ResponseParam<this, 200>): CodePayload<this, 200>;
+        created(...args: DefaultArgs<this, 201, ResponseParam<this, 201>>): CodePayload<this, 201, {
+            message: "created";
+        }>;
+        created(val: ResponseParam<this, 201>): CodePayload<this, 201>;
+        accepted(...args: DefaultArgs<this, 202, ResponseParam<this, 202>>): CodePayload<this, 202, {
+            message: "accepted";
+        }>;
+        accepted(val: ResponseParam<this, 202>): CodePayload<this, 202>;
+        noContent(): CodePayload<this, 204, void>;
+        badRequest(...args: DefaultArgs<this, 400, ErrorMethodParam<this, 400>>): CodePayload<this, 400, {
+            message: "badRequest";
+        }>;
+        badRequest<TVal extends ErrorMethodParam<this, 400>>(val: TVal): ErrorCodePayload<TVal>;
+        unauthorized(...args: DefaultArgs<this, 401, ErrorMethodParam<this, 401>>): CodePayload<this, 401, {
+            message: "unauthorized";
+        }>;
+        unauthorized<TVal extends ErrorMethodParam<this, 401>>(val: TVal): ErrorCodePayload<TVal>;
+        forbidden(...args: DefaultArgs<this, 403, ErrorMethodParam<this, 403>>): CodePayload<this, 403, {
+            message: "forbidden";
+        }>;
+        forbidden<TVal extends ErrorMethodParam<this, 403>>(val: TVal): ErrorCodePayload<TVal>;
+        notFound(...args: DefaultArgs<this, 404, ErrorMethodParam<this, 404>>): CodePayload<this, 404, {
+            message: "notFound";
+        }>;
+        notFound<TVal extends ErrorMethodParam<this, 404>>(val: TVal): ErrorCodePayload<TVal>;
+        notAcceptable(...args: DefaultArgs<this, 406, ErrorMethodParam<this, 406>>): CodePayload<this, 406, {
+            message: "notAcceptable";
+        }>;
+        notAcceptable<TVal extends ErrorMethodParam<this, 406>>(val: TVal): ErrorCodePayload<TVal>;
+        conflict(...args: DefaultArgs<this, 409, ErrorMethodParam<this, 409>>): CodePayload<this, 409, {
+            message: "conflict";
+        }>;
+        conflict<TVal extends ErrorMethodParam<this, 409>>(val: TVal): ErrorCodePayload<TVal>;
+        internalServerError(...args: DefaultArgs<this, 500, ErrorMethodParam<this, 500>>): CodePayload<this, 500, {
+            message: "internalServerError";
+        }>;
+        internalServerError<TVal extends ErrorMethodParam<this, 500>>(val: TVal): ErrorCodePayload<TVal>;
+    }
+}
+export type StatusCode<TCode extends number> = {
     statusCode: TCode;
     payload: any;
 };
@@ -18,15 +75,8 @@ export interface FastifyStatusCode {
 export type FastifyReplyPluginOptions = {
     statusCodes?: {
         [key in keyof FastifyStatusCode]?: FastifyStatusCode[key];
-    };
-};
-export type DecoratedReply = {
-    [key in keyof FastifyStatusCode]: <T>(val?: T) => T;
+    } & Record<string, StatusCode<any>>;
 };
-declare module "fastify" {
-    interface FastifyReply extends DecoratedReply {
-    }
-}
 declare const _default: import("fastify").FastifyPluginCallback<FastifyReplyPluginOptions, import("fastify").RawServerDefault, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
 export default _default;
 export { buildHTTPErrorObject, FastifyZodReplyError } from "./error.js";

package/lib/esm/index.js

@@ -13,10 +13,7 @@ const defaultOptions = {
         notFound: { statusCode: 404, payload: { message: "notFound" } },
         notAcceptable: { statusCode: 406, payload: { message: "notAcceptable" } },
         conflict: { statusCode: 409, payload: { message: "conflict" } },
-        internalServerError: {
-            statusCode: 500,
-            payload: { message: "internalServerError" },
-        },
+        internalServerError: { statusCode: 500, payload: { message: "internalServerError" } },
     },
 };
 export default fp(async (fastify, opts) => {

package/lib/esm/routeHelpers.d.ts

@@ -15,3 +15,14 @@ export declare const strictifySchema: (schema: z.ZodType, strict: boolean) => an
 export declare const parseStrict: (tag: keyof Exclude<NonNullable<RouteV4Options["strict"]>, boolean>, value: NonNullable<RouteV4Options["strict"]>) => boolean;
 export declare const findStatusCode: (statusCode: number, availableStatusCodes: [string | number, any][]) => [string | number, any] | undefined;
 export declare const mapZodError: (zodError: z.ZodError, prefix: string) => string;
+export declare const buildZodJsonSchemaParams: (io: "input" | "output") => {
+    io: "input" | "output";
+    reused: "inline";
+    target: "draft-7";
+    unrepresentable: "any";
+    override(ctx: {
+        zodSchema: z.core.$ZodTypes;
+        jsonSchema: z.core.JSONSchema.BaseSchema;
+        path: (string | number)[];
+    }): void;
+};

package/lib/esm/routeHelpers.js

@@ -5,9 +5,7 @@ export const parse = async (schema, payload, tag) => {
 export const strictifySchema = (schema, strict) => {
     if (!strict)
         return schema;
-    return "strict" in schema && typeof schema["strict"] === "function"
-        ? schema.strict()
-        : schema;
+    return "strict" in schema && typeof schema["strict"] === "function" ? schema.strict() : schema;
 };
 export const parseStrict = (tag, value) => {
     if (typeof value === "boolean")
@@ -34,3 +32,17 @@ export const mapZodError = (zodError, prefix) => {
     })
         .join("\n");
 };
+export const buildZodJsonSchemaParams = (io) => {
+    return {
+        io,
+        reused: "inline",
+        target: "draft-7",
+        unrepresentable: "any",
+        override(ctx) {
+            const def = ctx.zodSchema._zod.def;
+            if (def.type === "date") {
+                ctx.jsonSchema.type = "string";
+            }
+        },
+    };
+};

package/lib/esm/routeV4.d.ts

@@ -14,11 +14,16 @@ export type BaseZodV4Schema = {
     Summary?: string;
     Notes?: string;
 };
+type ErrorReplyFallback<TReply> = {
+    [K in Exclude<400 | 401 | 403 | 404 | 406 | 409 | 500, keyof TReply>]?: {
+        message: string;
+    };
+};
 export type FastifyZodV4Schema<TZodSchema extends BaseZodV4Schema> = {
     Body: TZodSchema["Body"] extends z.ZodTypeAny ? z.output<TZodSchema["Body"]> : undefined;
     Params: TZodSchema["Params"] extends z.ZodTypeAny ? z.output<TZodSchema["Params"]> : undefined;
     Querystring: TZodSchema["Query"] extends z.ZodTypeAny ? z.output<TZodSchema["Query"]> : undefined;
-    Reply: TZodSchema["Reply"] extends z.ZodTypeAny ? z.input<TZodSchema["Reply"]>[keyof z.input<TZodSchema["Reply"]>] : undefined;
+    Reply: TZodSchema["Reply"] extends z.ZodTypeAny ? z.input<TZodSchema["Reply"]> & ErrorReplyFallback<z.input<TZodSchema["Reply"]>> : undefined;
 };
 export type RouteV4Options = {
     strict?: boolean | {
@@ -28,9 +33,10 @@ export type RouteV4Options = {
         headers: boolean;
     };
 };
-export declare const createRouteV4: <RequestAugmentation extends object = {}, ReplyAugmentation extends object = {}>({ strict: globalStrict }?: RouteV4Options) => <TSchema extends BaseZodV4Schema, FastifySchema extends FastifyZodV4Schema<TSchema> = FastifyZodV4Schema<TSchema>>(schema: TSchema, handler: NoInfer<APIHandler<FastifySchema, RequestAugmentation, ReplyAugmentation>>, options?: RouteV4Options) => APIOptions<FastifySchema> & {
+export declare const createRouteV4: <RequestAugmentation extends object = {}, ReplyAugmentation extends object = {}>({ strict: globalStrict, }?: RouteV4Options) => <TSchema extends BaseZodV4Schema, FastifySchema extends FastifyZodV4Schema<TSchema> = FastifyZodV4Schema<TSchema>>(schema: TSchema, handler: NoInfer<APIHandler<FastifySchema, RequestAugmentation, ReplyAugmentation>>, options?: RouteV4Options) => APIOptions<FastifySchema> & {
     handler: APIHandler<FastifySchema>;
 };
 export declare const routeV4: <TSchema extends BaseZodV4Schema, FastifySchema extends FastifyZodV4Schema<TSchema> = FastifyZodV4Schema<TSchema>>(schema: TSchema, handler: NoInfer<APIHandler<FastifySchema, {}, {}>>, options?: RouteV4Options) => APIOptions<FastifySchema> & {
     handler: APIHandler<FastifySchema>;
 };
+export {};

package/lib/esm/routeV4.js

@@ -1,20 +1,17 @@
 import { z } from "zod/v4";
 import { FastifyZodReplyError } from "./error.js";
-import { findStatusCode, mapZodError, parse, parseStrict, strictifySchema, } from "./routeHelpers.js";
-export const createRouteV4 = ({ strict: globalStrict = false } = {}) => (schema, handler, options) => {
+import { buildZodJsonSchemaParams, findStatusCode, mapZodError, parse, parseStrict, strictifySchema } from "./routeHelpers.js";
+export const createRouteV4 = ({ strict: globalStrict = false, } = {}) => (schema, handler, options) => {
     const strict = typeof (options === null || options === void 0 ? void 0 : options.strict) !== "undefined" ? options === null || options === void 0 ? void 0 : options.strict : globalStrict;
     const finalResult = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (schema.Body && {
-        body: z.toJSONSchema(strictifySchema(schema.Body, parseStrict("body", strict)), { reused: "inline", target: "draft-7", io: "input" }),
+        body: z.toJSONSchema(strictifySchema(schema.Body, parseStrict("body", strict)), buildZodJsonSchemaParams('input')),
     })), (schema.Params && {
-        params: z.toJSONSchema(strictifySchema(schema.Params, parseStrict("params", strict)), { reused: "inline", target: "draft-7", io: "input" }),
+        params: z.toJSONSchema(strictifySchema(schema.Params, parseStrict("params", strict)), buildZodJsonSchemaParams('input')),
     })), (schema.Query && {
-        querystring: z.toJSONSchema(strictifySchema(schema.Query, parseStrict("query", strict)), { reused: "inline", target: "draft-7", io: "input" }),
+        querystring: z.toJSONSchema(strictifySchema(schema.Query, parseStrict("query", strict)), buildZodJsonSchemaParams('input')),
     })), (schema.Headers && {
-        headers: z.toJSONSchema(strictifySchema(schema.Headers, parseStrict("headers", strict)), { reused: "inline", target: "draft-7", io: "input" }),
-    })), { response: z.toJSONSchema(schema.Reply.partial(), {
-            reused: "inline",
-            target: "draft-7",
-        })["properties"] }), (schema.Security && { security: schema.Security })), (schema.Tags && { tags: schema.Tags })), (schema.Description && { description: schema.Description })), (schema.Summary && { summary: schema.Summary })), (schema.Notes && { notes: schema.Notes }));
+        headers: z.toJSONSchema(strictifySchema(schema.Headers, parseStrict("headers", strict)), buildZodJsonSchemaParams('input')),
+    })), { response: z.toJSONSchema(schema.Reply.partial(), buildZodJsonSchemaParams('output'))["properties"] }), (schema.Security && { security: schema.Security })), (schema.Tags && { tags: schema.Tags })), (schema.Description && { description: schema.Description })), (schema.Summary && { summary: schema.Summary })), (schema.Notes && { notes: schema.Notes }));
     return {
         schema: finalResult,
         handler,
@@ -22,12 +19,8 @@ export const createRouteV4 = ({ strict: globalStrict = false } = {}) => (schema,
             var _a, _b, _c;
             const results = await Promise.all([
                 ...(schema.Body ? [parse(schema.Body, request.body, "body")] : []),
-                ...(schema.Params
-                    ? [parse(schema.Params, request.params, "params")]
-                    : []),
-                ...(schema.Query
-                    ? [parse(schema.Query, request.query, "query")]
-                    : []),
+                ...(schema.Params ? [parse(schema.Params, request.params, "params")] : []),
+                ...(schema.Query ? [parse(schema.Query, request.query, "query")] : []),
             ]);
             for (const result of results) {
                 if (!result.success) {
@@ -39,12 +32,9 @@ export const createRouteV4 = ({ strict: globalStrict = false } = {}) => (schema,
                     });
                 }
             }
-            request.body =
-                ((_a = results.find((r) => r.tag === "body")) === null || _a === void 0 ? void 0 : _a.data) || {};
-            request.params =
-                ((_b = results.find((r) => r.tag === "params")) === null || _b === void 0 ? void 0 : _b.data) || {};
-            request.query =
-                ((_c = results.find((r) => r.tag === "query")) === null || _c === void 0 ? void 0 : _c.data) || {};
+            request.body = ((_a = results.find((r) => r.tag === "body")) === null || _a === void 0 ? void 0 : _a.data) || {};
+            request.params = ((_b = results.find((r) => r.tag === "params")) === null || _b === void 0 ? void 0 : _b.data) || {};
+            request.query = ((_c = results.find((r) => r.tag === "query")) === null || _c === void 0 ? void 0 : _c.data) || {};
         },
         preSerialization: (request, reply, payload, done) => {
             const foundSchema = findStatusCode(reply.statusCode, Object.entries(schema.Reply.shape));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@efebia/fastify-zod-reply",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "license": "MIT",
   "dependencies": {
     "fastify": "^5.3.0",
@@ -14,7 +14,8 @@
     "build:esm": "tsc -p ./tsconfig.build.json --module nodenext --moduleResolution nodenext --outDir lib/esm",
     "build:cjs": "tsc -p ./tsconfig.build.json --module commonjs --moduleResolution node --outDir lib/cjs",
     "build": "yarn build:esm && yarn build:cjs",
-    "test": "node --import tsx --test ./**/*.test.ts"
+    "test": "node --import tsx --test ./**/*.test.ts",
+    "test:only": "node --import tsx --test-only ./**/*.test.ts"
   },
   "main": "./lib/esm/index.js",
   "types": "./lib/esm/index.d.ts",