@coolon/angular-ui-powerups 0.0.126 → 0.0.129

package/esm2015/lib/place/place-router.js

@@ -5,53 +5,78 @@
 import * as tslib_1 from "tslib";
 import { Location } from '@angular/common';
 import { Injectable } from '@angular/core';
-import { NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Router, UrlSerializer } from '@angular/router';
-import { assert, Dsl, GarbageCollector, lang, Logger, MutableListModel, MutableStream, MutableValueModel } from '@coolon/pectin';
-import _ from 'lodash';
+import { NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Router } from '@angular/router';
+import { assert, DebugContext, Dsl, GarbageCollector, lang, Logger, MutableListModel, MutableValueModel } from '@coolon/pectin';
 import { InteractionService } from '../interaction/services/interaction.service';
-import { NavigationState } from './guards/navigation-state';
+import { NavigatingDuringInteraction } from './navigation/session/interactions/navigating-during-interaction';
+import { PopStateDuringInteractionNavigation } from './navigation/session/interactions/pop-state-during-interaction-navigation';
+import { SynchroniseInteractionContextIdsWithRoute } from './navigation/session/interactions/synchronise-interaction-context-ids-with-route';
+import { Navigating } from './navigation/session/navigating';
+import { NavigationContext } from './navigation/session/navigation-context';
+import { PopStateNavigation } from './navigation/session/pop-state-navigation';
 import { PlaceHistory } from './place-history';
-import { UrlSnapshot } from './url-snapshot';
+import { UrlService } from './url-service';
 import * as i0 from "@angular/core";
 import * as i1 from "@angular/router";
 import * as i2 from "@angular/common";
-import * as i3 from "./place-history";
-import * as i4 from "../interaction/services/interaction.service";
+import * as i3 from "../interaction/services/interaction.service";
+import * as i4 from "./url-service";
+import * as i5 from "./place-history";
 export class PlaceRouter extends GarbageCollector {
     /**
-     * @param {?} router
-     * @param {?} urlSerializer
+     * @param {?} angularRouter
      * @param {?} angularLocation
-     * @param {?} placeHistory
      * @param {?} interactionService
+     * @param {?} urlService
+     * @param {?} placeHistory
      */
-    constructor(router, urlSerializer, angularLocation, placeHistory, interactionService) {
+    constructor(angularRouter, angularLocation, interactionService, urlService, placeHistory) {
         super();
-        this.router = router;
-        this.urlSerializer = urlSerializer;
+        this.angularRouter = angularRouter;
         this.angularLocation = angularLocation;
-        this.placeHistory = placeHistory;
         this.interactionService = interactionService;
-        this._navigationStateModel = new MutableValueModel();
+        this.urlService = urlService;
+        this.placeHistory = placeHistory;
+        this.navigationSessionModel = new MutableValueModel();
         this._activeVisits = new MutableListModel();
-        const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
-        this.activeVisitIndex = chain(this._activeVisits).indexBy('placeDefinition');
-        this.navigationInProgress = chain(this.navigationStateModel).pluck('isTransitional');
-        this._navigationSessionContext = new NavigationState.Context(this, this.interactionService, (/**
-         * @param {?} session
+        this.sessionFinishedJobs = [];
+        this.routerInteractionAdapter = interactionService.registerPlaceRouter(this);
+        // TODO: Make this an interface and use 'this' instead.
+        this.navigationContext = new NavigationContext.Impl(this.urlService, this.routerInteractionAdapter, (/**
+         * @param {?} urlSnapshot
+         * @param {?} options
          * @return {?}
          */
-        session => {
-            this.processNavigationSuccess(session);
-        }));
-        this._navigationStateModel.value = new NavigationState.Idle(this._navigationSessionContext);
-        this._navigationStateTypeModel = chain(this._navigationStateModel).map((/**
+        (urlSnapshot, options) => {
+            return this.navigateByUrl(urlSnapshot, options);
+        }), (/**
          * @param {?} state
          * @return {?}
          */
-        state => (/** @type {?} */ (state.constructor))));
+        state => {
+            this.transitionTo(state);
+        }), (/**
+         * @param {?} visits
+         * @return {?}
+         */
+        visits => {
+            this.routingSessionFinished(visits);
+        }));
+        const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
+        this.navigationInProgress = chain(this.navigationSessionModel).isNotNil();
+        /** @type {?} */
+        const idleStateName = chain(this.interactionService.active).map((/**
+         * @param {?} active
+         * @return {?}
+         */
+        active => active ? 'IdleDuringInteraction' : 'Idle'));
+        this.navigationSessionName = chain(this.navigationSessionModel)
+            .pluck('name')
+            .otherwise(idleStateName);
+        DebugContext.tag(this._activeVisits, "PlaceRouter.activeVisits");
+        this.activeVisitsByPlaceDefinition = chain(this._activeVisits).indexBy('placeDefinition');
         // TODO: make setup the callbacks in during module initiation to make this testable.
-        this.router.events.subscribe((/**
+        angularRouter.events.subscribe((/**
          * @param {?} event
          * @return {?}
          */
@@ -63,154 +88,199 @@ export class PlaceRouter extends GarbageCollector {
             // NavigationStart -> .... -> NavigationError --> navigation aborted, end session.
             // =======================
             if (event instanceof NavigationStart) {
+                // console.log(`---> NavigationStart[${event.id}]: ${event.url} (${event.navigationTrigger})`);
                 if (event.navigationTrigger === 'popstate') {
-                    this.runStateTransition((/**
-                     * @param {?} state
-                     * @return {?}
-                     */
-                    state => state.onPopState(event)));
+                    this.onPopState(event);
                 }
                 else {
-                    this.runStateTransition((/**
-                     * @param {?} state
-                     * @return {?}
-                     */
-                    state => state.onRouterStarted(event)));
+                    this.onRouterStarted(event);
                 }
+                // console.log(`<--- NavigationStart[${event.id}]: ${event.url} (${event.navigationTrigger})`);
             }
             if (event instanceof NavigationEnd) {
-                console.log(event);
-                this.runStateTransition((/**
-                 * @param {?} state
-                 * @return {?}
-                 */
-                state => state.onRouterEnd(event)));
+                // console.log(`---> NavigationEnd[${event.id}]: ${event.url}`);
+                this.onRouterEnd(event);
+                // console.log(`<--- NavigationEnd[${event.id}]: ${event.url}`);
             }
             if (event instanceof NavigationError) {
-                console.log(event);
-                this.runStateTransition((/**
-                 * @param {?} state
-                 * @return {?}
-                 */
-                state => state.onRouterError(event)));
+                // console.log(`---> NavigationError[${event.id}]: ${event.url}`);
+                this.onRouterError(event);
+                // console.log(`<--- NavigationError[${event.id}]: ${event.url}`);
             }
             if (event instanceof NavigationCancel) {
-                console.log(event);
-                this.runStateTransition((/**
-                 * @param {?} state
-                 * @return {?}
-                 */
-                state => state.onRouterCancelled(event)));
+                // console.log(`---> NavigationCancel[${event.id}]: ${event.url}`);
+                this.onRouterCancelled(event);
+                // console.log(`<--- NavigationCancel[${event.id}]: ${event.url}`);
             }
         }));
-        // Push dialog state to the url so we can capture the back button.
-        when.listOf(this.interactionService.activeInteractionContextIds).changes((/**
-         * @param {?} ids
-         * @param {?} previous
-         * @return {?}
-         */
-        (ids, previous) => {
-            this.syncInteractionIdsWithRouter(ids, previous);
-        }), { unless: this.navigationInProgress }); // TODO: I think the exclusive interaction prevents interactions starting while it's active so we might not need this.
-        // TODO: I think the exclusive interaction prevents interactions starting while it's active so we might not need this.
-        /** @type {?} */
-        const urlChanges = new MutableStream();
-        // The angular router doesn't always fire router events when the back button is pushed while a navigation
-        // session is in progress.  Sometimes we only know about it from the url change.
-        // IMPORTANT ORDER DEPENDENCY
-        // This only works because we're notified of the change after the router has started reacting to it.  This
-        // we can can use our navigationState to determine things.
+        // The router needs to know about url changes and in some cases they are the only way the router can know if
+        // the back button was clicked.
         angularLocation.onUrlChange((/**
          * @param {?} url
          * @return {?}
          */
-        url => {
+        url => this.onUrlChanged(url)));
+    }
+    /**
+     * @return {?}
+     */
+    get navigationSession() {
+        return this.navigationSessionModel.value;
+    }
+    /**
+     * @return {?}
+     */
+    get currentSession() {
+        return this.navigationSessionModel.value;
+    }
+    // @Trace()
+    /**
+     * @param {?} event
+     * @return {?}
+     */
+    onPopState(event) {
+        assert.isTruthy(event.navigationTrigger === 'popstate');
+        if (this.currentSession) {
+            this.currentSession.onPopState(event);
+        }
+        else {
             /** @type {?} */
-            const navigationState = this._navigationStateModel.value;
-            console.log(`URLChange -> ${url}`, { state: navigationState });
-            urlChanges.publish({ url, state: navigationState });
-            // The url has changed while we're in a transitional state
-            if (navigationState.isTransitional) {
-                /** @type {?} */
-                const navigationInteraction = this.navigationState.interactionContext;
-                if (navigationInteraction && navigationInteraction.isActive()) {
-                    this.runStateTransition((/**
-                     * @param {?} state
-                     * @return {?}
-                     */
-                    state => state.onBackClickedDuringNavigationInteraction(url)));
-                }
-            }
-        }));
+            const poppedHistoryUrl = event.url;
+            /** @type {?} */
+            const currentRouterUrl = this.urlService.getCurrentRouterUrl();
+            /** @type {?} */
+            const session = this.interactionService.isActive() ?
+                new PopStateDuringInteractionNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl) :
+                new PopStateNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl);
+            this.transitionTo(session);
+        }
     }
+    // @Trace()
     /**
-     * @private
-     * @param {?} session
+     * @param {?} event
      * @return {?}
      */
-    processNavigationSuccess(session) {
-        // We need to update the visits before the session finishes.  This allows the placeOutets to ignore visit
-        // changes that occur while routerNavigationActive is true.
-        assert.isTruthy(this.navigationInProgress.value);
+    onRouterStarted(event) {
+        assert.isFalsey(event.navigationTrigger === 'popstate');
         /** @type {?} */
-        const visits = session.getVisits();
-        visits.forEach((/**
-         * @param {?} v
-         * @return {?}
-         */
-        v => this.placeHistory.add(v)));
-        this._activeVisits.value = visits;
+        const inInteraction = this.interactionService.isActive();
+        if (this.currentSession) {
+            this.currentSession.onRouterStarted(event);
+        }
+        else {
+            this.transitionTo(this.createNavigationSession(this.urlService.getCurrentRouterUrl()));
+        }
     }
+    // @Trace()
     /**
+     * @param {?} newUrl
      * @return {?}
      */
-    get navigationState() {
-        return this._navigationStateModel.value;
+    onUrlChanged(newUrl) {
+        // the back button can trigger a url change without a navigation session in progress so we
+        // console.log(`---> Url Changed ${newUrl}`);
+        if (this.currentSession) {
+            this.currentSession.onUrlChange(newUrl);
+        }
+        else {
+            console.log('FYI: url changed without a navigation session in progress');
+        }
+        // console.log(`<--- Url Changed`);
     }
+    // @Trace()
     /**
+     * @param {?} event
      * @return {?}
      */
-    get navigationStateModel() {
-        return this._navigationStateModel.readonly;
+    onRouterCancelled(event) {
+        this.currentSession.onRouterCancelled(event);
     }
+    // @Trace()
     /**
+     * @param {?} event
      * @return {?}
      */
-    get activeVisits() {
-        return this._activeVisits.readonly;
+    onRouterError(event) {
+        this.currentSession.onRouterError(event);
+    }
+    // @Trace()
+    /**
+     * @param {?} event
+     * @return {?}
+     */
+    onRouterEnd(event) {
+        this.currentSession.onRouterEnd(event);
     }
     /**
-     *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));
      * @param {?} visit
      * @param {?=} options
      * @return {?}
      */
     navigate(visit, options) {
+        return this.doNavigation(visit, (/**
+         * @param {?} router
+         * @return {?}
+         */
+        (router) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            /** @type {?} */
+            const commands = [
+                visit.placeDefinition.path,
+                ...this.createRouteParameters(visit)
+            ];
+            yield this.angularRouter.navigate(commands, {
+                relativeTo: options ? options.relativeTo : null
+            });
+        })));
+    }
+    // @Trace()
+    /**
+     * @param {?} visit
+     * @param {?} runNavigationCommands
+     * @return {?}
+     */
+    doNavigation(visit, runNavigationCommands) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.doNavigation(visit, (/**
-             * @param {?} router
-             * @return {?}
-             */
-            (router) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                /** @type {?} */
-                const commands = [
-                    visit.placeDefinition.path,
-                    ...this.createRouteParameters(visit)
-                ];
-                yield this.router.navigate(commands, {
-                    relativeTo: options ? options.relativeTo : null
-                });
-            })));
+            if (this.navigationInProgress.value) {
+                lang.illegalState('Navigation already in progress');
+            }
+            /** @type {?} */
+            const navigation = this.createNavigationSession(this.urlService.getCurrentRouterUrl());
+            navigation.storeVisit(visit);
+            this.transitionTo(navigation);
+            try {
+                yield runNavigationCommands(this.angularRouter);
+            }
+            finally {
+                // Check if the router has finished (in the case where no router change required) and we're still in  a
+                // transient state and finish of the transition.
+                if (!this.angularRouter.getCurrentNavigation() && this.currentSession) {
+                    this.currentSession.onRouterEnd(new NavigationEnd(-1, '', ''));
+                }
+            }
         });
     }
+    /**
+     * @param {?} urlSnapshot
+     * @param {?=} navigationExtras
+     * @return {?}
+     */
+    navigateByUrl(urlSnapshot, navigationExtras) {
+        // console.log(`### navigationByUrl -> ${urlSnapshot.urlTree.toString()}`);
+        return this.angularRouter.navigateByUrl(urlSnapshot.urlTree, navigationExtras);
+    }
+    /**
+     * @return {?}
+     */
+    get activeVisits() {
+        return this._activeVisits.readonly;
+    }
     // @Trace()
     /**
-     * @param {?} activatedRoute
      * @param {?} previous
      * @param {?} next
      * @return {?}
      */
-    pushVisitChangesToRoute(activatedRoute, previous, next) {
+    pushVisitChangesToRoute(previous, next) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // we have to push to history so our remember sanitisers don't pick up the previous value
             // when it's been cleared by the user.
@@ -223,214 +293,138 @@ export class PlaceRouter extends GarbageCollector {
                  */
                 router => {
                     /** @type {?} */
-                    const urlSnapshot = this.parseUrl(this.router.routerState.snapshot.url).updateVisitSegments(next);
-                    console.log('### Push Changes to route Redirect', { commands: urlSnapshot.url });
+                    const urlSnapshot = this.urlService.parseUrl(this.angularRouter.routerState.snapshot.url).updateVisitSegments(next);
+                    // console.log('### Push Changes to route Redirect', { commands: urlSnapshot.url });
                     return this.navigateByUrl(urlSnapshot);
                 }));
             }
         });
     }
     /**
-     * @param {?} visit
-     * @param {?} runNavigationCommands
+     * @private
+     * @param {?} currentRouterUrl
      * @return {?}
      */
-    doNavigation(visit, runNavigationCommands) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.navigationInProgress.value) {
-                lang.illegalState('Navigation already in progress');
-            }
-            this.runStateTransition((/**
-             * @param {?} current
-             * @return {?}
-             */
-            current => {
-                /** @type {?} */
-                const session = this.navigationState.onPlaceNavigationStart(visit, this.getCurrentRouterUrl());
-                session.storeVisit(visit);
-                return session;
-            }));
-            try {
-                yield runNavigationCommands(this.router);
-            }
-            finally {
-                // Router has finished (since there was no router change required) so we
-                // need to end the navigation session.
-                if (this.navigationState.isTransitional && !this.router.getCurrentNavigation()) {
-                    this.runStateTransition((/**
-                     * @param {?} session
-                     * @return {?}
-                     */
-                    session => session.onRouterEnd(new NavigationEnd(-1, '', ''))));
-                }
-            }
-        });
+    createNavigationSession(currentRouterUrl) {
+        /** @type {?} */
+        const inInteraction = this.interactionService.isActive();
+        return inInteraction ?
+            new NavigatingDuringInteraction(this.navigationContext, currentRouterUrl) :
+            new Navigating(this.navigationContext, currentRouterUrl);
     }
     // @Trace()
     /**
      * @protected
-     * @param {?} transition
+     * @param {?} next
      * @return {?}
      */
-    runStateTransition(transition) {
-        /** @type {?} */
-        const previous = this._navigationStateModel.value;
+    transitionTo(next) {
         /** @type {?} */
-        const next = transition(this.navigationState);
-        this._navigationStateModel.value = next;
-        if (next !== previous) {
+        const previous = this.navigationSessionModel.value;
+        assert.isTruthy(next !== previous);
+        Logger.get(this).info(`### Router State Transition: ${previous ? previous.toString() : 'null'} -> ${next.toString()}`);
+        this.navigationSessionModel.value = next;
+        if (!!previous) {
             previous.dispose();
-            Logger.get(this).info(`Router State Transition: ${previous.toString()} -> ${next.toString()}`);
         }
+        next.notifyActive();
     }
+    // @Trace()
     /**
      * @private
-     * @param {?} visit
-     * @return {?}
-     */
-    createRouteParameters(visit) {
-        /** @type {?} */
-        const def = visit.placeDefinition;
-        return visit.hasRouteId() ?
-            [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
-            [def.getFormattedRouteParameters(visit)];
-    }
-    /**
-     * @param {?} activatedRoute
-     * @return {?}
-     */
-    extractChildPath(activatedRoute) {
-        return _.flatten(activatedRoute.children.map((/**
-         * @param {?} child
-         * @return {?}
-         */
-        child => child.url)));
-    }
-    /**
-     * @param {?} url
-     * @return {?}
-     */
-    parseUrl(url) {
-        return new UrlSnapshot(this.urlSerializer, url);
-    }
-    /**
-     * @param {?} url
-     * @param {?} options
-     * @return {?}
-     */
-    resetBrowserLocation(url, options) {
-        options.replaceCurrent ? this.angularLocation.replaceState(url) : this.angularLocation.go(url);
-    }
-    /**
+     * @param {?} visits
      * @return {?}
      */
-    forward() {
-        this.angularLocation.forward();
-    }
-    /**
-     * @param {...?} visits
-     * @return {?}
-     */
-    createUrlSnapshot(...visits) {
+    routingSessionFinished(visits) {
+        if (visits && visits.length > 0) {
+            assert.isTruthy(this.navigationInProgress.value);
+            visits.forEach((/**
+             * @param {?} v
+             * @return {?}
+             */
+            v => this.placeHistory.add(v)));
+            // We update the active visits before we finish the session so the
+            // place outlets can ignore the incoming changes until things are
+            // settled. TODO: can we removed the event'ness here and just do a push?
+            this._activeVisits.value = visits;
+        }
         /** @type {?} */
-        const bits = [];
-        visits.forEach((/**
-         * @param {?} v
+        const session = this.currentSession;
+        session.dispose();
+        this.navigationSessionModel.value = null;
+        console.log(`### Router Session Finished (was ${session.toString()})`);
+        this.sessionFinishedJobs.forEach((/**
+         * @param {?} job
          * @return {?}
          */
-        v => {
-            bits.push(this.parseUrl(`${v.placeDefinition.path}`).updateVisitSegments(v).url);
-        }));
-        return this.parseUrl(bits.join(''));
-    }
-    /**
-     * @return {?}
-     */
-    getCurrentRouterUrl() {
-        return this.router.routerState ? this.router.routerState.snapshot.url : null;
+        job => job()));
+        this.sessionFinishedJobs = [];
     }
     /**
+     * @private
+     * @param {?} func
      * @return {?}
      */
-    getCurrentRouteSnapshot() {
-        return this.parseUrl(this.getCurrentRouterUrl());
-    }
-    /**
-     * @param {?} url
-     * @return {?}
-     */
-    getActiveInteractionIdsFromUrl(url) {
-        return this.parseUrl(url).getInteractionIds();
+    runAfterRoutingSessionFinishes(func) {
+        assert.isTruthy(this.navigationInProgress);
+        this.sessionFinishedJobs.push(func);
     }
-    // @Trace()
     /**
-     * @param {?} url
+     * Sync's the current interaction state with the URL.  We need to push something in the URL in order
+     * to be able to capture the back button on the first page.  If we don't then the back click will exit
+     * the app directly and we don't get to ask.
      * @return {?}
      */
-    hasActiveInteractionIds(url) {
-        return this.getActiveInteractionIdsFromUrl(url).length > 0;
-    }
     // @Trace()
-    /**
-     * @param {?} urlSnapshot
-     * @param {?=} navigationExtras
-     * @return {?}
-     */
-    navigateByUrl(urlSnapshot, navigationExtras) {
-        return this.router.navigateByUrl(urlSnapshot.urlTree, navigationExtras);
-    }
-    // TODO: Should this be moved to the navigation states?
-    /**
-     * @param {?} currentIds
-     * @param {?} previous
-     * @return {?}
-     */
-    syncInteractionIdsWithRouter(currentIds, previous) {
-        assert.isFalsey(this.navigationInProgress.value); // Updating interaction routes during an existing navigation breaks all the things.
-        console.log({
-            startingActivity: currentIds.length > previous.length,
-            wasBackButton: this.navigationState.isPopState
-        });
-        if (_.isEqual(currentIds, previous)) {
-            console.log('activity ids were the same, skipping');
+    syncInteractionContextIdsWithRouter() {
+        if (this.navigationSession) {
+            // console.log(`Navigation active -> ${this.navigationSession.toString()}, sync delayed until finished.`);
+            /** @type {?} */
+            const session = this.navigationSession;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            (resolve, reject) => {
+                this.runAfterRoutingSessionFinishes((/**
+                 * @return {?}
+                 */
+                () => {
+                    this.runAfterRoutingSessionFinishes(resolve);
+                    /** @type {?} */
+                    const syncSession = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);
+                    this.transitionTo(syncSession);
+                }));
+            }));
         }
         else {
-            // OMG, this is nuts.
-            /** @type {?} */
-            const addingActivity = currentIds.length > previous.length;
-            /** @type {?} */
-            const isFirstActivity = addingActivity && previous.length < 1;
-            /** @type {?} */
-            const removingLastActivity = currentIds.length < 1;
-            if (addingActivity) { // we're starting a new activity, push the change to the history and update the url
-                console.log('adding activity');
-                this.navigateByUrl(this.getCurrentRouteSnapshot().updateInteractionIds(currentIds), {
-                    replaceUrl: !isFirstActivity // we don't let the history pile up
-                });
-            }
-            else {
+            return new Promise(((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            (resolve, reject) => {
+                // console.log(`No navigation in progress, starting synchronisation job`);
+                this.runAfterRoutingSessionFinishes(resolve);
                 /** @type {?} */
-                const urlSnapshot = this.getCurrentRouteSnapshot().updateInteractionIds(currentIds);
-                if (removingLastActivity) {
-                    this.navigateByUrl(urlSnapshot, {
-                        replaceUrl: true
-                    }).then((/**
-                     * @return {?}
-                     */
-                    () => {
-                        // for some reason we need to pop the last history off the stack when leaving the
-                        // active activity state.
-                        this.angularLocation.back();
-                    }));
-                }
-                else {
-                    this.navigateByUrl(urlSnapshot, {
-                        replaceUrl: true
-                    });
-                }
-            }
+                const session = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);
+                this.transitionTo(session);
+            })));
         }
     }
+    /**
+     * @private
+     * @param {?} visit
+     * @return {?}
+     */
+    createRouteParameters(visit) {
+        /** @type {?} */
+        const def = visit.placeDefinition;
+        return visit.hasRouteId() ?
+            [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
+            [def.getFormattedRouteParameters(visit)];
+    }
 }
 PlaceRouter.decorators = [
     { type: Injectable, args: [{
@@ -440,61 +434,65 @@ PlaceRouter.decorators = [
 /** @nocollapse */
 PlaceRouter.ctorParameters = () => [
     { type: Router },
-    { type: UrlSerializer },
     { type: Location },
-    { type: PlaceHistory },
-    { type: InteractionService }
+    { type: InteractionService },
+    { type: UrlService },
+    { type: PlaceHistory }
 ];
-/** @nocollapse */ PlaceRouter.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i1.UrlSerializer), i0.ɵɵinject(i2.Location), i0.ɵɵinject(i3.PlaceHistory), i0.ɵɵinject(i4.InteractionService)); }, token: PlaceRouter, providedIn: "root" });
+/** @nocollapse */ PlaceRouter.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i2.Location), i0.ɵɵinject(i3.InteractionService), i0.ɵɵinject(i4.UrlService), i0.ɵɵinject(i5.PlaceHistory)); }, token: PlaceRouter, providedIn: "root" });
 if (false) {
+    /** @type {?} */
+    PlaceRouter.prototype.navigationSessionModel;
+    /** @type {?} */
+    PlaceRouter.prototype.navigationInProgress;
+    /** @type {?} */
+    PlaceRouter.prototype.navigationSessionName;
     /**
      * @type {?}
      * @private
      */
-    PlaceRouter.prototype._navigationStateModel;
+    PlaceRouter.prototype.navigationContext;
     /**
      * @type {?}
      * @private
      */
     PlaceRouter.prototype._activeVisits;
     /** @type {?} */
-    PlaceRouter.prototype.navigationInProgress;
-    /** @type {?} */
-    PlaceRouter.prototype.activeVisitIndex;
+    PlaceRouter.prototype.activeVisitsByPlaceDefinition;
     /**
      * @type {?}
      * @private
      */
-    PlaceRouter.prototype._navigationSessionContext;
+    PlaceRouter.prototype.routerInteractionAdapter;
     /**
      * @type {?}
      * @private
      */
-    PlaceRouter.prototype._navigationStateTypeModel;
+    PlaceRouter.prototype.sessionFinishedJobs;
     /**
      * @type {?}
      * @private
      */
-    PlaceRouter.prototype.router;
+    PlaceRouter.prototype.angularRouter;
     /**
      * @type {?}
      * @private
      */
-    PlaceRouter.prototype.urlSerializer;
+    PlaceRouter.prototype.angularLocation;
     /**
      * @type {?}
      * @private
      */
-    PlaceRouter.prototype.angularLocation;
+    PlaceRouter.prototype.interactionService;
     /**
      * @type {?}
      * @private
      */
-    PlaceRouter.prototype.placeHistory;
+    PlaceRouter.prototype.urlService;
     /**
      * @type {?}
      * @private
      */
-    PlaceRouter.prototype.interactionService;
+    PlaceRouter.prototype.placeHistory;
 }
 //# sourceMappingURL=place-router.js.map