express-zod-safe 1.0.7 → 1.1.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { RequestHandler } from 'express';
-import { z } from 'zod';
+import { z, ZodTypeAny, ZodRawShape } from 'zod';
 /**
  * Generates a middleware function for Express.js that validates request params, query, and body.
  * This function uses Zod schemas to perform validation against the provided schema definitions.
@@ -38,12 +38,12 @@ import { z } from 'zod';
  *
  * app.listen(3000, () => console.log('Server running on port 3000'));
  */
-declare function validate<TParams extends Validation = {}, TQuery extends Validation = {}, TBody extends Validation = {}>(schemas: ValidationSchemas<TParams, TQuery, TBody>): RequestHandler<ZodOutput<TParams>, any, ZodOutput<TBody>, ZodOutput<TQuery>>;
+declare function validate<TParams extends Validation = {}, TQuery extends Validation = {}, TBody extends Validation = {}>(schemas: ExtendedValidationSchemas<TParams, TQuery, TBody>): RequestHandler<ZodOutput<TParams>, any, ZodOutput<TBody>, ZodOutput<TQuery>>;
 /**
  * Represents a generic type for route validation, which can be applied to params, query, or body.
  * Each key-value pair represents a field and its corresponding Zod validation schema.
  */
-type Validation = Record<string, z.ZodTypeAny>;
+type Validation = ZodTypeAny | ZodRawShape;
 /**
  * Defines the structure for the schemas provided to the validate middleware.
  * Each property corresponds to a different part of the request (params, query, body)
@@ -53,7 +53,7 @@ type Validation = Record<string, z.ZodTypeAny>;
  * @template TQuery - Type definition for query schema.
  * @template TBody - Type definition for body schema.
  */
-interface ValidationSchemas<TParams extends Validation, TQuery extends Validation, TBody extends Validation> {
+interface ExtendedValidationSchemas<TParams, TQuery, TBody> {
     params?: TParams;
     query?: TQuery;
     body?: TBody;
@@ -65,5 +65,5 @@ interface ValidationSchemas<TParams extends Validation, TQuery extends Validatio
  *
  * @template T - The validation type (params, query, or body).
  */
-type ZodOutput<T extends Validation> = z.ZodObject<T>['_output'];
+type ZodOutput<T extends Validation> = T extends ZodRawShape ? z.ZodObject<T>['_output'] : T['_output'];
 export = validate;

package/dist/index.js

@@ -1,6 +1,14 @@
 "use strict";
 const zod_1 = require("zod");
 const types = ['query', 'params', 'body'];
+/**
+ * A ZodSchema type guard.
+ * @param schema The Zod schema to check.
+ * @returns Whether the provided schema is a ZodSchema.
+ */
+function isZodSchema(schema) {
+    return schema && typeof schema.safeParse === 'function';
+}
 /**
  * Generates a middleware function for Express.js that validates request params, query, and body.
  * This function uses Zod schemas to perform validation against the provided schema definitions.
@@ -43,16 +51,15 @@ function validate(schemas) {
     var _a, _b, _c;
     // Create validation objects for each type
     const validation = {
-        params: zod_1.z.object((_a = schemas.params) !== null && _a !== void 0 ? _a : {}).strict(),
-        query: zod_1.z.object((_b = schemas.query) !== null && _b !== void 0 ? _b : {}).strict(),
-        body: zod_1.z.object((_c = schemas.body) !== null && _c !== void 0 ? _c : {}).strict()
+        params: isZodSchema(schemas.params) ? schemas.params : zod_1.z.object((_a = schemas.params) !== null && _a !== void 0 ? _a : {}).strict(),
+        query: isZodSchema(schemas.query) ? schemas.query : zod_1.z.object((_b = schemas.query) !== null && _b !== void 0 ? _b : {}).strict(),
+        body: isZodSchema(schemas.body) ? schemas.body : zod_1.z.object((_c = schemas.body) !== null && _c !== void 0 ? _c : {}).strict()
     };
     return (req, res, next) => {
         const errors = [];
         // Validate all types (params, query, body)
         for (const type of types) {
             const parsed = validation[type].safeParse(req[type]);
-            // @ts-expect-error This is fine
             if (parsed.success)
                 req[type] = parsed.data;
             else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-zod-safe",
-  "version": "1.0.7",
+  "version": "1.1.1",
   "description": "TypeScript-friendly middleware designed for Express applications, leveraging the robustness of Zod schemas to validate incoming request bodies, parameters, and queries.",
   "main": "dist/index.js",
   "repository": {