Change initialization process of localize router parser. Fixes #31

Author: meeroslav

package.json

@@ -39,16 +39,15 @@
     "@ngx-translate/core": "^6.0.0"
   },
   "devDependencies": {
-    "@angular/common": "2.4.0",
-    "@angular/compiler": "2.4.0",
-    "@angular/compiler-cli": "2.4.0",
-    "@angular/core": "2.4.0",
-    "@angular/http": "2.4.0",
-    "@angular/platform-browser": "2.4.0",
-    "@angular/platform-browser-dynamic": "2.4.0",
-    "@angular/platform-server": "2.4.0",
-    "@angular/router": "3.4.0",
-    "@angular/upgrade": "2.4.0",
+    "@angular/common": "2.4.8",
+    "@angular/compiler": "2.4.8",
+    "@angular/compiler-cli": "2.4.8",
+    "@angular/core": "2.4.8",
+    "@angular/http": "2.4.8",
+    "@angular/platform-browser": "2.4.8",
+    "@angular/platform-browser-dynamic": "2.4.8",
+    "@angular/platform-server": "2.4.8",
+    "@angular/router": "3.4.8",
     "@types/es6-promise": "0.0.32",
     "@types/hammerjs": "2.0.33",
     "@types/jasmine": "2.5.41",

src/localize-router.module.ts

@@ -1,7 +1,10 @@
-import { NgModule, ModuleWithProviders, APP_INITIALIZER, Provider, OpaqueToken, Optional, SkipSelf } from '@angular/core';
+import {
+  NgModule, ModuleWithProviders, APP_INITIALIZER, Provider, OpaqueToken, Optional, SkipSelf,
+  Injectable, Injector
+} from '@angular/core';
 import { HttpModule, Http } from '@angular/http';
 import { LocalizeRouterService } from './localize-router.service';
-import { LocalizeParser, RAW_ROUTES, StaticParserLoader, parserInitializer } from './localize-router.parser';
+import { LocalizeParser, RAW_ROUTES, StaticParserLoader } from './localize-router.parser';
 import { RouterModule, Routes } from '@angular/router';
 import { LocalizeRouterPipe } from './localize-router.pipe';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
@@ -24,6 +27,35 @@ export function localizeLoaderFactory(translate: TranslateService, location: Loc
   return new StaticParserLoader(translate, location, http);
 }
 
+@Injectable()
+export class ParserInitializer {
+  parser: LocalizeParser;
+  routes: Routes;
+
+  constructor(private injector: Injector) {}
+
+  appInitializer(): Promise<any> {
+    // TODO: Potentially add route guards here on existing routes
+
+    const res = this.parser.load(this.routes);
+    res.then(() => {
+      const localize: LocalizeRouterService = this.injector.get(LocalizeRouterService);
+      localize.init();
+    });
+
+    return res;
+  }
+
+  generateInitializer(parser: LocalizeParser, routes: Routes[]) {
+    this.parser = parser;
+    this.routes = routes.reduce((a, b) => a.concat(b));
+    return this.appInitializer;
+  }
+}
+export function getAppInitializer(p: ParserInitializer, parser: LocalizeParser, routes: Routes[]) {
+  return p.generateInitializer(parser, routes).bind(p);
+}
+
 @NgModule({
   imports: [HttpModule, CommonModule, RouterModule, TranslateModule],
   declarations: [LocalizeRouterPipe],
@@ -42,8 +74,6 @@ export class LocalizeRouterModule {
     return {
       ngModule: LocalizeRouterModule,
       providers: [
-        localizeLoader,
-        LocalizeRouterService,
         {
           provide: LOCALIZE_ROUTER_FORROOT_GUARD,
           useFactory: provideForRootGuard,
@@ -54,11 +84,15 @@ export class LocalizeRouterModule {
           multi: true,
           useValue: routes
         },
+
+        localizeLoader,
+        LocalizeRouterService,
+        ParserInitializer,
         {
           provide: APP_INITIALIZER,
-          useFactory: parserInitializer,
-          deps: [LocalizeParser, RAW_ROUTES],
-          multi: true
+          multi: true,
+          useFactory: getAppInitializer,
+          deps: [ParserInitializer, LocalizeParser, RAW_ROUTES]
         }
       ]
     };

src/localize-router.parser.ts

@@ -309,24 +309,3 @@ export class StaticParserLoader extends LocalizeParser {
     });
   }
 }
-
-/**
- * Pre-loading helper functions
- * Necessary evil for AOT
- * @param parser
- * @param routes
- * @returns {any}
- */
-export function parserInitializer(parser: LocalizeParser, routes: any) {
-  loadRoutes.prototype.parser = parser;
-  loadRoutes.prototype.routes = routes.reduce(concatArrays);
-  return loadRoutes;
-}
-
-export function concatArrays(a: Array<any>, b: Array<any>): Array<any> {
-  return a.concat(b);
-}
-
-export function loadRoutes() {
-  return loadRoutes.prototype.parser.load(loadRoutes.prototype.routes);
-}

src/localize-router.service.ts

@@ -20,9 +20,15 @@ export class LocalizeRouterService {
    * @param router
    */
   constructor(public parser: LocalizeParser, private router: Router) {
+    this.routerEvents = new Subject<string>();
+  }
+
+  /**
+   * Start up the service
+   */
+  init() {
     this.router.resetConfig(this.parser.routes);
     this.router.events.subscribe(this._routeChanged());
-    this.routerEvents = new Subject<string>();
   }
 
   /**

tests/localize-router.service.spec.ts

@@ -96,12 +96,13 @@ describe('LocalizeRouterService', () => {
     expect(localizeRouterService.routerEvents).toBeDefined();
   });
 
-  it('should reset route config on load', () => {
+  it('should reset route config on init', () => {
     expect((<any>router)['routes']).toEqual(void 0);
     parser.routes = routes;
     spyOn(router, 'resetConfig').and.callThrough();
 
     localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService.init();
     expect(router.resetConfig).toHaveBeenCalledWith(routes);
   });
 
@@ -137,6 +138,7 @@ describe('LocalizeRouterService', () => {
 
   it('should translate routes if language had changed on route event', () => {
     localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService.init();
     parser.currentLang = 'de';
     parser.locales = ['de', 'en'];
     spyOn(parser, 'translateRoutes').and.stub();