clear-router 2.1.11 → 2.1.12

package/dist/{basic-DXbqD6cP.d.cts → basic-C_1O6RVq.d.cts}

@@ -5,10 +5,15 @@ import { H3, H3Event, Middleware as Middleware$1, TypedServerRequest } from "h3"
 type H3App = Omit<H3['fetch'], 'fetch'> & {
   fetch: (request: TypedServerRequest) => Promise<Response>;
 };
+type HttpRequest = H3Event['req'] & {
+  getBody: () => Record<string, any>;
+};
 /**
  * HTTP context passed to route handlers
  */
-type HttpContext$1 = H3Event & {};
+type HttpContext$1 = Omit<H3Event, 'req'> & {
+  req: HttpRequest;
+};
 /**
  * Route handler function type
  */
@@ -66,11 +71,14 @@ declare class ClearRequest<X = any, M = Middleware$1 | Middleware> {
 }
 //#endregion
 //#region types/express.d.ts
+interface RequestWithGetBody extends Request {
+  getBody: () => Record<string, any>;
+}
 /**
  * HTTP context passed to route handlers
  */
 interface HttpContext {
-  req: Request;
+  req: RequestWithGetBody;
   res: Response$1;
   next: NextFunction;
 }

package/dist/{basic-vvrFwa_Y.d.mts → basic-cLeny2Zk.d.mts}

@@ -5,10 +5,15 @@ import { NextFunction, Request, Response as Response$1 } from "express";
 type H3App = Omit<H3['fetch'], 'fetch'> & {
   fetch: (request: TypedServerRequest) => Promise<Response>;
 };
+type HttpRequest = H3Event['req'] & {
+  getBody: () => Record<string, any>;
+};
 /**
  * HTTP context passed to route handlers
  */
-type HttpContext$1 = H3Event & {};
+type HttpContext$1 = Omit<H3Event, 'req'> & {
+  req: HttpRequest;
+};
 /**
  * Route handler function type
  */
@@ -66,11 +71,14 @@ declare class ClearRequest<X = any, M = Middleware$1 | Middleware> {
 }
 //#endregion
 //#region types/express.d.ts
+interface RequestWithGetBody extends Request {
+  getBody: () => Record<string, any>;
+}
 /**
  * HTTP context passed to route handlers
  */
 interface HttpContext {
-  req: Request;
+  req: RequestWithGetBody;
   res: Response$1;
   next: NextFunction;
 }

package/dist/express/index.cjs

@@ -69,6 +69,9 @@ var Router = class Router {
 		const headerKeys = override.headerKeys;
 		if (typeof headerKeys !== "undefined") this.config.methodOverride.headerKeys = (Array.isArray(headerKeys) ? headerKeys : [headerKeys]).map((e) => String(e).trim().toLowerCase()).filter(Boolean);
 	}
+	static ensureRequestBodyAccessor(req) {
+		if (typeof req.getBody !== "function") req.getBody = () => req.body ?? {};
+	}
 	static resolveMethodOverride(method, headers, body) {
 		if (!this.config.methodOverride?.enabled || method.toLowerCase() !== "post") return null;
 		let override;
@@ -309,11 +312,13 @@ var Router = class Router {
 					throw error;
 				}
 				router[method](route.path, (req, res, next) => {
+					Router.ensureRequestBodyAccessor(req);
 					const override = Router.resolveMethodOverride(req.method, req.headers, req.body);
 					if (method === "post" && override && override !== "post") return next("route");
 					return next();
 				}, ...route.middlewares || [], async (req, res, next) => {
 					try {
+						Router.ensureRequestBodyAccessor(req);
 						const ctx = {
 							req,
 							res,
@@ -332,11 +337,13 @@ var Router = class Router {
 					"patch",
 					"delete"
 				].includes(method)) router.post(route.path, (req, res, next) => {
+					Router.ensureRequestBodyAccessor(req);
 					if (Router.resolveMethodOverride(req.method, req.headers, req.body) !== method) return next("route");
 					req.method = method.toUpperCase();
 					return next();
 				}, ...route.middlewares || [], async (req, res, next) => {
 					try {
+						Router.ensureRequestBodyAccessor(req);
 						const ctx = {
 							req,
 							res,
@@ -355,8 +362,9 @@ var Router = class Router {
 	}
 	static async bindRequestToInstance(ctx, instance, route) {
 		if (!instance) return;
+		Router.ensureRequestBodyAccessor(ctx.req);
 		instance.ctx = ctx;
-		instance.body = ctx.req.body;
+		instance.body = ctx.req.getBody();
 		instance.query = ctx.req.query;
 		instance.params = ctx.req.params;
 		instance.clearRequest = new require_Route.ClearRequest({

package/dist/express/index.d.cts

@@ -1,4 +1,4 @@
-import { a as Handler, c as Route, i as RouterConfig, n as ControllerAction, o as HttpContext, r as HttpMethod, s as Middleware, t as ApiResourceMiddleware } from "../basic-DXbqD6cP.cjs";
+import { a as Handler, c as Route, i as RouterConfig, n as ControllerAction, o as HttpContext, r as HttpMethod, s as Middleware, t as ApiResourceMiddleware } from "../basic-C_1O6RVq.cjs";
 import { Router as Router$1 } from "express";
 
 //#region src/express/router.d.ts
@@ -49,6 +49,7 @@ declare class Router {
    * @returns
    */
   static configure(options?: RouterConfig): void;
+  private static ensureRequestBodyAccessor;
   private static resolveMethodOverride;
   /**
     * Add a route with specified HTTP methods, path, handler, and middlewares

package/dist/express/index.d.mts

@@ -1,4 +1,4 @@
-import { a as Handler, c as Route, i as RouterConfig, n as ControllerAction, o as HttpContext, r as HttpMethod, s as Middleware, t as ApiResourceMiddleware } from "../basic-vvrFwa_Y.mjs";
+import { a as Handler, c as Route, i as RouterConfig, n as ControllerAction, o as HttpContext, r as HttpMethod, s as Middleware, t as ApiResourceMiddleware } from "../basic-cLeny2Zk.mjs";
 import { Router as Router$1 } from "express";
 
 //#region src/express/router.d.ts
@@ -49,6 +49,7 @@ declare class Router {
    * @returns
    */
   static configure(options?: RouterConfig): void;
+  private static ensureRequestBodyAccessor;
   private static resolveMethodOverride;
   /**
     * Add a route with specified HTTP methods, path, handler, and middlewares

package/dist/express/index.mjs

@@ -68,6 +68,9 @@ var Router = class Router {
 		const headerKeys = override.headerKeys;
 		if (typeof headerKeys !== "undefined") this.config.methodOverride.headerKeys = (Array.isArray(headerKeys) ? headerKeys : [headerKeys]).map((e) => String(e).trim().toLowerCase()).filter(Boolean);
 	}
+	static ensureRequestBodyAccessor(req) {
+		if (typeof req.getBody !== "function") req.getBody = () => req.body ?? {};
+	}
 	static resolveMethodOverride(method, headers, body) {
 		if (!this.config.methodOverride?.enabled || method.toLowerCase() !== "post") return null;
 		let override;
@@ -308,11 +311,13 @@ var Router = class Router {
 					throw error;
 				}
 				router[method](route.path, (req, res, next) => {
+					Router.ensureRequestBodyAccessor(req);
 					const override = Router.resolveMethodOverride(req.method, req.headers, req.body);
 					if (method === "post" && override && override !== "post") return next("route");
 					return next();
 				}, ...route.middlewares || [], async (req, res, next) => {
 					try {
+						Router.ensureRequestBodyAccessor(req);
 						const ctx = {
 							req,
 							res,
@@ -331,11 +336,13 @@ var Router = class Router {
 					"patch",
 					"delete"
 				].includes(method)) router.post(route.path, (req, res, next) => {
+					Router.ensureRequestBodyAccessor(req);
 					if (Router.resolveMethodOverride(req.method, req.headers, req.body) !== method) return next("route");
 					req.method = method.toUpperCase();
 					return next();
 				}, ...route.middlewares || [], async (req, res, next) => {
 					try {
+						Router.ensureRequestBodyAccessor(req);
 						const ctx = {
 							req,
 							res,
@@ -354,8 +361,9 @@ var Router = class Router {
 	}
 	static async bindRequestToInstance(ctx, instance, route) {
 		if (!instance) return;
+		Router.ensureRequestBodyAccessor(ctx.req);
 		instance.ctx = ctx;
-		instance.body = ctx.req.body;
+		instance.body = ctx.req.getBody();
 		instance.query = ctx.req.query;
 		instance.params = ctx.req.params;
 		instance.clearRequest = new ClearRequest({

package/dist/h3/index.cjs

@@ -65,8 +65,17 @@ var Router = class Router {
 		if (typeof headerKeys !== "undefined") this.config.methodOverride.headerKeys = (Array.isArray(headerKeys) ? headerKeys : [headerKeys]).map((e) => String(e).trim().toLowerCase()).filter(Boolean);
 	}
 	static async readBodyCached(ctx) {
-		if (this.bodyCache.has(ctx)) return this.bodyCache.get(ctx);
-		const body = await (0, h3.readBody)(ctx) ?? {};
+		if (this.bodyCache.has(ctx)) {
+			const cached = this.bodyCache.get(ctx);
+			ctx.req.getBody = () => cached;
+			return cached;
+		}
+		let body = {};
+		if (ctx.req.headers.get("content-type")?.includes("multipart/form-data")) (await ctx.req.formData()).forEach((value, key) => {
+			body[key] = value;
+		});
+		else body = await (0, h3.readBody)(ctx) ?? {};
+		ctx.req.getBody = () => body;
 		this.bodyCache.set(ctx, body);
 		return body;
 	}

package/dist/h3/index.d.cts

@@ -1,4 +1,4 @@
-import { c as Route, d as HttpContext, f as Middleware, i as RouterConfig, l as H3App, n as ControllerAction, r as HttpMethod, t as ApiResourceMiddleware, u as Handler } from "../basic-DXbqD6cP.cjs";
+import { c as Route, d as HttpContext, f as Middleware, i as RouterConfig, l as H3App, n as ControllerAction, r as HttpMethod, t as ApiResourceMiddleware, u as Handler } from "../basic-C_1O6RVq.cjs";
 import { H3 } from "h3";
 
 //#region src/h3/router.d.ts

package/dist/h3/index.d.mts

@@ -1,4 +1,4 @@
-import { c as Route, d as HttpContext, f as Middleware, i as RouterConfig, l as H3App, n as ControllerAction, r as HttpMethod, t as ApiResourceMiddleware, u as Handler } from "../basic-vvrFwa_Y.mjs";
+import { c as Route, d as HttpContext, f as Middleware, i as RouterConfig, l as H3App, n as ControllerAction, r as HttpMethod, t as ApiResourceMiddleware, u as Handler } from "../basic-cLeny2Zk.mjs";
 import { H3 } from "h3";
 
 //#region src/h3/router.d.ts

package/dist/h3/index.mjs

@@ -64,8 +64,17 @@ var Router = class Router {
 		if (typeof headerKeys !== "undefined") this.config.methodOverride.headerKeys = (Array.isArray(headerKeys) ? headerKeys : [headerKeys]).map((e) => String(e).trim().toLowerCase()).filter(Boolean);
 	}
 	static async readBodyCached(ctx) {
-		if (this.bodyCache.has(ctx)) return this.bodyCache.get(ctx);
-		const body = await readBody(ctx) ?? {};
+		if (this.bodyCache.has(ctx)) {
+			const cached = this.bodyCache.get(ctx);
+			ctx.req.getBody = () => cached;
+			return cached;
+		}
+		let body = {};
+		if (ctx.req.headers.get("content-type")?.includes("multipart/form-data")) (await ctx.req.formData()).forEach((value, key) => {
+			body[key] = value;
+		});
+		else body = await readBody(ctx) ?? {};
+		ctx.req.getBody = () => body;
 		this.bodyCache.set(ctx, body);
 		return body;
 	}

package/dist/index.d.cts

@@ -2,10 +2,15 @@ import { NextFunction, Request, Response as Response$1 } from "express";
 import { H3Event, Middleware as Middleware$1 } from "h3";
 
 //#region types/h3.d.ts
+type HttpRequest = H3Event['req'] & {
+  getBody: () => Record<string, any>;
+};
 /**
  * HTTP context passed to route handlers
  */
-type HttpContext = H3Event & {};
+type HttpContext = Omit<H3Event, 'req'> & {
+  req: HttpRequest;
+};
 /**
  * Route handler function type
  */
@@ -13,10 +18,12 @@ type RouteHandler = (
 /**
  * H3 event context
  */
+
 ctx: HttpContext,
 /**
  * ClearRequest instance
  */
+
 req: ClearRequest) => any | Promise<any>;
 /**
  * Handler can be either a function or controller reference

package/dist/index.d.mts

@@ -2,10 +2,15 @@ import { NextFunction, Request, Response as Response$1 } from "express";
 import { H3Event, Middleware as Middleware$1 } from "h3";
 
 //#region types/h3.d.ts
+type HttpRequest = H3Event['req'] & {
+  getBody: () => Record<string, any>;
+};
 /**
  * HTTP context passed to route handlers
  */
-type HttpContext = H3Event & {};
+type HttpContext = Omit<H3Event, 'req'> & {
+  req: HttpRequest;
+};
 /**
  * Route handler function type
  */
@@ -13,10 +18,12 @@ type RouteHandler = (
 /**
  * H3 event context
  */
+
 ctx: HttpContext,
 /**
  * ClearRequest instance
  */
+
 req: ClearRequest) => any | Promise<any>;
 /**
  * Handler can be either a function or controller reference

package/dist/types/express.d.mts

@@ -3,11 +3,14 @@ import { ControllerHandler } from "./basic.mjs";
 import { NextFunction, Request, Response } from "express";
 
 //#region types/express.d.ts
+interface RequestWithGetBody extends Request {
+  getBody: () => Record<string, any>;
+}
 /**
  * HTTP context passed to route handlers
  */
 interface HttpContext {
-  req: Request;
+  req: RequestWithGetBody;
   res: Response;
   next: NextFunction;
 }
@@ -34,4 +37,4 @@ type Handler = RouteHandler | ControllerHandler;
  */
 type Middleware = (req: Request, res: Response, next: NextFunction) => any | Promise<any>;
 //#endregion
-export { Handler, HttpContext, Middleware, RouteHandler };
+export { Handler, HttpContext, Middleware, RequestWithGetBody, RouteHandler };

package/dist/types/h3.d.mts

@@ -7,10 +7,15 @@ type H3App = Omit<H3['fetch'], 'fetch'> & {
   fetch: (request: TypedServerRequest) => Promise<Response>;
 };
 type MaybePromise<T = unknown> = T | Promise<T>;
+type HttpRequest = H3Event['req'] & {
+  getBody: () => Record<string, any>;
+};
 /**
  * HTTP context passed to route handlers
  */
-type HttpContext = H3Event & {};
+type HttpContext = Omit<H3Event, 'req'> & {
+  req: HttpRequest;
+};
 /**
  * Route handler function type
  */
@@ -31,4 +36,4 @@ req: ClearRequest) => any | Promise<any>;
 type Handler = RouteHandler | ControllerHandler;
 type NextFunction = () => MaybePromise<unknown | undefined>;
 //#endregion
-export { H3App, Handler, HttpContext, MaybePromise, type Middleware, NextFunction, RouteHandler };
+export { H3App, Handler, HttpContext, HttpRequest, MaybePromise, type Middleware, NextFunction, RouteHandler };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clear-router",
-  "version": "2.1.11",
+  "version": "2.1.12",
   "description": "Laravel-style routing system for Express.js and H3, with CommonJS, ESM, and TypeScript support",
   "keywords": [
     "h3",
@@ -80,6 +80,7 @@
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.56.1",
     "vite-tsconfig-paths": "^6.1.1",
+    "vitepress": "^1.6.4",
     "vitest": "^4.0.18"
   },
   "engines": {
@@ -88,6 +89,9 @@
   "scripts": {
     "test": "vitest",
     "lint": "eslint",
+    "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs",
     "test:esm": "vitest tests/esm.test.ts",
     "test:ts": "vitest tests/typescript.test.ts",
     "test:coverage": "vitest run --coverage",