Merge pull request #38 from Michaelpalacce/develop

[develop] v28.2.0

UPDATELOG.md

@@ -1,3 +1,6 @@
+28.2.0
+- Routers can now be added more than once using the router.add( 'path', router ) syntax
+
 28.1.1
 - Updated documentation a bit
 - EventRequest.sendError is now async

package.json

@@ -61,7 +61,7 @@
     "test": "nyc --reporter=lcov --reporter=text-summary node test.js --debug",
     "deploy": "npm run test && npm publish"
   },
-  "version": "28.1.1",
+  "version": "28.2.0",
   "devDependencies": {
     "nyc": "^15.1.0"
   }

server/components/routing/router.js

@@ -301,29 +301,47 @@ class Router extends PluginInterface
 	 */
 	_concat( router, path = null )
 	{
+		let middlewares;
+
 		if ( path !== null )
 		{
-			for ( const middleware of router.middleware )
+			middlewares	= [];
+			for ( const originalMiddleware of router.middleware )
 			{
-				if ( middleware.route === '/' )
-					middleware.route	= '';
+				let route	= originalMiddleware.route;
+
+				if ( route === '/' )
+					route	= '';
 
-				if ( middleware.route instanceof RegExp )
+				if ( originalMiddleware.route instanceof RegExp )
 				{
-					let regex	= middleware.route.source;
+					let regex	= originalMiddleware.route.source;
 
 					if ( regex.startsWith( '^' ) )
 						regex	= regex.substring( 1 );
 
-					middleware.route	= new RegExp( `${path}${regex}`, middleware.route.flags );
-					continue;
+					route	= new RegExp( `${path}${regex}`, originalMiddleware.route.flags );
+				}
+				else
+				{
+					route	= path + route;
 				}
 
-				middleware.route	= path + middleware.route;
+				middlewares.push( new Route({
+						handler		: originalMiddleware.getHandler(),
+						method		: originalMiddleware.getMethod(),
+						middlewares	: originalMiddleware.getMiddlewares(),
+						route
+					})
+				);
 			}
 		}
+		else
+		{
+			middlewares	= router.middleware;
+		}
 
-		this.middleware	= this.middleware.concat( router.middleware );
+		this.middleware	= this.middleware.concat( middlewares );
 
 		for ( const [key, value] of Object.entries( router.globalMiddlewares ) )
 			this.define( key, value );