@coolon/angular-ui-powerups 0.0.101 → 0.0.102

package/lib/interaction/interaction-context-base.d.ts

@@ -1,4 +1,4 @@
-import { Constructable, ListModel } from '@coolon/pectin';
+import { Constructable, ListModel, ValueModel } from '@coolon/pectin';
 import { Activity } from './activity';
 import { Alert } from './alert';
 import { Confirm } from './confirm';
@@ -10,9 +10,11 @@ export declare abstract class InteractionContextBase extends InteractionContext
      */
     private readonly _activityListDelegate;
     private deferredGetCurrentActivity;
+    private _currentActivity;
     protected constructor();
     protected setActivityList(activityList: ListModel<Activity<any, any>>): void;
     readonly activityList: ListModel<Activity<any, any, any>>;
+    readonly activeActivity: ValueModel<Activity<any, any, any>>;
     /**
      * Returns the activity that is currently active.
      * This model is only updated in the next tick after the view has been updated.

package/lib/interaction/interaction-context.d.ts

@@ -3,18 +3,24 @@ import { Activity } from './activity';
 import { Alert } from './alert';
 import { Confirm } from './confirm';
 export declare abstract class InteractionContext extends GarbageCollector {
-    abstract readonly activityList: ListModel<Activity<any, any, any>>;
     abstract readonly active: ValueModel<boolean>;
+    abstract readonly activityList: ListModel<Activity<any, any, any>>;
+    abstract readonly activeActivity: ValueModel<Activity<any, any, any>>;
     /**
      * Returns true if an activity is currently running.
      */
     isActive(): boolean;
     dispose(): void;
+    /**
+     * Cancels the current activity and returns true the context is no longer active, false if
+     * there is still another activity running.
+     */
+    cancelCurrentActivity(): Promise<boolean>;
     /**
      * Returns the activity that is currently active.
      * This model is only updated in the next tick after the view has been updated.
      */
-    abstract getCurrentActivity(): Promise<Activity<any, any>>;
+    protected abstract getCurrentActivity(): Promise<Activity<any, any>>;
     abstract startActivity<D, R, E>(activityType: Constructable<Activity<D, R, E>>, data?: D): Promise<R>;
     abstract alert(alert: Alert): Promise<void>;
     abstract confirm(confirm: Confirm): Promise<boolean>;
@@ -26,4 +32,5 @@ export declare abstract class InteractionContext extends GarbageCollector {
      * @param data the activity data.
      */
     abstract confirmThen<D, R, E>(confirm: Confirm, activityType: Constructable<Activity<D, R, E>>, data?: D): Promise<R>;
+    abort(): Promise<void>;
 }

package/lib/interaction/services/interaction.service.d.ts

@@ -1,5 +1,4 @@
 import { BooleanValueModelChain, Disposable, GarbageCollector, ListModelChain, MutableValueModel, ValueModel } from '@coolon/pectin';
-import { Activity } from '../activity';
 import { InteractionContext } from '../interaction-context';
 import { ModalInteractionContextFactory } from './modal-interaction-context.factory';
 export declare class InteractionService {
@@ -15,9 +14,10 @@ export declare class InteractionService {
     readonly inlineInteractionActive: BooleanValueModelChain;
     constructor(modelInteractionContextFactory: ModalInteractionContextFactory);
     isActive(): boolean;
+    isModalActive(): boolean;
     createModalInteractionContextFor(disposable: Disposable.Collector): InteractionContext;
     _registerInplaceInteractionContext(interactionContext: InteractionContext): void;
-    getCurrentActivity(): Promise<Activity<any, any, any>>;
+    getActiveContext(): InteractionContext;
     /**
      * Creates an interaction context that will prevent any other contexts from starting an
      * activity until it is disposed.  This is intended for use by the router for passing

package/lib/place/guards/navigation-state.d.ts

@@ -14,23 +14,26 @@ export declare abstract class NavigationState extends GarbageCollector {
     abstract readonly startingUrl: string;
     abstract readonly isPopState: boolean;
     constructor(context: NavigationState.Context);
+    readonly name: string;
     readonly idle: boolean;
     readonly placeRouter: PlaceRouter;
     readonly interactionService: InteractionService;
     readonly interactionContext: InteractionContext;
     storeVisit(visit: Visit): void;
     getVisitFor(placeDef: PlaceDefinition): Visit;
+    onPlaceNavigationStart(visit: Visit, initialUrl: string): NavigationState;
     onPopState(event: NavigationStart): NavigationState;
-    onStart(event: NavigationStart): NavigationState;
-    onCancel(event: NavigationCancel): NavigationState;
-    onError(event: NavigationError): NavigationState;
-    onEnd(event: NavigationEnd): NavigationState;
+    onRouterStarted(event: NavigationStart): NavigationState;
+    onRouterCancelled(event: NavigationCancel): NavigationState;
+    onRouterError(event: NavigationError): NavigationState;
+    onRouterEnd(event: NavigationEnd): NavigationState;
     onBackClickedDuringNavigationInteraction(newUrl: string): NavigationState;
-    canDeactivatePlace(component: PlaceComponent, nextState: UrlSnapshot): Promise<boolean>;
+    canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot>;
     getVisits(): Visit[];
     protected illegalTransition<R>(message: string | RouterEvent): R;
     protected currentRouterUrl(): string;
-    protected createTransitionStateFor(event: NavigationStart): NavigationState.NavigationBackTransition | NavigationState.NavigationTransition;
+    protected createTransitionStateFor(event: NavigationStart): any;
+    protected createIdleState(): any;
     resetBrowserLocation(url: any): void;
     toString(): string;
 }
@@ -46,41 +49,47 @@ export declare namespace NavigationState {
         readonly startingUrl: any;
         readonly isPopState = false;
         constructor(context: Context);
-        onStart(event: NavigationStart): NavigationState;
+        onPlaceNavigationStart(visit: Visit, initialUrl: string): NavigationState;
+        onRouterStarted(event: NavigationStart): NavigationState;
         onPopState(event: NavigationStart): NavigationState;
     }
     abstract class AbstractNavigationTransition extends NavigationState {
-        readonly isPopState: boolean;
         readonly startingUrl: string;
         readonly isTransitional = true;
         private componentDeactivationHandlers;
         private _interactionContext;
-        constructor(context: Context, isPopState: boolean, startingUrl: string);
+        constructor(context: Context, startingUrl: string);
         readonly interactionContext: InteractionContext;
-        onStart(event: NavigationStart): NavigationState;
-        onEnd(event: NavigationEnd): NavigationState;
+        onRouterStarted(event: NavigationStart): NavigationState;
+        onRouterEnd(event: NavigationEnd): NavigationState;
         onBackClickedDuringNavigationInteraction(locationTriggerUrl: string): NavigationState;
-        canDeactivatePlace(component: PlaceComponent, nextState: UrlSnapshot): Promise<boolean>;
+        canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot>;
         private detachInteractionContext;
     }
     class NavigationTransition extends AbstractNavigationTransition {
         readonly isPopState = false;
-        onStart(event: NavigationStart): NavigationState;
-        onEnd(event: NavigationEnd): NavigationState;
-        onCancel(event: NavigationCancel): NavigationState;
-        onError(event: NavigationError): NavigationState;
+        onRouterCancelled(event: NavigationCancel): NavigationState;
+        onRouterError(event: NavigationError): NavigationState;
         toString(): string;
     }
-    class NavigationBackTransition extends AbstractNavigationTransition {
+    class PopStateTransition extends AbstractNavigationTransition {
         readonly isPopState = true;
-        onCancel(event: NavigationCancel): NavigationState;
-        onError(event: NavigationError): NavigationState;
+        onRouterCancelled(event: NavigationCancel): NavigationState;
+        onRouterError(event: NavigationError): NavigationState;
+    }
+    class IdleDuringInteraction extends NavigationState {
+        readonly startingUrl: string;
+        readonly isTransitional = false;
+        readonly isPopState = false;
+        constructor(context: Context, startingUrl: string);
+        onPlaceNavigationStart(visit: Visit, initialUrl: string): NavigationState;
+        onRouterStarted(event: NavigationStart): NavigationState;
+        onPopState(event: NavigationStart): NavigationState;
     }
-    abstract class AbstractInteractionTransition extends NavigationState {
+    abstract class AbstractInteractionTransition extends AbstractNavigationTransition {
         readonly startingUrl: string;
         readonly isTransitional = true;
         constructor(context: Context, startingUrl: string);
-        protected reinstateInteractionRoute(): void;
     }
     /**
      * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
@@ -88,36 +97,33 @@ export declare namespace NavigationState {
      */
     class InteractionTransition extends AbstractInteractionTransition {
         readonly isPopState = false;
-        onEnd(event: NavigationEnd): NavigationState;
+        onRouterCancelled(event: NavigationCancel): NavigationState;
+        onRouterError(event: NavigationError): NavigationState;
+        onRouterEnd(event: NavigationEnd): NavigationState;
     }
     /**
      * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
      * happily ignore interaction contexts.
      */
-    class InteractionBackTransition extends AbstractInteractionTransition {
+    class InteractionPopStateTransition extends AbstractInteractionTransition {
         readonly isPopState = true;
-        onEnd(event: NavigationEnd): NavigationState;
-    }
-    class IdleDuringInteraction extends NavigationState {
-        readonly startingUrl: string;
-        readonly isTransitional = false;
-        readonly isPopState = false;
-        constructor(context: Context, startingUrl: string);
-        onStart(event: NavigationStart): NavigationState;
-        onPopState(event: NavigationStart): NavigationState;
+        onRouterCancelled(event: NavigationCancel): NavigationState;
+        onRouterEnd(event: NavigationEnd): NavigationState;
     }
     class CancelledDuringNavigationInteraction extends NavigationState {
         readonly startingUrl: string;
+        readonly startingEventWasAPopState: boolean;
         readonly locationChangeTriggerUrl: string;
         readonly isPopState = false;
-        private capturedFauxRouterStart;
-        constructor(context: Context, startingUrl: string, locationChangeTriggerUrl: string);
+        private gotPopStateWithLeavingUrl;
+        constructor(context: Context, startingUrl: string, startingEventWasAPopState: boolean, locationChangeTriggerUrl: string);
         readonly isTransitional: boolean;
-        onStart(event: NavigationStart): NavigationState;
-        onCancel(event: NavigationCancel): NavigationState;
-        onEnd(event: NavigationEnd): NavigationState;
-        onError(event: NavigationError): NavigationState;
+        onRouterStarted(event: NavigationStart): NavigationState;
+        onRouterCancelled(event: NavigationCancel): NavigationState;
+        onRouterEnd(event: NavigationEnd): NavigationState;
+        onRouterError(event: NavigationError): NavigationState;
         onPopState(event: NavigationStart): NavigationState;
+        canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot>;
         ignore(event: RouterEvent, reason?: string): NavigationState;
         toString(): string;
     }

package/lib/place/guards/place-component-deactivation-handler.d.ts

@@ -3,10 +3,13 @@ import { UrlSnapshot } from '../url-snapshot';
 import { NavigationState } from './navigation-state';
 export declare class PlaceComponentDeactivationHandler {
     readonly component: PlaceComponent;
-    readonly navigationSession: NavigationState;
+    readonly navigationState: NavigationState;
+    readonly isPrimaryComponent: boolean;
     private canDeactivatePromise;
-    constructor(component: PlaceComponent, navigationSession: NavigationState);
-    canDeactivate(nextState: UrlSnapshot): Promise<boolean>;
-    protected canDeactivateComponent(nextState: UrlSnapshot): Promise<boolean>;
+    constructor(component: PlaceComponent, navigationState: NavigationState, isPrimaryComponent: boolean);
+    readonly interactionService: import("../../interaction").InteractionService;
+    readonly placeRouter: import("..").PlaceRouter;
+    canDeactivate(currentUrl: UrlSnapshot, nextState: UrlSnapshot): Promise<boolean | UrlSnapshot>;
+    protected canDeactivateComponent(currentUrl: UrlSnapshot, nextState: UrlSnapshot): Promise<UrlSnapshot | boolean>;
     protected isNotJustAChangeInRouteId(nextState: UrlSnapshot): boolean;
 }

package/lib/place/guards/{abstract-place.guard.d.ts → place.guard.d.ts}

@@ -1,19 +1,24 @@
 import { Injector } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, CanDeactivate, Router, RouterStateSnapshot, UrlSerializer, UrlTree } from '@angular/router';
+import { InteractionService } from '../../interaction/services/interaction.service';
 import { PlaceComponent } from '../place-component';
 import { PlaceDefinition } from '../place-definition';
 import { PlaceHistory } from '../place-history';
 import { PlaceRouter } from '../place-router';
-export declare abstract class AbstractPlaceGuard implements CanActivate, CanDeactivate<PlaceComponent> {
+import { UrlSnapshot } from '../url-snapshot';
+export declare abstract class PlaceGuard implements CanActivate, CanDeactivate<PlaceComponent> {
     private readonly router;
     private urlSerializer;
     private readonly placeRouter;
     private readonly placeHistory;
+    private readonly interactionService;
     private readonly injector;
-    constructor(router: Router, urlSerializer: UrlSerializer, placeRouter: PlaceRouter, placeHistory: PlaceHistory, injector: Injector);
+    constructor(router: Router, urlSerializer: UrlSerializer, placeRouter: PlaceRouter, placeHistory: PlaceHistory, interactionService: InteractionService, injector: Injector);
     canActivate(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree>;
-    canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean>;
+    canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean | UrlTree>;
+    private handleGuardResult;
     protected authorisePlaceThen(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot, runPlaceGuards: (placeDefinition: PlaceDefinition) => Promise<boolean | UrlTree>): Promise<boolean | UrlTree>;
     isAuthorised(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree>;
     abstract getAuthGuard(injector: Injector): CanActivate;
+    cleanInteractionState(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, then: () => Promise<boolean | UrlSnapshot>): Promise<boolean | UrlSnapshot>;
 }

package/lib/place/index.d.ts

@@ -18,12 +18,11 @@ export * from "./components/list-place-nav/list-place-nav.component";
 export * from "./components/place-outlet/place-outlet.component";
 export * from "./components/place-outlet/route-animations";
 export * from "./components/tabbed-place-navigation/tabbed-place-navigation.component";
-export * from "./guards/abstract-place.guard";
 export * from "./guards/consolidated-param-map";
-export * from "./guards/interaction.guard";
 export * from "./guards/navigation-state";
 export * from "./guards/noop-auth-guard.service";
 export * from "./guards/place-component-deactivation-handler";
+export * from "./guards/place.guard";
 export * from "./route/formatter";
 export * from "./route/json-types";
 export * from "./route/parameter-decorators";

package/lib/place/place-router.d.ts

@@ -38,7 +38,9 @@ export declare class PlaceRouter extends GarbageCollector {
     parseUrl(url: string): UrlSnapshot;
     resetBrowserLocation(url: string): void;
     getCurrentRouterUrl(): string;
+    getCurrentRouteSnapshot(): UrlSnapshot;
     getActiveInteractionIdsFromUrl(url: string): string[];
     hasActiveInteractionIds(url: string): boolean;
+    navigateByUrl(urlSnapshot: UrlSnapshot): void;
     syncInteractionIdsWithRouter(): void;
 }

package/lib/place/url-snapshot.d.ts

@@ -1,28 +1,33 @@
-import { UrlSegment, UrlSerializer } from '@angular/router';
+import { NavigationExtras, UrlSegment, UrlSerializer, UrlTree } from '@angular/router';
 import { PlaceDefinition } from './place-definition';
 import { Visit } from './visit';
 export declare class UrlSnapshot {
     readonly urlSerializer: UrlSerializer;
     readonly url: string;
-    private readonly urlTree;
-    constructor(urlSerializer: UrlSerializer, url: string);
-    protected replaceExistingVisitSegmentsWith(visit: Visit): UrlSegment[];
+    private readonly options;
+    readonly urlTree: UrlTree;
+    constructor(urlSerializer: UrlSerializer, url: string, options: NavigationExtras);
+    updateVisitSegments(visit: Visit): UrlSnapshot;
     private getPrimarySegments;
     /**
      * Converts the visit into segments.  Please not that these segments are not e
      * @param visit
      */
     protected getSegmentsFor(visit: Visit): UrlSegment[];
-    createRedirectCommandsFor(visit: Visit): any[];
     includesPathOf(placeDef: PlaceDefinition): UrlSegment;
     getInteractionIds(): string[];
-    addOrReplaceInteractionIds(ids: string[]): UrlSnapshot;
+    hasInteractionIds(): boolean;
+    updateInteractionIds(ids: string[]): UrlSnapshot;
+    removeInteractionIds(): UrlSnapshot;
+    withOptions(options: NavigationExtras): UrlSnapshot;
+    getNavigationExtras(): NavigationExtras;
 }
 export declare namespace UrlSnapshot {
-    const INTERACTION_ROUTER_OUTLET = "aup-interactions";
-    const INTERACTION_ROUTER_PATH = "active";
+    const INTERACTION_QUERY_PARAM = "aup-interactions";
     const INTERACTION_ID_SEPARATOR = "--";
     function parseInteractionIds(path: string): string[];
     function createPathIdFor(interactionIds: string[]): string;
-    function createInteractionOutletRouterCommands(interactionIds: string[]): string[];
+    interface NavigationOptions {
+        replaceUrl?: boolean;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coolon/angular-ui-powerups",
-  "version": "0.0.101",
+  "version": "0.0.102",
   "schematics": "./schematics/collection.json",
   "dependencies": {
     "ts-morph": "^3.1.3",

package/schematics/place-routes/place-def.js

@@ -98,6 +98,7 @@ class PlaceDef {
     component: ${this.componentClass},
     canActivate: [PlaceGuard],
     canDeactivate: [PlaceGuard],
+    runGuardsAndResolvers: "paramsOrQueryParamsChange",
     children:[
       ${this.getChildRouteTemplates().join(', ')}
     ]

package/schematics/place-routes/place-def.js.map

@@ -1 +1 @@
-{"version":3,"file":"place-def.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-def.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"place-def.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-def.ts"],"names":[],"mappings":"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"}

package/schematics/place-routes/templates/place-routes.ts.template

@@ -12,8 +12,13 @@
 
 
 import { Injectable, Injector } from '@angular/core';
-import { Router, UrlSerializer } from '@angular/router';
-import { AbstractPlaceGuard, PlaceHistory, PlaceRouter, InteractionGuard, NoopComponent, UrlSnapshot } from '@coolon/angular-ui-powerups';
+import { Routes, Router, UrlSerializer } from '@angular/router';
+import {
+  InteractionService,
+  PlaceGuard as AbstractPlaceGuard,
+  PlaceHistory,
+  PlaceRouter
+} from '@coolon/angular-ui-powerups';
 import { <%= config.authGuard.className %> } from '<%= config.authGuard.importPath %>';
 
 <% placeDefs.forEach(def => { %>import {<%= def.componentClass %>} from "<%= def.importPath %>";
@@ -28,8 +33,9 @@ export class PlaceGuard extends AbstractPlaceGuard {
               urlSerializer: UrlSerializer,
               placeRouter: PlaceRouter,
               placeHistory: PlaceHistory,
+              interactionService:InteractionService,
               injector: Injector) {
-    super(router, urlSerializer, placeRouter, placeHistory, injector);
+    super(router, urlSerializer, placeRouter, placeHistory,interactionService, injector);
   }
 
   getAuthGuard(injector:Injector) {
@@ -37,14 +43,7 @@ export class PlaceGuard extends AbstractPlaceGuard {
   }
 }
 
-export const placeRoutes = [<% placeDefs.filter(def=> !def.isChild()).forEach(def => { %>
+export const placeRoutes:Routes = [<% placeDefs.filter(def=> !def.isChild()).forEach(def => { %>
     <%= def.getRouteTemplate() %>,
 <% }) %>
- {
-   path: "active/:ids", // Must match `${UrlSnapshot.INTERACTION_ROUTER_PATH}/:ids`
-   outlet:UrlSnapshot.INTERACTION_ROUTER_OUTLET,
-   component: NoopComponent,
-   canDeactivate: [InteractionGuard],
-   canActivate: [InteractionGuard]
- }
 ];

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

@@ -1,166 +0,0 @@
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-import * as tslib_1 from "tslib";
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { lang, Trace } from '@coolon/pectin';
-import { Observable } from 'rxjs';
-import { PlaceComponent } from '../place-component';
-import { VisitSanitiser } from '../route/visit-sanitiser';
-import { Visit } from '../visit';
-import { ConsolidatedParameterMap } from './consolidated-param-map';
-/**
- * @abstract
- */
-export class AbstractPlaceGuard {
-    /**
-     * @param {?} router
-     * @param {?} urlSerializer
-     * @param {?} placeRouter
-     * @param {?} placeHistory
-     * @param {?} injector
-     */
-    constructor(router, urlSerializer, placeRouter, placeHistory, injector) {
-        this.router = router;
-        this.urlSerializer = urlSerializer;
-        this.placeRouter = placeRouter;
-        this.placeHistory = placeHistory;
-        this.injector = injector;
-    }
-    // @Trace()
-    /**
-     * @param {?} activatedRoute
-     * @param {?} state
-     * @return {?}
-     */
-    canActivate(activatedRoute, state) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.authorisePlaceThen(activatedRoute, state, (/**
-             * @param {?} placeDefinition
-             * @return {?}
-             */
-            (placeDefinition) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                // Parse our route params.
-                /** @type {?} */
-                const params = new ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);
-                /** @type {?} */
-                const parsedParams = placeDefinition.parseRouteParams(params);
-                /** @type {?} */
-                const initialVisit = this.placeRouter.navigationState.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);
-                /** @type {?} */
-                const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);
-                /** @type {?} */
-                const sanitisedVisit = yield sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));
-                // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters
-                this.placeRouter.navigationState.storeVisit(sanitisedVisit);
-                if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {
-                    // Regenerate the url
-                    /** @type {?} */
-                    const commands = this.placeRouter.parseUrl(state.url).createRedirectCommandsFor(sanitisedVisit);
-                    console.log('##### Place Guard Redirect', commands);
-                    return this.router.createUrlTree(commands, {
-                        replaceUrl: true,
-                        skipLocationChange: false
-                    });
-                }
-                else {
-                    return true;
-                }
-            })));
-        });
-    }
-    /**
-     * @param {?} component
-     * @param {?} currentRoute
-     * @param {?} currentState
-     * @param {?=} nextState
-     * @return {?}
-     */
-    canDeactivate(component, currentRoute, currentState, nextState) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.placeRouter.navigationState.canDeactivatePlace(component, this.placeRouter.parseUrl(nextState.url));
-        });
-    }
-    // @Trace()
-    /**
-     * @protected
-     * @param {?} activatedRoute
-     * @param {?} state
-     * @param {?} runPlaceGuards
-     * @return {?}
-     */
-    authorisePlaceThen(activatedRoute, state, runPlaceGuards) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {
-                /** @type {?} */
-                const placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);
-                /** @type {?} */
-                const authoriseResult = placeDefinition.authenticate ? yield this.isAuthorised(activatedRoute, state) : true;
-                if (authoriseResult === true) {
-                    // we're authorised, now run the place guards.
-                    return runPlaceGuards(placeDefinition);
-                }
-                else {
-                    console.log('not authorised result', authoriseResult);
-                    return authoriseResult;
-                }
-            }
-            else {
-                return lang.illegalState(`expected component to be an instance of PlaceComponent, got ${activatedRoute.component}`);
-            }
-        });
-    }
-    /**
-     * @param {?} activatedRoute
-     * @param {?} state
-     * @return {?}
-     */
-    isAuthorised(activatedRoute, state) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            /** @type {?} */
-            const authorised = this.getAuthGuard(this.injector).canActivate(activatedRoute, state);
-            return (authorised instanceof Observable) ? authorised.toPromise() : authorised;
-        });
-    }
-}
-tslib_1.__decorate([
-    Trace(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [ActivatedRouteSnapshot, RouterStateSnapshot]),
-    tslib_1.__metadata("design:returntype", Promise)
-], AbstractPlaceGuard.prototype, "isAuthorised", null);
-if (false) {
-    /**
-     * @type {?}
-     * @private
-     */
-    AbstractPlaceGuard.prototype.router;
-    /**
-     * @type {?}
-     * @private
-     */
-    AbstractPlaceGuard.prototype.urlSerializer;
-    /**
-     * @type {?}
-     * @private
-     */
-    AbstractPlaceGuard.prototype.placeRouter;
-    /**
-     * @type {?}
-     * @private
-     */
-    AbstractPlaceGuard.prototype.placeHistory;
-    /**
-     * @type {?}
-     * @private
-     */
-    AbstractPlaceGuard.prototype.injector;
-    /**
-     * @abstract
-     * @param {?} injector
-     * @return {?}
-     */
-    AbstractPlaceGuard.prototype.getAuthGuard = function (injector) { };
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abstract-place.guard.js","sourceRoot":"ng://@coolon/angular-ui-powerups/","sources":["lib/place/guards/abstract-place.guard.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injector } from '@angular/core';\nimport {\n  ActivatedRouteSnapshot,\n  CanActivate, CanDeactivate,\n  Router,\n  RouterStateSnapshot,\n  UrlSerializer,\n  UrlTree\n} from '@angular/router';\nimport { lang, Trace } from '@coolon/pectin';\nimport { Observable } from 'rxjs';\nimport { InteractionService } from '../../interaction/services/interaction.service';\nimport { PlaceComponent } from '../place-component';\nimport { PlaceDefinition } from '../place-definition';\nimport { PlaceHistory } from '../place-history';\nimport { PlaceRouter } from '../place-router';\nimport { VisitSanitiser } from '../route/visit-sanitiser';\nimport { Visit } from '../visit';\nimport { ConsolidatedParameterMap } from './consolidated-param-map';\n\n\nexport abstract class AbstractPlaceGuard implements CanActivate, CanDeactivate<PlaceComponent> {\n\n\n  constructor(private readonly router: Router,\n              private urlSerializer: UrlSerializer,\n              private readonly placeRouter: PlaceRouter,\n              private readonly placeHistory: PlaceHistory,\n              private readonly injector: Injector) {\n  }\n\n  // @Trace()\n  async canActivate(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree> {\n    return this.authorisePlaceThen(activatedRoute, state, async placeDefinition => {\n\n      // Parse our route params.\n      const params = new ConsolidatedParameterMap(activatedRoute.paramMap, activatedRoute.url);\n      const parsedParams = placeDefinition.parseRouteParams(params);\n\n      const initialVisit = this.placeRouter.navigationState.getVisitFor(placeDefinition) || new Visit(placeDefinition, parsedParams);\n      const sanitiser = new VisitSanitiser(activatedRoute, this.router, this.placeHistory, this.injector);\n      const sanitisedVisit = await sanitiser.sanitise(initialVisit.mergeRouteParameters(parsedParams));\n\n      // Save the visit with any updated parameters.  We need to save it so we remember any non route parameters\n      this.placeRouter.navigationState.storeVisit(sanitisedVisit);\n      if (initialVisit.hasRoutingChangedFrom(sanitisedVisit)) {\n        // Regenerate the url\n        const commands = this.placeRouter.parseUrl(state.url).createRedirectCommandsFor(sanitisedVisit);\n        console.log('##### Place Guard Redirect', commands);\n        return this.router.createUrlTree(commands, {\n          replaceUrl: true,\n          skipLocationChange: false\n        });\n      } else {\n        return true;\n      }\n    });\n  }\n\n  async canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean> {\n    return this.placeRouter.navigationState.canDeactivatePlace(component, this.placeRouter.parseUrl(nextState.url));\n  }\n\n  // @Trace()\n  protected async authorisePlaceThen(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot, runPlaceGuards: (placeDefinition: PlaceDefinition) => Promise<boolean | UrlTree>) {\n    if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {\n      const placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);\n      const authoriseResult = placeDefinition.authenticate ? await this.isAuthorised(activatedRoute, state) : true;\n      if (authoriseResult === true) {\n        // we're authorised, now run the place guards.\n        return runPlaceGuards(placeDefinition);\n      } else {\n        console.log('not authorised result', authoriseResult);\n        return authoriseResult;\n      }\n    } else {\n       return lang.illegalState(`expected component to be an instance of PlaceComponent, got ${activatedRoute.component}`);\n    }\n  }\n\n  @Trace()\n  async isAuthorised(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree> {\n    const authorised = this.getAuthGuard(this.injector).canActivate(activatedRoute, state);\n    return (authorised instanceof Observable) ? authorised.toPromise() : authorised;\n  }\n\n  abstract getAuthGuard(injector: Injector): CanActivate;\n}\n"]}