Merge pull request #91 from xunra/master

Fix wildcards and alwaysSetPrefix when changing languages

Author: meeroslav

src/localize-router.service.ts

@@ -1,11 +1,12 @@
 import { Injectable } from '@angular/core';
-import { Router, NavigationStart, ActivatedRouteSnapshot, NavigationExtras, Route } from '@angular/router';
+import { Router, NavigationStart, ActivatedRouteSnapshot, NavigationExtras, Route, UrlSegment } from '@angular/router';
 import { Subject } from 'rxjs/Subject';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/forkJoin';
 import 'rxjs/add/operator/toPromise';
 
 import { LocalizeParser } from './localize-router.parser';
+import { LocalizeRouterSettings } from './localize-router.config';
 
 /**
  * Localization service
@@ -20,7 +21,7 @@ export class LocalizeRouterService {
    * @param parser
    * @param router
    */
-  constructor(public parser: LocalizeParser, private router: Router) {
+  constructor(public parser: LocalizeParser, public settings: LocalizeRouterSettings, private router: Router) {
     this.routerEvents = new Subject<string>();
   }
 
@@ -43,7 +44,28 @@ export class LocalizeRouterService {
       let rootSnapshot: ActivatedRouteSnapshot = this.router.routerState.snapshot.root;
 
       this.parser.translateRoutes(lang).subscribe(() => {
-        const url = this.traverseRouteSnapshot(rootSnapshot);
+        let url = this.traverseRouteSnapshot(rootSnapshot);
+
+        if (!this.settings.alwaysSetPrefix) {
+          let urlSegments = url.split('/');
+          const languageSegmentIndex = urlSegments.indexOf(this.parser.currentLang);
+          //If the default language has no prefix make sure to remove and add it when necessary
+          if (this.parser.currentLang === this.parser.defaultLang) {
+            //Remove the language prefix from url when current language is the default language
+            if (languageSegmentIndex === 0 || (languageSegmentIndex === 1 && urlSegments[0] === '')) {
+              //Remove the current aka default language prefix from the url
+              urlSegments = urlSegments.slice(0, languageSegmentIndex).concat(urlSegments.slice(languageSegmentIndex + 1));
+            }
+          } else {
+            //When coming from a default language it's possible that the url doesn't contain the language, make sure it does.
+            if (languageSegmentIndex === -1) {
+              //If the url starts with a slash make sure to keep it.
+              const injectionIndex = urlSegments[0] === '' ? 1 : 0;
+              urlSegments = urlSegments.slice(0, injectionIndex).concat(this.parser.currentLang, urlSegments.slice(injectionIndex));
+            }
+          }
+          url = urlSegments.join('/');
+        }
 
         if (useNavigateMethod) {
           this.router.navigate([url], extras);
@@ -61,7 +83,11 @@ export class LocalizeRouterService {
    */
   private traverseRouteSnapshot(snapshot: ActivatedRouteSnapshot): string {
     if (snapshot.firstChild && snapshot.firstChild.routeConfig && snapshot.firstChild.routeConfig.path) {
-      return this.parseSegmentValue(snapshot) + '/' + this.traverseRouteSnapshot(snapshot.firstChild);
+      if (snapshot.firstChild.routeConfig.path !== '**') {
+        return this.parseSegmentValue(snapshot) + '/' + this.traverseRouteSnapshot(snapshot.firstChild);
+      } else {
+        return this.parseSegmentValue(snapshot.firstChild);
+      }  
     }
     return this.parseSegmentValue(snapshot);
   }
@@ -73,8 +99,12 @@ export class LocalizeRouterService {
    */
   private parseSegmentValue(snapshot: ActivatedRouteSnapshot): string {
     if (snapshot.routeConfig) {
-      let subPathSegments = snapshot.routeConfig.path.split('/');
-      return subPathSegments.map((s: string, i: number) => s.indexOf(':') === 0 ? snapshot.url[i].path : s).join('/');
+      if (snapshot.routeConfig.path === '**') {
+        return snapshot.url.filter((segment: UrlSegment) => segment.path).map((segment: UrlSegment) => segment.path).join('/');
+      } else {
+        let subPathSegments = snapshot.routeConfig.path.split('/');
+        return subPathSegments.map((s: string, i: number) => s.indexOf(':') === 0 ? snapshot.url[i].path : s).join('/');
+      }
     }
     return '';
   }

tests/localize-router.service.spec.ts

@@ -1,6 +1,7 @@
 import { Injector } from '@angular/core';
 import { LocalizeRouterService } from '../src/localize-router.service';
 import { LocalizeParser } from '../src/localize-router.parser';
+import { LocalizeRouterSettings } from '../src/localize-router.config';
 import { LocalizeRouterModule } from '../src/localize-router.module';
 import { getTestBed, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { Routes, Router, Event, NavigationStart, NavigationEnd } from '@angular/router';
@@ -50,6 +51,7 @@ describe('LocalizeRouterService', () => {
   let injector: Injector;
   let parser: LocalizeParser;
   let router: Router;
+  let settings: LocalizeRouterSettings;
   let localizeRouterService: LocalizeRouterService;
   let routes: Routes;
 
@@ -79,13 +81,13 @@ describe('LocalizeRouterService', () => {
 
   it('is defined', () => {
     expect(LocalizeRouterService).toBeDefined();
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     expect(localizeRouterService).toBeDefined();
     expect(localizeRouterService instanceof LocalizeRouterService).toBeTruthy();
   });
 
   it('should initialize routerEvents', () => {
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     expect(localizeRouterService.routerEvents).toBeDefined();
   });
 
@@ -94,13 +96,13 @@ describe('LocalizeRouterService', () => {
     parser.routes = routes;
     spyOn(router, 'resetConfig').and.callThrough();
 
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     localizeRouterService.init();
     expect(router.resetConfig).toHaveBeenCalledWith(routes);
   });
 
   it('should call parser translateRoute', () => {
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     let testString = 'result/path';
     spyOn(parser, 'translateRoute').and.returnValue(testString);
 
@@ -110,7 +112,7 @@ describe('LocalizeRouterService', () => {
   });
 
   it('should append language if root route', () => {
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     parser.currentLang = 'de';
     parser.locales = ['de', 'en'];
     let testString = '/my/path';
@@ -122,7 +124,7 @@ describe('LocalizeRouterService', () => {
   });
 
   it('should translate complex route', () => {
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     parser.currentLang = 'de';
     parser.locales = ['de', 'en'];
     spyOn(parser, 'translateRoute').and.callFake((val: any) => val);
@@ -135,7 +137,7 @@ describe('LocalizeRouterService', () => {
   });
 
   it('should translate routes if language had changed on route event', () => {
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     localizeRouterService.init();
     parser.currentLang = 'de';
     parser.locales = ['de', 'en'];
@@ -146,7 +148,7 @@ describe('LocalizeRouterService', () => {
   });
 
   it('should not translate routes if language not found', () => {
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     parser.currentLang = 'de';
     parser.locales = ['de', 'en'];
     spyOn(parser, 'translateRoutes').and.stub();
@@ -156,7 +158,7 @@ describe('LocalizeRouterService', () => {
   });
 
   it('should not translate routes if language is same', () => {
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     parser.currentLang = 'de';
     parser.locales = ['de', 'en'];
     spyOn(parser, 'translateRoutes').and.stub();
@@ -166,7 +168,7 @@ describe('LocalizeRouterService', () => {
   });
 
   it('should not translate routes if not NavigationStart', () => {
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     parser.currentLang = 'de';
     parser.locales = ['de', 'en'];
     spyOn(parser, 'translateRoutes').and.stub();
@@ -176,7 +178,7 @@ describe('LocalizeRouterService', () => {
   });
 
   it('should not set new url if same language', fakeAsync(() => {
-    localizeRouterService = new LocalizeRouterService(parser, router);
+    localizeRouterService = new LocalizeRouterService(parser, settings, router);
     parser.currentLang = 'de';
     parser.locales = ['de', 'en'];
     parser.routes = routes;