@coolon/angular-ui-powerups 0.0.69 → 0.0.71

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

@@ -1,13 +1,13 @@
 import { DOCUMENT, Location, CommonModule } from '@angular/common';
-import { EventEmitter, Input, Output, HostListener, Component, Directive, ElementRef, Inject, NgZone, InjectionToken, Injector, ComponentFactoryResolver, ViewContainerRef, ViewChild, ViewChildren, Injectable, Optional, ɵɵdefineInjectable, ɵɵinject, NgModule, HostBinding, INJECTOR } from '@angular/core';
+import { EventEmitter, Input, Output, HostListener, Component, Directive, ElementRef, Inject, NgZone, InjectionToken, Injector, ComponentFactoryResolver, ViewContainerRef, ViewChild, ViewChildren, Injectable, Optional, ɵɵdefineInjectable, ɵɵinject, NgModule, HostBinding, SkipSelf, INJECTOR } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { MatDialog, MatButtonModule, MatDialogModule, MatTabsModule, MatProgressSpinnerModule, MatInputModule, MatFormFieldModule, MatSelectModule } from '@angular/material';
 import { MatTabsModule as MatTabsModule$1 } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { __extends, __decorate, __metadata, __assign, __awaiter, __generator } from 'tslib';
+import { __extends, __decorate, __metadata, __assign, __awaiter, __generator, __spread } from 'tslib';
 import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, DelegatingValueModel, MutableStream, MutableListModel, DelegatingListModel, StoreInValueModel, Binding, MutableValueModel, Trace, Guard as Guard$1, OptionsHelper, ValueHolder } from '@coolon/pectin';
 import { PortalModule } from '@angular/cdk/portal';
-import { Router, RouterModule, NavigationStart, NavigationEnd, NavigationError, ActivatedRoute, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Router, RouterModule, NavigationStart, NavigationEnd, NavigationError, ActivatedRoute, RouterOutlet, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import ___default, { last, isNil, isEqual } from 'lodash';
 import { assert as assert$1, Opts, Klass } from '@coolon/typescript-utilities';
 import { MatDialogConfig, MAT_DIALOG_DEFAULT_OPTIONS, MatDialog as MatDialog$1 } from '@angular/material/dialog';
@@ -3224,94 +3224,6 @@ if (false) {
     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.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: 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
@@ -3500,6 +3412,94 @@ if (false) {
     NavigationSession.createExternal = createExternal;
 })(NavigationSession || (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.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: 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
@@ -3759,23 +3759,43 @@ var PlaceRouter = /** @class */ (function (_super) {
      *  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*/];
             });
         });
@@ -3809,13 +3829,9 @@ var PlaceRouter = /** @class */ (function (_super) {
                             /** @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
@@ -3828,52 +3844,54 @@ var PlaceRouter = /** @class */ (function (_super) {
     };
     /**
      * @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 = 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()
     /**
@@ -3934,7 +3952,7 @@ var PlaceRouter = /** @class */ (function (_super) {
      * @param {?} activatedRoute
      * @return {?}
      */
-    PlaceRouter.prototype.getChildPath = /**
+    PlaceRouter.prototype.extractChildPath = /**
      * @param {?} activatedRoute
      * @return {?}
      */
@@ -3957,6 +3975,12 @@ var PlaceRouter = /** @class */ (function (_super) {
         { type: PlaceHistory }
     ]; };
     /** @nocollapse */ PlaceRouter.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(ɵɵinject(Router), ɵɵinject(Location), ɵɵinject(PlaceHistory)); }, token: PlaceRouter, providedIn: "root" });
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Visit, Object]),
+        __metadata("design:returntype", Promise)
+    ], PlaceRouter.prototype, "navigate", null);
     __decorate([
         Trace(),
         __metadata("design:type", Function),
@@ -4072,11 +4096,11 @@ if (false) {
 }
 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 EventEmitter();
         _this._activePlace = new MutableValueModel();
@@ -4137,6 +4161,20 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
      */
     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
@@ -4162,6 +4200,16 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         enumerable: true,
         configurable: true
     });
+    Object.defineProperty(PlaceOutletComponent.prototype, "activatedRouteModel", {
+        get: /**
+         * @return {?}
+         */
+        function () {
+            return this._activatedRouteModel.readonly;
+        },
+        enumerable: true,
+        configurable: true
+    });
     /**
      * @param {?} routerOutlet
      * @param {?} place
@@ -4236,17 +4284,6 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
             this._activePlace.value.onPlaceReady();
         }
     };
-    /**
-     * @param {?} placeDestination
-     * @return {?}
-     */
-    PlaceOutletComponent.prototype.activate = /**
-     * @param {?} placeDestination
-     * @return {?}
-     */
-    function (placeDestination) {
-        // this.router.
-    };
     PlaceOutletComponent.decorators = [
         { type: Component, args: [{
                     selector: 'angular-ui-powerups-place-outlet',
@@ -4259,13 +4296,31 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
     PlaceOutletComponent.ctorParameters = function () { return [
         { type: Router },
         { type: PlaceRouter },
-        { type: PlaceHistory }
+        { type: PlaceOutletComponent, decorators: [{ type: SkipSelf }, { type: Optional }] }
     ]; };
     PlaceOutletComponent.propDecorators = {
         animate: [{ type: Input }],
         placeChanged: [{ type: Output }],
         routerOut: [{ type: ViewChild, args: ['routeOutlet', { static: true },] }]
     };
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Visit]),
+        __metadata("design:returntype", void 0)
+    ], PlaceOutletComponent.prototype, "navigate", null);
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [RouterOutlet, PlaceComponent]),
+        __metadata("design:returntype", void 0)
+    ], PlaceOutletComponent.prototype, "onOutletActivated", null);
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [RouterOutlet, Object]),
+        __metadata("design:returntype", void 0)
+    ], PlaceOutletComponent.prototype, "onOutletDeactivated", null);
     return PlaceOutletComponent;
 }(DisposableComponent));
 if (false) {
@@ -4310,11 +4365,8 @@ if (false) {
      * @private
      */
     PlaceOutletComponent.prototype.placeRouter;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceOutletComponent.prototype.placeHistory;
+    /** @type {?} */
+    PlaceOutletComponent.prototype.parentOutlet;
 }
 
 /**
@@ -5128,6 +5180,8 @@ function RouteId(type, options) {
  * @return {?}
  */
 function VisitParameter(options) {
+    /** @type {?} */
+    var opts = Opts.get(options);
     return (/**
      * @param {?} prototype
      * @param {?} propertyKey
@@ -5135,7 +5189,7 @@ function VisitParameter(options) {
      */
     function (prototype, propertyKey) {
         /** @type {?} */
-        var param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, options.storeInUrl);
+        var param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
         Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
         UseDelegate()(prototype, propertyKey);
     });
@@ -5146,6 +5200,8 @@ function VisitParameter(options) {
  * @return {?}
  */
 function VisitParameterList(options) {
+    /** @type {?} */
+    var opts = Opts.get(options);
     return (/**
      * @param {?} prototype
      * @param {?} propertyKey
@@ -5153,7 +5209,7 @@ function VisitParameterList(options) {
      */
     function (prototype, propertyKey) {
         /** @type {?} */
-        var param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, options.storeInUrl);
+        var param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
         Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
         UseDelegate()(prototype, propertyKey);
     });
@@ -5462,7 +5518,7 @@ var PlaceRouteGuard = /** @class */ (function () {
      */
     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:
@@ -5475,14 +5531,14 @@ var PlaceRouteGuard = /** @class */ (function () {
                         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,