@coolon/angular-ui-powerups 0.0.125 → 0.0.128

package/esm2015/lib/place/components/place-outlet/place-outlet.component.js

@@ -5,7 +5,7 @@
 import * as tslib_1 from "tslib";
 import { Component, EventEmitter, Inject, Input, Optional, Output, SkipSelf, ViewChild } from '@angular/core';
 import { Router, RouterOutlet } from '@angular/router';
-import { DebugContext, DelegatingValueModel, Dsl, Guard, ListModel, MutableValueModel, StoreInListModel, StoreInValueModel, UseDelegate, ValueModel } from '@coolon/pectin';
+import { DebugContext, Dsl, lang, ListModel, MutableValueModel, StoreInListModel, StoreInValueModel, UseDelegate, ValueModel } from '@coolon/pectin';
 import * as _ from 'lodash';
 import { DisposableComponent } from '../../../components/disposable-component';
 import { AUP_PLACE_CONFIG } from '../../place-config';
@@ -41,23 +41,14 @@ export class PlaceOutletComponent extends DisposableComponent {
         this.placeRouter = placeRouter;
         this.placeConfig = placeConfig;
         this.placeChanged = new EventEmitter();
-        this._activePlace = new MutableValueModel();
-        this._activePlaceVisitModel = new DelegatingValueModel();
-        this._inOutletActivation = new Guard();
-        this._inOutletDeactivation = new Guard();
-        this._inRouteVisitUpdate = new Guard();
+        this.outletActivated = new MutableValueModel(false);
         this._activatedRouteModel = new MutableValueModel();
-        this._placeDefinition = new MutableValueModel();
+        this._activePlaceModel = new MutableValueModel();
         this.initialPlaceIndex = null;
+        this._isPushingVisitToRoute = new MutableValueModel(false);
         const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
         this.parentOutletModel = new MutableValueModel(parentOutlet);
         /** @type {?} */
-        const mutableValueModel = new MutableValueModel();
-        DebugContext.tag(mutableValueModel, "PlaceOutletComponent -> mutableValueModel");
-        this._activePlaceVisitModel.setDelegate(mutableValueModel);
-        DebugContext.tag(this._activePlaceVisitModel, "PlaceOutletComponent._activePlaceVisitModel");
-        this._inOutletUpdate = valueOf.any(this._inOutletDeactivation, this._inOutletActivation).areTruthy();
-        /** @type {?} */
         const defaultPlaceAnimationOrder = chain(this.parentOutletModel)
             .pullValueModel((/**
          * @param {?} o
@@ -90,35 +81,31 @@ export class PlaceOutletComponent extends DisposableComponent {
             }
             return _.isNil(this.initialPlaceIndex) ? 0 : placeIndex - this.initialPlaceIndex;
         }), { dependsOn: activatePlaceType });
-        // Push incoming changes into the component
-        this.routerVisit = chain(this._activePlace).pluck('placeDefinition').findIn(placeRouter.activeVisitIndex);
-        // Our router visit will change when our active is nullified during deactivation, which will push a null visit
-        // the the deactivated component, which will nuke it's view before the animations have finished.
-        // The visit will alway updated after the router session is finsised (when the new visits are registered) so
-        // we can safely ignore it during outlet changes as these always happen before the router session ends.
-        when.valueOf(this.routerVisit).changes((/**
+        // Extract our visit model from the place router.
+        this._activePlaceDefinition = chain(this._activePlaceModel).pluck('placeDefinition');
+        this.routerVisitModel = this._activePlaceDefinition.findIn(chain(placeRouter.activeVisitsByPlaceDefinition));
+        this.navigationInProgress = chain(this.placeRouter.navigationInProgress);
+        when.valueOf(this.navigationInProgress).becomesFalsey((/**
          * @return {?}
          */
-        () => this.pushRouteChangesToVisit()), { unless: this._inOutletUpdate });
-        // Handle component based changes
-        when.valueOf(this._activePlaceVisitModel).changes((/**
-         * @param {?} next
-         * @param {?} previous
+        () => {
+            this.checkStateAndInitialise();
+        }));
+        when.valueOf(this.outletActivated).becomesTruthy((/**
          * @return {?}
          */
-        (next, previous) => {
-            this.pushVisitChangesToRoute(next, previous);
-        }), {
-            unless: this.placeRouter.navigationInProgress
-        });
-        chain(this._activePlace)
-            .postponeWhile(placeRouter.navigationInProgress)
+        () => {
+            this.checkStateAndInitialise();
+        }));
+        chain(this._activePlaceModel)
+            .postponeWhile(this.navigationInProgress)
             .subscribe((/**
          * @param {?} place
          * @return {?}
          */
         place => this.placeChanged.emit(place)));
     }
+    // @Trace()
     /**
      * @return {?}
      */
@@ -154,93 +141,104 @@ export class PlaceOutletComponent extends DisposableComponent {
     get parentOutlet() {
         return this.parentOutletModel.value;
     }
-    // @Trace()
     /**
      * @return {?}
      */
-    pushRouteChangesToVisit() {
-        /** @type {?} */
-        const visit = this.routerVisit.value;
-        // console.log({
-        //   visit,
-        //   place: visit ? visit.placeDefinition.component : null,
-        //   inOutletActivation: this._inOutletActivation.value,
-        //   inRoutingSession: this.placeRouter.navigationSessionActive.value
-        // });
-        if (visit) { // can be null while the place and index sync up
-            this._inRouteVisitUpdate.whileTrue((/**
-             * @return {?}
-             */
-            () => {
-                this._activePlaceVisitModel.value = visit;
-            }));
-        }
+    get activePlaceModel() {
+        return this._activePlaceModel.readonly;
     }
     /**
-     * @param {?} next
-     * @param {?} previous
      * @return {?}
      */
-    pushVisitChangesToRoute(next, previous) {
-        /** @type {?} */
-        const activatedRoute = this._activatedRouteModel.value;
-        this.placeRouter.pushVisitChangesToRoute(activatedRoute, previous, next);
+    get activatedRouteModel() {
+        return this._activatedRouteModel.readonly;
     }
+    // @Trace()
     /**
+     * @param {?} routerOutlet
+     * @param {?} place
      * @return {?}
      */
-    get activePlaceModel() {
-        return this._activePlace.readonly;
+    onOutletActivated(routerOutlet, place) {
+        this._activatedRouteModel.value = routerOutlet.activatedRoute;
+        this._activePlaceModel.value = place;
+        this.outletActivated.value = true;
+        this.checkStateAndInitialise();
     }
+    // @Trace()
     /**
      * @return {?}
      */
-    get activatedRouteModel() {
-        return this._activatedRouteModel.readonly;
+    onOutletDeactivated() {
+        this.outletActivated.value = false;
+        this._activePlaceModel.value = null;
+        this._activatedRouteModel.value = null;
     }
     // @Trace()
     /**
-     * @param {?} routerOutlet
-     * @param {?} place
+     * @private
      * @return {?}
      */
-    onOutletActivated(routerOutlet, place) {
-        this._inOutletActivation.whileTrue((/**
+    checkStateAndInitialise() {
+        /** @type {?} */
+        const routerVisit = this.routerVisitModel.value;
+        /** @type {?} */
+        const activePlace = this.activePlaceModel.value;
+        if (routerVisit && activePlace && !activePlace.isInitialised()) {
+            if (routerVisit.placeDefinition !== activePlace.placeDefinition) {
+                lang.illegalState('wrong visit!!!');
+            }
+            this.initialisePlace(routerVisit, activePlace);
+        }
+    }
+    // @Trace()
+    /**
+     * @private
+     * @param {?} routerVisit
+     * @param {?} activePlace
+     * @return {?}
+     */
+    initialisePlace(routerVisit, activePlace) {
+        /** @type {?} */
+        const visitModel = new MutableValueModel(routerVisit);
+        DebugContext.tag(visitModel, `PlaceOutletComponent[${activePlace.constructor.name})].visitModel`);
+        activePlace.initialiseVisit(routerVisit, (/**
+         * @param {?} current
+         * @param {?} previous
          * @return {?}
          */
-        () => {
-            try {
-                this._activePlace.value = place;
-                this._activatedRouteModel.value = routerOutlet.activatedRoute;
-                this._placeDefinition.value = place.placeDefinition;
-                /** @type {?} */
-                const visitModel = new MutableValueModel();
-                DebugContext.tag(visitModel, "PlaceOutletCompeont.visitModel");
-                this._activePlaceVisitModel.setDelegate(visitModel);
-                place.initialiseVisit(visitModel);
-            }
-            catch (error) {
-                console.error(error);
-            }
+        (current, previous) => {
+            this.pushVisitChangeToRoute(previous, current);
         }));
         if (!this.animateModel.value) {
             // we're not animating so trigger any post animation callbacks now.
             this.animationDone();
         }
+        const { when, chain, valueOf } = Dsl.disposeWith(activePlace);
+        when.valueOf(this.routerVisitModel)
+            .changes((/**
+         * @param {?} visit
+         * @return {?}
+         */
+        visit => {
+            activePlace.updateVisit(visit);
+        }), {
+            unless: valueOf.any(this._isPushingVisitToRoute, this.routerVisitModel.isNil()).areTruthy()
+        });
     }
-    // @Trace()
     /**
+     * @private
+     * @param {?} previous
+     * @param {?} current
      * @return {?}
      */
-    onOutletDeactivated() {
-        this._inOutletDeactivation.whileTrue((/**
+    pushVisitChangeToRoute(previous, current) {
+        this._isPushingVisitToRoute.value = true;
+        this.placeRouter.pushVisitChangesToRoute(previous, current).finally((/**
          * @return {?}
          */
         () => {
-            this._activePlace.value = null;
-            this._activatedRouteModel.value = null;
-            this._placeDefinition.value = null;
-            this._activePlaceVisitModel.setDelegate(null);
+            this._isPushingVisitToRoute.value = false;
         }));
     }
     // @Trace()
@@ -248,22 +246,22 @@ export class PlaceOutletComponent extends DisposableComponent {
      * @return {?}
      */
     animationStarted() {
-        // console.log({ activePlace: this._activePlace.value });
+        // console.log({ activePlace: this._activePlaceModel.value });
     }
     // @Trace()
     /**
      * @return {?}
      */
     animationDone() {
-        if (this._activePlace.value) {
-            this._activePlace.value.onPlaceReady();
+        if (this._activePlaceModel.value) {
+            this._activePlaceModel.value.onPlaceReady();
         }
     }
 }
 PlaceOutletComponent.decorators = [
     { type: Component, args: [{
                 selector: 'aup-place-outlet',
-                template: "<div class=\"router-outlet-container\"\n     [@routeAnimations]=\"{value: getAnimationOrder(), params:{duration: animationDuration}}\"\n     [@.disabled]=\"!animateModel.value\"\n     (@routeAnimations.start)=\"animationStarted()\"\n     (@routeAnimations.done)=\"animationDone()\"\n>\n  <router-outlet #routerOutlet=\"outlet\"\n                 (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                 (deactivate)=\"onOutletDeactivated()\">\n  </router-outlet>\n</div>\n\n",
+                template: "<ng-container *ngIf=\"animateModel.value\">\n  <div class=\"router-outlet-container\"\n       [@routeAnimations]=\"{value: getAnimationOrder(), params:{duration: animationDuration}}\"\n       (@routeAnimations.start)=\"animationStarted()\"\n       (@routeAnimations.done)=\"animationDone()\"\n  >\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<ng-container *ngIf=\"!animateModel.value\">\n  <div class=\"router-outlet-container\">\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n",
                 animations: [LEFT_RIGHT_PLACE_ANIMATION],
                 styles: [":host{display:flex;flex-direction:column;min-height:0;overflow-x:hidden}.router-outlet-container{flex:1;display:block;position:relative;min-height:0}router-outlet{display:none}"]
             }] }
@@ -316,59 +314,49 @@ if (false) {
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype._activePlace;
+    PlaceOutletComponent.prototype.outletActivated;
     /**
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype._activePlaceVisitModel;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceOutletComponent.prototype._inOutletActivation;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceOutletComponent.prototype._inOutletDeactivation;
+    PlaceOutletComponent.prototype._activatedRouteModel;
     /**
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype._inOutletUpdate;
+    PlaceOutletComponent.prototype._activePlaceModel;
     /**
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype._inRouteVisitUpdate;
+    PlaceOutletComponent.prototype._activePlaceDefinition;
     /**
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype._activatedRouteModel;
+    PlaceOutletComponent.prototype.parentOutletModel;
+    /** @type {?} */
+    PlaceOutletComponent.prototype.placeAnimationOrder;
     /**
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype._placeDefinition;
+    PlaceOutletComponent.prototype.initialPlaceIndex;
     /**
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype.parentOutletModel;
-    /** @type {?} */
-    PlaceOutletComponent.prototype.placeAnimationOrder;
+    PlaceOutletComponent.prototype.routerVisitModel;
     /**
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype.initialPlaceIndex;
+    PlaceOutletComponent.prototype._isPushingVisitToRoute;
     /**
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype.routerVisit;
+    PlaceOutletComponent.prototype.navigationInProgress;
     /**
      * @type {?}
      * @private

package/esm2015/lib/place/components/place-outlet/place-outlet.component.js.map

@@ -1 +1 @@
-{"version":3,"file":"place-outlet.component.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/components/place-outlet/place-outlet.component.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAU,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACtH,OAAO,EAAkB,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAEU,YAAY,EAC3B,oBAAoB,EACpB,GAAG,EACH,KAAK,EACL,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,UAAU,EAEX,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;;;;AAGhE,uBAMC;;;IALC,mCAAyC;;;;;IAEzC,6DAAmD;;;;IAEnD,kDAAqB;;AASvB,MAAM,OAAO,oBAAqB,SAAQ,mBAAmB;;;;;;;IAsC3D,YAA6B,MAAc,EACd,WAAwB,EACM,WAAwB,EAC/C,YAAkC;QACpE,KAAK,EAAE,CAAC;QAJmB,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAAa;QACM,gBAAW,GAAX,WAAW,CAAa;QAvB1E,iBAAY,GAAG,IAAI,YAAY,EAAkB,CAAC;QAK1C,iBAAY,GAAG,IAAI,iBAAiB,EAAkB,CAAC;QACvD,2BAAsB,GAAG,IAAI,oBAAoB,EAAS,CAAC;QAE3D,wBAAmB,GAAG,IAAI,KAAK,EAAE,CAAC;QAClC,0BAAqB,GAAG,IAAI,KAAK,EAAE,CAAC;QAEpC,wBAAmB,GAAG,IAAI,KAAK,EAAE,CAAC;QAClC,yBAAoB,GAAG,IAAI,iBAAiB,EAAkB,CAAC;QAE/D,qBAAgB,GAAG,IAAI,iBAAiB,EAAmB,CAAC;QAIrE,sBAAiB,GAAW,IAAI,CAAC;cAQjC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC;QAExF,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,YAAY,CAAC,CAAC;;cACvD,iBAAiB,GAAG,IAAI,iBAAiB,EAAS;QACxD,YAAY,CAAC,GAAG,CAAC,iBAAiB,EAAE,2CAA2C,CAAC,CAAC;QACjF,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QAC3D,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,6CAA6C,CAAC,CAAC;QAC7F,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC,SAAS,EAAE,CAAC;;cAE/F,0BAA0B,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC;aAC7D,cAAc;;;;QAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAC;aACvC,KAAK,CAAC,iBAAiB,CAAC;aACxB,SAAS,CAAC,UAAU,CAAC;aACrB,KAAK,CAAC,WAAW,CAAC;;cAEf,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,GAAG;;;;QAAC,CAAC,CAAC,EAAE,CAAC,mBAAA,CAAC,CAAC,WAAW,EAAiC,EAAC;QAC/G,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC,IAAI,CAAC,8BAA8B,CAAC;aAClE,SAAS,CAAC,0BAA0B,CAAC;aACrC,MAAM;;;;QAAC,CAAC,aAAa,EAAE,EAAE;;gBACpB,UAAU,GAAG,CAAC;YAClB,IAAI,iBAAiB,CAAC,KAAK,EAAE;gBAC3B,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAC5D,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE;oBACnC,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;iBACrC;aACF;YACD,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACnF,CAAC,GAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAEvC,2CAA2C;QAC3C,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAC1G,8GAA8G;QAC9G,gGAAgG;QAChG,4GAA4G;QAC5G,uGAAuG;QACvG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO;;;QAAC,GAAG,EAAE,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAE,EAAE,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;QAE/G,iCAAiC;QACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,OAAO;;;;;QAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;YACnE,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC,GAAE;YACD,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,oBAAoB;SAC9C,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;aACrB,aAAa,CAAC,WAAW,CAAC,oBAAoB,CAAC;aAC/C,SAAS;;;;QAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAC,CAAC;IAEvD,CAAC;;;;IAED,QAAQ;IACR,CAAC;;;;;IAGD,iBAAiB;QACf,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;IACxC,CAAC;;;;IAED,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/G,CAAC;;;;;;IAGD,QAAQ,CAAC,KAAY;QACnB,oEAAoE;QACpE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE;YAC/B,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;SACnF,CAAC,CAAC;IACL,CAAC;;;;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;IACtC,CAAC;;;;;IAGD,uBAAuB;;cACf,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK;QACpC,gBAAgB;QAChB,WAAW;QACX,2DAA2D;QAC3D,wDAAwD;QACxD,qEAAqE;QACrE,MAAM;QACN,IAAI,KAAK,EAAE,EAAE,gDAAgD;YAC3D,IAAI,CAAC,mBAAmB,CAAC,SAAS;;;YAAC,GAAG,EAAE;gBACtC,IAAI,CAAC,sBAAsB,CAAC,KAAK,GAAG,KAAK,CAAC;YAC5C,CAAC,EAAC,CAAC;SACJ;IACH,CAAC;;;;;;IAED,uBAAuB,CAAC,IAAW,EAAE,QAAe;;cAC5C,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK;QACtD,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;;;;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;IACpC,CAAC;;;;IAED,IAAI,mBAAmB;QACrB,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;IAC5C,CAAC;;;;;;;IAGD,iBAAiB,CAAC,YAA0B,EAAE,KAAqB;QACjE,IAAI,CAAC,mBAAmB,CAAC,SAAS;;;QAAC,GAAG,EAAE;YACtC,IAAI;gBACF,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC;gBAChC,IAAI,CAAC,oBAAoB,CAAC,KAAK,GAAG,YAAY,CAAC,cAAc,CAAC;gBAC9D,IAAI,CAAC,gBAAgB,CAAC,KAAK,GAAG,KAAK,CAAC,eAAe,CAAC;;sBAC9C,UAAU,GAAG,IAAI,iBAAiB,EAAS;gBACjD,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,gCAAgC,CAAC,CAAC;gBAC/D,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;gBACpD,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;aACnC;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACtB;QACH,CAAC,EAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YAC5B,mEAAmE;YACnE,IAAI,CAAC,aAAa,EAAE,CAAC;SACtB;IACH,CAAC;;;;;IAGD,mBAAmB;QACjB,IAAI,CAAC,qBAAqB,CAAC,SAAS;;;QAAC,GAAG,EAAE;YACxC,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC;YAC/B,IAAI,CAAC,oBAAoB,CAAC,KAAK,GAAG,IAAI,CAAC;YACvC,IAAI,CAAC,gBAAgB,CAAC,KAAK,GAAG,IAAI,CAAC;YACnC,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC,EAAC,CAAC;IACL,CAAC;;;;;IAGD,gBAAgB;QACd,yDAAyD;IAC3D,CAAC;;;;;IAGD,aAAa;QACX,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;YAC3B,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;SACxC;IACH,CAAC;;;YAjMF,SAAS,SAAC;gBACT,QAAQ,EAAE,kBAAkB;gBAC5B,sfAA4C;gBAE5C,UAAU,EAAE,CAAC,0BAA0B,CAAC;;aACzC;;;;YAvCwB,MAAM;YAoBtB,WAAW;4CA4DL,QAAQ,YAAI,MAAM,SAAC,gBAAgB;YACE,oBAAoB,uBAAzD,QAAQ,YAAI,QAAQ;;;sBAvChC,KAAK;2BAGL,KAAK;6CAIL,KAAK,SAAC,0BAA0B;wCAIhC,KAAK,SAAC,qBAAqB;2BAG3B,MAAM;wBAGN,SAAS,SAAC,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;;AAhB1C;IADU,iBAAiB,CAAC,cAAc,CAAC;;qDAC1B;AAGjB;IADU,WAAW,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;sCAC/B,UAAU;0DAAU;AAIlC;IADoC,WAAW,EAAE;sCACjB,SAAS;4EAAgC;AAIzE;IAD+B,gBAAgB,CAAC,gCAAgC,CAAC;;uEACtB;;;IAZ3D,uCACiB;;IAEjB,4CACkC;;IAGlC,8DACyE;;IAGzE,yDAC2D;;IAE3D,4CAC2D;;IAE3D,yCACwB;;;;;IAExB,4CAAwE;;;;;IACxE,sDAA4E;;;;;IAE5E,mDAAmD;;;;;IACnD,qDAAqD;;;;;IACrD,+CAAyD;;;;;IACzD,mDAAmD;;;;;IACnD,oDAAgF;;;;;IAEhF,gDAA6E;;;;;IAC7E,iDAAmE;;IACnE,mDAA6D;;;;;IAE7D,iDAAyC;;;;;IACzC,2CAA4C;;;;;IAEhC,sCAA+B;;;;;IAC/B,2CAAyC;;IACzC,2CAAuE","sourcesContent":["import { Component, EventEmitter, Inject, Input, OnInit, Optional, Output, SkipSelf, ViewChild } from '@angular/core';\nimport { ActivatedRoute, Router, RouterOutlet } from '@angular/router';\nimport {\n  BooleanValueModelChain,\n  Constructable, DebugContext,\n  DelegatingValueModel,\n  Dsl,\n  Guard,\n  ListModel,\n  MutableValueModel,\n  StoreInListModel,\n  StoreInValueModel,\n  UseDelegate,\n  ValueModel,\n  ValueModelChain\n} from '@coolon/pectin';\nimport * as _ from 'lodash';\nimport { DisposableComponent } from '../../../components/disposable-component';\nimport { PlaceComponent } from '../../place-component';\nimport { AUP_PLACE_CONFIG, PlaceConfig } from '../../place-config';\nimport { PlaceDefinition } from '../../place-definition';\nimport { PlaceRouter } from '../../place-router';\n\nimport { Visit } from '../../visit';\nimport { LEFT_RIGHT_PLACE_ANIMATION } from './route-animations';\n\n// Quick hack to avoid circular references between this and PlaceComponents.\ninterface PlaceRef {\n  readonly placeDefinition: PlaceDefinition\n\n  initialiseBindings(param: ValueModel<Visit>): void;\n\n  onPlaceReady(): void;\n}\n\n@Component({\n  selector: 'aup-place-outlet',\n  templateUrl: './place-outlet.component.html',\n  styleUrls: ['./place-outlet.component.scss'],\n  animations: [LEFT_RIGHT_PLACE_ANIMATION]\n})\nexport class PlaceOutletComponent extends DisposableComponent implements OnInit {\n\n  @Input() @StoreInValueModel('animateModel')\n  animate: boolean;\n\n  @Input() @UseDelegate({ defaultValue: true })\n  animateModel: ValueModel<boolean>;\n\n  // tslint:disable-next-line:no-input-rename\n  @Input('placeAnimationOrderModel') @UseDelegate()\n  customPlaceAnimationOrderModel: ListModel<Constructable<PlaceComponent>>;\n\n  // tslint:disable-next-line:no-input-rename\n  @Input('placeAnimationOrder') @StoreInListModel('customPlaceAnimationOrderModel')\n  customPlaceAnimationOrder: Constructable<PlaceComponent>[];\n\n  @Output()\n  readonly placeChanged = new EventEmitter<PlaceComponent>();\n\n  @ViewChild('routeOutlet', { static: true })\n  routerOut: RouterOutlet;\n\n  private readonly _activePlace = new MutableValueModel<PlaceComponent>();\n  private readonly _activePlaceVisitModel = new DelegatingValueModel<Visit>();\n\n  private readonly _inOutletActivation = new Guard();\n  private readonly _inOutletDeactivation = new Guard();\n  private readonly _inOutletUpdate: BooleanValueModelChain;\n  private readonly _inRouteVisitUpdate = new Guard();\n  private readonly _activatedRouteModel = new MutableValueModel<ActivatedRoute>();\n\n  private readonly _placeDefinition = new MutableValueModel<PlaceDefinition>();\n  private parentOutletModel: MutableValueModel<PlaceOutletComponent>;\n  public readonly placeAnimationOrder: ValueModelChain<number>;\n\n  private initialPlaceIndex: number = null;\n  private routerVisit: ValueModelChain<Visit>;\n\n  constructor(private readonly router: Router,\n              private readonly placeRouter: PlaceRouter,\n              @Optional() @Inject(AUP_PLACE_CONFIG) readonly placeConfig: PlaceConfig,\n              @SkipSelf() @Optional() parentOutlet: PlaceOutletComponent) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n\n    this.parentOutletModel = new MutableValueModel(parentOutlet);\n    const mutableValueModel = new MutableValueModel<Visit>();\n    DebugContext.tag(mutableValueModel, \"PlaceOutletComponent -> mutableValueModel\");\n    this._activePlaceVisitModel.setDelegate(mutableValueModel);\n    DebugContext.tag(this._activePlaceVisitModel, \"PlaceOutletComponent._activePlaceVisitModel\");\n    this._inOutletUpdate = valueOf.any(this._inOutletDeactivation, this._inOutletActivation).areTruthy();\n\n    const defaultPlaceAnimationOrder = chain(this.parentOutletModel)\n      .pullValueModel(o => o.activePlaceModel)\n      .pluck('placeDefinition')\n      .pluckList('children')\n      .pluck('component');\n\n    const activatePlaceType = chain(this.activePlaceModel).map(p => p.constructor as Constructable<PlaceComponent>);\n    this.placeAnimationOrder = chain(this.customPlaceAnimationOrderModel)\n      .otherwise(defaultPlaceAnimationOrder)\n      .reduce((placesInOrder) => {\n        let placeIndex = 0;\n        if (activatePlaceType.value) {\n          placeIndex = placesInOrder.indexOf(activatePlaceType.value);\n          if (_.isNil(this.initialPlaceIndex)) {\n            this.initialPlaceIndex = placeIndex;\n          }\n        }\n        return _.isNil(this.initialPlaceIndex) ? 0 : placeIndex - this.initialPlaceIndex;\n      }, { dependsOn: activatePlaceType });\n\n    // Push incoming changes into the component\n    this.routerVisit = chain(this._activePlace).pluck('placeDefinition').findIn(placeRouter.activeVisitIndex);\n    // Our router visit will change when our active is nullified during deactivation, which will push a null visit\n    // the the deactivated component, which will nuke it's view before the animations have finished.\n    // The visit will alway updated after the router session is finsised (when the new visits are registered) so\n    // we can safely ignore it during outlet changes as these always happen before the router session ends.\n    when.valueOf(this.routerVisit).changes(() => this.pushRouteChangesToVisit(), { unless: this._inOutletUpdate });\n\n    // Handle component based changes\n    when.valueOf(this._activePlaceVisitModel).changes((next, previous) => {\n      this.pushVisitChangesToRoute(next, previous);\n    }, {\n      unless: this.placeRouter.navigationInProgress\n    });\n\n    chain(this._activePlace)\n      .postponeWhile(placeRouter.navigationInProgress)\n      .subscribe(place => this.placeChanged.emit(place));\n\n  }\n\n  ngOnInit() {\n  }\n\n  // @Trace()\n  getAnimationOrder() {\n    return this.placeAnimationOrder.value;\n  }\n\n  get animationDuration() {\n    return this.placeConfig && this.placeConfig.animationDuration ? this.placeConfig.animationDuration : '500ms';\n  }\n\n  // @Trace()\n  navigate(visit: Visit) {\n    // console.log({ activatedRoute: this._activatedRouteModel.value });\n    this.placeRouter.navigate(visit, {\n      relativeTo: this.parentOutlet ? this.parentOutlet.activatedRouteModel.value : null\n    });\n  }\n\n  get parentOutlet(): PlaceOutletComponent {\n    return this.parentOutletModel.value;\n  }\n\n  // @Trace()\n  pushRouteChangesToVisit() {\n    const visit = this.routerVisit.value;\n    // console.log({\n    //   visit,\n    //   place: visit ? visit.placeDefinition.component : null,\n    //   inOutletActivation: this._inOutletActivation.value,\n    //   inRoutingSession: this.placeRouter.navigationSessionActive.value\n    // });\n    if (visit) { // can be null while the place and index sync up\n      this._inRouteVisitUpdate.whileTrue(() => {\n        this._activePlaceVisitModel.value = visit;\n      });\n    }\n  }\n\n  pushVisitChangesToRoute(next: Visit, previous: Visit) {\n    const activatedRoute = this._activatedRouteModel.value;\n    this.placeRouter.pushVisitChangesToRoute(activatedRoute, previous, next);\n  }\n\n  get activePlaceModel(): ValueModel<PlaceComponent> {\n    return this._activePlace.readonly;\n  }\n\n  get activatedRouteModel(): ValueModel<ActivatedRoute> {\n    return this._activatedRouteModel.readonly;\n  }\n\n  // @Trace()\n  onOutletActivated(routerOutlet: RouterOutlet, place: PlaceComponent) {\n    this._inOutletActivation.whileTrue(() => {\n      try {\n        this._activePlace.value = place;\n        this._activatedRouteModel.value = routerOutlet.activatedRoute;\n        this._placeDefinition.value = place.placeDefinition;\n        const visitModel = new MutableValueModel<Visit>();\n        DebugContext.tag(visitModel, \"PlaceOutletCompeont.visitModel\");\n        this._activePlaceVisitModel.setDelegate(visitModel);\n        place.initialiseVisit(visitModel);\n      } catch (error) {\n        console.error(error);\n      }\n    });\n    if (!this.animateModel.value) {\n      // we're not animating so trigger any post animation callbacks now.\n      this.animationDone();\n    }\n  }\n\n  // @Trace()\n  onOutletDeactivated() {\n    this._inOutletDeactivation.whileTrue(() => {\n      this._activePlace.value = null;\n      this._activatedRouteModel.value = null;\n      this._placeDefinition.value = null;\n      this._activePlaceVisitModel.setDelegate(null);\n    });\n  }\n\n  // @Trace()\n  animationStarted() {\n    // console.log({ activePlace: this._activePlace.value });\n  }\n\n  // @Trace()\n  animationDone() {\n    if (this._activePlace.value) {\n      this._activePlace.value.onPlaceReady();\n    }\n  }\n\n\n}\n"]}
+{"version":3,"file":"place-outlet.component.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/components/place-outlet/place-outlet.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, EventEmitter, Inject, Input, OnInit, Optional, Output, SkipSelf, ViewChild } from '@angular/core';\nimport { ActivatedRoute, Router, RouterOutlet } from '@angular/router';\nimport {\n  Constructable,\n  DebugContext,\n  Dsl,\n  lang,\n  ListModel,\n  MutableValueModel,\n  StoreInListModel,\n  StoreInValueModel,\n  UseDelegate,\n  ValueModel,\n  ValueModelChain\n} from '@coolon/pectin';\nimport * as _ from 'lodash';\nimport { DisposableComponent } from '../../../components/disposable-component';\nimport { PlaceComponent } from '../../place-component';\nimport { AUP_PLACE_CONFIG, PlaceConfig } from '../../place-config';\nimport { PlaceDefinition } from '../../place-definition';\nimport { PlaceRouter } from '../../place-router';\n\nimport { Visit } from '../../visit';\nimport { LEFT_RIGHT_PLACE_ANIMATION } from './route-animations';\n\n// Quick hack to avoid circular references between this and PlaceComponents.\ninterface PlaceRef {\n  readonly placeDefinition: PlaceDefinition\n\n  initialiseBindings(param: ValueModel<Visit>): void;\n\n  onPlaceReady(): void;\n}\n\n@Component({\n  selector: 'aup-place-outlet',\n  templateUrl: './place-outlet.component.html',\n  styleUrls: ['./place-outlet.component.scss'],\n  animations: [LEFT_RIGHT_PLACE_ANIMATION]\n})\nexport class PlaceOutletComponent extends DisposableComponent implements OnInit {\n\n  @Input() @StoreInValueModel('animateModel')\n  animate: boolean;\n\n  @Input() @UseDelegate({ defaultValue: true })\n  animateModel: ValueModel<boolean>;\n\n  // tslint:disable-next-line:no-input-rename\n  @Input('placeAnimationOrderModel') @UseDelegate()\n  customPlaceAnimationOrderModel: ListModel<Constructable<PlaceComponent>>;\n\n  // tslint:disable-next-line:no-input-rename\n  @Input('placeAnimationOrder') @StoreInListModel('customPlaceAnimationOrderModel')\n  customPlaceAnimationOrder: Constructable<PlaceComponent>[];\n\n  @Output()\n  readonly placeChanged = new EventEmitter<PlaceComponent>();\n\n  @ViewChild('routeOutlet', { static: true })\n  routerOut: RouterOutlet;\n\n\n  private outletActivated = new MutableValueModel(false);\n  private readonly _activatedRouteModel = new MutableValueModel<ActivatedRoute>();\n  private readonly _activePlaceModel = new MutableValueModel<PlaceComponent>();\n  private readonly _activePlaceDefinition: ValueModelChain<PlaceDefinition>;\n\n  private parentOutletModel: MutableValueModel<PlaceOutletComponent>;\n  public readonly placeAnimationOrder: ValueModelChain<number>;\n\n  private initialPlaceIndex: number = null;\n  private routerVisitModel: ValueModelChain<Visit>;\n  private _isPushingVisitToRoute = new MutableValueModel<boolean>(false);\n  private navigationInProgress: ValueModelChain<boolean>;\n\n  constructor(private readonly router: Router,\n              private readonly placeRouter: PlaceRouter,\n              @Optional() @Inject(AUP_PLACE_CONFIG) readonly placeConfig: PlaceConfig,\n              @SkipSelf() @Optional() parentOutlet: PlaceOutletComponent) {\n    super();\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n\n    this.parentOutletModel = new MutableValueModel(parentOutlet);\n\n    const defaultPlaceAnimationOrder = chain(this.parentOutletModel)\n      .pullValueModel(o => o.activePlaceModel)\n      .pluck('placeDefinition')\n      .pluckList('children')\n      .pluck('component');\n\n    const activatePlaceType = chain(this.activePlaceModel).map(p => p.constructor as Constructable<PlaceComponent>);\n    this.placeAnimationOrder = chain(this.customPlaceAnimationOrderModel)\n      .otherwise(defaultPlaceAnimationOrder)\n      .reduce((placesInOrder) => {\n        let placeIndex = 0;\n        if (activatePlaceType.value) {\n          placeIndex = placesInOrder.indexOf(activatePlaceType.value);\n          if (_.isNil(this.initialPlaceIndex)) {\n            this.initialPlaceIndex = placeIndex;\n          }\n        }\n        return _.isNil(this.initialPlaceIndex) ? 0 : placeIndex - this.initialPlaceIndex;\n      }, { dependsOn: activatePlaceType });\n\n    // Extract our visit model from the place router.\n    this._activePlaceDefinition = chain(this._activePlaceModel).pluck('placeDefinition');\n    this.routerVisitModel = this._activePlaceDefinition.findIn(chain(placeRouter.activeVisitsByPlaceDefinition));\n\n    this.navigationInProgress = chain(this.placeRouter.navigationInProgress);\n    when.valueOf(this.navigationInProgress).becomesFalsey(() => {\n      this.checkStateAndInitialise();\n    });\n    when.valueOf(this.outletActivated).becomesTruthy(() => {\n      this.checkStateAndInitialise();\n    });\n\n    chain(this._activePlaceModel)\n      .postponeWhile(this.navigationInProgress)\n      .subscribe(place => this.placeChanged.emit(place));\n\n  }\n\n  // @Trace()\n  ngOnInit() {\n  }\n\n  // @Trace()\n  getAnimationOrder() {\n    return this.placeAnimationOrder.value;\n  }\n\n  get animationDuration() {\n    return this.placeConfig && this.placeConfig.animationDuration ? this.placeConfig.animationDuration : '500ms';\n  }\n\n  // @Trace()\n  navigate(visit: Visit) {\n    // console.log({ activatedRoute: this._activatedRouteModel.value });\n    this.placeRouter.navigate(visit, {\n      relativeTo: this.parentOutlet ? this.parentOutlet.activatedRouteModel.value : null\n    });\n  }\n\n  get parentOutlet(): PlaceOutletComponent {\n    return this.parentOutletModel.value;\n  }\n\n\n  get activePlaceModel(): ValueModel<PlaceComponent> {\n    return this._activePlaceModel.readonly;\n  }\n\n  get activatedRouteModel(): ValueModel<ActivatedRoute> {\n    return this._activatedRouteModel.readonly;\n  }\n\n  // @Trace()\n  onOutletActivated(routerOutlet: RouterOutlet, place: PlaceComponent) {\n    this._activatedRouteModel.value = routerOutlet.activatedRoute;\n    this._activePlaceModel.value = place;\n    this.outletActivated.value = true;\n    this.checkStateAndInitialise();\n  }\n\n  // @Trace()\n  onOutletDeactivated() {\n    this.outletActivated.value = false;\n    this._activePlaceModel.value = null;\n    this._activatedRouteModel.value = null;\n  }\n\n  // @Trace()\n  private checkStateAndInitialise() {\n    const routerVisit = this.routerVisitModel.value;\n    const activePlace = this.activePlaceModel.value;\n    if (routerVisit && activePlace && !activePlace.isInitialised()) {\n      if (routerVisit.placeDefinition !== activePlace.placeDefinition) {\n        lang.illegalState('wrong visit!!!');\n      }\n      this.initialisePlace(routerVisit, activePlace);\n    }\n  }\n\n  // @Trace()\n  private initialisePlace(routerVisit: Visit, activePlace: PlaceComponent) {\n    const visitModel = new MutableValueModel<Visit>(routerVisit);\n    DebugContext.tag(visitModel, `PlaceOutletComponent[${activePlace.constructor.name})].visitModel`);\n    activePlace.initialiseVisit(routerVisit, (current, previous) => {\n      this.pushVisitChangeToRoute(previous, current);\n    });\n    if (!this.animateModel.value) {\n      // we're not animating so trigger any post animation callbacks now.\n      this.animationDone();\n    }\n    const { when, chain, valueOf } = Dsl.disposeWith(activePlace);\n    when.valueOf(this.routerVisitModel)\n      .changes(visit => {\n        activePlace.updateVisit(visit);\n      }, {\n        unless: valueOf.any(\n          this._isPushingVisitToRoute,\n          this.routerVisitModel.isNil()\n        ).areTruthy()\n      });\n  }\n\n  private pushVisitChangeToRoute(previous: Visit, current: Visit) {\n    this._isPushingVisitToRoute.value = true;\n    this.placeRouter.pushVisitChangesToRoute(previous, current).finally(() => {\n      this._isPushingVisitToRoute.value = false;\n    });\n  }\n\n// @Trace()\n  animationStarted() {\n    // console.log({ activePlace: this._activePlaceModel.value });\n  }\n\n  // @Trace()\n  animationDone() {\n    if (this._activePlaceModel.value) {\n      this._activePlaceModel.value.onPlaceReady();\n    }\n  }\n\n}\n"]}

package/esm2015/lib/place/components/place-outlet/place-outlet.component.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"PlaceOutletComponent":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../../../components/disposable-component","name":"DisposableComponent","line":41,"character":42},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":35,"character":1},"arguments":[{"selector":"aup-place-outlet","animations":[{"__symbolic":"reference","module":"./route-animations","name":"LEFT_RIGHT_PLACE_ANIMATION","line":39,"character":15}],"template":"<div class=\"router-outlet-container\"\n     [@routeAnimations]=\"{value: getAnimationOrder(), params:{duration: animationDuration}}\"\n     [@.disabled]=\"!animateModel.value\"\n     (@routeAnimations.start)=\"animationStarted()\"\n     (@routeAnimations.done)=\"animationDone()\"\n>\n  <router-outlet #routerOutlet=\"outlet\"\n                 (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                 (deactivate)=\"onOutletDeactivated()\">\n  </router-outlet>\n</div>\n\n","styles":[":host{display:flex;flex-direction:column;min-height:0;overflow-x:hidden}.router-outlet-container{flex:1;display:block;position:relative;min-height:0}router-outlet{display:none}"]}]}],"members":{"animate":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":43,"character":3}},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"StoreInValueModel","line":43,"character":12},"arguments":["animateModel"]}]}],"animateModel":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":46,"character":3}},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"UseDelegate","line":46,"character":12},"arguments":[{"defaultValue":true}]}]}],"customPlaceAnimationOrderModel":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":50,"character":3},"arguments":["placeAnimationOrderModel"]},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"UseDelegate","line":50,"character":38}}]}],"customPlaceAnimationOrder":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":54,"character":3},"arguments":["placeAnimationOrder"]},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"StoreInListModel","line":54,"character":33},"arguments":["customPlaceAnimationOrderModel"]}]}],"placeChanged":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Output","line":57,"character":3}}]}],"routerOut":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"ViewChild","line":60,"character":3},"arguments":["routeOutlet",{"static":true}]}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[null,null,[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Optional","line":81,"character":15}},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":81,"character":27},"arguments":[{"__symbolic":"reference","module":"../../place-config","name":"AUP_PLACE_CONFIG","line":81,"character":34}]}],[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"SkipSelf","line":82,"character":15}},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Optional","line":82,"character":27}}]],"parameters":[{"__symbolic":"reference","module":"@angular/router","name":"Router","line":79,"character":39},{"__symbolic":"reference","module":"../../place-router","name":"PlaceRouter","line":80,"character":44},{"__symbolic":"reference","module":"../../place-config","name":"PlaceConfig","line":81,"character":74},{"__symbolic":"reference","name":"PlaceOutletComponent"}]}],"ngOnInit":[{"__symbolic":"method"}],"getAnimationOrder":[{"__symbolic":"method"}],"navigate":[{"__symbolic":"method"}],"pushRouteChangesToVisit":[{"__symbolic":"method"}],"pushVisitChangesToRoute":[{"__symbolic":"method"}],"onOutletActivated":[{"__symbolic":"method"}],"onOutletDeactivated":[{"__symbolic":"method"}],"animationStarted":[{"__symbolic":"method"}],"animationDone":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"PlaceOutletComponent":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../../../components/disposable-component","name":"DisposableComponent","line":40,"character":42},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":34,"character":1},"arguments":[{"selector":"aup-place-outlet","animations":[{"__symbolic":"reference","module":"./route-animations","name":"LEFT_RIGHT_PLACE_ANIMATION","line":38,"character":15}],"template":"<ng-container *ngIf=\"animateModel.value\">\n  <div class=\"router-outlet-container\"\n       [@routeAnimations]=\"{value: getAnimationOrder(), params:{duration: animationDuration}}\"\n       (@routeAnimations.start)=\"animationStarted()\"\n       (@routeAnimations.done)=\"animationDone()\"\n  >\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<ng-container *ngIf=\"!animateModel.value\">\n  <div class=\"router-outlet-container\">\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n","styles":[":host{display:flex;flex-direction:column;min-height:0;overflow-x:hidden}.router-outlet-container{flex:1;display:block;position:relative;min-height:0}router-outlet{display:none}"]}]}],"members":{"animate":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":42,"character":3}},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"StoreInValueModel","line":42,"character":12},"arguments":["animateModel"]}]}],"animateModel":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":45,"character":3}},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"UseDelegate","line":45,"character":12},"arguments":[{"defaultValue":true}]}]}],"customPlaceAnimationOrderModel":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":49,"character":3},"arguments":["placeAnimationOrderModel"]},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"UseDelegate","line":49,"character":38}}]}],"customPlaceAnimationOrder":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Input","line":53,"character":3},"arguments":["placeAnimationOrder"]},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"StoreInListModel","line":53,"character":33},"arguments":["customPlaceAnimationOrderModel"]}]}],"placeChanged":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Output","line":56,"character":3}}]}],"routerOut":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"ViewChild","line":59,"character":3},"arguments":["routeOutlet",{"static":true}]}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[null,null,[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Optional","line":78,"character":15}},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":78,"character":27},"arguments":[{"__symbolic":"reference","module":"../../place-config","name":"AUP_PLACE_CONFIG","line":78,"character":34}]}],[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"SkipSelf","line":79,"character":15}},{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Optional","line":79,"character":27}}]],"parameters":[{"__symbolic":"reference","module":"@angular/router","name":"Router","line":76,"character":39},{"__symbolic":"reference","module":"../../place-router","name":"PlaceRouter","line":77,"character":44},{"__symbolic":"reference","module":"../../place-config","name":"PlaceConfig","line":78,"character":74},{"__symbolic":"reference","name":"PlaceOutletComponent"}]}],"ngOnInit":[{"__symbolic":"method"}],"getAnimationOrder":[{"__symbolic":"method"}],"navigate":[{"__symbolic":"method"}],"onOutletActivated":[{"__symbolic":"method"}],"onOutletDeactivated":[{"__symbolic":"method"}],"checkStateAndInitialise":[{"__symbolic":"method"}],"initialisePlace":[{"__symbolic":"method"}],"pushVisitChangeToRoute":[{"__symbolic":"method"}],"animationStarted":[{"__symbolic":"method"}],"animationDone":[{"__symbolic":"method"}]}}}}]

package/esm2015/lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.js

@@ -3,10 +3,14 @@
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 import { Component } from '@angular/core';
+import { PlaceRouter } from '../../place-router';
 import { AbstractPlaceNavigationComponent } from '../abstract-place-navigation.component';
 export class TabbedPlaceNavigationComponent extends AbstractPlaceNavigationComponent {
-    constructor() {
-        super();
+    /**
+     * @param {?} placeRouter
+     */
+    constructor(placeRouter) {
+        super(placeRouter);
     }
 }
 TabbedPlaceNavigationComponent.decorators = [
@@ -17,5 +21,7 @@ TabbedPlaceNavigationComponent.decorators = [
             }] }
 ];
 /** @nocollapse */
-TabbedPlaceNavigationComponent.ctorParameters = () => [];
+TabbedPlaceNavigationComponent.ctorParameters = () => [
+    { type: PlaceRouter }
+];
 //# sourceMappingURL=tabbed-place-navigation.component.js.map

package/esm2015/lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.js.map

@@ -1 +1 @@
-{"version":3,"file":"tabbed-place-navigation.component.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAO1F,MAAM,OAAO,8BAA+B,SAAQ,gCAAgC;IAClF;QACE,KAAK,EAAE,CAAC;IACV,CAAC;;;YARF,SAAS,SAAC;gBACT,QAAQ,EAAE,6BAA6B;gBACvC,mcAAuD;;aAExD","sourcesContent":["import { Component } from '@angular/core';\nimport { AbstractPlaceNavigationComponent } from '../abstract-place-navigation.component';\n\n@Component({\n  selector: 'aup-tabbed-place-navigation',\n  templateUrl: './tabbed-place-navigation.component.html',\n  styleUrls: ['./tabbed-place-navigation.component.scss']\n})\nexport class TabbedPlaceNavigationComponent extends AbstractPlaceNavigationComponent {\n  constructor() {\n    super();\n  }\n}\n"]}
+{"version":3,"file":"tabbed-place-navigation.component.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAO1F,MAAM,OAAO,8BAA+B,SAAQ,gCAAgC;;;;IAClF,YAAY,WAAuB;QACjC,KAAK,CAAC,WAAW,CAAC,CAAC;IACrB,CAAC;;;YARF,SAAS,SAAC;gBACT,QAAQ,EAAE,6BAA6B;gBACvC,mcAAuD;;aAExD;;;;YAPQ,WAAW","sourcesContent":["import { Component } from '@angular/core';\nimport { PlaceRouter } from '../../place-router';\nimport { AbstractPlaceNavigationComponent } from '../abstract-place-navigation.component';\n\n@Component({\n  selector: 'aup-tabbed-place-navigation',\n  templateUrl: './tabbed-place-navigation.component.html',\n  styleUrls: ['./tabbed-place-navigation.component.scss']\n})\nexport class TabbedPlaceNavigationComponent extends AbstractPlaceNavigationComponent {\n  constructor(placeRouter:PlaceRouter) {\n    super(placeRouter);\n  }\n}\n"]}

package/esm2015/lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"TabbedPlaceNavigationComponent":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../abstract-place-navigation.component","name":"AbstractPlaceNavigationComponent","line":8,"character":52},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":3,"character":1},"arguments":[{"selector":"aup-tabbed-place-navigation","template":"<nav mat-tab-nav-bar>\n  <a mat-tab-link *ngFor=\"let placeDefinition of placeDefinitions.value\"\n     [pectinCommand]=\"commandFactory.create(placeDefinition)\"\n     [active]=\"isActive(placeDefinition)\"\n     [matTooltip]=\"getNav(placeDefinition).tooltip()\">\n    <mat-icon *ngIf=\"getNav(placeDefinition).icon()\">{{getNav(placeDefinition).icon()}}</mat-icon>\n    <span>{{getNav(placeDefinition).title()}}</span>\n  </a>\n</nav>\n","styles":[""]}]}],"members":{"__ctor__":[{"__symbolic":"constructor"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"TabbedPlaceNavigationComponent":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../abstract-place-navigation.component","name":"AbstractPlaceNavigationComponent","line":9,"character":52},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":4,"character":1},"arguments":[{"selector":"aup-tabbed-place-navigation","template":"<nav mat-tab-nav-bar>\n  <a mat-tab-link *ngFor=\"let placeDefinition of placeDefinitions.value\"\n     [pectinCommand]=\"commandFactory.create(placeDefinition)\"\n     [active]=\"isActive(placeDefinition)\"\n     [matTooltip]=\"getNav(placeDefinition).tooltip()\">\n    <mat-icon *ngIf=\"getNav(placeDefinition).icon()\">{{getNav(placeDefinition).icon()}}</mat-icon>\n    <span>{{getNav(placeDefinition).title()}}</span>\n  </a>\n</nav>\n","styles":[""]}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../place-router","name":"PlaceRouter","line":10,"character":26}]}]}}}}]

package/esm2015/lib/place/guards/place.guard.js

@@ -16,15 +16,15 @@ import { ConsolidatedParameterMap } from './consolidated-param-map';
 export class PlaceGuard {
     /**
      * @param {?} router
-     * @param {?} urlSerializer
+     * @param {?} urlService
      * @param {?} placeRouter
      * @param {?} placeHistory
      * @param {?} interactionService
      * @param {?} injector
      */
-    constructor(router, urlSerializer, placeRouter, placeHistory, interactionService, injector) {
+    constructor(router, urlService, placeRouter, placeHistory, interactionService, injector) {
         this.router = router;
-        this.urlSerializer = urlSerializer;
+        this.urlService = urlService;
         this.placeRouter = placeRouter;
         this.placeHistory = placeHistory;
         this.interactionService = interactionService;
@@ -56,18 +56,18 @@ export class PlaceGuard {
                     /** @type {?} */
                     const parsedParams = placeDefinition.parseRouteParams(params);
                     /** @type {?} */
-                    const initialVisit = this.placeRouter.navigationState.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);
+                    const initialVisit = this.placeRouter.navigationSession.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);
                     /** @type {?} */
                     const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
                     /** @type {?} */
                     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.navigationState.storeVisit(sanitisedVisit);
+                    this.placeRouter.navigationSession.storeVisit(sanitisedVisit);
                     if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
                         // Regenerate the url
                         /** @type {?} */
-                        const urlSnapshot = this.placeRouter.parseUrl(state.url).updateVisitSegments(sanitisedVisit);
-                        console.log('##### Place Guard Redirect', urlSnapshot);
+                        const urlSnapshot = this.urlService.parseUrl(state.url).updateVisitSegments(sanitisedVisit);
+                        // console.log('##### Place Guard Redirect', urlSnapshot);
                         return urlSnapshot;
                     }
                     else {
@@ -89,14 +89,15 @@ export class PlaceGuard {
     canDeactivate(component, currentRoute, currentState, nextState) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             /** @type {?} */
-            const currentUrl = this.placeRouter.parseUrl(currentState.url);
+            const currentUrl = this.urlService.parseUrl(currentState.url);
             /** @type {?} */
-            const nextUrl = this.placeRouter.parseUrl(nextState.url);
+            const nextUrl = this.urlService.parseUrl(nextState.url);
             /** @type {?} */
-            const result = yield this.placeRouter.navigationState.canDeactivatePlace(component, currentUrl, nextUrl);
+            const result = yield this.placeRouter.navigationSession.canDeactivatePlace(component, currentUrl, nextUrl);
             return this.handleGuardResult(result);
         });
     }
+    // @Trace()
     /**
      * @private
      * @param {?} result
@@ -162,8 +163,8 @@ export class PlaceGuard {
     cleanInteractionState(route, state, then) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             /** @type {?} */
-            const url = this.placeRouter.parseUrl(state.url);
-            if (!this.interactionService.isActive() && url.hasInteractionIds()) {
+            const url = this.urlService.parseUrl(state.url);
+            if (!this.interactionService.isActive() && url.hasInteractions()) {
                 // This happens if we reload the page or the url was pasted as the route should only be activated
                 // after the interaction context has become active.
                 return url.removeInteractionIds();
@@ -184,7 +185,7 @@ if (false) {
      * @type {?}
      * @private
      */
-    PlaceGuard.prototype.urlSerializer;
+    PlaceGuard.prototype.urlService;
     /**
      * @type {?}
      * @private

package/esm2015/lib/place/guards/place.guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"place.guard.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/guards/place.guard.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport {\n  ActivatedRouteSnapshot,\n  CanActivate,\n  CanDeactivate,\n  Router,\n  RouterStateSnapshot,\n  UrlSerializer,\n  UrlTree\n} from '@angular/router';\nimport { lang, Trace } from '@coolon/pectin';\nimport { Observable } from 'rxjs';\nimport { InteractionService } from '../../interaction/services/interaction.service';\nimport { PlaceComponent } from '../place-component';\nimport { PlaceDefinition } from '../place-definition';\nimport { PlaceHistory } from '../place-history';\nimport { PlaceRouter } from '../place-router';\nimport { VisitSanitiser } from '../route/visit-sanitiser';\nimport { UrlSnapshot } from '../url-snapshot';\nimport { Visit } from '../visit';\nimport { ConsolidatedParameterMap } from './consolidated-param-map';\n\n\nexport abstract class PlaceGuard implements CanActivate, CanDeactivate<PlaceComponent> {\n\n\n  constructor(private readonly router: Router,\n              private urlSerializer: UrlSerializer,\n              private readonly placeRouter: PlaceRouter,\n              private readonly placeHistory: PlaceHistory,\n              private readonly interactionService: InteractionService,\n              private readonly injector: Injector) {\n  }\n\n  // @Trace()\n  async canActivate(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree> {\n\n     // TODO: this is ugly now that I'm return UrlSnapshots and not UrlTrees.  It'd be better if the functions\n    //        weren't nested or if I implemented a handler chain.\n    return this.authorisePlaceThen(activatedRoute, state, async (placeDefinition) => {\n\n      const result = await this.cleanInteractionState(activatedRoute, state, async () => {\n        // Parse our route params.\n        const params = new ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);\n        const parsedParams = placeDefinition.parseRouteParams(params);\n\n        const initialVisit = this.placeRouter.navigationState.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);\n        const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);\n        const sanitisedVisit = await sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));\n\n        // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters\n        this.placeRouter.navigationState.storeVisit(sanitisedVisit);\n        if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {\n          // Regenerate the url\n          const urlSnapshot = this.placeRouter.parseUrl(state.url).updateVisitSegments(sanitisedVisit);\n          console.log('##### Place Guard Redirect', urlSnapshot);\n          return urlSnapshot;\n        } else {\n          return true;\n        }\n      });\n      return this.handleGuardResult(result);\n\n    });\n  }\n\n  // @Trace()\n  async canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean | UrlTree> {\n    const currentUrl = this.placeRouter.parseUrl(currentState.url);\n    const nextUrl = this.placeRouter.parseUrl(nextState.url);\n    const result = await this.placeRouter.navigationState.canDeactivatePlace(component, currentUrl, nextUrl);\n    return this.handleGuardResult(result);\n  }\n\n  private handleGuardResult(result) {\n    if (result instanceof UrlSnapshot) {\n      return result.urlTree;\n    } else {\n      return result;\n    }\n  }\n\n  // @Trace()\n  protected async authorisePlaceThen(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot, runPlaceGuards: (placeDefinition: PlaceDefinition) => Promise<boolean | UrlTree>) {\n    if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {\n      const placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);\n      const authoriseResult = placeDefinition.authenticate ? await this.isAuthorised(activatedRoute, state) : true;\n      if (authoriseResult === true) {\n        // we're authorised, now run the place guards.\n        return runPlaceGuards(placeDefinition);\n      } else {\n        console.log('not authorised result', authoriseResult);\n        return authoriseResult;\n      }\n    } else {\n      return lang.illegalState(`expected component to be an instance of PlaceComponent, got ${activatedRoute.component}`);\n    }\n  }\n\n  // @Trace()\n  async isAuthorised(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree> {\n    const authorised = this.getAuthGuard(this.injector).canActivate(activatedRoute, state);\n    return (authorised instanceof Observable) ? authorised.toPromise() : authorised;\n  }\n\n  abstract getAuthGuard(injector: Injector): CanActivate;\n\n  // @Trace()\n  async cleanInteractionState(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, then: () => Promise<boolean | UrlSnapshot>): Promise<boolean | UrlSnapshot> {\n    const url = this.placeRouter.parseUrl(state.url);\n    if (!this.interactionService.isActive() && url.hasInteractionIds()) {\n      // This happens if we reload the page or the url was pasted as the route should only be activated\n      // after the interaction context has become active.\n      return url.removeInteractionIds();\n    } else {\n      return then();\n    }\n  }\n\n}\n"]}
+{"version":3,"file":"place.guard.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/guards/place.guard.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport {\n  ActivatedRouteSnapshot,\n  CanActivate,\n  CanDeactivate,\n  Router,\n  RouterStateSnapshot,\n  UrlSerializer,\n  UrlTree\n} from '@angular/router';\nimport { lang, Trace } from '@coolon/pectin';\nimport { Observable } from 'rxjs';\nimport { InteractionService } from '../../interaction/services/interaction.service';\nimport { PlaceComponent } from '../place-component';\nimport { PlaceDefinition } from '../place-definition';\nimport { PlaceHistory } from '../place-history';\nimport { PlaceRouter } from '../place-router';\nimport { VisitSanitiser } from '../route/visit-sanitiser';\nimport { UrlService } from '../url-service';\nimport { UrlSnapshot } from '../url-snapshot';\nimport { Visit } from '../visit';\nimport { ConsolidatedParameterMap } from './consolidated-param-map';\n\n\nexport abstract class PlaceGuard implements CanActivate, CanDeactivate<PlaceComponent> {\n\n\n  constructor(private readonly router: Router,\n              private urlService: UrlService,\n              private readonly placeRouter: PlaceRouter,\n              private readonly placeHistory: PlaceHistory,\n              private readonly interactionService: InteractionService,\n              private readonly injector: Injector) {\n  }\n\n  // @Trace()\n  async canActivate(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree> {\n\n    // TODO: this is ugly now that I'm return UrlSnapshots and not UrlTrees.  It'd be better if the functions\n    //        weren't nested or if I implemented a handler chain.\n    return this.authorisePlaceThen(activatedRoute, state, async (placeDefinition) => {\n\n      const result = await this.cleanInteractionState(activatedRoute, state, async () => {\n        // Parse our route params.\n        const params = new ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);\n        const parsedParams = placeDefinition.parseRouteParams(params);\n\n        const initialVisit = this.placeRouter.navigationSession.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);\n        const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);\n        const sanitisedVisit = await sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));\n\n        // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters\n        this.placeRouter.navigationSession.storeVisit(sanitisedVisit);\n        if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {\n          // Regenerate the url\n          const urlSnapshot = this.urlService.parseUrl(state.url).updateVisitSegments(sanitisedVisit);\n          // console.log('##### Place Guard Redirect', urlSnapshot);\n          return urlSnapshot;\n        } else {\n          return true;\n        }\n      });\n      return this.handleGuardResult(result);\n\n    });\n  }\n\n  // @Trace()\n  async canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean | UrlTree> {\n    const currentUrl = this.urlService.parseUrl(currentState.url);\n    const nextUrl = this.urlService.parseUrl(nextState.url);\n    const result = await this.placeRouter.navigationSession.canDeactivatePlace(component, currentUrl, nextUrl);\n    return this.handleGuardResult(result);\n  }\n\n  // @Trace()\n  private handleGuardResult(result) {\n    if (result instanceof UrlSnapshot) {\n      return result.urlTree;\n    } else {\n      return result;\n    }\n  }\n\n  // @Trace()\n  protected async authorisePlaceThen(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot, runPlaceGuards: (placeDefinition: PlaceDefinition) => Promise<boolean | UrlTree>) {\n    if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {\n      const placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);\n      const authoriseResult = placeDefinition.authenticate ? await this.isAuthorised(activatedRoute, state) : true;\n      if (authoriseResult === true) {\n        // we're authorised, now run the place guards.\n        return runPlaceGuards(placeDefinition);\n      } else {\n        console.log('not authorised result', authoriseResult);\n        return authoriseResult;\n      }\n    } else {\n      return lang.illegalState(`expected component to be an instance of PlaceComponent, got ${activatedRoute.component}`);\n    }\n  }\n\n  // @Trace()\n  async isAuthorised(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree> {\n    const authorised = this.getAuthGuard(this.injector).canActivate(activatedRoute, state);\n    return (authorised instanceof Observable) ? authorised.toPromise() : authorised;\n  }\n\n  abstract getAuthGuard(injector: Injector): CanActivate;\n\n  // @Trace()\n  async cleanInteractionState(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, then: () => Promise<boolean | UrlSnapshot>): Promise<boolean | UrlSnapshot> {\n    const url = this.urlService.parseUrl(state.url);\n    if (!this.interactionService.isActive() && url.hasInteractions()) {\n      // This happens if we reload the page or the url was pasted as the route should only be activated\n      // after the interaction context has become active.\n      return url.removeInteractionIds();\n    } else {\n      return then();\n    }\n  }\n\n}\n"]}