@coolon/angular-ui-powerups 0.0.69 → 0.0.71

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

@@ -1,5 +1,5 @@
 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';
@@ -7,7 +7,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { __decorate, __metadata, __awaiter } 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';
@@ -2616,79 +2616,6 @@ if (false) {
     ListPlaceNavComponent.prototype.expanded;
 }
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-class PlaceHistory {
-    /**
-     * @param {?} router
-     */
-    constructor(router) {
-        this.router = router;
-        this._history = new Map();
-    }
-    // @Trace()
-    /**
-     * @param {?} state
-     * @return {?}
-     */
-    add(state) {
-        /** @type {?} */
-        const history = this.getHistory(state.placeDefinition);
-        /** @type {?} */
-        const 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 {?}
-     */
-    getHistory(placeDef) {
-        /** @type {?} */
-        let history = this._history.get(placeDef);
-        if (!history) {
-            history = [];
-            this.setHistory(placeDef, history);
-        }
-        return history;
-    }
-    /**
-     * @private
-     * @param {?} placeDef
-     * @param {?} history
-     * @return {?}
-     */
-    setHistory(placeDef, history) {
-        this._history.set(placeDef, history);
-    }
-}
-PlaceHistory.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-/** @nocollapse */
-PlaceHistory.ctorParameters = () => [
-    { type: Router }
-];
-/** @nocollapse */ PlaceHistory.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceHistory_Factory() { return new PlaceHistory(ɵɵinject(Router)); }, token: PlaceHistory, providedIn: "root" });
-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
@@ -2836,6 +2763,79 @@ if (false) {
     NavigationSession.createExternal = createExternal;
 })(NavigationSession || (NavigationSession = {}));
 
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+class PlaceHistory {
+    /**
+     * @param {?} router
+     */
+    constructor(router) {
+        this.router = router;
+        this._history = new Map();
+    }
+    // @Trace()
+    /**
+     * @param {?} state
+     * @return {?}
+     */
+    add(state) {
+        /** @type {?} */
+        const history = this.getHistory(state.placeDefinition);
+        /** @type {?} */
+        const 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 {?}
+     */
+    getHistory(placeDef) {
+        /** @type {?} */
+        let history = this._history.get(placeDef);
+        if (!history) {
+            history = [];
+            this.setHistory(placeDef, history);
+        }
+        return history;
+    }
+    /**
+     * @private
+     * @param {?} placeDef
+     * @param {?} history
+     * @return {?}
+     */
+    setHistory(placeDef, history) {
+        this._history.set(placeDef, history);
+    }
+}
+PlaceHistory.decorators = [
+    { type: Injectable, args: [{
+                providedIn: 'root'
+            },] }
+];
+/** @nocollapse */
+PlaceHistory.ctorParameters = () => [
+    { type: Router }
+];
+/** @nocollapse */ PlaceHistory.ngInjectableDef = ɵɵdefineInjectable({ factory: function PlaceHistory_Factory() { return new PlaceHistory(ɵɵinject(Router)); }, token: PlaceHistory, providedIn: "root" });
+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
@@ -3034,12 +3034,25 @@ class PlaceRouter extends GarbageCollector {
     /**
      *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));
      * @param {?} visit
+     * @param {?=} options
      * @return {?}
      */
-    // @Trace()
-    navigate(visit) {
+    navigate(visit, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.doNavigation(visit);
+            this.doNavigation(visit, (/**
+             * @param {?} router
+             * @return {?}
+             */
+            (router) => __awaiter(this, void 0, void 0, function* () {
+                /** @type {?} */
+                const commands = [
+                    visit.placeDefinition.path,
+                    ...this.createRouteParameters(visit)
+                ];
+                yield this.router.navigate(commands, {
+                    relativeTo: options ? options.relativeTo : null
+                });
+            })));
         });
     }
     /**
@@ -3063,13 +3076,11 @@ class PlaceRouter extends GarbageCollector {
                     /** @type {?} */
                     const relativePath = !!previous.placeDefinition.hasRouteId() ? '..' : '.';
                     /** @type {?} */
-                    const def = next.placeDefinition;
-                    /** @type {?} */
-                    const params = next.hasRouteId() ?
-                        [def.getFormattedRouteId(next), def.getFormattedRouteParameters(next)] :
-                        [def.getFormattedRouteParameters(next)];
-                    /** @type {?} */
-                    const commands = [relativePath].concat(params, this.getChildPath(activatedRoute.snapshot));
+                    const commands = [
+                        relativePath,
+                        ...this.createRouteParameters(next),
+                        ...this.extractChildPath(activatedRoute.snapshot)
+                    ];
                     console.log('### Redirect', commands);
                     return router.navigate(commands, {
                         relativeTo: activatedRoute
@@ -3080,29 +3091,14 @@ class PlaceRouter extends GarbageCollector {
     }
     /**
      * @param {?} visit
-     * @param {?=} customNavigation
+     * @param {?} customNavigation
      * @return {?}
      */
     doNavigation(visit, customNavigation) {
         return __awaiter(this, void 0, void 0, function* () {
             this._navigationSessionModel.value = NavigationSession.createInternal(visit);
             try {
-                if (customNavigation) {
-                    yield customNavigation(this.router);
-                }
-                else {
-                    /** @type {?} */
-                    const def = visit.placeDefinition;
-                    // @see https://coolon.atlassian.net/browse/AUP-41
-                    /** @type {?} */
-                    const parameterCommands = visit.hasRouteId() ?
-                        [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
-                        [def.getFormattedRouteParameters(visit)];
-                    /** @type {?} */
-                    const commands = [def.path].concat(parameterCommands);
-                    console.log('_doNavigation', visit, commands);
-                    yield this.router.navigate(commands);
-                }
+                yield customNavigation(this.router);
             }
             finally {
                 if (this.navigationSession && !this.router.getCurrentNavigation()) {
@@ -3111,6 +3107,18 @@ class PlaceRouter extends GarbageCollector {
             }
         });
     }
+    /**
+     * @private
+     * @param {?} visit
+     * @return {?}
+     */
+    createRouteParameters(visit) {
+        /** @type {?} */
+        const def = visit.placeDefinition;
+        return visit.hasRouteId() ?
+            [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
+            [def.getFormattedRouteParameters(visit)];
+    }
     // @Trace()
     /**
      * @private
@@ -3155,7 +3163,7 @@ class PlaceRouter extends GarbageCollector {
      * @param {?} activatedRoute
      * @return {?}
      */
-    getChildPath(activatedRoute) {
+    extractChildPath(activatedRoute) {
         return ___default.flatten(activatedRoute.children.map((/**
          * @param {?} child
          * @return {?}
@@ -3175,6 +3183,12 @@ PlaceRouter.ctorParameters = () => [
     { 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),
@@ -3290,13 +3304,13 @@ class PlaceOutletComponent extends DisposableComponent {
     /**
      * @param {?} router
      * @param {?} placeRouter
-     * @param {?} placeHistory
+     * @param {?} parentOutlet
      */
-    constructor(router, placeRouter, placeHistory) {
+    constructor(router, placeRouter, parentOutlet) {
         super();
         this.router = router;
         this.placeRouter = placeRouter;
-        this.placeHistory = placeHistory;
+        this.parentOutlet = parentOutlet;
         this.animate = true;
         this.placeChanged = new EventEmitter();
         this._activePlace = new MutableValueModel();
@@ -3353,6 +3367,16 @@ class PlaceOutletComponent extends DisposableComponent {
      */
     ngOnInit() {
     }
+    /**
+     * @param {?} visit
+     * @return {?}
+     */
+    navigate(visit) {
+        console.log({ activatedRoute: this._activatedRouteModel.value });
+        this.placeRouter.navigate(visit, {
+            relativeTo: this.parentOutlet ? this.parentOutlet.activatedRouteModel.value : null
+        });
+    }
     /**
      * @param {?} next
      * @param {?} previous
@@ -3369,6 +3393,12 @@ class PlaceOutletComponent extends DisposableComponent {
     get activePlaceModel() {
         return this._activePlace.readonly;
     }
+    /**
+     * @return {?}
+     */
+    get activatedRouteModel() {
+        return this._activatedRouteModel.readonly;
+    }
     /**
      * @param {?} routerOutlet
      * @param {?} place
@@ -3424,13 +3454,6 @@ class PlaceOutletComponent extends DisposableComponent {
             this._activePlace.value.onPlaceReady();
         }
     }
-    /**
-     * @param {?} placeDestination
-     * @return {?}
-     */
-    activate(placeDestination) {
-        // this.router.
-    }
 }
 PlaceOutletComponent.decorators = [
     { type: Component, args: [{
@@ -3444,13 +3467,31 @@ PlaceOutletComponent.decorators = [
 PlaceOutletComponent.ctorParameters = () => [
     { 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);
 if (false) {
     /** @type {?} */
     PlaceOutletComponent.prototype.animate;
@@ -3493,11 +3534,8 @@ if (false) {
      * @private
      */
     PlaceOutletComponent.prototype.placeRouter;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceOutletComponent.prototype.placeHistory;
+    /** @type {?} */
+    PlaceOutletComponent.prototype.parentOutlet;
 }
 
 /**
@@ -4232,6 +4270,8 @@ function RouteId(type, options) {
  * @return {?}
  */
 function VisitParameter(options) {
+    /** @type {?} */
+    const opts = Opts.get(options);
     return (/**
      * @param {?} prototype
      * @param {?} propertyKey
@@ -4239,7 +4279,7 @@ function VisitParameter(options) {
      */
     (prototype, propertyKey) => {
         /** @type {?} */
-        const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, options.storeInUrl);
+        const param = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
         Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
         UseDelegate()(prototype, propertyKey);
     });
@@ -4250,6 +4290,8 @@ function VisitParameter(options) {
  * @return {?}
  */
 function VisitParameterList(options) {
+    /** @type {?} */
+    const opts = Opts.get(options);
     return (/**
      * @param {?} prototype
      * @param {?} propertyKey
@@ -4257,7 +4299,7 @@ function VisitParameterList(options) {
      */
     (prototype, propertyKey) => {
         /** @type {?} */
-        const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, options.storeInUrl);
+        const param = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional("storeInUrl", null));
         Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, param);
         UseDelegate()(prototype, propertyKey);
     });
@@ -4609,16 +4651,16 @@ class PlaceRouteGuard {
                 /** @type {?} */
                 const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
                 /** @type {?} */
-                const updatedVisit = yield sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));
+                const sanitisedVisit = yield sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));
                 // 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)) {
+                this.placeRouter.navigationSession.storeVisit(sanitisedVisit);
+                if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
                     /** @type {?} */
-                    const parameterCommands = updatedVisit.hasRouteId() ?
-                        [placeDefinition.getFormattedRouteId(updatedVisit), placeDefinition.getFormattedRouteParameters(updatedVisit)] :
-                        [placeDefinition.getFormattedRouteParameters(updatedVisit)];
+                    const parameterCommands = sanitisedVisit.hasRouteId() ?
+                        [placeDefinition.getFormattedRouteId(sanitisedVisit), placeDefinition.getFormattedRouteParameters(sanitisedVisit)] :
+                        [placeDefinition.getFormattedRouteParameters(sanitisedVisit)];
                     /** @type {?} */
-                    const commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.getChildPath(activatedRoute));
+                    const commands = [(activatedRoute.url[0].path)].concat(parameterCommands, this.placeRouter.extractChildPath(activatedRoute));
                     console.log('##### Redirect', commands);
                     return this.router.createUrlTree(commands, {
                         replaceUrl: true,