refactor(urlService): Move public API implementations from UrlRouter to UrlService

Migrate towards accessing services from router instance, i.e., router.urlService.rules.method()

Author: christopherthielen

src/router.ts

@@ -134,7 +134,7 @@ export class UIRouter {
     this.disposable(this.stateService);
     this.disposable(this.stateRegistry);
     this.disposable(this.transitionService);
-    this.disposable(this.urlRouter);
+    this.disposable(this.urlService);
     this.disposable(locationService);
     this.disposable(locationConfig);
   }

src/state/stateQueueManager.ts

@@ -1,30 +1,23 @@
-/** @module state */ /** for typedoc */
-import { inArray } from '../common/common';
-import { isString } from '../common/predicates';
-import { StateDeclaration, _StateDeclaration } from './interface';
+/** @module state */
+/** for typedoc */
+import { inArray, isString, prop } from '../common';
+import { _StateDeclaration } from './interface';
 import { StateObject } from './stateObject';
 import { StateBuilder } from './stateBuilder';
-import { StateRegistryListener, StateRegistry } from './stateRegistry';
+import { StateRegistryListener } from './stateRegistry';
 import { Disposable } from '../interface';
-import { UrlRouter } from '../url/urlRouter';
-import { prop } from '../common/hof';
-import { StateMatcher } from './stateMatcher';
+import { UIRouter } from '../router';
 
 /** @internalapi */
 export class StateQueueManager implements Disposable {
-  queue: StateObject[];
-  matcher: StateMatcher;
+  queue: StateObject[] = [];
 
   constructor(
-    private $registry: StateRegistry,
-    private $urlRouter: UrlRouter,
+    private router: UIRouter,
     public states: { [key: string]: StateObject },
     public builder: StateBuilder,
     public listeners: StateRegistryListener[]
-  ) {
-    this.queue = [];
-    this.matcher = $registry.matcher;
-  }
+  ) {}
 
   /** @internalapi */
   dispose() {
@@ -73,7 +66,7 @@ export class StateQueueManager implements Disposable {
         const existingFutureState = getState(name + '.**');
         if (existingFutureState) {
           // Remove future state of the same name
-          this.$registry.deregister(existingFutureState);
+          this.router.stateRegistry.deregister(existingFutureState);
         }
 
         states[name] = state;
@@ -104,7 +97,7 @@ export class StateQueueManager implements Disposable {
 
   attachRoute(state: StateObject) {
     if (state.abstract || !state.url) return;
-
-    this.$urlRouter.rule(this.$urlRouter.urlRuleFactory.create(state));
+    const rulesApi = this.router.urlService.rules;
+    rulesApi.rule(rulesApi.urlRuleFactory.create(state));
   }
 }

src/state/stateRegistry.ts

@@ -35,10 +35,10 @@ export class StateRegistry {
   listeners: StateRegistryListener[] = [];
 
   /** @internalapi */
-  constructor(private _router: UIRouter) {
+  constructor(private router: UIRouter) {
     this.matcher = new StateMatcher(this.states);
-    this.builder = new StateBuilder(this.matcher, _router.urlMatcherFactory);
-    this.stateQueue = new StateQueueManager(this, _router.urlRouter, this.states, this.builder, this.listeners);
+    this.builder = new StateBuilder(this.matcher, router.urlMatcherFactory);
+    this.stateQueue = new StateQueueManager(router, this.states, this.builder, this.listeners);
     this._registerRoot();
   }
 
@@ -143,12 +143,14 @@ export class StateRegistry {
     const deregistered: StateObject[] = [state].concat(children).reverse();
 
     deregistered.forEach(_state => {
-      const $ur = this._router.urlRouter;
+      const rulesApi = this.router.urlService.rules;
+
       // Remove URL rule
-      $ur
+      rulesApi
         .rules()
         .filter(propEq('state', _state))
-        .forEach($ur.removeRule.bind($ur));
+        .forEach(rule => rulesApi.removeRule(rule));
+
       // Remove state from registry
       delete this.states[_state.name];
     });

src/state/stateService.ts

@@ -524,9 +524,8 @@ export class StateService {
     if (!nav || nav.url === undefined || nav.url === null) {
       return null;
     }
-    return this.router.urlRouter.href(nav.url, params, {
-      absolute: options.absolute,
-    });
+
+    return this.router.urlRouter.href(nav.url, params, { absolute: options.absolute });
   }
 
   /** @hidden */

src/url/urlMatcherFactory.ts

@@ -45,6 +45,7 @@ export class UrlMatcherFactory implements Disposable, UrlMatcherConfig {
   /** @internalapi Creates a new [[Param]] for a given location (DefType) */
   paramFactory = new ParamFactory(this);
 
+  // TODO: move implementations to UrlConfig (urlService.config)
   constructor() {
     extend(this, { UrlMatcher, Param });
   }