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

package/esm5/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, __extends, __generator, __metadata, __read, __spread } 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';
@@ -23,7 +19,7 @@ import * as i3 from "../interaction/services/interaction.service";
 import * as i4 from "./url-service";
 import * as i5 from "./place-history";
 var PlaceRouter = /** @class */ (function (_super) {
-    tslib_1.__extends(PlaceRouter, _super);
+    __extends(PlaceRouter, _super);
     function PlaceRouter(angularRouter, angularLocation, interactionService, urlService, placeHistory) {
         var _this = _super.call(this) || this;
         _this.angularRouter = angularRouter;
@@ -36,45 +32,23 @@ var PlaceRouter = /** @class */ (function (_super) {
         _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 {?}
-         */
-        function (urlSnapshot, options) {
+        _this.navigationContext = new NavigationContext.Impl(_this.urlService, _this.routerInteractionAdapter, function (urlSnapshot, options) {
             return _this.navigateByUrl(urlSnapshot, options);
-        }), (/**
-         * @param {?} state
-         * @return {?}
-         */
-        function (state) {
+        }, function (state) {
             _this.transitionTo(state);
-        }), (/**
-         * @param {?} visits
-         * @return {?}
-         */
-        function (visits) {
+        }, function (visits) {
             _this.routingSessionFinished(visits);
-        }));
+        });
         var _a = Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
         _this.navigationInProgress = chain(_this.navigationSessionModel).isNotNil();
-        /** @type {?} */
-        var idleStateName = chain(_this.interactionService.active).map((/**
-         * @param {?} active
-         * @return {?}
-         */
-        function (active) { return active ? 'IdleDuringInteraction' : 'Idle'; }));
+        var idleStateName = chain(_this.interactionService.active).map(function (active) { return 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 {?}
-         */
-        function (event) {
+        angularRouter.events.subscribe(function (event) {
             // Routing event sequence
             // ======================
             // NavigationStart -> .... -> NavigationCancel --> redirect, go around again in the same session
@@ -106,59 +80,35 @@ var PlaceRouter = /** @class */ (function (_super) {
                 _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 {?}
-         */
-        function (url) { return _this.onUrlChanged(url); }));
+        angularLocation.onUrlChange(function (url) { return _this.onUrlChanged(url); });
         return _this;
     }
     Object.defineProperty(PlaceRouter.prototype, "navigationSession", {
-        get: /**
-         * @return {?}
-         */
-        function () {
+        get: function () {
             return this.navigationSessionModel.value;
         },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(PlaceRouter.prototype, "currentSession", {
-        get: /**
-         * @return {?}
-         */
-        function () {
+        get: function () {
             return this.navigationSessionModel.value;
         },
         enumerable: true,
         configurable: true
     });
     // @Trace()
-    // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
-    PlaceRouter.prototype.onPopState = 
-    // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
-    function (event) {
+    PlaceRouter.prototype.onPopState = function (event) {
         assert.isTruthy(event.navigationTrigger === 'popstate');
         if (this.currentSession) {
             this.currentSession.onPopState(event);
         }
         else {
-            /** @type {?} */
             var poppedHistoryUrl = event.url;
-            /** @type {?} */
             var currentRouterUrl = this.urlService.getCurrentRouterUrl();
-            /** @type {?} */
             var session = this.interactionService.isActive() ?
                 new PopStateDuringInteractionNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl) :
                 new PopStateNavigation(this.navigationContext, currentRouterUrl, poppedHistoryUrl);
@@ -166,20 +116,8 @@ var PlaceRouter = /** @class */ (function (_super) {
         }
     };
     // @Trace()
-    // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
-    PlaceRouter.prototype.onRouterStarted = 
-    // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
-    function (event) {
+    PlaceRouter.prototype.onRouterStarted = function (event) {
         assert.isFalsey(event.navigationTrigger === 'popstate');
-        /** @type {?} */
         var inInteraction = this.interactionService.isActive();
         if (this.currentSession) {
             this.currentSession.onRouterStarted(event);
@@ -189,18 +127,7 @@ var PlaceRouter = /** @class */ (function (_super) {
         }
     };
     // @Trace()
-    // @Trace()
-    /**
-     * @param {?} newUrl
-     * @return {?}
-     */
-    PlaceRouter.prototype.onUrlChanged = 
-    // @Trace()
-    /**
-     * @param {?} newUrl
-     * @return {?}
-     */
-    function (newUrl) {
+    PlaceRouter.prototype.onUrlChanged = function (newUrl) {
         // the back button can trigger a url change without a navigation session in progress so we
         // console.log(`---> Url Changed ${newUrl}`);
         if (this.currentSession) {
@@ -212,72 +139,25 @@ var PlaceRouter = /** @class */ (function (_super) {
         // console.log(`<--- Url Changed`);
     };
     // @Trace()
-    // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
-    PlaceRouter.prototype.onRouterCancelled = 
-    // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
-    function (event) {
+    PlaceRouter.prototype.onRouterCancelled = function (event) {
         this.currentSession.onRouterCancelled(event);
     };
     // @Trace()
-    // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
-    PlaceRouter.prototype.onRouterError = 
-    // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
-    function (event) {
+    PlaceRouter.prototype.onRouterError = function (event) {
         this.currentSession.onRouterError(event);
     };
     // @Trace()
-    // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
-    PlaceRouter.prototype.onRouterEnd = 
-    // @Trace()
-    /**
-     * @param {?} event
-     * @return {?}
-     */
-    function (event) {
+    PlaceRouter.prototype.onRouterEnd = function (event) {
         this.currentSession.onRouterEnd(event);
     };
-    /**
-     * @param {?} visit
-     * @param {?=} options
-     * @return {?}
-     */
-    PlaceRouter.prototype.navigate = /**
-     * @param {?} visit
-     * @param {?=} options
-     * @return {?}
-     */
-    function (visit, options) {
+    PlaceRouter.prototype.navigate = function (visit, options) {
         var _this = this;
-        return this.doNavigation(visit, (/**
-         * @param {?} router
-         * @return {?}
-         */
-        function (router) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        return this.doNavigation(visit, function (router) { return __awaiter(_this, void 0, void 0, function () {
             var commands;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        commands = tslib_1.__spread([
+                        commands = __spread([
                             visit.placeDefinition.path
                         ], this.createRouteParameters(visit));
                         return [4 /*yield*/, this.angularRouter.navigate(commands, {
@@ -288,26 +168,13 @@ var PlaceRouter = /** @class */ (function (_super) {
                         return [2 /*return*/];
                 }
             });
-        }); }));
+        }); });
     };
     // @Trace()
-    // @Trace()
-    /**
-     * @param {?} visit
-     * @param {?} runNavigationCommands
-     * @return {?}
-     */
-    PlaceRouter.prototype.doNavigation = 
-    // @Trace()
-    /**
-     * @param {?} visit
-     * @param {?} runNavigationCommands
-     * @return {?}
-     */
-    function (visit, runNavigationCommands) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+    PlaceRouter.prototype.doNavigation = function (visit, runNavigationCommands) {
+        return __awaiter(this, void 0, void 0, function () {
             var navigation;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.navigationInProgress.value) {
@@ -335,101 +202,45 @@ var PlaceRouter = /** @class */ (function (_super) {
             });
         });
     };
-    /**
-     * @param {?} urlSnapshot
-     * @param {?=} navigationExtras
-     * @return {?}
-     */
-    PlaceRouter.prototype.navigateByUrl = /**
-     * @param {?} urlSnapshot
-     * @param {?=} navigationExtras
-     * @return {?}
-     */
-    function (urlSnapshot, navigationExtras) {
+    PlaceRouter.prototype.navigateByUrl = function (urlSnapshot, navigationExtras) {
         // console.log(`### navigationByUrl -> ${urlSnapshot.urlTree.toString()}`);
         return this.angularRouter.navigateByUrl(urlSnapshot.urlTree, navigationExtras);
     };
     Object.defineProperty(PlaceRouter.prototype, "activeVisits", {
-        get: /**
-         * @return {?}
-         */
-        function () {
+        get: function () {
             return this._activeVisits.readonly;
         },
         enumerable: true,
         configurable: true
     });
     // @Trace()
-    // @Trace()
-    /**
-     * @param {?} previous
-     * @param {?} next
-     * @return {?}
-     */
-    PlaceRouter.prototype.pushVisitChangesToRoute = 
-    // @Trace()
-    /**
-     * @param {?} previous
-     * @param {?} next
-     * @return {?}
-     */
-    function (previous, next) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+    PlaceRouter.prototype.pushVisitChangesToRoute = function (previous, next) {
+        return __awaiter(this, void 0, void 0, function () {
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 // 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 [2 /*return*/, this.doNavigation(next, (/**
-                         * @param {?} router
-                         * @return {?}
-                         */
-                        function (router) {
-                            /** @type {?} */
+                    return [2 /*return*/, this.doNavigation(next, function (router) {
                             var 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);
-                        }))];
+                        })];
                 }
                 return [2 /*return*/];
             });
         });
     };
-    /**
-     * @private
-     * @param {?} currentRouterUrl
-     * @return {?}
-     */
-    PlaceRouter.prototype.createNavigationSession = /**
-     * @private
-     * @param {?} currentRouterUrl
-     * @return {?}
-     */
-    function (currentRouterUrl) {
-        /** @type {?} */
+    PlaceRouter.prototype.createNavigationSession = function (currentRouterUrl) {
         var inInteraction = this.interactionService.isActive();
         return inInteraction ?
             new NavigatingDuringInteraction(this.navigationContext, currentRouterUrl) :
             new Navigating(this.navigationContext, currentRouterUrl);
     };
     // @Trace()
-    // @Trace()
-    /**
-     * @protected
-     * @param {?} next
-     * @return {?}
-     */
-    PlaceRouter.prototype.transitionTo = 
-    // @Trace()
-    /**
-     * @protected
-     * @param {?} next
-     * @return {?}
-     */
-    function (next) {
-        /** @type {?} */
+    PlaceRouter.prototype.transitionTo = function (next) {
         var previous = this.navigationSessionModel.value;
         assert.isTruthy(next !== previous);
         Logger.get(this).info("### Router State Transition: " + (previous ? previous.toString() : 'null') + " -> " + next.toString());
@@ -440,56 +251,24 @@ var PlaceRouter = /** @class */ (function (_super) {
         next.notifyActive();
     };
     // @Trace()
-    // @Trace()
-    /**
-     * @private
-     * @param {?} visits
-     * @return {?}
-     */
-    PlaceRouter.prototype.routingSessionFinished = 
-    // @Trace()
-    /**
-     * @private
-     * @param {?} visits
-     * @return {?}
-     */
-    function (visits) {
+    PlaceRouter.prototype.routingSessionFinished = function (visits) {
         var _this = this;
         if (visits && visits.length > 0) {
             assert.isTruthy(this.navigationInProgress.value);
-            visits.forEach((/**
-             * @param {?} v
-             * @return {?}
-             */
-            function (v) { return _this.placeHistory.add(v); }));
+            visits.forEach(function (v) { return _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 {?} */
         var session = this.currentSession;
         session.dispose();
         this.navigationSessionModel.value = null;
         console.log("### Router Session Finished (was " + session.toString() + ")");
-        this.sessionFinishedJobs.forEach((/**
-         * @param {?} job
-         * @return {?}
-         */
-        function (job) { return job(); }));
+        this.sessionFinishedJobs.forEach(function (job) { return job(); });
         this.sessionFinishedJobs = [];
     };
-    /**
-     * @private
-     * @param {?} func
-     * @return {?}
-     */
-    PlaceRouter.prototype.runAfterRoutingSessionFinishes = /**
-     * @private
-     * @param {?} func
-     * @return {?}
-     */
-    function (func) {
+    PlaceRouter.prototype.runAfterRoutingSessionFinishes = function (func) {
         assert.isTruthy(this.navigationInProgress);
         this.sessionFinishedJobs.push(func);
     };
@@ -499,81 +278,34 @@ var PlaceRouter = /** @class */ (function (_super) {
      * the app directly and we don't get to ask.
      */
     // @Trace()
-    /**
-     * 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()
-    PlaceRouter.prototype.syncInteractionContextIdsWithRouter = /**
-     * 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()
-    function () {
+    PlaceRouter.prototype.syncInteractionContextIdsWithRouter = function () {
         var _this = this;
         if (this.navigationSession) {
             // console.log(`Navigation active -> ${this.navigationSession.toString()}, sync delayed until finished.`);
-            /** @type {?} */
             var session = this.navigationSession;
-            return new Promise((/**
-             * @param {?} resolve
-             * @param {?} reject
-             * @return {?}
-             */
-            function (resolve, reject) {
-                _this.runAfterRoutingSessionFinishes((/**
-                 * @return {?}
-                 */
-                function () {
+            return new Promise(function (resolve, reject) {
+                _this.runAfterRoutingSessionFinishes(function () {
                     _this.runAfterRoutingSessionFinishes(resolve);
-                    /** @type {?} */
                     var syncSession = new SynchroniseInteractionContextIdsWithRoute(_this.navigationContext, _this.urlService.getCurrentRouterUrl(), false);
                     _this.transitionTo(syncSession);
-                }));
-            }));
+                });
+            });
         }
         else {
-            return new Promise(((/**
-             * @param {?} resolve
-             * @param {?} reject
-             * @return {?}
-             */
-            function (resolve, reject) {
+            return new Promise((function (resolve, reject) {
                 // console.log(`No navigation in progress, starting synchronisation job`);
                 _this.runAfterRoutingSessionFinishes(resolve);
-                /** @type {?} */
                 var session = new SynchroniseInteractionContextIdsWithRoute(_this.navigationContext, _this.urlService.getCurrentRouterUrl(), false);
                 _this.transitionTo(session);
-            })));
+            }));
         }
     };
-    /**
-     * @private
-     * @param {?} visit
-     * @return {?}
-     */
-    PlaceRouter.prototype.createRouteParameters = /**
-     * @private
-     * @param {?} visit
-     * @return {?}
-     */
-    function (visit) {
-        /** @type {?} */
+    PlaceRouter.prototype.createRouteParameters = function (visit) {
         var 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 = function () { return [
         { type: Router },
         { type: Location },
@@ -581,63 +313,18 @@ var PlaceRouter = /** @class */ (function (_super) {
         { 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" });
+    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);
     return PlaceRouter;
 }(GarbageCollector));
 export { PlaceRouter };
-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;
-}
 //# sourceMappingURL=place-router.js.map