@h3ravel/router 1.29.0-alpha.16 → 2.0.0-alpha.16

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 /// <reference path="./app.globals.d.ts" />
-import { ActionInput, CallableConstructor, ClassConstructor, ConcreteConstructor, GenericObject, IAbstractRouteCollection, IApplication, ICallableDispatcher, IContainer, IController, IControllerDispatcher, IDispatcher, IHttpContext, IMiddleware, IRequest, IResponse, IRoute, IRouteCollection, IRouteUrlGenerator, IRouter, IUrlGenerator, MiddlewareIdentifier, MiddlewareList, ResourceMethod, ResourceOptions, ResponsableType, RouteActions, RouteMethod, RouteParams, UrlRoutable } from "@h3ravel/contracts";
-import { Middleware, Request, Response } from "@h3ravel/http";
-import { H3, Middleware as Middleware$1, MiddlewareOptions } from "h3";
 import { Collection, ServiceProvider } from "@h3ravel/support";
+import { ActionInput, CallableConstructor, ClassConstructor, ConcreteConstructor, GenericObject, IAbstractRouteCollection, IApplication, ICallableDispatcher, IContainer, IController, IControllerDispatcher, IDispatcher, IHttpContext, IMiddleware, IRequest, IResponse, IRoute, IRouteCollection, IRouteUrlGenerator, IRouter, IUrlGenerator, MiddlewareIdentifier, MiddlewareList, ResourceMethod, ResourceOptions, ResponsableType, RouteActions, RouteMethod, RouteParams, UrlRoutable } from "@h3ravel/contracts";
 import { Magic } from "@h3ravel/shared";
 import { Command } from "@h3ravel/musket";
+import { Middleware, Request, Response } from "@h3ravel/http";
+import { H3, Middleware as Middleware$1, MiddlewareOptions } from "h3";
 import { Model } from "@h3ravel/database";
 
 //#region src/RouteParameter.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;
   /**
@@ -896,6 +896,7 @@ declare class Router extends Router_base {
    * The route group attribute stack.
    */
   protected groupStack: GenericObject<any>[];
+  protected routeLoading: Promise<void>;
   /**
    * The event dispatcher instance.
    */
@@ -1220,6 +1221,10 @@ declare class Router extends Router_base {
    * @param  routes
    */
   group<C extends ((_e: this) => void) | string>(attributes: RouteActions, routes: C | C[]): this;
+  /**
+   * Wait for route files queued by route groups to finish loading.
+   */
+  routesLoaded(): Promise<void>;
   /**
    * Update the group stack with the given attributes.
    *
@@ -1681,7 +1686,7 @@ declare class Route extends IRoute {
    *
    * @return array
    */
-  static getValidators(): IRouteValidator[] | (UriValidator | HostValidator | MethodValidator | SchemeValidator)[];
+  static getValidators(): IRouteValidator[] | (MethodValidator | UriValidator | HostValidator | SchemeValidator)[];
   /**
    * Run the route action and return the response.
    *
@@ -1766,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

@@ -2,10 +2,10 @@ import { Arr, Collection, Macroable, MacroableClass, Obj, RuntimeException, Serv
 import { Injectable, LogicException, ModelNotFoundException, NotFoundHttpException, RouteNotFoundException, UrlGenerationException } from "@h3ravel/foundation";
 import { IApplication, ICallableDispatcher, IControllerDispatcher, IResponsable, IResponse, IRoute, IRouteUrlGenerator, IRouter, IUrlGenerator, UrlRoutable } from "@h3ravel/contracts";
 import "reflect-metadata";
-import { Finalizable, Logger, Magic, UseMagic, internal, mix, trait, use } from "@h3ravel/shared";
+import { Finalizable, Logger, Magic, UseMagic, importFile, internal, mix, trait, use } from "@h3ravel/shared";
 import { Command } from "@h3ravel/musket";
 import { JsonResponse, Middleware, Request, Response, UnexpectedValueException } from "@h3ravel/http";
-import { createRequire } from "module";
+import * as facadeModule from "@h3ravel/support/facades";
 import { existsSync } from "node:fs";
 import crypto from "crypto";
 //#region src/AbstractRouteCollection.ts
@@ -3047,6 +3047,7 @@ var Router = class Router extends mix(IRouter, MacroableClass, Magic) {
 	* The route group attribute stack.
 	*/
 	groupStack = [];
+	routeLoading = Promise.resolve();
 	/**
 	* The event dispatcher instance.
 	*/
@@ -3537,13 +3538,33 @@ var Router = class Router extends mix(IRouter, MacroableClass, Magic) {
 	*/
 	group(attributes, routes) {
 		for (const groupRoutes of Arr.wrap(routes)) {
-			this.updateGroupStack(attributes);
-			this.loadRoutes(groupRoutes);
-			this.groupStack.pop();
+			if (typeof groupRoutes === "function") {
+				this.updateGroupStack(attributes);
+				this.loadRoutes(groupRoutes);
+				this.groupStack.pop();
+				continue;
+			}
+			const parentStack = [...this.groupStack];
+			this.routeLoading = this.routeLoading.then(async () => {
+				const previousStack = this.groupStack;
+				this.groupStack = [...parentStack];
+				this.updateGroupStack(attributes);
+				try {
+					await this.loadRoutes(groupRoutes);
+				} finally {
+					this.groupStack = previousStack;
+				}
+			});
 		}
 		return this;
 	}
 	/**
+	* Wait for route files queued by route groups to finish loading.
+	*/
+	async routesLoaded() {
+		await this.routeLoading;
+	}
+	/**
 	* Update the group stack with the given attributes.
 	*
 	* @param  attributes
@@ -3567,9 +3588,12 @@ var Router = class Router extends mix(IRouter, MacroableClass, Magic) {
 	* @param  routes
 	*/
 	async loadRoutes(routes) {
-		const require = createRequire(import.meta.url);
-		if (typeof routes === "function") routes(this);
-		else if (existsSync(this.app.paths.distPath(routes))) require(this.app.paths.distPath(routes));
+		if (typeof routes === "function") {
+			routes(this);
+			return;
+		}
+		const sourcePath = this.app.paths.distPath(routes);
+		if (existsSync(sourcePath)) await importFile(sourcePath, { virtualModules: { "@h3ravel/support/facades": facadeModule } });
 	}
 	/**
 	* Get the prefix from the last group on the stack.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h3ravel/router",
-  "version": "1.29.0-alpha.16",
+  "version": "2.0.0-alpha.16",
   "description": "Route facade, decorators and controller system for H3ravel.",
   "h3ravel": {
     "providers": [
@@ -8,9 +8,7 @@
     ]
   },
   "type": "module",
-  "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
-  "module": "./dist/index.js",
   "exports": {
     ".": {
       "import": "./dist/index.js",
@@ -41,22 +39,22 @@
     "laravel"
   ],
   "peerDependencies": {
-    "@h3ravel/database": "^11.15.0-alpha.16"
+    "@h3ravel/database": "^11.17.0-alpha.16"
   },
   "dependencies": {
     "h3": "2.0.1-rc.5",
-    "@h3ravel/contracts": "^1.29.0-alpha.16",
-    "@h3ravel/events": "^1.29.0-alpha.16",
+    "@h3ravel/contracts": "^2.0.0-alpha.16",
+    "@h3ravel/events": "^2.0.0-alpha.16",
     "@h3ravel/musket": "^1.29.0-alpha.15",
-    "@h3ravel/http": "^11.15.0-alpha.16",
-    "@h3ravel/shared": "^1.29.0-alpha.16",
-    "@h3ravel/support": "^1.29.0-alpha.16",
-    "@h3ravel/foundation": "^1.29.0-alpha.16",
+    "@h3ravel/http": "^11.17.0-alpha.16",
+    "@h3ravel/shared": "^2.0.0-alpha.16",
+    "@h3ravel/support": "^2.0.0-alpha.16",
+    "@h3ravel/foundation": "^2.0.0-alpha.16",
     "reflect-metadata": "^0.2.2"
   },
   "scripts": {
     "build": "tsdown --config-loader unrun",
-    "dev": "tsx watch src/index.ts",
+    "dev": "tsdown --watch --config-loader unrun",
     "start": "node dist/index.js",
     "lint": "eslint . --ext .ts",
     "test": "jest --passWithNoTests",