refactor(url): use urlService (not urlRouter) and switch private variable names

Author: christopherthielen

src/urlRouterProvider.ts

@@ -1,13 +1,13 @@
 /** @module url */ /** */
 import {
   UIRouter,
-  UrlRouter,
   LocationServices,
   $InjectorLike,
   BaseUrlRule,
   UrlRuleHandlerFn,
   UrlMatcher,
   IInjectable,
+  UrlRouter,
 } from '@uirouter/core';
 import { services, isString, isFunction, isArray, identity } from '@uirouter/core';
 
@@ -30,25 +30,19 @@ export interface RawNg1RuleFunction {
  * @deprecated
  */
 export class UrlRouterProvider {
-  /** @hidden */ _router: UIRouter;
-  /** @hidden */ _urlRouter: UrlRouter;
-
   static injectableHandler(router: UIRouter, handler): UrlRuleHandlerFn {
     return match => services.$injector.invoke(handler, null, { $match: match, $stateParams: router.globals.params });
   }
 
   /** @hidden */
-  constructor(router: UIRouter) {
-    this._router = router;
-    this._urlRouter = router.urlRouter;
-  }
+  constructor(/** @hidden */ private router: UIRouter) {}
 
   /** @hidden */
-  $get() {
-    const urlRouter = this._urlRouter;
-    urlRouter.update(true);
-    if (!urlRouter.interceptDeferred) urlRouter.listen();
-    return urlRouter;
+  $get(): UrlRouter {
+    const urlService = this.router.urlService;
+    this.router.urlRouter.update(true);
+    if (!urlService.interceptDeferred) urlService.listen();
+    return this.router.urlRouter;
   }
 
   /**
@@ -85,10 +79,10 @@ export class UrlRouterProvider {
   rule(ruleFn: RawNg1RuleFunction): UrlRouterProvider {
     if (!isFunction(ruleFn)) throw new Error("'rule' must be a function");
 
-    const match = () => ruleFn(services.$injector, this._router.locationService);
+    const match = () => ruleFn(services.$injector, this.router.locationService);
 
     const rule = new BaseUrlRule(match, identity);
-    this._urlRouter.rule(rule);
+    this.router.urlService.rules.rule(rule);
     return this;
   }
 
@@ -119,12 +113,11 @@ export class UrlRouterProvider {
    * @return {object} `$urlRouterProvider` - `$urlRouterProvider` instance
    */
   otherwise(rule: string | RawNg1RuleFunction): UrlRouterProvider {
-    const urlRouter = this._urlRouter;
-
+    const urlRules = this.router.urlService.rules;
     if (isString(rule)) {
-      urlRouter.otherwise(rule);
+      urlRules.otherwise(rule);
     } else if (isFunction(rule)) {
-      urlRouter.otherwise(() => rule(services.$injector, this._router.locationService));
+      urlRules.otherwise(() => rule(services.$injector, this.router.locationService));
     } else {
       throw new Error("'rule' must be a string or function");
     }
@@ -172,10 +165,10 @@ export class UrlRouterProvider {
    */
   when(what: RegExp | UrlMatcher | string, handler: string | IInjectable) {
     if (isArray(handler) || isFunction(handler)) {
-      handler = UrlRouterProvider.injectableHandler(this._router, handler);
+      handler = UrlRouterProvider.injectableHandler(this.router, handler);
     }
 
-    this._urlRouter.when(what, handler as any);
+    this.router.urlService.rules.when(what, handler as any);
     return this;
   }
 
@@ -210,6 +203,6 @@ export class UrlRouterProvider {
    *        Passing no parameter is equivalent to `true`.
    */
   deferIntercept(defer?: boolean) {
-    this._urlRouter.deferIntercept(defer);
+    this.router.urlService.deferIntercept(defer);
   }
 }

test/urlRouterSpec.ts

@@ -294,23 +294,23 @@ describe('UrlRouter', function() {
     });
 
     describe('URL generation', function() {
-      it('should return null when UrlMatcher rejects parameters', inject(function($urlRouter) {
+      it('should return null when UrlMatcher rejects parameters', inject(function($urlRouter: UrlRouter) {
         $umf.type('custom', <any>{ is: val => val === 1138 });
         const matcher = $umf.compile('/foo/{param:custom}');
 
         expect($urlRouter.href(matcher, { param: 1138 })).toBe('#/foo/1138');
         expect($urlRouter.href(matcher, { param: 5 })).toBeNull();
       }));
 
-      it('should handle the new html5Mode object config from Angular 1.3', inject(function($urlRouter) {
+      it('should handle the new html5Mode object config from Angular 1.3', inject(function($urlRouter: UrlRouter) {
         $lp.html5Mode({
           enabled: false,
         });
 
         expect($urlRouter.href($umf.compile('/hello'))).toBe('#/hello');
       }));
 
-      it('should return URLs with #fragments', inject(function($urlRouter) {
+      it('should return URLs with #fragments', inject(function($urlRouter: UrlRouter) {
         // html5mode disabled
         $lp.html5Mode(false);
         expect(html5Compat($lp.html5Mode())).toBe(false);
@@ -325,7 +325,7 @@ describe('UrlRouter', function() {
       }));
 
       it('should return URLs with #fragments when html5Mode is true & browser does not support ___pushState', inject(function(
-        $urlRouter
+        $urlRouter: UrlRouter
       ) {
         $lp.html5Mode(true);
         $s['history'] = false;