@coolon/angular-ui-powerups 0.0.44 → 0.0.46

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

@@ -13,7 +13,7 @@ import { MatDialog as MatDialog$1 } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import { Router, RouterModule } from '@angular/router';
+import { Router, ActivatedRouteSnapshot, UrlTree, 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 'reflect-metadata';
@@ -1902,7 +1902,7 @@ var PlaceComponent = /** @class */ (function (_super) {
              * @return {?}
              */
             function (parameters) {
-                return parameters.getResolvedParameterValue(parameterDef);
+                return parameters.getValueOf(parameterDef);
             },
             toLeft: /**
              * @param {?} value
@@ -2148,7 +2148,7 @@ if (false) {
 var PlaceHistory = /** @class */ (function () {
     function PlaceHistory(router) {
         this.router = router;
-        this._history = [];
+        this._history = new Map();
     }
     /**
      * @param {?} state
@@ -2160,131 +2160,69 @@ var PlaceHistory = /** @class */ (function () {
      */
     function (state) {
         /** @type {?} */
-        var previousState = ___default.last(this._history);
+        var history = this.getHistory(state.placeDefinition);
+        /** @type {?} */
+        var previousState = ___default.last(history);
         if (!previousState || state.hasChanged(previousState)) {
-            this._history.push(state);
-            // limit our history to 100 visits
-            this._history = this._history.slice(-100);
+            history.unshift(state); // LIFO
+            this.setHistory(state.placeDefinition, history.slice(-3)); // limit our history to 3 visits
         }
     };
-    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 PlaceRouter = /** @class */ (function () {
-    function PlaceRouter(router) {
-        this.router = router;
-    }
-    /**
-     * @param {?} activatedRoute
-     * @param {?} previous
-     * @param {?} next
-     * @return {?}
-     */
-    PlaceRouter.prototype.pushParameterChangesToRoute = /**
-     * @param {?} activatedRoute
-     * @param {?} previous
-     * @param {?} next
-     * @return {?}
-     */
-    function (activatedRoute, previous, next) {
-        this.router.navigate(this.redirect(activatedRoute.snapshot, previous, next), {
-            relativeTo: activatedRoute
-        });
-    };
-    /**
-     * @param {?} activatedRoute
-     * @param {?} sanitised
-     * @param {?} snapshot
+     * @param {?} placeDef
      * @return {?}
      */
-    PlaceRouter.prototype.createUrlTree = /**
-     * @param {?} activatedRoute
-     * @param {?} sanitised
-     * @param {?} snapshot
+    PlaceHistory.prototype.getHistory = /**
+     * @param {?} placeDef
      * @return {?}
      */
-    function (activatedRoute, sanitised, snapshot) {
-        return this.router.createUrlTree(this.redirect(activatedRoute, snapshot, sanitised));
+    function (placeDef) {
+        /** @type {?} */
+        var history = this._history.get(placeDef);
+        if (!history) {
+            history = [];
+            this.setHistory(placeDef, history);
+        }
+        return history;
     };
     /**
-     * @protected
-     * @param {?} activatedRoute
-     * @param {?} previous
-     * @param {?} next
+     * @private
+     * @param {?} placeDef
+     * @param {?} history
      * @return {?}
      */
-    PlaceRouter.prototype.redirect = /**
-     * @protected
-     * @param {?} activatedRoute
-     * @param {?} previous
-     * @param {?} next
+    PlaceHistory.prototype.setHistory = /**
+     * @private
+     * @param {?} placeDef
+     * @param {?} history
      * @return {?}
      */
-    function (activatedRoute, previous, next) {
-        /** @type {?} */
-        var childSegments = ___default.flatten(activatedRoute.children.map((/**
-         * @param {?} child
-         * @return {?}
-         */
-        function (child) { return child.url; })));
-        /** @type {?} */
-        var relativePath = !!previous.hasRouteId() ? '..' : '.';
-        /** @type {?} */
-        var routeId = next.getFormattedRouteId();
-        /** @type {?} */
-        var path = routeId ?
-            [relativePath, routeId, next.getFormattedParameters()] :
-            [relativePath, next.getFormattedParameters()];
-        return path.concat(childSegments.map((/**
-         * @param {?} s
-         * @return {?}
-         */
-        function (s) { return s.path; })));
+    function (placeDef, history) {
+        this._history.set(placeDef, history);
     };
-    PlaceRouter.decorators = [
+    PlaceHistory.decorators = [
         { type: Injectable, args: [{
                     providedIn: 'root'
                 },] }
     ];
     /** @nocollapse */
-    PlaceRouter.ctorParameters = function () { return [
+    PlaceHistory.ctorParameters = function () { return [
         { type: Router }
     ]; };
-    /** @nocollapse */ PlaceRouter.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(ɵɵinject(Router)); }, token: PlaceRouter, providedIn: "root" });
-    return PlaceRouter;
+    /** @nocollapse */ PlaceHistory.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceHistory_Factory() { return new PlaceHistory(ɵɵinject(Router)); }, token: PlaceHistory, providedIn: "root" });
+    return PlaceHistory;
 }());
 if (false) {
     /**
      * @type {?}
      * @private
      */
-    PlaceRouter.prototype.router;
+    PlaceHistory.prototype._history;
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceHistory.prototype.router;
 }
 
 /**
@@ -2306,11 +2244,8 @@ ParameterDefinition = /** @class */ (function () {
         /** @type {?} */
         var opts = Opts.get(options);
         this.name = opts.getOptional('as', propertyName);
-        // this.sanitiser = new DefaultParameterSanitiser(
-        //   this,
-        //   opts.getOptional('remember', false),
-        //   opts.getOptional('defaultValue', null)
-        // );
+        this.remember = opts.getOptional('remember', false);
+        this.defaultValue = opts.getOptional('defaultValue', null);
     }
     /**
      * @param {?} injector
@@ -2321,7 +2256,12 @@ ParameterDefinition = /** @class */ (function () {
      * @return {?}
      */
     function (injector) {
-        return this.sanitiser;
+        if (this.remember || !___default.isNil(this.defaultValue)) {
+            return new ParameterDefinition.DefaultParameterSanitiser(this.remember, this.defaultValue, injector.get(PlaceHistory));
+        }
+        else {
+            return null;
+        }
     };
     return ParameterDefinition;
 }());
@@ -2332,8 +2272,16 @@ if (false) {
     ParameterDefinition.prototype.isArray;
     /** @type {?} */
     ParameterDefinition.prototype.name;
-    /** @type {?} */
-    ParameterDefinition.prototype.sanitiser;
+    /**
+     * @type {?}
+     * @private
+     */
+    ParameterDefinition.prototype.remember;
+    /**
+     * @type {?}
+     * @private
+     */
+    ParameterDefinition.prototype.defaultValue;
     /** @type {?} */
     ParameterDefinition.prototype.propertyName;
     /** @type {?} */
@@ -2425,6 +2373,89 @@ if (false) {
         /** @type {?} */
         ArrayParameter.prototype.isArray;
     }
+    /**
+     * @template T, S
+     */
+    var /**
+     * @template T, S
+     */
+    DefaultParameterSanitiser = /** @class */ (function () {
+        function DefaultParameterSanitiser(remember, defaultValue, placeHistory) {
+            this.remember = remember;
+            this.defaultValue = defaultValue;
+            this.placeHistory = placeHistory;
+        }
+        /**
+         * @param {?} parameterDef
+         * @param {?} value
+         * @param {?=} visit
+         * @return {?}
+         */
+        DefaultParameterSanitiser.prototype.sanitise = /**
+         * @param {?} parameterDef
+         * @param {?} value
+         * @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); }));
+                }
+                value = this.isBlank(parameterDef, value) ? this.defaultValue : value;
+                console.log(parameterDef.name + " is blank, returning: " + value);
+                return value;
+            }
+            else {
+                console.log(parameterDef.name + " is not blank");
+                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;
+    if (false) {
+        /** @type {?} */
+        DefaultParameterSanitiser.prototype.remember;
+        /** @type {?} */
+        DefaultParameterSanitiser.prototype.defaultValue;
+        /** @type {?} */
+        DefaultParameterSanitiser.prototype.placeHistory;
+    }
 })(ParameterDefinition || (ParameterDefinition = {}));
 
 /**
@@ -2438,24 +2469,31 @@ var ParameterSnapshot = /** @class */ (function () {
     }
     /**
      * @param {?} other
+     * @param {?=} debug
      * @return {?}
      */
     ParameterSnapshot.prototype.hasChanged = /**
      * @param {?} other
+     * @param {?=} debug
      * @return {?}
      */
-    function (other) {
+    function (other, debug) {
+        if (debug === void 0) { debug = false; }
         /** @type {?} */
         var changed = this.resolved.find((/**
          * @param {?} r
          * @return {?}
          */
         function (r) {
-            return !r.isSame(other.getResolvedParameterValue(r.parameterDef));
+            return !r.isSame(other.getValueOf(r.parameterDef));
         }));
-        // if (changed) {
-        //   console.log({ mine: changed, theirs: other.getResolvedParameter(changed.parameterDef) });
-        // }
+        if (changed && debug) {
+            console.log({
+                name: changed.parameterDef.name,
+                mine: changed.value,
+                theirs: other.getValueOf(changed.parameterDef)
+            });
+        }
         return !!changed;
     };
     /**
@@ -2463,7 +2501,7 @@ var ParameterSnapshot = /** @class */ (function () {
      * @param {?} parameterDef
      * @return {?}
      */
-    ParameterSnapshot.prototype.getResolvedParameter = /**
+    ParameterSnapshot.prototype.getParameter = /**
      * @template T, S
      * @param {?} parameterDef
      * @return {?}
@@ -2480,30 +2518,30 @@ var ParameterSnapshot = /** @class */ (function () {
      * @param {?} parameterDef
      * @return {?}
      */
-    ParameterSnapshot.prototype.getResolvedParameterValue = /**
+    ParameterSnapshot.prototype.getValueOf = /**
      * @template T, S
      * @param {?} parameterDef
      * @return {?}
      */
     function (parameterDef) {
         /** @type {?} */
-        var resolvedParameter = this.getResolvedParameter(parameterDef);
+        var resolvedParameter = this.getParameter(parameterDef);
         return resolvedParameter ? resolvedParameter.value : null;
     };
     /**
      * @return {?}
      */
-    ParameterSnapshot.prototype.getRouteId = /**
+    ParameterSnapshot.prototype.getRouteIdValue = /**
      * @return {?}
      */
     function () {
-        return this.getResolvedRouteId() ? this.getResolvedRouteId().value : null;
+        return this.getRouteIdParameter() ? this.getRouteIdParameter().value : null;
     };
     /**
      * @param {?} name
      * @return {?}
      */
-    ParameterSnapshot.prototype.getRouteParameter = /**
+    ParameterSnapshot.prototype.getParameterValue = /**
      * @param {?} name
      * @return {?}
      */
@@ -2520,7 +2558,7 @@ var ParameterSnapshot = /** @class */ (function () {
      * @private
      * @return {?}
      */
-    ParameterSnapshot.prototype.getResolvedRouteId = /**
+    ParameterSnapshot.prototype.getRouteIdParameter = /**
      * @private
      * @return {?}
      */
@@ -2533,6 +2571,21 @@ var ParameterSnapshot = /** @class */ (function () {
          */
         function (p) { return p.parameterDef.isRouteId; }))));
     };
+    /**
+     * @private
+     * @return {?}
+     */
+    ParameterSnapshot.prototype.getRouteParameters = /**
+     * @private
+     * @return {?}
+     */
+    function () {
+        return this.resolved.filter((/**
+         * @param {?} r
+         * @return {?}
+         */
+        function (r) { return !r.parameterDef.isRouteId; }));
+    };
     /**
      * @return {?}
      */
@@ -2540,7 +2593,7 @@ var ParameterSnapshot = /** @class */ (function () {
      * @return {?}
      */
     function () {
-        return !!this.getResolvedRouteId();
+        return !!this.getRouteIdParameter();
     };
     /**
      * @return {?}
@@ -2550,7 +2603,7 @@ var ParameterSnapshot = /** @class */ (function () {
      */
     function () {
         /** @type {?} */
-        var routeIdParam = this.getResolvedRouteId();
+        var routeIdParam = this.getRouteIdParameter();
         return routeIdParam ? routeIdParam.formattedValue() : null;
     };
     /**
@@ -2576,6 +2629,25 @@ var ParameterSnapshot = /** @class */ (function () {
         }));
         return params;
     };
+    /**
+     * @return {?}
+     */
+    ParameterSnapshot.prototype.getAllFormattedParameters = /**
+     * @return {?}
+     */
+    function () {
+        /** @type {?} */
+        var params = {};
+        /** @type {?} */
+        var routeIdParam = this.resolved.forEach((/**
+         * @param {?} p
+         * @return {?}
+         */
+        function (p) {
+            params[p.parameterDef.name] = p.formattedValue();
+        }));
+        return params;
+    };
     /**
      * @template T, S
      * @param {?} parameter
@@ -2607,8 +2679,40 @@ var ParameterSnapshot = /** @class */ (function () {
      */
     function (injector) {
         return __awaiter(this, void 0, void 0, function () {
+            var routeId, sanitisedValue, result, routeParameters, i, sanitisedValue;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this];
+                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.isSame(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)];
+                        }
+                        _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];
+                        return [4 /*yield*/, routeParameters[i].sanitise(this, injector)];
+                    case 4:
+                        sanitisedValue = _a.sent();
+                        if (!routeParameters[i].isSame(sanitisedValue)) {
+                            result = this.replace(routeParameters[i].parameterDef, sanitisedValue);
+                        }
+                        _a.label = 5;
+                    case 5:
+                        i++;
+                        return [3 /*break*/, 3];
+                    case 6: return [2 /*return*/, result];
+                }
             });
         });
     };
@@ -2618,25 +2722,37 @@ var ParameterSnapshot = /** @class */ (function () {
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [ParameterDefinition]),
         __metadata("design:returntype", ParameterSnapshot.ResolvedParameter)
-    ], ParameterSnapshot.prototype, "getResolvedParameter", null);
+    ], 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, "getResolvedParameterValue", null);
+    ], ParameterSnapshot.prototype, "getValueOf", null);
     __decorate([
         Memoize$1(),
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [String]),
         __metadata("design:returntype", Object)
-    ], ParameterSnapshot.prototype, "getRouteParameter", null);
+    ], ParameterSnapshot.prototype, "getParameterValue", null);
     __decorate([
         Memoize$1(),
         __metadata("design:type", Function),
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", ParameterSnapshot.ResolvedValueParameter)
-    ], ParameterSnapshot.prototype, "getResolvedRouteId", null);
+    ], ParameterSnapshot.prototype, "getRouteIdParameter", null);
+    __decorate([
+        Memoize$1(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", Array)
+    ], ParameterSnapshot.prototype, "getRouteParameters", null);
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Injector]),
+        __metadata("design:returntype", Promise)
+    ], ParameterSnapshot.prototype, "sanitise", null);
     return ParameterSnapshot;
 }());
 if (false) {
@@ -2651,10 +2767,13 @@ if (false) {
 (function (ParameterSnapshot) {
     /**
      * @param {?} placeDef
-     * @param {?} paramMap
+     * @param {?} params
+     * @param {?} urlSegments
      * @return {?}
      */
-    function create(placeDef, paramMap) {
+    function create(placeDef, params, urlSegments) {
+        /** @type {?} */
+        var paramMap = new ConsolidatedParameterMap(params, urlSegments);
         /** @type {?} */
         var resolvedParameters = placeDef.getRouteParameters()
             .map((/**
@@ -2664,7 +2783,11 @@ if (false) {
         function (def) {
             if (def.isArray) {
                 /** @type {?} */
-                var value = paramMap.has(def.name) ? paramMap.getAll(def.name).map((/**
+                var value = paramMap.has(def.name) ? paramMap.getAll(def.name).filter((/**
+                 * @param {?} s
+                 * @return {?}
+                 */
+                function (s) { return !___default.isEmpty(s); })).map((/**
                  * @param {?} raw
                  * @return {?}
                  */
@@ -2680,6 +2803,140 @@ if (false) {
         return new ParameterSnapshot(placeDef, resolvedParameters);
     }
     ParameterSnapshot.create = create;
+    /**
+     * 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 /**
+     * 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 () {
+        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); }));
+        };
+        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;
+    }
     /**
      * @abstract
      * @template T, S
@@ -2702,6 +2959,31 @@ if (false) {
         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;
@@ -2858,6 +3140,115 @@ if (false) {
     ParameterSnapshot.ResolvedArrayParameter = ResolvedArrayParameter;
 })(ParameterSnapshot || (ParameterSnapshot = {}));
 
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+var PlaceRouter = /** @class */ (function () {
+    function PlaceRouter(router) {
+        this.router = router;
+    }
+    /**
+     * @param {?} activatedRoute
+     * @param {?} previous
+     * @param {?} next
+     * @return {?}
+     */
+    PlaceRouter.prototype.pushParameterChangesToRoute = /**
+     * @param {?} activatedRoute
+     * @param {?} previous
+     * @param {?} next
+     * @return {?}
+     */
+    function (activatedRoute, previous, next) {
+        /** @type {?} */
+        var relativePath = !!previous.hasRouteId() ? '..' : '.';
+        this.router.navigate([relativePath].concat(this.createRouteParameters(next), this.getChildPath(activatedRoute.snapshot)), {
+            relativeTo: activatedRoute
+        });
+    };
+    /**
+     * @param {?} activatedRoute
+     * @param {?} sanitised
+     * @return {?}
+     */
+    PlaceRouter.prototype.getRedirectUrlTree = /**
+     * @param {?} activatedRoute
+     * @param {?} sanitised
+     * @return {?}
+     */
+    function (activatedRoute, sanitised) {
+        /** @type {?} */
+        var urlSegments = activatedRoute.url;
+        /** @type {?} */
+        var weHaveARouteId = sanitised.hasRouteId() && sanitised.getFormattedRouteId();
+        /** @type {?} */
+        var commands = (weHaveARouteId) ?
+            [urlSegments[0].path, sanitised.getFormattedRouteId(), sanitised.getFormattedParameters()] :
+            [urlSegments[0].path, sanitised.getFormattedParameters()];
+        console.log("redirect path", commands);
+        return this.router.createUrlTree(commands);
+    };
+    /**
+     * @protected
+     * @param {?} activatedRoute
+     * @return {?}
+     */
+    PlaceRouter.prototype.getChildPath = /**
+     * @protected
+     * @param {?} activatedRoute
+     * @return {?}
+     */
+    function (activatedRoute) {
+        return ___default.flatten(activatedRoute.children.map((/**
+         * @param {?} child
+         * @return {?}
+         */
+        function (child) { return child.url; })));
+    };
+    /**
+     * @protected
+     * @param {?} parameters
+     * @return {?}
+     */
+    PlaceRouter.prototype.createRouteParameters = /**
+     * @protected
+     * @param {?} parameters
+     * @return {?}
+     */
+    function (parameters) {
+        /** @type {?} */
+        var routeId = parameters.getFormattedRouteId();
+        return routeId ?
+            [routeId, parameters.getFormattedParameters()] :
+            [parameters.getFormattedParameters()];
+    };
+    PlaceRouter.decorators = [
+        { type: Injectable, args: [{
+                    providedIn: 'root'
+                },] }
+    ];
+    /** @nocollapse */
+    PlaceRouter.ctorParameters = function () { return [
+        { type: Router }
+    ]; };
+    /** @nocollapse */ PlaceRouter.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(ɵɵinject(Router)); }, token: PlaceRouter, providedIn: "root" });
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [ActivatedRouteSnapshot, ParameterSnapshot]),
+        __metadata("design:returntype", UrlTree)
+    ], PlaceRouter.prototype, "getRedirectUrlTree", null);
+    return PlaceRouter;
+}());
+if (false) {
+    /**
+     * @type {?}
+     * @private
+     */
+    PlaceRouter.prototype.router;
+}
+
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -2945,19 +3336,25 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         _this._placeDefinition = new MutableValueModel();
         _this._resolvedParameters = 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;
-        _this._paramMap = chain(_this._activatedRouteModel).pullObservableValue((/**
+        /** @type {?} */
+        var paramMap = chain(_this._activatedRouteModel).pullObservableValue((/**
          * @param {?} ar
          * @return {?}
          */
         function (ar) { return ar.paramMap; }));
-        _this.placeConfigured = valueOf.all(chain(_this._inOutletUpdate).isFalsey(), _this._placeDefinition, _this._paramMap).areTruthy();
-        when.valueOf(_this._paramMap).changes((/**
-         * @param {?} params
+        /** @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((/**
          * @return {?}
          */
-        function (params) {
+        function () {
             /** @type {?} */
-            var snapshot = ParameterSnapshot.create(_this._placeDefinition.value, params);
+            var snapshot = ParameterSnapshot.create(_this._placeDefinition.value, paramMap.value, urls.value);
             _this._incomingRouteChange.whileTrue((/**
              * @return {?}
              */
@@ -2980,6 +3377,10 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
             unless: _this.incomingRouteChange
         });
         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);
     }
     Object.defineProperty(PlaceOutletComponent.prototype, "incomingRouteChange", {
         get: /**
@@ -3150,11 +3551,6 @@ if (false) {
      * @private
      */
     PlaceOutletComponent.prototype._placeDefinition;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceOutletComponent.prototype._paramMap;
     /** @type {?} */
     PlaceOutletComponent.prototype._resolvedParameters;
     /**
@@ -3728,12 +4124,12 @@ if (false) {
     /**
      * @return {?}
      */
-    Visit.prototype.getRouteId = function () { };
+    Visit.prototype.getRouteIdValue = function () { };
     /**
      * @param {?} name
      * @return {?}
      */
-    Visit.prototype.getRouteParameter = function (name) { };
+    Visit.prototype.getParameterValue = function (name) { };
 }
 
 /**
@@ -3832,14 +4228,14 @@ var PlaceRouteGuard = /** @class */ (function () {
             /** @type {?} */
             var placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);
             /** @type {?} */
-            var snapshot_1 = ParameterSnapshot.create(placeDefinition, activatedRoute.paramMap);
+            var snapshot_1 = ParameterSnapshot.create(placeDefinition, activatedRoute.paramMap, activatedRoute.url);
             return snapshot_1.sanitise(this.injector).then((/**
              * @param {?} sanitised
              * @return {?}
              */
             function (sanitised) {
-                if (sanitised.hasChanged(snapshot_1)) {
-                    return _this.placeRouter.createUrlTree(activatedRoute, snapshot_1, sanitised);
+                if (sanitised.hasChanged(snapshot_1, true)) {
+                    return _this.placeRouter.getRedirectUrlTree(activatedRoute, sanitised);
                 }
                 else {
                     return true;
@@ -3876,75 +4272,6 @@ if (false) {
     PlaceRouteGuard.prototype.injector;
 }
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/**
- * @template T, S
- */
-var DefaultParameterSanitiser = /** @class */ (function () {
-    function DefaultParameterSanitiser(def, remember, defaultValue) {
-        this.def = def;
-        this.remember = remember;
-        this.defaultValue = defaultValue;
-    }
-    /**
-     * @param {?} value
-     * @param {?} visit
-     * @return {?}
-     */
-    DefaultParameterSanitiser.prototype.sanitise = /**
-     * @param {?} value
-     * @param {?} visit
-     * @return {?}
-     */
-    function (value, visit) {
-        if (this.isBlank(value)) {
-            if (this.remember) {
-                // value = null;
-            }
-            return this.isBlank(value) && !___default.isNil(this.defaultValue) ? this.defaultValue : value;
-        }
-        else {
-            return value;
-        }
-    };
-    /**
-     * @private
-     * @param {?} value
-     * @return {?}
-     */
-    DefaultParameterSanitiser.prototype.isBlank = /**
-     * @private
-     * @param {?} value
-     * @return {?}
-     */
-    function (value) {
-        /** @type {?} */
-        var isNil = ___default.isNil(value);
-        return this.def.isArray ? !isNil || value['length'] < 1 : isNil;
-    };
-    __decorate([
-        Trace(),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Object, Object]),
-        __metadata("design:returntype", Object)
-    ], DefaultParameterSanitiser.prototype, "sanitise", null);
-    return DefaultParameterSanitiser;
-}());
-if (false) {
-    /**
-     * @type {?}
-     * @private
-     */
-    DefaultParameterSanitiser.prototype.def;
-    /** @type {?} */
-    DefaultParameterSanitiser.prototype.remember;
-    /** @type {?} */
-    DefaultParameterSanitiser.prototype.defaultValue;
-}
-
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -4056,16 +4383,17 @@ function RouteParameterList(elementType, options) {
  */
 /**
  * @record
- * @template T
+ * @template S
  */
 function ParameterSanitiser() { }
 if (false) {
     /**
+     * @param {?} parameterDef
      * @param {?} value
      * @param {?=} visit
      * @return {?}
      */
-    ParameterSanitiser.prototype.sanitise = function (value, visit) { };
+    ParameterSanitiser.prototype.sanitise = function (parameterDef, value, visit) { };
 }
 
 /**
@@ -4260,7 +4588,7 @@ Sanitiser = /** @class */ (function () {
                         if (!this.sanitiser) return [3 /*break*/, 2];
                         this.initialValue = this.readFrom(this.snapshot);
                         _a = this;
-                        return [4 /*yield*/, this.sanitiser.sanitise(this.initialValue)];
+                        return [4 /*yield*/, this.sanitiser.sanitise(null, this.initialValue)];
                     case 1:
                         _a._sanitisedValue = _b.sent();
                         if (this.initialValue !== this._sanitisedValue) {
@@ -4608,5 +4936,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, DefaultParameterSanitiser, 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, 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 };
 //# sourceMappingURL=coolon-angular-ui-powerups.js.map