@coolon/angular-ui-powerups 0.0.89 → 0.0.91

package/lib/directives/command.directive.d.ts

@@ -2,6 +2,8 @@ import { AfterViewInit, ElementRef, OnDestroy, OnInit } from '@angular/core';
 import { Command, GarbageCollector, UnaryCommand } from '@coolon/pectin';
 export declare class CommandDirective<P = any> extends GarbageCollector implements OnInit, OnDestroy, AfterViewInit {
     private elementRef;
+    private _command;
+    private _commandEnabled;
     pectinCommand: Command<any> | UnaryCommand<P>;
     private _commandParameter;
     private _commandParameterProvided;

package/lib/interaction/components/activity-container/activity-container.component.d.ts

@@ -1,6 +1,6 @@
 import { AfterViewInit, EventEmitter, OnInit, QueryList } from '@angular/core';
 import { MatTabGroup } from '@angular/material';
-import { Constructable, ListModel, MutableListModel } from '@coolon/pectin';
+import { Constructable, MutableListModel } from '@coolon/pectin';
 import { Activity } from '../../activity';
 import { Alert } from '../../alert';
 import { Confirm } from '../../confirm';
@@ -39,13 +39,12 @@ export declare class ActivityContainerComponent<D, R, E> extends InteractionCont
     private readonly _activityList;
     constructor();
     isActive(): boolean;
-    readonly activityList: ListModel<Activity<any, any, any>>;
     readonly isFinished: boolean;
     ngOnInit(): void;
     ngAfterViewInit(): void;
     startActivity<D1, R1, E1>(activityType: Constructable<Activity<D1, R1, E1>>, data?: D1): Promise<R1>;
     alert(alert: Alert): Promise<void>;
-    confirm(confirm: Confirm): Promise<void>;
+    confirmOrReject(confirm: Confirm): Promise<void>;
     confirmThen<D1, R1, E1>(confirm: Confirm, activityType: Constructable<Activity<D1, R1, E1>>, data?: D1): Promise<R1>;
     private finishInitialActivity;
     private onNestedActivityFinished;

package/lib/interaction/components/inplace-interaction-context/inplace-interaction-context.component.d.ts

@@ -1,4 +1,4 @@
-import { OnInit } from '@angular/core';
+import { AfterViewInit } from '@angular/core';
 import { Constructable } from '@coolon/pectin';
 import { Activity } from '../../activity';
 import { Alert } from '../../alert';
@@ -6,15 +6,14 @@ import { Confirm } from '../../confirm';
 import { InteractionContext } from '../../interaction-context';
 import { ActivityContainerComponent } from '../activity-container/activity-container.component';
 import { ActivityOutletContext } from '../activity-outlet/activity-outlet-context';
-export declare class InplaceInteractionContextComponent<D, R, E> extends InteractionContext implements OnInit {
+export declare class InplaceInteractionContextComponent<D, R, E> extends InteractionContext implements AfterViewInit {
     interactionContext: ActivityContainerComponent<any, any, any>;
     initialActivityContext: ActivityOutletContext<D, R, E>;
     constructor();
-    ngOnInit(): void;
-    readonly activityList: import("@coolon/pectin").ListModel<Activity<any, any, any>>;
+    ngAfterViewInit(): void;
     isActive(): boolean;
     alert(alert: Alert): Promise<void>;
-    confirm(confirm: Confirm): Promise<void>;
+    confirmOrReject(confirm: Confirm): Promise<void>;
     confirmThen<D1, R1, E1>(confirm: Confirm, activityType: Constructable<Activity<D1, R1, E1>>, data?: D1): Promise<R1>;
     startActivity<D1, R1, E1>(activityType: Constructable<Activity<D1, R1, E1>>, data?: D1): Promise<R1>;
     protected _startActivity<D1, R1, E1>(activityType: Constructable<Activity<D1, R1, E1>>, data?: D1): Promise<R1>;

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

@@ -7,19 +7,23 @@ export declare abstract class InteractionContext extends GarbageCollector {
      * Returns the current list of activities that are in progress.
      * This model is only updated in the next tick after the view has been updated.
      */
-    abstract readonly activityList: ListModel<Activity<any, any>>;
+    private readonly _activityListDelegate;
+    private deferredGetCurrentActivity;
     protected constructor();
+    protected setActivityList(activityList: ListModel<Activity<any, any>>): void;
+    readonly activityList: ListModel<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.
      */
-    readonly currentActivity: Activity<any, any>;
+    getCurrentActivity(): Promise<Activity<any, any>>;
     /**
      * Returns true if an activity is currently running.
      */
     abstract isActive(): boolean;
     abstract startActivity<D, R, E>(activityType: Constructable<Activity<D, R, E>>, data?: D): Promise<R>;
-    abstract confirm(confirm: Confirm): Promise<void>;
+    confirm(confirm: Confirm): Promise<boolean>;
+    abstract confirmOrReject(confirm: Confirm): Promise<void>;
     /**
      * Presents the confirmation to the user and runs the activity only if the user confirms.
      * @param confirm:Confirm the confirmation to display.

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

@@ -3,7 +3,7 @@ import { InjectionToken } from '@angular/core';
 import { MatDialog } from '@angular/material';
 import { MatDialogConfig } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-import { BooleanValueModelChain, Constructable, ListModel } from '@coolon/pectin';
+import { Constructable, ListModel, ValueModel } from '@coolon/pectin';
 import { Activity } from '../activity';
 import { Alert } from '../alert';
 import { Confirm } from '../confirm';
@@ -15,13 +15,11 @@ export declare class DialogInteractionService extends InteractionContext {
     readonly router: Router;
     readonly dialogServiceDefaults: MatDialogConfig<any>;
     readonly matDialogDefaultConfig: MatDialogConfig<any>;
-    private readonly _activityList;
     private startingGuard;
-    readonly active: BooleanValueModelChain;
+    private readonly _inActivityPromise;
     constructor(dialogService: MatDialog, location: Location, router: Router, dialogServiceDefaults: MatDialogConfig<any>, matDialogDefaultConfig: MatDialogConfig<any>);
     isActive(): boolean;
-    cancelActivity(): void;
-    readonly activityList: ListModel<Activity<any, any>>;
+    readonly active: ValueModel<boolean>;
     startActivity<D, R, E>(activityType: Constructable<Activity<D, R, E>>, data?: D): Promise<R>;
     private _startActivity;
     /**
@@ -30,6 +28,6 @@ export declare class DialogInteractionService extends InteractionContext {
      */
     safelyUpdateActivityListDelegate(delegate: ListModel<Activity<any, any>>): void;
     alert(alert: Alert): Promise<void>;
-    confirm(confirm: Confirm): Promise<void>;
+    confirmOrReject(confirm: Confirm): Promise<void>;
     confirmThen<D, R, E>(confirm: Confirm, activityType: Constructable<Activity<D, R, E>>, data?: D): Promise<R>;
 }

package/lib/place/navigation-session.d.ts

@@ -1,26 +1,43 @@
+import { InteractionContext } from '../interaction/interaction-context';
 import { PlaceComponent } from './place-component';
 import { PlaceDefinition } from './place-definition';
+import { PlaceRouter } from './place-router';
 import { Visit } from './visit';
 export declare abstract class NavigationSession {
     readonly firstNavigation: boolean;
+    private readonly appModalInteractionContext;
     private _alreadyAccepted;
     private _visits;
     private _popStateReturnUrl;
     abstract readonly isExternal: boolean;
-    protected constructor(firstNavigation: boolean);
+    readonly dialogOpenOnStart: boolean;
+    private componentDeactivationHandlers;
+    protected constructor(firstNavigation: boolean, appModalInteractionContext: InteractionContext);
     storeVisit(visit: Visit): void;
     getVisitFor(placeDef: PlaceDefinition): Visit;
-    mergePrivatePlaceParameters(params: {
-        [p: string]: any;
-    }): NavigationSession;
-    alreadyAccepted(placeComponent: PlaceComponent): boolean;
-    rememberAcceptanceOf(component: PlaceComponent): void;
-    setPopstateReturn(url: string): void;
+    canDeactivate(component: PlaceComponent, nextState: PlaceRouter.UrlHelper): Promise<boolean>;
+    setPopstateReturnUrl(url: string): void;
     readonly isPopState: boolean;
     readonly popStateReturnUrl: string;
     getVisits(): Visit[];
 }
 export declare namespace NavigationSession {
-    function createInternal(visit: Visit): NavigationSession;
-    function createExternal(firstTimeRoute: boolean): NavigationSession;
+    class Factory {
+        readonly appModelInteractionContext: InteractionContext;
+        constructor(appModelInteractionContext: InteractionContext);
+        createInternal(visit: Visit): NavigationSession;
+        createExternal(firstTimeRoute: boolean): NavigationSession;
+    }
+    class ComponentDeactivationHandler {
+        readonly component: PlaceComponent;
+        readonly appModelInteractionContext: InteractionContext;
+        readonly primary: boolean;
+        private alreadyAccepted;
+        constructor(component: PlaceComponent, appModelInteractionContext: InteractionContext, primary: boolean);
+        canDeactivate(nextState: PlaceRouter.UrlHelper): Promise<boolean>;
+        protected canDeactivateComponent(nextState: PlaceRouter.UrlHelper): Promise<boolean>;
+        isAppModalInteractionContext(interactionContext: InteractionContext): boolean;
+        protected cancelCurrentActivityOf(interactionContext: InteractionContext): Promise<void>;
+        protected isLeavingCurrentPlace(nextState: PlaceRouter.UrlHelper): boolean;
+    }
 }

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

@@ -1,27 +1,22 @@
-import { Constructable, GarbageCollector, ValueModel } from '@coolon/pectin';
+import { Constructable, ValueModel } from '@coolon/pectin';
 import 'reflect-metadata';
+import { DisposableComponent } from '../components/disposable-component';
 import { InteractionContext } from '../interaction/interaction-context';
 import { PlaceDefinition } from './place-definition';
 import { ParameterDefinition } from './route/parameter-definition.class';
 import { Visit } from './visit';
 export declare const DEFINITION_META_DATA_KEY = "PLACE_DEFINITION_OPTIONS";
 export declare const ROUTE_PARAMETER_LIST_KEY: unique symbol;
-export declare class PlaceComponent extends GarbageCollector {
+export declare class PlaceComponent extends DisposableComponent {
     private visit;
     interactionContext?: InteractionContext;
+    canDeactivate?(): boolean | Promise<boolean>;
     constructor();
     initialiseBindings(visit: ValueModel<Visit>): void;
     private installBinding;
     readonly placeDefinition: PlaceDefinition;
     readonly childPlaces: Constructable<PlaceComponent>[];
-    canDeactivate(): boolean | Promise<boolean>;
     onPlaceReady(): void;
-    /**
-     * Called by the place outlet after all animations have finished.  We need this instead of ngOnDestroy
-     * to avoid the fact that the angular router calls it before the animations have run causing the component
-     * to loose any pectin bindings.
-     */
-    onPlaceDestroyed(): void;
 }
 export declare namespace PlaceComponent {
     function isPlaceComponentConstructor(target: any): target is Constructable<PlaceComponent>;

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

@@ -22,10 +22,6 @@ export declare class PlaceDefinition {
     getPlaceData<T>(key: string, defaultValue?: T): T;
     searchPlaceData<T>(keys: string[], defaultValue?: T): T;
     getRouteIdFrom(visit: Visit): any;
-    /**
-     * Returns angular router commands that specify the route id and any route parameters.  The result does
-     * not include any path information.
-     */
     getFormattedRouteId(visit: Visit): any;
     getFormattedRouteParameters(visit: Visit, includeRouteId?: boolean): {
         [p: string]: string;

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

@@ -1,11 +1,14 @@
 import { Location } from '@angular/common';
-import { ActivatedRoute, ActivatedRouteSnapshot, Router } from '@angular/router';
+import { ActivatedRoute, ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlSegment, UrlSerializer, UrlTree } from '@angular/router';
 import { BooleanValueModelChain, GarbageCollector, HasOneIndexChain, ListModel, ValueModel } from '@coolon/pectin';
 import { NavigationSession } from './navigation-session';
+import { PlaceDefinition } from './place-definition';
 import { PlaceHistory } from './place-history';
 import { Visit } from './visit';
 export declare class PlaceRouter extends GarbageCollector {
     private readonly router;
+    private readonly urlSerializer;
+    private readonly navigationSessionFactory;
     readonly angularLocation: Location;
     readonly placeHistory: PlaceHistory;
     private firstRoute;
@@ -13,7 +16,7 @@ export declare class PlaceRouter extends GarbageCollector {
     private readonly _activeVisits;
     readonly navigationSessionActive: BooleanValueModelChain;
     readonly activeVisitIndex: HasOneIndexChain<'placeDefinition', Visit>;
-    constructor(router: Router, angularLocation: Location, placeHistory: PlaceHistory);
+    constructor(router: Router, urlSerializer: UrlSerializer, navigationSessionFactory: NavigationSession.Factory, angularLocation: Location, placeHistory: PlaceHistory);
     readonly navigationSession: NavigationSession;
     readonly navigationSessionModel: ValueModel<NavigationSession>;
     readonly activeVisits: ListModel<Visit>;
@@ -30,4 +33,20 @@ export declare class PlaceRouter extends GarbageCollector {
     private onAngularRouterStarted;
     private onAngularRouterFinished;
     extractChildPath(activatedRoute: ActivatedRouteSnapshot): any[];
+    parseUrl(snapshot: RouterStateSnapshot): PlaceRouter.UrlHelper;
+}
+export declare namespace PlaceRouter {
+    class UrlHelper {
+        private urlTree;
+        constructor(urlTree: UrlTree);
+        cloneUrlSegmentList(): UrlSegment[];
+        updateVisitSegments(visit: Visit): UrlSegment[];
+        /**
+         * Converts the visit into segments.  Please not that these segments are not e
+         * @param visit
+         */
+        convertToUrlSegments(visit: Visit): UrlSegment[];
+        createRedirectCommandsFor(visit: Visit): any[];
+        includesPathOf(placeDef: PlaceDefinition): UrlSegment;
+    }
 }

package/lib/place/route/guards/enter-place-guard.service.d.ts

@@ -10,7 +10,6 @@ export declare class EnterPlaceGuard implements CanActivate {
     private readonly injector;
     constructor(router: Router, urlSerializer: UrlSerializer, placeRouter: PlaceRouter, placeHistory: PlaceHistory, injector: Injector);
     canActivate(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree>;
-    private createRedirectCommands;
 }
 export declare namespace EnterPlaceGuard {
     /**

package/lib/place/route/guards/leave-place.guard.d.ts

@@ -1,16 +1,8 @@
-import { Location } from '@angular/common';
-import { Injector } from '@angular/core';
-import { ActivatedRouteSnapshot, CanDeactivate, Router, RouterStateSnapshot } from '@angular/router';
-import { InteractionContext } from '../../../interaction/interaction-context';
+import { ActivatedRouteSnapshot, CanDeactivate, RouterStateSnapshot } from '@angular/router';
 import { PlaceComponent } from '../../place-component';
 import { PlaceRouter } from '../../place-router';
 export declare class LeavePlaceGuard implements CanDeactivate<PlaceComponent> {
-    private router;
-    private injector;
     private placeRouter;
-    readonly dialogInteractionContext: InteractionContext;
-    readonly angularLocation: Location;
-    constructor(router: Router, injector: Injector, placeRouter: PlaceRouter, dialogInteractionContext: InteractionContext, angularLocation: Location);
-    private isLeavingTheCurrentPlace;
+    constructor(placeRouter: PlaceRouter);
     canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean>;
 }

package/lib/place/visit.d.ts

@@ -1,4 +1,3 @@
-import { UrlSegment } from '@angular/router';
 import { PlaceDefinition } from './place-definition';
 import { ParameterDefinition } from './route/parameter-definition.class';
 interface Params {
@@ -24,6 +23,5 @@ export declare class Visit {
     }): Visit;
     hasRoutingChangedFrom(other: Visit): boolean;
     hasChangedFrom(other: Visit): boolean;
-    getUrlSegments(): UrlSegment[];
 }
 export {};

package/package.json

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