clear-router 2.3.5 → 2.5.0

package/README.md

@@ -49,6 +49,7 @@ yarn add clear-router express
 - Function handlers always receive context as first argument
 - Controller handlers receive hydrated `this.body`, `this.query`, `this.params`, and `this.clearRequest`
 - `clearRequest` is passed as second handler argument for controller handlers
+- Route handlers can return response values directly across Express, Fastify, Hono, and H3
 - Auto-binds controller methods
 - Full CommonJS, ESM, and TypeScript support
 - Error handling delegated to Express | H3 | Fastify | Hono

package/dist/core/index.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_router = require('../router-C-c43ybe.cjs');
+const require_router = require('../router-Cxi21bzi.cjs');
 
 exports.CoreRouter = require_router.CoreRouter;

package/dist/core/index.d.mts

@@ -1,2 +1,2 @@
-import { t as CoreRouter } from "../router-DhF8f80v.mjs";
+import { t as CoreRouter } from "../router-CVeqd7Ro.mjs";
 export { CoreRouter };

package/dist/core/index.mjs

@@ -1,3 +1,3 @@
-import { t as CoreRouter } from "../router-CHaZi7NS.mjs";
+import { t as CoreRouter } from "../router-Dxc8FQOl.mjs";
 
 export { CoreRouter };

package/dist/express/index.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_router = require('../router-C-c43ybe.cjs');
+const require_router = require('../router-Cxi21bzi.cjs');
+const require_responses = require('../responses-r-O3jS-S.cjs');
 
 //#region src/express/router.ts
 /**
@@ -14,6 +15,31 @@ var Router = class Router extends require_router.CoreRouter {
 	static ensureRequestBodyAccessor(req) {
 		if (typeof req.getBody !== "function") req.getBody = () => req.body ?? {};
 	}
+	static async sendReturnValue(req, res, value, method, path) {
+		if (require_responses.responseWasSent(res) || value === res || require_responses.responseWasSent(value)) return;
+		const meta = require_responses.resolveResponseMeta(value, {
+			headers: req.headers,
+			method,
+			path
+		});
+		if (!meta) return;
+		res.status(meta.status);
+		if (require_responses.isFetchResponse(meta.body)) {
+			meta.body.headers.forEach((headerValue, key) => {
+				res.setHeader(key, headerValue);
+			});
+			res.status(meta.body.status);
+			const body = Buffer.from(await meta.body.arrayBuffer());
+			res.send(body);
+			return;
+		}
+		if (meta.contentType && !res.getHeader("Content-Type")) res.setHeader("Content-Type", meta.contentType);
+		if (meta.isEmpty) {
+			res.sendStatus(meta.status);
+			return;
+		}
+		res.send(meta.body);
+	}
 	/**
 	* Adds a new route to the router with the specified HTTP methods, path, handler, and optional middlewares.
 	* 
@@ -178,7 +204,8 @@ var Router = class Router extends require_router.CoreRouter {
 							params: ctx.req.params
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						await Router.sendReturnValue(req, res, resolved, method, route.path);
 					} catch (error) {
 						next(error);
 					}
@@ -207,7 +234,8 @@ var Router = class Router extends require_router.CoreRouter {
 							params: ctx.req.params
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						await Router.sendReturnValue(req, res, resolved, method, route.path);
 					} catch (error) {
 						next(error);
 					}

package/dist/express/index.d.cts

@@ -12,6 +12,7 @@ import { Router as Router$1 } from "express";
 declare class Router extends CoreRouter {
   protected static routerStateNamespace: string;
   private static ensureRequestBodyAccessor;
+  private static sendReturnValue;
   /**
    * Adds a new route to the router with the specified HTTP methods, path, handler, and optional middlewares.
    *

package/dist/express/index.d.mts

@@ -1,4 +1,4 @@
-import { c as Handler, d as ApiResourceMiddleware, f as ControllerAction, l as HttpContext, m as HttpMethod, r as Route, t as CoreRouter, u as Middleware } from "../router-DhF8f80v.mjs";
+import { c as Handler, d as ApiResourceMiddleware, f as ControllerAction, l as HttpContext, m as HttpMethod, r as Route, t as CoreRouter, u as Middleware } from "../router-CVeqd7Ro.mjs";
 import { Router as Router$1 } from "express";
 
 //#region src/express/router.d.ts
@@ -12,6 +12,7 @@ import { Router as Router$1 } from "express";
 declare class Router extends CoreRouter {
   protected static routerStateNamespace: string;
   private static ensureRequestBodyAccessor;
+  private static sendReturnValue;
   /**
    * Adds a new route to the router with the specified HTTP methods, path, handler, and optional middlewares.
    *

package/dist/express/index.mjs

@@ -1,4 +1,5 @@
-import { t as CoreRouter } from "../router-CHaZi7NS.mjs";
+import { t as CoreRouter } from "../router-Dxc8FQOl.mjs";
+import { n as resolveResponseMeta, r as responseWasSent, t as isFetchResponse } from "../responses-HOePPAl8.mjs";
 
 //#region src/express/router.ts
 /**
@@ -13,6 +14,31 @@ var Router = class Router extends CoreRouter {
 	static ensureRequestBodyAccessor(req) {
 		if (typeof req.getBody !== "function") req.getBody = () => req.body ?? {};
 	}
+	static async sendReturnValue(req, res, value, method, path) {
+		if (responseWasSent(res) || value === res || responseWasSent(value)) return;
+		const meta = resolveResponseMeta(value, {
+			headers: req.headers,
+			method,
+			path
+		});
+		if (!meta) return;
+		res.status(meta.status);
+		if (isFetchResponse(meta.body)) {
+			meta.body.headers.forEach((headerValue, key) => {
+				res.setHeader(key, headerValue);
+			});
+			res.status(meta.body.status);
+			const body = Buffer.from(await meta.body.arrayBuffer());
+			res.send(body);
+			return;
+		}
+		if (meta.contentType && !res.getHeader("Content-Type")) res.setHeader("Content-Type", meta.contentType);
+		if (meta.isEmpty) {
+			res.sendStatus(meta.status);
+			return;
+		}
+		res.send(meta.body);
+	}
 	/**
 	* Adds a new route to the router with the specified HTTP methods, path, handler, and optional middlewares.
 	* 
@@ -177,7 +203,8 @@ var Router = class Router extends CoreRouter {
 							params: ctx.req.params
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						await Router.sendReturnValue(req, res, resolved, method, route.path);
 					} catch (error) {
 						next(error);
 					}
@@ -206,7 +233,8 @@ var Router = class Router extends CoreRouter {
 							params: ctx.req.params
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						await Router.sendReturnValue(req, res, resolved, method, route.path);
 					} catch (error) {
 						next(error);
 					}

package/dist/fastify/index.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_router = require('../router-C-c43ybe.cjs');
+const require_router = require('../router-Cxi21bzi.cjs');
+const require_responses = require('../responses-r-O3jS-S.cjs');
 
 //#region src/fastify/router.ts
 /**
@@ -13,6 +14,26 @@ var Router = class Router extends require_router.CoreRouter {
 	static ensureRequestBodyAccessor(req) {
 		if (typeof req.getBody !== "function") req.getBody = () => req.body ?? {};
 	}
+	static async sendReturnValue(req, reply, value, method, path) {
+		if (require_responses.responseWasSent(reply) || value === reply || require_responses.responseWasSent(value)) return value;
+		const meta = require_responses.resolveResponseMeta(value, {
+			headers: req.headers,
+			method,
+			path
+		});
+		if (!meta) return void 0;
+		reply.code(meta.status);
+		if (require_responses.isFetchResponse(meta.body)) {
+			meta.body.headers.forEach((headerValue, key) => {
+				reply.header(key, headerValue);
+			});
+			reply.code(meta.body.status);
+			return reply.send(Buffer.from(await meta.body.arrayBuffer()));
+		}
+		if (meta.contentType) reply.type(meta.contentType);
+		if (meta.isEmpty) return reply.send();
+		return reply.send(meta.body);
+	}
 	/**
 	* Add a route to the router
 	* 
@@ -176,7 +197,8 @@ var Router = class Router extends require_router.CoreRouter {
 							params: ctx.req.params ?? {}
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						return await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						return Router.sendReturnValue(req, reply, resolved, method, route.path);
 					}
 				});
 				if ([
@@ -201,7 +223,8 @@ var Router = class Router extends require_router.CoreRouter {
 							params: ctx.req.params ?? {}
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						return await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						return Router.sendReturnValue(req, reply, resolved, method, route.path);
 					}
 				});
 			}

package/dist/fastify/index.d.cts

@@ -25,6 +25,7 @@ type FastifyApp = FastifyInstance;
 declare class Router extends CoreRouter {
   protected static routerStateNamespace: string;
   private static ensureRequestBodyAccessor;
+  private static sendReturnValue;
   /**
    * Add a route to the router
    *

package/dist/fastify/index.d.mts

@@ -1,4 +1,4 @@
-import { d as ApiResourceMiddleware, f as ControllerAction, m as HttpMethod, n as ClearRequest, p as ControllerHandler, r as Route, t as CoreRouter } from "../router-DhF8f80v.mjs";
+import { d as ApiResourceMiddleware, f as ControllerAction, m as HttpMethod, n as ClearRequest, p as ControllerHandler, r as Route, t as CoreRouter } from "../router-CVeqd7Ro.mjs";
 import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 
 //#region types/fastify.d.ts
@@ -25,6 +25,7 @@ type FastifyApp = FastifyInstance;
 declare class Router extends CoreRouter {
   protected static routerStateNamespace: string;
   private static ensureRequestBodyAccessor;
+  private static sendReturnValue;
   /**
    * Add a route to the router
    *

package/dist/fastify/index.mjs

@@ -1,4 +1,5 @@
-import { t as CoreRouter } from "../router-CHaZi7NS.mjs";
+import { t as CoreRouter } from "../router-Dxc8FQOl.mjs";
+import { n as resolveResponseMeta, r as responseWasSent, t as isFetchResponse } from "../responses-HOePPAl8.mjs";
 
 //#region src/fastify/router.ts
 /**
@@ -12,6 +13,26 @@ var Router = class Router extends CoreRouter {
 	static ensureRequestBodyAccessor(req) {
 		if (typeof req.getBody !== "function") req.getBody = () => req.body ?? {};
 	}
+	static async sendReturnValue(req, reply, value, method, path) {
+		if (responseWasSent(reply) || value === reply || responseWasSent(value)) return value;
+		const meta = resolveResponseMeta(value, {
+			headers: req.headers,
+			method,
+			path
+		});
+		if (!meta) return void 0;
+		reply.code(meta.status);
+		if (isFetchResponse(meta.body)) {
+			meta.body.headers.forEach((headerValue, key) => {
+				reply.header(key, headerValue);
+			});
+			reply.code(meta.body.status);
+			return reply.send(Buffer.from(await meta.body.arrayBuffer()));
+		}
+		if (meta.contentType) reply.type(meta.contentType);
+		if (meta.isEmpty) return reply.send();
+		return reply.send(meta.body);
+	}
 	/**
 	* Add a route to the router
 	* 
@@ -175,7 +196,8 @@ var Router = class Router extends CoreRouter {
 							params: ctx.req.params ?? {}
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						return await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						return Router.sendReturnValue(req, reply, resolved, method, route.path);
 					}
 				});
 				if ([
@@ -200,7 +222,8 @@ var Router = class Router extends CoreRouter {
 							params: ctx.req.params ?? {}
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						return await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						return Router.sendReturnValue(req, reply, resolved, method, route.path);
 					}
 				});
 			}

package/dist/h3/index.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_router = require('../router-C-c43ybe.cjs');
+const require_router = require('../router-Cxi21bzi.cjs');
+const require_responses = require('../responses-r-O3jS-S.cjs');
 let h3 = require("h3");
 
 //#region src/h3/router.ts
@@ -12,6 +13,21 @@ let h3 = require("h3");
 var Router = class Router extends require_router.CoreRouter {
 	static routerStateNamespace = "clear-router:h3";
 	static bodyCache = /* @__PURE__ */ new WeakMap();
+	static toResponse(ctx, value, method, path) {
+		const meta = require_responses.resolveResponseMeta(value, {
+			headers: ctx.req.headers,
+			method,
+			path,
+			status: typeof ctx.res.status === "number" && ctx.res.status !== 200 ? ctx.res.status : void 0
+		});
+		if (!meta) return void 0;
+		if (meta.isNativeResponse) return meta.body;
+		if (meta.contentType?.startsWith("application/json")) return Response.json(meta.body, { status: meta.status });
+		return new Response(meta.isEmpty ? null : meta.body, {
+			status: meta.status,
+			headers: meta.contentType ? { "Content-Type": meta.contentType } : void 0
+		});
+	}
 	static async readBodyCached(ctx) {
 		if (this.bodyCache.has(ctx)) {
 			const cached = this.bodyCache.get(ctx);
@@ -191,7 +207,8 @@ var Router = class Router extends require_router.CoreRouter {
 							params: (0, h3.getRouterParams)(ctx, { decode: true })
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						return await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						return Router.toResponse(ctx, resolved, method, route.path);
 					} catch (error) {
 						return error;
 					}
@@ -212,7 +229,8 @@ var Router = class Router extends require_router.CoreRouter {
 							params: (0, h3.getRouterParams)(ctx, { decode: true })
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						return await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						return Router.toResponse(ctx, resolved, method, route.path);
 					} catch (error) {
 						return error;
 					}

package/dist/h3/index.d.cts

@@ -11,6 +11,7 @@ import { H3 } from "h3";
 declare class Router extends CoreRouter {
   protected static routerStateNamespace: string;
   private static readonly bodyCache;
+  private static toResponse;
   private static readBodyCached;
   /**
    * Adds a new route to the router with the specified HTTP methods, path, handler, and optional middlewares.

package/dist/h3/index.d.mts

@@ -1,4 +1,4 @@
-import { a as Handler, d as ApiResourceMiddleware, f as ControllerAction, i as H3App, m as HttpMethod, o as HttpContext, r as Route, s as Middleware, t as CoreRouter } from "../router-DhF8f80v.mjs";
+import { a as Handler, d as ApiResourceMiddleware, f as ControllerAction, i as H3App, m as HttpMethod, o as HttpContext, r as Route, s as Middleware, t as CoreRouter } from "../router-CVeqd7Ro.mjs";
 import { H3 } from "h3";
 
 //#region src/h3/router.d.ts
@@ -11,6 +11,7 @@ import { H3 } from "h3";
 declare class Router extends CoreRouter {
   protected static routerStateNamespace: string;
   private static readonly bodyCache;
+  private static toResponse;
   private static readBodyCached;
   /**
    * Adds a new route to the router with the specified HTTP methods, path, handler, and optional middlewares.

package/dist/h3/index.mjs

@@ -1,4 +1,5 @@
-import { t as CoreRouter } from "../router-CHaZi7NS.mjs";
+import { t as CoreRouter } from "../router-Dxc8FQOl.mjs";
+import { n as resolveResponseMeta } from "../responses-HOePPAl8.mjs";
 import { getQuery, getRouterParams, readBody } from "h3";
 
 //#region src/h3/router.ts
@@ -11,6 +12,21 @@ import { getQuery, getRouterParams, readBody } from "h3";
 var Router = class Router extends CoreRouter {
 	static routerStateNamespace = "clear-router:h3";
 	static bodyCache = /* @__PURE__ */ new WeakMap();
+	static toResponse(ctx, value, method, path) {
+		const meta = resolveResponseMeta(value, {
+			headers: ctx.req.headers,
+			method,
+			path,
+			status: typeof ctx.res.status === "number" && ctx.res.status !== 200 ? ctx.res.status : void 0
+		});
+		if (!meta) return void 0;
+		if (meta.isNativeResponse) return meta.body;
+		if (meta.contentType?.startsWith("application/json")) return Response.json(meta.body, { status: meta.status });
+		return new Response(meta.isEmpty ? null : meta.body, {
+			status: meta.status,
+			headers: meta.contentType ? { "Content-Type": meta.contentType } : void 0
+		});
+	}
 	static async readBodyCached(ctx) {
 		if (this.bodyCache.has(ctx)) {
 			const cached = this.bodyCache.get(ctx);
@@ -190,7 +206,8 @@ var Router = class Router extends CoreRouter {
 							params: getRouterParams(ctx, { decode: true })
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						return await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						return Router.toResponse(ctx, resolved, method, route.path);
 					} catch (error) {
 						return error;
 					}
@@ -211,7 +228,8 @@ var Router = class Router extends CoreRouter {
 							params: getRouterParams(ctx, { decode: true })
 						});
 						const result = handlerFunction(ctx, inst.clearRequest);
-						return await Promise.resolve(result);
+						const resolved = await Promise.resolve(result);
+						return Router.toResponse(ctx, resolved, method, route.path);
 					} catch (error) {
 						return error;
 					}

package/dist/hono/index.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_router = require('../router-C-c43ybe.cjs');
+const require_router = require('../router-Cxi21bzi.cjs');
+const require_responses = require('../responses-r-O3jS-S.cjs');
 
 //#region src/hono/router.ts
 /**
@@ -11,13 +12,17 @@ const require_router = require('../router-C-c43ybe.cjs');
 var Router = class Router extends require_router.CoreRouter {
 	static routerStateNamespace = "clear-router:hono";
 	static bodyCache = /* @__PURE__ */ new WeakMap();
-	static toResponse(ctx, value) {
-		if (value instanceof Response) return value;
-		if (typeof value === "undefined") return void 0;
-		if (value === null) return ctx.body(null);
-		if (typeof value === "string") return ctx.text(value);
-		if (typeof value === "object") return ctx.json(value);
-		return ctx.text(String(value));
+	static toResponse(ctx, value, method, path) {
+		const meta = require_responses.resolveResponseMeta(value, {
+			headers: ctx.req.header(),
+			method,
+			path
+		});
+		if (!meta) return void 0;
+		if (meta.isNativeResponse) return meta.body;
+		if (meta.isEmpty) return ctx.body(null, meta.status);
+		if (meta.contentType?.startsWith("application/json")) return ctx.json(meta.body, meta.status);
+		return ctx.body(meta.body, meta.status, meta.contentType ? { "Content-Type": meta.contentType } : void 0);
 	}
 	static getParams(ctx) {
 		try {
@@ -198,7 +203,7 @@ var Router = class Router extends require_router.CoreRouter {
 					});
 					const result = handlerFunction(ctx, inst.clearRequest);
 					const resolved = await Promise.resolve(result);
-					return Router.toResponse(ctx, resolved);
+					return Router.toResponse(ctx, resolved, method, route.path);
 				});
 				if ([
 					"put",
@@ -216,7 +221,7 @@ var Router = class Router extends require_router.CoreRouter {
 					});
 					const result = handlerFunction(ctx, inst.clearRequest);
 					const resolved = await Promise.resolve(result);
-					return Router.toResponse(ctx, resolved);
+					return Router.toResponse(ctx, resolved, method, route.path);
 				});
 			}
 		}

package/dist/hono/index.d.mts

@@ -1,4 +1,4 @@
-import { d as ApiResourceMiddleware, f as ControllerAction, m as HttpMethod, n as ClearRequest, p as ControllerHandler, r as Route, t as CoreRouter } from "../router-DhF8f80v.mjs";
+import { d as ApiResourceMiddleware, f as ControllerAction, m as HttpMethod, n as ClearRequest, p as ControllerHandler, r as Route, t as CoreRouter } from "../router-CVeqd7Ro.mjs";
 import { Context, HonoRequest, MiddlewareHandler } from "hono";
 
 //#region types/hono.d.ts

package/dist/hono/index.mjs

@@ -1,4 +1,5 @@
-import { t as CoreRouter } from "../router-CHaZi7NS.mjs";
+import { t as CoreRouter } from "../router-Dxc8FQOl.mjs";
+import { n as resolveResponseMeta } from "../responses-HOePPAl8.mjs";
 
 //#region src/hono/router.ts
 /**
@@ -10,13 +11,17 @@ import { t as CoreRouter } from "../router-CHaZi7NS.mjs";
 var Router = class Router extends CoreRouter {
 	static routerStateNamespace = "clear-router:hono";
 	static bodyCache = /* @__PURE__ */ new WeakMap();
-	static toResponse(ctx, value) {
-		if (value instanceof Response) return value;
-		if (typeof value === "undefined") return void 0;
-		if (value === null) return ctx.body(null);
-		if (typeof value === "string") return ctx.text(value);
-		if (typeof value === "object") return ctx.json(value);
-		return ctx.text(String(value));
+	static toResponse(ctx, value, method, path) {
+		const meta = resolveResponseMeta(value, {
+			headers: ctx.req.header(),
+			method,
+			path
+		});
+		if (!meta) return void 0;
+		if (meta.isNativeResponse) return meta.body;
+		if (meta.isEmpty) return ctx.body(null, meta.status);
+		if (meta.contentType?.startsWith("application/json")) return ctx.json(meta.body, meta.status);
+		return ctx.body(meta.body, meta.status, meta.contentType ? { "Content-Type": meta.contentType } : void 0);
 	}
 	static getParams(ctx) {
 		try {
@@ -197,7 +202,7 @@ var Router = class Router extends CoreRouter {
 					});
 					const result = handlerFunction(ctx, inst.clearRequest);
 					const resolved = await Promise.resolve(result);
-					return Router.toResponse(ctx, resolved);
+					return Router.toResponse(ctx, resolved, method, route.path);
 				});
 				if ([
 					"put",
@@ -215,7 +220,7 @@ var Router = class Router extends CoreRouter {
 					});
 					const result = handlerFunction(ctx, inst.clearRequest);
 					const resolved = await Promise.resolve(result);
-					return Router.toResponse(ctx, resolved);
+					return Router.toResponse(ctx, resolved, method, route.path);
 				});
 			}
 		}

package/dist/index.cjs

@@ -155,6 +155,11 @@ var CoreRouter = class {
 				ctx.reply.code(204).send();
 				return;
 			}
+			if (ctx?.set && "status" in ctx) {
+				ctx.set("Allow", allow);
+				ctx.status = 204;
+				ctx.body = null;
+			}
 		};
 	}
 	static config = { methodOverride: {

package/dist/index.mjs

@@ -154,6 +154,11 @@ var CoreRouter = class {
 				ctx.reply.code(204).send();
 				return;
 			}
+			if (ctx?.set && "status" in ctx) {
+				ctx.set("Allow", allow);
+				ctx.status = 204;
+				ctx.body = null;
+			}
 		};
 	}
 	static config = { methodOverride: {