refactor(router): clean up naming

Author: vsavkin

modules/@angular/router/index.ts

@@ -7,16 +7,16 @@
  */
 
 
-export {ExtraOptions, provideRoutes, provideRouterConfig} from './src/common_router_providers';
-export {Data, ResolveData, Route, RouterConfig} from './src/config';
+export {ExtraOptions, provideRouterConfig, provideRoutes} from './src/common_router_providers';
+export {Data, ResolveData, Route, RouterConfig, Routes} from './src/config';
 export {RouterLink, RouterLinkWithHref} from './src/directives/router_link';
 export {RouterLinkActive} from './src/directives/router_link_active';
 export {RouterOutlet} from './src/directives/router_outlet';
 export {CanActivate, CanDeactivate, Resolve} from './src/interfaces';
 export {Event, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Router, RoutesRecognized} from './src/router';
+export {ROUTER_DIRECTIVES, RouterAppModule} from './src/router_app_module';
 export {RouterOutletMap} from './src/router_outlet_map';
 export {provideRouter} from './src/router_providers';
 export {ActivatedRoute, ActivatedRouteSnapshot, RouterState, RouterStateSnapshot} from './src/router_state';
 export {PRIMARY_OUTLET, Params} from './src/shared';
-export {RouterAppModule, ROUTER_DIRECTIVES} from './src/router_app_module';
 export {DefaultUrlSerializer, UrlPathWithParams, UrlSerializer, UrlTree} from './src/url_tree';

modules/@angular/router/src/apply_redirects.ts

@@ -15,7 +15,7 @@ import {Observer} from 'rxjs/Observer';
 import {of } from 'rxjs/observable/of';
 import {EmptyError} from 'rxjs/util/EmptyError';
 
-import {Route, RouterConfig} from './config';
+import {Route, Routes} from './config';
 import {RouterConfigLoader} from './router_config_loader';
 import {PRIMARY_OUTLET} from './shared';
 import {UrlPathWithParams, UrlSegment, UrlTree} from './url_tree';
@@ -38,7 +38,7 @@ function absoluteRedirect(newPaths: UrlPathWithParams[]): Observable<UrlSegment>
 }
 
 export function applyRedirects(
-    configLoader: RouterConfigLoader, urlTree: UrlTree, config: RouterConfig): Observable<UrlTree> {
+    configLoader: RouterConfigLoader, urlTree: UrlTree, config: Routes): Observable<UrlTree> {
   return expandSegment(configLoader, config, urlTree.root, PRIMARY_OUTLET)
       .map(rootSegment => createUrlTree(urlTree, rootSegment))
       .catch(e => {
@@ -190,8 +190,8 @@ function matchPathsWithParamsAgainstRoute(
 function getChildConfig(configLoader: RouterConfigLoader, route: Route): Observable<Route[]> {
   if (route.children) {
     return of (route.children);
-  } else if (route.mountChildren) {
-    return configLoader.load(route.mountChildren).map(r => {
+  } else if (route.loadChildren) {
+    return configLoader.load(route.loadChildren).map(r => {
       (<any>route)._loadedConfig = r;
       return r.routes;
     });

modules/@angular/router/src/common_router_providers.ts

@@ -9,14 +9,14 @@
 import {Location, LocationStrategy, PathLocationStrategy} from '@angular/common';
 import {APP_INITIALIZER, AppModuleFactoryLoader, ApplicationRef, ComponentResolver, Injector, OpaqueToken, SystemJsAppModuleLoader} from '@angular/core';
 
-import {RouterConfig} from './config';
+import {Routes} from './config';
 import {Router} from './router';
-import {ROUTER_CONFIG} from './router_config_loader';
+import {ROUTER_CONFIG, ROUTES} from './router_config_loader';
 import {RouterOutletMap} from './router_outlet_map';
 import {ActivatedRoute} from './router_state';
 import {DefaultUrlSerializer, UrlSerializer} from './url_tree';
 
-export const ROUTER_OPTIONS = new OpaqueToken('ROUTER_OPTIONS');
+export const ROUTER_CONFIGURATION = new OpaqueToken('ROUTER_CONFIGURATION');
 
 /**
  * @experimental
@@ -26,7 +26,7 @@ export interface ExtraOptions { enableTracing?: boolean; }
 export function setupRouter(
     ref: ApplicationRef, resolver: ComponentResolver, urlSerializer: UrlSerializer,
     outletMap: RouterOutletMap, location: Location, injector: Injector,
-    loader: AppModuleFactoryLoader, config: RouterConfig, opts: ExtraOptions) {
+    loader: AppModuleFactoryLoader, config: Routes, opts: ExtraOptions) {
   if (ref.componentTypes.length == 0) {
     throw new Error('Bootstrap at least one component before injecting Router.');
   }
@@ -82,18 +82,20 @@ export function setupRouterInitializer(injector: Injector) {
  *
  * @deprecated use RouterAppModule instead
  */
-export function provideRouter(_config: RouterConfig, _opts: ExtraOptions): any[] {
+export function provideRouter(routes: Routes, config: ExtraOptions): any[] {
   return [
-    {provide: ROUTER_CONFIG, useValue: _config}, {provide: ROUTER_OPTIONS, useValue: _opts},
-    Location, {provide: LocationStrategy, useClass: PathLocationStrategy},
+    {provide: ROUTES, useExisting: ROUTER_CONFIG}, {provide: ROUTER_CONFIG, useValue: routes},
+
+    {provide: ROUTER_CONFIGURATION, useValue: config}, Location,
+    {provide: LocationStrategy, useClass: PathLocationStrategy},
     {provide: UrlSerializer, useClass: DefaultUrlSerializer},
 
     {
       provide: Router,
       useFactory: setupRouter,
       deps: [
         ApplicationRef, ComponentResolver, UrlSerializer, RouterOutletMap, Location, Injector,
-        AppModuleFactoryLoader, ROUTER_CONFIG, ROUTER_OPTIONS
+        AppModuleFactoryLoader, ROUTES, ROUTER_CONFIGURATION
       ]
     },
 
@@ -122,8 +124,8 @@ export function provideRouter(_config: RouterConfig, _opts: ExtraOptions): any[]
  *
  * @experimental
  */
-export function provideRoutes(config: RouterConfig): any {
-  return {provide: ROUTER_CONFIG, useValue: config};
+export function provideRoutes(routes: Routes): any {
+  return {provide: ROUTES, useValue: routes};
 }
 
 /**
@@ -142,6 +144,6 @@ export function provideRoutes(config: RouterConfig): any {
  *
  * @experimental
  */
-export function provideRouterConfig(options: ExtraOptions): any {
-  return {provide: ROUTER_OPTIONS, useValue: options};
+export function provideRouterConfig(config: ExtraOptions): any {
+  return {provide: ROUTER_CONFIGURATION, useValue: config};
 }