@coolon/angular-ui-powerups 0.0.51 → 0.0.54

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

@@ -4,8 +4,8 @@ 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, __values } from 'tslib';
-import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, EventListenerList, DelegatingValueModel, MutableListModel, StoreInValueModel, Binding, MutableValueModel, Guard, OptionsHelper, ValueHolder } from '@coolon/pectin';
+import { __extends, __decorate, __metadata, __assign, __awaiter, __generator } from 'tslib';
+import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, EventListenerList, DelegatingValueModel, MutableListModel, StoreInValueModel, Binding, Trace, MutableValueModel, Guard, OptionsHelper, ValueHolder } from '@coolon/pectin';
 import { PortalModule } from '@angular/cdk/portal';
 import { Deferred } from '@coolon/pectin/lib/promise/deferred.class';
 import { assert as assert$1, Klass, Opts } from '@coolon/typescript-utilities';
@@ -2494,62 +2494,30 @@ if (false) {
             this.placeHistory = placeHistory;
         }
         /**
-         * @param {?} parameterDef
-         * @param {?} value
+         * @param {?} parameter
          * @param {?=} visit
          * @return {?}
          */
         DefaultParameterSanitiser.prototype.sanitise = /**
-         * @param {?} parameterDef
-         * @param {?} value
+         * @param {?} parameter
          * @param {?=} visit
          * @return {?}
          */
-        function (parameterDef, value, visit) {
-            var _this = this;
-            if (this.isBlank(parameterDef, value)) {
-                if (this.remember) {
-                    /** @type {?} */
-                    var visits = this.placeHistory.getHistory(visit.placeDefinition);
-                    value = visits.map((/**
-                     * @param {?} v
-                     * @return {?}
-                     */
-                    function (v) { return v.getValueOf(parameterDef); }))
-                        .filter((/**
-                     * @param {?} v
-                     * @return {?}
-                     */
-                    function (v) { return !___default.isNil(v); }))
-                        .find((/**
-                     * @param {?} v
-                     * @return {?}
-                     */
-                    function (v) { return !_this.isBlank(parameterDef, v); }));
+        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 this.isBlank(parameterDef, value) ? this.defaultValue : value;
+                return parameter.isEmptyValue(value) ? this.defaultValue : value;
             }
             else {
                 return value;
             }
         };
-        /**
-         * @private
-         * @param {?} def
-         * @param {?} value
-         * @return {?}
-         */
-        DefaultParameterSanitiser.prototype.isBlank = /**
-         * @private
-         * @param {?} def
-         * @param {?} value
-         * @return {?}
-         */
-        function (def, value) {
-            /** @type {?} */
-            var isNil = ___default.isNil(value);
-            return isNil ? true : def.isArray ? value['length'] < 1 : false;
-        };
         return DefaultParameterSanitiser;
     }());
     ParameterDefinition.DefaultParameterSanitiser = DefaultParameterSanitiser;
@@ -2563,14 +2531,315 @@ if (false) {
     }
 })(ParameterDefinition || (ParameterDefinition = {}));
 
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+/**
+ * @abstract
+ * @template S, T, R
+ */
+var  /**
+ * @abstract
+ * @template S, T, R
+ */
+RouteParameterValue = /** @class */ (function () {
+    function RouteParameterValue(definition, rawValue) {
+        this.definition = definition;
+        this.rawValue = rawValue;
+    }
+    /**
+     * @return {?}
+     */
+    RouteParameterValue.prototype.isRouteId = /**
+     * @return {?}
+     */
+    function () {
+        return this.definition.isRouteId;
+    };
+    /**
+     * @param {?} otherValue
+     * @return {?}
+     */
+    RouteParameterValue.prototype.hasChanged = /**
+     * @param {?} otherValue
+     * @return {?}
+     */
+    function (otherValue) {
+        return this.isEmpty() ?
+            !this.isEmptyValue(otherValue) :
+            this.isEmptyValue(otherValue) || !this.isSameValue(otherValue);
+    };
+    /**
+     * Return's true if the current value is empty.
+     */
+    /**
+     * Return's true if the current value is empty.
+     * @return {?}
+     */
+    RouteParameterValue.prototype.isEmpty = /**
+     * Return's true if the current value is empty.
+     * @return {?}
+     */
+    function () {
+        return this.isEmptyValue(this.value);
+    };
+    /**
+     * Returns true if the rawValue is undefined.  This
+     */
+    /**
+     * Returns true if the rawValue is undefined.  This
+     * @return {?}
+     */
+    RouteParameterValue.prototype.isMissing = /**
+     * Returns true if the rawValue is undefined.  This
+     * @return {?}
+     */
+    function () {
+        return ___default.isUndefined(this.rawValue);
+    };
+    /**
+     * @param {?} visit
+     * @param {?} injector
+     * @return {?}
+     */
+    RouteParameterValue.prototype.sanitise = /**
+     * @param {?} visit
+     * @param {?} injector
+     * @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*/];
+            });
+        });
+    };
+    return RouteParameterValue;
+}());
+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 {?}
+     */
+    RouteParameterValue.prototype.formattedValue = function () { };
+    /**
+     * @abstract
+     * @param {?} value
+     * @return {?}
+     */
+    RouteParameterValue.prototype.replace = function (value) { };
+    /**
+     * @abstract
+     * @param {?} value
+     * @return {?}
+     */
+    RouteParameterValue.prototype.isEmptyValue = function (value) { };
+}
+(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
+        return def.isArray ?
+            new RouteParameterValue.Array(def, paramMap.has(def.name) ? paramMap.getAll(def.name) : undefined) :
+            new RouteParameterValue.Scalar(def, paramMap.has(def.name) ? paramMap.get(def.name) : undefined);
+    }
+    RouteParameterValue.create = create;
+    /**
+     * @template T
+     */
+    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;
+    /**
+     * @template T
+     */
+    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 = {}));
+
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 var ParameterSnapshot = /** @class */ (function () {
-    function ParameterSnapshot(placeDefinition, resolved) {
+    function ParameterSnapshot(placeDefinition, parameters) {
         this.placeDefinition = placeDefinition;
-        this.resolved = resolved;
+        this.parameters = parameters;
     }
     /**
      * @param {?} other
@@ -2585,18 +2854,18 @@ var ParameterSnapshot = /** @class */ (function () {
     function (other, debug) {
         if (debug === void 0) { debug = false; }
         /** @type {?} */
-        var changed = this.resolved.find((/**
+        var changed = this.parameters.find((/**
          * @param {?} r
          * @return {?}
          */
         function (r) {
-            return !r.isSame(other.getValueOf(r.parameterDef));
+            return r.hasChanged(other.getValueOf(r.definition));
         }));
         if (changed && debug) {
             console.log({
-                name: changed.parameterDef.name,
+                name: changed.definition.name,
                 mine: changed.value,
-                theirs: other.getValueOf(changed.parameterDef)
+                theirs: other.getValueOf(changed.definition)
             });
         }
         return !!changed;
@@ -2612,11 +2881,11 @@ var ParameterSnapshot = /** @class */ (function () {
      * @return {?}
      */
     function (parameterDef) {
-        return this.resolved.find((/**
+        return this.parameters.find((/**
          * @param {?} r
          * @return {?}
          */
-        function (r) { return r.parameterDef === parameterDef; }));
+        function (r) { return r.definition === parameterDef; }));
     };
     /**
      * @template T, S
@@ -2652,11 +2921,11 @@ var ParameterSnapshot = /** @class */ (function () {
      */
     function (name) {
         /** @type {?} */
-        var resolvedParameter = this.resolved.find((/**
+        var resolvedParameter = this.parameters.find((/**
          * @param {?} r
          * @return {?}
          */
-        function (r) { return r.parameterDef.name === name; }));
+        function (r) { return r.definition.name === name; }));
         return resolvedParameter ? resolvedParameter.value : null;
     };
     /**
@@ -2670,11 +2939,11 @@ var ParameterSnapshot = /** @class */ (function () {
     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.resolved.find((/**
+        return (/** @type {?} */ (this.parameters.find((/**
          * @param {?} p
          * @return {?}
          */
-        function (p) { return p.parameterDef.isRouteId; }))));
+        function (p) { return p.definition.isRouteId; }))));
     };
     /**
      * @private
@@ -2685,11 +2954,11 @@ var ParameterSnapshot = /** @class */ (function () {
      * @return {?}
      */
     function () {
-        return this.resolved.filter((/**
+        return this.parameters.filter((/**
          * @param {?} r
          * @return {?}
          */
-        function (r) { return !r.parameterDef.isRouteId; }));
+        function (r) { return !r.definition.isRouteId; }));
     };
     /**
      * @return {?}
@@ -2714,43 +2983,37 @@ var ParameterSnapshot = /** @class */ (function () {
     /**
      * @return {?}
      */
-    ParameterSnapshot.prototype.getFormattedParameters = /**
+    ParameterSnapshot.prototype.getNonEmptyParameters = /**
      * @return {?}
      */
     function () {
-        /** @type {?} */
-        var params = {};
-        /** @type {?} */
-        var routeIdParam = this.resolved.filter((/**
-         * @param {?} p
-         * @return {?}
-         */
-        function (p) { return !p.parameterDef.isRouteId; })).forEach((/**
+        return this.parameters.filter((/**
          * @param {?} p
          * @return {?}
          */
-        function (p) {
-            params[p.parameterDef.name] = p.formattedValue();
-        }));
-        return params;
+        function (p) { return !p.isEmpty(); }));
     };
     /**
      * @return {?}
      */
-    ParameterSnapshot.prototype.getAllFormattedParameters = /**
+    ParameterSnapshot.prototype.getFormattedParameters = /**
      * @return {?}
      */
     function () {
         /** @type {?} */
         var params = {};
         /** @type {?} */
-        var routeIdParam = this.resolved.forEach((/**
+        var routeIdParam = this.getNonEmptyParameters()
+            .filter((/**
          * @param {?} p
          * @return {?}
          */
-        function (p) {
-            params[p.parameterDef.name] = p.formattedValue();
-        }));
+        function (p) { return !p.definition.isRouteId; }))
+            .forEach((/**
+         * @param {?} p
+         * @return {?}
+         */
+        function (p) { return params[p.definition.name] = p.formattedValue(); }));
         return params;
     };
     /**
@@ -2763,12 +3026,12 @@ var ParameterSnapshot = /** @class */ (function () {
         /** @type {?} */
         var params = {};
         /** @type {?} */
-        var routeIdParam = this.resolved.forEach((/**
+        var routeIdParam = this.parameters.forEach((/**
          * @param {?} p
          * @return {?}
          */
         function (p) {
-            params[p.parameterDef.name] = p.value;
+            params[p.definition.name] = p.value;
         }));
         return params;
     };
@@ -2785,12 +3048,12 @@ var ParameterSnapshot = /** @class */ (function () {
      * @return {?}
      */
     function (parameter, value) {
-        return new ParameterSnapshot(this.placeDefinition, this.resolved.map((/**
+        return new ParameterSnapshot(this.placeDefinition, this.parameters.map((/**
          * @param {?} p
          * @return {?}
          */
         function (p) {
-            return p.parameterDef === parameter ? p.replace(value) : p;
+            return p.definition === parameter ? p.replace(value) : p;
         })));
     };
     /**
@@ -2812,10 +3075,10 @@ var ParameterSnapshot = /** @class */ (function () {
                         return [4 /*yield*/, routeId.sanitise(this, injector)];
                     case 1:
                         sanitisedValue = _a.sent();
-                        if (!routeId.isSame(sanitisedValue)) {
+                        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.parameterDef, sanitisedValue)];
+                            return [2 /*return*/, this.replace(routeId.definition, sanitisedValue)];
                         }
                         _a.label = 2;
                     case 2:
@@ -2829,8 +3092,8 @@ var ParameterSnapshot = /** @class */ (function () {
                         return [4 /*yield*/, routeParameter.sanitise(this, injector)];
                     case 4:
                         sanitisedValue = _a.sent();
-                        if (!routeParameter.isSame(sanitisedValue)) {
-                            result = result.replace(routeParameter.parameterDef, sanitisedValue);
+                        if (routeParameter.hasChanged(sanitisedValue)) {
+                            result = result.replace(routeParameter.definition, sanitisedValue);
                         }
                         _a.label = 5;
                     case 5:
@@ -2846,7 +3109,7 @@ var ParameterSnapshot = /** @class */ (function () {
         Memoize$1(),
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [ParameterDefinition]),
-        __metadata("design:returntype", ParameterSnapshot.ResolvedParameter)
+        __metadata("design:returntype", RouteParameterValue)
     ], ParameterSnapshot.prototype, "getParameter", null);
     __decorate([
         Memoize$1(),
@@ -2864,7 +3127,7 @@ var ParameterSnapshot = /** @class */ (function () {
         Memoize$1(),
         __metadata("design:type", Function),
         __metadata("design:paramtypes", []),
-        __metadata("design:returntype", ParameterSnapshot.ResolvedValueParameter)
+        __metadata("design:returntype", RouteParameterValue.Scalar)
     ], ParameterSnapshot.prototype, "getRouteIdParameter", null);
     __decorate([
         Memoize$1(),
@@ -2872,6 +3135,12 @@ var ParameterSnapshot = /** @class */ (function () {
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", Array)
     ], ParameterSnapshot.prototype, "getRouteParameters", null);
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], ParameterSnapshot.prototype, "getFormattedParameters", null);
     return ParameterSnapshot;
 }());
 if (false) {
@@ -2881,7 +3150,7 @@ if (false) {
      * @type {?}
      * @private
      */
-    ParameterSnapshot.prototype.resolved;
+    ParameterSnapshot.prototype.parameters;
 }
 (function (ParameterSnapshot) {
     /**
@@ -2894,31 +3163,11 @@ if (false) {
         /** @type {?} */
         var paramMap = new ConsolidatedParameterMap(params, urlSegments);
         /** @type {?} */
-        var resolvedParameters = placeDef.getRouteParameters()
-            .map((/**
+        var resolvedParameters = placeDef.getRouteParameters().map((/**
          * @param {?} def
          * @return {?}
          */
-        function (def) {
-            if (def.isArray) {
-                /** @type {?} */
-                var value = paramMap.has(def.name) ? paramMap.getAll(def.name).filter((/**
-                 * @param {?} s
-                 * @return {?}
-                 */
-                function (s) { return !___default.isEmpty(s); })).map((/**
-                 * @param {?} raw
-                 * @return {?}
-                 */
-                function (raw) { return def.type.parse(raw); })) : null;
-                return new ResolvedArrayParameter(def, value);
-            }
-            else {
-                /** @type {?} */
-                var value = paramMap.has(def.name) ? def.type.parse(paramMap.get(def.name)) : null;
-                return new ResolvedValueParameter(def, value);
-            }
-        }));
+        function (def) { return RouteParameterValue.create(def, paramMap); }));
         return new ParameterSnapshot(placeDef, resolvedParameters);
     }
     ParameterSnapshot.create = create;
@@ -2927,12 +3176,7 @@ if (false) {
      * include the segment params in the paramMap as well as each segment returns an empty
      * param map even when `parameter`s has content.
      */
-    var /**
-     * 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.
-     */
-    ConsolidatedParameterMap = /** @class */ (function () {
+    var ConsolidatedParameterMap = /** @class */ (function () {
         function ConsolidatedParameterMap(paramMap, urlSegments) {
             this.paramMaps = [paramMap].concat((urlSegments || []).map((/**
              * @param {?} s
@@ -2989,6 +3233,26 @@ if (false) {
              */
             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) {
@@ -3056,207 +3320,6 @@ if (false) {
          */
         ParamMapAdapter.prototype.params;
     }
-    /**
-     * @abstract
-     * @template T, S
-     */
-    var /**
-     * @abstract
-     * @template T, S
-     */
-    ResolvedParameter = /** @class */ (function () {
-        function ResolvedParameter(parameterDef, value) {
-            this.parameterDef = parameterDef;
-            this.value = value;
-        }
-        /**
-         * @return {?}
-         */
-        ResolvedParameter.prototype.isRouteId = /**
-         * @return {?}
-         */
-        function () {
-            return this.parameterDef.isRouteId;
-        };
-        /**
-         * @param {?} visit
-         * @param {?} injector
-         * @return {?}
-         */
-        ResolvedParameter.prototype.sanitise = /**
-         * @param {?} visit
-         * @param {?} injector
-         * @return {?}
-         */
-        function (visit, injector) {
-            return __awaiter(this, void 0, void 0, function () {
-                var sanitiser;
-                return __generator(this, function (_a) {
-                    sanitiser = this.parameterDef.getSanitiser(injector);
-                    if (sanitiser) {
-                        return [2 /*return*/, sanitiser.sanitise(this.parameterDef, this.value, visit)];
-                    }
-                    else {
-                        return [2 /*return*/, this.value];
-                    }
-                    return [2 /*return*/];
-                });
-            });
-        };
-        return ResolvedParameter;
-    }());
-    ParameterSnapshot.ResolvedParameter = ResolvedParameter;
-    if (false) {
-        /** @type {?} */
-        ResolvedParameter.prototype.parameterDef;
-        /** @type {?} */
-        ResolvedParameter.prototype.value;
-        /**
-         * @abstract
-         * @param {?} dest
-         * @return {?}
-         */
-        ResolvedParameter.prototype.injectRouteParam = function (dest) { };
-        /**
-         * @abstract
-         * @param {?} otherValue
-         * @return {?}
-         */
-        ResolvedParameter.prototype.isSame = function (otherValue) { };
-        /**
-         * @abstract
-         * @return {?}
-         */
-        ResolvedParameter.prototype.formattedValue = function () { };
-        /**
-         * @abstract
-         * @param {?} value
-         * @return {?}
-         */
-        ResolvedParameter.prototype.replace = function (value) { };
-    }
-    /**
-     * @template T
-     */
-    var /**
-     * @template T
-     */
-    ResolvedValueParameter = /** @class */ (function (_super) {
-        __extends(ResolvedValueParameter, _super);
-        function ResolvedValueParameter() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        /**
-         * @param {?} otherValue
-         * @return {?}
-         */
-        ResolvedValueParameter.prototype.isSame = /**
-         * @param {?} otherValue
-         * @return {?}
-         */
-        function (otherValue) {
-            return this.value === otherValue;
-        };
-        /**
-         * @param {?} dest
-         * @return {?}
-         */
-        ResolvedValueParameter.prototype.injectRouteParam = /**
-         * @param {?} dest
-         * @return {?}
-         */
-        function (dest) {
-            dest[this.parameterDef.name] = this.parameterDef.type.format(this.value);
-        };
-        /**
-         * @param {?} value
-         * @return {?}
-         */
-        ResolvedValueParameter.prototype.replace = /**
-         * @param {?} value
-         * @return {?}
-         */
-        function (value) {
-            return new ResolvedValueParameter(this.parameterDef, value);
-        };
-        /**
-         * @return {?}
-         */
-        ResolvedValueParameter.prototype.formattedValue = /**
-         * @return {?}
-         */
-        function () {
-            return !___default.isNil(this.value) ? this.parameterDef.type.format(this.value) : null;
-        };
-        return ResolvedValueParameter;
-    }(ResolvedParameter));
-    ParameterSnapshot.ResolvedValueParameter = ResolvedValueParameter;
-    /**
-     * @template T
-     */
-    var /**
-     * @template T
-     */
-    ResolvedArrayParameter = /** @class */ (function (_super) {
-        __extends(ResolvedArrayParameter, _super);
-        function ResolvedArrayParameter() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        /**
-         * @param {?} otherValue
-         * @return {?}
-         */
-        ResolvedArrayParameter.prototype.isSame = /**
-         * @param {?} otherValue
-         * @return {?}
-         */
-        function (otherValue) {
-            return ___default.isEqual(this.value, otherValue);
-        };
-        /**
-         * @param {?} dest
-         * @return {?}
-         */
-        ResolvedArrayParameter.prototype.injectRouteParam = /**
-         * @param {?} dest
-         * @return {?}
-         */
-        function (dest) {
-            var _this = this;
-            dest[this.parameterDef.name] = this.value.map((/**
-             * @param {?} v
-             * @return {?}
-             */
-            function (v) { return _this.parameterDef.type.format(v); }));
-        };
-        /**
-         * @param {?} value
-         * @return {?}
-         */
-        ResolvedArrayParameter.prototype.replace = /**
-         * @param {?} value
-         * @return {?}
-         */
-        function (value) {
-            return new ResolvedArrayParameter(this.parameterDef, value);
-        };
-        /**
-         * @return {?}
-         */
-        ResolvedArrayParameter.prototype.formattedValue = /**
-         * @return {?}
-         */
-        function () {
-            var _this = this;
-            return this.value ? this.value.map((/**
-             * @param {?} v
-             * @return {?}
-             */
-            function (v) { return _this.parameterDef.type.format(v); })) : [];
-        };
-        return ResolvedArrayParameter;
-    }(ResolvedParameter));
-    ParameterSnapshot.ResolvedArrayParameter = ResolvedArrayParameter;
 })(ParameterSnapshot || (ParameterSnapshot = {}));
 
 /**
@@ -3382,8 +3445,8 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
          * @return {?}
          */
         function (next, previous) {
-            _this.pushChangesToRoute(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);
         }), {
             unless: _this.incomingRouteChange
         });
@@ -4255,7 +4318,7 @@ var PlaceRouteGuard = /** @class */ (function () {
              * @return {?}
              */
             function (sanitised) {
-                Logger.get(_this).info("ParameterSnapshot.sanitise result", sanitised.getAllParameters());
+                Logger.get(_this).info("ParameterSnapshot.sanitise ->", sanitised.getAllParameters());
                 if (sanitised.hasChanged(snapshot_1, true)) {
                     return _this.placeRouter.getRedirectUrlTree(activatedRoute, sanitised);
                 }
@@ -4410,12 +4473,11 @@ function RouteParameterList(elementType, options) {
 function ParameterSanitiser() { }
 if (false) {
     /**
-     * @param {?} parameterDef
-     * @param {?} value
+     * @param {?} paramter
      * @param {?=} visit
      * @return {?}
      */
-    ParameterSanitiser.prototype.sanitise = function (parameterDef, value, visit) { };
+    ParameterSanitiser.prototype.sanitise = function (paramter, visit) { };
 }
 
 /**
@@ -4511,431 +4573,6 @@ var ParameterType;
     ParameterType.BOOLEAN = new BooleanType();
 })(ParameterType || (ParameterType = {}));
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/**
- * @template T, S
- */
-var  /**
- * @template T, S
- */
-Sanitiser = /** @class */ (function () {
-    function Sanitiser(parameterDef, snapshot, sanitiser) {
-        this.parameterDef = parameterDef;
-        this.snapshot = snapshot;
-        this.sanitiser = sanitiser;
-    }
-    /**
-     * @return {?}
-     */
-    Sanitiser.prototype.isRouteId = /**
-     * @return {?}
-     */
-    function () {
-        return this.parameterDef.isRouteId;
-    };
-    Object.defineProperty(Sanitiser.prototype, "valueChanged", {
-        get: /**
-         * @return {?}
-         */
-        function () {
-            return !___default.isNil(this.initialValue) && this.hasChanged(this.initialValue, this.sanitisedValue);
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(Sanitiser.prototype, "sanitisedValue", {
-        get: /**
-         * @return {?}
-         */
-        function () {
-            return this._sanitisedValue;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    /**
-     * @protected
-     * @param {?} snapshot
-     * @return {?}
-     */
-    Sanitiser.prototype.readFrom = /**
-     * @protected
-     * @param {?} snapshot
-     * @return {?}
-     */
-    function (snapshot) {
-        return lang.abstractMethod(this.constructor);
-    };
-    /**
-     * @protected
-     * @param {?} initialValue
-     * @param {?} sanitisedValue
-     * @return {?}
-     */
-    Sanitiser.prototype.hasChanged = /**
-     * @protected
-     * @param {?} initialValue
-     * @param {?} sanitisedValue
-     * @return {?}
-     */
-    function (initialValue, sanitisedValue) {
-        return lang.abstractMethod(this.constructor);
-    };
-    /**
-     * @param {?} dest
-     * @return {?}
-     */
-    Sanitiser.prototype.injectRouteParam = /**
-     * @param {?} dest
-     * @return {?}
-     */
-    function (dest) {
-        lang.abstractMethod(this.constructor);
-    };
-    /**
-     * @return {?}
-     */
-    Sanitiser.prototype.sanitize = /**
-     * @return {?}
-     */
-    function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!this.sanitiser) return [3 /*break*/, 2];
-                        this.initialValue = this.readFrom(this.snapshot);
-                        _a = this;
-                        return [4 /*yield*/, this.sanitiser.sanitise(null, this.initialValue)];
-                    case 1:
-                        _a._sanitisedValue = _b.sent();
-                        if (this.initialValue !== this._sanitisedValue) {
-                            return [2 /*return*/, false];
-                        }
-                        _b.label = 2;
-                    case 2: return [2 /*return*/, true];
-                }
-            });
-        });
-    };
-    return Sanitiser;
-}());
-if (false) {
-    /**
-     * @type {?}
-     * @private
-     */
-    Sanitiser.prototype.initialValue;
-    /**
-     * @type {?}
-     * @private
-     */
-    Sanitiser.prototype._sanitisedValue;
-    /** @type {?} */
-    Sanitiser.prototype.parameterDef;
-    /** @type {?} */
-    Sanitiser.prototype.snapshot;
-    /** @type {?} */
-    Sanitiser.prototype.sanitiser;
-}
-var RouteParameterSanitiser = /** @class */ (function () {
-    function RouteParameterSanitiser(parameterDefs, snapshot, injector) {
-        var _this = this;
-        this.parameterDefs = parameterDefs;
-        this.snapshot = snapshot;
-        this.injector = injector;
-        this.parameterSanitisers = [];
-        /** @type {?} */
-        var sanitisers = parameterDefs.map((/**
-         * @param {?} def
-         * @return {?}
-         */
-        function (def) {
-            return def.isArray ?
-                new Sanitiser.Array(def, snapshot, _this.getSanitiser(def)) :
-                new Sanitiser.Value(def, snapshot, _this.getSanitiser(def));
-        }));
-        this.routeIdSanitiser = sanitisers.find((/**
-         * @param {?} p
-         * @return {?}
-         */
-        function (p) { return p.isRouteId(); }));
-        this.parameterSanitisers = sanitisers.filter((/**
-         * @param {?} p
-         * @return {?}
-         */
-        function (p) { return !p.isRouteId(); }));
-    }
-    /**
-     * @return {?}
-     */
-    RouteParameterSanitiser.prototype.sanitise = /**
-     * @return {?}
-     */
-    function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var e_1, _a, _b, _c, sanitiser, e_1_1;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        if (!this.routeIdSanitiser) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.routeIdSanitiser.sanitize()];
-                    case 1:
-                        _d.sent();
-                        if (this.routeIdSanitiser.valueChanged) {
-                            // if the route id isn't ok we redirect immediately as the query params may need to be sanitised in the
-                            // context of the route id.
-                            return [2 /*return*/, false];
-                        }
-                        _d.label = 2;
-                    case 2:
-                        _d.trys.push([2, 7, 8, 9]);
-                        _b = __values(this.parameterSanitisers), _c = _b.next();
-                        _d.label = 3;
-                    case 3:
-                        if (!!_c.done) return [3 /*break*/, 6];
-                        sanitiser = _c.value;
-                        return [4 /*yield*/, sanitiser.sanitize()];
-                    case 4:
-                        _d.sent();
-                        _d.label = 5;
-                    case 5:
-                        _c = _b.next();
-                        return [3 /*break*/, 3];
-                    case 6: return [3 /*break*/, 9];
-                    case 7:
-                        e_1_1 = _d.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 9];
-                    case 8:
-                        try {
-                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                        return [7 /*endfinally*/];
-                    case 9: return [2 /*return*/, !this.parameterSanitisers.find((/**
-                         * @param {?} s
-                         * @return {?}
-                         */
-                        function (s) { return s.valueChanged; }))];
-                }
-            });
-        });
-    };
-    /**
-     * @private
-     * @template T, S
-     * @param {?} def
-     * @return {?}
-     */
-    RouteParameterSanitiser.prototype.getSanitiser = /**
-     * @private
-     * @template T, S
-     * @param {?} def
-     * @return {?}
-     */
-    function (def) {
-        return def.getSanitiser(this.injector);
-    };
-    /**
-     * @return {?}
-     */
-    RouteParameterSanitiser.prototype.routeIdHasChanged = /**
-     * @return {?}
-     */
-    function () {
-        assert.isTruthy(this.parameterSanitisers.length !== 0);
-        return this.routeIdSanitiser && this.routeIdSanitiser.valueChanged;
-    };
-    // @Trace()
-    // @Trace()
-    /**
-     * @return {?}
-     */
-    RouteParameterSanitiser.prototype.getRedirectParams = 
-    // @Trace()
-    /**
-     * @return {?}
-     */
-    function () {
-        if (this.routeIdHasChanged()) {
-            return [this.routeIdSanitiser.sanitisedValue];
-        }
-        else {
-            /** @type {?} */
-            var routeParams_1 = {};
-            this.parameterSanitisers.forEach((/**
-             * @param {?} s
-             * @return {?}
-             */
-            function (s) { return s.injectRouteParam(routeParams_1); }));
-            return [routeParams_1];
-        }
-    };
-    /**
-     * @private
-     * @template S
-     * @param {?} value
-     * @return {?}
-     */
-    RouteParameterSanitiser.prototype.isSanitiserContructor = /**
-     * @private
-     * @template S
-     * @param {?} value
-     * @return {?}
-     */
-    function (value) {
-        return ___default.isFunction(value) && lang.constructorChain((/** @type {?} */ ((/** @type {?} */ (value))))).includes(Sanitiser);
-    };
-    __decorate([
-        Memoize$1(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [ParameterDefinition]),
-        __metadata("design:returntype", Object)
-    ], RouteParameterSanitiser.prototype, "getSanitiser", null);
-    return RouteParameterSanitiser;
-}());
-if (false) {
-    /**
-     * @type {?}
-     * @private
-     */
-    RouteParameterSanitiser.prototype.routeIdSanitiser;
-    /**
-     * @type {?}
-     * @private
-     */
-    RouteParameterSanitiser.prototype.parameterSanitisers;
-    /** @type {?} */
-    RouteParameterSanitiser.prototype.parameterDefs;
-    /** @type {?} */
-    RouteParameterSanitiser.prototype.snapshot;
-    /** @type {?} */
-    RouteParameterSanitiser.prototype.injector;
-}
-(function (Sanitiser) {
-    /**
-     * @template T
-     */
-    var /**
-     * @template T
-     */
-    Value = /** @class */ (function (_super) {
-        __extends(Value, _super);
-        function Value() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        /**
-         * @param {?} snapshot
-         * @return {?}
-         */
-        Value.prototype.readFrom = /**
-         * @param {?} snapshot
-         * @return {?}
-         */
-        function (snapshot) {
-            /** @type {?} */
-            var rawValue = snapshot.paramMap.get(this.parameterDef.name);
-            return this.parameterDef.type.parse(rawValue);
-        };
-        /**
-         * @protected
-         * @param {?} initialValue
-         * @param {?} sanitisedValue
-         * @return {?}
-         */
-        Value.prototype.hasChanged = /**
-         * @protected
-         * @param {?} initialValue
-         * @param {?} sanitisedValue
-         * @return {?}
-         */
-        function (initialValue, sanitisedValue) {
-            return initialValue !== sanitisedValue;
-        };
-        /**
-         * @param {?} dest
-         * @return {?}
-         */
-        Value.prototype.injectRouteParam = /**
-         * @param {?} dest
-         * @return {?}
-         */
-        function (dest) {
-            dest[this.parameterDef.name] = this.parameterDef.type.format(this.sanitisedValue);
-        };
-        return Value;
-    }(Sanitiser));
-    Sanitiser.Value = Value;
-    /**
-     * @template T
-     */
-    var /**
-     * @template T
-     */
-    Array = /** @class */ (function (_super) {
-        __extends(Array, _super);
-        function Array() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        /**
-         * @param {?} snapshot
-         * @return {?}
-         */
-        Array.prototype.readFrom = /**
-         * @param {?} snapshot
-         * @return {?}
-         */
-        function (snapshot) {
-            var _this = this;
-            /** @type {?} */
-            var rawValues = snapshot.paramMap.getAll(this.parameterDef.name);
-            return rawValues.map((/**
-             * @param {?} value
-             * @return {?}
-             */
-            function (value) { return _this.parameterDef.type.parse(value); }));
-        };
-        /**
-         * @protected
-         * @param {?} initialValue
-         * @param {?} sanitisedValue
-         * @return {?}
-         */
-        Array.prototype.hasChanged = /**
-         * @protected
-         * @param {?} initialValue
-         * @param {?} sanitisedValue
-         * @return {?}
-         */
-        function (initialValue, sanitisedValue) {
-            return initialValue !== sanitisedValue;
-        };
-        /**
-         * @param {?} dest
-         * @return {?}
-         */
-        Array.prototype.injectRouteParam = /**
-         * @param {?} dest
-         * @return {?}
-         */
-        function (dest) {
-            var _this = this;
-            dest[this.parameterDef.name] = this.sanitisedValue.map((/**
-             * @param {?} v
-             * @return {?}
-             */
-            function (v) { return _this.parameterDef.type.format(v); }));
-        };
-        return Array;
-    }(Sanitiser));
-    Sanitiser.Array = Array;
-})(Sanitiser || (Sanitiser = {}));
-
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -4956,5 +4593,5 @@ if (false) {
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 
-export { ACTIVITY_DATA, AbstractActivity, AbstractInputComponent, AbstractPlaceNavigationComponent, ActivityContainerComponent, ActivityOutletComponent, AlertDialogComponent, AngularUiPowerupsModule, Bounds, BusyOverlayComponent, CommandDirective, ConfirmationDialogComponent, DEFINITION_META_DATA_KEY, DialogInteractionService, Dimension, DisposableComponent, EmptyStateComponent, FocusBindingDirective, INTERACTION_CONTEXT, 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, RouteParameterSanitiser, Sanitiser, SelectInputComponent, StringInputComponent, TabbedPlaceNavigationComponent, leftRightPlaceAnimation, slideDownAndUpAnimation, CommandDirective as ɵa, FocusBindingDirective as ɵb, AlertDialogComponent as ɵba, DialogInteractionService as ɵbc, InteractionContext as ɵbd, 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, ActivityOutletComponent as ɵv, ConfirmationDialogComponent as ɵw, AbstractActivity as ɵx, ACTIVITY_DATA as ɵy };
+export { ACTIVITY_DATA, AbstractActivity, AbstractInputComponent, AbstractPlaceNavigationComponent, ActivityContainerComponent, ActivityOutletComponent, AlertDialogComponent, AngularUiPowerupsModule, Bounds, BusyOverlayComponent, CommandDirective, ConfirmationDialogComponent, DEFINITION_META_DATA_KEY, DialogInteractionService, Dimension, DisposableComponent, EmptyStateComponent, FocusBindingDirective, INTERACTION_CONTEXT, 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, AlertDialogComponent as ɵba, DialogInteractionService as ɵbc, InteractionContext as ɵbd, 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, ActivityOutletComponent as ɵv, ConfirmationDialogComponent as ɵw, AbstractActivity as ɵx, ACTIVITY_DATA as ɵy };
 //# sourceMappingURL=coolon-angular-ui-powerups.js.map