(chore) Code cleanup

Author: meeroslav

src/localize-router.module.ts

@@ -1,7 +1,7 @@
 import { NgModule, ModuleWithProviders, APP_INITIALIZER, Provider } from '@angular/core';
 import { HttpModule, Http } from '@angular/http';
-import { LocalizeRouterService, RAW_ROUTES, parserInitializer } from './localize-router.service';
-import { LocalizeParser, StaticParserLoader } from './localize-router.parser';
+import { LocalizeRouterService } from './localize-router.service';
+import { LocalizeParser, RAW_ROUTES, StaticParserLoader, parserInitializer } from './localize-router.parser';
 import { RouterModule, Routes } from '@angular/router';
 import { LocalizeRouterPipe } from './localize-router.pipe';
 import { TranslateModule, TranslateService } from 'ng2-translate';

src/localize-router.parser.ts

@@ -1,4 +1,5 @@
 import { Http, Response } from '@angular/http';
+import { OpaqueToken } from '@angular/core';
 import { Routes, Route } from '@angular/router';
 import { TranslateService } from 'ng2-translate';
 import { Observable } from 'rxjs/Observable';
@@ -9,6 +10,12 @@ import 'rxjs/add/operator/toPromise';
 
 const LOCALIZE_LOCAL_STORAGE = 'LOCALIZE_LOCAL_STORAGE';
 
+/**
+ * Static provider for keeping track of routes
+ * @type {OpaqueToken}
+ */
+export const RAW_ROUTES = new OpaqueToken('RAW_ROUTES');
+
 /**
  * Config interface
  */
@@ -302,3 +309,25 @@ 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

@@ -1,17 +1,11 @@
-import { Injectable, OpaqueToken } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { Router, NavigationStart, ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 import { Subject } from 'rxjs/Subject';
 import 'rxjs/add/observable/forkJoin';
 
 import { LocalizeParser } from './localize-router.parser';
 
-/**
- * Static provider for keeping track of routes
- * @type {OpaqueToken}
- */
-export const RAW_ROUTES = new OpaqueToken('RAW_ROUTES');
-
 /**
  * Localization service
  * modifyRoutes
@@ -110,24 +104,3 @@ export class LocalizeRouterService {
     };
   }
 }
-
-/**
- * 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);
-}