@coolon/angular-ui-powerups 0.0.135 → 1.0.0-alpha.11

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

@@ -1,35 +1,21 @@
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
+import { __decorate, __metadata } from "tslib";
 import { Injectable } from '@angular/core';
 import _ from 'lodash';
 import * as i0 from "@angular/core";
-export class PlaceHistory {
+let PlaceHistory = class PlaceHistory {
     constructor() {
         this._history = new Map();
     }
     // @Trace()
-    /**
-     * @param {?} state
-     * @return {?}
-     */
     add(state) {
-        /** @type {?} */
         const history = this.getHistory(state.placeDefinition);
-        /** @type {?} */
         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
         }
     }
-    /**
-     * @param {?} placeDef
-     * @return {?}
-     */
     getHistory(placeDef) {
-        /** @type {?} */
         let history = this._history.get(placeDef);
         if (!history) {
             history = [];
@@ -37,29 +23,16 @@ export class PlaceHistory {
         }
         return history;
     }
-    /**
-     * @private
-     * @param {?} placeDef
-     * @param {?} history
-     * @return {?}
-     */
     setHistory(placeDef, history) {
         this._history.set(placeDef, history);
     }
-}
-PlaceHistory.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-/** @nocollapse */
-PlaceHistory.ctorParameters = () => [];
-/** @nocollapse */ PlaceHistory.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function PlaceHistory_Factory() { return new PlaceHistory(); }, token: PlaceHistory, providedIn: "root" });
-if (false) {
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceHistory.prototype._history;
-}
+};
+PlaceHistory.ɵprov = i0.ɵɵdefineInjectable({ factory: function PlaceHistory_Factory() { return new PlaceHistory(); }, token: PlaceHistory, providedIn: "root" });
+PlaceHistory = __decorate([
+    Injectable({
+        providedIn: 'root'
+    }),
+    __metadata("design:paramtypes", [])
+], PlaceHistory);
+export { 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,MAAM,OAAO,YAAY;IAIvB;QAFQ,aAAQ,GAAG,IAAI,GAAG,EAA4B,CAAC;IAGvD,CAAC;;;;;;IAGD,GAAG,CAAC,KAAY;;cACR,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC;;cAChD,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;QACtC,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;;YAC9B,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzC,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;;;YA/BF,UAAU,SAAC;gBACV,UAAU,EAAE,MAAM;aACnB;;;;;;;;;;IAGC,gCAAuD","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":";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"]}

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":{"ngInjectableDef":{}}}}}]
+[{"__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":{}}}}}]

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

@@ -1,11 +1,7 @@
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-import * as tslib_1 from "tslib";
+import { __awaiter, __decorate, __metadata } from "tslib";
 import { Location } from '@angular/common';
 import { Injectable } from '@angular/core';
-import { NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Router } from '@angular/router';
+import { ActivatedRoute, NavigationCancel, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router } from '@angular/router';
 import { assert, DebugContext, Dsl, GarbageCollector, lang, Logger, MutableListModel, MutableValueModel } from '@coolon/pectin';
 import { InteractionService } from '../interaction/services/interaction.service';
 import { NavigatingDuringInteraction } from './navigation/session/interactions/navigating-during-interaction';
@@ -22,14 +18,7 @@ import * as i2 from "@angular/common";
 import * as i3 from "../interaction/services/interaction.service";
 import * as i4 from "./url-service";
 import * as i5 from "./place-history";
-export class PlaceRouter extends GarbageCollector {
-    /**
-     * @param {?} angularRouter
-     * @param {?} angularLocation
-     * @param {?} interactionService
-     * @param {?} urlService
-     * @param {?} placeHistory
-     */
+let PlaceRouter = class PlaceRouter extends GarbageCollector {
     constructor(angularRouter, angularLocation, interactionService, urlService, placeHistory) {
         super();
         this.angularRouter = angularRouter;
@@ -42,45 +31,23 @@ export class PlaceRouter extends GarbageCollector {
         this.sessionFinishedJobs = [];
         this.routerInteractionAdapter = interactionService.registerPlaceRouter(this);
         // TODO: Make this an interface and use 'this' instead.
-        this.navigationContext = new NavigationContext.Impl(this.urlService, this.routerInteractionAdapter, (/**
-         * @param {?} urlSnapshot
-         * @param {?} options
-         * @return {?}
-         */
-        (urlSnapshot, options) => {
+        this.navigationContext = new NavigationContext.Impl(this.urlService, this.routerInteractionAdapter, (urlSnapshot, options) => {
             return this.navigateByUrl(urlSnapshot, options);
-        }), (/**
-         * @param {?} state
-         * @return {?}
-         */
-        state => {
+        }, state => {
             this.transitionTo(state);
-        }), (/**
-         * @param {?} visits
-         * @return {?}
-         */
-        visits => {
+        }, visits => {
             this.routingSessionFinished(visits);
-        }));
+        });
         const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
         this.navigationInProgress = chain(this.navigationSessionModel).isNotNil();
-        /** @type {?} */
-        const idleStateName = chain(this.interactionService.active).map((/**
-         * @param {?} active
-         * @return {?}
-         */
-        active => active ? 'IdleDuringInteraction' : 'Idle'));
+        const idleStateName = chain(this.interactionService.active).map(active => active ? 'IdleDuringInteraction' : 'Idle');
         this.navigationSessionName = chain(this.navigationSessionModel)
             .pluck('name')
             .otherwise(idleStateName);
         DebugContext.tag(this._activeVisits, "PlaceRouter.activeVisits");
         this.activeVisitsByPlaceDefinition = chain(this._activeVisits).indexBy('placeDefinition');
         // TODO: make setup the callbacks in during module initiation to make this testable.
-        angularRouter.events.subscribe((/**
-         * @param {?} event
-         * @return {?}
-         */
-        event => {
+        angularRouter.events.subscribe(event => {
             // Routing event sequence
             // ======================
             // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session
@@ -112,43 +79,26 @@ export class PlaceRouter extends GarbageCollector {
                 this.onRouterCancelled(event);
                 // console.log(`<--- NavigationCancel[${event.id}]: ${event.url}`);
             }
-        }));
+        });
         // The router needs to know about url changes and in some cases they are the only way the router can know if
         // the back button was clicked.
-        angularLocation.onUrlChange((/**
-         * @param {?} url
-         * @return {?}
-         */
-        url => this.onUrlChanged(url)));
+        angularLocation.onUrlChange(url => this.onUrlChanged(url));
     }
-    /**
-     * @return {?}
-     */
     get navigationSession() {
         return this.navigationSessionModel.value;
     }
-    /**
-     * @return {?}
-     */
     get currentSession() {
         return this.navigationSessionModel.value;
     }
     // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
     onPopState(event) {
         assert.isTruthy(event.navigationTrigger === 'popstate');
         if (this.currentSession) {
             this.currentSession.onPopState(event);
         }
         else {
-            /** @type {?} */
             const poppedHistoryUrl = event.url;
-            /** @type {?} */
             const currentRouterUrl = this.urlService.getCurrentRouterUrl();
-            /** @type {?} */
             const session = this.interactionService.isActive() ?
                 new PopStateDuringInteractionNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl) :
                 new PopStateNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl);
@@ -156,13 +106,8 @@ export class PlaceRouter extends GarbageCollector {
         }
     }
     // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
     onRouterStarted(event) {
         assert.isFalsey(event.navigationTrigger === 'popstate');
-        /** @type {?} */
         const inInteraction = this.interactionService.isActive();
         if (this.currentSession) {
             this.currentSession.onRouterStarted(event);
@@ -172,10 +117,6 @@ export class PlaceRouter extends GarbageCollector {
         }
     }
     // @Trace()
-    /**
-     * @param {?} newUrl
-     * @return {?}
-     */
     onUrlChanged(newUrl) {
         // the back button can trigger a url change without a navigation session in progress so we
         // console.log(`---> Url Changed ${newUrl}`);
@@ -188,41 +129,19 @@ export class PlaceRouter extends GarbageCollector {
         // console.log(`<--- Url Changed`);
     }
     // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
     onRouterCancelled(event) {
         this.currentSession.onRouterCancelled(event);
     }
     // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
     onRouterError(event) {
         this.currentSession.onRouterError(event);
     }
     // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
     onRouterEnd(event) {
         this.currentSession.onRouterEnd(event);
     }
-    /**
-     * @param {?} visit
-     * @param {?=} options
-     * @return {?}
-     */
     navigate(visit, options) {
-        return this.doNavigation(visit, (/**
-         * @param {?} router
-         * @return {?}
-         */
-        (router) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            /** @type {?} */
+        return this.doNavigation(visit, (router) => __awaiter(this, void 0, void 0, function* () {
             const commands = [
                 visit.placeDefinition.path,
                 ...this.createRouteParameters(visit)
@@ -230,20 +149,14 @@ export class PlaceRouter extends GarbageCollector {
             yield this.angularRouter.navigate(commands, {
                 relativeTo: options ? options.relativeTo : null
             });
-        })));
+        }));
     }
     // @Trace()
-    /**
-     * @param {?} visit
-     * @param {?} runNavigationCommands
-     * @return {?}
-     */
     doNavigation(visit, runNavigationCommands) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.navigationInProgress.value) {
                 lang.illegalState('Navigation already in progress');
             }
-            /** @type {?} */
             const navigation = this.createNavigationSession(this.urlService.getCurrentRouterUrl());
             navigation.storeVisit(visit);
             this.transitionTo(navigation);
@@ -259,67 +172,37 @@ export class PlaceRouter extends GarbageCollector {
             }
         });
     }
-    /**
-     * @param {?} urlSnapshot
-     * @param {?=} navigationExtras
-     * @return {?}
-     */
     navigateByUrl(urlSnapshot, navigationExtras) {
         // console.log(`### navigationByUrl -> ${urlSnapshot.urlTree.toString()}`);
         return this.angularRouter.navigateByUrl(urlSnapshot.urlTree, navigationExtras);
     }
-    /**
-     * @return {?}
-     */
     get activeVisits() {
         return this._activeVisits.readonly;
     }
     // @Trace()
-    /**
-     * @param {?} previous
-     * @param {?} next
-     * @return {?}
-     */
     pushVisitChangesToRoute(previous, next) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        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);
             // FIXME: no route id -> route id duplicates route parameters
             if (next.hasRoutingChangedFrom(previous)) {
-                return this.doNavigation(next, (/**
-                 * @param {?} router
-                 * @return {?}
-                 */
-                router => {
-                    /** @type {?} */
+                return this.doNavigation(next, router => {
                     const urlSnapshot = this.urlService.parseUrl(this.angularRouter.routerState.snapshot.url).updateVisitSegments(next);
                     // console.log('### Push Changes to route Redirect', { commands: urlSnapshot.url });
                     return this.navigateByUrl(urlSnapshot);
-                }));
+                });
             }
         });
     }
-    /**
-     * @private
-     * @param {?} currentRouterUrl
-     * @return {?}
-     */
     createNavigationSession(currentRouterUrl) {
-        /** @type {?} */
         const inInteraction = this.interactionService.isActive();
         return inInteraction ?
             new NavigatingDuringInteraction(this.navigationContext, currentRouterUrl) :
             new Navigating(this.navigationContext, currentRouterUrl);
     }
     // @Trace()
-    /**
-     * @protected
-     * @param {?} next
-     * @return {?}
-     */
     transitionTo(next) {
-        /** @type {?} */
         const previous = this.navigationSessionModel.value;
         assert.isTruthy(next !== previous);
         Logger.get(this).info(`### Router State Transition: ${previous ? previous.toString() : 'null'} -> ${next.toString()}`);
@@ -330,41 +213,22 @@ export class PlaceRouter extends GarbageCollector {
         next.notifyActive();
     }
     // @Trace()
-    /**
-     * @private
-     * @param {?} visits
-     * @return {?}
-     */
     routingSessionFinished(visits) {
         if (visits && visits.length > 0) {
             assert.isTruthy(this.navigationInProgress.value);
-            visits.forEach((/**
-             * @param {?} v
-             * @return {?}
-             */
-            v => this.placeHistory.add(v)));
+            visits.forEach(v => this.placeHistory.add(v));
             // 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?
             this._activeVisits.value = visits;
         }
-        /** @type {?} */
         const session = this.currentSession;
         session.dispose();
         this.navigationSessionModel.value = null;
         console.log(`### Router Session Finished (was ${session.toString()})`);
-        this.sessionFinishedJobs.forEach((/**
-         * @param {?} job
-         * @return {?}
-         */
-        job => job()));
+        this.sessionFinishedJobs.forEach(job => job());
         this.sessionFinishedJobs = [];
     }
-    /**
-     * @private
-     * @param {?} func
-     * @return {?}
-     */
     runAfterRoutingSessionFinishes(func) {
         assert.isTruthy(this.navigationInProgress);
         this.sessionFinishedJobs.push(func);
@@ -373,65 +237,36 @@ export class PlaceRouter extends GarbageCollector {
      * Sync's the current interaction state with the URL.  We need to push something in the URL in order
      * to be able to capture the back button on the first page.  If we don't then the back click will exit
      * the app directly and we don't get to ask.
-     * @return {?}
      */
     // @Trace()
     syncInteractionContextIdsWithRouter() {
         if (this.navigationSession) {
             // console.log(`Navigation active -> ${this.navigationSession.toString()}, sync delayed until finished.`);
-            /** @type {?} */
             const session = this.navigationSession;
-            return new Promise((/**
-             * @param {?} resolve
-             * @param {?} reject
-             * @return {?}
-             */
-            (resolve, reject) => {
-                this.runAfterRoutingSessionFinishes((/**
-                 * @return {?}
-                 */
-                () => {
+            return new Promise((resolve, reject) => {
+                this.runAfterRoutingSessionFinishes(() => {
                     this.runAfterRoutingSessionFinishes(resolve);
-                    /** @type {?} */
                     const syncSession = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);
                     this.transitionTo(syncSession);
-                }));
-            }));
+                });
+            });
         }
         else {
-            return new Promise(((/**
-             * @param {?} resolve
-             * @param {?} reject
-             * @return {?}
-             */
-            (resolve, reject) => {
+            return new Promise(((resolve, reject) => {
                 // console.log(`No navigation in progress, starting synchronisation job`);
                 this.runAfterRoutingSessionFinishes(resolve);
-                /** @type {?} */
                 const session = new SynchroniseInteractionContextIdsWithRoute(this.navigationContext, this.urlService.getCurrentRouterUrl(), false);
                 this.transitionTo(session);
-            })));
+            }));
         }
     }
-    /**
-     * @private
-     * @param {?} visit
-     * @return {?}
-     */
     createRouteParameters(visit) {
-        /** @type {?} */
         const def = visit.placeDefinition;
         return visit.hasRouteId() ?
             [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
             [def.getFormattedRouteParameters(visit)];
     }
-}
-PlaceRouter.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-/** @nocollapse */
+};
 PlaceRouter.ctorParameters = () => [
     { type: Router },
     { type: Location },
@@ -439,60 +274,16 @@ PlaceRouter.ctorParameters = () => [
     { type: UrlService },
     { type: PlaceHistory }
 ];
-/** @nocollapse */ PlaceRouter.ngInjectableDef = 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" });
-if (false) {
-    /** @type {?} */
-    PlaceRouter.prototype.navigationSessionModel;
-    /** @type {?} */
-    PlaceRouter.prototype.navigationInProgress;
-    /** @type {?} */
-    PlaceRouter.prototype.navigationSessionName;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouter.prototype.navigationContext;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouter.prototype._activeVisits;
-    /** @type {?} */
-    PlaceRouter.prototype.activeVisitsByPlaceDefinition;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouter.prototype.routerInteractionAdapter;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouter.prototype.sessionFinishedJobs;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouter.prototype.angularRouter;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouter.prototype.angularLocation;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouter.prototype.interactionService;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouter.prototype.urlService;
-    /**
-     * @type {?}
-     * @private
-     */
-    PlaceRouter.prototype.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" });
+PlaceRouter = __decorate([
+    Injectable({
+        providedIn: 'root'
+    }),
+    __metadata("design:paramtypes", [Router,
+        Location,
+        InteractionService,
+        UrlService,
+        PlaceHistory])
+], PlaceRouter);
+export { PlaceRouter };
 //# sourceMappingURL=place-router.js.map