fix(router): make addRoute split list of routes into multiple routeco…

…nfigs with single route each

src/router-configuration.js

@@ -1,4 +1,5 @@
 import {RouteConfig} from './interfaces';
+import {_ensureArrayWithSingleRoutePerConfig} from './util'
 
 /**
  * Class used to configure a [[Router]] instance.
@@ -111,17 +112,7 @@ export class RouterConfiguration {
   */
   mapRoute(config: RouteConfig): RouterConfiguration {
     this.instructions.push(router => {
-      let routeConfigs = [];
-
-      if (Array.isArray(config.route)) {
-        for (let i = 0, ii = config.route.length; i < ii; ++i) {
-          let current = Object.assign({}, config);
-          current.route = config.route[i];
-          routeConfigs.push(current);
-        }
-      } else {
-        routeConfigs.push(Object.assign({}, config));
-      }
+      let routeConfigs = _ensureArrayWithSingleRoutePerConfig(config);
 
       let navModel;
       for (let i = 0, ii = routeConfigs.length; i < ii; ++i) {

src/router.js

@@ -5,6 +5,7 @@ import {NavigationInstruction} from './navigation-instruction';
 import {NavModel} from './nav-model';
 import {RouterConfiguration} from './router-configuration';
 import {
+  _ensureArrayWithSingleRoutePerConfig,
   _normalizeAbsolutePath,
   _createRootedPath,
   _resolveUrl} from './util';
@@ -299,6 +300,12 @@ export class Router {
   * @param navModel The [[NavModel]] to use for the route. May be omitted for single-pattern routes.
   */
   addRoute(config: RouteConfig, navModel?: NavModel): void {
+    if (Array.isArray(config.route)) {
+      let routeConfigs = _ensureArrayWithSingleRoutePerConfig(config);
+      routeConfigs.forEach(this.addRoute.bind(this));
+      return;
+    }
+
     validateRouteConfig(config, this.routes);
 
     if (!('viewPorts' in config) && !config.navigationStrategy) {

src/util.js

@@ -42,5 +42,21 @@ export function _resolveUrl(fragment, baseUrl, hasPushState) {
   return _createRootedPath(fragment, baseUrl, hasPushState);
 }
 
+export function _ensureArrayWithSingleRoutePerConfig(config) {
+  let routeConfigs = [];
+
+  if (Array.isArray(config.route)) {
+    for (let i = 0, ii = config.route.length; i < ii; ++i) {
+      let current = Object.assign({}, config);
+      current.route = config.route[i];
+      routeConfigs.push(current);
+    }
+  } else {
+    routeConfigs.push(Object.assign({}, config));
+  }
+
+  return routeConfigs;
+}
+
 const isRootedPath = /^#?\//;
 const isAbsoluteUrl = /^([a-z][a-z0-9+\-.]*:)?\/\//i;

test/router.spec.js

@@ -71,6 +71,12 @@ describe('the router', () => {
         'number2': { moduleId: 'test2' }
       }})).not.toThrow();
     });
+
+    it('should map a routeconfig with an array of routes to multiple routeconfigs with one route each', () => {
+      router.addRoute({ route: ['test1', 'test2'], moduleId: 'test', nav: true });
+      expect(router.routes[0].route).toEqual('test1');
+      expect(router.routes[1].route).toEqual('test2');
+    });
   });
 
   describe('generate', () => {