@coolon/angular-ui-powerups 0.0.126 → 0.0.129

package/esm5/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';
@@ -36,23 +36,14 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         _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);
         var _a = Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
         _this.parentOutletModel = new MutableValueModel(parentOutlet);
         /** @type {?} */
-        var 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 {?} */
         var defaultPlaceAnimationOrder = chain(_this.parentOutletModel)
             .pullValueModel((/**
          * @param {?} o
@@ -85,29 +76,24 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
             }
             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 {?}
          */
-        function () { return _this.pushRouteChangesToVisit(); }), { unless: _this._inOutletUpdate });
-        // Handle component based changes
-        when.valueOf(_this._activePlaceVisitModel).changes((/**
-         * @param {?} next
-         * @param {?} previous
+        function () {
+            _this.checkStateAndInitialise();
+        }));
+        when.valueOf(_this.outletActivated).becomesTruthy((/**
          * @return {?}
          */
-        function (next, previous) {
-            _this.pushVisitChangesToRoute(next, previous);
-        }), {
-            unless: _this.placeRouter.navigationInProgress
-        });
-        chain(_this._activePlace)
-            .postponeWhile(placeRouter.navigationInProgress)
+        function () {
+            _this.checkStateAndInitialise();
+        }));
+        chain(_this._activePlaceModel)
+            .postponeWhile(_this.navigationInProgress)
             .subscribe((/**
          * @param {?} place
          * @return {?}
@@ -115,10 +101,14 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         function (place) { return _this.placeChanged.emit(place); }));
         return _this;
     }
+    // @Trace()
+    // @Trace()
     /**
      * @return {?}
      */
-    PlaceOutletComponent.prototype.ngOnInit = /**
+    PlaceOutletComponent.prototype.ngOnInit = 
+    // @Trace()
+    /**
      * @return {?}
      */
     function () {
@@ -174,56 +164,12 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
         enumerable: true,
         configurable: true
     });
-    // @Trace()
-    // @Trace()
-    /**
-     * @return {?}
-     */
-    PlaceOutletComponent.prototype.pushRouteChangesToVisit = 
-    // @Trace()
-    /**
-     * @return {?}
-     */
-    function () {
-        var _this = this;
-        /** @type {?} */
-        var 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 {?}
-             */
-            function () {
-                _this._activePlaceVisitModel.value = visit;
-            }));
-        }
-    };
-    /**
-     * @param {?} next
-     * @param {?} previous
-     * @return {?}
-     */
-    PlaceOutletComponent.prototype.pushVisitChangesToRoute = /**
-     * @param {?} next
-     * @param {?} previous
-     * @return {?}
-     */
-    function (next, previous) {
-        /** @type {?} */
-        var activatedRoute = this._activatedRouteModel.value;
-        this.placeRouter.pushVisitChangesToRoute(activatedRoute, previous, next);
-    };
     Object.defineProperty(PlaceOutletComponent.prototype, "activePlaceModel", {
         get: /**
          * @return {?}
          */
         function () {
-            return this._activePlace.readonly;
+            return this._activePlaceModel.readonly;
         },
         enumerable: true,
         configurable: true
@@ -253,50 +199,115 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
      * @return {?}
      */
     function (routerOutlet, place) {
+        this._activatedRouteModel.value = routerOutlet.activatedRoute;
+        this._activePlaceModel.value = place;
+        this.outletActivated.value = true;
+        this.checkStateAndInitialise();
+    };
+    // @Trace()
+    // @Trace()
+    /**
+     * @return {?}
+     */
+    PlaceOutletComponent.prototype.onOutletDeactivated = 
+    // @Trace()
+    /**
+     * @return {?}
+     */
+    function () {
+        this.outletActivated.value = false;
+        this._activePlaceModel.value = null;
+        this._activatedRouteModel.value = null;
+    };
+    // @Trace()
+    // @Trace()
+    /**
+     * @private
+     * @return {?}
+     */
+    PlaceOutletComponent.prototype.checkStateAndInitialise = 
+    // @Trace()
+    /**
+     * @private
+     * @return {?}
+     */
+    function () {
+        /** @type {?} */
+        var routerVisit = this.routerVisitModel.value;
+        /** @type {?} */
+        var activePlace = this.activePlaceModel.value;
+        if (routerVisit && activePlace && !activePlace.isInitialised()) {
+            if (routerVisit.placeDefinition !== activePlace.placeDefinition) {
+                lang.illegalState('wrong visit!!!');
+            }
+            this.initialisePlace(routerVisit, activePlace);
+        }
+    };
+    // @Trace()
+    // @Trace()
+    /**
+     * @private
+     * @param {?} routerVisit
+     * @param {?} activePlace
+     * @return {?}
+     */
+    PlaceOutletComponent.prototype.initialisePlace = 
+    // @Trace()
+    /**
+     * @private
+     * @param {?} routerVisit
+     * @param {?} activePlace
+     * @return {?}
+     */
+    function (routerVisit, activePlace) {
         var _this = this;
-        this._inOutletActivation.whileTrue((/**
+        /** @type {?} */
+        var visitModel = new MutableValueModel(routerVisit);
+        DebugContext.tag(visitModel, "PlaceOutletComponent[" + activePlace.constructor.name + ")].visitModel");
+        activePlace.initialiseVisit(routerVisit, (/**
+         * @param {?} current
+         * @param {?} previous
          * @return {?}
          */
-        function () {
-            try {
-                _this._activePlace.value = place;
-                _this._activatedRouteModel.value = routerOutlet.activatedRoute;
-                _this._placeDefinition.value = place.placeDefinition;
-                /** @type {?} */
-                var visitModel = new MutableValueModel();
-                DebugContext.tag(visitModel, "PlaceOutletCompeont.visitModel");
-                _this._activePlaceVisitModel.setDelegate(visitModel);
-                place.initialiseVisit(visitModel);
-            }
-            catch (error) {
-                console.error(error);
-            }
+        function (current, previous) {
+            _this.pushVisitChangeToRoute(previous, current);
         }));
         if (!this.animateModel.value) {
             // we're not animating so trigger any post animation callbacks now.
             this.animationDone();
         }
+        var _a = Dsl.disposeWith(activePlace), when = _a.when, chain = _a.chain, valueOf = _a.valueOf;
+        when.valueOf(this.routerVisitModel)
+            .changes((/**
+         * @param {?} visit
+         * @return {?}
+         */
+        function (visit) {
+            activePlace.updateVisit(visit);
+        }), {
+            unless: valueOf.any(this._isPushingVisitToRoute, this.routerVisitModel.isNil()).areTruthy()
+        });
     };
-    // @Trace()
-    // @Trace()
     /**
+     * @private
+     * @param {?} previous
+     * @param {?} current
      * @return {?}
      */
-    PlaceOutletComponent.prototype.onOutletDeactivated = 
-    // @Trace()
-    /**
+    PlaceOutletComponent.prototype.pushVisitChangeToRoute = /**
+     * @private
+     * @param {?} previous
+     * @param {?} current
      * @return {?}
      */
-    function () {
+    function (previous, current) {
         var _this = this;
-        this._inOutletDeactivation.whileTrue((/**
+        this._isPushingVisitToRoute.value = true;
+        this.placeRouter.pushVisitChangesToRoute(previous, current).finally((/**
          * @return {?}
          */
         function () {
-            _this._activePlace.value = null;
-            _this._activatedRouteModel.value = null;
-            _this._placeDefinition.value = null;
-            _this._activePlaceVisitModel.setDelegate(null);
+            _this._isPushingVisitToRoute.value = false;
         }));
     };
     // @Trace()
@@ -310,7 +321,7 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
      * @return {?}
      */
     function () {
-        // console.log({ activePlace: this._activePlace.value });
+        // console.log({ activePlace: this._activePlaceModel.value });
     };
     // @Trace()
     // @Trace()
@@ -323,14 +334,14 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
      * @return {?}
      */
     function () {
-        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}"]
                 }] }
@@ -386,59 +397,49 @@ if (false) {
      * @type {?}
      * @private
      */
-    PlaceOutletComponent.prototype._activePlace;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceOutletComponent.prototype._activePlaceVisitModel;
+    PlaceOutletComponent.prototype.outletActivated;
     /**
      * @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/esm5/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":"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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  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/esm5/lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component.js

@@ -4,11 +4,12 @@
  */
 import * as tslib_1 from "tslib";
 import { Component } from '@angular/core';
+import { PlaceRouter } from '../../place-router';
 import { AbstractPlaceNavigationComponent } from '../abstract-place-navigation.component';
 var TabbedPlaceNavigationComponent = /** @class */ (function (_super) {
     tslib_1.__extends(TabbedPlaceNavigationComponent, _super);
-    function TabbedPlaceNavigationComponent() {
-        return _super.call(this) || this;
+    function TabbedPlaceNavigationComponent(placeRouter) {
+        return _super.call(this, placeRouter) || this;
     }
     TabbedPlaceNavigationComponent.decorators = [
         { type: Component, args: [{
@@ -18,7 +19,9 @@ var TabbedPlaceNavigationComponent = /** @class */ (function (_super) {
                 }] }
     ];
     /** @nocollapse */
-    TabbedPlaceNavigationComponent.ctorParameters = function () { return []; };
+    TabbedPlaceNavigationComponent.ctorParameters = function () { return [
+        { type: PlaceRouter }
+    ]; };
     return TabbedPlaceNavigationComponent;
 }(AbstractPlaceNavigationComponent));
 export { TabbedPlaceNavigationComponent };

package/esm5/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;AAE1F;IAKoD,0DAAgC;IAClF;eACE,iBAAO;IACT,CAAC;;gBARF,SAAS,SAAC;oBACT,QAAQ,EAAE,6BAA6B;oBACvC,mcAAuD;;iBAExD;;;;IAKD,qCAAC;CAAA,AATD,CAKoD,gCAAgC,GAInF;SAJY,8BAA8B","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;AAE1F;IAKoD,0DAAgC;IAClF,wCAAY,WAAuB;eACjC,kBAAM,WAAW,CAAC;IACpB,CAAC;;gBARF,SAAS,SAAC;oBACT,QAAQ,EAAE,6BAA6B;oBACvC,mcAAuD;;iBAExD;;;;gBAPQ,WAAW;;IAYpB,qCAAC;CAAA,AATD,CAKoD,gCAAgC,GAInF;SAJY,8BAA8B","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/esm5/lib/place/guards/place.guard.js

@@ -17,9 +17,9 @@ var /**
  * @abstract
  */
 PlaceGuard = /** @class */ (function () {
-    function PlaceGuard(router, urlSerializer, placeRouter, placeHistory, interactionService, injector) {
+    function PlaceGuard(router, urlService, placeRouter, placeHistory, interactionService, injector) {
         this.router = router;
-        this.urlSerializer = urlSerializer;
+        this.urlService = urlService;
         this.placeRouter = placeRouter;
         this.placeHistory = placeHistory;
         this.interactionService = interactionService;
@@ -65,17 +65,17 @@ PlaceGuard = /** @class */ (function () {
                                                     // Parse our route params.
                                                     params = new ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);
                                                     parsedParams = placeDefinition.parseRouteParams(params);
-                                                    initialVisit = this.placeRouter.navigationState.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);
+                                                    initialVisit = this.placeRouter.navigationSession.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);
                                                     sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
                                                     return [4 /*yield*/, sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams))];
                                                 case 1:
                                                     sanitisedVisit = _a.sent();
                                                     // 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
-                                                        urlSnapshot = this.placeRouter.parseUrl(state.url).updateVisitSegments(sanitisedVisit);
-                                                        console.log('##### Place Guard Redirect', urlSnapshot);
+                                                        urlSnapshot = this.urlService.parseUrl(state.url).updateVisitSegments(sanitisedVisit);
+                                                        // console.log('##### Place Guard Redirect', urlSnapshot);
                                                         return [2 /*return*/, urlSnapshot];
                                                     }
                                                     else {
@@ -118,9 +118,9 @@ PlaceGuard = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        currentUrl = this.placeRouter.parseUrl(currentState.url);
-                        nextUrl = this.placeRouter.parseUrl(nextState.url);
-                        return [4 /*yield*/, this.placeRouter.navigationState.canDeactivatePlace(component, currentUrl, nextUrl)];
+                        currentUrl = this.urlService.parseUrl(currentState.url);
+                        nextUrl = this.urlService.parseUrl(nextState.url);
+                        return [4 /*yield*/, this.placeRouter.navigationSession.canDeactivatePlace(component, currentUrl, nextUrl)];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, this.handleGuardResult(result)];
@@ -128,12 +128,16 @@ PlaceGuard = /** @class */ (function () {
             });
         });
     };
+    // @Trace()
+    // @Trace()
     /**
      * @private
      * @param {?} result
      * @return {?}
      */
-    PlaceGuard.prototype.handleGuardResult = /**
+    PlaceGuard.prototype.handleGuardResult = 
+    // @Trace()
+    /**
      * @private
      * @param {?} result
      * @return {?}
@@ -240,8 +244,8 @@ PlaceGuard = /** @class */ (function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var url;
             return tslib_1.__generator(this, function (_a) {
-                url = this.placeRouter.parseUrl(state.url);
-                if (!this.interactionService.isActive() && url.hasInteractionIds()) {
+                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 [2 /*return*/, url.removeInteractionIds()];
@@ -269,7 +273,7 @@ if (false) {
      * @type {?}
      * @private
      */
-    PlaceGuard.prototype.urlSerializer;
+    PlaceGuard.prototype.urlService;
     /**
      * @type {?}
      * @private

package/esm5/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"]}