@efebia/fastify-zod-reply 1.2.2 → 1.3.0

package/lib/cjs/index.d.ts

@@ -30,6 +30,5 @@ declare module 'fastify' {
 declare const _default: import("fastify").FastifyPluginCallback<FastifyReplyPluginOptions, import("fastify").RawServerDefault, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
 export default _default;
 export * from './error.js';
-export * from './route.js';
 export * from './routeV4.js';
 export * from './types.js';

package/lib/cjs/index.js

@@ -25,7 +25,7 @@ const defaultOptions = {
         ok: { statusCode: 200, payload: { message: 'ok' } },
         created: { statusCode: 201, payload: { message: 'created' } },
         accepted: { statusCode: 202, payload: { message: 'accepted' } },
-        noContent: { statusCode: 204, payload: { message: 'noContent' } },
+        noContent: { statusCode: 204, payload: undefined },
         badRequest: { statusCode: 400, payload: { message: 'badRequest' } },
         unauthorized: { statusCode: 401, payload: { message: 'unauthorized' } },
         forbidden: { statusCode: 403, payload: { message: 'forbidden' } },
@@ -45,6 +45,5 @@ exports.default = (0, fastify_plugin_1.default)(async (fastify, opts) => {
     name: '@efebia/fastify-zod-reply'
 });
 __exportStar(require("./error.js"), exports);
-__exportStar(require("./route.js"), exports);
 __exportStar(require("./routeV4.js"), exports);
 __exportStar(require("./types.js"), exports);

package/lib/esm/index.d.ts

@@ -30,6 +30,5 @@ declare module 'fastify' {
 declare const _default: import("fastify").FastifyPluginCallback<FastifyReplyPluginOptions, import("fastify").RawServerDefault, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
 export default _default;
 export * from './error.js';
-export * from './route.js';
 export * from './routeV4.js';
 export * from './types.js';

package/lib/esm/index.js

@@ -6,7 +6,7 @@ const defaultOptions = {
         ok: { statusCode: 200, payload: { message: 'ok' } },
         created: { statusCode: 201, payload: { message: 'created' } },
         accepted: { statusCode: 202, payload: { message: 'accepted' } },
-        noContent: { statusCode: 204, payload: { message: 'noContent' } },
+        noContent: { statusCode: 204, payload: undefined },
         badRequest: { statusCode: 400, payload: { message: 'badRequest' } },
         unauthorized: { statusCode: 401, payload: { message: 'unauthorized' } },
         forbidden: { statusCode: 403, payload: { message: 'forbidden' } },
@@ -26,6 +26,5 @@ export default fp(async (fastify, opts) => {
     name: '@efebia/fastify-zod-reply'
 });
 export * from './error.js';
-export * from './route.js';
 export * from './routeV4.js';
 export * from './types.js';

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@efebia/fastify-zod-reply",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "license": "MIT",
   "dependencies": {
     "fastify": "^5.3.0",
     "fastify-plugin": "^5.0.1",
-    "zod": "^3.25.47",
-    "zod-to-json-schema": "^3.24.5"
+    "zod": "^4.1.8"
   },
   "files": [
     "/lib"

package/lib/cjs/route.d.ts

@@ -1,31 +0,0 @@
-import { z } from 'zod';
-import { APIHandler, APIOptions, RouteSecurity, RouteTag } from './types.js';
-export type BaseZodSchema = {
-    Body?: z.ZodTypeAny;
-    Params?: z.ZodTypeAny;
-    Query?: z.ZodTypeAny;
-    Headers?: z.ZodTypeAny;
-    Reply: z.AnyZodObject;
-    Security?: (RouteSecurity[keyof RouteSecurity])[];
-    Tags?: (keyof RouteTag)[];
-};
-export type FastifyZodSchema<TZodSchema extends BaseZodSchema> = {
-    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.infer<TZodSchema['Reply']>] : undefined;
-};
-export type RouteOptions = {
-    strict?: boolean | {
-        body: boolean;
-        query: boolean;
-        params: boolean;
-        headers: boolean;
-    };
-};
-export declare const createRoute: ({ strict: globalStrict }?: RouteOptions) => <TSchema extends BaseZodSchema, FastifySchema extends FastifyZodSchema<TSchema> = FastifyZodSchema<TSchema>>(schema: TSchema, handler: APIHandler<FastifySchema>, options?: RouteOptions) => APIOptions<FastifySchema> & {
-    handler: APIHandler<FastifySchema>;
-};
-export declare const route: <TSchema extends BaseZodSchema, FastifySchema extends FastifyZodSchema<TSchema> = FastifyZodSchema<TSchema>>(schema: TSchema, handler: APIHandler<FastifySchema>, options?: RouteOptions) => APIOptions<FastifySchema> & {
-    handler: APIHandler<FastifySchema>;
-};

package/lib/cjs/route.js

@@ -1,85 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.route = exports.createRoute = void 0;
-const zod_to_json_schema_1 = require("zod-to-json-schema");
-const error_js_1 = require("./error.js");
-const mapZodError = (zodError, prefix) => {
-    return zodError.issues.map(issue => {
-        const pathStr = `Error at ${prefix}->${issue.path.join('->')}`;
-        return issue.message ? `${pathStr}->${issue.message}` : pathStr;
-    }).join('\n');
-};
-const parse = async (schema, payload, tag) => {
-    const result = await schema.safeParseAsync(payload);
-    return Object.assign(Object.assign({}, result), { tag });
-};
-const findStatusCode = (statusCode, availableStatusCodes) => {
-    return availableStatusCodes.find(([key]) => {
-        if (!['number', 'string'].includes(typeof key))
-            return false;
-        if (typeof key === 'number')
-            return statusCode === key;
-        if (/^[0-9]{3}$/.test(key))
-            return statusCode === parseInt(key);
-        if (/^[0-9]xx$/i.test(key))
-            return statusCode.toString()[0] === key[0];
-    });
-};
-const strictifySchema = (schema, strict) => {
-    if (!strict)
-        return schema;
-    return 'strict' in schema && typeof schema['strict'] === 'function' ? schema.strict() : schema;
-};
-const parseStrict = (tag, value) => {
-    if (typeof value === 'boolean')
-        return value;
-    return value[tag];
-};
-const createRoute = ({ 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({}, (schema.Body && { body: (0, zod_to_json_schema_1.zodToJsonSchema)(strictifySchema(schema.Body, parseStrict('body', strict)), { $refStrategy: 'none', removeAdditionalStrategy: 'strict', allowedAdditionalProperties: undefined }) })), (schema.Params && { params: (0, zod_to_json_schema_1.zodToJsonSchema)(strictifySchema(schema.Params, parseStrict('params', strict)), { $refStrategy: 'none', removeAdditionalStrategy: 'strict', allowedAdditionalProperties: undefined }) })), (schema.Query && { querystring: (0, zod_to_json_schema_1.zodToJsonSchema)(strictifySchema(schema.Query, parseStrict('query', strict)), { $refStrategy: 'none', removeAdditionalStrategy: 'strict', allowedAdditionalProperties: undefined }) })), (schema.Headers && { headers: (0, zod_to_json_schema_1.zodToJsonSchema)(strictifySchema(schema.Headers, parseStrict('headers', strict)), { $refStrategy: 'none', removeAdditionalStrategy: 'strict', allowedAdditionalProperties: undefined }) })), { response: (0, zod_to_json_schema_1.zodToJsonSchema)(schema.Reply.partial(), {
-            $refStrategy: 'none',
-            strictUnions: true,
-        })['properties'] }), (schema.Security && { security: schema.Security })), (schema.Tags && { tags: schema.Tags }));
-    return {
-        schema: finalResult,
-        handler,
-        preHandler: async (request, reply) => {
-            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')] : []),
-            ]);
-            for (const result of results) {
-                if (!result.success) {
-                    return reply
-                        .code(400)
-                        .type('application/json')
-                        .send({
-                        message: mapZodError(result.error, result.tag),
-                    });
-                }
-            }
-            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));
-            if (!foundSchema) {
-                if (reply.statusCode >= 400)
-                    return done(null, payload);
-                request.log.warn(`[@efebia/fastify-zod-reply]: Reply schema of: ${request.routeOptions.url} does not have the specified status code: ${reply.statusCode}.`);
-                return done(new error_js_1.FastifyZodReplyError(`Reply schema of: ${request.routeOptions.url} does not have the specified status code: ${reply.statusCode}.`, 500));
-            }
-            const serialized = foundSchema[1].safeParse(payload);
-            if (serialized.success) {
-                return done(null, serialized.data);
-            }
-            return done(new error_js_1.FastifyZodReplyError(mapZodError(serialized.error, 'reply'), 500));
-        },
-    };
-};
-exports.createRoute = createRoute;
-exports.route = (0, exports.createRoute)({ strict: false });

package/lib/esm/route.d.ts

@@ -1,31 +0,0 @@
-import { z } from 'zod';
-import { APIHandler, APIOptions, RouteSecurity, RouteTag } from './types.js';
-export type BaseZodSchema = {
-    Body?: z.ZodTypeAny;
-    Params?: z.ZodTypeAny;
-    Query?: z.ZodTypeAny;
-    Headers?: z.ZodTypeAny;
-    Reply: z.AnyZodObject;
-    Security?: (RouteSecurity[keyof RouteSecurity])[];
-    Tags?: (keyof RouteTag)[];
-};
-export type FastifyZodSchema<TZodSchema extends BaseZodSchema> = {
-    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.infer<TZodSchema['Reply']>] : undefined;
-};
-export type RouteOptions = {
-    strict?: boolean | {
-        body: boolean;
-        query: boolean;
-        params: boolean;
-        headers: boolean;
-    };
-};
-export declare const createRoute: ({ strict: globalStrict }?: RouteOptions) => <TSchema extends BaseZodSchema, FastifySchema extends FastifyZodSchema<TSchema> = FastifyZodSchema<TSchema>>(schema: TSchema, handler: APIHandler<FastifySchema>, options?: RouteOptions) => APIOptions<FastifySchema> & {
-    handler: APIHandler<FastifySchema>;
-};
-export declare const route: <TSchema extends BaseZodSchema, FastifySchema extends FastifyZodSchema<TSchema> = FastifyZodSchema<TSchema>>(schema: TSchema, handler: APIHandler<FastifySchema>, options?: RouteOptions) => APIOptions<FastifySchema> & {
-    handler: APIHandler<FastifySchema>;
-};

package/lib/esm/route.js

@@ -1,81 +0,0 @@
-import { zodToJsonSchema } from 'zod-to-json-schema';
-import { FastifyZodReplyError } from './error.js';
-const mapZodError = (zodError, prefix) => {
-    return zodError.issues.map(issue => {
-        const pathStr = `Error at ${prefix}->${issue.path.join('->')}`;
-        return issue.message ? `${pathStr}->${issue.message}` : pathStr;
-    }).join('\n');
-};
-const parse = async (schema, payload, tag) => {
-    const result = await schema.safeParseAsync(payload);
-    return Object.assign(Object.assign({}, result), { tag });
-};
-const findStatusCode = (statusCode, availableStatusCodes) => {
-    return availableStatusCodes.find(([key]) => {
-        if (!['number', 'string'].includes(typeof key))
-            return false;
-        if (typeof key === 'number')
-            return statusCode === key;
-        if (/^[0-9]{3}$/.test(key))
-            return statusCode === parseInt(key);
-        if (/^[0-9]xx$/i.test(key))
-            return statusCode.toString()[0] === key[0];
-    });
-};
-const strictifySchema = (schema, strict) => {
-    if (!strict)
-        return schema;
-    return 'strict' in schema && typeof schema['strict'] === 'function' ? schema.strict() : schema;
-};
-const parseStrict = (tag, value) => {
-    if (typeof value === 'boolean')
-        return value;
-    return value[tag];
-};
-export const createRoute = ({ 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({}, (schema.Body && { body: zodToJsonSchema(strictifySchema(schema.Body, parseStrict('body', strict)), { $refStrategy: 'none', removeAdditionalStrategy: 'strict', allowedAdditionalProperties: undefined }) })), (schema.Params && { params: zodToJsonSchema(strictifySchema(schema.Params, parseStrict('params', strict)), { $refStrategy: 'none', removeAdditionalStrategy: 'strict', allowedAdditionalProperties: undefined }) })), (schema.Query && { querystring: zodToJsonSchema(strictifySchema(schema.Query, parseStrict('query', strict)), { $refStrategy: 'none', removeAdditionalStrategy: 'strict', allowedAdditionalProperties: undefined }) })), (schema.Headers && { headers: zodToJsonSchema(strictifySchema(schema.Headers, parseStrict('headers', strict)), { $refStrategy: 'none', removeAdditionalStrategy: 'strict', allowedAdditionalProperties: undefined }) })), { response: zodToJsonSchema(schema.Reply.partial(), {
-            $refStrategy: 'none',
-            strictUnions: true,
-        })['properties'] }), (schema.Security && { security: schema.Security })), (schema.Tags && { tags: schema.Tags }));
-    return {
-        schema: finalResult,
-        handler,
-        preHandler: async (request, reply) => {
-            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')] : []),
-            ]);
-            for (const result of results) {
-                if (!result.success) {
-                    return reply
-                        .code(400)
-                        .type('application/json')
-                        .send({
-                        message: mapZodError(result.error, result.tag),
-                    });
-                }
-            }
-            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));
-            if (!foundSchema) {
-                if (reply.statusCode >= 400)
-                    return done(null, payload);
-                request.log.warn(`[@efebia/fastify-zod-reply]: Reply schema of: ${request.routeOptions.url} does not have the specified status code: ${reply.statusCode}.`);
-                return done(new FastifyZodReplyError(`Reply schema of: ${request.routeOptions.url} does not have the specified status code: ${reply.statusCode}.`, 500));
-            }
-            const serialized = foundSchema[1].safeParse(payload);
-            if (serialized.success) {
-                return done(null, serialized.data);
-            }
-            return done(new FastifyZodReplyError(mapZodError(serialized.error, 'reply'), 500));
-        },
-    };
-};
-export const route = createRoute({ strict: false });