@tahminator/sapling 2.0.5-beta.662f05c0 → 2.0.5-beta.75e5e346

package/dist/index.cjs

@@ -258,6 +258,7 @@ var ParserError = class ParserError extends ResponseStatusError {
 				case "reqbody": return "request body";
 				case "reqparams": return "request params";
 				case "reqquery": return "request query";
+				case "resbody": return "response body";
 			}
 		})()}: ${formatted}`;
 	}
@@ -381,134 +382,20 @@ var Sapling = class Sapling {
 	static setSwaggerPath(path) {
 		_settings.doc.swaggerPath = path;
 	}
-};
-//#endregion
-//#region src/annotation/request.ts
-const _requestSchemaStore = /* @__PURE__ */ new WeakMap();
-/**
-* Apply to a route method to have `request.body` be parsed by `schema`.
-*
-* This annotation will parse `request.body` & then override `request.body`.
-* You can then just simply cast `request.body` for your use
-*
-* @example
-* ```ts
-*  const CREATE_BOOK_REQUEST_BODY_SCHEMA = z.object({
-*    name: z.string(),
-*    description: z.string().optional(),
-*  });
-*
-* ⠀@Controller({ prefix: "/api/book" })
-*  class BookController {
-*   ⠀@RequestBody(CREATE_BOOK_REQUEST_BODY_SCHEMA)
-*   ⠀@POST()
-*    public createBook(request: e.Request) {
-*      const { name, description } = request.body as unknown as z.infer<
-*        typeof CREATE_BOOK_REQUEST_BODY_SCHEMA
-*      >;
-*    }
-*  }
-* ```
-*/
-function RequestBody(schema) {
-	return (target, propertyKey) => {
-		const ctor = target.constructor;
-		const fnName = String(propertyKey);
-		_setOnce(_getOrCreateRequestSchemaDefinition(ctor, fnName), "body", schema, fnName);
-	};
-}
-/**
-* Apply to a route method to have `request.param` be parsed by `schema`.
-*
-* This annotation will parse `request.param` & then override `request.param`.
-* You can then just simply cast `request.param` for your use
-*
-* @example
-* ```ts
-*  const GET_BOOK_REQUEST_PARAM_SCHEMA = z.object({
-*    bookId: z.string(),
-*  });
-*
-* ⠀@Controller({ prefix: "/api/book" })
-*  class BookController {
-*   ⠀@RequestParam(GET_BOOK_REQUEST_PARAM_SCHEMA)
-*   ⠀@GET("/:bookId")
-*    public getBook(request: e.Request) {
-*      const { bookId } = request.param as unknown as z.infer<
-*        typeof GET_BOOK_REQUEST_PARAM_SCHEMA
-*      >;
-*    }
-*  }
-* ```
-*/
-function RequestParam(schema) {
-	return (target, propertyKey) => {
-		const ctor = target.constructor;
-		const fnName = String(propertyKey);
-		_setOnce(_getOrCreateRequestSchemaDefinition(ctor, fnName), "param", schema, fnName);
-	};
-}
-/**
-* Apply to a route method to have `request.query` be parsed by `schema`.
-*
-* This annotation will parse `request.query` & then override `request.query`.
-* You can then just simply cast `request.query` for your use
-*
-* @example
-* ```ts
-*  const LIST_BOOKS_REQUEST_QUERY_SCHEMA = z.object({
-*    sort: z.enum(["name", "createdAt"]).optional(),
-*    q: z.string().optional(),
-*  });
-*
-* ⠀@Controller({ prefix: "/api/book" })
-*  class BookController {
-*   ⠀@RequestQuery(LIST_BOOKS_REQUEST_QUERY_SCHEMA)
-*   ⠀@GET()
-*    public listBooks(request: e.Request) {
-*      const { sort, q } = request.query as unknown as z.infer<
-*        typeof LIST_BOOKS_REQUEST_QUERY_SCHEMA
-*      >;
-*    }
-*  }
-* ```
-*/
-function RequestQuery(schema) {
-	return (target, propertyKey) => {
-		const ctor = target.constructor;
-		const fnName = String(propertyKey);
-		_setOnce(_getOrCreateRequestSchemaDefinition(ctor, fnName), "query", schema, fnName);
-	};
-}
-function _getOrCreateRequestSchemaDefinition(ctor, fnName) {
-	const byFn = (() => {
-		const fn = _requestSchemaStore.get(ctor);
-		if (fn) return fn;
-		const newFn = /* @__PURE__ */ new Map();
-		_requestSchemaStore.set(ctor, newFn);
-		return newFn;
-	})();
-	const existing = byFn.get(fnName);
-	if (existing) return existing;
-	const created = {};
-	byFn.set(fnName, created);
-	return created;
-}
-function _setOnce(def, key, schema, fnName) {
-	if (def[key]) throw new Error(`Duplicate request schema for "${String(key)}" on method "${fnName}"`);
-	def[key] = schema;
-}
-function _getRequestSchemas(ctor, fnName) {
-	return _requestSchemaStore.get(ctor)?.get(fnName);
-}
-async function _parseOrThrow(schema, input, kind) {
-	const result = await schema["~standard"].validate(input);
-	if (result.issues) {
-		console.debug(`Failed to parse a schema`);
-		throw new ParserError(kind, result.issues, schema["~standard"].vendor);
+	static chainHandlers(handlers, request, response, next, index = 0) {
+		if (index >= handlers.length) {
+			next();
+			return;
+		}
+		handlers[index]?.(request, response, (err) => {
+			if (err) {
+				next(err);
+				return;
+			}
+			Sapling.chainHandlers(handlers, request, response, next, index + 1);
+		});
 	}
-	return result.value;
-}
+};
 //#endregion
 //#region src/annotation/route.ts
 const _routeStore = /* @__PURE__ */ new WeakMap();
@@ -591,6 +478,42 @@ function _getRoutes(ctor) {
 	return _routeStore.get(ctor) ?? [];
 }
 //#endregion
+//#region src/utils.ts
+function _getOrCreateMap(store, ctor) {
+	const existing = store.get(ctor);
+	if (existing) return existing;
+	const created = /* @__PURE__ */ new Map();
+	store.set(ctor, created);
+	return created;
+}
+//#endregion
+//#region src/annotation/schema.ts
+const _routeSchemaStore = /* @__PURE__ */ new WeakMap();
+const _controllerSchemaStore = /* @__PURE__ */ new WeakMap();
+function ControllerSchema(options) {
+	return (target) => {
+		_setControllerSchema(target, options);
+	};
+}
+function RouteSchema(options) {
+	return (target, propertyKey) => {
+		const ctor = target.constructor;
+		_setRouteSchema(ctor, String(propertyKey), options);
+	};
+}
+function _setRouteSchema(ctor, fnName, options) {
+	_getOrCreateMap(_routeSchemaStore, ctor).set(fnName, options);
+}
+function _setControllerSchema(ctor, options) {
+	_controllerSchemaStore.set(ctor, options);
+}
+function _getRouteSchema(ctor, fnName) {
+	return _routeSchemaStore.get(ctor)?.get(fnName);
+}
+function _getControllerSchema(ctor) {
+	return _controllerSchemaStore.get(ctor);
+}
+//#endregion
 //#region src/helper/openapi.ts
 var OpenAPIGenerator = class {
 	constructor() {
@@ -612,42 +535,79 @@ var OpenAPIGenerator = class {
 	generateSpec() {
 		const config = this.config;
 		const paths = {};
+		const tags = [];
 		for (const { class: controllerClass, prefix } of this.controllers) {
 			const routes = _getRoutes(controllerClass);
+			const controllerSchema = _getControllerSchema(controllerClass);
+			if (controllerSchema?.title) tags.push({
+				name: controllerSchema.title,
+				description: controllerSchema.description
+			});
 			for (const route of routes) {
 				if (route.method === "USE") continue;
-				const schemas = _getRequestSchemas(controllerClass, route.fnName);
-				const fullPath = route.path instanceof RegExp ? route.path.source : prefix + route.path;
-				const openApiPath = typeof fullPath === "string" ? fullPath.replace(/:(\w+)/g, "{$1}") : fullPath;
+				const schemas = _getValidatorSchema(controllerClass, route.fnName);
+				const routeSchema = _getRouteSchema(controllerClass, route.fnName);
+				if (route.path instanceof RegExp) throw new Error(`You have a route with a regex path of ${route.path.source}. This is not compatible with OpenAPI.`);
+				const openApiPath = (prefix + route.path).replace(/:([A-Za-z0-9_]+)/g, "{$1}");
 				if (!paths[openApiPath]) paths[openApiPath] = {};
-				const operation = { responses: { "200": { description: "Successful response" } } };
+				const responses = {};
+				if (schemas?.responseBody) {
+					const responseSchema = this.toJsonSchema(schemas.responseBody, "output");
+					responses["200"] = {
+						description: responseSchema.description ?? "Successful response",
+						content: { "application/json": { schema: responseSchema } }
+					};
+				} else responses["200"] = { description: "Successful response" };
+				if (routeSchema?.responses) for (const resp of routeSchema.responses) {
+					const responseSchema = resp.schema ? this.toJsonSchema(resp.schema, "output") : void 0;
+					responses[String(resp.statusCode)] = {
+						description: resp.description ?? responseSchema?.description ?? `Response ${resp.statusCode}`,
+						...responseSchema ? { content: { "application/json": { schema: responseSchema } } } : {}
+					};
+				}
+				const operation = {
+					responses,
+					summary: routeSchema?.summary,
+					description: routeSchema?.description,
+					tags: controllerSchema?.title ? [controllerSchema.title] : void 0
+				};
 				const parameters = [];
-				if (schemas?.param) {
-					const paramSchema = this.toJsonSchema(schemas.param);
-					if (paramSchema.type === "object" && paramSchema.properties) for (const [name, schema] of Object.entries(paramSchema.properties)) parameters.push({
-						name,
-						in: "path",
-						required: true,
-						schema
-					});
+				if (schemas?.requestParam) {
+					const paramSchema = this.toJsonSchema(schemas.requestParam, "input");
+					if (paramSchema.type === "object" && paramSchema.properties) for (const [name, schema] of Object.entries(paramSchema.properties)) {
+						const parameterSchema = schema;
+						parameters.push({
+							name,
+							in: "path",
+							required: true,
+							description: parameterSchema.description,
+							schema: parameterSchema
+						});
+					}
 				}
-				if (schemas?.query) {
-					const querySchema = this.toJsonSchema(schemas.query);
+				if (schemas?.requestQuery) {
+					const querySchema = this.toJsonSchema(schemas.requestQuery, "input");
 					if (querySchema.type === "object" && querySchema.properties) for (const [name, schema] of Object.entries(querySchema.properties)) {
 						const isRequired = Array.isArray(querySchema.required) && querySchema.required.includes(name);
+						const parameterSchema = schema;
 						parameters.push({
 							name,
 							in: "query",
 							required: isRequired,
-							schema
+							description: parameterSchema.description,
+							schema: parameterSchema
 						});
 					}
 				}
 				if (parameters.length > 0) operation.parameters = parameters;
-				if (schemas?.body) operation.requestBody = {
-					required: true,
-					content: { "application/json": { schema: this.toJsonSchema(schemas.body) } }
-				};
+				if (schemas?.requestBody) {
+					const requestSchema = this.toJsonSchema(schemas.requestBody, "input");
+					operation.requestBody = {
+						required: true,
+						description: requestSchema.description,
+						content: { "application/json": { schema: requestSchema } }
+					};
+				}
 				const method = route.method.toLowerCase();
 				paths[openApiPath][method] = operation;
 			}
@@ -659,12 +619,15 @@ var OpenAPIGenerator = class {
 				version: config.version,
 				description: config.description
 			},
+			tags: tags.length > 0 ? tags : void 0,
 			paths
 		};
 	}
-	toJsonSchema(schema) {
+	toJsonSchema(schema, direction = "output") {
 		try {
-			return schema["~standard"].jsonSchema.output({ target: "openapi-3.0" });
+			const jsonSchema = schema["~standard"].jsonSchema;
+			if (direction === "input" && jsonSchema.input) return jsonSchema.input({ target: "openapi-3.0" });
+			return jsonSchema.output({ target: "openapi-3.0" });
 		} catch (e) {
 			if (e instanceof Error && e.message.includes("Transforms cannot be represented in JSON Schema")) throw new Error(`${e.message}.\nIt appears that you are using z.transform() - it is highly recommended that you use z.codec instead - https://zod.dev/codecs`);
 			throw e;
@@ -675,10 +638,10 @@ const openApiGenerator = new OpenAPIGenerator();
 function _registerControllerClass(controllerClass, prefix) {
 	openApiGenerator.registerController(controllerClass, prefix);
 }
-function _setOpenApiConfig(config) {
+function setOpenApiConfig(config) {
 	openApiGenerator.setConfig(config);
 }
-function _generateOpenApiSpec() {
+function generateOpenApiSpec() {
 	return openApiGenerator.generateSpec();
 }
 //#endregion
@@ -814,6 +777,60 @@ function _resolve(ctor) {
 	return _InjectableRegistry.get(ctor);
 }
 //#endregion
+//#region src/annotation/validator.ts
+const _validatorSchemaStore = /* @__PURE__ */ new WeakMap();
+function ResponseBody(schema) {
+	return (target, propertyKey) => {
+		const ctor = target.constructor;
+		const fnName = String(propertyKey);
+		_setOnce(_getOrCreateSchemaDefinition(ctor, fnName), "responseBody", schema, fnName);
+	};
+}
+function RequestBody(schema) {
+	return (target, propertyKey) => {
+		const ctor = target.constructor;
+		const fnName = String(propertyKey);
+		_setOnce(_getOrCreateSchemaDefinition(ctor, fnName), "requestBody", schema, fnName);
+	};
+}
+function RequestParam(schema) {
+	return (target, propertyKey) => {
+		const ctor = target.constructor;
+		const fnName = String(propertyKey);
+		_setOnce(_getOrCreateSchemaDefinition(ctor, fnName), "requestParam", schema, fnName);
+	};
+}
+function RequestQuery(schema) {
+	return (target, propertyKey) => {
+		const ctor = target.constructor;
+		const fnName = String(propertyKey);
+		_setOnce(_getOrCreateSchemaDefinition(ctor, fnName), "requestQuery", schema, fnName);
+	};
+}
+function _getOrCreateSchemaDefinition(ctor, fnName) {
+	const byFn = _getOrCreateMap(_validatorSchemaStore, ctor);
+	const existing = byFn.get(fnName);
+	if (existing) return existing;
+	const created = {};
+	byFn.set(fnName, created);
+	return created;
+}
+async function _parseOrThrow(schema, input, kind) {
+	const result = await schema["~standard"].validate(input);
+	if (result.issues) {
+		console.debug(`Failed to parse ${schema["~standard"].vendor} schema\nissues: ${result.issues}`);
+		throw new ParserError(kind, result.issues, schema["~standard"].vendor);
+	}
+	return result.value;
+}
+function _getValidatorSchema(ctor, fnName) {
+	return _validatorSchemaStore.get(ctor)?.get(fnName);
+}
+function _setOnce(def, key, schema, fnName) {
+	if (def[key]) throw new Error(`Duplicate schema for "${String(key)}" on method "${fnName}"`);
+	def[key] = schema;
+}
+//#endregion
 //#region src/annotation/controller.ts
 const _ControllerRegistry = /* @__PURE__ */ new WeakMap();
 /**
@@ -868,12 +885,12 @@ Split these into separate @MiddlewareClass classes, or merge the logic into a si
 				return;
 			}
 			router[methodName](fp, async (request, response, next) => {
-				const schemas = _getRequestSchemas(target, fnName);
+				const schemas = _getValidatorSchema(target, fnName);
 				if (schemas) {
-					if (schemas.body) request.body = await _parseOrThrow(schemas.body, request.body, "reqbody");
-					if (schemas.param) request.params = await _parseOrThrow(schemas.param, request.params, "reqparams");
-					if (schemas.query) {
-						const parsedQuery = await _parseOrThrow(schemas.query, request.query, "reqquery");
+					if (schemas.requestBody) request.body = await _parseOrThrow(schemas.requestBody, request.body, "reqbody");
+					if (schemas.requestParam) request.params = await _parseOrThrow(schemas.requestParam, request.params, "reqparams");
+					if (schemas.requestQuery) {
+						const parsedQuery = await _parseOrThrow(schemas.requestQuery, request.query, "reqquery");
 						Object.defineProperty(request, "query", {
 							value: parsedQuery,
 							writable: true,
@@ -883,7 +900,8 @@ Split these into separate @MiddlewareClass classes, or merge the logic into a si
 				}
 				const result = await fn.bind(controllerInstance)(request, response, next);
 				if (result instanceof ResponseEntity) {
-					response.contentType("application/json").status(result.getStatusCode()).set(result.getHeaders()).send(Sapling.serialize(result.getBody()));
+					const body = schemas && schemas.responseBody ? await _parseOrThrow(schemas.responseBody, result.getBody(), "resbody") : result.getBody();
+					response.contentType("application/json").status(result.getStatusCode()).set(result.getHeaders()).send(Sapling.serialize(body));
 					return;
 				}
 				if (result instanceof RedirectView) {
@@ -950,7 +968,7 @@ DefaultResponseStatusErrorMiddleware = __decorate([MiddlewareClass()], DefaultRe
 //#region src/middleware/default/openapi/index.ts
 let DefaultOpenApiMiddleware = class DefaultOpenApiMiddleware {
 	handle(_request, _response, _next) {
-		return ResponseEntity.ok().body(_generateOpenApiSpec());
+		return ResponseEntity.ok().body(generateOpenApiSpec());
 	}
 };
 __decorate([GET(_settings.doc.openApiPath)], DefaultOpenApiMiddleware.prototype, "handle", null);
@@ -962,20 +980,7 @@ let Serve = class Serve {
 		this.handlers = swagger_ui_express.default.serve;
 	}
 	handle(request, response, next) {
-		this.runNext(0, request, response, next);
-	}
-	runNext(i, req, res, next) {
-		if (i >= this.handlers.length) {
-			next();
-			return;
-		}
-		this.handlers[i]?.(req, res, (err) => {
-			if (err) {
-				next(err);
-				return;
-			}
-			this.runNext(i + 1, req, res, next);
-		});
+		return Sapling.chainHandlers(this.handlers, request, response, next);
 	}
 };
 __decorate([Middleware(_settings.doc.swaggerPath)], Serve.prototype, "handle", null);
@@ -996,6 +1001,7 @@ const DefaultSwaggerMiddleware = {
 };
 //#endregion
 exports.Controller = Controller;
+exports.ControllerSchema = ControllerSchema;
 exports.DELETE = DELETE;
 Object.defineProperty(exports, "DefaultBaseErrorMiddleware", {
 	enumerable: true,
@@ -1038,21 +1044,29 @@ exports.RedirectView = RedirectView;
 exports.RequestBody = RequestBody;
 exports.RequestParam = RequestParam;
 exports.RequestQuery = RequestQuery;
+exports.ResponseBody = ResponseBody;
 exports.ResponseEntity = ResponseEntity;
 exports.ResponseEntityBuilder = ResponseEntityBuilder;
 exports.ResponseStatusError = ResponseStatusError;
+exports.RouteSchema = RouteSchema;
 exports.Sapling = Sapling;
 exports._ControllerRegistry = _ControllerRegistry;
 exports._InjectableDeps = _InjectableDeps;
 exports._InjectableRegistry = _InjectableRegistry;
 exports._Route = _Route;
-exports._generateOpenApiSpec = _generateOpenApiSpec;
-exports._getRequestSchemas = _getRequestSchemas;
+exports._getControllerSchema = _getControllerSchema;
+exports._getOrCreateSchemaDefinition = _getOrCreateSchemaDefinition;
+exports._getRouteSchema = _getRouteSchema;
 exports._getRoutes = _getRoutes;
+exports._getValidatorSchema = _getValidatorSchema;
 exports._parseOrThrow = _parseOrThrow;
 exports._registerControllerClass = _registerControllerClass;
 exports._resolve = _resolve;
-exports._setOpenApiConfig = _setOpenApiConfig;
+exports._setControllerSchema = _setControllerSchema;
+exports._setOnce = _setOnce;
+exports._setRouteSchema = _setRouteSchema;
 exports._settings = _settings;
+exports.generateOpenApiSpec = generateOpenApiSpec;
 exports.methodResolve = methodResolve;
 exports.openApiGenerator = openApiGenerator;
+exports.setOpenApiConfig = setOpenApiConfig;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import e, { ErrorRequestHandler, NextFunction, Request, Response as Response$1, Router } from "express";
+import e, { ErrorRequestHandler, NextFunction, Request, RequestHandler, Response as Response$1, Router } from "express";
 
 //#region src/html/404.d.ts
 /**
@@ -437,7 +437,7 @@ declare class ResponseStatusError extends Error {
 }
 //#endregion
 //#region src/helper/error/parse.d.ts
-type ParserErrorLocation = "reqbody" | "reqparams" | "reqquery";
+type ParserErrorLocation = "reqbody" | "reqparams" | "reqquery" | "resbody";
 /**
  * This error should be thrown when some data cannot be parsed by a given schema.
  */
@@ -531,6 +531,7 @@ declare class Sapling {
   static setDeserializeFn(this: void, fn: (value: string) => any): void;
   static setOpenApiPath(this: void, path: string): void;
   static setSwaggerPath(this: void, path: string): void;
+  static chainHandlers(this: void, handlers: RequestHandler[], request: Request, response: Response$1, next: NextFunction, index?: number): void;
 }
 //#endregion
 //#region node_modules/.pnpm/openapi-types@12.1.3/node_modules/openapi-types/dist/index.d.ts
@@ -869,94 +870,53 @@ declare class OpenAPIGenerator {
 }
 declare const openApiGenerator: OpenAPIGenerator;
 declare function _registerControllerClass(controllerClass: Function, prefix: string): void;
-declare function _setOpenApiConfig(config: OpenAPIConfig): void;
-declare function _generateOpenApiSpec(): OpenAPIV3.Document;
+declare function setOpenApiConfig(config: OpenAPIConfig): void;
+declare function generateOpenApiSpec(): OpenAPIV3.Document;
 //#endregion
-//#region src/annotation/request.d.ts
-type RequestSchemaDefinition = {
-  body?: StandardSchemaV1 & StandardJSONSchemaV1;
-  param?: StandardSchemaV1 & StandardJSONSchemaV1;
-  query?: StandardSchemaV1 & StandardJSONSchemaV1;
+//#region src/annotation/validator.d.ts
+type ValidatorSchema = {
+  requestBody?: StandardSchemaV1 & StandardJSONSchemaV1;
+  requestParam?: StandardSchemaV1 & StandardJSONSchemaV1;
+  requestQuery?: StandardSchemaV1 & StandardJSONSchemaV1;
+  responseBody?: StandardSchemaV1 & StandardJSONSchemaV1;
 };
-/**
- * Apply to a route method to have `request.body` be parsed by `schema`.
- *
- * This annotation will parse `request.body` & then override `request.body`.
- * You can then just simply cast `request.body` for your use
- *
- * @example
- * ```ts
- *  const CREATE_BOOK_REQUEST_BODY_SCHEMA = z.object({
- *    name: z.string(),
- *    description: z.string().optional(),
- *  });
- *
- * ⠀@Controller({ prefix: "/api/book" })
- *  class BookController {
- *   ⠀@RequestBody(CREATE_BOOK_REQUEST_BODY_SCHEMA)
- *   ⠀@POST()
- *    public createBook(request: e.Request) {
- *      const { name, description } = request.body as unknown as z.infer<
- *        typeof CREATE_BOOK_REQUEST_BODY_SCHEMA
- *      >;
- *    }
- *  }
- * ```
- */
+declare function ResponseBody(schema: StandardSchemaV1 & StandardJSONSchemaV1): MethodDecorator;
 declare function RequestBody(schema: StandardSchemaV1 & StandardJSONSchemaV1): MethodDecorator;
-/**
- * Apply to a route method to have `request.param` be parsed by `schema`.
- *
- * This annotation will parse `request.param` & then override `request.param`.
- * You can then just simply cast `request.param` for your use
- *
- * @example
- * ```ts
- *  const GET_BOOK_REQUEST_PARAM_SCHEMA = z.object({
- *    bookId: z.string(),
- *  });
- *
- * ⠀@Controller({ prefix: "/api/book" })
- *  class BookController {
- *   ⠀@RequestParam(GET_BOOK_REQUEST_PARAM_SCHEMA)
- *   ⠀@GET("/:bookId")
- *    public getBook(request: e.Request) {
- *      const { bookId } = request.param as unknown as z.infer<
- *        typeof GET_BOOK_REQUEST_PARAM_SCHEMA
- *      >;
- *    }
- *  }
- * ```
- */
 declare function RequestParam(schema: StandardSchemaV1 & StandardJSONSchemaV1): MethodDecorator;
-/**
- * Apply to a route method to have `request.query` be parsed by `schema`.
- *
- * This annotation will parse `request.query` & then override `request.query`.
- * You can then just simply cast `request.query` for your use
- *
- * @example
- * ```ts
- *  const LIST_BOOKS_REQUEST_QUERY_SCHEMA = z.object({
- *    sort: z.enum(["name", "createdAt"]).optional(),
- *    q: z.string().optional(),
- *  });
- *
- * ⠀@Controller({ prefix: "/api/book" })
- *  class BookController {
- *   ⠀@RequestQuery(LIST_BOOKS_REQUEST_QUERY_SCHEMA)
- *   ⠀@GET()
- *    public listBooks(request: e.Request) {
- *      const { sort, q } = request.query as unknown as z.infer<
- *        typeof LIST_BOOKS_REQUEST_QUERY_SCHEMA
- *      >;
- *    }
- *  }
- * ```
- */
 declare function RequestQuery(schema: StandardSchemaV1 & StandardJSONSchemaV1): MethodDecorator;
-declare function _getRequestSchemas(ctor: Function, fnName: string): RequestSchemaDefinition | undefined;
+declare function _getOrCreateSchemaDefinition(ctor: Function, fnName: string): ValidatorSchema;
 declare function _parseOrThrow<TSchema extends StandardSchemaV1>(schema: TSchema, input: unknown, kind: ParserErrorLocation): Promise<StandardSchemaV1.InferOutput<TSchema>>;
+declare function _getValidatorSchema(ctor: Function, fnName: string): ValidatorSchema | undefined;
+declare function _setOnce(def: ValidatorSchema, key: keyof ValidatorSchema, schema: StandardSchemaV1 & StandardJSONSchemaV1, fnName: string): void;
+//#endregion
+//#region src/annotation/schema.d.ts
+type ResponseSchema = {
+  statusCode: HttpStatus;
+  description?: string;
+  schema?: StandardSchemaV1 & StandardJSONSchemaV1;
+};
+type RouteSchemaDefinition = {
+  summary?: string;
+  description?: string;
+  responses?: ResponseSchema[];
+};
+type ControllerSchemaDefinition = {
+  title?: string;
+  description?: string;
+};
+declare function ControllerSchema(options: {
+  title?: string;
+  description?: string;
+}): ClassDecorator;
+declare function RouteSchema(options: {
+  summary?: string;
+  description?: string;
+  responses?: ResponseSchema[];
+}): MethodDecorator;
+declare function _setRouteSchema(ctor: Function, fnName: string, options: RouteSchemaDefinition): void;
+declare function _setControllerSchema(ctor: Function, options: ControllerSchemaDefinition): void;
+declare function _getRouteSchema(ctor: Function, fnName: string): RouteSchemaDefinition | undefined;
+declare function _getControllerSchema(ctor: Function): ControllerSchemaDefinition | undefined;
 //#endregion
 //#region src/middleware/default/error/base.d.ts
 /**
@@ -993,7 +953,6 @@ declare class DefaultOpenApiMiddleware {
 declare class Serve {
   private readonly handlers;
   handle(request: Request, response: Response$1, next: NextFunction): void;
-  private runNext;
 }
 declare class Setup {
   private readonly handler;
@@ -1005,4 +964,4 @@ declare const DefaultSwaggerMiddleware: {
   Setup: typeof Setup;
 };
 //#endregion
-export { Class, Controller, DELETE, DefaultBaseErrorMiddleware, DefaultOpenApiMiddleware, DefaultParserErrorMiddleware, DefaultResponseStatusErrorMiddleware, DefaultSwaggerMiddleware, ExpressMiddlewareFn, ExpressRouterMethodKey, ExpressRouterMethods, GET, HEAD, Html404ErrorPage, HttpHeaders, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, ParserErrorLocation, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseEntity, ResponseEntityBuilder, ResponseStatusError, RouteDefinition, Sapling, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _generateOpenApiSpec, _getRequestSchemas, _getRoutes, _parseOrThrow, _registerControllerClass, _resolve, _setOpenApiConfig, _settings, methodResolve, openApiGenerator };
+export { Class, Controller, ControllerSchema, ControllerSchemaDefinition, DELETE, DefaultBaseErrorMiddleware, DefaultOpenApiMiddleware, DefaultParserErrorMiddleware, DefaultResponseStatusErrorMiddleware, DefaultSwaggerMiddleware, ExpressMiddlewareFn, ExpressRouterMethodKey, ExpressRouterMethods, GET, HEAD, Html404ErrorPage, HttpHeaders, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, ParserErrorLocation, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseBody, ResponseEntity, ResponseEntityBuilder, ResponseSchema, ResponseStatusError, RouteDefinition, RouteSchema, RouteSchemaDefinition, Sapling, ValidatorSchema, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _getControllerSchema, _getOrCreateSchemaDefinition, _getRouteSchema, _getRoutes, _getValidatorSchema, _parseOrThrow, _registerControllerClass, _resolve, _setControllerSchema, _setOnce, _setRouteSchema, _settings, generateOpenApiSpec, methodResolve, openApiGenerator, setOpenApiConfig };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import e, { ErrorRequestHandler, NextFunction, Request, Response as Response$1, Router } from "express";
+import e, { ErrorRequestHandler, NextFunction, Request, RequestHandler, Response as Response$1, Router } from "express";
 
 //#region src/html/404.d.ts
 /**
@@ -437,7 +437,7 @@ declare class ResponseStatusError extends Error {
 }
 //#endregion
 //#region src/helper/error/parse.d.ts
-type ParserErrorLocation = "reqbody" | "reqparams" | "reqquery";
+type ParserErrorLocation = "reqbody" | "reqparams" | "reqquery" | "resbody";
 /**
  * This error should be thrown when some data cannot be parsed by a given schema.
  */
@@ -531,6 +531,7 @@ declare class Sapling {
   static setDeserializeFn(this: void, fn: (value: string) => any): void;
   static setOpenApiPath(this: void, path: string): void;
   static setSwaggerPath(this: void, path: string): void;
+  static chainHandlers(this: void, handlers: RequestHandler[], request: Request, response: Response$1, next: NextFunction, index?: number): void;
 }
 //#endregion
 //#region node_modules/.pnpm/openapi-types@12.1.3/node_modules/openapi-types/dist/index.d.ts
@@ -869,94 +870,53 @@ declare class OpenAPIGenerator {
 }
 declare const openApiGenerator: OpenAPIGenerator;
 declare function _registerControllerClass(controllerClass: Function, prefix: string): void;
-declare function _setOpenApiConfig(config: OpenAPIConfig): void;
-declare function _generateOpenApiSpec(): OpenAPIV3.Document;
+declare function setOpenApiConfig(config: OpenAPIConfig): void;
+declare function generateOpenApiSpec(): OpenAPIV3.Document;
 //#endregion
-//#region src/annotation/request.d.ts
-type RequestSchemaDefinition = {
-  body?: StandardSchemaV1 & StandardJSONSchemaV1;
-  param?: StandardSchemaV1 & StandardJSONSchemaV1;
-  query?: StandardSchemaV1 & StandardJSONSchemaV1;
+//#region src/annotation/validator.d.ts
+type ValidatorSchema = {
+  requestBody?: StandardSchemaV1 & StandardJSONSchemaV1;
+  requestParam?: StandardSchemaV1 & StandardJSONSchemaV1;
+  requestQuery?: StandardSchemaV1 & StandardJSONSchemaV1;
+  responseBody?: StandardSchemaV1 & StandardJSONSchemaV1;
 };
-/**
- * Apply to a route method to have `request.body` be parsed by `schema`.
- *
- * This annotation will parse `request.body` & then override `request.body`.
- * You can then just simply cast `request.body` for your use
- *
- * @example
- * ```ts
- *  const CREATE_BOOK_REQUEST_BODY_SCHEMA = z.object({
- *    name: z.string(),
- *    description: z.string().optional(),
- *  });
- *
- * ⠀@Controller({ prefix: "/api/book" })
- *  class BookController {
- *   ⠀@RequestBody(CREATE_BOOK_REQUEST_BODY_SCHEMA)
- *   ⠀@POST()
- *    public createBook(request: e.Request) {
- *      const { name, description } = request.body as unknown as z.infer<
- *        typeof CREATE_BOOK_REQUEST_BODY_SCHEMA
- *      >;
- *    }
- *  }
- * ```
- */
+declare function ResponseBody(schema: StandardSchemaV1 & StandardJSONSchemaV1): MethodDecorator;
 declare function RequestBody(schema: StandardSchemaV1 & StandardJSONSchemaV1): MethodDecorator;
-/**
- * Apply to a route method to have `request.param` be parsed by `schema`.
- *
- * This annotation will parse `request.param` & then override `request.param`.
- * You can then just simply cast `request.param` for your use
- *
- * @example
- * ```ts
- *  const GET_BOOK_REQUEST_PARAM_SCHEMA = z.object({
- *    bookId: z.string(),
- *  });
- *
- * ⠀@Controller({ prefix: "/api/book" })
- *  class BookController {
- *   ⠀@RequestParam(GET_BOOK_REQUEST_PARAM_SCHEMA)
- *   ⠀@GET("/:bookId")
- *    public getBook(request: e.Request) {
- *      const { bookId } = request.param as unknown as z.infer<
- *        typeof GET_BOOK_REQUEST_PARAM_SCHEMA
- *      >;
- *    }
- *  }
- * ```
- */
 declare function RequestParam(schema: StandardSchemaV1 & StandardJSONSchemaV1): MethodDecorator;
-/**
- * Apply to a route method to have `request.query` be parsed by `schema`.
- *
- * This annotation will parse `request.query` & then override `request.query`.
- * You can then just simply cast `request.query` for your use
- *
- * @example
- * ```ts
- *  const LIST_BOOKS_REQUEST_QUERY_SCHEMA = z.object({
- *    sort: z.enum(["name", "createdAt"]).optional(),
- *    q: z.string().optional(),
- *  });
- *
- * ⠀@Controller({ prefix: "/api/book" })
- *  class BookController {
- *   ⠀@RequestQuery(LIST_BOOKS_REQUEST_QUERY_SCHEMA)
- *   ⠀@GET()
- *    public listBooks(request: e.Request) {
- *      const { sort, q } = request.query as unknown as z.infer<
- *        typeof LIST_BOOKS_REQUEST_QUERY_SCHEMA
- *      >;
- *    }
- *  }
- * ```
- */
 declare function RequestQuery(schema: StandardSchemaV1 & StandardJSONSchemaV1): MethodDecorator;
-declare function _getRequestSchemas(ctor: Function, fnName: string): RequestSchemaDefinition | undefined;
+declare function _getOrCreateSchemaDefinition(ctor: Function, fnName: string): ValidatorSchema;
 declare function _parseOrThrow<TSchema extends StandardSchemaV1>(schema: TSchema, input: unknown, kind: ParserErrorLocation): Promise<StandardSchemaV1.InferOutput<TSchema>>;
+declare function _getValidatorSchema(ctor: Function, fnName: string): ValidatorSchema | undefined;
+declare function _setOnce(def: ValidatorSchema, key: keyof ValidatorSchema, schema: StandardSchemaV1 & StandardJSONSchemaV1, fnName: string): void;
+//#endregion
+//#region src/annotation/schema.d.ts
+type ResponseSchema = {
+  statusCode: HttpStatus;
+  description?: string;
+  schema?: StandardSchemaV1 & StandardJSONSchemaV1;
+};
+type RouteSchemaDefinition = {
+  summary?: string;
+  description?: string;
+  responses?: ResponseSchema[];
+};
+type ControllerSchemaDefinition = {
+  title?: string;
+  description?: string;
+};
+declare function ControllerSchema(options: {
+  title?: string;
+  description?: string;
+}): ClassDecorator;
+declare function RouteSchema(options: {
+  summary?: string;
+  description?: string;
+  responses?: ResponseSchema[];
+}): MethodDecorator;
+declare function _setRouteSchema(ctor: Function, fnName: string, options: RouteSchemaDefinition): void;
+declare function _setControllerSchema(ctor: Function, options: ControllerSchemaDefinition): void;
+declare function _getRouteSchema(ctor: Function, fnName: string): RouteSchemaDefinition | undefined;
+declare function _getControllerSchema(ctor: Function): ControllerSchemaDefinition | undefined;
 //#endregion
 //#region src/middleware/default/error/base.d.ts
 /**
@@ -993,7 +953,6 @@ declare class DefaultOpenApiMiddleware {
 declare class Serve {
   private readonly handlers;
   handle(request: Request, response: Response$1, next: NextFunction): void;
-  private runNext;
 }
 declare class Setup {
   private readonly handler;
@@ -1005,4 +964,4 @@ declare const DefaultSwaggerMiddleware: {
   Setup: typeof Setup;
 };
 //#endregion
-export { Class, Controller, DELETE, DefaultBaseErrorMiddleware, DefaultOpenApiMiddleware, DefaultParserErrorMiddleware, DefaultResponseStatusErrorMiddleware, DefaultSwaggerMiddleware, ExpressMiddlewareFn, ExpressRouterMethodKey, ExpressRouterMethods, GET, HEAD, Html404ErrorPage, HttpHeaders, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, ParserErrorLocation, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseEntity, ResponseEntityBuilder, ResponseStatusError, RouteDefinition, Sapling, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _generateOpenApiSpec, _getRequestSchemas, _getRoutes, _parseOrThrow, _registerControllerClass, _resolve, _setOpenApiConfig, _settings, methodResolve, openApiGenerator };
+export { Class, Controller, ControllerSchema, ControllerSchemaDefinition, DELETE, DefaultBaseErrorMiddleware, DefaultOpenApiMiddleware, DefaultParserErrorMiddleware, DefaultResponseStatusErrorMiddleware, DefaultSwaggerMiddleware, ExpressMiddlewareFn, ExpressRouterMethodKey, ExpressRouterMethods, GET, HEAD, Html404ErrorPage, HttpHeaders, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, ParserErrorLocation, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseBody, ResponseEntity, ResponseEntityBuilder, ResponseSchema, ResponseStatusError, RouteDefinition, RouteSchema, RouteSchemaDefinition, Sapling, ValidatorSchema, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _getControllerSchema, _getOrCreateSchemaDefinition, _getRouteSchema, _getRoutes, _getValidatorSchema, _parseOrThrow, _registerControllerClass, _resolve, _setControllerSchema, _setOnce, _setRouteSchema, _settings, generateOpenApiSpec, methodResolve, openApiGenerator, setOpenApiConfig };

package/dist/index.mjs

@@ -233,6 +233,7 @@ var ParserError = class ParserError extends ResponseStatusError {
 				case "reqbody": return "request body";
 				case "reqparams": return "request params";
 				case "reqquery": return "request query";
+				case "resbody": return "response body";
 			}
 		})()}: ${formatted}`;
 	}
@@ -356,134 +357,20 @@ var Sapling = class Sapling {
 	static setSwaggerPath(path) {
 		_settings.doc.swaggerPath = path;
 	}
-};
-//#endregion
-//#region src/annotation/request.ts
-const _requestSchemaStore = /* @__PURE__ */ new WeakMap();
-/**
-* Apply to a route method to have `request.body` be parsed by `schema`.
-*
-* This annotation will parse `request.body` & then override `request.body`.
-* You can then just simply cast `request.body` for your use
-*
-* @example
-* ```ts
-*  const CREATE_BOOK_REQUEST_BODY_SCHEMA = z.object({
-*    name: z.string(),
-*    description: z.string().optional(),
-*  });
-*
-* ⠀@Controller({ prefix: "/api/book" })
-*  class BookController {
-*   ⠀@RequestBody(CREATE_BOOK_REQUEST_BODY_SCHEMA)
-*   ⠀@POST()
-*    public createBook(request: e.Request) {
-*      const { name, description } = request.body as unknown as z.infer<
-*        typeof CREATE_BOOK_REQUEST_BODY_SCHEMA
-*      >;
-*    }
-*  }
-* ```
-*/
-function RequestBody(schema) {
-	return (target, propertyKey) => {
-		const ctor = target.constructor;
-		const fnName = String(propertyKey);
-		_setOnce(_getOrCreateRequestSchemaDefinition(ctor, fnName), "body", schema, fnName);
-	};
-}
-/**
-* Apply to a route method to have `request.param` be parsed by `schema`.
-*
-* This annotation will parse `request.param` & then override `request.param`.
-* You can then just simply cast `request.param` for your use
-*
-* @example
-* ```ts
-*  const GET_BOOK_REQUEST_PARAM_SCHEMA = z.object({
-*    bookId: z.string(),
-*  });
-*
-* ⠀@Controller({ prefix: "/api/book" })
-*  class BookController {
-*   ⠀@RequestParam(GET_BOOK_REQUEST_PARAM_SCHEMA)
-*   ⠀@GET("/:bookId")
-*    public getBook(request: e.Request) {
-*      const { bookId } = request.param as unknown as z.infer<
-*        typeof GET_BOOK_REQUEST_PARAM_SCHEMA
-*      >;
-*    }
-*  }
-* ```
-*/
-function RequestParam(schema) {
-	return (target, propertyKey) => {
-		const ctor = target.constructor;
-		const fnName = String(propertyKey);
-		_setOnce(_getOrCreateRequestSchemaDefinition(ctor, fnName), "param", schema, fnName);
-	};
-}
-/**
-* Apply to a route method to have `request.query` be parsed by `schema`.
-*
-* This annotation will parse `request.query` & then override `request.query`.
-* You can then just simply cast `request.query` for your use
-*
-* @example
-* ```ts
-*  const LIST_BOOKS_REQUEST_QUERY_SCHEMA = z.object({
-*    sort: z.enum(["name", "createdAt"]).optional(),
-*    q: z.string().optional(),
-*  });
-*
-* ⠀@Controller({ prefix: "/api/book" })
-*  class BookController {
-*   ⠀@RequestQuery(LIST_BOOKS_REQUEST_QUERY_SCHEMA)
-*   ⠀@GET()
-*    public listBooks(request: e.Request) {
-*      const { sort, q } = request.query as unknown as z.infer<
-*        typeof LIST_BOOKS_REQUEST_QUERY_SCHEMA
-*      >;
-*    }
-*  }
-* ```
-*/
-function RequestQuery(schema) {
-	return (target, propertyKey) => {
-		const ctor = target.constructor;
-		const fnName = String(propertyKey);
-		_setOnce(_getOrCreateRequestSchemaDefinition(ctor, fnName), "query", schema, fnName);
-	};
-}
-function _getOrCreateRequestSchemaDefinition(ctor, fnName) {
-	const byFn = (() => {
-		const fn = _requestSchemaStore.get(ctor);
-		if (fn) return fn;
-		const newFn = /* @__PURE__ */ new Map();
-		_requestSchemaStore.set(ctor, newFn);
-		return newFn;
-	})();
-	const existing = byFn.get(fnName);
-	if (existing) return existing;
-	const created = {};
-	byFn.set(fnName, created);
-	return created;
-}
-function _setOnce(def, key, schema, fnName) {
-	if (def[key]) throw new Error(`Duplicate request schema for "${String(key)}" on method "${fnName}"`);
-	def[key] = schema;
-}
-function _getRequestSchemas(ctor, fnName) {
-	return _requestSchemaStore.get(ctor)?.get(fnName);
-}
-async function _parseOrThrow(schema, input, kind) {
-	const result = await schema["~standard"].validate(input);
-	if (result.issues) {
-		console.debug(`Failed to parse a schema`);
-		throw new ParserError(kind, result.issues, schema["~standard"].vendor);
+	static chainHandlers(handlers, request, response, next, index = 0) {
+		if (index >= handlers.length) {
+			next();
+			return;
+		}
+		handlers[index]?.(request, response, (err) => {
+			if (err) {
+				next(err);
+				return;
+			}
+			Sapling.chainHandlers(handlers, request, response, next, index + 1);
+		});
 	}
-	return result.value;
-}
+};
 //#endregion
 //#region src/annotation/route.ts
 const _routeStore = /* @__PURE__ */ new WeakMap();
@@ -566,6 +453,42 @@ function _getRoutes(ctor) {
 	return _routeStore.get(ctor) ?? [];
 }
 //#endregion
+//#region src/utils.ts
+function _getOrCreateMap(store, ctor) {
+	const existing = store.get(ctor);
+	if (existing) return existing;
+	const created = /* @__PURE__ */ new Map();
+	store.set(ctor, created);
+	return created;
+}
+//#endregion
+//#region src/annotation/schema.ts
+const _routeSchemaStore = /* @__PURE__ */ new WeakMap();
+const _controllerSchemaStore = /* @__PURE__ */ new WeakMap();
+function ControllerSchema(options) {
+	return (target) => {
+		_setControllerSchema(target, options);
+	};
+}
+function RouteSchema(options) {
+	return (target, propertyKey) => {
+		const ctor = target.constructor;
+		_setRouteSchema(ctor, String(propertyKey), options);
+	};
+}
+function _setRouteSchema(ctor, fnName, options) {
+	_getOrCreateMap(_routeSchemaStore, ctor).set(fnName, options);
+}
+function _setControllerSchema(ctor, options) {
+	_controllerSchemaStore.set(ctor, options);
+}
+function _getRouteSchema(ctor, fnName) {
+	return _routeSchemaStore.get(ctor)?.get(fnName);
+}
+function _getControllerSchema(ctor) {
+	return _controllerSchemaStore.get(ctor);
+}
+//#endregion
 //#region src/helper/openapi.ts
 var OpenAPIGenerator = class {
 	constructor() {
@@ -587,42 +510,79 @@ var OpenAPIGenerator = class {
 	generateSpec() {
 		const config = this.config;
 		const paths = {};
+		const tags = [];
 		for (const { class: controllerClass, prefix } of this.controllers) {
 			const routes = _getRoutes(controllerClass);
+			const controllerSchema = _getControllerSchema(controllerClass);
+			if (controllerSchema?.title) tags.push({
+				name: controllerSchema.title,
+				description: controllerSchema.description
+			});
 			for (const route of routes) {
 				if (route.method === "USE") continue;
-				const schemas = _getRequestSchemas(controllerClass, route.fnName);
-				const fullPath = route.path instanceof RegExp ? route.path.source : prefix + route.path;
-				const openApiPath = typeof fullPath === "string" ? fullPath.replace(/:(\w+)/g, "{$1}") : fullPath;
+				const schemas = _getValidatorSchema(controllerClass, route.fnName);
+				const routeSchema = _getRouteSchema(controllerClass, route.fnName);
+				if (route.path instanceof RegExp) throw new Error(`You have a route with a regex path of ${route.path.source}. This is not compatible with OpenAPI.`);
+				const openApiPath = (prefix + route.path).replace(/:([A-Za-z0-9_]+)/g, "{$1}");
 				if (!paths[openApiPath]) paths[openApiPath] = {};
-				const operation = { responses: { "200": { description: "Successful response" } } };
+				const responses = {};
+				if (schemas?.responseBody) {
+					const responseSchema = this.toJsonSchema(schemas.responseBody, "output");
+					responses["200"] = {
+						description: responseSchema.description ?? "Successful response",
+						content: { "application/json": { schema: responseSchema } }
+					};
+				} else responses["200"] = { description: "Successful response" };
+				if (routeSchema?.responses) for (const resp of routeSchema.responses) {
+					const responseSchema = resp.schema ? this.toJsonSchema(resp.schema, "output") : void 0;
+					responses[String(resp.statusCode)] = {
+						description: resp.description ?? responseSchema?.description ?? `Response ${resp.statusCode}`,
+						...responseSchema ? { content: { "application/json": { schema: responseSchema } } } : {}
+					};
+				}
+				const operation = {
+					responses,
+					summary: routeSchema?.summary,
+					description: routeSchema?.description,
+					tags: controllerSchema?.title ? [controllerSchema.title] : void 0
+				};
 				const parameters = [];
-				if (schemas?.param) {
-					const paramSchema = this.toJsonSchema(schemas.param);
-					if (paramSchema.type === "object" && paramSchema.properties) for (const [name, schema] of Object.entries(paramSchema.properties)) parameters.push({
-						name,
-						in: "path",
-						required: true,
-						schema
-					});
+				if (schemas?.requestParam) {
+					const paramSchema = this.toJsonSchema(schemas.requestParam, "input");
+					if (paramSchema.type === "object" && paramSchema.properties) for (const [name, schema] of Object.entries(paramSchema.properties)) {
+						const parameterSchema = schema;
+						parameters.push({
+							name,
+							in: "path",
+							required: true,
+							description: parameterSchema.description,
+							schema: parameterSchema
+						});
+					}
 				}
-				if (schemas?.query) {
-					const querySchema = this.toJsonSchema(schemas.query);
+				if (schemas?.requestQuery) {
+					const querySchema = this.toJsonSchema(schemas.requestQuery, "input");
 					if (querySchema.type === "object" && querySchema.properties) for (const [name, schema] of Object.entries(querySchema.properties)) {
 						const isRequired = Array.isArray(querySchema.required) && querySchema.required.includes(name);
+						const parameterSchema = schema;
 						parameters.push({
 							name,
 							in: "query",
 							required: isRequired,
-							schema
+							description: parameterSchema.description,
+							schema: parameterSchema
 						});
 					}
 				}
 				if (parameters.length > 0) operation.parameters = parameters;
-				if (schemas?.body) operation.requestBody = {
-					required: true,
-					content: { "application/json": { schema: this.toJsonSchema(schemas.body) } }
-				};
+				if (schemas?.requestBody) {
+					const requestSchema = this.toJsonSchema(schemas.requestBody, "input");
+					operation.requestBody = {
+						required: true,
+						description: requestSchema.description,
+						content: { "application/json": { schema: requestSchema } }
+					};
+				}
 				const method = route.method.toLowerCase();
 				paths[openApiPath][method] = operation;
 			}
@@ -634,12 +594,15 @@ var OpenAPIGenerator = class {
 				version: config.version,
 				description: config.description
 			},
+			tags: tags.length > 0 ? tags : void 0,
 			paths
 		};
 	}
-	toJsonSchema(schema) {
+	toJsonSchema(schema, direction = "output") {
 		try {
-			return schema["~standard"].jsonSchema.output({ target: "openapi-3.0" });
+			const jsonSchema = schema["~standard"].jsonSchema;
+			if (direction === "input" && jsonSchema.input) return jsonSchema.input({ target: "openapi-3.0" });
+			return jsonSchema.output({ target: "openapi-3.0" });
 		} catch (e) {
 			if (e instanceof Error && e.message.includes("Transforms cannot be represented in JSON Schema")) throw new Error(`${e.message}.\nIt appears that you are using z.transform() - it is highly recommended that you use z.codec instead - https://zod.dev/codecs`);
 			throw e;
@@ -650,10 +613,10 @@ const openApiGenerator = new OpenAPIGenerator();
 function _registerControllerClass(controllerClass, prefix) {
 	openApiGenerator.registerController(controllerClass, prefix);
 }
-function _setOpenApiConfig(config) {
+function setOpenApiConfig(config) {
 	openApiGenerator.setConfig(config);
 }
-function _generateOpenApiSpec() {
+function generateOpenApiSpec() {
 	return openApiGenerator.generateSpec();
 }
 //#endregion
@@ -789,6 +752,60 @@ function _resolve(ctor) {
 	return _InjectableRegistry.get(ctor);
 }
 //#endregion
+//#region src/annotation/validator.ts
+const _validatorSchemaStore = /* @__PURE__ */ new WeakMap();
+function ResponseBody(schema) {
+	return (target, propertyKey) => {
+		const ctor = target.constructor;
+		const fnName = String(propertyKey);
+		_setOnce(_getOrCreateSchemaDefinition(ctor, fnName), "responseBody", schema, fnName);
+	};
+}
+function RequestBody(schema) {
+	return (target, propertyKey) => {
+		const ctor = target.constructor;
+		const fnName = String(propertyKey);
+		_setOnce(_getOrCreateSchemaDefinition(ctor, fnName), "requestBody", schema, fnName);
+	};
+}
+function RequestParam(schema) {
+	return (target, propertyKey) => {
+		const ctor = target.constructor;
+		const fnName = String(propertyKey);
+		_setOnce(_getOrCreateSchemaDefinition(ctor, fnName), "requestParam", schema, fnName);
+	};
+}
+function RequestQuery(schema) {
+	return (target, propertyKey) => {
+		const ctor = target.constructor;
+		const fnName = String(propertyKey);
+		_setOnce(_getOrCreateSchemaDefinition(ctor, fnName), "requestQuery", schema, fnName);
+	};
+}
+function _getOrCreateSchemaDefinition(ctor, fnName) {
+	const byFn = _getOrCreateMap(_validatorSchemaStore, ctor);
+	const existing = byFn.get(fnName);
+	if (existing) return existing;
+	const created = {};
+	byFn.set(fnName, created);
+	return created;
+}
+async function _parseOrThrow(schema, input, kind) {
+	const result = await schema["~standard"].validate(input);
+	if (result.issues) {
+		console.debug(`Failed to parse ${schema["~standard"].vendor} schema\nissues: ${result.issues}`);
+		throw new ParserError(kind, result.issues, schema["~standard"].vendor);
+	}
+	return result.value;
+}
+function _getValidatorSchema(ctor, fnName) {
+	return _validatorSchemaStore.get(ctor)?.get(fnName);
+}
+function _setOnce(def, key, schema, fnName) {
+	if (def[key]) throw new Error(`Duplicate schema for "${String(key)}" on method "${fnName}"`);
+	def[key] = schema;
+}
+//#endregion
 //#region src/annotation/controller.ts
 const _ControllerRegistry = /* @__PURE__ */ new WeakMap();
 /**
@@ -843,12 +860,12 @@ Split these into separate @MiddlewareClass classes, or merge the logic into a si
 				return;
 			}
 			router[methodName](fp, async (request, response, next) => {
-				const schemas = _getRequestSchemas(target, fnName);
+				const schemas = _getValidatorSchema(target, fnName);
 				if (schemas) {
-					if (schemas.body) request.body = await _parseOrThrow(schemas.body, request.body, "reqbody");
-					if (schemas.param) request.params = await _parseOrThrow(schemas.param, request.params, "reqparams");
-					if (schemas.query) {
-						const parsedQuery = await _parseOrThrow(schemas.query, request.query, "reqquery");
+					if (schemas.requestBody) request.body = await _parseOrThrow(schemas.requestBody, request.body, "reqbody");
+					if (schemas.requestParam) request.params = await _parseOrThrow(schemas.requestParam, request.params, "reqparams");
+					if (schemas.requestQuery) {
+						const parsedQuery = await _parseOrThrow(schemas.requestQuery, request.query, "reqquery");
 						Object.defineProperty(request, "query", {
 							value: parsedQuery,
 							writable: true,
@@ -858,7 +875,8 @@ Split these into separate @MiddlewareClass classes, or merge the logic into a si
 				}
 				const result = await fn.bind(controllerInstance)(request, response, next);
 				if (result instanceof ResponseEntity) {
-					response.contentType("application/json").status(result.getStatusCode()).set(result.getHeaders()).send(Sapling.serialize(result.getBody()));
+					const body = schemas && schemas.responseBody ? await _parseOrThrow(schemas.responseBody, result.getBody(), "resbody") : result.getBody();
+					response.contentType("application/json").status(result.getStatusCode()).set(result.getHeaders()).send(Sapling.serialize(body));
 					return;
 				}
 				if (result instanceof RedirectView) {
@@ -925,7 +943,7 @@ DefaultResponseStatusErrorMiddleware = __decorate([MiddlewareClass()], DefaultRe
 //#region src/middleware/default/openapi/index.ts
 let DefaultOpenApiMiddleware = class DefaultOpenApiMiddleware {
 	handle(_request, _response, _next) {
-		return ResponseEntity.ok().body(_generateOpenApiSpec());
+		return ResponseEntity.ok().body(generateOpenApiSpec());
 	}
 };
 __decorate([GET(_settings.doc.openApiPath)], DefaultOpenApiMiddleware.prototype, "handle", null);
@@ -937,20 +955,7 @@ let Serve = class Serve {
 		this.handlers = swagger.serve;
 	}
 	handle(request, response, next) {
-		this.runNext(0, request, response, next);
-	}
-	runNext(i, req, res, next) {
-		if (i >= this.handlers.length) {
-			next();
-			return;
-		}
-		this.handlers[i]?.(req, res, (err) => {
-			if (err) {
-				next(err);
-				return;
-			}
-			this.runNext(i + 1, req, res, next);
-		});
+		return Sapling.chainHandlers(this.handlers, request, response, next);
 	}
 };
 __decorate([Middleware(_settings.doc.swaggerPath)], Serve.prototype, "handle", null);
@@ -970,4 +975,4 @@ const DefaultSwaggerMiddleware = {
 	Setup
 };
 //#endregion
-export { Controller, DELETE, DefaultBaseErrorMiddleware, DefaultOpenApiMiddleware, DefaultParserErrorMiddleware, DefaultResponseStatusErrorMiddleware, DefaultSwaggerMiddleware, GET, HEAD, Html404ErrorPage, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseEntity, ResponseEntityBuilder, ResponseStatusError, Sapling, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _generateOpenApiSpec, _getRequestSchemas, _getRoutes, _parseOrThrow, _registerControllerClass, _resolve, _setOpenApiConfig, _settings, methodResolve, openApiGenerator };
+export { Controller, ControllerSchema, DELETE, DefaultBaseErrorMiddleware, DefaultOpenApiMiddleware, DefaultParserErrorMiddleware, DefaultResponseStatusErrorMiddleware, DefaultSwaggerMiddleware, GET, HEAD, Html404ErrorPage, HttpStatus, Injectable, Middleware, MiddlewareClass, OPTIONS, PATCH, POST, PUT, ParserError, RedirectView, RequestBody, RequestParam, RequestQuery, ResponseBody, ResponseEntity, ResponseEntityBuilder, ResponseStatusError, RouteSchema, Sapling, _ControllerRegistry, _InjectableDeps, _InjectableRegistry, _Route, _getControllerSchema, _getOrCreateSchemaDefinition, _getRouteSchema, _getRoutes, _getValidatorSchema, _parseOrThrow, _registerControllerClass, _resolve, _setControllerSchema, _setOnce, _setRouteSchema, _settings, generateOpenApiSpec, methodResolve, openApiGenerator, setOpenApiConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tahminator/sapling",
-  "version": "2.0.5-beta.662f05c0",
+  "version": "2.0.5-beta.75e5e346",
   "author": "Tahmid Ahmed",
   "description": "A library to help you write cleaner Express.js code",
   "repository": {