@h3ravel/router 2.1.4 → 2.2.1

package/dist/index.d.ts

@@ -121,7 +121,7 @@ declare class RouteDependencyResolver {
 }
 //#endregion
 //#region src/ControllerDispatcher.d.ts
-declare const ControllerDispatcher_base: typeof RouteDependencyResolver & typeof IControllerDispatcher & typeof FiltersControllerMiddleware & (new (...args: any[]) => RouteDependencyResolver & IControllerDispatcher & FiltersControllerMiddleware);
+declare const ControllerDispatcher_base: typeof IControllerDispatcher & typeof RouteDependencyResolver & typeof FiltersControllerMiddleware & (new (...args: any[]) => IControllerDispatcher & RouteDependencyResolver & FiltersControllerMiddleware);
 declare class ControllerDispatcher extends ControllerDispatcher_base {
   protected container: IApplication;
   /**
@@ -1686,7 +1686,7 @@ declare class Route extends IRoute {
    *
    * @return array
    */
-  static getValidators(): IRouteValidator[] | (UriValidator | MethodValidator | SchemeValidator | HostValidator)[];
+  static getValidators(): IRouteValidator[] | (MethodValidator | HostValidator | SchemeValidator | UriValidator)[];
   /**
    * Run the route action and return the response.
    *
@@ -1771,7 +1771,7 @@ declare abstract class AbstractRouteCollection implements IAbstractRouteCollecti
 }
 //#endregion
 //#region src/CallableDispatcher.d.ts
-declare const CallableDispatcher_base: typeof ICallableDispatcher & typeof RouteDependencyResolver & (new (...args: any[]) => ICallableDispatcher & RouteDependencyResolver);
+declare const CallableDispatcher_base: typeof RouteDependencyResolver & typeof ICallableDispatcher & (new (...args: any[]) => RouteDependencyResolver & ICallableDispatcher);
 declare class CallableDispatcher extends CallableDispatcher_base {
   protected container: IApplication;
   /**

package/dist/index.js

@@ -3302,8 +3302,16 @@ var Router = class Router extends mix(IRouter, MacroableClass, Magic) {
 	*/
 	static toResponse(request, response) {
 		if (response instanceof IResponsable) response = response.toResponse(request);
-		if (response instanceof Stringable || typeof response === "string") response = new Response(request.app, response.toString(), 200, { "Content-Type": "text/html" });
-		else if (!(response instanceof IResponse) && !(response instanceof Response)) response = new JsonResponse(request.app, response);
+		const eventResponse = request.getEvent().res;
+		const status = eventResponse.status;
+		const statusText = eventResponse.statusText;
+		const headers = Object.fromEntries(eventResponse.headers.entries());
+		if (response instanceof Stringable || typeof response === "string") response = new Response(request.app, response.toString(), status, {
+			...headers,
+			"Content-Type": "text/html"
+		});
+		else if (!(response instanceof IResponse) && !(response instanceof Response)) response = new JsonResponse(request.app, response, status, headers);
+		if (statusText) response.setStatusCode(response.getStatusCode(), statusText);
 		if (response.getStatusCode() === Response.codes.HTTP_NOT_MODIFIED) response.setNotModified();
 		return response.prepare(request);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/router",
-  "version": "2.1.4",
+  "version": "2.2.1",
   "description": "Route facade, decorators and controller system for H3ravel.",
   "h3ravel": {
     "providers": [
@@ -10,11 +10,8 @@
   "type": "module",
   "types": "./dist/index.d.ts",
   "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
-    },
-    "./*": "./*"
+    ".": "./dist/index.js",
+    "./package.json": "./package.json"
   },
   "files": [
     "dist"
@@ -39,17 +36,17 @@
     "laravel"
   ],
   "peerDependencies": {
-    "@h3ravel/database": "^11.18.4"
+    "@h3ravel/database": "^11.19.1"
   },
   "dependencies": {
-    "h3": "2.0.1-rc.5",
-    "@h3ravel/contracts": "^2.1.4",
-    "@h3ravel/events": "^2.1.4",
-    "@h3ravel/musket": "^1.29.0-alpha.15",
-    "@h3ravel/http": "^11.18.4",
-    "@h3ravel/shared": "^2.1.4",
-    "@h3ravel/support": "^2.1.4",
-    "@h3ravel/foundation": "^2.1.4",
+    "h3": "^2.0.1-rc.22",
+    "@h3ravel/contracts": "^2.2.1",
+    "@h3ravel/events": "^2.2.1",
+    "@h3ravel/musket": "^2.2.1",
+    "@h3ravel/http": "^11.19.1",
+    "@h3ravel/shared": "^2.2.1",
+    "@h3ravel/support": "^2.2.1",
+    "@h3ravel/foundation": "^2.2.1",
     "reflect-metadata": "^0.2.2"
   },
   "scripts": {