@coolon/angular-ui-powerups 0.0.66 → 0.0.68

package/fesm5/coolon-angular-ui-powerups.js

@@ -1,22 +1,22 @@
-import { DOCUMENT, CommonModule, Location } from '@angular/common';
+import { DOCUMENT, Location, CommonModule } from '@angular/common';
 import { EventEmitter, Input, Output, HostListener, Component, Directive, ElementRef, Inject, NgZone, InjectionToken, Injector, ComponentFactoryResolver, ViewContainerRef, ViewChild, ViewChildren, Injectable, Optional, ɵɵdefineInjectable, ɵɵinject, NgModule, HostBinding, INJECTOR } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { MatDialog, MatButtonModule, MatDialogModule, MatTabsModule, MatProgressSpinnerModule, MatInputModule, MatFormFieldModule, MatSelectModule } from '@angular/material';
 import { MatTabsModule as MatTabsModule$1 } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { __extends, __decorate, __metadata, __assign, __awaiter, __generator } from 'tslib';
-import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, DelegatingValueModel, MutableStream, MutableListModel, DelegatingListModel, StoreInValueModel, Binding, MutableValueModel, Guard as Guard$1, OptionsHelper, ValueHolder } from '@coolon/pectin';
+import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, DelegatingValueModel, MutableStream, MutableListModel, DelegatingListModel, StoreInValueModel, Binding, MutableValueModel, Trace, Guard as Guard$1, OptionsHelper, ValueHolder } from '@coolon/pectin';
 import { PortalModule } from '@angular/cdk/portal';
-import ___default, { last, isNil } from 'lodash';
-import { assert as assert$1, Klass, Opts } from '@coolon/typescript-utilities';
+import { Router, RouterModule, NavigationStart, NavigationEnd, NavigationError, ActivatedRoute, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import ___default, { last, isNil, isEqual } from 'lodash';
+import { assert as assert$1, Opts, Klass } from '@coolon/typescript-utilities';
 import { MatDialogConfig, MAT_DIALOG_DEFAULT_OPTIONS, MatDialog as MatDialog$1 } from '@angular/material/dialog';
 import { v1 } from 'uuid';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import { Router, NavigationStart, NavigationEnd, NavigationError, RouterModule } from '@angular/router';
-import { Memoize as Memoize$1 } from '@typescript-plus/fast-memoize-decorator/dist/src';
-import { Memoize } from '@typescript-plus/fast-memoize-decorator';
+import { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';
+import { Memoize as Memoize$1 } from '@typescript-plus/fast-memoize-decorator';
 import 'reflect-metadata';
 import { style, query, group, animate, trigger, transition } from '@angular/animations';
 import ResizeObserver from 'resize-observer-polyfill';
@@ -417,6 +417,25 @@ var StringInputComponent = /** @class */ (function (_super) {
     return StringInputComponent;
 }(AbstractInputComponent));
 
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+var NoopComponent = /** @class */ (function () {
+    function NoopComponent() {
+    }
+    NoopComponent.decorators = [
+        { type: Component, args: [{
+                    selector: 'angular-ui-powerups-noop',
+                    template: "",
+                    styles: [":host{display:block}"]
+                }] }
+    ];
+    /** @nocollapse */
+    NoopComponent.ctorParameters = function () { return []; };
+    return NoopComponent;
+}());
+
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -1176,7 +1195,7 @@ var AlertDialogComponent = /** @class */ (function (_super) {
     AlertDialogComponent.decorators = [
         { type: Component, args: [{
                     selector: 'angular-ui-powerups-alert-dialog',
-                    template: "<h3 matDialogTitle *ngIf=\"alert.title\">{{alert.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of alert.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-raised-button color=\"primary\" (click)=\"done()\">{{alert.ok()}}</button>\n</p>\n",
+                    template: "<h3 matDialogTitle *ngIf=\"alert.title\">{{alert.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of alert.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-raised-button color=\"primary\" (click)=\"done()\" data-cy=\"close-button\">{{alert.ok()}}</button>\n</p>\n",
                     styles: [":host{display:block;padding:var(--angular-ui-powerups-default-padding)}.mat-dialog-actions{justify-content:flex-end}"]
                 }] }
     ];
@@ -1257,7 +1276,7 @@ var ConfirmThenDialogComponent = /** @class */ (function (_super) {
     ConfirmThenDialogComponent.decorators = [
         { type: Component, args: [{
                     selector: 'angular-ui-powerups-confirmation-dialog',
-                    template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-button (click)=\"cancel()\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"onConfirm()\">{{confirm.ok()}}</button>\n</p>\n\n",
+                    template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-button (click)=\"cancel()\" data-cy=\"cancel-button\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"onConfirm()\" data-cy=\"confirm-button\">{{confirm.ok()}}</button>\n</p>\n\n",
                     styles: [":host{display:block;padding:var(--angular-ui-powerups-default-padding)}.mat-dialog-actions{justify-content:flex-end}"]
                 }] }
     ];
@@ -1323,7 +1342,7 @@ var ConfirmationDialogComponent = /** @class */ (function (_super) {
     ConfirmationDialogComponent.decorators = [
         { type: Component, args: [{
                     selector: 'angular-ui-powerups-confirmation-dialog',
-                    template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-button (click)=\"cancel()\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"done()\">{{confirm.ok()}}</button>\n</p>\n\n",
+                    template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-button (click)=\"cancel()\" data-cy=\"cancel-button\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"done()\" data-cy=\"confirm-button\">{{confirm.ok()}}</button>\n</p>\n\n",
                     styles: [":host{display:block;padding:var(--angular-ui-powerups-default-padding)}.mat-dialog-actions{justify-content:flex-end}"]
                 }] }
     ];
@@ -1811,6 +1830,25 @@ if (false) {
     ActivityContainerComponent.prototype._activityList;
 }
 
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+var InteractionOutletComponent = /** @class */ (function () {
+    function InteractionOutletComponent() {
+    }
+    InteractionOutletComponent.decorators = [
+        { type: Component, args: [{
+                    selector: 'angular-ui-powerups-interaction-outlet',
+                    template: "<router-outlet name=\"interaction-context\"></router-outlet>\n",
+                    styles: [":host{display:block}"]
+                }] }
+    ];
+    /** @nocollapse */
+    InteractionOutletComponent.ctorParameters = function () { return []; };
+    return InteractionOutletComponent;
+}());
+
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -1871,9 +1909,11 @@ var Guard = /** @class */ (function (_super) {
 }(ValueModel));
 var DialogInteractionService = /** @class */ (function (_super) {
     __extends(DialogInteractionService, _super);
-    function DialogInteractionService(dialogService, dialogServiceDefaults, matDialogDefaultConfig) {
+    function DialogInteractionService(dialogService, location, router, dialogServiceDefaults, matDialogDefaultConfig) {
         var _this = _super.call(this) || this;
         _this.dialogService = dialogService;
+        _this.location = location;
+        _this.router = router;
         _this.dialogServiceDefaults = dialogServiceDefaults;
         _this.matDialogDefaultConfig = matDialogDefaultConfig;
         _this._activityList = new DelegatingListModel();
@@ -1955,6 +1995,7 @@ var DialogInteractionService = /** @class */ (function (_super) {
          */
         function () {
             _this.currentActivityId = v1();
+            // this.location.go(this.router.routerState.snapshot.url, "aup");
             /** @type {?} */
             var self = _this;
             /** @type {?} */
@@ -1984,7 +2025,7 @@ var DialogInteractionService = /** @class */ (function (_super) {
                      */
                     function (result) {
                         resolve(result);
-                        matDialogRef.close(result);
+                        matDialogRef.close(true); // return true to let the after close listener know we've already handled it.
                     },
                     onCancel: /**
                      * @param {?} error
@@ -1992,9 +2033,18 @@ var DialogInteractionService = /** @class */ (function (_super) {
                      */
                     function (error) {
                         reject(error);
-                        matDialogRef.close(error);
+                        matDialogRef.close(true); // return true to let the after close listener know we've already handled it.
                     }
                 };
+                matDialogRef.afterClosed().subscribe((/**
+                 * @param {?} promiseAlreadyFinished
+                 * @return {?}
+                 */
+                function (promiseAlreadyFinished) {
+                    if (!promiseAlreadyFinished) {
+                        reject("auto-closed");
+                    }
+                }));
                 matDialogRef.updateSize();
             })).finally((/**
              * @return {?}
@@ -2035,6 +2085,7 @@ var DialogInteractionService = /** @class */ (function (_super) {
      * @return {?}
      */
     function (alert) {
+        // TODO: Test disableClose === false
         return this._startActivity(AlertDialogComponent, alert, false);
     };
     /**
@@ -2077,10 +2128,12 @@ var DialogInteractionService = /** @class */ (function (_super) {
     /** @nocollapse */
     DialogInteractionService.ctorParameters = function () { return [
         { type: MatDialog },
+        { type: Location },
+        { type: Router },
         { type: MatDialogConfig, decorators: [{ type: Optional }, { type: Inject, args: [DIALOG_INTERACTION_SERVICE_DEFAULTS,] }] },
         { type: MatDialogConfig, decorators: [{ type: Optional }, { type: Inject, args: [MAT_DIALOG_DEFAULT_OPTIONS,] }] }
     ]; };
-    /** @nocollapse */ DialogInteractionService.ngInjectableDef = ɵɵdefineInjectable({ factory: function DialogInteractionService_Factory() { return new DialogInteractionService(ɵɵinject(MatDialog$1), ɵɵinject(DIALOG_INTERACTION_SERVICE_DEFAULTS, 8), ɵɵinject(MAT_DIALOG_DEFAULT_OPTIONS, 8)); }, token: DialogInteractionService, providedIn: "root" });
+    /** @nocollapse */ DialogInteractionService.ngInjectableDef = ɵɵdefineInjectable({ factory: function DialogInteractionService_Factory() { return new DialogInteractionService(ɵɵinject(MatDialog$1), ɵɵinject(Location), ɵɵinject(Router), ɵɵinject(DIALOG_INTERACTION_SERVICE_DEFAULTS, 8), ɵɵinject(MAT_DIALOG_DEFAULT_OPTIONS, 8)); }, token: DialogInteractionService, providedIn: "root" });
     return DialogInteractionService;
 }(InteractionContext));
 if (false) {
@@ -2105,6 +2158,10 @@ if (false) {
      */
     DialogInteractionService.prototype.dialogService;
     /** @type {?} */
+    DialogInteractionService.prototype.location;
+    /** @type {?} */
+    DialogInteractionService.prototype.router;
+    /** @type {?} */
     DialogInteractionService.prototype.dialogServiceDefaults;
     /** @type {?} */
     DialogInteractionService.prototype.matDialogDefaultConfig;
@@ -2124,18 +2181,21 @@ var InteractionModule = /** @class */ (function () {
                         MatButtonModule,
                         MatDialogModule,
                         MatTabsModule,
-                        PortalModule
+                        PortalModule,
+                        RouterModule
                     ],
                     declarations: [
                         ActivityContainerComponent,
                         ConfirmationDialogComponent,
                         ConfirmThenDialogComponent,
                         AlertDialogComponent,
-                        ActivityOutletComponent
+                        ActivityOutletComponent,
+                        InteractionOutletComponent
                     ],
                     exports: [
                         ActivityContainerComponent,
                         ActivityOutletComponent,
+                        InteractionOutletComponent
                     ],
                     entryComponents: [
                         ActivityContainerComponent,
@@ -2227,859 +2287,1020 @@ var EmptyStateComponent = /** @class */ (function () {
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
-var PlaceDefinition = /** @class */ (function () {
-    function PlaceDefinition(component, path, authenticate, order, data, routeParameters, children) {
-        this.component = component;
-        this.path = path;
-        this.authenticate = authenticate;
-        this.order = order;
-        this.data = data;
-        this.routeParameters = routeParameters;
-        this.children = children;
-    }
-    /**
-     * @return {?}
-     */
-    PlaceDefinition.prototype.getRouteParameters = /**
-     * @return {?}
-     */
-    function () {
-        return this.routeParameters;
-    };
-    /**
-     * @template T
-     * @param {?} key
-     * @param {?=} defaultValue
-     * @return {?}
-     */
-    PlaceDefinition.prototype.getData = /**
-     * @template T
-     * @param {?} key
-     * @param {?=} defaultValue
-     * @return {?}
-     */
-    function (key, defaultValue) {
-        return this.data ?
-            ___default.isNil(this.data[key]) ? defaultValue : this.data[key] :
-            defaultValue;
-    };
-    /**
-     * @template T
-     * @param {?} keys
-     * @param {?=} defaultValue
-     * @return {?}
-     */
-    PlaceDefinition.prototype.searchData = /**
-     * @template T
-     * @param {?} keys
-     * @param {?=} defaultValue
-     * @return {?}
-     */
-    function (keys, defaultValue) {
-        var _this = this;
-        if (this.data) {
-            /** @type {?} */
-            var found = keys.find((/**
-             * @param {?} key
-             * @return {?}
-             */
-            function (key) { return !___default.isNil(_this.data[key]); }));
-            return found ? this.data[found] : defaultValue;
-        }
-        else {
-            return defaultValue;
-        }
-    };
-    return PlaceDefinition;
-}());
-if (false) {
-    /** @type {?} */
-    PlaceDefinition.prototype.component;
-    /** @type {?} */
-    PlaceDefinition.prototype.path;
-    /** @type {?} */
-    PlaceDefinition.prototype.authenticate;
-    /** @type {?} */
-    PlaceDefinition.prototype.order;
-    /** @type {?} */
-    PlaceDefinition.prototype.data;
-    /** @type {?} */
-    PlaceDefinition.prototype.routeParameters;
-    /** @type {?} */
-    PlaceDefinition.prototype.children;
-}
-
 /**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ * @abstract
+ * @template T, E
  */
-// RAKE: making this Symbol(...) broke things.
-/** @type {?} */
-var DEFINITION_META_DATA_KEY = 'PLACE_DEFINITION_OPTIONS';
-// this one seems ok.
-/** @type {?} */
-var ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');
-var PlaceComponent = /** @class */ (function (_super) {
-    __extends(PlaceComponent, _super);
-    function PlaceComponent() {
-        return _super.call(this) || this;
+var  /**
+ * @abstract
+ * @template T, E
+ */
+ParameterDefinition = /** @class */ (function () {
+    function ParameterDefinition(propertyName, options, urlFormat) {
+        this.propertyName = propertyName;
+        this.urlFormat = urlFormat;
+        this.options = Opts.get(options);
+        this.remember = this.options.getOptional('remember', false);
+        this.defaultValue = this.options.getOptional('defaultValue', null);
     }
-    /**
-     * @param {?} resolvedParameters
-     * @return {?}
-     */
-    PlaceComponent.prototype.initialiseBindings = /**
-     * @param {?} resolvedParameters
-     * @return {?}
-     */
-    function (resolvedParameters) {
-        var _this = this;
-        assert.isNil(this.resolvedParameters);
-        this.resolvedParameters = resolvedParameters;
-        this.placeDefinition.getRouteParameters().forEach((/**
-         * @param {?} parameterDef
-         * @return {?}
-         */
-        function (parameterDef) {
-            _this.installBinding(parameterDef);
-        }));
-    };
-    /**
-     * @private
-     * @template T, S
-     * @param {?} parameterDef
-     * @return {?}
-     */
-    PlaceComponent.prototype.installBinding = /**
-     * @private
-     * @template T, S
-     * @param {?} parameterDef
-     * @return {?}
-     */
-    function (parameterDef) {
-        /** @type {?} */
-        var model = (/** @type {?} */ (this[parameterDef.propertyName]));
-        // this.txo.observe(parameterDef.propertyName, model);
-        this.registerDisposable(new Binding(this.resolvedParameters, model, {
-            toRight: /**
-             * @param {?} parameters
-             * @return {?}
-             */
-            function (parameters) {
-                return parameters.getValueOf(parameterDef);
-            },
-            toLeft: /**
-             * @param {?} value
-             * @param {?=} currentParameters
-             * @return {?}
-             */
-            function (value, currentParameters) {
-                return currentParameters.replace(parameterDef, value);
-            }
-        }));
-    };
-    Object.defineProperty(PlaceComponent.prototype, "placeDefinition", {
+    Object.defineProperty(ParameterDefinition.prototype, "name", {
         get: /**
          * @return {?}
          */
         function () {
-            return PlaceComponent.getDefinition((/** @type {?} */ ((/** @type {?} */ (this.constructor)))));
+            return this.options.getOptional('as', this.propertyName);
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(PlaceComponent.prototype, "childPlaces", {
-        get: /**
+    Object.defineProperty(ParameterDefinition.prototype, "isRouteParameter", {
+        // @Trace()
+        get: 
+        // @Trace()
+        /**
          * @return {?}
          */
         function () {
-            return this.placeDefinition.children.map((/**
-             * @param {?} d
-             * @return {?}
-             */
-            function (d) { return d.component; }));
+            return !!this.urlFormat;
         },
         enumerable: true,
         configurable: true
     });
     /**
+     * @protected
+     * @template K
+     * @param {?} key
      * @return {?}
      */
-    PlaceComponent.prototype.canDeactivate = /**
+    ParameterDefinition.prototype.getOptionValue = /**
+     * @protected
+     * @template K
+     * @param {?} key
      * @return {?}
      */
-    function () {
-        return true;
+    function (key) {
+        return this.options.getOptional(key, null);
     };
+    // @Trace()
+    // @Trace()
     /**
+     * @param {?} value
+     * @param {?} visit
+     * @param {?} placeHistory
+     * @param {?} injector
      * @return {?}
      */
-    PlaceComponent.prototype.onPlaceReady = /**
+    ParameterDefinition.prototype.sanitise = 
+    // @Trace()
+    /**
+     * @param {?} value
+     * @param {?} visit
+     * @param {?} placeHistory
+     * @param {?} injector
      * @return {?}
      */
-    function () {
+    function (value, visit, placeHistory, injector) {
+        return __awaiter(this, void 0, void 0, function () {
+            var previousVisit;
+            return __generator(this, function (_a) {
+                if (this.isMissingFrom(visit)) {
+                    previousVisit = ___default.first(placeHistory.getHistory(visit.placeDefinition));
+                    if (this.remember && previousVisit) {
+                        value = previousVisit.getParameter(this.name);
+                    }
+                    return [2 /*return*/, this.isEmptyValue(value) ? this.defaultValue : value];
+                }
+                else {
+                    // todo: add custom sanitiser
+                    return [2 /*return*/, value];
+                }
+                return [2 /*return*/];
+            });
+        });
     };
-    __decorate([
-        Memoize(),
-        __metadata("design:type", PlaceDefinition),
-        __metadata("design:paramtypes", [])
-    ], PlaceComponent.prototype, "placeDefinition", null);
-    return PlaceComponent;
-}(DisposableComponent));
+    /**
+     * @private
+     * @param {?} visit
+     * @return {?}
+     */
+    ParameterDefinition.prototype.isMissingFrom = /**
+     * @private
+     * @param {?} visit
+     * @return {?}
+     */
+    function (visit) {
+        return !visit.hasParameter(this.name) || (this.isRouteId && !visit.hasRouteId());
+    };
+    return ParameterDefinition;
+}());
 if (false) {
+    /** @type {?} */
+    ParameterDefinition.prototype.isRouteId;
+    /** @type {?} */
+    ParameterDefinition.prototype.isArray;
+    /** @type {?} */
+    ParameterDefinition.prototype.remember;
+    /** @type {?} */
+    ParameterDefinition.prototype.defaultValue;
     /**
      * @type {?}
      * @private
      */
-    PlaceComponent.prototype.resolvedParameters;
-}
-(function (PlaceComponent) {
+    ParameterDefinition.prototype.options;
+    /** @type {?} */
+    ParameterDefinition.prototype.propertyName;
+    /** @type {?} */
+    ParameterDefinition.prototype.urlFormat;
     /**
-     * @param {?} target
+     * @abstract
+     * @param {?} value
      * @return {?}
      */
-    function isPlaceComponentConstructor(target) {
-        return lang.constructorChain((/** @type {?} */ (target))).includes(PlaceComponent);
-    }
-    PlaceComponent.isPlaceComponentConstructor = isPlaceComponentConstructor;
+    ParameterDefinition.prototype.isEmptyValue = function (value) { };
     /**
-     * @param {?} klass
+     * @abstract
+     * @param {?} a
+     * @param {?} b
      * @return {?}
      */
-    function getRouteParameters(klass) {
-        return Klass.get(klass).getMetadataList(ROUTE_PARAMETER_LIST_KEY);
-    }
-    PlaceComponent.getRouteParameters = getRouteParameters;
+    ParameterDefinition.prototype.hasChanged = function (a, b) { };
+}
+(function (ParameterDefinition) {
     /**
-     * @param {?} klass
-     * @return {?}
+     * @record
+     * @template T
      */
-    function getDefinition(klass) {
-        return Reflect.getMetadata(DEFINITION_META_DATA_KEY, klass);
+    function Options() { }
+    ParameterDefinition.Options = Options;
+    if (false) {
+        /** @type {?|undefined} */
+        Options.prototype.as;
+        /** @type {?|undefined} */
+        Options.prototype.optional;
+        /** @type {?|undefined} */
+        Options.prototype.remember;
+        /** @type {?|undefined} */
+        Options.prototype.defaultValue;
     }
-    PlaceComponent.getDefinition = getDefinition;
     /**
-     * @param {?} klass
-     * @param {?} definition
-     * @return {?}
+     * @template T
      */
-    function injectDefinition(klass, definition) {
-        Reflect.defineMetadata(DEFINITION_META_DATA_KEY, definition, klass);
-    }
-    PlaceComponent.injectDefinition = injectDefinition;
-})(PlaceComponent || (PlaceComponent = {}));
-
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-var AbstractPlaceNavigationComponent = /** @class */ (function (_super) {
-    __extends(AbstractPlaceNavigationComponent, _super);
-    function AbstractPlaceNavigationComponent() {
-        var _this = _super.call(this) || this;
-        var _a = Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
-        _this.placeDefinitions = chain(_this.placesModel).map((/**
-         * @param {?} c
+    var /**
+     * @template T
+     */
+    RouteId = /** @class */ (function (_super) {
+        __extends(RouteId, _super);
+        function RouteId() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.isRouteId = true;
+            _this.isArray = false;
+            return _this;
+        }
+        /**
+         * @param {?} value
          * @return {?}
          */
-        function (c) { return PlaceComponent.getDefinition(c); }));
-        return _this;
+        RouteId.prototype.isEmptyValue = /**
+         * @param {?} value
+         * @return {?}
+         */
+        function (value) {
+            return ___default.isNil(value);
+        };
+        /**
+         * @param {?} a
+         * @param {?} b
+         * @return {?}
+         */
+        RouteId.prototype.hasChanged = /**
+         * @param {?} a
+         * @param {?} b
+         * @return {?}
+         */
+        function (a, b) {
+            return a !== b;
+        };
+        return RouteId;
+    }(ParameterDefinition));
+    ParameterDefinition.RouteId = RouteId;
+    if (false) {
+        /** @type {?} */
+        RouteId.prototype.isRouteId;
+        /** @type {?} */
+        RouteId.prototype.isArray;
     }
     /**
-     * @param {?} placeDef
-     * @return {?}
+     * @template T
      */
-    AbstractPlaceNavigationComponent.prototype.getNav = /**
-     * @param {?} placeDef
-     * @return {?}
+    var /**
+     * @template T
      */
-    function (placeDef) {
-        /** @type {?} */
-        var navItem = (/** @type {?} */ (placeDef.getData('nav')));
-        return {
-            title: (/**
-             * @return {?}
-             */
-            function () { return navItem ? navItem.title() : placeDef.searchData(['navTitle', 'title']); }),
-            tooltip: (/**
-             * @return {?}
-             */
-            function () { return navItem && navItem.tooltip ? navItem.tooltip() : placeDef.getData('navTooltip', null); }),
-            icon: (/**
-             * @return {?}
-             */
-            function () { return navItem && navItem.icon ? navItem.icon() : placeDef.getData('navIcon', null); })
+    ValueParameter = /** @class */ (function (_super) {
+        __extends(ValueParameter, _super);
+        function ValueParameter() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.isRouteId = false;
+            _this.isArray = false;
+            return _this;
+        }
+        /**
+         * @param {?} value
+         * @return {?}
+         */
+        ValueParameter.prototype.isEmptyValue = /**
+         * @param {?} value
+         * @return {?}
+         */
+        function (value) {
+            return ___default.isNil(value);
         };
-    };
+        /**
+         * @param {?} a
+         * @param {?} b
+         * @return {?}
+         */
+        ValueParameter.prototype.hasChanged = /**
+         * @param {?} a
+         * @param {?} b
+         * @return {?}
+         */
+        function (a, b) {
+            return a !== b;
+        };
+        return ValueParameter;
+    }(ParameterDefinition));
+    ParameterDefinition.ValueParameter = ValueParameter;
+    if (false) {
+        /** @type {?} */
+        ValueParameter.prototype.isRouteId;
+        /** @type {?} */
+        ValueParameter.prototype.isArray;
+    }
     /**
-     * @return {?}
+     * @template T
      */
-    AbstractPlaceNavigationComponent.prototype.ngOnInit = /**
-     * @return {?}
+    var /**
+     * @template T
      */
-    function () {
-    };
-    AbstractPlaceNavigationComponent.propDecorators = {
-        places: [{ type: Input }],
-        placesModel: [{ type: Input }]
-    };
-    __decorate([
-        StoreInListModel('placesModel'),
-        __metadata("design:type", Array)
-    ], AbstractPlaceNavigationComponent.prototype, "places", void 0);
-    __decorate([
-        UseDelegate(),
-        __metadata("design:type", ListModel)
-    ], AbstractPlaceNavigationComponent.prototype, "placesModel", void 0);
-    __decorate([
-        Memoize$1(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [PlaceDefinition]),
-        __metadata("design:returntype", Object)
-    ], AbstractPlaceNavigationComponent.prototype, "getNav", null);
-    return AbstractPlaceNavigationComponent;
-}(DisposableComponent));
-if (false) {
-    /** @type {?} */
-    AbstractPlaceNavigationComponent.prototype.places;
-    /** @type {?} */
-    AbstractPlaceNavigationComponent.prototype.placesModel;
-    /** @type {?} */
-    AbstractPlaceNavigationComponent.prototype.placeDefinitions;
-}
+    ArrayParameter = /** @class */ (function (_super) {
+        __extends(ArrayParameter, _super);
+        function ArrayParameter(parameterName, options, urlFormat) {
+            var _this = _super.call(this, parameterName, options, urlFormat) || this;
+            _this.isRouteId = false;
+            _this.isArray = true;
+            return _this;
+        }
+        /**
+         * @param {?} value
+         * @return {?}
+         */
+        ArrayParameter.prototype.isEmptyValue = /**
+         * @param {?} value
+         * @return {?}
+         */
+        function (value) {
+            return ___default.isNil(value) || value.length < 1;
+        };
+        /**
+         * @param {?} a
+         * @param {?} b
+         * @return {?}
+         */
+        ArrayParameter.prototype.hasChanged = /**
+         * @param {?} a
+         * @param {?} b
+         * @return {?}
+         */
+        function (a, b) {
+            return !___default.isEqual(a, b);
+        };
+        return ArrayParameter;
+    }(ParameterDefinition));
+    ParameterDefinition.ArrayParameter = ArrayParameter;
+    if (false) {
+        /** @type {?} */
+        ArrayParameter.prototype.isRouteId;
+        /** @type {?} */
+        ArrayParameter.prototype.isArray;
+    }
+})(ParameterDefinition || (ParameterDefinition = {}));
 
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
-var ListPlaceNavComponent = /** @class */ (function (_super) {
-    __extends(ListPlaceNavComponent, _super);
-    function ListPlaceNavComponent() {
-        var _this = _super.call(this) || this;
-        _this.expanded = true;
-        return _this;
+var PlaceDefinition = /** @class */ (function () {
+    function PlaceDefinition(component, path, authenticate, order, data, routeParameters, children) {
+        this.component = component;
+        this.path = path;
+        this.authenticate = authenticate;
+        this.order = order;
+        this.data = data;
+        this.routeParameters = routeParameters;
+        this.children = children;
     }
     /**
      * @return {?}
      */
-    ListPlaceNavComponent.prototype.expandMenu = /**
+    PlaceDefinition.prototype.hasRouteId = /**
      * @return {?}
      */
     function () {
-        this.expanded = true;
+        return !!this.getRouteIdParameterDef();
     };
     /**
      * @return {?}
      */
-    ListPlaceNavComponent.prototype.collapseMenu = /**
+    PlaceDefinition.prototype.getRouteIdParameterDef = /**
      * @return {?}
      */
     function () {
-        this.expanded = false;
+        return this.routeParameters.find((/**
+         * @param {?} p
+         * @return {?}
+         */
+        function (p) { return p.isRouteId; }));
     };
     /**
+     * @param {?=} includeRouteId
      * @return {?}
      */
-    ListPlaceNavComponent.prototype.toggleMenu = /**
+    PlaceDefinition.prototype.getRouteParameterDefs = /**
+     * @param {?=} includeRouteId
      * @return {?}
      */
-    function () {
-        this.expanded = !this.expanded;
-    };
-    ListPlaceNavComponent.decorators = [
-        { type: Component, args: [{
-                    selector: 'angular-ui-powerups-list-place-nav',
-                    template: "<mat-nav-list class=\"app-menu\">\n  <a mat-list-item *ngFor=\"let place of placeDefinitions.value\"\n     [routerLink]='place.path'\n     routerLinkActive #rla=\"routerLinkActive\"\n     [matTooltip]=\"getNav(place).tooltip()\">\n    <mat-icon *ngIf=\"getNav(place).icon()\">{{getNav(place).icon()}}</mat-icon>\n    <span class=\"expanded-only\">{{getNav(place).title()}}</span>\n  </a>\n</mat-nav-list>\n",
-                    styles: [":host{display:flex;flex-direction:column;--expanded-width:235px;--nav-item-width:var(--nav-bar-height);width:var(--nav-item-width);transition:width 125ms linear}:host.expanded{width:var(--expanded-width);max-width:var(--expanded-width)}.expanded-only{max-width:0;overflow:hidden}.collapsed-only{max-width:100%;overflow:hidden}.header{display:flex;flex-direction:row;justify-content:flex-end;align-items:center;height:var(--nav-bar-height);border-bottom:var(--pinstripe-border);cursor:pointer}.header .menu{flex:1}.header button{color:inherit;width:var(--nav-item-width);height:var(--nav-bar-height)}mat-nav-list{flex:1;display:flex;flex-direction:column}.mat-list-item{width:var(--nav-item-width);height:var(--nav-bar-height);color:inherit}mat-icon{color:inherit}mat-icon.flip-horizontal{transform:scaleX(-1)}:host-context(.expanded) .expanded-only{max-width:100%}:host-context(.expanded) .collapsed-only{max-width:0}:host-context(.expanded) .mat-list-item mat-icon{margin-right:12px}:host-context(.expanded) .mat-list-item span{text-wrap:none;white-space:nowrap}a[ng-reflect-router-link=manage-instruments] mat-icon{transform:rotate(90deg)}.app-menu{padding-top:0}"]
-                }] }
-    ];
-    /** @nocollapse */
-    ListPlaceNavComponent.ctorParameters = function () { return []; };
-    ListPlaceNavComponent.propDecorators = {
-        expanded: [{ type: HostBinding, args: ['class.expanded',] }]
+    function (includeRouteId) {
+        if (includeRouteId === void 0) { includeRouteId = false; }
+        return this.getVisitParameterDefs({ includeRouteId: includeRouteId, includeRouteParameters: true });
     };
-    return ListPlaceNavComponent;
-}(AbstractPlaceNavigationComponent));
-if (false) {
-    /** @type {?} */
-    ListPlaceNavComponent.prototype.expanded;
-}
-
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-var PlaceHistory = /** @class */ (function () {
-    function PlaceHistory(router) {
-        this.router = router;
-        this._history = new Map();
-    }
     /**
-     * @param {?} state
+     * @param {?=} include
      * @return {?}
      */
-    PlaceHistory.prototype.add = /**
-     * @param {?} state
+    PlaceDefinition.prototype.getVisitParameterDefs = /**
+     * @param {?=} include
      * @return {?}
      */
-    function (state) {
+    function (include) {
         /** @type {?} */
-        var history = this.getHistory(state.placeDefinition);
+        var opts = Opts.get(include);
+        // includes
         /** @type {?} */
-        var previousState = ___default.last(history);
-        if (!previousState || state.hasChanged(previousState)) {
-            history.unshift(state); // LIFO
-            this.setHistory(state.placeDefinition, history.slice(0, 3)); // limit our history to 4 visits
-        }
-    };
-    /**
-     * @param {?} placeDef
-     * @return {?}
-     */
-    PlaceHistory.prototype.getHistory = /**
-     * @param {?} placeDef
-     * @return {?}
-     */
-    function (placeDef) {
+        var includeRouteId = !include || opts.getOptional('includeRouteId', false);
         /** @type {?} */
-        var history = this._history.get(placeDef);
-        if (!history) {
-            history = [];
-            this.setHistory(placeDef, history);
-        }
-        return history;
+        var includeRouteParameters = !include || opts.getOptional('includeRouteParameters', false);
+        /** @type {?} */
+        var includeNonRouteParameters = !include || opts.getOptional('includeNonRouteParameters', false);
+        return this.routeParameters.filter((/**
+         * @param {?} p
+         * @return {?}
+         */
+        function (p) {
+            return (includeRouteId && p.isRouteId)
+                || (includeRouteParameters && p.isRouteParameter && !p.isRouteId) // route id is included in the line above
+                || (includeNonRouteParameters && !p.isRouteParameter);
+        }));
     };
     /**
-     * @private
-     * @param {?} placeDef
-     * @param {?} history
+     * @template T
+     * @param {?} key
+     * @param {?=} defaultValue
      * @return {?}
      */
-    PlaceHistory.prototype.setHistory = /**
-     * @private
-     * @param {?} placeDef
-     * @param {?} history
+    PlaceDefinition.prototype.getPlaceData = /**
+     * @template T
+     * @param {?} key
+     * @param {?=} defaultValue
      * @return {?}
      */
-    function (placeDef, history) {
-        this._history.set(placeDef, history);
+    function (key, defaultValue) {
+        return this.data ?
+            ___default.isNil(this.data[key]) ? defaultValue : this.data[key] :
+            defaultValue;
     };
-    PlaceHistory.decorators = [
-        { type: Injectable, args: [{
-                    providedIn: 'root'
-                },] }
-    ];
-    /** @nocollapse */
-    PlaceHistory.ctorParameters = function () { return [
-        { type: Router }
-    ]; };
-    /** @nocollapse */ PlaceHistory.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceHistory_Factory() { return new PlaceHistory(ɵɵinject(Router)); }, token: PlaceHistory, providedIn: "root" });
-    return PlaceHistory;
-}());
-if (false) {
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceHistory.prototype._history;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceHistory.prototype.router;
-}
-
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-var NavigationSession = /** @class */ (function () {
-    function NavigationSession(isPopState, initialUrl) {
-        this.isPopState = isPopState;
-        this.initialUrl = initialUrl;
-        this._alreadyAccepted = [];
-        console.log('NavigationSession', { isPopState: isPopState, initialUrl: initialUrl });
-    }
     /**
-     * @param {?} placeComponent
+     * @template T
+     * @param {?} keys
+     * @param {?=} defaultValue
      * @return {?}
      */
-    NavigationSession.prototype.alreadyAccepted = /**
-     * @param {?} placeComponent
+    PlaceDefinition.prototype.searchPlaceData = /**
+     * @template T
+     * @param {?} keys
+     * @param {?=} defaultValue
      * @return {?}
      */
-    function (placeComponent) {
-        return this._alreadyAccepted.includes(placeComponent);
+    function (keys, defaultValue) {
+        var _this = this;
+        if (this.data) {
+            /** @type {?} */
+            var found = keys.find((/**
+             * @param {?} key
+             * @return {?}
+             */
+            function (key) { return !___default.isNil(_this.data[key]); }));
+            return found ? this.data[found] : defaultValue;
+        }
+        else {
+            return defaultValue;
+        }
     };
     /**
-     * @param {?} component
+     * @param {?} visit
      * @return {?}
      */
-    NavigationSession.prototype.rememberAcceptanceOf = /**
-     * @param {?} component
+    PlaceDefinition.prototype.getRouteIdFrom = /**
+     * @param {?} visit
      * @return {?}
      */
-    function (component) {
-        this._alreadyAccepted.push(component);
+    function (visit) {
+        /** @type {?} */
+        var routeIdParameterDef = this.getRouteIdParameterDef();
+        return routeIdParameterDef ? visit.getParameter(routeIdParameterDef.name) : null;
     };
-    return NavigationSession;
-}());
-if (false) {
     /**
-     * @type {?}
-     * @private
+     * Returns angular router commands that specify the route id and any route parameters.  The result does
+     * not include any path information.
      */
-    NavigationSession.prototype._alreadyAccepted;
-    /** @type {?} */
-    NavigationSession.prototype.isPopState;
-    /** @type {?} */
-    NavigationSession.prototype.initialUrl;
-}
-var PlaceRouter = /** @class */ (function () {
-    function PlaceRouter(router, angularLocation) {
-        var _this = this;
-        this.router = router;
-        this._navigationSession = new MutableValueModel();
-        angularLocation.onUrlChange((/**
-         * @param {?} url
-         * @return {?}
-         */
-        function (url) {
-            console.log("### " + url);
-        }));
-        this.router.events.subscribe((/**
-         * @param {?} event
-         * @return {?}
-         */
-        function (event) {
-            // console.log(`${event.constructor.name}`, location.pathname, angularLocation.getState());
-            // NavigationStart -> .... -> NavigationCancel === redirect (so don't ask again)
-            // NavigationStart -> .... -> NavigationEnd === navigated (so ask next time)
-            // NavigationStart -> .... -> NavigationError === canceled (guard cancelled so ask next time)
-            if (event instanceof NavigationStart && !_this.navigationSession) {
-                _this._navigationSession.value = new NavigationSession(event.navigationTrigger === 'popstate', _this.router.routerState.snapshot.url);
-            }
-            if (event instanceof NavigationEnd) {
-                console.log('navigation ended');
-                _this._navigationSession.value = null;
-            }
-            if (event instanceof NavigationError) {
-                console.log('navigation errored');
-                _this._navigationSession.value = null;
-            }
-        }));
-    }
-    Object.defineProperty(PlaceRouter.prototype, "navigationSession", {
-        get: /**
-         * @return {?}
-         */
-        function () {
-            return this._navigationSession.value;
-        },
-        enumerable: true,
-        configurable: true
-    });
+    // getFormattedRouterCommands(visit: Visit): any[] {
+    //   return this.hasRouteId() ?
+    //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
+    //     [this.getFormattedRouteParameters(visit)];
+    // }
     /**
-     * @param {?} activatedRoute
-     * @param {?} previous
-     * @param {?} next
+     * Returns angular router commands that specify the route id and any route parameters.  The result does
+     * not include any path information.
+     * @param {?} visit
      * @return {?}
      */
-    PlaceRouter.prototype.pushParameterChangesToRoute = /**
-     * @param {?} activatedRoute
-     * @param {?} previous
-     * @param {?} next
+    // getFormattedRouterCommands(visit: Visit): any[] {
+    //   return this.hasRouteId() ?
+    //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
+    //     [this.getFormattedRouteParameters(visit)];
+    // }
+    PlaceDefinition.prototype.getFormattedRouteId = /**
+     * Returns angular router commands that specify the route id and any route parameters.  The result does
+     * not include any path information.
+     * @param {?} visit
      * @return {?}
      */
-    function (activatedRoute, previous, next) {
-        /** @type {?} */
-        var relativePath = !!previous.hasRouteId() ? '..' : '.';
-        this.router.navigate([relativePath].concat(this.createRouteParameters(next), this.getChildPath(activatedRoute.snapshot)), {
-            relativeTo: activatedRoute
-        });
+    // getFormattedRouterCommands(visit: Visit): any[] {
+    //   return this.hasRouteId() ?
+    //     [this.getFormattedRouteId(visit), this.getFormattedRouteParameters(visit)] :
+    //     [this.getFormattedRouteParameters(visit)];
+    // }
+    function (visit) {
+        return visit.hasRouteId() ? this.getRouteIdParameterDef().urlFormat.format(visit.getRouteId()) : null;
     };
     // @Trace()
     // @Trace()
     /**
-     * @param {?} activatedRoute
-     * @param {?} sanitised
+     * @param {?} visit
+     * @param {?=} includeRouteId
      * @return {?}
      */
-    PlaceRouter.prototype.getRedirectUrlTree = 
+    PlaceDefinition.prototype.getFormattedRouteParameters = 
     // @Trace()
     /**
-     * @param {?} activatedRoute
-     * @param {?} sanitised
+     * @param {?} visit
+     * @param {?=} includeRouteId
      * @return {?}
      */
-    function (activatedRoute, sanitised) {
-        /** @type {?} */
-        var urlSegments = activatedRoute.url;
-        /** @type {?} */
-        var weHaveARouteId = sanitised.hasRouteId() && sanitised.getFormattedRouteId();
+    function (visit, includeRouteId) {
+        if (includeRouteId === void 0) { includeRouteId = false; }
         /** @type {?} */
-        var commands = (weHaveARouteId) ?
-            [urlSegments[0].path, sanitised.getFormattedRouteId(), sanitised.getFormattedParameters()] :
-            [urlSegments[0].path, sanitised.getFormattedParameters()];
-        return this.router.createUrlTree(commands);
+        var result = {};
+        this.getVisitParameterDefs({
+            includeRouteId: includeRouteId, includeRouteParameters: true
+        }).forEach((/**
+         * @param {?} def
+         * @return {?}
+         */
+        function (def) {
+            /** @type {?} */
+            var value = visit.getParameter(def.name);
+            if (!def.isEmptyValue(value)) {
+                if (def.isArray) {
+                    assert.isArray(value);
+                    result[def.name] = value.map((/**
+                     * @param {?} v
+                     * @return {?}
+                     */
+                    function (v) { return def.urlFormat.format(v); }));
+                }
+                else {
+                    assert.isFalsey(Array.isArray(value));
+                    result[def.name] = def.urlFormat.format(value);
+                }
+            }
+        }));
+        return result;
     };
     /**
-     * @protected
-     * @param {?} activatedRoute
+     * @param {?} visit
      * @return {?}
      */
-    PlaceRouter.prototype.getChildPath = /**
-     * @protected
-     * @param {?} activatedRoute
+    PlaceDefinition.prototype.getNonRouteParameters = /**
+     * @param {?} visit
      * @return {?}
      */
-    function (activatedRoute) {
-        return ___default.flatten(activatedRoute.children.map((/**
-         * @param {?} child
+    function (visit) {
+        /** @type {?} */
+        var result = {};
+        this.getVisitParameterDefs({ includeNonRouteParameters: true }).forEach((/**
+         * @param {?} def
          * @return {?}
          */
-        function (child) { return child.url; })));
+        function (def) {
+            /** @type {?} */
+            var value = visit.getParameter(def.name);
+            if (!def.isEmptyValue(value)) {
+                result[def.name] = value;
+            }
+        }));
+        return result;
     };
+    // @Trace()
+    // @Trace()
     /**
-     * @protected
-     * @param {?} parameters
+     * @param {?} params
      * @return {?}
      */
-    PlaceRouter.prototype.createRouteParameters = /**
-     * @protected
-     * @param {?} parameters
+    PlaceDefinition.prototype.parseRouteParams = 
+    // @Trace()
+    /**
+     * @param {?} params
      * @return {?}
      */
-    function (parameters) {
+    function (params) {
         /** @type {?} */
-        var routeId = parameters.getFormattedRouteId();
-        return routeId ?
-            [routeId, parameters.getFormattedParameters()] :
-            [parameters.getFormattedParameters()];
+        var result = {};
+        this.getVisitParameterDefs({
+            includeRouteId: true,
+            includeRouteParameters: true,
+            includeNonRouteParameters: false
+        }).forEach((/**
+         * @param {?} def
+         * @return {?}
+         */
+        function (def) {
+            // params will return null for non existent names
+            if (params.has(def.name)) {
+                if (def.isArray) {
+                    /** @type {?} */
+                    var values = params.getAll(def.name);
+                    result[def.name] = values.map((/**
+                     * @param {?} v
+                     * @return {?}
+                     */
+                    function (v) { return def.urlFormat.parse(v); }));
+                }
+                else {
+                    result[def.name] = def.urlFormat.parse(params.get(def.name));
+                }
+            }
+        }));
+        return result;
     };
-    PlaceRouter.decorators = [
-        { type: Injectable, args: [{
-                    providedIn: 'root'
-                },] }
-    ];
-    /** @nocollapse */
-    PlaceRouter.ctorParameters = function () { return [
-        { type: Router },
-        { type: Location }
-    ]; };
-    /** @nocollapse */ PlaceRouter.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(ɵɵinject(Router), ɵɵinject(Location)); }, token: PlaceRouter, providedIn: "root" });
-    return PlaceRouter;
+    __decorate([
+        Memoize(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", ParameterDefinition)
+    ], PlaceDefinition.prototype, "getRouteIdParameterDef", null);
+    __decorate([
+        Memoize(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", Array)
+    ], PlaceDefinition.prototype, "getRouteParameterDefs", null);
+    __decorate([
+        Memoize(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", Array)
+    ], PlaceDefinition.prototype, "getVisitParameterDefs", null);
+    return PlaceDefinition;
 }());
 if (false) {
+    /** @type {?} */
+    PlaceDefinition.prototype.component;
+    /** @type {?} */
+    PlaceDefinition.prototype.path;
+    /** @type {?} */
+    PlaceDefinition.prototype.authenticate;
+    /** @type {?} */
+    PlaceDefinition.prototype.order;
+    /** @type {?} */
+    PlaceDefinition.prototype.data;
+    /** @type {?} */
+    PlaceDefinition.prototype.routeParameters;
+    /** @type {?} */
+    PlaceDefinition.prototype.children;
+}
+(function (PlaceDefinition) {
     /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouter.prototype._navigationSession;
-    /**
-     * @type {?}
-     * @private
+     * @record
      */
-    PlaceRouter.prototype.router;
-}
+    function ParameterOptions() { }
+    PlaceDefinition.ParameterOptions = ParameterOptions;
+    if (false) {
+        /** @type {?|undefined} */
+        ParameterOptions.prototype.includeRouteId;
+        /** @type {?|undefined} */
+        ParameterOptions.prototype.includeRouteParameters;
+        /** @type {?|undefined} */
+        ParameterOptions.prototype.includeNonRouteParameters;
+    }
+})(PlaceDefinition || (PlaceDefinition = {}));
 
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
-/**
- * @abstract
- * @template T, S
- */
-var  /**
- * @abstract
- * @template T, S
- */
-ParameterDefinition = /** @class */ (function () {
-    function ParameterDefinition(propertyName, type, options) {
-        this.propertyName = propertyName;
-        this.type = type;
-        /** @type {?} */
-        var opts = Opts.get(options);
-        this.name = opts.getOptional('as', propertyName);
-        this.remember = opts.getOptional('remember', false);
-        this.defaultValue = opts.getOptional('defaultValue', null);
+// RAKE: making this Symbol(...) broke things.
+/** @type {?} */
+var DEFINITION_META_DATA_KEY = 'PLACE_DEFINITION_OPTIONS';
+// this one seems ok.
+/** @type {?} */
+var ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');
+var PlaceComponent = /** @class */ (function (_super) {
+    __extends(PlaceComponent, _super);
+    function PlaceComponent() {
+        return _super.call(this) || this;
     }
     /**
-     * @param {?} injector
+     * @param {?} visit
      * @return {?}
      */
-    ParameterDefinition.prototype.getSanitiser = /**
-     * @param {?} injector
+    PlaceComponent.prototype.initialiseBindings = /**
+     * @param {?} visit
      * @return {?}
      */
-    function (injector) {
-        if (this.remember || !___default.isNil(this.defaultValue)) {
-            return new ParameterDefinition.DefaultParameterSanitiser(this.remember, this.defaultValue, injector.get(PlaceHistory));
-        }
-        else {
-            return null;
-        }
+    function (visit) {
+        var _this = this;
+        assert.isNil(this.visit);
+        this.visit = visit;
+        this.placeDefinition.getVisitParameterDefs().forEach((/**
+         * @param {?} parameterDef
+         * @return {?}
+         */
+        function (parameterDef) {
+            _this.installBinding(parameterDef);
+        }));
     };
-    return ParameterDefinition;
-}());
-if (false) {
-    /** @type {?} */
-    ParameterDefinition.prototype.isRouteId;
-    /** @type {?} */
-    ParameterDefinition.prototype.isArray;
-    /** @type {?} */
-    ParameterDefinition.prototype.name;
     /**
-     * @type {?}
      * @private
+     * @template T, S
+     * @param {?} parameterDef
+     * @return {?}
+     */
+    PlaceComponent.prototype.installBinding = /**
+     * @private
+     * @template T, S
+     * @param {?} parameterDef
+     * @return {?}
      */
-    ParameterDefinition.prototype.remember;
+    function (parameterDef) {
+        /** @type {?} */
+        var model = (/** @type {?} */ (this[parameterDef.propertyName]));
+        // this.txo.observe(parameterDef.propertyName, model);
+        this.registerDisposable(new Binding(this.visit, model, {
+            toRight: /**
+             * @param {?} visit
+             * @return {?}
+             */
+            function (visit) {
+                /** @type {?} */
+                var value = visit.getParameter(parameterDef.name);
+                // console.log('push to component', {name:parameterDef.name, value, visit});
+                return value;
+            },
+            toLeft: /**
+             * @param {?} value
+             * @param {?=} currentVisit
+             * @return {?}
+             */
+            function (value, currentVisit) {
+                console.log('push to route', { name: parameterDef.name, value: value, currentVisit: currentVisit });
+                return currentVisit.replace(parameterDef, value);
+            }
+        }));
+    };
+    Object.defineProperty(PlaceComponent.prototype, "placeDefinition", {
+        get: /**
+         * @return {?}
+         */
+        function () {
+            return PlaceComponent.getDefinition((/** @type {?} */ ((/** @type {?} */ (this.constructor)))));
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(PlaceComponent.prototype, "childPlaces", {
+        get: /**
+         * @return {?}
+         */
+        function () {
+            return this.placeDefinition.children.map((/**
+             * @param {?} d
+             * @return {?}
+             */
+            function (d) { return d.component; }));
+        },
+        enumerable: true,
+        configurable: true
+    });
+    /**
+     * @return {?}
+     */
+    PlaceComponent.prototype.canDeactivate = /**
+     * @return {?}
+     */
+    function () {
+        return true;
+    };
+    /**
+     * @return {?}
+     */
+    PlaceComponent.prototype.onPlaceReady = /**
+     * @return {?}
+     */
+    function () {
+    };
+    __decorate([
+        Memoize$1(),
+        __metadata("design:type", PlaceDefinition),
+        __metadata("design:paramtypes", [])
+    ], PlaceComponent.prototype, "placeDefinition", null);
+    return PlaceComponent;
+}(DisposableComponent));
+if (false) {
     /**
      * @type {?}
      * @private
      */
-    ParameterDefinition.prototype.defaultValue;
-    /** @type {?} */
-    ParameterDefinition.prototype.propertyName;
-    /** @type {?} */
-    ParameterDefinition.prototype.type;
+    PlaceComponent.prototype.visit;
 }
-(function (ParameterDefinition) {
+(function (PlaceComponent) {
     /**
-     * @record
-     * @template T
+     * @param {?} target
+     * @return {?}
      */
-    function Options() { }
-    ParameterDefinition.Options = Options;
-    if (false) {
-        /** @type {?|undefined} */
-        Options.prototype.as;
-        /** @type {?|undefined} */
-        Options.prototype.optional;
-        /** @type {?|undefined} */
-        Options.prototype.remember;
-        /** @type {?|undefined} */
-        Options.prototype.defaultValue;
+    function isPlaceComponentConstructor(target) {
+        return lang.constructorChain((/** @type {?} */ (target))).includes(PlaceComponent);
     }
+    PlaceComponent.isPlaceComponentConstructor = isPlaceComponentConstructor;
     /**
-     * @template T
+     * @param {?} klass
+     * @return {?}
      */
-    var /**
-     * @template T
+    function getRouteParameters(klass) {
+        return Klass.get(klass).getMetadataList(ROUTE_PARAMETER_LIST_KEY);
+    }
+    PlaceComponent.getRouteParameters = getRouteParameters;
+    /**
+     * @param {?} klass
+     * @return {?}
      */
-    RouteId = /** @class */ (function (_super) {
-        __extends(RouteId, _super);
-        function RouteId() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
-            _this.isRouteId = true;
-            _this.isArray = false;
-            return _this;
-        }
-        return RouteId;
-    }(ParameterDefinition));
-    ParameterDefinition.RouteId = RouteId;
-    if (false) {
-        /** @type {?} */
-        RouteId.prototype.isRouteId;
-        /** @type {?} */
-        RouteId.prototype.isArray;
+    function getDefinition(klass) {
+        return Reflect.getMetadata(DEFINITION_META_DATA_KEY, klass);
     }
+    PlaceComponent.getDefinition = getDefinition;
     /**
-     * @template T
+     * @param {?} klass
+     * @param {?} definition
+     * @return {?}
      */
-    var /**
-     * @template T
+    function injectDefinition(klass, definition) {
+        Reflect.defineMetadata(DEFINITION_META_DATA_KEY, definition, klass);
+    }
+    PlaceComponent.injectDefinition = injectDefinition;
+})(PlaceComponent || (PlaceComponent = {}));
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+var AbstractPlaceNavigationComponent = /** @class */ (function (_super) {
+    __extends(AbstractPlaceNavigationComponent, _super);
+    function AbstractPlaceNavigationComponent() {
+        var _this = _super.call(this) || this;
+        var _a = Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
+        _this.placeDefinitions = chain(_this.placesModel).map((/**
+         * @param {?} c
+         * @return {?}
+         */
+        function (c) { return PlaceComponent.getDefinition(c); }));
+        return _this;
+    }
+    /**
+     * @param {?} placeDef
+     * @return {?}
      */
-    ValueParameter = /** @class */ (function (_super) {
-        __extends(ValueParameter, _super);
-        function ValueParameter() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
-            _this.isRouteId = false;
-            _this.isArray = false;
-            return _this;
-        }
-        return ValueParameter;
-    }(ParameterDefinition));
-    ParameterDefinition.ValueParameter = ValueParameter;
-    if (false) {
-        /** @type {?} */
-        ValueParameter.prototype.isRouteId;
+    AbstractPlaceNavigationComponent.prototype.getNav = /**
+     * @param {?} placeDef
+     * @return {?}
+     */
+    function (placeDef) {
         /** @type {?} */
-        ValueParameter.prototype.isArray;
+        var navItem = (/** @type {?} */ (placeDef.getPlaceData('nav')));
+        return {
+            title: (/**
+             * @return {?}
+             */
+            function () { return navItem ? navItem.title() : placeDef.searchPlaceData(['navTitle', 'title']); }),
+            tooltip: (/**
+             * @return {?}
+             */
+            function () { return navItem && navItem.tooltip ? navItem.tooltip() : placeDef.getPlaceData('navTooltip', null); }),
+            icon: (/**
+             * @return {?}
+             */
+            function () { return navItem && navItem.icon ? navItem.icon() : placeDef.getPlaceData('navIcon', null); })
+        };
+    };
+    /**
+     * @return {?}
+     */
+    AbstractPlaceNavigationComponent.prototype.ngOnInit = /**
+     * @return {?}
+     */
+    function () {
+    };
+    AbstractPlaceNavigationComponent.propDecorators = {
+        places: [{ type: Input }],
+        placesModel: [{ type: Input }]
+    };
+    __decorate([
+        StoreInListModel('placesModel'),
+        __metadata("design:type", Array)
+    ], AbstractPlaceNavigationComponent.prototype, "places", void 0);
+    __decorate([
+        UseDelegate(),
+        __metadata("design:type", ListModel)
+    ], AbstractPlaceNavigationComponent.prototype, "placesModel", void 0);
+    __decorate([
+        Memoize(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [PlaceDefinition]),
+        __metadata("design:returntype", Object)
+    ], AbstractPlaceNavigationComponent.prototype, "getNav", null);
+    return AbstractPlaceNavigationComponent;
+}(DisposableComponent));
+if (false) {
+    /** @type {?} */
+    AbstractPlaceNavigationComponent.prototype.places;
+    /** @type {?} */
+    AbstractPlaceNavigationComponent.prototype.placesModel;
+    /** @type {?} */
+    AbstractPlaceNavigationComponent.prototype.placeDefinitions;
+}
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+var ListPlaceNavComponent = /** @class */ (function (_super) {
+    __extends(ListPlaceNavComponent, _super);
+    function ListPlaceNavComponent() {
+        var _this = _super.call(this) || this;
+        _this.expanded = true;
+        return _this;
     }
     /**
-     * @template T
+     * @return {?}
      */
-    var /**
-     * @template T
+    ListPlaceNavComponent.prototype.expandMenu = /**
+     * @return {?}
      */
-    ArrayParameter = /** @class */ (function (_super) {
-        __extends(ArrayParameter, _super);
-        function ArrayParameter() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
-            _this.isRouteId = false;
-            _this.isArray = true;
-            return _this;
-        }
-        return ArrayParameter;
-    }(ParameterDefinition));
-    ParameterDefinition.ArrayParameter = ArrayParameter;
-    if (false) {
-        /** @type {?} */
-        ArrayParameter.prototype.isRouteId;
-        /** @type {?} */
-        ArrayParameter.prototype.isArray;
+    function () {
+        this.expanded = true;
+    };
+    /**
+     * @return {?}
+     */
+    ListPlaceNavComponent.prototype.collapseMenu = /**
+     * @return {?}
+     */
+    function () {
+        this.expanded = false;
+    };
+    /**
+     * @return {?}
+     */
+    ListPlaceNavComponent.prototype.toggleMenu = /**
+     * @return {?}
+     */
+    function () {
+        this.expanded = !this.expanded;
+    };
+    ListPlaceNavComponent.decorators = [
+        { type: Component, args: [{
+                    selector: 'angular-ui-powerups-list-place-nav',
+                    template: "<mat-nav-list class=\"app-menu\">\n  <a mat-list-item *ngFor=\"let place of placeDefinitions.value\"\n     [routerLink]='place.path'\n     [replaceUrl]=\"true\"\n     routerLinkActive #rla=\"routerLinkActive\"\n     [matTooltip]=\"getNav(place).tooltip()\">\n    <mat-icon *ngIf=\"getNav(place).icon()\">{{getNav(place).icon()}}</mat-icon>\n    <span class=\"expanded-only\">{{getNav(place).title()}}</span>\n  </a>\n</mat-nav-list>\n",
+                    styles: [":host{display:flex;flex-direction:column;--expanded-width:235px;--nav-item-width:var(--nav-bar-height);width:var(--nav-item-width);transition:width 125ms linear}:host.expanded{width:var(--expanded-width);max-width:var(--expanded-width)}.expanded-only{max-width:0;overflow:hidden}.collapsed-only{max-width:100%;overflow:hidden}.header{display:flex;flex-direction:row;justify-content:flex-end;align-items:center;height:var(--nav-bar-height);border-bottom:var(--pinstripe-border);cursor:pointer}.header .menu{flex:1}.header button{color:inherit;width:var(--nav-item-width);height:var(--nav-bar-height)}mat-nav-list{flex:1;display:flex;flex-direction:column}.mat-list-item{width:var(--nav-item-width);height:var(--nav-bar-height);color:inherit}mat-icon{color:inherit}mat-icon.flip-horizontal{transform:scaleX(-1)}:host-context(.expanded) .expanded-only{max-width:100%}:host-context(.expanded) .collapsed-only{max-width:0}:host-context(.expanded) .mat-list-item mat-icon{margin-right:12px}:host-context(.expanded) .mat-list-item span{text-wrap:none;white-space:nowrap}a[ng-reflect-router-link=manage-instruments] mat-icon{transform:rotate(90deg)}.app-menu{padding-top:0}"]
+                }] }
+    ];
+    /** @nocollapse */
+    ListPlaceNavComponent.ctorParameters = function () { return []; };
+    ListPlaceNavComponent.propDecorators = {
+        expanded: [{ type: HostBinding, args: ['class.expanded',] }]
+    };
+    return ListPlaceNavComponent;
+}(AbstractPlaceNavigationComponent));
+if (false) {
+    /** @type {?} */
+    ListPlaceNavComponent.prototype.expanded;
+}
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+var PlaceHistory = /** @class */ (function () {
+    function PlaceHistory(router) {
+        this.router = router;
+        this._history = new Map();
     }
+    // @Trace()
+    // @Trace()
     /**
-     * @template T, S
+     * @param {?} state
+     * @return {?}
      */
-    var /**
-     * @template T, S
+    PlaceHistory.prototype.add = 
+    // @Trace()
+    /**
+     * @param {?} state
+     * @return {?}
      */
-    DefaultParameterSanitiser = /** @class */ (function () {
-        function DefaultParameterSanitiser(remember, defaultValue, placeHistory) {
-            this.remember = remember;
-            this.defaultValue = defaultValue;
-            this.placeHistory = placeHistory;
-        }
-        /**
-         * @param {?} parameter
-         * @param {?=} visit
-         * @return {?}
-         */
-        DefaultParameterSanitiser.prototype.sanitise = /**
-         * @param {?} parameter
-         * @param {?=} visit
-         * @return {?}
-         */
-        function (parameter, visit) {
-            /** @type {?} */
-            var value = parameter.value;
-            if (parameter.isMissing()) {
-                /** @type {?} */
-                var previousVisit = ___default.first(this.placeHistory.getHistory(visit.placeDefinition));
-                if (this.remember && previousVisit) {
-                    value = previousVisit.getValueOf(parameter.definition);
-                }
-                return parameter.isEmptyValue(value) ? this.defaultValue : value;
-            }
-            else {
-                return value;
-            }
-        };
-        return DefaultParameterSanitiser;
-    }());
-    ParameterDefinition.DefaultParameterSanitiser = DefaultParameterSanitiser;
-    if (false) {
+    function (state) {
         /** @type {?} */
-        DefaultParameterSanitiser.prototype.remember;
+        var history = this.getHistory(state.placeDefinition);
         /** @type {?} */
-        DefaultParameterSanitiser.prototype.defaultValue;
+        var previousState = ___default.last(history);
+        if (!previousState || state.hasChangedFrom(previousState)) {
+            history.unshift(state); // LIFO
+            this.setHistory(state.placeDefinition, history.slice(0, 3)); // limit our history to 4 visits
+        }
+    };
+    /**
+     * @param {?} placeDef
+     * @return {?}
+     */
+    PlaceHistory.prototype.getHistory = /**
+     * @param {?} placeDef
+     * @return {?}
+     */
+    function (placeDef) {
         /** @type {?} */
-        DefaultParameterSanitiser.prototype.placeHistory;
-    }
-})(ParameterDefinition || (ParameterDefinition = {}));
+        var history = this._history.get(placeDef);
+        if (!history) {
+            history = [];
+            this.setHistory(placeDef, history);
+        }
+        return history;
+    };
+    /**
+     * @private
+     * @param {?} placeDef
+     * @param {?} history
+     * @return {?}
+     */
+    PlaceHistory.prototype.setHistory = /**
+     * @private
+     * @param {?} placeDef
+     * @param {?} history
+     * @return {?}
+     */
+    function (placeDef, history) {
+        this._history.set(placeDef, history);
+    };
+    PlaceHistory.decorators = [
+        { type: Injectable, args: [{
+                    providedIn: 'root'
+                },] }
+    ];
+    /** @nocollapse */
+    PlaceHistory.ctorParameters = function () { return [
+        { type: Router }
+    ]; };
+    /** @nocollapse */ PlaceHistory.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceHistory_Factory() { return new PlaceHistory(ɵɵinject(Router)); }, token: PlaceHistory, providedIn: "root" });
+    return PlaceHistory;
+}());
+if (false) {
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceHistory.prototype._history;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceHistory.prototype.router;
+}
 
 /**
  * @fileoverview added by tsickle
@@ -3087,791 +3308,682 @@ if (false) {
  */
 /**
  * @abstract
- * @template S, T, R
  */
 var  /**
  * @abstract
- * @template S, T, R
  */
-RouteParameterValue = /** @class */ (function () {
-    function RouteParameterValue(definition, rawValue) {
-        this.definition = definition;
-        this.rawValue = rawValue;
+NavigationSession = /** @class */ (function () {
+    function NavigationSession(firstNavigation) {
+        this.firstNavigation = firstNavigation;
+        this._alreadyAccepted = [];
+        this._visits = new Map();
     }
     /**
+     * @param {?} visit
      * @return {?}
      */
-    RouteParameterValue.prototype.isRouteId = /**
+    NavigationSession.prototype.storeVisit = /**
+     * @param {?} visit
      * @return {?}
      */
-    function () {
-        return this.definition.isRouteId;
+    function (visit) {
+        this._visits.set(visit.placeDefinition, visit);
     };
     /**
-     * @param {?} otherValue
+     * @param {?} placeDef
      * @return {?}
      */
-    RouteParameterValue.prototype.hasChanged = /**
-     * @param {?} otherValue
+    NavigationSession.prototype.getVisitFor = /**
+     * @param {?} placeDef
      * @return {?}
      */
-    function (otherValue) {
-        return this.isEmpty() ?
-            !this.isEmptyValue(otherValue) :
-            this.isEmptyValue(otherValue) || !this.isSameValue(otherValue);
+    function (placeDef) {
+        return this._visits.get(placeDef);
     };
     /**
-     * Return's true if the current value is empty.
+     * @param {?} params
+     * @return {?}
+     */
+    NavigationSession.prototype.mergePrivatePlaceParameters = /**
+     * @param {?} params
+     * @return {?}
      */
+    function (params) {
+        return null;
+    };
+    // @Trace()
+    // @Trace()
     /**
-     * Return's true if the current value is empty.
+     * @param {?} placeComponent
      * @return {?}
      */
-    RouteParameterValue.prototype.isEmpty = /**
-     * Return's true if the current value is empty.
+    NavigationSession.prototype.alreadyAccepted = 
+    // @Trace()
+    /**
+     * @param {?} placeComponent
      * @return {?}
      */
-    function () {
-        return this.isEmptyValue(this.value);
+    function (placeComponent) {
+        return this._alreadyAccepted.includes(placeComponent);
     };
+    // @Trace()
+    // @Trace()
+    /**
+     * @param {?} component
+     * @return {?}
+     */
+    NavigationSession.prototype.rememberAcceptanceOf = 
+    // @Trace()
     /**
-     * Returns true if the rawValue is undefined.  This
+     * @param {?} component
+     * @return {?}
      */
+    function (component) {
+        this._alreadyAccepted.push(component);
+    };
     /**
-     * Returns true if the rawValue is undefined.  This
+     * @param {?} url
      * @return {?}
      */
-    RouteParameterValue.prototype.isMissing = /**
-     * Returns true if the rawValue is undefined.  This
+    NavigationSession.prototype.setPopstateReturn = /**
+     * @param {?} url
      * @return {?}
      */
-    function () {
-        return ___default.isUndefined(this.rawValue);
+    function (url) {
+        this._popStateReturnUrl = url;
     };
+    Object.defineProperty(NavigationSession.prototype, "isPopState", {
+        get: /**
+         * @return {?}
+         */
+        function () {
+            return !!this._popStateReturnUrl;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(NavigationSession.prototype, "popStateReturnUrl", {
+        get: /**
+         * @return {?}
+         */
+        function () {
+            return this._popStateReturnUrl;
+        },
+        enumerable: true,
+        configurable: true
+    });
     /**
-     * @param {?} visit
-     * @param {?} injector
      * @return {?}
      */
-    RouteParameterValue.prototype.sanitise = /**
-     * @param {?} visit
-     * @param {?} injector
+    NavigationSession.prototype.getVisits = /**
      * @return {?}
      */
-    function (visit, injector) {
-        return __awaiter(this, void 0, void 0, function () {
-            var sanitiser;
-            return __generator(this, function (_a) {
-                sanitiser = this.definition.getSanitiser(injector);
-                if (sanitiser) {
-                    return [2 /*return*/, sanitiser.sanitise(this, visit)];
-                }
-                else {
-                    return [2 /*return*/, this.value];
-                }
-                return [2 /*return*/];
-            });
-        });
+    function () {
+        return Array.from(this._visits.values());
     };
-    return RouteParameterValue;
+    return NavigationSession;
 }());
 if (false) {
-    /** @type {?} */
-    RouteParameterValue.prototype.value;
-    /** @type {?} */
-    RouteParameterValue.prototype.definition;
     /**
      * @type {?}
-     * @protected
-     */
-    RouteParameterValue.prototype.rawValue;
-    /**
-     * @abstract
-     * @param {?} otherValue
-     * @return {?}
-     */
-    RouteParameterValue.prototype.isSameValue = function (otherValue) { };
-    /**
-     * @abstract
-     * @return {?}
+     * @private
      */
-    RouteParameterValue.prototype.formattedValue = function () { };
+    NavigationSession.prototype._alreadyAccepted;
     /**
-     * @abstract
-     * @param {?} value
-     * @return {?}
+     * @type {?}
+     * @private
      */
-    RouteParameterValue.prototype.replace = function (value) { };
+    NavigationSession.prototype._visits;
     /**
-     * @abstract
-     * @param {?} value
-     * @return {?}
+     * @type {?}
+     * @private
      */
-    RouteParameterValue.prototype.isEmptyValue = function (value) { };
+    NavigationSession.prototype._popStateReturnUrl;
+    /** @type {?} */
+    NavigationSession.prototype.isExternal;
+    /** @type {?} */
+    NavigationSession.prototype.firstNavigation;
 }
-(function (RouteParameterValue) {
-    /**
-     * @template T
-     * @param {?} def
-     * @param {?} paramMap
-     * @return {?}
-     */
-    function create(def, paramMap) {
-        // NOTE: Using undefined is important as it triggers the isMissing flag which is used by defaultValue and remember flags
-        if (def.isArray) {
-            return new RouteParameterValue.Array(def, paramMap.has(def.name) ? paramMap.getAll(def.name) : undefined);
+(function (NavigationSession) {
+    var External = /** @class */ (function (_super) {
+        __extends(External, _super);
+        function External(isFirstTime) {
+            var _this = _super.call(this, isFirstTime) || this;
+            _this.isExternal = true;
+            return _this;
         }
-        else {
-            /** @type {?} */
-            var rawValue = paramMap.has(def.name) ? paramMap.get(def.name) : undefined;
-            // route ids are always present so we have to check if it's empty to flag it as missing..
-            rawValue = def.isRouteId && ___default.isEmpty(rawValue) ? undefined : rawValue;
-            return new RouteParameterValue.Scalar(def, rawValue);
+        return External;
+    }(NavigationSession));
+    if (false) {
+        /** @type {?} */
+        External.prototype.isExternal;
+    }
+    var Internal = /** @class */ (function (_super) {
+        __extends(Internal, _super);
+        function Internal(visit) {
+            var _this = _super.call(this, false) || this;
+            _this.isExternal = false;
+            _this.storeVisit(visit);
+            return _this;
         }
+        return Internal;
+    }(NavigationSession));
+    if (false) {
+        /** @type {?} */
+        Internal.prototype.isExternal;
     }
-    RouteParameterValue.create = create;
     /**
-     * @template T
+     * @param {?} visit
+     * @return {?}
      */
-    var Scalar = /** @class */ (function (_super) {
-        __extends(Scalar, _super);
-        function Scalar() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        Object.defineProperty(Scalar.prototype, "value", {
-            get: /**
-             * @return {?}
-             */
-            function () {
-                return this.definition.type.parse(this.rawValue);
-            },
-            enumerable: true,
-            configurable: true
-        });
-        /**
-         * @param {?} otherValue
-         * @return {?}
-         */
-        Scalar.prototype.isSameValue = /**
-         * @param {?} otherValue
-         * @return {?}
-         */
-        function (otherValue) {
-            return this.value === otherValue;
-        };
-        /**
-         * @param {?} value
-         * @return {?}
-         */
-        Scalar.prototype.replace = /**
-         * @param {?} value
-         * @return {?}
-         */
-        function (value) {
-            return new RouteParameterValue.Scalar(this.definition, this.isEmptyValue(value) ? undefined : this.definition.type.format(value));
-        };
-        /**
-         * @return {?}
-         */
-        Scalar.prototype.formattedValue = /**
-         * @return {?}
-         */
-        function () {
-            return this.isEmpty() ? undefined : this.definition.type.format(this.value);
-        };
-        /**
-         * @param {?} value
-         * @return {?}
-         */
-        Scalar.prototype.isEmptyValue = /**
-         * @param {?} value
-         * @return {?}
-         */
-        function (value) {
-            return ___default.isNil(value);
-        };
-        __decorate([
-            Memoize$1(),
-            __metadata("design:type", Object),
-            __metadata("design:paramtypes", [])
-        ], Scalar.prototype, "value", null);
-        return Scalar;
-    }(RouteParameterValue));
-    RouteParameterValue.Scalar = Scalar;
+    function createInternal(visit) {
+        return new Internal(visit);
+    }
+    NavigationSession.createInternal = createInternal;
     /**
-     * @template T
+     * @param {?} firstTimeRoute
+     * @return {?}
      */
-    var Array = /** @class */ (function (_super) {
-        __extends(Array, _super);
-        function Array() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        Object.defineProperty(Array.prototype, "value", {
-            get: /**
-             * @return {?}
-             */
-            function () {
-                var _this = this;
-                return (this.rawValue || [])
-                    .filter((/**
-                 * @param {?} s
-                 * @return {?}
-                 */
-                function (s) { return !___default.isEmpty(s); }))
-                    .map((/**
-                 * @param {?} raw
-                 * @return {?}
-                 */
-                function (raw) { return _this.definition.type.parse(raw); }));
-            },
-            enumerable: true,
-            configurable: true
-        });
-        /**
-         * @param {?} otherValue
-         * @return {?}
-         */
-        Array.prototype.isSameValue = /**
-         * @param {?} otherValue
-         * @return {?}
-         */
-        function (otherValue) {
-            return ___default.isEqual(this.value, otherValue);
-        };
-        /**
-         * @param {?} value
-         * @return {?}
-         */
-        Array.prototype.replace = /**
-         * @param {?} value
-         * @return {?}
-         */
-        function (value) {
-            var _this = this;
-            return new RouteParameterValue.Array(this.definition, this.isEmptyValue(value) ? undefined : value.map((/**
-             * @param {?} v
-             * @return {?}
-             */
-            function (v) { return _this.definition.type.format(v); })));
-        };
-        /**
-         * @return {?}
-         */
-        Array.prototype.formattedValue = /**
-         * @return {?}
-         */
-        function () {
-            var _this = this;
-            return this.isEmpty() ? [] : this.value.map((/**
-             * @param {?} v
-             * @return {?}
-             */
-            function (v) { return _this.definition.type.format(v); }));
-        };
-        /**
-         * @param {?} value
-         * @return {?}
-         */
-        Array.prototype.isEmptyValue = /**
-         * @param {?} value
-         * @return {?}
-         */
-        function (value) {
-            return ___default.isNil(value) || value.length < 1;
-        };
-        __decorate([
-            Memoize$1(),
-            __metadata("design:type", Array),
-            __metadata("design:paramtypes", [])
-        ], Array.prototype, "value", null);
-        return Array;
-    }(RouteParameterValue));
-    RouteParameterValue.Array = Array;
-})(RouteParameterValue || (RouteParameterValue = {}));
+    function createExternal(firstTimeRoute) {
+        return new External(firstTimeRoute);
+    }
+    NavigationSession.createExternal = createExternal;
+})(NavigationSession || (NavigationSession = {}));
 
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
-var ParameterSnapshot = /** @class */ (function () {
-    function ParameterSnapshot(placeDefinition, parameters) {
+/**
+ * @record
+ */
+function Params() { }
+var Visit = /** @class */ (function () {
+    function Visit(placeDefinition, visitParameters) {
+        if (visitParameters === void 0) { visitParameters = {}; }
         this.placeDefinition = placeDefinition;
-        this.parameters = parameters;
+        this.visitParameters = visitParameters;
     }
+    // @Trace()
+    // @Trace()
     /**
-     * @param {?} other
-     * @param {?=} debug
      * @return {?}
      */
-    ParameterSnapshot.prototype.hasChanged = /**
-     * @param {?} other
-     * @param {?=} debug
+    Visit.prototype.getRouteId = 
+    // @Trace()
+    /**
      * @return {?}
      */
-    function (other, debug) {
-        if (debug === void 0) { debug = false; }
-        /** @type {?} */
-        var changed = this.parameters.find((/**
-         * @param {?} r
-         * @return {?}
-         */
-        function (r) {
-            return r.hasChanged(other.getValueOf(r.definition));
-        }));
-        if (changed && debug) {
-            console.log({
-                name: changed.definition.name,
-                mine: changed.value,
-                theirs: other.getValueOf(changed.definition)
-            });
-        }
-        return !!changed;
+    function () {
+        return this.placeDefinition.getRouteIdFrom(this);
+    };
+    // @Trace()
+    // @Trace()
+    /**
+     * @return {?}
+     */
+    Visit.prototype.hasRouteId = 
+    // @Trace()
+    /**
+     * @return {?}
+     */
+    function () {
+        return !isNil(this.getRouteId());
     };
     /**
-     * @template T, S
-     * @param {?} parameterDef
+     * Returns the value of the place parameter with the specified name.  The parameter
+     * name is taken from the `as` option, e.g. {as: 'aCustomName'} otherwise it is the
+     * same as the the ValueModel property name.
+     * @param parameterName the field name of the property model or the `as` option if specified.
+     */
+    /**
+     * Returns the value of the place parameter with the specified name.  The parameter
+     * name is taken from the `as` option, e.g. {as: 'aCustomName'} otherwise it is the
+     * same as the the ValueModel property name.
+     * @param {?} parameterName the field name of the property model or the `as` option if specified.
      * @return {?}
      */
-    ParameterSnapshot.prototype.getParameter = /**
-     * @template T, S
-     * @param {?} parameterDef
+    Visit.prototype.getParameter = /**
+     * Returns the value of the place parameter with the specified name.  The parameter
+     * name is taken from the `as` option, e.g. {as: 'aCustomName'} otherwise it is the
+     * same as the the ValueModel property name.
+     * @param {?} parameterName the field name of the property model or the `as` option if specified.
      * @return {?}
      */
-    function (parameterDef) {
-        return this.parameters.find((/**
-         * @param {?} r
-         * @return {?}
-         */
-        function (r) { return r.definition === parameterDef; }));
+    function (parameterName) {
+        return this.visitParameters[parameterName];
     };
+    // @Trace()
+    // @Trace()
     /**
-     * @template T, S
-     * @param {?} parameterDef
+     * @param {?} parameterName
      * @return {?}
      */
-    ParameterSnapshot.prototype.getValueOf = /**
-     * @template T, S
-     * @param {?} parameterDef
+    Visit.prototype.hasParameter = 
+    // @Trace()
+    /**
+     * @param {?} parameterName
      * @return {?}
      */
-    function (parameterDef) {
-        /** @type {?} */
-        var resolvedParameter = this.getParameter(parameterDef);
-        return resolvedParameter ? resolvedParameter.value : null;
+    function (parameterName) {
+        return Object.keys(this.visitParameters).includes(parameterName);
     };
     /**
+     * @template S
+     * @param {?} parameter
+     * @param {?} value
      * @return {?}
      */
-    ParameterSnapshot.prototype.getRouteIdValue = /**
+    Visit.prototype.replace = /**
+     * @template S
+     * @param {?} parameter
+     * @param {?} value
      * @return {?}
      */
-    function () {
-        return this.getRouteIdParameter() ? this.getRouteIdParameter().value : null;
+    function (parameter, value) {
+        var _a;
+        return new Visit(this.placeDefinition, __assign({}, this.visitParameters, (_a = {}, _a[parameter.name] = value, _a)));
     };
     /**
-     * @param {?} name
+     * @template S
+     * @param {?} routeParams
      * @return {?}
      */
-    ParameterSnapshot.prototype.getParameterValue = /**
-     * @param {?} name
+    Visit.prototype.mergeRouteParameters = /**
+     * @template S
+     * @param {?} routeParams
      * @return {?}
      */
-    function (name) {
+    function (routeParams) {
+        var _this = this;
+        // todo: whitelist parameters.
         /** @type {?} */
-        var resolvedParameter = this.parameters.find((/**
-         * @param {?} r
+        var routeParameterKeys = Object.keys(routeParams);
+        /** @type {?} */
+        var params = {};
+        this.placeDefinition.getVisitParameterDefs().forEach((/**
+         * @param {?} def
          * @return {?}
          */
-        function (r) { return r.definition.name === name; }));
-        return resolvedParameter ? resolvedParameter.value : null;
+        function (def) {
+            if (def.isRouteId || def.isRouteParameter) {
+                if (routeParameterKeys.includes(def.name)) {
+                    params[def.name] = routeParams[def.name];
+                }
+            }
+            else {
+                // copy non route params as is, but only if they already exist otherwise we'll inject nil values and break the
+                // defaults and remember sanitisation process.
+                if (_this.hasParameter(def.name)) {
+                    params[def.name] = _this.getParameter(def.name);
+                }
+            }
+        }));
+        return new Visit(this.placeDefinition, params);
     };
     /**
-     * @private
+     * @param {?} other
      * @return {?}
      */
-    ParameterSnapshot.prototype.getRouteIdParameter = /**
-     * @private
+    Visit.prototype.hasRoutingChangedFrom = /**
+     * @param {?} other
      * @return {?}
      */
-    function () {
-        // RouteId's are never arrays: see parameter-decorators.ts createDefinition methods. It would be nice to
-        // capture this in the type system though
-        return (/** @type {?} */ (this.parameters.find((/**
-         * @param {?} p
-         * @return {?}
-         */
-        function (p) { return p.definition.isRouteId; }))));
+    function (other) {
+        /** @type {?} */
+        var samePlace = other.placeDefinition === this.placeDefinition;
+        /** @type {?} */
+        var sameRouteParameters = isEqual(this.placeDefinition.getFormattedRouteParameters(this, true), this.placeDefinition.getFormattedRouteParameters(other, true));
+        return !samePlace || !sameRouteParameters;
     };
     /**
-     * @private
+     * @param {?} other
      * @return {?}
      */
-    ParameterSnapshot.prototype.getRouteParameters = /**
-     * @private
+    Visit.prototype.hasChangedFrom = /**
+     * @param {?} other
      * @return {?}
      */
-    function () {
-        return this.parameters.filter((/**
-         * @param {?} r
+    function (other) {
+        /** @type {?} */
+        var sameNonRouteParameters = isEqual(this.placeDefinition.getNonRouteParameters(this), this.placeDefinition.getNonRouteParameters(other));
+        return !sameNonRouteParameters || this.hasRoutingChangedFrom(other);
+    };
+    return Visit;
+}());
+if (false) {
+    /** @type {?} */
+    Visit.prototype.placeDefinition;
+    /**
+     * @type {?}
+     * @private
+     */
+    Visit.prototype.visitParameters;
+}
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+var PlaceRouter = /** @class */ (function (_super) {
+    __extends(PlaceRouter, _super);
+    function PlaceRouter(router, angularLocation, placeHistory) {
+        var _this = _super.call(this) || this;
+        _this.router = router;
+        _this.angularLocation = angularLocation;
+        _this.placeHistory = placeHistory;
+        _this.firstRoute = true;
+        _this._navigationSessionModel = new MutableValueModel();
+        _this._activeVisits = new MutableListModel();
+        var _a = Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
+        _this.activeVisitIndex = chain(_this._activeVisits).indexBy('placeDefinition');
+        angularLocation.onUrlChange((/**
+         * @param {?} url
          * @return {?}
          */
-        function (r) { return !r.definition.isRouteId; }));
-    };
+        function (url) {
+            console.log("location.onUrlChange -> " + url);
+        }));
+        // TODO: make setup the callbacks in during module initiation to make this testable.
+        _this.router.events.subscribe((/**
+         * @param {?} event
+         * @return {?}
+         */
+        function (event) {
+            // Routing event sequence
+            // ======================
+            // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session
+            // NavigationStart -> .... -> NavigationEnd --> navigation complete, end session.
+            // NavigationStart -> .... -> NavigationError --> navigation canceled, end session.
+            // =======================
+            if (event instanceof NavigationStart) {
+                _this.onAngularRouterStarted(event);
+            }
+            if (event instanceof NavigationEnd || event instanceof NavigationError) {
+                _this.onAngularRouterFinished();
+            }
+        }));
+        _this.navigationSessionActive = chain(_this.navigationSessionModel).isNotNil();
+        _this.navigationSessionActive.subscribe((/**
+         * @param {?} active
+         * @return {?}
+         */
+        function (active) {
+            console.log('navigationSessionActive', active);
+        }));
+        return _this;
+        // const txo = new TransactionObserver().onEvent(e => console.log(e.toString()));
+        // txo.observe('this.navigationSessionModel', this.navigationSessionModel);
+    }
+    Object.defineProperty(PlaceRouter.prototype, "navigationSession", {
+        get: /**
+         * @return {?}
+         */
+        function () {
+            return this._navigationSessionModel.value;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(PlaceRouter.prototype, "navigationSessionModel", {
+        get: /**
+         * @return {?}
+         */
+        function () {
+            return this._navigationSessionModel.readonly;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(PlaceRouter.prototype, "activeVisits", {
+        get: /**
+         * @return {?}
+         */
+        function () {
+            return this._activeVisits.readonly;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    /**
+     *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));
+     * @param visit
+     */
+    // @Trace()
     /**
+     *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));
+     * @param {?} visit
      * @return {?}
      */
-    ParameterSnapshot.prototype.hasRouteId = /**
+    // @Trace()
+    PlaceRouter.prototype.navigate = /**
+     *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));
+     * @param {?} visit
      * @return {?}
      */
-    function () {
-        return !!this.getRouteIdParameter();
+    // @Trace()
+    function (visit) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                this.doNavigation(visit);
+                return [2 /*return*/];
+            });
+        });
     };
     /**
+     * @param {?} activatedRoute
+     * @param {?} previous
+     * @param {?} next
      * @return {?}
      */
-    ParameterSnapshot.prototype.getFormattedRouteId = /**
+    PlaceRouter.prototype.pushVisitChangesToRoute = /**
+     * @param {?} activatedRoute
+     * @param {?} previous
+     * @param {?} next
      * @return {?}
      */
-    function () {
-        /** @type {?} */
-        var routeIdParam = this.getRouteIdParameter();
-        return routeIdParam ? routeIdParam.formattedValue() : null;
+    function (activatedRoute, previous, next) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                // FIXME: no route id -> route id duplicates route parameters
+                if (next.hasRoutingChangedFrom(previous)) {
+                    return [2 /*return*/, this.doNavigation(next, (/**
+                         * @param {?} router
+                         * @return {?}
+                         */
+                        function (router) {
+                            /** @type {?} */
+                            var relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';
+                            /** @type {?} */
+                            var def = next.placeDefinition;
+                            /** @type {?} */
+                            var params = next.hasRouteId() ?
+                                [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :
+                                [def.getFormattedRouteParameters(next)];
+                            /** @type {?} */
+                            var commands = [relativePath].concat(params, _this.getChildPath(activatedRoute.snapshot));
+                            console.log('### Redirect', commands);
+                            return router.navigate(commands, {
+                                relativeTo: activatedRoute
+                            });
+                        }))];
+                }
+                else {
+                    this.placeHistory.add(next);
+                }
+                return [2 /*return*/];
+            });
+        });
     };
     /**
+     * @param {?} visit
+     * @param {?=} customNavigation
      * @return {?}
      */
-    ParameterSnapshot.prototype.getNonEmptyParameters = /**
+    PlaceRouter.prototype.doNavigation = /**
+     * @param {?} visit
+     * @param {?=} customNavigation
      * @return {?}
      */
-    function () {
-        return this.parameters.filter((/**
-         * @param {?} p
-         * @return {?}
-         */
-        function (p) { return !p.isEmpty(); }));
+    function (visit, customNavigation) {
+        return __awaiter(this, void 0, void 0, function () {
+            var def, parameterCommands, commands;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this._navigationSessionModel.value = NavigationSession.createInternal(visit);
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 6, 7]);
+                        if (!customNavigation) return [3 /*break*/, 3];
+                        return [4 /*yield*/, customNavigation(this.router)];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 3:
+                        def = visit.placeDefinition;
+                        parameterCommands = visit.hasRouteId() ?
+                            [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
+                            [def.getFormattedRouteParameters(visit)];
+                        commands = [def.path].concat(parameterCommands);
+                        console.log('_doNavigation', visit, commands);
+                        return [4 /*yield*/, this.router.navigate(commands)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [3 /*break*/, 7];
+                    case 6:
+                        if (this.navigationSession && !this.router.getCurrentNavigation()) {
+                            this.onAngularRouterFinished();
+                        }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
     };
+    // @Trace()
+    // @Trace()
     /**
+     * @private
+     * @param {?} event
      * @return {?}
      */
-    ParameterSnapshot.prototype.getFormattedParameters = /**
+    PlaceRouter.prototype.onAngularRouterStarted = 
+    // @Trace()
+    /**
+     * @private
+     * @param {?} event
      * @return {?}
      */
-    function () {
-        /** @type {?} */
-        var params = {};
-        /** @type {?} */
-        var routeIdParam = this.getNonEmptyParameters()
-            .filter((/**
-         * @param {?} p
-         * @return {?}
-         */
-        function (p) { return !p.definition.isRouteId; }))
-            .forEach((/**
-         * @param {?} p
-         * @return {?}
-         */
-        function (p) { return params[p.definition.name] = p.formattedValue(); }));
-        return params;
+    function (event) {
+        if (!this.navigationSession) { // We been activated by an external route rather than placeRouter.go(visit)
+            console.log('navigation started', { firstTime: this.firstRoute });
+            /** @type {?} */
+            var session = NavigationSession.createExternal(this.firstRoute);
+            if (event.navigationTrigger === 'popstate') {
+                session.setPopstateReturn(this.router.routerState.snapshot.url);
+            }
+            this._navigationSessionModel.value = session;
+        }
+        this.firstRoute = false;
     };
+    // @Trace()
+    // @Trace()
     /**
+     * @private
      * @return {?}
      */
-    ParameterSnapshot.prototype.getAllParameters = /**
+    PlaceRouter.prototype.onAngularRouterFinished = 
+    // @Trace()
+    /**
+     * @private
      * @return {?}
      */
     function () {
+        var _this = this;
         /** @type {?} */
-        var params = {};
+        var session = this._navigationSessionModel.value;
+        // Update visits before we end the navigation session.  This allows the place out let to
+        // gate ignore changes that occur while the visit is active
         /** @type {?} */
-        var routeIdParam = this.parameters.forEach((/**
-         * @param {?} p
+        var visits = session.getVisits();
+        visits.forEach((/**
+         * @param {?} v
          * @return {?}
          */
-        function (p) {
-            params[p.definition.name] = p.value;
+        function (v) {
+            _this.placeHistory.add(v);
         }));
-        return params;
+        this._activeVisits.value = visits;
+        this._navigationSessionModel.value = null;
     };
     /**
-     * @template T, S
-     * @param {?} parameter
-     * @param {?} value
+     * @param {?} activatedRoute
      * @return {?}
      */
-    ParameterSnapshot.prototype.replace = /**
-     * @template T, S
-     * @param {?} parameter
-     * @param {?} value
+    PlaceRouter.prototype.getChildPath = /**
+     * @param {?} activatedRoute
      * @return {?}
      */
-    function (parameter, value) {
-        return new ParameterSnapshot(this.placeDefinition, this.parameters.map((/**
-         * @param {?} p
+    function (activatedRoute) {
+        return ___default.flatten(activatedRoute.children.map((/**
+         * @param {?} child
          * @return {?}
          */
-        function (p) {
-            return p.definition === parameter ? p.replace(value) : p;
-        })));
-    };
-    /**
-     * @param {?} injector
-     * @return {?}
-     */
-    ParameterSnapshot.prototype.sanitise = /**
-     * @param {?} injector
-     * @return {?}
-     */
-    function (injector) {
-        return __awaiter(this, void 0, void 0, function () {
-            var routeId, sanitisedValue, result, routeParameters, i, routeParameter, sanitisedValue;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.hasRouteId()) return [3 /*break*/, 2];
-                        routeId = this.getRouteIdParameter();
-                        return [4 /*yield*/, routeId.sanitise(this, injector)];
-                    case 1:
-                        sanitisedValue = _a.sent();
-                        if (routeId.hasChanged(sanitisedValue)) {
-                            // if the route id has changed we redirect immediately as other
-                            // parameter sanitisers might use it.
-                            return [2 /*return*/, this.replace(routeId.definition, sanitisedValue)];
-                        }
-                        _a.label = 2;
-                    case 2:
-                        result = this;
-                        routeParameters = this.getRouteParameters();
-                        i = 0;
-                        _a.label = 3;
-                    case 3:
-                        if (!(i < routeParameters.length)) return [3 /*break*/, 6];
-                        routeParameter = routeParameters[i];
-                        return [4 /*yield*/, routeParameter.sanitise(this, injector)];
-                    case 4:
-                        sanitisedValue = _a.sent();
-                        if (routeParameter.hasChanged(sanitisedValue)) {
-                            result = result.replace(routeParameter.definition, sanitisedValue);
-                        }
-                        _a.label = 5;
-                    case 5:
-                        i++;
-                        return [3 /*break*/, 3];
-                    case 6: return [2 /*return*/, result];
-                }
-            });
-        });
+        function (child) { return child.url; })));
     };
-    var _a;
-    __decorate([
-        Memoize$1(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [ParameterDefinition]),
-        __metadata("design:returntype", RouteParameterValue)
-    ], ParameterSnapshot.prototype, "getParameter", null);
-    __decorate([
-        Memoize$1(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [ParameterDefinition]),
-        __metadata("design:returntype", typeof (_a = typeof S !== "undefined" && S) === "function" ? _a : Object)
-    ], ParameterSnapshot.prototype, "getValueOf", null);
-    __decorate([
-        Memoize$1(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [String]),
-        __metadata("design:returntype", Object)
-    ], ParameterSnapshot.prototype, "getParameterValue", null);
-    __decorate([
-        Memoize$1(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", RouteParameterValue.Scalar)
-    ], ParameterSnapshot.prototype, "getRouteIdParameter", null);
+    PlaceRouter.decorators = [
+        { type: Injectable, args: [{
+                    providedIn: 'root'
+                },] }
+    ];
+    /** @nocollapse */
+    PlaceRouter.ctorParameters = function () { return [
+        { type: Router },
+        { type: Location },
+        { type: PlaceHistory }
+    ]; };
+    /** @nocollapse */ PlaceRouter.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(ɵɵinject(Router), ɵɵinject(Location), ɵɵinject(PlaceHistory)); }, token: PlaceRouter, providedIn: "root" });
     __decorate([
-        Memoize$1(),
+        Trace(),
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", Array)
-    ], ParameterSnapshot.prototype, "getRouteParameters", null);
-    return ParameterSnapshot;
-}());
+        __metadata("design:paramtypes", [ActivatedRoute, Visit, Visit]),
+        __metadata("design:returntype", Promise)
+    ], PlaceRouter.prototype, "pushVisitChangesToRoute", null);
+    return PlaceRouter;
+}(GarbageCollector));
 if (false) {
-    /** @type {?} */
-    ParameterSnapshot.prototype.placeDefinition;
     /**
      * @type {?}
      * @private
      */
-    ParameterSnapshot.prototype.parameters;
-}
-(function (ParameterSnapshot) {
+    PlaceRouter.prototype.firstRoute;
     /**
-     * @param {?} placeDef
-     * @param {?} params
-     * @param {?} urlSegments
-     * @return {?}
+     * @type {?}
+     * @private
      */
-    function create(placeDef, params, urlSegments) {
-        /** @type {?} */
-        var paramMap = new ConsolidatedParameterMap(params, urlSegments);
-        /** @type {?} */
-        var resolvedParameters = placeDef.getRouteParameters().map((/**
-         * @param {?} def
-         * @return {?}
-         */
-        function (def) { return RouteParameterValue.create(def, paramMap); }));
-        return new ParameterSnapshot(placeDef, resolvedParameters);
-    }
-    ParameterSnapshot.create = create;
+    PlaceRouter.prototype._navigationSessionModel;
     /**
-     * This a work around for the fact that an activated route with multiple segments doesn't
-     * include the segment params in the paramMap as well as each segment returns an empty
-     * param map even when `parameter`s has content.
+     * @type {?}
+     * @private
      */
-    var ConsolidatedParameterMap = /** @class */ (function () {
-        function ConsolidatedParameterMap(paramMap, urlSegments) {
-            this.paramMaps = [paramMap].concat((urlSegments || []).map((/**
-             * @param {?} s
-             * @return {?}
-             */
-            function (s) { return new ParamMapAdapter(s.parameters); }))).filter((/**
-             * @param {?} m
-             * @return {?}
-             */
-            function (m) { return !!m; })); // the activated route param map can be null
-        }
-        /**
-         * @param {?} name
-         * @return {?}
-         */
-        ConsolidatedParameterMap.prototype.get = /**
-         * @param {?} name
-         * @return {?}
-         */
-        function (name) {
-            return this.paramMaps.find((/**
-             * @param {?} m
-             * @return {?}
-             */
-            function (m) { return m.has(name); })).get(name);
-        };
-        /**
-         * @param {?} name
-         * @return {?}
-         */
-        ConsolidatedParameterMap.prototype.getAll = /**
-         * @param {?} name
-         * @return {?}
-         */
-        function (name) {
-            return this.paramMaps.find((/**
-             * @param {?} m
-             * @return {?}
-             */
-            function (m) { return m.has(name); })).getAll(name);
-        };
-        /**
-         * @param {?} name
-         * @return {?}
-         */
-        ConsolidatedParameterMap.prototype.has = /**
-         * @param {?} name
-         * @return {?}
-         */
-        function (name) {
-            return !!this.paramMaps.find((/**
-             * @param {?} m
-             * @return {?}
-             */
-            function (m) { return m.has(name); }));
-        };
-        Object.defineProperty(ConsolidatedParameterMap.prototype, "keys", {
-            get: /**
-             * @return {?}
-             */
-            function () {
-                return this.paramMaps.reduce((/**
-                 * @param {?} result
-                 * @param {?} params
-                 * @return {?}
-                 */
-                function (result, params) { return result.concat(params.keys); }), []);
-            },
-            enumerable: true,
-            configurable: true
-        });
-        __decorate([
-            Memoize$1(),
-            __metadata("design:type", Array),
-            __metadata("design:paramtypes", [])
-        ], ConsolidatedParameterMap.prototype, "keys", null);
-        return ConsolidatedParameterMap;
-    }());
-    if (false) {
-        /**
-         * @type {?}
-         * @private
-         */
-        ConsolidatedParameterMap.prototype.paramMaps;
-    }
-    var ParamMapAdapter = /** @class */ (function () {
-        function ParamMapAdapter(params) {
-            this.params = params;
-        }
-        /**
-         * @param {?} name
-         * @return {?}
-         */
-        ParamMapAdapter.prototype.get = /**
-         * @param {?} name
-         * @return {?}
-         */
-        function (name) {
-            return this.params[name];
-        };
-        /**
-         * @param {?} name
-         * @return {?}
-         */
-        ParamMapAdapter.prototype.getAll = /**
-         * @param {?} name
-         * @return {?}
-         */
-        function (name) {
-            /** @type {?} */
-            var value = this.get(name);
-            return Array.isArray(value) ? value : [value];
-        };
-        /**
-         * @param {?} name
-         * @return {?}
-         */
-        ParamMapAdapter.prototype.has = /**
-         * @param {?} name
-         * @return {?}
-         */
-        function (name) {
-            return this.keys.includes(name);
-        };
-        Object.defineProperty(ParamMapAdapter.prototype, "keys", {
-            get: /**
-             * @return {?}
-             */
-            function () {
-                return Object.keys(this.params);
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return ParamMapAdapter;
-    }());
-    if (false) {
-        /**
-         * @type {?}
-         * @private
-         */
-        ParamMapAdapter.prototype.params;
-    }
-})(ParameterSnapshot || (ParameterSnapshot = {}));
+    PlaceRouter.prototype._activeVisits;
+    /** @type {?} */
+    PlaceRouter.prototype.navigationSessionActive;
+    /** @type {?} */
+    PlaceRouter.prototype.activeVisitIndex;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceRouter.prototype.router;
+    /** @type {?} */
+    PlaceRouter.prototype.angularLocation;
+    /** @type {?} */
+    PlaceRouter.prototype.placeHistory;
+}
 
 /**
  * @fileoverview added by tsickle
@@ -3949,63 +4061,62 @@ if (false) {
 }
 var PlaceOutletComponent = /** @class */ (function (_super) {
     __extends(PlaceOutletComponent, _super);
-    function PlaceOutletComponent(router, placeHistory) {
+    function PlaceOutletComponent(router, placeRouter, placeHistory) {
         var _this = _super.call(this) || this;
         _this.router = router;
+        _this.placeRouter = placeRouter;
         _this.placeHistory = placeHistory;
         _this.animate = true;
+        _this.placeChanged = new EventEmitter();
         _this._activePlace = new MutableValueModel();
-        _this._incomingRouteChange = new Guard$1();
         _this._inOutletUpdate = new Guard$1();
         _this._activatedRouteModel = new MutableValueModel();
         _this._placeDefinition = new MutableValueModel();
-        _this._resolvedParameters = new MutableValueModel();
+        /**
+         * TODO: This is now really a visit
+         */
+        _this._placeVisit = new MutableValueModel();
         var _a = Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
+        // Handle incoming route changes.
         /** @type {?} */
-        var paramMap = chain(_this._activatedRouteModel).pullObservableValue((/**
-         * @param {?} ar
-         * @return {?}
-         */
-        function (ar) { return ar.paramMap; }));
+        var inRouteVisitUpdate = new Guard$1();
         /** @type {?} */
-        var urls = chain(_this._activatedRouteModel).pullObservableValue((/**
-         * @param {?} ar
-         * @return {?}
-         */
-        function (ar) { return ar.url; }));
-        _this.placeConfigured = valueOf.all(chain(_this._inOutletUpdate).isFalsey(), _this._placeDefinition, paramMap, urls).areTruthy();
-        when.anyOf(paramMap, urls).changes((/**
+        var routeVisit = chain(_this._activePlace).pluck('placeDefinition').findIn(placeRouter.activeVisitIndex);
+        when.valueOf(routeVisit).changes((/**
+         * @param {?} visit
          * @return {?}
          */
-        function () {
-            /** @type {?} */
-            var snapshot = ParameterSnapshot.create(_this._placeDefinition.value, paramMap.value, urls.value);
-            _this._incomingRouteChange.whileTrue((/**
-             * @return {?}
-             */
-            function () {
-                _this._resolvedParameters.value = snapshot;
-                _this.placeHistory.add(snapshot);
-            }));
-        }), {
-            postponeUntil: _this.placeConfigured
-        });
-        when.valueOf(_this._resolvedParameters).changes((/**
+        function (visit) {
+            if (visit) {
+                inRouteVisitUpdate.whileTrue((/**
+                 * @return {?}
+                 */
+                function () {
+                    _this._placeVisit.value = visit;
+                }));
+            }
+        }));
+        // Handle component based changes
+        when.valueOf(_this._placeVisit).changes((/**
          * @param {?} next
          * @param {?} previous
          * @return {?}
          */
         function (next, previous) {
-            _this.placeHistory.add(next); // the above route change doesn't seem to propagate back in, so I'm add the state to the history manually for now.
-            _this.pushChangesToRoute(next, previous);
+            _this.pushVisitChangesToRoute(next, previous);
         }), {
-            unless: _this.incomingRouteChange
+            unless: inRouteVisitUpdate
         });
+        chain(_this._activePlace)
+            .postponeWhile(placeRouter.navigationSessionActive)
+            .subscribe((/**
+         * @param {?} place
+         * @return {?}
+         */
+        function (place) { return _this.placeChanged.emit(place); }));
         return _this;
         // const txo = new TransactionObserver().onEvent(e => console.log(e.toString()));
-        // txo.observe('paramMap', paramMap);
-        // txo.observe('urls', urls);
-        // txo.observe('this._resolvedParameters', this._resolvedParameters);
+        // txo.observe('inRouteVisitUpdate', inRouteVisitUpdate);
     }
     /**
      * @return {?}
@@ -4015,17 +4126,22 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
      */
     function () {
     };
-    Object.defineProperty(PlaceOutletComponent.prototype, "incomingRouteChange", {
-        get: /**
-         * @return {?}
-         */
-        function () {
-            return this._incomingRouteChange;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(PlaceOutletComponent.prototype, "activePlace", {
+    /**
+     * @param {?} next
+     * @param {?} previous
+     * @return {?}
+     */
+    PlaceOutletComponent.prototype.pushVisitChangesToRoute = /**
+     * @param {?} next
+     * @param {?} previous
+     * @return {?}
+     */
+    function (next, previous) {
+        /** @type {?} */
+        var activatedRoute = this._activatedRouteModel.value;
+        this.placeRouter.pushVisitChangesToRoute(activatedRoute, previous, next);
+    };
+    Object.defineProperty(PlaceOutletComponent.prototype, "activePlaceModel", {
         get: /**
          * @return {?}
          */
@@ -4055,7 +4171,7 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
                 _this._activePlace.value = place;
                 _this._activatedRouteModel.value = routerOutlet.activatedRoute;
                 _this._placeDefinition.value = place.placeDefinition;
-                place.initialiseBindings(_this._resolvedParameters);
+                place.initialiseBindings(_this._placeVisit);
             }
             catch (error) {
                 console.error(error);
@@ -4110,32 +4226,15 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         }
     };
     /**
-     * @param {?} next
-     * @param {?} previous
-     * @return {?}
-     */
-    PlaceOutletComponent.prototype.pushChangesToRoute = /**
-     * @param {?} next
-     * @param {?} previous
-     * @return {?}
-     */
-    function (next, previous) {
-        /** @type {?} */
-        var activatedRoute = this._activatedRouteModel.value;
-        this.router.pushParameterChangesToRoute(activatedRoute, previous, next);
-    };
-    /**
-     * @param {?} snapshot
-     * @param {?} callback
+     * @param {?} placeDestination
      * @return {?}
      */
-    PlaceOutletComponent.prototype.sanitise = /**
-     * @param {?} snapshot
-     * @param {?} callback
+    PlaceOutletComponent.prototype.activate = /**
+     * @param {?} placeDestination
      * @return {?}
      */
-    function (snapshot, callback) {
-        return snapshot;
+    function (placeDestination) {
+        // this.router.
     };
     PlaceOutletComponent.decorators = [
         { type: Component, args: [{
@@ -4147,11 +4246,13 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
     ];
     /** @nocollapse */
     PlaceOutletComponent.ctorParameters = function () { return [
+        { type: Router },
         { type: PlaceRouter },
         { type: PlaceHistory }
     ]; };
     PlaceOutletComponent.propDecorators = {
         animate: [{ type: Input }],
+        placeChanged: [{ type: Output }],
         routerOut: [{ type: ViewChild, args: ['routeOutlet', { static: true },] }]
     };
     return PlaceOutletComponent;
@@ -4160,17 +4261,14 @@ if (false) {
     /** @type {?} */
     PlaceOutletComponent.prototype.animate;
     /** @type {?} */
+    PlaceOutletComponent.prototype.placeChanged;
+    /** @type {?} */
     PlaceOutletComponent.prototype.routerOut;
     /**
      * @type {?}
      * @private
      */
     PlaceOutletComponent.prototype._activePlace;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceOutletComponent.prototype._incomingRouteChange;
     /**
      * @type {?}
      * @private
@@ -4186,18 +4284,21 @@ if (false) {
      * @private
      */
     PlaceOutletComponent.prototype._placeDefinition;
-    /** @type {?} */
-    PlaceOutletComponent.prototype._resolvedParameters;
     /**
+     * TODO: This is now really a visit
      * @type {?}
-     * @private
      */
-    PlaceOutletComponent.prototype.placeConfigured;
+    PlaceOutletComponent.prototype._placeVisit;
     /**
      * @type {?}
      * @private
      */
     PlaceOutletComponent.prototype.router;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceOutletComponent.prototype.placeRouter;
     /**
      * @type {?}
      * @private
@@ -4217,7 +4318,7 @@ var TabbedPlaceNavigationComponent = /** @class */ (function (_super) {
     TabbedPlaceNavigationComponent.decorators = [
         { type: Component, args: [{
                     selector: 'angular-ui-powerups-tabbed-place-navigation',
-                    template: "<nav mat-tab-nav-bar>\n  <a mat-tab-link *ngFor=\"let place of placeDefinitions.value\"\n     [routerLink]='place.path'\n     routerLinkActive #rla=\"routerLinkActive\"\n     [active]=\"rla.isActive\"\n     [matTooltip]=\"getNav(place).tooltip()\">\n    <mat-icon *ngIf=\"getNav(place).icon()\">{{getNav(place).icon()}}</mat-icon>\n    <span>{{getNav(place).title()}}</span>\n  </a>\n</nav>\n",
+                    template: "<nav mat-tab-nav-bar>\n  <a mat-tab-link *ngFor=\"let place of placeDefinitions.value\"\n     [routerLink]='place.path'\n     [replaceUrl]=\"true\"\n     routerLinkActive #rla=\"routerLinkActive\"\n     [active]=\"rla.isActive\"\n     [matTooltip]=\"getNav(place).tooltip()\">\n    <mat-icon *ngIf=\"getNav(place).icon()\">{{getNav(place).icon()}}</mat-icon>\n    <span>{{getNav(place).title()}}</span>\n  </a>\n</nav>\n",
                     styles: [""]
                 }] }
     ];
@@ -4281,7 +4382,8 @@ var AngularUiPowerupsModule = /** @class */ (function () {
                         NumberInputComponent,
                         StringInputComponent,
                         PasswordInputComponent,
-                        SelectInputComponent
+                        SelectInputComponent,
+                        NoopComponent
                     ],
                     imports: [
                         CommonModule,
@@ -4302,7 +4404,8 @@ var AngularUiPowerupsModule = /** @class */ (function () {
                         PasswordInputComponent,
                         SelectInputComponent,
                         InteractionModule,
-                        PlaceModule
+                        PlaceModule,
+                        NoopComponent
                     ]
                 },] }
     ];
@@ -4674,12 +4777,25 @@ if (false) {
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
-var CloseInteractionGuard = /** @class */ (function () {
-    function CloseInteractionGuard(router, injector, interactionContext) {
+var InteractionGuard = /** @class */ (function () {
+    function InteractionGuard(router, injector, interactionContext) {
         this.router = router;
         this.injector = injector;
         this.interactionContext = interactionContext;
     }
+    /**
+     * @param {?} route
+     * @param {?} state
+     * @return {?}
+     */
+    InteractionGuard.prototype.canActivate = /**
+     * @param {?} route
+     * @param {?} state
+     * @return {?}
+     */
+    function (route, state) {
+        return true;
+    };
     /**
      * @param {?} component
      * @param {?} currentRoute
@@ -4687,7 +4803,7 @@ var CloseInteractionGuard = /** @class */ (function () {
      * @param {?=} nextState
      * @return {?}
      */
-    CloseInteractionGuard.prototype.canDeactivate = /**
+    InteractionGuard.prototype.canDeactivate = /**
      * @param {?} component
      * @param {?} currentRoute
      * @param {?} currentState
@@ -4697,36 +4813,48 @@ var CloseInteractionGuard = /** @class */ (function () {
     function (component, currentRoute, currentState, nextState) {
         return !this.interactionContext.isActive();
     };
-    CloseInteractionGuard.decorators = [
+    InteractionGuard.decorators = [
         { type: Injectable, args: [{
                     providedIn: 'root'
                 },] }
     ];
     /** @nocollapse */
-    CloseInteractionGuard.ctorParameters = function () { return [
+    InteractionGuard.ctorParameters = function () { return [
         { type: Router },
         { type: Injector },
         { type: InteractionContext }
     ]; };
-    /** @nocollapse */ CloseInteractionGuard.ngInjectableDef = ɵɵdefineInjectable({ factory: function CloseInteractionGuard_Factory() { return new CloseInteractionGuard(ɵɵinject(Router), ɵɵinject(INJECTOR), ɵɵinject(InteractionContext)); }, token: CloseInteractionGuard, providedIn: "root" });
-    return CloseInteractionGuard;
+    /** @nocollapse */ InteractionGuard.ngInjectableDef = ɵɵdefineInjectable({ factory: function InteractionGuard_Factory() { return new InteractionGuard(ɵɵinject(Router), ɵɵinject(INJECTOR), ɵɵinject(InteractionContext)); }, token: InteractionGuard, providedIn: "root" });
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [ActivatedRouteSnapshot, RouterStateSnapshot]),
+        __metadata("design:returntype", Object)
+    ], InteractionGuard.prototype, "canActivate", null);
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [NoopComponent, ActivatedRouteSnapshot, RouterStateSnapshot, RouterStateSnapshot]),
+        __metadata("design:returntype", Object)
+    ], InteractionGuard.prototype, "canDeactivate", null);
+    return InteractionGuard;
 }());
 if (false) {
     /**
      * @type {?}
      * @private
      */
-    CloseInteractionGuard.prototype.router;
+    InteractionGuard.prototype.router;
     /**
      * @type {?}
      * @private
      */
-    CloseInteractionGuard.prototype.injector;
+    InteractionGuard.prototype.injector;
     /**
      * @type {?}
      * @private
      */
-    CloseInteractionGuard.prototype.interactionContext;
+    InteractionGuard.prototype.interactionContext;
 }
 
 /**
@@ -4754,7 +4882,289 @@ if (false) {
     /**
      * @return {?}
      */
-    NavItem.prototype.tooltip = function () { };
+    NavItem.prototype.tooltip = function () { };
+}
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+/**
+ * @param {?} options
+ * @return {?}
+ */
+function Place(options) {
+    return (/**
+     * @param {?} target
+     * @return {?}
+     */
+    function (target) {
+        if (PlaceComponent.isPlaceComponentConstructor(target)) {
+            PlaceComponent.injectDefinition(target, new PlaceDefinition(target, options.path, isNil(options.authenticate) ? false : options.authenticate, options.order, options.data, PlaceComponent.getRouteParameters(target), (options.children || []).map((/**
+             * @param {?} c
+             * @return {?}
+             */
+            function (c) { return PlaceComponent.getDefinition(c); }))));
+        }
+        else {
+            lang.illegalState(target + " must extend PlaceComponent to use the @Place decorator");
+        }
+    });
+}
+(function (Place) {
+    /**
+     * @record
+     */
+    function Options() { }
+    Place.Options = Options;
+    if (false) {
+        /** @type {?} */
+        Options.prototype.path;
+        /** @type {?} */
+        Options.prototype.order;
+        /** @type {?|undefined} */
+        Options.prototype.data;
+        /** @type {?|undefined} */
+        Options.prototype.authenticate;
+        /** @type {?|undefined} */
+        Options.prototype.children;
+    }
+})(Place || (Place = {}));
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+// WARNING: interface has both a type and a value, skipping emit
+var Formatter;
+(function (Formatter) {
+    var StringType = /** @class */ (function () {
+        function StringType() {
+        }
+        /**
+         * @param {?} value
+         * @return {?}
+         */
+        StringType.prototype.format = /**
+         * @param {?} value
+         * @return {?}
+         */
+        function (value) {
+            return value;
+        };
+        /**
+         * @param {?} value
+         * @return {?}
+         */
+        StringType.prototype.parse = /**
+         * @param {?} value
+         * @return {?}
+         */
+        function (value) {
+            return value;
+        };
+        return StringType;
+    }());
+    var NumberType = /** @class */ (function () {
+        function NumberType() {
+        }
+        /**
+         * @param {?} value
+         * @return {?}
+         */
+        NumberType.prototype.format = /**
+         * @param {?} value
+         * @return {?}
+         */
+        function (value) {
+            return ___default.isNumber(value) && !___default.isNaN(value) ? "" + value : null;
+        };
+        /**
+         * @param {?} value
+         * @return {?}
+         */
+        NumberType.prototype.parse = /**
+         * @param {?} value
+         * @return {?}
+         */
+        function (value) {
+            /** @type {?} */
+            var parsed = Number.parseFloat(value);
+            return ___default.isNaN(parsed) ? null : parsed;
+        };
+        return NumberType;
+    }());
+    var BooleanType = /** @class */ (function () {
+        function BooleanType() {
+        }
+        /**
+         * @param {?} value
+         * @return {?}
+         */
+        BooleanType.prototype.format = /**
+         * @param {?} value
+         * @return {?}
+         */
+        function (value) {
+            return value ? 'true' : 'false';
+        };
+        /**
+         * @param {?} value
+         * @return {?}
+         */
+        BooleanType.prototype.parse = /**
+         * @param {?} value
+         * @return {?}
+         */
+        function (value) {
+            return value === 'true';
+        };
+        return BooleanType;
+    }());
+    Formatter.STRING = new StringType();
+    Formatter.NUMBER = new NumberType();
+    Formatter.BOOLEAN = new BooleanType();
+})(Formatter || (Formatter = {}));
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+/**
+ * @record
+ */
+function JsonArray() { }
+/**
+ * @record
+ */
+function JsonMap() { }
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+/**
+ * @record
+ * @template T
+ */
+function RouteIdOptions() { }
+if (false) {
+    /** @type {?|undefined} */
+    RouteIdOptions.prototype.as;
+    /** @type {?|undefined} */
+    RouteIdOptions.prototype.optional;
+    /** @type {?|undefined} */
+    RouteIdOptions.prototype.remember;
+    /** @type {?|undefined} */
+    RouteIdOptions.prototype.defaultValue;
+}
+/**
+ * @record
+ * @template T
+ */
+function RouteParameterOptions() { }
+if (false) {
+    /** @type {?|undefined} */
+    RouteParameterOptions.prototype.as;
+    /** @type {?|undefined} */
+    RouteParameterOptions.prototype.optional;
+    /** @type {?|undefined} */
+    RouteParameterOptions.prototype.remember;
+    /** @type {?|undefined} */
+    RouteParameterOptions.prototype.defaultValue;
+    /** @type {?|undefined} */
+    RouteParameterOptions.prototype.storeInUrl;
+}
+/**
+ * @record
+ * @template T
+ */
+function RouteListParameterOptions() { }
+if (false) {
+    /** @type {?|undefined} */
+    RouteListParameterOptions.prototype.as;
+    /** @type {?|undefined} */
+    RouteListParameterOptions.prototype.optional;
+    /** @type {?|undefined} */
+    RouteListParameterOptions.prototype.remember;
+    /** @type {?|undefined} */
+    RouteListParameterOptions.prototype.defaultValue;
+    /** @type {?|undefined} */
+    RouteListParameterOptions.prototype.storeInUrl;
+}
+/**
+ * @template T
+ * @param {?} type
+ * @param {?=} options
+ * @return {?}
+ */
+function RouteId(type, options) {
+    return (/**
+     * @param {?} prototype
+     * @param {?} propertyKey
+     * @return {?}
+     */
+    function (prototype, propertyKey) {
+        /** @type {?} */
+        var param = new ParameterDefinition.RouteId(propertyKey.toString(), options, type);
+        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
+        UseDelegate()(prototype, propertyKey);
+    });
+}
+/**
+ * @template T
+ * @param {?=} options
+ * @return {?}
+ */
+function VisitParameter(options) {
+    return (/**
+     * @param {?} prototype
+     * @param {?} propertyKey
+     * @return {?}
+     */
+    function (prototype, propertyKey) {
+        /** @type {?} */
+        var param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, options.storeInUrl);
+        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
+        UseDelegate()(prototype, propertyKey);
+    });
+}
+/**
+ * @template E
+ * @param {?=} options
+ * @return {?}
+ */
+function VisitParameterList(options) {
+    return (/**
+     * @param {?} prototype
+     * @param {?} propertyKey
+     * @return {?}
+     */
+    function (prototype, propertyKey) {
+        /** @type {?} */
+        var param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, options.storeInUrl);
+        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
+        UseDelegate()(prototype, propertyKey);
+    });
+}
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+/**
+ * @record
+ * @template S
+ */
+function ParameterSanitiser() { }
+if (false) {
+    /**
+     * @param {?} parameterValue
+     * @param {?=} visit
+     * @param {?=} injector
+     * @return {?}
+     */
+    ParameterSanitiser.prototype.sanitise = function (parameterValue, visit, injector) { };
 }
 
 /**
@@ -4762,67 +5172,116 @@ if (false) {
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 /**
- * @param {?} options
- * @return {?}
+ * @record
+ * @template T
  */
-function Place(options) {
-    return (/**
-     * @param {?} target
+function ParameterSnapshot() { }
+if (false) {
+    /** @type {?} */
+    ParameterSnapshot.prototype.definition;
+    /** @type {?} */
+    ParameterSnapshot.prototype.value;
+    /**
      * @return {?}
      */
-    function (target) {
-        if (PlaceComponent.isPlaceComponentConstructor(target)) {
-            PlaceComponent.injectDefinition(target, new PlaceDefinition(target, options.path, isNil(options.authenticate) ? false : options.authenticate, options.order, options.data, PlaceComponent.getRouteParameters(target), (options.children || []).map((/**
-             * @param {?} c
-             * @return {?}
-             */
-            function (c) { return PlaceComponent.getDefinition(c); }))));
-        }
-        else {
-            lang.illegalState(target + " must extend PlaceComponent to use the @Place decorator");
-        }
-    });
+    ParameterSnapshot.prototype.isMissing = function () { };
 }
-(function (Place) {
-    /**
-     * @record
-     */
-    function Options() { }
-    Place.Options = Options;
-    if (false) {
-        /** @type {?} */
-        Options.prototype.path;
-        /** @type {?} */
-        Options.prototype.order;
-        /** @type {?|undefined} */
-        Options.prototype.data;
-        /** @type {?|undefined} */
-        Options.prototype.authenticate;
-        /** @type {?|undefined} */
-        Options.prototype.children;
-    }
-})(Place || (Place = {}));
 
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
-/**
- * @record
- */
-function Visit() { }
-if (false) {
-    /** @type {?} */
-    Visit.prototype.placeDefinition;
+var VisitSanitiser = /** @class */ (function () {
+    function VisitSanitiser(activatedRoute, router, placeHistory, injector) {
+        this.activatedRoute = activatedRoute;
+        this.router = router;
+        this.placeHistory = placeHistory;
+        this.injector = injector;
+    }
+    // @Trace()
+    // @Trace()
     /**
+     * @param {?} visit
      * @return {?}
      */
-    Visit.prototype.getRouteIdValue = function () { };
+    VisitSanitiser.prototype.sanitise = 
+    // @Trace()
     /**
-     * @param {?} name
+     * @param {?} visit
      * @return {?}
      */
-    Visit.prototype.getParameterValue = function (name) { };
+    function (visit) {
+        return __awaiter(this, void 0, void 0, function () {
+            var placeDef, routeIdDef, routeId, sanitisedValue, parameterDefs, sanitisedVisit, i, def, value, sanitisedValue;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        placeDef = visit.placeDefinition;
+                        if (!placeDef.hasRouteId()) return [3 /*break*/, 2];
+                        routeIdDef = placeDef.getRouteIdParameterDef();
+                        routeId = visit.getRouteId();
+                        return [4 /*yield*/, routeIdDef.sanitise(routeId, visit, this.placeHistory, this.injector)];
+                    case 1:
+                        sanitisedValue = _a.sent();
+                        console.log({ routeId: routeId, sanitisedValue: sanitisedValue });
+                        // ###------- EARLY EXIT --------###
+                        if (routeIdDef.hasChanged(routeId, sanitisedValue)) {
+                            // if the route id has changed we redirect immediately as other
+                            // parameter sanitisers might use it.
+                            return [2 /*return*/, visit.replace(routeIdDef, sanitisedValue)];
+                        }
+                        _a.label = 2;
+                    case 2:
+                        // if we didn't replace the routeId we continue the url present parameters.
+                        parameterDefs = placeDef.getVisitParameterDefs({
+                            includeRouteParameters: true,
+                            includeNonRouteParameters: true
+                        });
+                        sanitisedVisit = visit;
+                        i = 0;
+                        _a.label = 3;
+                    case 3:
+                        if (!(i < parameterDefs.length)) return [3 /*break*/, 6];
+                        def = parameterDefs[i];
+                        value = visit.getParameter(def.name);
+                        return [4 /*yield*/, def.sanitise(value, sanitisedVisit, this.placeHistory, this.injector)];
+                    case 4:
+                        sanitisedValue = _a.sent();
+                        if (def.hasChanged(value, sanitisedValue)) {
+                            sanitisedVisit = sanitisedVisit.replace(def, sanitisedValue);
+                        }
+                        _a.label = 5;
+                    case 5:
+                        i++;
+                        return [3 /*break*/, 3];
+                    case 6: return [2 /*return*/, sanitisedVisit.hasChangedFrom(visit) ? sanitisedVisit : visit];
+                }
+            });
+        });
+    };
+    return VisitSanitiser;
+}());
+if (false) {
+    /**
+     * @type {?}
+     * @private
+     */
+    VisitSanitiser.prototype.activatedRoute;
+    /**
+     * @type {?}
+     * @private
+     */
+    VisitSanitiser.prototype.router;
+    /**
+     * @type {?}
+     * @private
+     */
+    VisitSanitiser.prototype.placeHistory;
+    /**
+     * @type {?}
+     * @private
+     */
+    VisitSanitiser.prototype.injector;
 }
 
 /**
@@ -4837,6 +5296,22 @@ var LeavePlaceGuard = /** @class */ (function () {
         this.interactionContext = interactionContext;
         this.angularLocation = angularLocation;
     }
+    /**
+     * @private
+     * @param {?} nextState
+     * @param {?} placeDefinitionPath
+     * @return {?}
+     */
+    LeavePlaceGuard.prototype.isLeavingTheCurrentPlace = /**
+     * @private
+     * @param {?} nextState
+     * @param {?} placeDefinitionPath
+     * @return {?}
+     */
+    function (nextState, placeDefinitionPath) {
+        // TODO: this will break with child routes... need to examine the router states properly.
+        return !nextState.url.startsWith(placeDefinitionPath);
+    };
     /**
      * @param {?} component
      * @param {?} currentRoute
@@ -4859,23 +5334,43 @@ var LeavePlaceGuard = /** @class */ (function () {
                     case 0:
                         placeDefinitionPath = "/" + component.placeDefinition.path;
                         if (!this.placeRouter.navigationSession.alreadyAccepted(component)) return [3 /*break*/, 1];
+                        // We'll get called multiple times if there's any parameter sanitisation so
+                        // we always return true if we accepted on a previous cycle of the current
+                        // navigation session.
                         return [2 /*return*/, true];
                     case 1:
-                        if (!!nextState.url.startsWith(placeDefinitionPath)) return [3 /*break*/, 3];
                         self_1 = this;
+                        canLeave = true;
+                        if (!this.isLeavingTheCurrentPlace(nextState, placeDefinitionPath)) return [3 /*break*/, 4];
+                        // we check the interaction first, so that components that don't need to check if they're in an
+                        // interaction during the canDeactivate cycle.
+                        // TODO: Add tests: show dialog -> hit back -> same route
+                        if (this.interactionContext.isActive()) {
+                            canLeave = false;
+                            console.log('cancelling', { activity: this.interactionContext.currentActivity });
+                            this.interactionContext.currentActivity.cancel(null);
+                        }
+                        if (!canLeave) return [3 /*break*/, 3];
                         return [4 /*yield*/, component.canDeactivate()];
                     case 2:
+                        // TODO: Add tests: hit back -> confirm leave dialog -> hit back -> close dialog ->  hit back -> confirm leave dialog.
                         canLeave = _a.sent();
-                        // component is happy to leave but we need to check if it's left an interaction
-                        // open.  If so we close and stay where we are.
-                        if (canLeave && this.interactionContext.isActive()) {
-                            canLeave = false;
-                            console.log("cancelling", { activity: this.interactionContext.currentActivity });
+                        _a.label = 3;
+                    case 3: return [3 /*break*/, 5];
+                    case 4:
+                        if (this.interactionContext.isActive()) {
+                            console.log('cancelling', { activity: this.interactionContext.currentActivity });
                             this.interactionContext.currentActivity.cancel(null);
+                            canLeave = false;
                         }
-                        // If we're still leaving then remember it since angular will call this method multiple
-                        // times if any route parameters are changed along the way.
+                        else {
+                            canLeave = true;
+                        }
+                        _a.label = 5;
+                    case 5:
                         if (canLeave) {
+                            // We'll get called multiple times if there's any parameter sanitisation so
+                            // we remember the acceptance for the duration of the current navigation session.
                             self_1.placeRouter.navigationSession.rememberAcceptanceOf(component);
                         }
                         else {
@@ -4883,11 +5378,10 @@ var LeavePlaceGuard = /** @class */ (function () {
                             // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
                             if (this.placeRouter.navigationSession.isPopState) {
                                 console.log('cancelled during popstate');
-                                this.angularLocation.go(this.placeRouter.navigationSession.initialUrl);
+                                this.angularLocation.go(this.placeRouter.navigationSession.popStateReturnUrl);
                             }
                         }
                         return [2 /*return*/, canLeave];
-                    case 3: return [2 /*return*/, true];
                 }
             });
         });
@@ -4915,306 +5409,278 @@ if (false) {
      */
     LeavePlaceGuard.prototype.router;
     /**
-     * @type {?}
-     * @private
-     */
-    LeavePlaceGuard.prototype.injector;
-    /**
-     * @type {?}
-     * @private
-     */
-    LeavePlaceGuard.prototype.placeRouter;
-    /** @type {?} */
-    LeavePlaceGuard.prototype.interactionContext;
-    /** @type {?} */
-    LeavePlaceGuard.prototype.angularLocation;
-}
-
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-var PlaceRouteGuard = /** @class */ (function () {
-    function PlaceRouteGuard(placeRouter, injector) {
-        this.placeRouter = placeRouter;
-        this.injector = injector;
-    }
-    /**
-     * @param {?} activatedRoute
-     * @param {?} state
-     * @return {?}
-     */
-    PlaceRouteGuard.prototype.canActivate = /**
-     * @param {?} activatedRoute
-     * @param {?} state
-     * @return {?}
-     */
-    function (activatedRoute, state) {
-        var _this = this;
-        if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {
-            /** @type {?} */
-            var placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);
-            /** @type {?} */
-            var snapshot_1 = ParameterSnapshot.create(placeDefinition, activatedRoute.paramMap, activatedRoute.url);
-            return snapshot_1.sanitise(this.injector).then((/**
-             * @param {?} sanitised
-             * @return {?}
-             */
-            function (sanitised) {
-                Logger.get(_this).info("ParameterSnapshot.sanitise ->", sanitised.getAllParameters());
-                if (sanitised.hasChanged(snapshot_1, true)) {
-                    return _this.placeRouter.getRedirectUrlTree(activatedRoute, sanitised);
-                }
-                else {
-                    return true;
-                }
-            }));
-        }
-        else {
-            return lang.illegalState("expected component to be an instance of PlaceComponent, got " + activatedRoute.component);
-        }
-    };
-    PlaceRouteGuard.decorators = [
-        { type: Injectable, args: [{
-                    providedIn: 'root'
-                },] }
-    ];
-    /** @nocollapse */
-    PlaceRouteGuard.ctorParameters = function () { return [
-        { type: PlaceRouter },
-        { type: Injector }
-    ]; };
-    /** @nocollapse */ PlaceRouteGuard.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceRouteGuard_Factory() { return new PlaceRouteGuard(ɵɵinject(PlaceRouter), ɵɵinject(INJECTOR)); }, token: PlaceRouteGuard, providedIn: "root" });
-    return PlaceRouteGuard;
-}());
-if (false) {
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouteGuard.prototype.placeRouter;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouteGuard.prototype.injector;
-}
-
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/**
- * @record
- */
-function JsonArray() { }
-/**
- * @record
- */
-function JsonMap() { }
-
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/**
- * @record
- * @template T
- */
-function ParameterOptions() { }
-if (false) {
-    /** @type {?|undefined} */
-    ParameterOptions.prototype.as;
-    /** @type {?|undefined} */
-    ParameterOptions.prototype.optional;
-    /** @type {?|undefined} */
-    ParameterOptions.prototype.remember;
-    /** @type {?|undefined} */
-    ParameterOptions.prototype.defaultValue;
-}
-/**
- * @record
- * @template T
- */
-function ListParameterOptions() { }
-if (false) {
-    /** @type {?|undefined} */
-    ListParameterOptions.prototype.as;
-    /** @type {?|undefined} */
-    ListParameterOptions.prototype.optional;
-    /** @type {?|undefined} */
-    ListParameterOptions.prototype.remember;
-    /** @type {?|undefined} */
-    ListParameterOptions.prototype.defaultValue;
-}
-/**
- * @template T
- * @param {?} type
- * @param {?=} options
- * @return {?}
- */
-function RouteId(type, options) {
-    return (/**
-     * @param {?} prototype
-     * @param {?} propertyKey
-     * @return {?}
-     */
-    function (prototype, propertyKey) {
-        /** @type {?} */
-        var param = new ParameterDefinition.RouteId(propertyKey.toString(), type, options);
-        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
-        UseDelegate()(prototype, propertyKey);
-    });
-}
-/**
- * @template T
- * @param {?} type
- * @param {?=} options
- * @return {?}
- */
-function RouteParameter(type, options) {
-    return (/**
-     * @param {?} prototype
-     * @param {?} propertyKey
-     * @return {?}
+     * @type {?}
+     * @private
      */
-    function (prototype, propertyKey) {
-        /** @type {?} */
-        var param = new ParameterDefinition.ValueParameter(propertyKey.toString(), type, options);
-        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
-        UseDelegate()(prototype, propertyKey);
-    });
-}
-/**
- * @template E
- * @param {?} elementType
- * @param {?=} options
- * @return {?}
- */
-function RouteParameterList(elementType, options) {
-    return (/**
-     * @param {?} prototype
-     * @param {?} propertyKey
-     * @return {?}
+    LeavePlaceGuard.prototype.injector;
+    /**
+     * @type {?}
+     * @private
      */
-    function (prototype, propertyKey) {
-        /** @type {?} */
-        var param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), elementType, options);
-        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
-        UseDelegate()(prototype, propertyKey);
-    });
+    LeavePlaceGuard.prototype.placeRouter;
+    /** @type {?} */
+    LeavePlaceGuard.prototype.interactionContext;
+    /** @type {?} */
+    LeavePlaceGuard.prototype.angularLocation;
 }
 
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
-/**
- * @record
- * @template S
- */
-function ParameterSanitiser() { }
-if (false) {
+var PlaceRouteGuard = /** @class */ (function () {
+    function PlaceRouteGuard(router, placeRouter, placeHistory, injector) {
+        this.router = router;
+        this.placeRouter = placeRouter;
+        this.placeHistory = placeHistory;
+        this.injector = injector;
+    }
+    // @Trace()
+    // @Trace()
     /**
-     * @param {?} paramter
-     * @param {?=} visit
+     * @param {?} activatedRoute
+     * @param {?} state
+     * @return {?}
+     */
+    PlaceRouteGuard.prototype.canActivate = 
+    // @Trace()
+    /**
+     * @param {?} activatedRoute
+     * @param {?} state
      * @return {?}
      */
-    ParameterSanitiser.prototype.sanitise = function (paramter, visit) { };
+    function (activatedRoute, state) {
+        return __awaiter(this, void 0, void 0, function () {
+            var placeDefinition, params, parsedParams, initialVisit, sanitiser, updatedVisit, parameterCommands, commands;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) return [3 /*break*/, 2];
+                        placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);
+                        // Parse our route params.
+                        params = new PlaceRouteGuard.ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);
+                        parsedParams = placeDefinition.parseRouteParams(params);
+                        initialVisit = this.placeRouter.navigationSession.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);
+                        sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
+                        return [4 /*yield*/, sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams))];
+                    case 1:
+                        updatedVisit = _a.sent();
+                        // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters
+                        this.placeRouter.navigationSession.storeVisit(updatedVisit);
+                        if (initialVisit.hasRoutingChangedFrom(updatedVisit)) {
+                            parameterCommands = updatedVisit.hasRouteId() ?
+                                [placeDefinition.getFormattedRouteId(updatedVisit), placeDefinition.getFormattedRouteParameters(updatedVisit)] :
+                                [placeDefinition.getFormattedRouteParameters(updatedVisit)];
+                            commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.getChildPath(activatedRoute));
+                            console.log('##### Redirect', commands);
+                            return [2 /*return*/, this.router.createUrlTree(commands, {
+                                    replaceUrl: true,
+                                    skipLocationChange: false
+                                })];
+                        }
+                        else {
+                            return [2 /*return*/, true];
+                        }
+                        return [3 /*break*/, 3];
+                    case 2: return [2 /*return*/, lang.illegalState("expected component to be an instance of PlaceComponent, got " + activatedRoute.component)];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    PlaceRouteGuard.decorators = [
+        { type: Injectable, args: [{
+                    providedIn: 'root'
+                },] }
+    ];
+    /** @nocollapse */
+    PlaceRouteGuard.ctorParameters = function () { return [
+        { type: Router },
+        { type: PlaceRouter },
+        { type: PlaceHistory },
+        { type: Injector }
+    ]; };
+    /** @nocollapse */ PlaceRouteGuard.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceRouteGuard_Factory() { return new PlaceRouteGuard(ɵɵinject(Router), ɵɵinject(PlaceRouter), ɵɵinject(PlaceHistory), ɵɵinject(INJECTOR)); }, token: PlaceRouteGuard, providedIn: "root" });
+    return PlaceRouteGuard;
+}());
+if (false) {
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceRouteGuard.prototype.router;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceRouteGuard.prototype.placeRouter;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceRouteGuard.prototype.placeHistory;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceRouteGuard.prototype.injector;
 }
-
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-// WARNING: interface has both a type and a value, skipping emit
-var ParameterType;
-(function (ParameterType) {
-    var StringType = /** @class */ (function () {
-        function StringType() {
+(function (PlaceRouteGuard) {
+    /**
+     * This a work around for the fact that an activated route with multiple segments doesn't
+     * include the segment params in the paramMap as well as each segment returns an empty
+     * param map even when `parameter`s has content.
+     */
+    var ConsolidatedParameterMap = /** @class */ (function () {
+        function ConsolidatedParameterMap(paramMap, urlSegments) {
+            this.paramMaps = [paramMap].concat((urlSegments || []).map((/**
+             * @param {?} s
+             * @return {?}
+             */
+            function (s) { return new ParamMapAdapter(s.parameters); }))).filter((/**
+             * @param {?} m
+             * @return {?}
+             */
+            function (m) { return !!m; })); // the activated route param map can be null
         }
         /**
-         * @param {?} value
+         * @param {?} name
          * @return {?}
          */
-        StringType.prototype.format = /**
-         * @param {?} value
+        ConsolidatedParameterMap.prototype.get = /**
+         * @param {?} name
          * @return {?}
          */
-        function (value) {
-            return value;
+        function (name) {
+            /** @type {?} */
+            var paramMap = this.paramMaps.find((/**
+             * @param {?} m
+             * @return {?}
+             */
+            function (m) { return m.has(name); }));
+            return paramMap.get(name);
         };
         /**
-         * @param {?} value
+         * @param {?} name
          * @return {?}
          */
-        StringType.prototype.parse = /**
-         * @param {?} value
+        ConsolidatedParameterMap.prototype.getAll = /**
+         * @param {?} name
          * @return {?}
          */
-        function (value) {
-            return value;
+        function (name) {
+            /** @type {?} */
+            var paramMap = this.paramMaps.find((/**
+             * @param {?} m
+             * @return {?}
+             */
+            function (m) { return m.has(name); }));
+            return paramMap.getAll(name);
         };
-        return StringType;
-    }());
-    var NumberType = /** @class */ (function () {
-        function NumberType() {
-        }
         /**
-         * @param {?} value
+         * @param {?} name
          * @return {?}
          */
-        NumberType.prototype.format = /**
-         * @param {?} value
+        ConsolidatedParameterMap.prototype.has = /**
+         * @param {?} name
          * @return {?}
          */
-        function (value) {
-            return "" + value;
+        function (name) {
+            return !!this.paramMaps.find((/**
+             * @param {?} m
+             * @return {?}
+             */
+            function (m) { return m.has(name); }));
         };
+        Object.defineProperty(ConsolidatedParameterMap.prototype, "keys", {
+            get: /**
+             * @return {?}
+             */
+            function () {
+                return this.paramMaps.reduce((/**
+                 * @param {?} result
+                 * @param {?} params
+                 * @return {?}
+                 */
+                function (result, params) { return result.concat(params.keys); }), []);
+            },
+            enumerable: true,
+            configurable: true
+        });
+        __decorate([
+            Memoize(),
+            __metadata("design:type", Array),
+            __metadata("design:paramtypes", [])
+        ], ConsolidatedParameterMap.prototype, "keys", null);
+        return ConsolidatedParameterMap;
+    }());
+    PlaceRouteGuard.ConsolidatedParameterMap = ConsolidatedParameterMap;
+    if (false) {
         /**
-         * @param {?} value
+         * @type {?}
+         * @private
+         */
+        ConsolidatedParameterMap.prototype.paramMaps;
+    }
+    var ParamMapAdapter = /** @class */ (function () {
+        function ParamMapAdapter(params) {
+            this.params = params;
+        }
+        /**
+         * @param {?} name
          * @return {?}
          */
-        NumberType.prototype.parse = /**
-         * @param {?} value
+        ParamMapAdapter.prototype.get = /**
+         * @param {?} name
          * @return {?}
          */
-        function (value) {
-            return ___default.isNil(value) || ___default.isEmpty(value) ? null : +value;
+        function (name) {
+            return this.params[name];
         };
-        return NumberType;
-    }());
-    var BooleanType = /** @class */ (function () {
-        function BooleanType() {
-        }
         /**
-         * @param {?} value
+         * @param {?} name
          * @return {?}
          */
-        BooleanType.prototype.format = /**
-         * @param {?} value
+        ParamMapAdapter.prototype.getAll = /**
+         * @param {?} name
          * @return {?}
          */
-        function (value) {
-            return value ? 'true' : 'false';
+        function (name) {
+            /** @type {?} */
+            var value = this.get(name);
+            return Array.isArray(value) ? value : [value];
         };
         /**
-         * @param {?} value
+         * @param {?} name
          * @return {?}
          */
-        BooleanType.prototype.parse = /**
-         * @param {?} value
+        ParamMapAdapter.prototype.has = /**
+         * @param {?} name
          * @return {?}
          */
-        function (value) {
-            return value === 'true';
+        function (name) {
+            return this.keys.includes(name);
         };
-        return BooleanType;
+        Object.defineProperty(ParamMapAdapter.prototype, "keys", {
+            get: /**
+             * @return {?}
+             */
+            function () {
+                return Object.keys(this.params);
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return ParamMapAdapter;
     }());
-    ParameterType.STRING = new StringType();
-    ParameterType.NUMBER = new NumberType();
-    ParameterType.BOOLEAN = new BooleanType();
-})(ParameterType || (ParameterType = {}));
+    if (false) {
+        /**
+         * @type {?}
+         * @private
+         */
+        ParamMapAdapter.prototype.params;
+    }
+})(PlaceRouteGuard || (PlaceRouteGuard = {}));
 
 /**
  * @fileoverview added by tsickle
@@ -5236,5 +5702,5 @@ var ParameterType;
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 
-export { ACTIVITY_DATA, AbstractActivity, AbstractInputComponent, AbstractPlaceNavigationComponent, Activity, ActivityContainerComponent, ActivityOutletComponent, AlertDialogComponent, AngularUiPowerupsModule, Bounds, BusyOverlayComponent, CloseInteractionGuard, CommandDirective, ConfirmThenDialogComponent, ConfirmationDialogComponent, DEFINITION_META_DATA_KEY, DIALOG_INTERACTION_SERVICE_DEFAULTS, DialogInteractionService, Dimension, DisposableComponent, EmptyStateComponent, FocusBindingDirective, InteractionContext, InteractionModule, LEFT_RIGHT_PLACE_ANIMATION, LeavePlaceGuard, ListPlaceNavComponent, NumberInputComponent, ParameterDefinition, ParameterSnapshot, ParameterType, PasswordInputComponent, Place, PlaceComponent, PlaceDefinition, PlaceHistory, PlaceModule, PlaceOutletComponent, PlaceRouteGuard, PlaceRouter, Point, ROUTE_PARAMETER_LIST_KEY, ResizeAwareComponent, RouteId, RouteParameter, RouteParameterList, RouteParameterValue, SelectInputComponent, StringInputComponent, TabbedPlaceNavigationComponent, leftRightPlaceAnimation, slideDownAndUpAnimation, CommandDirective as ɵa, FocusBindingDirective as ɵb, Activity as ɵba, ConfirmThenDialogComponent as ɵbc, AlertDialogComponent as ɵbd, DIALOG_INTERACTION_SERVICE_DEFAULTS as ɵbf, DialogInteractionService as ɵbg, DisposableComponent as ɵc, NumberInputComponent as ɵd, AbstractInputComponent as ɵe, StringInputComponent as ɵf, PasswordInputComponent as ɵg, SelectInputComponent as ɵh, PlaceModule as ɵi, EmptyStateComponent as ɵj, BusyOverlayComponent as ɵk, PlaceOutletComponent as ɵl, leftRightPlaceAnimation as ɵm, LEFT_RIGHT_PLACE_ANIMATION as ɵn, PlaceRouter as ɵo, PlaceHistory as ɵp, TabbedPlaceNavigationComponent as ɵq, AbstractPlaceNavigationComponent as ɵr, ListPlaceNavComponent as ɵs, InteractionModule as ɵt, ActivityContainerComponent as ɵu, InteractionContext as ɵv, ActivityOutletComponent as ɵw, ConfirmationDialogComponent as ɵx, AbstractActivity as ɵy, ACTIVITY_DATA as ɵz };
+export { ACTIVITY_DATA, AbstractActivity, AbstractInputComponent, AbstractPlaceNavigationComponent, Activity, ActivityContainerComponent, ActivityOutletComponent, AlertDialogComponent, AngularUiPowerupsModule, Bounds, BusyOverlayComponent, CommandDirective, ConfirmThenDialogComponent, ConfirmationDialogComponent, DEFINITION_META_DATA_KEY, DIALOG_INTERACTION_SERVICE_DEFAULTS, DialogInteractionService, Dimension, DisposableComponent, EmptyStateComponent, FocusBindingDirective, Formatter, InteractionContext, InteractionGuard, InteractionModule, InteractionOutletComponent, LEFT_RIGHT_PLACE_ANIMATION, LeavePlaceGuard, ListPlaceNavComponent, NavigationSession, NoopComponent, NumberInputComponent, ParameterDefinition, PasswordInputComponent, Place, PlaceComponent, PlaceDefinition, PlaceHistory, PlaceModule, PlaceOutletComponent, PlaceRouteGuard, PlaceRouter, Point, ROUTE_PARAMETER_LIST_KEY, ResizeAwareComponent, RouteId, SelectInputComponent, StringInputComponent, TabbedPlaceNavigationComponent, Visit, VisitParameter, VisitParameterList, VisitSanitiser, leftRightPlaceAnimation, slideDownAndUpAnimation, CommandDirective as ɵa, FocusBindingDirective as ɵb, ACTIVITY_DATA as ɵba, Activity as ɵbb, ConfirmThenDialogComponent as ɵbd, AlertDialogComponent as ɵbe, InteractionOutletComponent as ɵbg, DIALOG_INTERACTION_SERVICE_DEFAULTS as ɵbh, DialogInteractionService as ɵbi, DisposableComponent as ɵc, NumberInputComponent as ɵd, AbstractInputComponent as ɵe, StringInputComponent as ɵf, PasswordInputComponent as ɵg, SelectInputComponent as ɵh, NoopComponent as ɵi, PlaceModule as ɵj, EmptyStateComponent as ɵk, BusyOverlayComponent as ɵl, PlaceOutletComponent as ɵm, leftRightPlaceAnimation as ɵn, LEFT_RIGHT_PLACE_ANIMATION as ɵo, PlaceRouter as ɵp, PlaceHistory as ɵq, TabbedPlaceNavigationComponent as ɵr, AbstractPlaceNavigationComponent as ɵs, ListPlaceNavComponent as ɵt, InteractionModule as ɵu, ActivityContainerComponent as ɵv, InteractionContext as ɵw, ActivityOutletComponent as ɵx, ConfirmationDialogComponent as ɵy, AbstractActivity as ɵz };
 //# sourceMappingURL=coolon-angular-ui-powerups.js.map