BREAKING CHANGE: Replace UrlRouterProvider/UrlRouter with just UrlRouter

The configuration functions from the provider object have been integrated into the normal UrlRouter object.
The `UIRouter` object no longer has a `uriRouterProvider`, but the equivalent functions can be found on `uiRouter`

One difference between the old functions on `urlRouterProvider` and the new ones on `uriRouter` is that new functions do not accept injectable functions.

Author: christopherthielen

src/router.ts

@@ -3,7 +3,7 @@
  * @module core
  */ /** */
 import { UrlMatcherFactory } from "./url/urlMatcherFactory";
-import { UrlRouterProvider, UrlRouter } from "./url/urlRouter";
+import { UrlRouter } from "./url/urlRouter";
 import { TransitionService } from "./transition/transitionService";
 import { ViewService } from "./view/view";
 import { StateRegistry } from "./state/stateRegistry";
@@ -41,11 +41,9 @@ export class UIRouter {
 
   urlMatcherFactory: UrlMatcherFactory = new UrlMatcherFactory();
 
-  urlRouterProvider: UrlRouterProvider = new UrlRouterProvider(this);
-
   urlRouter: UrlRouter = new UrlRouter(this);
 
-  stateRegistry: StateRegistry = new StateRegistry(this.urlMatcherFactory, this.urlRouterProvider);
+  stateRegistry: StateRegistry = new StateRegistry(this);
 
   stateService = new StateService(this);
 
@@ -92,7 +90,6 @@ export class UIRouter {
     this.globals.current = this.globals.$current.self;
 
     this.disposable(this.transitionService);
-    this.disposable(this.urlRouterProvider);
     this.disposable(this.urlRouter);
     this.disposable(this.stateRegistry);
     this.disposable(locationService);

src/state/stateQueueManager.ts

@@ -4,20 +4,19 @@ import { isString } from "../common/predicates";
 import { StateDeclaration } from "./interface";
 import { State } from "./stateObject";
 import { StateBuilder } from "./stateBuilder";
-import { UrlRouterProvider } from "../url/urlRouter";
-import { StateRegistry, StateRegistryListener } from "./stateRegistry";
+import { StateRegistryListener, StateRegistry } from "./stateRegistry";
 import { Disposable } from "../interface";
-import { UrlRuleFactory } from "../url/urlRule";
+import { UrlRouter } from "../url/urlRouter";
 
 /** @internalapi */
 export class StateQueueManager implements Disposable {
   queue: State[];
 
   constructor(
+      private $registry: StateRegistry,
+      private $urlRouter: UrlRouter,
       public states: { [key: string]: State; },
-      public $registry: StateRegistry,
       public builder: StateBuilder,
-      public $urlRouterProvider: UrlRouterProvider,
       public listeners: StateRegistryListener[]) {
     this.queue = [];
   }
@@ -100,7 +99,8 @@ export class StateQueueManager implements Disposable {
 
   attachRoute(state: State) {
     if (state.abstract || !state.url) return;
-    state._urlRule = new UrlRuleFactory(this.$urlRouterProvider._router).fromState(state);
-    this.$urlRouterProvider.addRule(state._urlRule);
+
+    state._urlRule = this.$urlRouter.urlRuleFactory.fromState(state);
+    this.$urlRouter.addRule(state._urlRule);
   }
 }

src/state/stateRegistry.ts

@@ -7,12 +7,12 @@ import { State } from "./stateObject";
 import { StateMatcher } from "./stateMatcher";
 import { StateBuilder } from "./stateBuilder";
 import { StateQueueManager } from "./stateQueueManager";
-import { UrlMatcherFactory } from "../url/urlMatcherFactory";
 import { StateDeclaration } from "./interface";
 import { BuilderFunction } from "./stateBuilder";
 import { StateOrName } from "./interface";
-import { UrlRouterProvider } from "../url/urlRouter";
+import { UrlRouter } from "../url/urlRouter";
 import { removeFrom } from "../common/common";
+import { UIRouter } from "../router";
 
 /**
  * The signature for the callback function provided to [[StateRegistry.onStateRegistryEvent]].
@@ -31,14 +31,21 @@ export class StateRegistry {
   matcher: StateMatcher;
   private builder: StateBuilder;
   stateQueue: StateQueueManager;
+  urlRouter: UrlRouter;
 
   listeners: StateRegistryListener[] = [];
 
-  constructor(urlMatcherFactory: UrlMatcherFactory, private urlRouterProvider: UrlRouterProvider) {
+  /** @internalapi */
+  constructor(private _router: UIRouter) {
+    this.urlRouter = _router.urlRouter;
     this.matcher = new StateMatcher(this.states);
-    this.builder = new StateBuilder(this.matcher, urlMatcherFactory);
-    this.stateQueue = new StateQueueManager(this.states, this, this.builder, urlRouterProvider, this.listeners);
+    this.builder = new StateBuilder(this.matcher, _router.urlMatcherFactory);
+    this.stateQueue = new StateQueueManager(this, _router.urlRouter, this.states, this.builder, this.listeners);
+    this._registerRoot();
+  }
 
+  /** @internalapi */
+  private _registerRoot() {
     let rootStateDef: StateDeclaration = {
       name: '',
       url: '^',
@@ -139,7 +146,7 @@ export class StateRegistry {
     let deregistered = [state].concat(children).reverse();
 
     deregistered.forEach(state => {
-      this.urlRouterProvider.removeRule(state._urlRule);
+      this.urlRouter.removeRule(state._urlRule);
       delete this.states[state.name];
     });