refactor(url): Move coreservices.location to router.urlService

Author: christopherthielen

src/url/urlRouter.ts

@@ -178,8 +178,10 @@ export class UrlRouterProvider implements Disposable {
    * Note: the handler may also invoke arbitrary code, such as `$state.go()`
    */
   when(what: (RegExp|UrlMatcher|string), handler: string|IInjectable, ruleCallback = function(rule) {}) {
-    let $urlMatcherFactory = this.router.urlMatcherFactory;
-    let $stateParams = this.router.globals.params;
+    let router = this.router;
+    let $urlMatcherFactory = router.urlMatcherFactory;
+    let $stateParams = router.globals.params;
+    let $loc = router.urlService;
     let redirect, handlerIsString = isString(handler);
 
     // @todo Queue this
@@ -188,7 +190,6 @@ export class UrlRouterProvider implements Disposable {
     if (!handlerIsString && !isFunction(handler) && !isArray(handler))
       throw new Error("invalid 'handler' in when()");
 
-    let $loc = services.location;
     let strategies = {
       matcher: function (_what, _handler) {
         if (handlerIsString) {
@@ -341,7 +342,7 @@ export class UrlRouter implements Disposable {
    * This causes [[UrlRouter]] to start listening for changes to the URL, if it wasn't already listening.
    */
   listen(): Function {
-    return this.listener = this.listener || services.location.onChange(evt => this.sync(evt));
+    return this.listener = this.listener || this.router.urlService.onChange(evt => this.sync(evt));
   }
 
   /**

src/vanilla/pushStateLocation.ts

@@ -2,7 +2,7 @@
  * @internalapi
  * @module vanilla
  */ /** */
-import { services, isDefined } from "../common/index";
+import { isDefined } from "../common/index";
 import { LocationServices } from "../common/coreservices";
 import { splitQuery, trimHashVal, getParams, locationPluginFactory } from "./utils";
 import { LocationPlugin } from "./interface";
@@ -22,7 +22,7 @@ export class PushStateLocationService implements LocationServices, Disposable {
   private _location: Location;
   private _history: History;
 
-  constructor() {
+  constructor(public router: UIRouter) {
     this._location = location;
     this._history = history;
   };
@@ -32,21 +32,22 @@ export class PushStateLocationService implements LocationServices, Disposable {
   }
 
   path() {
-    let base = services.locationConfig.baseHref();
+    let base = this.router.urlConfig.baseHref();
     let path = this._location.pathname;
     let idx = path.indexOf(base);
     if (idx !== 0) throw new Error(`current url: ${path} does not start with <base> tag ${base}`);
     return path.substr(base.length);
   }
 
   search() {
-      return getParams(splitQuery(this._location.search)[1]);
+    return getParams(splitQuery(this._location.search)[1]);
   }
 
   setUrl(url: string, replace: boolean = false) {
     if (isDefined(url)) {
-      if (replace) this._history.replaceState(null, null, services.locationConfig.baseHref() + url);
-      else this._history.pushState(null, null, services.locationConfig.baseHref() + url);
+      let fullUrl = this.router.urlConfig.baseHref() + url;
+      if (replace) this._history.replaceState(null, null, fullUrl);
+      else this._history.pushState(null, null, fullUrl);
     }
   }
 

test/lazyLoadSpec.ts

@@ -288,7 +288,7 @@ describe('future state', function () {
     });
 
     it('triggered by a URL sync should re-parse the URL to activate the lazy loaded state', (done) => {
-      services.location.setUrl('/a/def');
+      router.urlService.setUrl('/a/def');
       $urlRouter.sync();
       $transitions.onSuccess({}, () => {
         expect($state.current.name).toBe('A');
@@ -334,7 +334,7 @@ describe('future state', function () {
     });
 
     it('should re-parse the URL to activate the final state', (done) => {
-      services.location.setUrl('/a/def/b');
+      router.urlService.setUrl('/a/def/b');
       $urlRouter.sync();
       $transitions.onSuccess({}, () => {
         expect($state.current.name).toBe('A.B');
@@ -452,7 +452,7 @@ describe('future state', function () {
     });
 
     it('should load and activate a nested future state by url sync', (done) => {
-      services.location.setUrl('/a/aid/b/bid');
+      router.urlService.setUrl('/a/aid/b/bid');
       $urlRouter.sync();
       $transitions.onSuccess({}, (trans) => {
         expect($state.current.name).toBe('A.B');

test/stateRegistrySpec.ts

@@ -64,7 +64,7 @@ describe("StateRegistry", () => {
       registry.register(state);
 
       spyOn($state, "transitionTo");
-      services.location.setUrl("/foo");
+      router.urlService.setUrl("/foo");
       router.urlRouter.sync();
       expect($state.transitionTo['calls'].mostRecent().args[0]).toBe(state.$$state());
 

test/stateServiceSpec.ts

@@ -32,9 +32,9 @@ describe('stateService', function () {
     router = new UIRouter();
     router.plugin(TestingPlugin);
 
-    $loc = services.location;
-    $state = router.stateService;
-    $registry = router.stateRegistry;
+    $loc         = router.urlService;
+    $state       = router.stateService;
+    $registry    = router.stateRegistry;
     $transitions = router.transitionService;
   });
 

test/vanilla.browserHistorySpec.ts

@@ -6,8 +6,8 @@ import * as vanilla from "../src/vanilla"
 describe('browserHistory implementation', () => {
 
   let router: UIRouter;
+  let locationProvider;
   let makeMatcher;
-  let locationProvider = services.location;
 
   // Replace the `history` reference because PhantomJS does not support spying on it.
   function mockHistoryObject() {
@@ -26,6 +26,7 @@ describe('browserHistory implementation', () => {
     router.plugin(vanilla.servicesPlugin);
     router.plugin(vanilla.pushStateLocationPlugin);
     router.stateRegistry.stateQueue.autoFlush(router.stateService);
+    locationProvider = router.urlService;
     makeMatcher = (url, config?) => {
       return new UrlMatcher(url, router.urlMatcherFactory.paramTypes, config)
     };
@@ -38,7 +39,7 @@ describe('browserHistory implementation', () => {
 
   it('uses history.pushState when setting a url', () => {
     let service = mockHistoryObject();
-    expect(services.location.html5Mode()).toBe(true);
+    expect(router.urlService.html5Mode()).toBe(true);
     let stub = spyOn(service._history, 'pushState');
     router.urlRouter.push(makeMatcher('/hello/:name'), { name: 'world' }, {});
     expect(stub.calls.first().args[2]).toBe('/hello/world');
@@ -52,7 +53,7 @@ describe('browserHistory implementation', () => {
   });
 
   it('returns the correct url query', () => {
-    expect(services.location.html5Mode()).toBe(true);
+    expect(router.urlService.html5Mode()).toBe(true);
     return router.stateService.go('path', {urlParam: 'bar'}).then(() => {
       expect(window.location.toString().includes('/path/bar')).toBe(true);
       expect(window.location.toString().includes('/#/path/bar')).toBe(false);

test/vanilla.hashHistorySpec.ts

@@ -5,15 +5,16 @@ describe('hashHistory implementation', () => {
 
   let router;
   let $state;
+  let locationProvider;
   let makeMatcher;
-  let locationProvider = services.location;
 
   beforeEach(() => {
     router = new UIRouter();
     router.plugin(vanilla.servicesPlugin);
     router.plugin(vanilla.hashLocationPlugin);
     $state = router.stateService;
     router.stateRegistry.stateQueue.autoFlush($state);
+    locationProvider = router.urlService;
 
     makeMatcher = (url, config?) => {
       return new UrlMatcher(url, router.urlMatcherFactory.paramTypes, config)
@@ -26,7 +27,7 @@ describe('hashHistory implementation', () => {
   });
 
   it('reports html5Mode to be false', () => {
-    expect(services.location.html5Mode()).toBe(false);
+    expect(router.urlService.html5Mode()).toBe(false);
   });
 
   it('returns the correct url query', (done) => {