@coolon/angular-ui-powerups 0.0.69 → 0.0.71

package/bundles/coolon-angular-ui-powerups.umd.js

@@ -3407,94 +3407,6 @@
         ListPlaceNavComponent.prototype.expanded;
     }
 
-    /**
-     * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
-     */
-    var PlaceHistory = /** @class */ (function () {
-        function PlaceHistory(router) {
-            this.router = router;
-            this._history = new Map();
-        }
-        // @Trace()
-        // @Trace()
-        /**
-         * @param {?} state
-         * @return {?}
-         */
-        PlaceHistory.prototype.add = 
-        // @Trace()
-        /**
-         * @param {?} state
-         * @return {?}
-         */
-        function (state) {
-            /** @type {?} */
-            var history = this.getHistory(state.placeDefinition);
-            /** @type {?} */
-            var previousState = ___default__default.last(history);
-            if (!previousState || state.hasChangedFrom(previousState)) {
-                history.unshift(state); // LIFO
-                this.setHistory(state.placeDefinition, history.slice(0, 3)); // limit our history to 4 visits
-            }
-        };
-        /**
-         * @param {?} placeDef
-         * @return {?}
-         */
-        PlaceHistory.prototype.getHistory = /**
-         * @param {?} placeDef
-         * @return {?}
-         */
-        function (placeDef) {
-            /** @type {?} */
-            var history = this._history.get(placeDef);
-            if (!history) {
-                history = [];
-                this.setHistory(placeDef, history);
-            }
-            return history;
-        };
-        /**
-         * @private
-         * @param {?} placeDef
-         * @param {?} history
-         * @return {?}
-         */
-        PlaceHistory.prototype.setHistory = /**
-         * @private
-         * @param {?} placeDef
-         * @param {?} history
-         * @return {?}
-         */
-        function (placeDef, history) {
-            this._history.set(placeDef, history);
-        };
-        PlaceHistory.decorators = [
-            { type: core.Injectable, args: [{
-                        providedIn: 'root'
-                    },] }
-        ];
-        /** @nocollapse */
-        PlaceHistory.ctorParameters = function () { return [
-            { type: router.Router }
-        ]; };
-        /** @nocollapse */ PlaceHistory.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function PlaceHistory_Factory() { return new PlaceHistory(core.ɵɵinject(router.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
@@ -3683,6 +3595,94 @@
         NavigationSession.createExternal = createExternal;
     })(exports.NavigationSession || (exports.NavigationSession = {}));
 
+    /**
+     * @fileoverview added by tsickle
+     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     */
+    var PlaceHistory = /** @class */ (function () {
+        function PlaceHistory(router) {
+            this.router = router;
+            this._history = new Map();
+        }
+        // @Trace()
+        // @Trace()
+        /**
+         * @param {?} state
+         * @return {?}
+         */
+        PlaceHistory.prototype.add = 
+        // @Trace()
+        /**
+         * @param {?} state
+         * @return {?}
+         */
+        function (state) {
+            /** @type {?} */
+            var history = this.getHistory(state.placeDefinition);
+            /** @type {?} */
+            var previousState = ___default__default.last(history);
+            if (!previousState || state.hasChangedFrom(previousState)) {
+                history.unshift(state); // LIFO
+                this.setHistory(state.placeDefinition, history.slice(0, 3)); // limit our history to 4 visits
+            }
+        };
+        /**
+         * @param {?} placeDef
+         * @return {?}
+         */
+        PlaceHistory.prototype.getHistory = /**
+         * @param {?} placeDef
+         * @return {?}
+         */
+        function (placeDef) {
+            /** @type {?} */
+            var history = this._history.get(placeDef);
+            if (!history) {
+                history = [];
+                this.setHistory(placeDef, history);
+            }
+            return history;
+        };
+        /**
+         * @private
+         * @param {?} placeDef
+         * @param {?} history
+         * @return {?}
+         */
+        PlaceHistory.prototype.setHistory = /**
+         * @private
+         * @param {?} placeDef
+         * @param {?} history
+         * @return {?}
+         */
+        function (placeDef, history) {
+            this._history.set(placeDef, history);
+        };
+        PlaceHistory.decorators = [
+            { type: core.Injectable, args: [{
+                        providedIn: 'root'
+                    },] }
+        ];
+        /** @nocollapse */
+        PlaceHistory.ctorParameters = function () { return [
+            { type: router.Router }
+        ]; };
+        /** @nocollapse */ PlaceHistory.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function PlaceHistory_Factory() { return new PlaceHistory(core.ɵɵinject(router.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
@@ -3942,23 +3942,43 @@
          *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));
          * @param visit
          */
-        // @Trace()
         /**
          *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));
          * @param {?} visit
+         * @param {?=} options
          * @return {?}
          */
-        // @Trace()
         PlaceRouter.prototype.navigate = /**
          *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));
          * @param {?} visit
+         * @param {?=} options
          * @return {?}
          */
-        // @Trace()
-        function (visit) {
+        function (visit, options) {
             return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
                 return __generator(this, function (_a) {
-                    this.doNavigation(visit);
+                    this.doNavigation(visit, (/**
+                     * @param {?} router
+                     * @return {?}
+                     */
+                    function (router) { return __awaiter(_this, void 0, void 0, function () {
+                        var commands;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    commands = __spread([
+                                        visit.placeDefinition.path
+                                    ], this.createRouteParameters(visit));
+                                    return [4 /*yield*/, this.router.navigate(commands, {
+                                            relativeTo: options ? options.relativeTo : null
+                                        })];
+                                case 1:
+                                    _a.sent();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); }));
                     return [2 /*return*/];
                 });
             });
@@ -3992,13 +4012,9 @@
                                 /** @type {?} */
                                 var relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';
                                 /** @type {?} */
-                                var def = next.placeDefinition;
-                                /** @type {?} */
-                                var params = next.hasRouteId() ?
-                                    [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :
-                                    [def.getFormattedRouteParameters(next)];
-                                /** @type {?} */
-                                var commands = [relativePath].concat(params, _this.getChildPath(activatedRoute.snapshot));
+                                var commands = __spread([
+                                    relativePath
+                                ], _this.createRouteParameters(next), _this.extractChildPath(activatedRoute.snapshot));
                                 console.log('### Redirect', commands);
                                 return router.navigate(commands, {
                                     relativeTo: activatedRoute
@@ -4011,52 +4027,54 @@
         };
         /**
          * @param {?} visit
-         * @param {?=} customNavigation
+         * @param {?} customNavigation
          * @return {?}
          */
         PlaceRouter.prototype.doNavigation = /**
          * @param {?} visit
-         * @param {?=} customNavigation
+         * @param {?} customNavigation
          * @return {?}
          */
         function (visit, customNavigation) {
             return __awaiter(this, void 0, void 0, function () {
-                var def, parameterCommands, commands;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             this._navigationSessionModel.value = exports.NavigationSession.createInternal(visit);
                             _a.label = 1;
                         case 1:
-                            _a.trys.push([1, , 6, 7]);
-                            if (!customNavigation) return [3 /*break*/, 3];
+                            _a.trys.push([1, , 3, 4]);
                             return [4 /*yield*/, customNavigation(this.router)];
                         case 2:
                             _a.sent();
-                            return [3 /*break*/, 5];
+                            return [3 /*break*/, 4];
                         case 3:
-                            def = visit.placeDefinition;
-                            // @see https://coolon.atlassian.net/browse/AUP-41
-                            parameterCommands = visit.hasRouteId() ?
-                                [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
-                                [def.getFormattedRouteParameters(visit)];
-                            commands = [def.path].concat(parameterCommands);
-                            console.log('_doNavigation', visit, commands);
-                            return [4 /*yield*/, this.router.navigate(commands)];
-                        case 4:
-                            _a.sent();
-                            _a.label = 5;
-                        case 5: return [3 /*break*/, 7];
-                        case 6:
                             if (this.navigationSession && !this.router.getCurrentNavigation()) {
                                 this.onAngularRouterFinished();
                             }
                             return [7 /*endfinally*/];
-                        case 7: return [2 /*return*/];
+                        case 4: return [2 /*return*/];
                     }
                 });
             });
         };
+        /**
+         * @private
+         * @param {?} visit
+         * @return {?}
+         */
+        PlaceRouter.prototype.createRouteParameters = /**
+         * @private
+         * @param {?} visit
+         * @return {?}
+         */
+        function (visit) {
+            /** @type {?} */
+            var def = visit.placeDefinition;
+            return visit.hasRouteId() ?
+                [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
+                [def.getFormattedRouteParameters(visit)];
+        };
         // @Trace()
         // @Trace()
         /**
@@ -4117,7 +4135,7 @@
          * @param {?} activatedRoute
          * @return {?}
          */
-        PlaceRouter.prototype.getChildPath = /**
+        PlaceRouter.prototype.extractChildPath = /**
          * @param {?} activatedRoute
          * @return {?}
          */
@@ -4140,6 +4158,12 @@
             { type: PlaceHistory }
         ]; };
         /** @nocollapse */ PlaceRouter.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(core.ɵɵinject(router.Router), core.ɵɵinject(common.Location), core.ɵɵinject(PlaceHistory)); }, token: PlaceRouter, providedIn: "root" });
+        __decorate([
+            pectin.Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [Visit, Object]),
+            __metadata("design:returntype", Promise)
+        ], PlaceRouter.prototype, "navigate", null);
         __decorate([
             pectin.Trace(),
             __metadata("design:type", Function),
@@ -4255,11 +4279,11 @@
     }
     var PlaceOutletComponent = /** @class */ (function (_super) {
         __extends(PlaceOutletComponent, _super);
-        function PlaceOutletComponent(router, placeRouter, placeHistory) {
+        function PlaceOutletComponent(router, placeRouter, parentOutlet) {
             var _this = _super.call(this) || this;
             _this.router = router;
             _this.placeRouter = placeRouter;
-            _this.placeHistory = placeHistory;
+            _this.parentOutlet = parentOutlet;
             _this.animate = true;
             _this.placeChanged = new core.EventEmitter();
             _this._activePlace = new pectin.MutableValueModel();
@@ -4320,6 +4344,20 @@
          */
         function () {
         };
+        /**
+         * @param {?} visit
+         * @return {?}
+         */
+        PlaceOutletComponent.prototype.navigate = /**
+         * @param {?} visit
+         * @return {?}
+         */
+        function (visit) {
+            console.log({ activatedRoute: this._activatedRouteModel.value });
+            this.placeRouter.navigate(visit, {
+                relativeTo: this.parentOutlet ? this.parentOutlet.activatedRouteModel.value : null
+            });
+        };
         /**
          * @param {?} next
          * @param {?} previous
@@ -4345,6 +4383,16 @@
             enumerable: true,
             configurable: true
         });
+        Object.defineProperty(PlaceOutletComponent.prototype, "activatedRouteModel", {
+            get: /**
+             * @return {?}
+             */
+            function () {
+                return this._activatedRouteModel.readonly;
+            },
+            enumerable: true,
+            configurable: true
+        });
         /**
          * @param {?} routerOutlet
          * @param {?} place
@@ -4419,17 +4467,6 @@
                 this._activePlace.value.onPlaceReady();
             }
         };
-        /**
-         * @param {?} placeDestination
-         * @return {?}
-         */
-        PlaceOutletComponent.prototype.activate = /**
-         * @param {?} placeDestination
-         * @return {?}
-         */
-        function (placeDestination) {
-            // this.router.
-        };
         PlaceOutletComponent.decorators = [
             { type: core.Component, args: [{
                         selector: 'angular-ui-powerups-place-outlet',
@@ -4442,13 +4479,31 @@
         PlaceOutletComponent.ctorParameters = function () { return [
             { type: router.Router },
             { type: PlaceRouter },
-            { type: PlaceHistory }
+            { type: PlaceOutletComponent, decorators: [{ type: core.SkipSelf }, { type: core.Optional }] }
         ]; };
         PlaceOutletComponent.propDecorators = {
             animate: [{ type: core.Input }],
             placeChanged: [{ type: core.Output }],
             routerOut: [{ type: core.ViewChild, args: ['routeOutlet', { static: true },] }]
         };
+        __decorate([
+            pectin.Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [Visit]),
+            __metadata("design:returntype", void 0)
+        ], PlaceOutletComponent.prototype, "navigate", null);
+        __decorate([
+            pectin.Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [router.RouterOutlet, exports.PlaceComponent]),
+            __metadata("design:returntype", void 0)
+        ], PlaceOutletComponent.prototype, "onOutletActivated", null);
+        __decorate([
+            pectin.Trace(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", [router.RouterOutlet, Object]),
+            __metadata("design:returntype", void 0)
+        ], PlaceOutletComponent.prototype, "onOutletDeactivated", null);
         return PlaceOutletComponent;
     }(DisposableComponent));
     if (false) {
@@ -4493,11 +4548,8 @@
          * @private
          */
         PlaceOutletComponent.prototype.placeRouter;
-        /**
-         * @type {?}
-         * @private
-         */
-        PlaceOutletComponent.prototype.placeHistory;
+        /** @type {?} */
+        PlaceOutletComponent.prototype.parentOutlet;
     }
 
     /**
@@ -5311,6 +5363,8 @@
      * @return {?}
      */
     function VisitParameter(options) {
+        /** @type {?} */
+        var opts = typescriptUtilities.Opts.get(options);
         return (/**
          * @param {?} prototype
          * @param {?} propertyKey
@@ -5318,7 +5372,7 @@
          */
         function (prototype, propertyKey) {
             /** @type {?} */
-            var param = new exports.ParameterDefinition.ValueParameter(propertyKey.toString(), options, options.storeInUrl);
+            var param = new exports.ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
             typescriptUtilities.Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
             pectin.UseDelegate()(prototype, propertyKey);
         });
@@ -5329,6 +5383,8 @@
      * @return {?}
      */
     function VisitParameterList(options) {
+        /** @type {?} */
+        var opts = typescriptUtilities.Opts.get(options);
         return (/**
          * @param {?} prototype
          * @param {?} propertyKey
@@ -5336,7 +5392,7 @@
          */
         function (prototype, propertyKey) {
             /** @type {?} */
-            var param = new exports.ParameterDefinition.ArrayParameter(propertyKey.toString(), options, options.storeInUrl);
+            var param = new exports.ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
             typescriptUtilities.Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
             pectin.UseDelegate()(prototype, propertyKey);
         });
@@ -5645,7 +5701,7 @@
          */
         function (activatedRoute, state) {
             return __awaiter(this, void 0, void 0, function () {
-                var placeDefinition, params, parsedParams, initialVisit, sanitiser, updatedVisit, parameterCommands, commands;
+                var placeDefinition, params, parsedParams, initialVisit, sanitiser, sanitisedVisit, parameterCommands, commands;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -5658,14 +5714,14 @@
                             sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
                             return [4 /*yield*/, sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams))];
                         case 1:
-                            updatedVisit = _a.sent();
+                            sanitisedVisit = _a.sent();
                             // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters
-                            this.placeRouter.navigationSession.storeVisit(updatedVisit);
-                            if (initialVisit.hasRoutingChangedFrom(updatedVisit)) {
-                                parameterCommands = updatedVisit.hasRouteId() ?
-                                    [placeDefinition.getFormattedRouteId(updatedVisit), placeDefinition.getFormattedRouteParameters(updatedVisit)] :
-                                    [placeDefinition.getFormattedRouteParameters(updatedVisit)];
-                                commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.getChildPath(activatedRoute));
+                            this.placeRouter.navigationSession.storeVisit(sanitisedVisit);
+                            if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
+                                parameterCommands = sanitisedVisit.hasRouteId() ?
+                                    [placeDefinition.getFormattedRouteId(sanitisedVisit), placeDefinition.getFormattedRouteParameters(sanitisedVisit)] :
+                                    [placeDefinition.getFormattedRouteParameters(sanitisedVisit)];
+                                commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.extractChildPath(activatedRoute));
                                 console.log('##### Redirect', commands);
                                 return [2 /*return*/, this.router.createUrlTree(commands, {
                                         replaceUrl: true,