@coolon/angular-ui-powerups 1.0.1 → 1.0.2

package/esm2015/lib/place/place-history.js

@@ -1,22 +1,36 @@
+var PlaceHistory_1;
 import { __decorate, __metadata } from "tslib";
 import { Injectable } from '@angular/core';
+import { assert } from '@coolon/pectin';
 import _ from 'lodash';
 import * as i0 from "@angular/core";
-let PlaceHistory = class PlaceHistory {
+let PlaceHistory = PlaceHistory_1 = class PlaceHistory {
     constructor() {
-        this._history = new Map();
-    }
-    // @Trace()
-    add(state) {
-        const history = this.getHistory(state.placeDefinition);
-        const previousState = _.first(history);
-        if (!previousState || state.hasChangedFrom(previousState)) {
-            history.unshift(state); // LIFO
-            this.setHistory(state.placeDefinition, history.slice(0, 3)); // limit our history to 4 visits
+        this._archive = new Map();
+        this.placeHistoryDepth = 4;
+    }
+    notifyNavigationStarted() {
+        if (this._activeVisits) {
+            this.archive(this._activeVisits.visits);
+            this._previousVisits = this._activeVisits;
         }
     }
+    notifyNavigationFinished(visits) {
+        this._activeVisits = new PlaceHistory_1.VisitRecord(visits);
+    }
+    updateVisit(visit) {
+        assert.isTruthy(this._activeVisits);
+        this._activeVisits.update(visit);
+    }
+    lastVisitIncluded(placeDef) {
+        var _a;
+        return !!((_a = this._previousVisits) === null || _a === void 0 ? void 0 : _a.getVisitFor(placeDef));
+    }
+    getMostRecentVisitFor(placeDef) {
+        return _.first(this.getHistory(placeDef));
+    }
     getHistory(placeDef) {
-        let history = this._history.get(placeDef);
+        let history = this._archive.get(placeDef);
         if (!history) {
             history = [];
             this.setHistory(placeDef, history);
@@ -24,15 +38,104 @@ let PlaceHistory = class PlaceHistory {
         return history;
     }
     setHistory(placeDef, history) {
-        this._history.set(placeDef, history);
+        this._archive.set(placeDef, history);
+    }
+    archive(visits) {
+        visits.forEach(state => {
+            const history = this.getHistory(state.placeDefinition);
+            const previousState = _.first(history);
+            if (!previousState || state.hasChangedFrom(previousState)) {
+                history.unshift(state); // LIFO
+                this.setHistory(state.placeDefinition, history.slice(0, this.placeHistoryDepth));
+            }
+        });
     }
 };
 PlaceHistory.ɵprov = i0.ɵɵdefineInjectable({ factory: function PlaceHistory_Factory() { return new PlaceHistory(); }, token: PlaceHistory, providedIn: "root" });
-PlaceHistory = __decorate([
+PlaceHistory = PlaceHistory_1 = __decorate([
     Injectable({
         providedIn: 'root'
     }),
     __metadata("design:paramtypes", [])
 ], PlaceHistory);
 export { PlaceHistory };
+(function (PlaceHistory) {
+    class VisitRecord {
+        constructor(visits) {
+            this.visits = visits;
+        }
+        update(visit) {
+            this.visits = this.visits.filter(v => v.placeDefinition !== visit.placeDefinition).concat(visit);
+        }
+        getVisitFor(placeDef) {
+            return this.visits.find(v => v.placeDefinition === placeDef);
+        }
+    }
+    PlaceHistory.VisitRecord = VisitRecord;
+    // export class Query {
+    //   private _history: Visit.State[];
+    //   private _places: Place[];
+    //   private _predicate: (visit: any) => boolean;
+    //   private _limit: number;
+    //
+    //   constructor(history, limit = history.length) {
+    //     this._history = history;
+    //     this._places = [];
+    //     this._predicate = (visit => true);
+    //     this._limit = limit;
+    //   }
+    //
+    //   to(...places:Place[]):this {
+    //     this._places = places;
+    //     return this;
+    //   }
+    //
+    //   with(parameters: { [parameter: string]: any }): this {
+    //     this.matching(state => {
+    //       return Object.keys(parameters).reduce((acc, key) => {
+    //         const matchValue = parameters[key];
+    //         const visitValue = state.get(key);
+    //         const matched = matchValue === '*' ? !_.isNil(visitValue) : visitValue == matchValue;
+    //         // Logger.get(this).info(`matched=${matched}`, parameters, visitValue);
+    //         return acc && matched;
+    //       }, true);
+    //     });
+    //     return this;
+    //   }
+    //
+    //   last(): Visit.State {
+    //     return _.findLast(this._history, visit => this._matches(visit))
+    //   }
+    //
+    //   // @trace
+    //   allThatMatch(): Visit.State[] {
+    //     return _.filter(this._history, visit => this._matches(visit)).slice(-this._limit);
+    //   }
+    //
+    //   // @trace
+    //   mostRecentValueOf<T=any>(param: string, defaultValue: T = null): T {
+    //     const lastStateWithParam = _.findLast(this.allThatMatch(), state => !_.isNil(state.get(param)));
+    //     return _.isNil(lastStateWithParam) ? defaultValue : lastStateWithParam.get(param);
+    //   }
+    //
+    //   limit(limit: number): this {
+    //     this._limit = limit;
+    //     return this;
+    //   }
+    //
+    //   matching(predicate: (visit: Visit.State) => boolean): this {
+    //     this._predicate = predicate;
+    //     return this;
+    //   }
+    //
+    //   _matches(visit: Visit.State) {
+    //     return this._isPlaceMatch(visit) && this._predicate(visit);
+    //   }
+    //
+    //   _isPlaceMatch(visit: Visit.State) {
+    //     return this._places.length < 1 || this._places.includes(visit.place)
+    //   }
+    //
+    // }
+})(PlaceHistory || (PlaceHistory = {}));
 //# sourceMappingURL=place-history.js.map

package/esm2015/lib/place/place-history.js.map

@@ -1 +1 @@
-{"version":3,"file":"place-history.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/place-history.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,CAAC,MAAM,QAAQ,CAAC;;AAOvB,IAAa,YAAY,GAAzB,MAAa,YAAY;IAIvB;QAFQ,aAAQ,GAAG,IAAI,GAAG,EAA4B,CAAC;IAGvD,CAAC;IAED,WAAW;IACX,GAAG,CAAC,KAAY;QACd,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,aAAa,IAAI,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE;YACzD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO;YAC/B,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,gCAAgC;SAC9F;IACH,CAAC;IAED,UAAU,CAAC,QAAyB;QAClC,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;SACpC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,UAAU,CAAC,QAAyB,EAAE,OAAgB;QAC5D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;CAcF,CAAA;;AA1CY,YAAY;IAHxB,UAAU,CAAC;QACV,UAAU,EAAE,MAAM;KACnB,CAAC;;GACW,YAAY,CA0CxB;SA1CY,YAAY","sourcesContent":["import { Injectable } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { Trace } from '@coolon/pectin';\nimport _ from 'lodash';\nimport { PlaceDefinition } from './place-definition';\nimport { Visit } from './visit';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceHistory {\n\n  private _history = new Map<PlaceDefinition, Visit[]>();\n\n  constructor() {\n  }\n\n  // @Trace()\n  add(state: Visit) {\n    const history = this.getHistory(state.placeDefinition);\n    const previousState = _.first(history);\n    if (!previousState || state.hasChangedFrom(previousState)) {\n      history.unshift(state); // LIFO\n      this.setHistory(state.placeDefinition, history.slice(0, 3)); // limit our history to 4 visits\n    }\n  }\n\n  getHistory(placeDef: PlaceDefinition): Visit[] {\n    let history = this._history.get(placeDef);\n    if (!history) {\n      history = [];\n      this.setHistory(placeDef, history);\n    }\n    return history;\n  }\n\n  private setHistory(placeDef: PlaceDefinition, history: Visit[]) {\n    this._history.set(placeDef, history);\n  }\n\n// previousVisit(): Visit {\n  //   return _.last(this._history);\n  // }\n  //\n  // withPreviousVisit<R>(callback:(previousVisit:Visit)=>R, defaultValue:R = null):R{\n  //   const visit = this.previousVisit();\n  //   return visit ? callback(visit) : defaultValue;\n  // }\n  //\n  // previousVisitTo(place: Place): Visit {\n  //   return new VisitHistory.Query(this._history).to(place).last();\n  // }\n}\n\nexport namespace VisitHistory {\n\n  // export class Query {\n  //   private _history: Visit.State[];\n  //   private _places: Place[];\n  //   private _predicate: (visit: any) => boolean;\n  //   private _limit: number;\n  //\n  //   constructor(history, limit = history.length) {\n  //     this._history = history;\n  //     this._places = [];\n  //     this._predicate = (visit => true);\n  //     this._limit = limit;\n  //   }\n  //\n  //   to(...places:Place[]):this {\n  //     this._places = places;\n  //     return this;\n  //   }\n  //\n  //   with(parameters: { [parameter: string]: any }): this {\n  //     this.matching(state => {\n  //       return Object.keys(parameters).reduce((acc, key) => {\n  //         const matchValue = parameters[key];\n  //         const visitValue = state.get(key);\n  //         const matched = matchValue === '*' ? !_.isNil(visitValue) : visitValue == matchValue;\n  //         // Logger.get(this).info(`matched=${matched}`, parameters, visitValue);\n  //         return acc && matched;\n  //       }, true);\n  //     });\n  //     return this;\n  //   }\n  //\n  //   last(): Visit.State {\n  //     return _.findLast(this._history, visit => this._matches(visit))\n  //   }\n  //\n  //   // @trace\n  //   allThatMatch(): Visit.State[] {\n  //     return _.filter(this._history, visit => this._matches(visit)).slice(-this._limit);\n  //   }\n  //\n  //   // @trace\n  //   mostRecentValueOf<T=any>(param: string, defaultValue: T = null): T {\n  //     const lastStateWithParam = _.findLast(this.allThatMatch(), state => !_.isNil(state.get(param)));\n  //     return _.isNil(lastStateWithParam) ? defaultValue : lastStateWithParam.get(param);\n  //   }\n  //\n  //   limit(limit: number): this {\n  //     this._limit = limit;\n  //     return this;\n  //   }\n  //\n  //   matching(predicate: (visit: Visit.State) => boolean): this {\n  //     this._predicate = predicate;\n  //     return this;\n  //   }\n  //\n  //   _matches(visit: Visit.State) {\n  //     return this._isPlaceMatch(visit) && this._predicate(visit);\n  //   }\n  //\n  //   _isPlaceMatch(visit: Visit.State) {\n  //     return this._places.length < 1 || this._places.includes(visit.place)\n  //   }\n  //\n  // }\n\n}\n"]}
+{"version":3,"file":"place-history.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/place-history.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { assert, Trace } from '@coolon/pectin';\nimport _ from 'lodash';\nimport { PlaceDefinition } from './place-definition';\nimport { Visit } from './visit';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceHistory {\n\n  private _activeVisits: PlaceHistory.VisitRecord;\n  private _previousVisits: PlaceHistory.VisitRecord;\n\n  private _archive = new Map<PlaceDefinition, Visit[]>();\n  private readonly placeHistoryDepth: number = 4;\n\n  constructor() {\n  }\n\n  notifyNavigationStarted() {\n    if (this._activeVisits) {\n      this.archive(this._activeVisits.visits);\n      this._previousVisits = this._activeVisits;\n    }\n  }\n\n  notifyNavigationFinished(visits: Visit[]) {\n    this._activeVisits = new PlaceHistory.VisitRecord(visits);\n  }\n\n  updateVisit(visit: Visit) {\n    assert.isTruthy(this._activeVisits);\n    this._activeVisits.update(visit);\n  }\n\n  lastVisitIncluded(placeDef: PlaceDefinition): boolean {\n    return !!this._previousVisits?.getVisitFor(placeDef);\n  }\n\n  getMostRecentVisitFor(placeDef: PlaceDefinition) {\n    return _.first(this.getHistory(placeDef));\n  }\n\n  getHistory(placeDef: PlaceDefinition): Visit[] {\n    let history = this._archive.get(placeDef);\n    if (!history) {\n      history = [];\n      this.setHistory(placeDef, history);\n    }\n    return history;\n  }\n\n  private setHistory(placeDef: PlaceDefinition, history: Visit[]) {\n    this._archive.set(placeDef, history);\n  }\n\n  protected archive(visits: Visit[]) {\n    visits.forEach(state => {\n      const history = this.getHistory(state.placeDefinition);\n      const previousState = _.first(history);\n      if (!previousState || state.hasChangedFrom(previousState)) {\n        history.unshift(state); // LIFO\n        this.setHistory(state.placeDefinition, history.slice(0, this.placeHistoryDepth));\n      }\n    });\n  }\n\n\n}\n\nexport namespace PlaceHistory {\n\n  export class VisitRecord {\n    constructor(public visits: Visit[]) {\n    }\n\n    update(visit: Visit) {\n      this.visits = this.visits.filter(v => v.placeDefinition !== visit.placeDefinition).concat(visit);\n    }\n\n    getVisitFor(placeDef: PlaceDefinition): Visit | undefined {\n      return this.visits.find(v => v.placeDefinition === placeDef);\n    }\n  }\n\n  // export class Query {\n  //   private _history: Visit.State[];\n  //   private _places: Place[];\n  //   private _predicate: (visit: any) => boolean;\n  //   private _limit: number;\n  //\n  //   constructor(history, limit = history.length) {\n  //     this._history = history;\n  //     this._places = [];\n  //     this._predicate = (visit => true);\n  //     this._limit = limit;\n  //   }\n  //\n  //   to(...places:Place[]):this {\n  //     this._places = places;\n  //     return this;\n  //   }\n  //\n  //   with(parameters: { [parameter: string]: any }): this {\n  //     this.matching(state => {\n  //       return Object.keys(parameters).reduce((acc, key) => {\n  //         const matchValue = parameters[key];\n  //         const visitValue = state.get(key);\n  //         const matched = matchValue === '*' ? !_.isNil(visitValue) : visitValue == matchValue;\n  //         // Logger.get(this).info(`matched=${matched}`, parameters, visitValue);\n  //         return acc && matched;\n  //       }, true);\n  //     });\n  //     return this;\n  //   }\n  //\n  //   last(): Visit.State {\n  //     return _.findLast(this._history, visit => this._matches(visit))\n  //   }\n  //\n  //   // @trace\n  //   allThatMatch(): Visit.State[] {\n  //     return _.filter(this._history, visit => this._matches(visit)).slice(-this._limit);\n  //   }\n  //\n  //   // @trace\n  //   mostRecentValueOf<T=any>(param: string, defaultValue: T = null): T {\n  //     const lastStateWithParam = _.findLast(this.allThatMatch(), state => !_.isNil(state.get(param)));\n  //     return _.isNil(lastStateWithParam) ? defaultValue : lastStateWithParam.get(param);\n  //   }\n  //\n  //   limit(limit: number): this {\n  //     this._limit = limit;\n  //     return this;\n  //   }\n  //\n  //   matching(predicate: (visit: Visit.State) => boolean): this {\n  //     this._predicate = predicate;\n  //     return this;\n  //   }\n  //\n  //   _matches(visit: Visit.State) {\n  //     return this._isPlaceMatch(visit) && this._predicate(visit);\n  //   }\n  //\n  //   _isPlaceMatch(visit: Visit.State) {\n  //     return this._places.length < 1 || this._places.includes(visit.place)\n  //   }\n  //\n  // }\n\n}\n"]}

package/esm2015/lib/place/place-history.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"PlaceHistory":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable","line":7,"character":1},"arguments":[{"providedIn":"root"}]}],"members":{"__ctor__":[{"__symbolic":"constructor"}],"add":[{"__symbolic":"method"}],"getHistory":[{"__symbolic":"method"}],"setHistory":[{"__symbolic":"method"}]},"statics":{"ɵprov":{}}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"PlaceHistory":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable","line":6,"character":1},"arguments":[{"providedIn":"root"}]}],"members":{"__ctor__":[{"__symbolic":"constructor"}],"notifyNavigationStarted":[{"__symbolic":"method"}],"notifyNavigationFinished":[{"__symbolic":"method"}],"updateVisit":[{"__symbolic":"method"}],"lastVisitIncluded":[{"__symbolic":"method"}],"getMostRecentVisitFor":[{"__symbolic":"method"}],"getHistory":[{"__symbolic":"method"}],"setHistory":[{"__symbolic":"method"}],"archive":[{"__symbolic":"method"}]},"statics":{"ɵprov":{}}}}}]

package/esm2015/lib/place/place-router.js

@@ -2,7 +2,7 @@ import { __awaiter, __decorate, __metadata } from "tslib";
 import { Location } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { ActivatedRoute, NavigationCancel, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router } from '@angular/router';
-import { assert, DebugContext, Dsl, GarbageCollector, lang, Logger, MutableListModel, MutableValueModel } from '@coolon/pectin';
+import { assert, DebugContext, Dsl, GarbageCollector, lang, Logger, MutableListModel, MutableValueModel, Trace } from '@coolon/pectin';
 import { InteractionService } from '../interaction/services/interaction.service';
 import { NavigatingDuringInteraction } from './navigation/session/interactions/navigating-during-interaction';
 import { PopStateDuringInteractionNavigation } from './navigation/session/interactions/pop-state-during-interaction-navigation';
@@ -12,6 +12,7 @@ import { NavigationContext } from './navigation/session/navigation-context';
 import { PopStateNavigation } from './navigation/session/pop-state-navigation';
 import { PlaceHistory } from './place-history';
 import { UrlService } from './url-service';
+import { Visit } from './visit';
 import * as i0 from "@angular/core";
 import * as i1 from "@angular/router";
 import * as i2 from "@angular/common";
@@ -179,12 +180,9 @@ let PlaceRouter = class PlaceRouter extends GarbageCollector {
     get activeVisits() {
         return this._activeVisits.readonly;
     }
-    // @Trace()
     pushVisitChangesToRoute(previous, next) {
         return __awaiter(this, void 0, void 0, function* () {
-            // we have to push to history so our remember sanitisers don't pick up the previous value
-            // when it's been cleared by the user.
-            this.placeHistory.add(next);
+            this.placeHistory.updateVisit(next);
             // FIXME: no route id -> route id duplicates route parameters
             if (next.hasRoutingChangedFrom(previous)) {
                 return this.doNavigation(next, router => {
@@ -204,6 +202,9 @@ let PlaceRouter = class PlaceRouter extends GarbageCollector {
     // @Trace()
     transitionTo(next) {
         const previous = this.navigationSessionModel.value;
+        if (!previous) {
+            this.placeHistory.notifyNavigationStarted();
+        }
         assert.isTruthy(next !== previous);
         Logger.get(this).info(`### Router State Transition: ${previous ? previous.toString() : 'null'} -> ${next.toString()}`);
         this.navigationSessionModel.value = next;
@@ -216,7 +217,7 @@ let PlaceRouter = class PlaceRouter extends GarbageCollector {
     routingSessionFinished(visits) {
         if (visits && visits.length > 0) {
             assert.isTruthy(this.navigationInProgress.value);
-            visits.forEach(v => this.placeHistory.add(v));
+            this.placeHistory.notifyNavigationFinished(visits);
             // We update the active visits before we finish the session so the
             // place outlets can ignore the incoming changes until things are
             // settled. TODO: can we removed the event'ness here and just do a push?
@@ -275,6 +276,12 @@ PlaceRouter.ctorParameters = () => [
     { type: PlaceHistory }
 ];
 PlaceRouter.ɵprov = i0.ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i2.Location), i0.ɵɵinject(i3.InteractionService), i0.ɵɵinject(i4.UrlService), i0.ɵɵinject(i5.PlaceHistory)); }, token: PlaceRouter, providedIn: "root" });
+__decorate([
+    Trace(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Visit, Visit]),
+    __metadata("design:returntype", Promise)
+], PlaceRouter.prototype, "pushVisitChangesToRoute", null);
 PlaceRouter = __decorate([
     Injectable({
         providedIn: 'root'

package/esm2015/lib/place/place-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/place-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { Location } from '@angular/common';\nimport { DEBUG } from '@angular/compiler-cli/ngcc/src/logging/console_logger';\nimport { Injectable } from '@angular/core';\nimport {\n  ActivatedRoute,\n  NavigationCancel,\n  NavigationEnd,\n  NavigationError,\n  NavigationExtras,\n  NavigationStart,\n  Router\n} from '@angular/router';\nimport {\n  assert, DebugContext,\n  Dsl,\n  GarbageCollector,\n  HasOneIndexChain,\n  lang,\n  ListModel,\n  Logger,\n  MutableListModel,\n  MutableValueModel,\n  Trace, TransactionObserver,\n  ValueModelChain\n} from '@coolon/pectin';\nimport { InteractionService } from '../interaction/services/interaction.service';\nimport { InteractionServiceRoutingAdapter } from '../interaction/services/interaction-service-routing-adapter';\nimport { NavigatingDuringInteraction } from './navigation/session/interactions/navigating-during-interaction';\nimport { PopStateDuringInteractionNavigation } from './navigation/session/interactions/pop-state-during-interaction-navigation';\nimport { SynchroniseInteractionContextIdsWithRoute } from './navigation/session/interactions/synchronise-interaction-context-ids-with-route';\nimport { Navigating } from './navigation/session/navigating';\nimport { NavigationContext } from './navigation/session/navigation-context';\nimport { NavigationSession } from './navigation/session/navigation-session';\nimport { PopStateNavigation } from './navigation/session/pop-state-navigation';\nimport { PlaceHistory } from './place-history';\nimport { UrlService } from './url-service';\nimport { UrlSnapshot } from './url-snapshot';\nimport { Visit } from './visit';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  readonly navigationSessionModel = new MutableValueModel<NavigationSession>();\n  readonly navigationInProgress: ValueModelChain<boolean>;\n  readonly navigationSessionName: ValueModelChain<string>; // used by tests\n\n  private readonly navigationContext: NavigationContext.Impl;\n\n  private readonly _activeVisits = new MutableListModel<Visit>();\n  readonly activeVisitsByPlaceDefinition: HasOneIndexChain<'placeDefinition', Visit>;\n  private routerInteractionAdapter: InteractionServiceRoutingAdapter;\n  private sessionFinishedJobs: (() => void)[] = [];\n\n  constructor(private readonly angularRouter: Router,\n              private readonly angularLocation: Location,\n              private readonly interactionService: InteractionService,\n              private readonly urlService: UrlService,\n              private readonly placeHistory: PlaceHistory) {\n    super();\n\n    this.routerInteractionAdapter = interactionService.registerPlaceRouter(this);\n\n    // TODO: Make this an interface and use 'this' instead.\n    this.navigationContext = new NavigationContext.Impl(\n      this.urlService,\n      this.routerInteractionAdapter,\n      (urlSnapshot: UrlSnapshot, options: { replaceUrl: boolean }) => {\n        return this.navigateByUrl(urlSnapshot, options);\n      },\n      state => {\n        this.transitionTo(state);\n      },\n      visits => {\n        this.routingSessionFinished(visits);\n      });\n\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.navigationInProgress = chain(this.navigationSessionModel).isNotNil();\n\n    const idleStateName = chain(this.interactionService.active).map(active => active ? 'IdleDuringInteraction' : 'Idle');\n    this.navigationSessionName = chain(this.navigationSessionModel)\n      .pluck('name')\n      .otherwise(idleStateName);\n\n    DebugContext.tag(this._activeVisits, \"PlaceRouter.activeVisits\");\n    this.activeVisitsByPlaceDefinition = chain(this._activeVisits).indexBy('placeDefinition');\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    angularRouter.events.subscribe(event => {\n      // Routing event sequence\n      // ======================\n      // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session\n      // NavigationStart -> .... -> NavigationEnd --> navigation complete, end session.\n      // NavigationStart -> .... -> NavigationError --> navigation aborted, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        // console.log(`---> NavigationStart[${event.id}]: ${event.url} (${event.navigationTrigger})`);\n        if (event.navigationTrigger === 'popstate') {\n          this.onPopState(event);\n        } else {\n          this.onRouterStarted(event);\n        }\n        // console.log(`<--- NavigationStart[${event.id}]: ${event.url} (${event.navigationTrigger})`);\n      }\n      if (event instanceof NavigationEnd) {\n        // console.log(`---> NavigationEnd[${event.id}]: ${event.url}`);\n        this.onRouterEnd(event);\n        // console.log(`<--- NavigationEnd[${event.id}]: ${event.url}`);\n      }\n      if (event instanceof NavigationError) {\n        // console.log(`---> NavigationError[${event.id}]: ${event.url}`);\n        this.onRouterError(event);\n        // console.log(`<--- NavigationError[${event.id}]: ${event.url}`);\n      }\n      if (event instanceof NavigationCancel) {\n        // console.log(`---> NavigationCancel[${event.id}]: ${event.url}`);\n        this.onRouterCancelled(event);\n        // console.log(`<--- NavigationCancel[${event.id}]: ${event.url}`);\n      }\n    });\n\n    // The router needs to know about url changes and in some cases they are the only way the router can know if\n    // the back button was clicked.\n    angularLocation.onUrlChange(url => this.onUrlChanged(url));\n\n  }\n\n  get navigationSession() {\n    return this.navigationSessionModel.value;\n  }\n\n  get currentSession() {\n    return this.navigationSessionModel.value;\n  }\n\n  // @Trace()\n  onPopState(event: NavigationStart) {\n    assert.isTruthy(event.navigationTrigger === 'popstate');\n    if (this.currentSession) {\n      this.currentSession.onPopState(event);\n    } else {\n      const poppedHistoryUrl = event.url;\n      const currentRouterUrl = this.urlService.getCurrentRouterUrl();\n      const session = this.interactionService.isActive() ?\n        new PopStateDuringInteractionNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl) :\n        new PopStateNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl);\n      this.transitionTo(session);\n    }\n  }\n\n  // @Trace()\n  onRouterStarted(event: NavigationStart) {\n    assert.isFalsey(event.navigationTrigger === 'popstate');\n    const inInteraction = this.interactionService.isActive();\n    if (this.currentSession) {\n      this.currentSession.onRouterStarted(event);\n    } else {\n      this.transitionTo(this.createNavigationSession(this.urlService.getCurrentRouterUrl()));\n    }\n  }\n\n  // @Trace()\n  onUrlChanged(newUrl: string) {\n    // the back button can trigger a url change without a navigation session in progress so we\n    // console.log(`---> Url Changed ${newUrl}`);\n    if (this.currentSession) {\n      this.currentSession.onUrlChange(newUrl);\n    } else {\n      console.log('FYI: url changed without a navigation session in progress');\n    }\n    // console.log(`<--- Url Changed`);\n  }\n\n  // @Trace()\n  onRouterCancelled(event: NavigationCancel) {\n    this.currentSession.onRouterCancelled(event);\n  }\n\n  // @Trace()\n  onRouterError(event: NavigationError) {\n    this.currentSession.onRouterError(event);\n  }\n\n  // @Trace()\n  onRouterEnd(event: NavigationEnd) {\n    this.currentSession.onRouterEnd(event);\n  }\n\n  navigate(visit: Visit, options?: { relativeTo: ActivatedRoute }) {\n    return this.doNavigation(visit, async router => {\n      const commands = [\n        visit.placeDefinition.path,\n        ...this.createRouteParameters(visit)\n      ];\n      await this.angularRouter.navigate(commands, {\n        relativeTo: options ? options.relativeTo : null\n      });\n    });\n  }\n\n  // @Trace()\n  async doNavigation(visit: Visit, runNavigationCommands: (router: Router) => any) {\n    if (this.navigationInProgress.value) {\n      lang.illegalState('Navigation already in progress');\n    }\n    const navigation = this.createNavigationSession(this.urlService.getCurrentRouterUrl());\n    navigation.storeVisit(visit);\n    this.transitionTo(navigation);\n    try {\n      await runNavigationCommands(this.angularRouter);\n    } finally {\n      // Check if the router has finished (in the case where no router change required) and we're still in  a\n      // transient state and finish of the transition.\n      if (!this.angularRouter.getCurrentNavigation() && this.currentSession) {\n        this.currentSession.onRouterEnd(new NavigationEnd(-1, '', ''));\n      }\n    }\n  }\n\n  navigateByUrl(urlSnapshot: UrlSnapshot, navigationExtras?: NavigationExtras) {\n    // console.log(`### navigationByUrl -> ${urlSnapshot.urlTree.toString()}`);\n    return this.angularRouter.navigateByUrl(urlSnapshot.urlTree, navigationExtras);\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  // @Trace()\n  async pushVisitChangesToRoute(previous: Visit, next: Visit): Promise<void> {\n    // we have to push to history so our remember sanitisers don't pick up the previous value\n    // when it's been cleared by the user.\n    this.placeHistory.add(next);\n    // FIXME: no route id -> route id duplicates route parameters\n    if (next.hasRoutingChangedFrom(previous)) {\n      return this.doNavigation(next, router => {\n        const urlSnapshot = this.urlService.parseUrl(this.angularRouter.routerState.snapshot.url).updateVisitSegments(next);\n        // console.log('### Push Changes to route Redirect', { commands: urlSnapshot.url });\n        return this.navigateByUrl(urlSnapshot);\n      });\n    }\n  }\n\n\n  private createNavigationSession(currentRouterUrl: string): NavigationSession {\n    const inInteraction = this.interactionService.isActive();\n    return inInteraction ?\n      new NavigatingDuringInteraction(this.navigationContext, currentRouterUrl) :\n      new Navigating(this.navigationContext, currentRouterUrl);\n  }\n\n  // @Trace()\n  protected transitionTo(next: NavigationSession) {\n    const previous = this.navigationSessionModel.value;\n    assert.isTruthy(next !== previous);\n    Logger.get(this).info(`### Router State Transition: ${previous ? previous.toString() : 'null'} -> ${next.toString()}`);\n    this.navigationSessionModel.value = next;\n    if (!!previous) {\n      previous.dispose();\n    }\n    next.notifyActive();\n  }\n\n  // @Trace()\n  private routingSessionFinished(visits: Visit[]) {\n    if (visits && visits.length > 0) {\n      assert.isTruthy(this.navigationInProgress.value);\n      visits.forEach(v => this.placeHistory.add(v));\n      // We update the active visits before we finish the session so the\n      // place outlets can ignore the incoming changes until things are\n      // settled. TODO: can we removed the event'ness here and just do a push?\n      this._activeVisits.value = visits;\n    }\n    const session = this.currentSession;\n    session.dispose();\n    this.navigationSessionModel.value = null;\n    console.log(`### Router Session Finished (was ${session.toString()})`);\n    this.sessionFinishedJobs.forEach(job => job());\n    this.sessionFinishedJobs = [];\n  }\n\n  private runAfterRoutingSessionFinishes(func: () => void) {\n    assert.isTruthy(this.navigationInProgress);\n    this.sessionFinishedJobs.push(func);\n  }\n\n\n  /**\n   * Sync's the current interaction state with the URL.  We need to push something in the URL in order\n   * to be able to capture the back button on the first page.  If we don't then the back click will exit\n   * the app directly and we don't get to ask.\n   */\n  // @Trace()\n  syncInteractionContextIdsWithRouter(): Promise<unknown> {\n    if (this.navigationSession) {\n      // console.log(`Navigation active -> ${this.navigationSession.toString()}, sync delayed until finished.`);\n      const session = this.navigationSession;\n      return new Promise((resolve, reject) => {\n        this.runAfterRoutingSessionFinishes(() => {\n          this.runAfterRoutingSessionFinishes(resolve);\n          const syncSession = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);\n          this.transitionTo(syncSession);\n        });\n      });\n    } else {\n      return new Promise<unknown>(((resolve, reject) => {\n        // console.log(`No navigation in progress, starting synchronisation job`);\n        this.runAfterRoutingSessionFinishes(resolve);\n        const session = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);\n        this.transitionTo(session);\n      }))\n\n    }\n  }\n\n\n  private createRouteParameters(visit: Visit) {\n    const def = visit.placeDefinition;\n    return visit.hasRouteId() ?\n      [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n      [def.getFormattedRouteParameters(visit)];\n  }\n\n}\n\nexport namespace NavigationStateMachine {\n  export type VisitsUpdatedCallback = (visits: Visit[]) => void;\n}\n"]}
+{"version":3,"file":"place-router.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/place-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { Location } from '@angular/common';\nimport { DEBUG } from '@angular/compiler-cli/ngcc/src/logging/console_logger';\nimport { Injectable } from '@angular/core';\nimport {\n  ActivatedRoute,\n  NavigationCancel,\n  NavigationEnd,\n  NavigationError,\n  NavigationExtras,\n  NavigationStart,\n  Router\n} from '@angular/router';\nimport {\n  assert, DebugContext,\n  Dsl,\n  GarbageCollector,\n  HasOneIndexChain,\n  lang,\n  ListModel,\n  Logger,\n  MutableListModel,\n  MutableValueModel,\n  Trace, TransactionObserver,\n  ValueModelChain\n} from '@coolon/pectin';\nimport { InteractionService } from '../interaction/services/interaction.service';\nimport { InteractionServiceRoutingAdapter } from '../interaction/services/interaction-service-routing-adapter';\nimport { NavigatingDuringInteraction } from './navigation/session/interactions/navigating-during-interaction';\nimport { PopStateDuringInteractionNavigation } from './navigation/session/interactions/pop-state-during-interaction-navigation';\nimport { SynchroniseInteractionContextIdsWithRoute } from './navigation/session/interactions/synchronise-interaction-context-ids-with-route';\nimport { Navigating } from './navigation/session/navigating';\nimport { NavigationContext } from './navigation/session/navigation-context';\nimport { NavigationSession } from './navigation/session/navigation-session';\nimport { PopStateNavigation } from './navigation/session/pop-state-navigation';\nimport { PlaceHistory } from './place-history';\nimport { UrlService } from './url-service';\nimport { UrlSnapshot } from './url-snapshot';\nimport { Visit } from './visit';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class PlaceRouter extends GarbageCollector {\n\n  readonly navigationSessionModel = new MutableValueModel<NavigationSession>();\n  readonly navigationInProgress: ValueModelChain<boolean>;\n  readonly navigationSessionName: ValueModelChain<string>; // used by tests\n\n  private readonly navigationContext: NavigationContext.Impl;\n\n  private readonly _activeVisits = new MutableListModel<Visit>();\n  readonly activeVisitsByPlaceDefinition: HasOneIndexChain<'placeDefinition', Visit>;\n  private routerInteractionAdapter: InteractionServiceRoutingAdapter;\n  private sessionFinishedJobs: (() => void)[] = [];\n\n  constructor(private readonly angularRouter: Router,\n              private readonly angularLocation: Location,\n              private readonly interactionService: InteractionService,\n              private readonly urlService: UrlService,\n              private readonly placeHistory: PlaceHistory) {\n    super();\n\n    this.routerInteractionAdapter = interactionService.registerPlaceRouter(this);\n\n    // TODO: Make this an interface and use 'this' instead.\n    this.navigationContext = new NavigationContext.Impl(\n      this.urlService,\n      this.routerInteractionAdapter,\n      (urlSnapshot: UrlSnapshot, options: { replaceUrl: boolean }) => {\n        return this.navigateByUrl(urlSnapshot, options);\n      },\n      state => {\n        this.transitionTo(state);\n      },\n      visits => {\n        this.routingSessionFinished(visits);\n      });\n\n    const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);\n    this.navigationInProgress = chain(this.navigationSessionModel).isNotNil();\n\n    const idleStateName = chain(this.interactionService.active).map(active => active ? 'IdleDuringInteraction' : 'Idle');\n    this.navigationSessionName = chain(this.navigationSessionModel)\n      .pluck('name')\n      .otherwise(idleStateName);\n\n    DebugContext.tag(this._activeVisits, \"PlaceRouter.activeVisits\");\n    this.activeVisitsByPlaceDefinition = chain(this._activeVisits).indexBy('placeDefinition');\n\n    // TODO: make setup the callbacks in during module initiation to make this testable.\n    angularRouter.events.subscribe(event => {\n      // Routing event sequence\n      // ======================\n      // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session\n      // NavigationStart -> .... -> NavigationEnd --> navigation complete, end session.\n      // NavigationStart -> .... -> NavigationError --> navigation aborted, end session.\n      // =======================\n      if (event instanceof NavigationStart) {\n        // console.log(`---> NavigationStart[${event.id}]: ${event.url} (${event.navigationTrigger})`);\n        if (event.navigationTrigger === 'popstate') {\n          this.onPopState(event);\n        } else {\n          this.onRouterStarted(event);\n        }\n        // console.log(`<--- NavigationStart[${event.id}]: ${event.url} (${event.navigationTrigger})`);\n      }\n      if (event instanceof NavigationEnd) {\n        // console.log(`---> NavigationEnd[${event.id}]: ${event.url}`);\n        this.onRouterEnd(event);\n        // console.log(`<--- NavigationEnd[${event.id}]: ${event.url}`);\n      }\n      if (event instanceof NavigationError) {\n        // console.log(`---> NavigationError[${event.id}]: ${event.url}`);\n        this.onRouterError(event);\n        // console.log(`<--- NavigationError[${event.id}]: ${event.url}`);\n      }\n      if (event instanceof NavigationCancel) {\n        // console.log(`---> NavigationCancel[${event.id}]: ${event.url}`);\n        this.onRouterCancelled(event);\n        // console.log(`<--- NavigationCancel[${event.id}]: ${event.url}`);\n      }\n    });\n\n    // The router needs to know about url changes and in some cases they are the only way the router can know if\n    // the back button was clicked.\n    angularLocation.onUrlChange(url => this.onUrlChanged(url));\n\n  }\n\n  get navigationSession() {\n    return this.navigationSessionModel.value;\n  }\n\n  get currentSession() {\n    return this.navigationSessionModel.value;\n  }\n\n  // @Trace()\n  onPopState(event: NavigationStart) {\n    assert.isTruthy(event.navigationTrigger === 'popstate');\n    if (this.currentSession) {\n      this.currentSession.onPopState(event);\n    } else {\n      const poppedHistoryUrl = event.url;\n      const currentRouterUrl = this.urlService.getCurrentRouterUrl();\n      const session = this.interactionService.isActive() ?\n        new PopStateDuringInteractionNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl) :\n        new PopStateNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl);\n      this.transitionTo(session);\n    }\n  }\n\n  // @Trace()\n  onRouterStarted(event: NavigationStart) {\n    assert.isFalsey(event.navigationTrigger === 'popstate');\n    const inInteraction = this.interactionService.isActive();\n    if (this.currentSession) {\n      this.currentSession.onRouterStarted(event);\n    } else {\n      this.transitionTo(this.createNavigationSession(this.urlService.getCurrentRouterUrl()));\n    }\n  }\n\n  // @Trace()\n  onUrlChanged(newUrl: string) {\n    // the back button can trigger a url change without a navigation session in progress so we\n    // console.log(`---> Url Changed ${newUrl}`);\n    if (this.currentSession) {\n      this.currentSession.onUrlChange(newUrl);\n    } else {\n      console.log('FYI: url changed without a navigation session in progress');\n    }\n    // console.log(`<--- Url Changed`);\n  }\n\n  // @Trace()\n  onRouterCancelled(event: NavigationCancel) {\n    this.currentSession.onRouterCancelled(event);\n  }\n\n  // @Trace()\n  onRouterError(event: NavigationError) {\n    this.currentSession.onRouterError(event);\n  }\n\n  // @Trace()\n  onRouterEnd(event: NavigationEnd) {\n    this.currentSession.onRouterEnd(event);\n  }\n\n  navigate(visit: Visit, options?: { relativeTo: ActivatedRoute }) {\n    return this.doNavigation(visit, async router => {\n      const commands = [\n        visit.placeDefinition.path,\n        ...this.createRouteParameters(visit)\n      ];\n      await this.angularRouter.navigate(commands, {\n        relativeTo: options ? options.relativeTo : null\n      });\n    });\n  }\n\n  // @Trace()\n  async doNavigation(visit: Visit, runNavigationCommands: (router: Router) => any) {\n    if (this.navigationInProgress.value) {\n      lang.illegalState('Navigation already in progress');\n    }\n    const navigation = this.createNavigationSession(this.urlService.getCurrentRouterUrl());\n    navigation.storeVisit(visit);\n    this.transitionTo(navigation);\n    try {\n      await runNavigationCommands(this.angularRouter);\n    } finally {\n      // Check if the router has finished (in the case where no router change required) and we're still in  a\n      // transient state and finish of the transition.\n      if (!this.angularRouter.getCurrentNavigation() && this.currentSession) {\n        this.currentSession.onRouterEnd(new NavigationEnd(-1, '', ''));\n      }\n    }\n  }\n\n  navigateByUrl(urlSnapshot: UrlSnapshot, navigationExtras?: NavigationExtras) {\n    // console.log(`### navigationByUrl -> ${urlSnapshot.urlTree.toString()}`);\n    return this.angularRouter.navigateByUrl(urlSnapshot.urlTree, navigationExtras);\n  }\n\n  get activeVisits(): ListModel<Visit> {\n    return this._activeVisits.readonly;\n  }\n\n  @Trace()\n  async pushVisitChangesToRoute(previous: Visit, next: Visit): Promise<void> {\n    this.placeHistory.updateVisit(next);\n\n    // FIXME: no route id -> route id duplicates route parameters\n    if (next.hasRoutingChangedFrom(previous)) {\n      return this.doNavigation(next, router => {\n        const urlSnapshot = this.urlService.parseUrl(this.angularRouter.routerState.snapshot.url).updateVisitSegments(next);\n        // console.log('### Push Changes to route Redirect', { commands: urlSnapshot.url });\n        return this.navigateByUrl(urlSnapshot);\n      });\n    }\n  }\n\n\n  private createNavigationSession(currentRouterUrl: string): NavigationSession {\n    const inInteraction = this.interactionService.isActive();\n    return inInteraction ?\n      new NavigatingDuringInteraction(this.navigationContext, currentRouterUrl) :\n      new Navigating(this.navigationContext, currentRouterUrl);\n  }\n\n  // @Trace()\n  protected transitionTo(next: NavigationSession) {\n    const previous = this.navigationSessionModel.value;\n    if (!previous) {\n      this.placeHistory.notifyNavigationStarted();\n    }\n    assert.isTruthy(next !== previous);\n    Logger.get(this).info(`### Router State Transition: ${previous ? previous.toString() : 'null'} -> ${next.toString()}`);\n    this.navigationSessionModel.value = next;\n    if (!!previous) {\n      previous.dispose();\n    }\n    next.notifyActive();\n  }\n\n  // @Trace()\n  private routingSessionFinished(visits: Visit[]) {\n    if (visits && visits.length > 0) {\n      assert.isTruthy(this.navigationInProgress.value);\n      this.placeHistory.notifyNavigationFinished(visits)\n      // We update the active visits before we finish the session so the\n      // place outlets can ignore the incoming changes until things are\n      // settled. TODO: can we removed the event'ness here and just do a push?\n      this._activeVisits.value = visits;\n    }\n    const session = this.currentSession;\n    session.dispose();\n    this.navigationSessionModel.value = null;\n    console.log(`### Router Session Finished (was ${session.toString()})`);\n    this.sessionFinishedJobs.forEach(job => job());\n    this.sessionFinishedJobs = [];\n  }\n\n  private runAfterRoutingSessionFinishes(func: () => void) {\n    assert.isTruthy(this.navigationInProgress);\n    this.sessionFinishedJobs.push(func);\n  }\n\n\n  /**\n   * Sync's the current interaction state with the URL.  We need to push something in the URL in order\n   * to be able to capture the back button on the first page.  If we don't then the back click will exit\n   * the app directly and we don't get to ask.\n   */\n  // @Trace()\n  syncInteractionContextIdsWithRouter(): Promise<unknown> {\n    if (this.navigationSession) {\n      // console.log(`Navigation active -> ${this.navigationSession.toString()}, sync delayed until finished.`);\n      const session = this.navigationSession;\n      return new Promise((resolve, reject) => {\n        this.runAfterRoutingSessionFinishes(() => {\n          this.runAfterRoutingSessionFinishes(resolve);\n          const syncSession = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);\n          this.transitionTo(syncSession);\n        });\n      });\n    } else {\n      return new Promise<unknown>(((resolve, reject) => {\n        // console.log(`No navigation in progress, starting synchronisation job`);\n        this.runAfterRoutingSessionFinishes(resolve);\n        const session = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);\n        this.transitionTo(session);\n      }))\n\n    }\n  }\n\n\n  private createRouteParameters(visit: Visit) {\n    const def = visit.placeDefinition;\n    return visit.hasRouteId() ?\n      [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :\n      [def.getFormattedRouteParameters(visit)];\n  }\n\n}\n\nexport namespace NavigationStateMachine {\n  export type VisitsUpdatedCallback = (visits: Visit[]) => void;\n}\n"]}

package/esm2015/lib/place/place-router.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"PlaceRouter":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"@coolon/pectin","name":"GarbageCollector","line":42,"character":33},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable","line":39,"character":1},"arguments":[{"providedIn":"root"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/router","name":"Router","line":55,"character":46},{"__symbolic":"reference","module":"@angular/common","name":"Location","line":56,"character":48},{"__symbolic":"reference","module":"../interaction/services/interaction.service","name":"InteractionService","line":57,"character":51},{"__symbolic":"reference","module":"./url-service","name":"UrlService","line":58,"character":43},{"__symbolic":"reference","module":"./place-history","name":"PlaceHistory","line":59,"character":45}]}],"onPopState":[{"__symbolic":"method"}],"onRouterStarted":[{"__symbolic":"method"}],"onUrlChanged":[{"__symbolic":"method"}],"onRouterCancelled":[{"__symbolic":"method"}],"onRouterError":[{"__symbolic":"method"}],"onRouterEnd":[{"__symbolic":"method"}],"navigate":[{"__symbolic":"method"}],"doNavigation":[{"__symbolic":"method"}],"navigateByUrl":[{"__symbolic":"method"}],"pushVisitChangesToRoute":[{"__symbolic":"method"}],"createNavigationSession":[{"__symbolic":"method"}],"transitionTo":[{"__symbolic":"method"}],"routingSessionFinished":[{"__symbolic":"method"}],"runAfterRoutingSessionFinishes":[{"__symbolic":"method"}],"syncInteractionContextIdsWithRouter":[{"__symbolic":"method"}],"createRouteParameters":[{"__symbolic":"method"}]},"statics":{"ɵprov":{}}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"PlaceRouter":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"@coolon/pectin","name":"GarbageCollector","line":42,"character":33},"decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable","line":39,"character":1},"arguments":[{"providedIn":"root"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/router","name":"Router","line":55,"character":46},{"__symbolic":"reference","module":"@angular/common","name":"Location","line":56,"character":48},{"__symbolic":"reference","module":"../interaction/services/interaction.service","name":"InteractionService","line":57,"character":51},{"__symbolic":"reference","module":"./url-service","name":"UrlService","line":58,"character":43},{"__symbolic":"reference","module":"./place-history","name":"PlaceHistory","line":59,"character":45}]}],"onPopState":[{"__symbolic":"method"}],"onRouterStarted":[{"__symbolic":"method"}],"onUrlChanged":[{"__symbolic":"method"}],"onRouterCancelled":[{"__symbolic":"method"}],"onRouterError":[{"__symbolic":"method"}],"onRouterEnd":[{"__symbolic":"method"}],"navigate":[{"__symbolic":"method"}],"doNavigation":[{"__symbolic":"method"}],"navigateByUrl":[{"__symbolic":"method"}],"pushVisitChangesToRoute":[{"__symbolic":"method","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"Trace","line":230,"character":3}}]}],"createNavigationSession":[{"__symbolic":"method"}],"transitionTo":[{"__symbolic":"method"}],"routingSessionFinished":[{"__symbolic":"method"}],"runAfterRoutingSessionFinishes":[{"__symbolic":"method"}],"syncInteractionContextIdsWithRouter":[{"__symbolic":"method"}],"createRouteParameters":[{"__symbolic":"method"}]},"statics":{"ɵprov":{}}}}}]

package/esm2015/lib/place/route/parameter-definition.class.js

@@ -20,19 +20,20 @@ export class ParameterDefinition {
         return this.options.getOptional(key, null);
     }
     // @Trace()
-    sanitise(value, visit, placeHistory, injector) {
+    sanitise(value, visit, placeHistory, injector, isPopState) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isMissingFrom(visit)) {
-                const previousVisit = _.first(placeHistory.getHistory(visit.placeDefinition));
-                if (this.remember && previousVisit) {
-                    value = previousVisit.getParameter(this.name);
+                const returningFromSomewhereElse = !placeHistory.lastVisitIncluded(visit.placeDefinition);
+                if (returningFromSomewhereElse) {
+                    const lastKnownVisit = placeHistory.getMostRecentVisitFor(visit.placeDefinition);
+                    if (this.remember && lastKnownVisit) {
+                        value = lastKnownVisit.getParameter(this.name);
+                    }
+                    return this.isEmptyValue(value) ? this.defaultValue : value;
                 }
-                return this.isEmptyValue(value) ? this.defaultValue : value;
-            }
-            else {
-                // todo: add custom sanitiser
-                return value;
             }
+            // todo: add custom sanitiser
+            return value;
         });
     }
     isMissingFrom(visit) {

package/esm2015/lib/place/route/parameter-definition.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameter-definition.class.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/parameter-definition.class.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AACpD,OAAO,CAAC,MAAM,QAAQ,CAAC;AAKvB,MAAM,OAAgB,mBAAmB;IASvC,YAAqB,YAAoB,EAAE,OAAuC,EAAW,SAAwB;QAAhG,iBAAY,GAAZ,YAAY,CAAQ;QAAoD,cAAS,GAAT,SAAS,CAAe;QACnH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC;IAED,WAAW;IACX,IAAI,gBAAgB;QAClB,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAMS,cAAc,CAAiD,GAAM;QAC7E,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW;IACL,QAAQ,CAAC,KAAO,EAAE,KAAY,EAAE,YAA0B,EAAE,QAAkB;;YAClF,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;gBAC9E,IAAI,IAAI,CAAC,QAAQ,IAAI,aAAa,EAAE;oBAClC,KAAK,GAAG,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC/C;gBACD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC;aAC7D;iBAAM;gBACL,6BAA6B;gBAC7B,OAAO,KAAK,CAAC;aACd;QACH,CAAC;KAAA;IAEO,aAAa,CAAC,KAAY;QAChC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACF;AAED,WAAiB,mBAAmB;IAUlC,MAAa,OAAW,SAAQ,mBAAsB;QAAtD;;YACW,cAAS,GAAG,IAAI,CAAC;YACjB,YAAO,GAAG,KAAK,CAAC;QAS3B,CAAC;QAPC,YAAY,CAAC,KAAQ;YACnB,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QAED,UAAU,CAAC,CAAM,EAAE,CAAM;YACvB,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;KACF;IAXY,2BAAO,UAWnB,CAAA;IAED,MAAa,cAAkB,SAAQ,mBAAsB;QAA7D;;YACW,cAAS,GAAG,KAAK,CAAC;YAClB,YAAO,GAAG,KAAK,CAAC;QAS3B,CAAC;QAPC,YAAY,CAAC,KAAQ;YACnB,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QAED,UAAU,CAAC,CAAM,EAAE,CAAM;YACvB,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;KACF;IAXY,kCAAc,iBAW1B,CAAA;IAED,MAAa,cAAkB,SAAQ,mBAA2B;QAIhE,YAAY,aAAqB,EAAE,OAAqB,EAAE,SAAuB;YAC/E,KAAK,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YAJlC,cAAS,GAAG,KAAK,CAAC;YAClB,YAAO,GAAG,IAAI,CAAC;QAIxB,CAAC;QAED,YAAY,CAAC,KAAU;YACrB,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5C,CAAC;QAED,UAAU,CAAC,CAAM,EAAE,CAAM;YACvB,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1B,CAAC;KAEF;IAhBY,kCAAc,iBAgB1B,CAAA;AACH,CAAC,EArDgB,mBAAmB,KAAnB,mBAAmB,QAqDnC","sourcesContent":["import { Injector } from '@angular/core';\nimport { Trace } from '@coolon/pectin';\nimport { Opts } from '@coolon/typescript-utilities';\nimport _ from 'lodash';\nimport { PlaceHistory } from '../place-history';\nimport { Visit } from '../visit';\nimport { Formatter } from './formatter';\n\nexport abstract class ParameterDefinition<T, E = T> {\n\n  abstract readonly isRouteId: boolean;\n  abstract readonly isArray: boolean;\n\n  readonly remember: boolean;\n  readonly defaultValue: T;\n  private options: Opts<ParameterDefinition.Options<T>>;\n\n  constructor(readonly propertyName: string, options: ParameterDefinition.Options<T>, readonly urlFormat?: Formatter<E>) {\n    this.options = Opts.get(options);\n    this.remember = this.options.getOptional('remember', false);\n    this.defaultValue = this.options.getOptional('defaultValue', null);\n  }\n\n  get name() {\n    return this.options.getOptional('as', this.propertyName);\n  }\n\n  // @Trace()\n  get isRouteParameter(): boolean {\n    return !!this.urlFormat;\n  }\n\n  abstract isEmptyValue(value: T): boolean;\n\n  abstract hasChanged(a: any, b: any): boolean;\n\n  protected getOptionValue<K extends keyof ParameterDefinition.Options<T>>(key: K): ParameterDefinition.Options<T>[K] {\n    return this.options.getOptional(key, null);\n  }\n\n  // @Trace()\n  async sanitise(value:T, visit: Visit, placeHistory: PlaceHistory, injector: Injector) {\n    if (this.isMissingFrom(visit)) {\n      const previousVisit = _.first(placeHistory.getHistory(visit.placeDefinition));\n      if (this.remember && previousVisit) {\n        value = previousVisit.getParameter(this.name);\n      }\n      return this.isEmptyValue(value) ? this.defaultValue : value;\n    } else {\n      // todo: add custom sanitiser\n      return value;\n    }\n  }\n\n  private isMissingFrom(visit: Visit) {\n    return !visit.hasParameter(this.name);\n  }\n}\n\nexport namespace ParameterDefinition {\n\n  export interface Options<T> {\n    as?: string;\n    optional?: boolean;\n    remember?: boolean;\n    defaultValue?: T;\n    // sanitiser?: Constructable<ParameterSanitiser<T>> | ParameterSanitiser.Options<T>;\n  }\n\n  export class RouteId<T> extends ParameterDefinition<T> {\n    readonly isRouteId = true;\n    readonly isArray = false;\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ValueParameter<T> extends ParameterDefinition<T> {\n    readonly isRouteId = false;\n    readonly isArray = false;\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ArrayParameter<T> extends ParameterDefinition<T[], T> {\n    readonly isRouteId = false;\n    readonly isArray = true;\n\n    constructor(parameterName: string, options: Options<T[]>, urlFormat: Formatter<T>) {\n      super(parameterName, options, urlFormat);\n    }\n\n    isEmptyValue(value: T[]): boolean {\n      return _.isNil(value) || value.length < 1;\n    }\n\n    hasChanged(a: T[], b: T[]): boolean {\n      return !_.isEqual(a, b);\n    }\n\n  }\n}\n"]}
+{"version":3,"file":"parameter-definition.class.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/parameter-definition.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport { Trace } from '@coolon/pectin';\nimport { Opts } from '@coolon/typescript-utilities';\nimport _ from 'lodash';\nimport { PlaceHistory } from '../place-history';\nimport { Visit } from '../visit';\nimport { Formatter } from './formatter';\n\nexport abstract class ParameterDefinition<T, E = T> {\n\n  abstract readonly isRouteId: boolean;\n  abstract readonly isArray: boolean;\n\n  readonly remember: boolean;\n  readonly defaultValue: T;\n  private options: Opts<ParameterDefinition.Options<T>>;\n\n  constructor(readonly propertyName: string, options: ParameterDefinition.Options<T>, readonly urlFormat?: Formatter<E>) {\n    this.options = Opts.get(options);\n    this.remember = this.options.getOptional('remember', false);\n    this.defaultValue = this.options.getOptional('defaultValue', null);\n  }\n\n  get name() {\n    return this.options.getOptional('as', this.propertyName);\n  }\n\n  // @Trace()\n  get isRouteParameter(): boolean {\n    return !!this.urlFormat;\n  }\n\n  abstract isEmptyValue(value: T): boolean;\n\n  abstract hasChanged(a: any, b: any): boolean;\n\n  protected getOptionValue<K extends keyof ParameterDefinition.Options<T>>(key: K): ParameterDefinition.Options<T>[K] {\n    return this.options.getOptional(key, null);\n  }\n\n  // @Trace()\n  async sanitise(value:T, visit: Visit, placeHistory: PlaceHistory, injector: Injector, isPopState: boolean) {\n    if (this.isMissingFrom(visit)) {\n      const returningFromSomewhereElse = !placeHistory.lastVisitIncluded(visit.placeDefinition);\n      if (returningFromSomewhereElse) {\n        const lastKnownVisit = placeHistory.getMostRecentVisitFor(visit.placeDefinition);\n        if (this.remember && lastKnownVisit) {\n          value = lastKnownVisit.getParameter(this.name);\n        }\n        return this.isEmptyValue(value) ? this.defaultValue : value;\n      }\n    }\n    // todo: add custom sanitiser\n    return value;\n  }\n\n  private isMissingFrom(visit: Visit) {\n    return !visit.hasParameter(this.name);\n  }\n}\n\nexport namespace ParameterDefinition {\n\n  export interface Options<T> {\n    as?: string;\n    optional?: boolean;\n    remember?: boolean;\n    defaultValue?: T;\n    // sanitiser?: Constructable<ParameterSanitiser<T>> | ParameterSanitiser.Options<T>;\n  }\n\n  export class RouteId<T> extends ParameterDefinition<T> {\n    readonly isRouteId = true;\n    readonly isArray = false;\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ValueParameter<T> extends ParameterDefinition<T> {\n    readonly isRouteId = false;\n    readonly isArray = false;\n\n    isEmptyValue(value: T): boolean {\n      return _.isNil(value);\n    }\n\n    hasChanged(a: any, b: any): boolean {\n      return a !== b;\n    }\n  }\n\n  export class ArrayParameter<T> extends ParameterDefinition<T[], T> {\n    readonly isRouteId = false;\n    readonly isArray = true;\n\n    constructor(parameterName: string, options: Options<T[]>, urlFormat: Formatter<T>) {\n      super(parameterName, options, urlFormat);\n    }\n\n    isEmptyValue(value: T[]): boolean {\n      return _.isNil(value) || value.length < 1;\n    }\n\n    hasChanged(a: T[], b: T[]): boolean {\n      return !_.isEqual(a, b);\n    }\n\n  }\n}\n"]}

package/esm2015/lib/place/route/visit-sanitiser.js

@@ -1,20 +1,22 @@
-import { __awaiter } from "tslib";
+import { __awaiter, __decorate, __metadata } from "tslib";
+import { Trace } from '@coolon/pectin';
+import { Visit } from '../visit';
 export class VisitSanitiser {
-    constructor(activatedRoute, router, placeHistory, injector) {
+    constructor(navigationSession, activatedRoute, router, placeHistory, injector) {
+        this.navigationSession = navigationSession;
         this.activatedRoute = activatedRoute;
         this.router = router;
         this.placeHistory = placeHistory;
         this.injector = injector;
     }
-    // @Trace()
     sanitise(visit) {
         return __awaiter(this, void 0, void 0, function* () {
             const placeDef = visit.placeDefinition;
             if (placeDef.hasRouteId()) {
                 const routeIdDef = placeDef.getRouteIdParameterDef();
                 const routeId = visit.getRouteId();
-                const sanitisedValue = yield routeIdDef.sanitise(routeId, visit, this.placeHistory, this.injector);
-                // console.log({routeId, sanitisedValue});
+                const sanitisedValue = yield routeIdDef.sanitise(routeId, visit, this.placeHistory, this.injector, this.navigationSession.isPopState);
+                console.log({ routeId, sanitisedValue });
                 // ###------- EARLY EXIT --------###
                 if (routeIdDef.hasChanged(routeId, sanitisedValue)) {
                     // if the route id has changed we redirect immediately as other
@@ -31,7 +33,7 @@ export class VisitSanitiser {
             for (let i = 0; i < parameterDefs.length; i++) {
                 const def = parameterDefs[i];
                 const value = visit.getParameter(def.name);
-                const sanitisedValue = yield def.sanitise(value, sanitisedVisit, this.placeHistory, this.injector);
+                const sanitisedValue = yield def.sanitise(value, sanitisedVisit, this.placeHistory, this.injector, this.navigationSession.isPopState);
                 if (def.hasChanged(value, sanitisedValue)) {
                     sanitisedVisit = sanitisedVisit.replace(def, sanitisedValue);
                 }
@@ -40,4 +42,10 @@ export class VisitSanitiser {
         });
     }
 }
+__decorate([
+    Trace(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Visit]),
+    __metadata("design:returntype", Promise)
+], VisitSanitiser.prototype, "sanitise", null);
 //# sourceMappingURL=visit-sanitiser.js.map

package/esm2015/lib/place/route/visit-sanitiser.js.map

@@ -1 +1 @@
-{"version":3,"file":"visit-sanitiser.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/visit-sanitiser.ts"],"names":[],"mappings":";AAMA,MAAM,OAAO,cAAc;IACzB,YAAoB,cAAsC,EAAU,MAAc,EAAU,YAA0B,EAAU,QAAkB;QAA9H,mBAAc,GAAd,cAAc,CAAwB;QAAU,WAAM,GAAN,MAAM,CAAQ;QAAU,iBAAY,GAAZ,YAAY,CAAc;QAAU,aAAQ,GAAR,QAAQ,CAAU;IAElJ,CAAC;IAED,WAAW;IACL,QAAQ,CAAC,KAAY;;YACzB,MAAM,QAAQ,GAAG,KAAK,CAAC,eAAe,CAAC;YACvC,IAAI,QAAQ,CAAC,UAAU,EAAE,EAAE;gBACzB,MAAM,UAAU,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAC;gBACrD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;gBACnC,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACnG,0CAA0C;gBAC1C,oCAAoC;gBACpC,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE;oBAClD,+DAA+D;oBAC/D,qCAAqC;oBACrC,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;iBAClD;aACF;YAED,2EAA2E;YAC3E,MAAM,aAAa,GAAG,QAAQ,CAAC,qBAAqB,CAAC;gBACnD,sBAAsB,EAAE,IAAI;gBAC5B,yBAAyB,EAAE,IAAI;aAChC,CAAC,CAAC;YACH,IAAI,cAAc,GAAU,KAAK,CAAC;YAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7C,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC3C,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACnG,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE;oBACzC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;iBAC9D;aACF;YAED,OAAO,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC;QACvE,CAAC;KAAA;CAEF","sourcesContent":["import { Injector } from '@angular/core';\nimport { ActivatedRouteSnapshot, Router } from '@angular/router';\nimport { Trace } from '@coolon/pectin';\nimport { PlaceHistory } from '../place-history';\nimport { Visit } from '../visit';\n\nexport class VisitSanitiser {\n  constructor(private activatedRoute: ActivatedRouteSnapshot, private router: Router, private placeHistory: PlaceHistory, private injector: Injector) {\n\n  }\n\n  // @Trace()\n  async sanitise(visit: Visit): Promise<Visit> {\n    const placeDef = visit.placeDefinition;\n    if (placeDef.hasRouteId()) {\n      const routeIdDef = placeDef.getRouteIdParameterDef();\n      const routeId = visit.getRouteId();\n      const sanitisedValue = await routeIdDef.sanitise(routeId, visit, this.placeHistory, this.injector);\n      // console.log({routeId, sanitisedValue});\n      // ###------- EARLY EXIT --------###\n      if (routeIdDef.hasChanged(routeId, sanitisedValue)) {\n        // if the route id has changed we redirect immediately as other\n        // parameter sanitisers might use it.\n        return visit.replace(routeIdDef, sanitisedValue);\n      }\n    }\n\n    // if we didn't replace the routeId we continue the url present parameters.\n    const parameterDefs = placeDef.getVisitParameterDefs({\n      includeRouteParameters: true,\n      includeNonRouteParameters: true\n    });\n    let sanitisedVisit: Visit = visit;\n    for (let i = 0; i < parameterDefs.length; i++) {\n      const def = parameterDefs[i];\n      const value = visit.getParameter(def.name);\n      const sanitisedValue = await def.sanitise(value, sanitisedVisit, this.placeHistory, this.injector);\n      if (def.hasChanged(value, sanitisedValue)) {\n        sanitisedVisit = sanitisedVisit.replace(def, sanitisedValue);\n      }\n    }\n\n    return sanitisedVisit.hasChangedFrom(visit) ? sanitisedVisit : visit;\n  }\n\n}\n"]}
+{"version":3,"file":"visit-sanitiser.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/route/visit-sanitiser.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,OAAO,cAAc;IACzB,YAAoB,iBAAoC,EAAU,cAAsC,EAAU,MAAc,EAAU,YAA0B,EAAU,QAAkB;QAA5K,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAU,mBAAc,GAAd,cAAc,CAAwB;QAAU,WAAM,GAAN,MAAM,CAAQ;QAAU,iBAAY,GAAZ,YAAY,CAAc;QAAU,aAAQ,GAAR,QAAQ,CAAU;IAEhM,CAAC;IAGK,QAAQ,CAAC,KAAY;;YACzB,MAAM,QAAQ,GAAG,KAAK,CAAC,eAAe,CAAC;YACvC,IAAI,QAAQ,CAAC,UAAU,EAAE,EAAE;gBACzB,MAAM,UAAU,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAC;gBACrD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;gBACnC,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBACtI,OAAO,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,cAAc,EAAC,CAAC,CAAC;gBACvC,oCAAoC;gBACpC,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE;oBAClD,+DAA+D;oBAC/D,qCAAqC;oBACrC,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;iBAClD;aACF;YAED,2EAA2E;YAC3E,MAAM,aAAa,GAAG,QAAQ,CAAC,qBAAqB,CAAC;gBACnD,sBAAsB,EAAE,IAAI;gBAC5B,yBAAyB,EAAE,IAAI;aAChC,CAAC,CAAC;YACH,IAAI,cAAc,GAAU,KAAK,CAAC;YAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7C,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC3C,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBACtI,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE;oBACzC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;iBAC9D;aACF;YAED,OAAO,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC;QACvE,CAAC;KAAA;CAEF;AAjCC;IADC,KAAK,EAAE;;qCACc,KAAK;;8CA+B1B","sourcesContent":["import { Injector } from '@angular/core';\nimport { ActivatedRouteSnapshot, Router } from '@angular/router';\nimport { Trace } from '@coolon/pectin';\nimport { NavigationSession } from '../navigation/session/navigation-session';\nimport { PlaceHistory } from '../place-history';\nimport { Visit } from '../visit';\n\nexport class VisitSanitiser {\n  constructor(private navigationSession: NavigationSession, private activatedRoute: ActivatedRouteSnapshot, private router: Router, private placeHistory: PlaceHistory, private injector: Injector) {\n\n  }\n\n  @Trace()\n  async sanitise(visit: Visit): Promise<Visit> {\n    const placeDef = visit.placeDefinition;\n    if (placeDef.hasRouteId()) {\n      const routeIdDef = placeDef.getRouteIdParameterDef();\n      const routeId = visit.getRouteId();\n      const sanitisedValue = await routeIdDef.sanitise(routeId, visit, this.placeHistory, this.injector, this.navigationSession.isPopState);\n      console.log({routeId, sanitisedValue});\n      // ###------- EARLY EXIT --------###\n      if (routeIdDef.hasChanged(routeId, sanitisedValue)) {\n        // if the route id has changed we redirect immediately as other\n        // parameter sanitisers might use it.\n        return visit.replace(routeIdDef, sanitisedValue);\n      }\n    }\n\n    // if we didn't replace the routeId we continue the url present parameters.\n    const parameterDefs = placeDef.getVisitParameterDefs({\n      includeRouteParameters: true,\n      includeNonRouteParameters: true\n    });\n    let sanitisedVisit: Visit = visit;\n    for (let i = 0; i < parameterDefs.length; i++) {\n      const def = parameterDefs[i];\n      const value = visit.getParameter(def.name);\n      const sanitisedValue = await def.sanitise(value, sanitisedVisit, this.placeHistory, this.injector, this.navigationSession.isPopState);\n      if (def.hasChanged(value, sanitisedValue)) {\n        sanitisedVisit = sanitisedVisit.replace(def, sanitisedValue);\n      }\n    }\n\n    return sanitisedVisit.hasChangedFrom(visit) ? sanitisedVisit : visit;\n  }\n\n}\n"]}

package/esm2015/lib/place/route/visit-sanitiser.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"VisitSanitiser":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/router","name":"ActivatedRouteSnapshot","line":7,"character":38},{"__symbolic":"reference","module":"@angular/router","name":"Router","line":7,"character":78},{"__symbolic":"reference","module":"../place-history","name":"PlaceHistory","line":7,"character":108},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":7,"character":140}]}],"sanitise":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"VisitSanitiser":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../navigation/session/navigation-session","name":"NavigationSession","line":8,"character":41},{"__symbolic":"reference","module":"@angular/router","name":"ActivatedRouteSnapshot","line":8,"character":84},{"__symbolic":"reference","module":"@angular/router","name":"Router","line":8,"character":124},{"__symbolic":"reference","module":"../place-history","name":"PlaceHistory","line":8,"character":154},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":8,"character":186}]}],"sanitise":[{"__symbolic":"method","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@coolon/pectin","name":"Trace","line":12,"character":3}}]}]}}}}]

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

@@ -11,30 +11,31 @@ export { SelectInputComponent as ɵj } from './lib/components/forms/select-input
 export { StringInputComponent as ɵh } from './lib/components/forms/string-input/string-input.component';
 export { NoopComponent as ɵl } from './lib/components/noop/noop.component';
 export { ScrollContainerComponent as ɵk } from './lib/components/scroll-container/scroll-container.component';
+export { SwitchCaseComponent as ɵp, SwitchCaseDefaultDirective as ɵo, SwitchCaseOption as ɵm, SwitchCaseWhenDirective as ɵn } from './lib/components/switch-case/switch-case.component';
 export { CommandDirective as ɵb } from './lib/directives/command.directive';
 export { DirectivesModule as ɵa } from './lib/directives/directives.module';
 export { FocusBindingDirective as ɵc } from './lib/directives/focus-binding.directive';
-export { AbstractInteractionContext as ɵbe } from './lib/interaction/abstract-interaction-context';
-export { ACTIVITY_DATA as ɵbh, Activity as ɵbi } from './lib/interaction/activity';
-export { ActivityContainerComponent as ɵbd } from './lib/interaction/components/activity-container/activity-container.component';
-export { ActivityOutletComponent as ɵbf } from './lib/interaction/components/activity-container/activity-outlet/activity-outlet.component';
-export { AlertDialogComponent as ɵbl } from './lib/interaction/components/alert-dialog/alert-dialog.component';
-export { ConfirmThenDialogComponent as ɵbk } from './lib/interaction/components/confirm-then-dialog/confirm-then-dialog.component';
-export { ConfirmationDialogComponent as ɵbg } from './lib/interaction/components/confirmation-dialog/confirmation-dialog.component';
-export { InPlaceInteractionContextComponent as ɵbn } from './lib/interaction/components/inplace-interaction-context/in-place-interaction-context.component';
-export { InteractionModule as ɵbc } from './lib/interaction/interaction.module';
-export { InteractionService as ɵv } from './lib/interaction/services/interaction.service';
-export { ModalInteractionContextFactory as ɵw } from './lib/interaction/services/modal-interaction-context.factory';
-export { AbstractPlaceNavigationComponent as ɵba } from './lib/place/components/abstract-place-navigation.component';
-export { BusyOverlayComponent as ɵo } from './lib/place/components/busy-overlay/busy-overlay.component';
-export { EmptyStateComponent as ɵn } from './lib/place/components/empty-state/empty-state.component';
-export { ListPlaceNavComponent as ɵbb } from './lib/place/components/list-place-nav/list-place-nav.component';
-export { PlaceOutletComponent as ɵp } from './lib/place/components/place-outlet/place-outlet.component';
-export { LEFT_RIGHT_PLACE_ANIMATION as ɵr, leftRightPlaceAnimation as ɵq } from './lib/place/components/place-outlet/route-animations';
-export { TabbedPlaceNavigationComponent as ɵz } from './lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component';
-export { AUP_PLACE_CONFIG as ɵs } from './lib/place/place-config';
-export { PlaceHistory as ɵy } from './lib/place/place-history';
-export { PlaceRouter as ɵu } from './lib/place/place-router';
-export { PlaceModule as ɵm } from './lib/place/place.module';
-export { UrlService as ɵx } from './lib/place/url-service';
+export { AbstractInteractionContext as ɵbi } from './lib/interaction/abstract-interaction-context';
+export { ACTIVITY_DATA as ɵbl, Activity as ɵbm } from './lib/interaction/activity';
+export { ActivityContainerComponent as ɵbh } from './lib/interaction/components/activity-container/activity-container.component';
+export { ActivityOutletComponent as ɵbj } from './lib/interaction/components/activity-container/activity-outlet/activity-outlet.component';
+export { AlertDialogComponent as ɵbp } from './lib/interaction/components/alert-dialog/alert-dialog.component';
+export { ConfirmThenDialogComponent as ɵbo } from './lib/interaction/components/confirm-then-dialog/confirm-then-dialog.component';
+export { ConfirmationDialogComponent as ɵbk } from './lib/interaction/components/confirmation-dialog/confirmation-dialog.component';
+export { InPlaceInteractionContextComponent as ɵbr } from './lib/interaction/components/inplace-interaction-context/in-place-interaction-context.component';
+export { InteractionModule as ɵbg } from './lib/interaction/interaction.module';
+export { InteractionService as ɵz } from './lib/interaction/services/interaction.service';
+export { ModalInteractionContextFactory as ɵba } from './lib/interaction/services/modal-interaction-context.factory';
+export { AbstractPlaceNavigationComponent as ɵbe } from './lib/place/components/abstract-place-navigation.component';
+export { BusyOverlayComponent as ɵs } from './lib/place/components/busy-overlay/busy-overlay.component';
+export { EmptyStateComponent as ɵr } from './lib/place/components/empty-state/empty-state.component';
+export { ListPlaceNavComponent as ɵbf } from './lib/place/components/list-place-nav/list-place-nav.component';
+export { PlaceOutletComponent as ɵt } from './lib/place/components/place-outlet/place-outlet.component';
+export { LEFT_RIGHT_PLACE_ANIMATION as ɵv, leftRightPlaceAnimation as ɵu } from './lib/place/components/place-outlet/route-animations';
+export { TabbedPlaceNavigationComponent as ɵbd } from './lib/place/components/tabbed-place-navigation/tabbed-place-navigation.component';
+export { AUP_PLACE_CONFIG as ɵw } from './lib/place/place-config';
+export { PlaceHistory as ɵbc } from './lib/place/place-history';
+export { PlaceRouter as ɵy } from './lib/place/place-router';
+export { PlaceModule as ɵq } from './lib/place/place.module';
+export { UrlService as ɵbb } from './lib/place/url-service';
 //# sourceMappingURL=coolon-angular-ui-powerups.js.map