npm - @coolon/angular-ui-powerups - Versions diffs - 0.0.71 → 0.0.74 - Mend

@coolon/angular-ui-powerups 0.0.71 → 0.0.74

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (102) hide show

package/lib/components/components.module.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export declare class ComponentsModule {
2	+ }

package/lib/components/index.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 /**
  * @file Automatically generated by barrelsby.
  */
+export * from "./components.module";
 export * from "./disposable-component";
 export * from "./resize-aware.component";
 export * from "./forms/abstract-input.component";

package/lib/directives/directives.module.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export declare class DirectivesModule {
2	+ }

package/lib/directives/index.d.ts CHANGED Viewed

@@ -2,4 +2,5 @@
  * @file Automatically generated by barrelsby.
  */
 export * from "./command.directive";
+export * from "./directives.module";
 export * from "./focus-binding.directive";

package/lib/place/components/abstract-place-navigation.component.d.ts CHANGED Viewed

@@ -1,13 +1,19 @@
 import { OnInit } from '@angular/core';
-import { Constructable, ListModel, ListModelChain } from '@coolon/pectin';
+import { ActivatedRoute } from '@angular/router';
+import { Command, Constructable, ListModel, ListModelChain, ValueModel, ValueModelChain } from '@coolon/pectin';
 import { DisposableComponent } from '../../components/disposable-component';
 import { NavItem } from '../nav-item';
 import { PlaceComponent } from '../place-component';
 import { PlaceDefinition } from '../place-definition';
+import { PlaceOutletComponent } from './place-outlet/place-outlet.component';
 export declare class AbstractPlaceNavigationComponent extends DisposableComponent implements OnInit {
     places: Constructable<PlaceComponent>[];
     placesModel: ListModel<Constructable<PlaceComponent>>;
+    placeOutlet: PlaceOutletComponent;
+    placeOutletModel: ValueModel<PlaceOutletComponent>;
     readonly placeDefinitions: ListModelChain<PlaceDefinition>;
+    protected relativeToModel: ValueModelChain<ActivatedRoute>;
+    commandFactory: Command.Factory<PlaceDefinition, void>;
     constructor();
     getNav(placeDef: PlaceDefinition): NavItem;
     ngOnInit(): void;

package/lib/place/components/place-outlet/place-outlet.component.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { EventEmitter, OnInit } from '@angular/core';
 import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
-import { MutableValueModel, ValueModel } from '@coolon/pectin';
+import { Constructable, ListModel, ValueModel, ValueModelChain } from '@coolon/pectin';
 import { DisposableComponent } from '../../../components/disposable-component';
 import { PlaceComponent } from '../../place-component';
 import { PlaceDefinition } from '../../place-definition';
@@ -14,25 +14,27 @@ interface PlaceRef {
 export declare class PlaceOutletComponent extends DisposableComponent implements OnInit {
     private readonly router;
     private readonly placeRouter;
-    readonly parentOutlet: PlaceOutletComponent;
     animate: boolean;
+    customPlaceAnimationOrderModel: ListModel<Constructable<PlaceComponent>>;
+    customPlaceAnimationOrder: Constructable<PlaceComponent>[];
     readonly placeChanged: EventEmitter<PlaceComponent>;
     routerOut: RouterOutlet;
     private readonly _activePlace;
+    private readonly _placeVisit;
     private readonly _inOutletUpdate;
     private readonly _activatedRouteModel;
     private readonly _placeDefinition;
-    /** TODO: This is now really a visit */
-    readonly _placeVisit: MutableValueModel<Visit>;
+    private parentOutletModel;
+    readonly placeAnimationOrder: ValueModelChain<number>;
     constructor(router: Router, placeRouter: PlaceRouter, parentOutlet: PlaceOutletComponent);
     ngOnInit(): void;
     navigate(visit: Visit): void;
+    readonly parentOutlet: PlaceOutletComponent;
     pushVisitChangesToRoute(next: Visit, previous: Visit): void;
     readonly activePlaceModel: ValueModel<PlaceComponent>;
     readonly activatedRouteModel: ValueModel<ActivatedRoute>;
     onOutletActivated(routerOutlet: RouterOutlet, place: PlaceComponent): void;
     onOutletDeactivated(routerOutlet: RouterOutlet, $event: PlaceRef): void;
-    getPlaceOrder(outlet: RouterOutlet): any;
     animationDone(): void;
 }
 export {};

package/lib/place/index.d.ts CHANGED Viewed

@@ -24,5 +24,5 @@ export * from "./route/parameter-definition.class";
 export * from "./route/parameter-sanitiser";
 export * from "./route/parameter-snapshot";
 export * from "./route/visit-sanitiser";
+export * from "./route/guards/enter-place-guard.service";
 export * from "./route/guards/leave-place.guard";
-export * from "./route/guards/place-route.guard";

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

@@ -7,13 +7,12 @@ export declare class PlaceDefinition {
     readonly component: Constructable<PlaceComponent>;
     readonly path: string;
     readonly authenticate: boolean;
-    readonly order: number;
     readonly data: {
         [key: string]: any;
     };
     readonly routeParameters: ParameterDefinition<any>[];
     readonly children: PlaceDefinition[];
-    constructor(component: Constructable<PlaceComponent>, path: string, authenticate: boolean, order: number, data: {
+    constructor(component: Constructable<PlaceComponent>, path: string, authenticate: boolean, data: {
         [key: string]: any;
     }, routeParameters: ParameterDefinition<any>[], children: PlaceDefinition[]);
     hasRouteId(): boolean;

package/lib/place/place.decorator.d.ts CHANGED Viewed

@@ -4,11 +4,11 @@ export declare function Place(options: Place.Options): (target: Function) => voi
 export declare namespace Place {
     interface Options {
         path: string;
-        order: number;
         data?: {
             [key: string]: any;
         };
         authenticate?: boolean;
         children?: Constructable<PlaceComponent>[];
+        defaultChild?: Constructable<PlaceComponent>;
     }
 }

package/lib/place/route/guards/{place-route.guard.d.ts → enter-place-guard.service.d.ts} RENAMED Viewed

@@ -1,16 +1,18 @@
 import { Injector } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, ParamMap, Router, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
+import { ActivatedRouteSnapshot, CanActivate, ParamMap, Router, RouterStateSnapshot, UrlSegment, UrlSerializer, UrlTree } from '@angular/router';
 import { PlaceHistory } from '../../place-history';
 import { PlaceRouter } from '../../place-router';
-export declare class PlaceRouteGuard implements CanActivate {
+export declare class EnterPlaceGuard implements CanActivate {
     private readonly router;
+    private urlSerializer;
     private readonly placeRouter;
     private readonly placeHistory;
     private readonly injector;
-    constructor(router: Router, placeRouter: PlaceRouter, placeHistory: PlaceHistory, injector: 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 PlaceRouteGuard {
+export declare namespace EnterPlaceGuard {
     /**
      * This a work around for the fact that an activated route with multiple segments doesn't
      * include the segment params in the paramMap as well as each segment returns an empty

package/lib/place/visit.d.ts CHANGED Viewed

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

package/package.json CHANGED Viewed

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

package/schematics/place-routes/place-builder.js CHANGED Viewed

@@ -87,7 +87,6 @@ class PlaceBuilder {
                 });
             });
         });
-        placeDefs.sort((a, b) => a.order - b.order);
         const rootPlaces = this.buildPlaceHierarchy(placeDefs);
         return placeDefs;
     }

package/schematics/place-routes/place-builder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"place-builder.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-builder.ts"],"names":[],"mappings":"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~~SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5C,~~MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACvD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,mBAAmB,CAAC,SAAqB;QAC/C,MAAM,YAAY,GAAe,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC/E,MAAM,WAAW,GAAe,EAAE,CAAC;QACnC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACvB,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACtB,MAAM,aAAa,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC3C,IAAI,CAAC,aAAa,EAAE;oBAClB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,cAAc,qBAAqB,CAAC,CAAC,cAAc,uBAAuB,CAAC,CAAC;iBAClG;gBACD,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAChC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;~~AA9HD~~,~~oCA8HC~~"}
1	+ {"version":3,"file":"place-builder.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-builder.ts"],"names":[],"mappings":"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"}

package/schematics/place-routes/place-class-scanner.d.ts CHANGED Viewed

@@ -12,6 +12,7 @@ export declare class PlaceClassScanner {
     createDefinition(moduleImportPath: string): PlaceDef;
     protected getPlaceOptions(): PlaceDef.Options;
     protected getChildren(): PlaceDef.ChildRef[];
+    protected getDefaultChild(): string;
     getChildRefFor(componentClassName: string): PlaceDef.ChildRef;
     private extractChildComponentClassNames;
     protected getRouteIdParameter(): PlaceClassScanner.RouteParameterInfo;

package/schematics/place-routes/place-class-scanner.js CHANGED Viewed

@@ -35,7 +35,7 @@ class PlaceClassScanner {
         }
     }
     createDefinition(moduleImportPath) {
-        return new place_def_1.PlaceDef(this.sourceFile.getFilePath(), moduleImportPath, this.classDecl.getName(), this.getPlaceOptions(), this.getRouteIdParameter(), this.getRouteParameters(), this.getChildren());
+        return new place_def_1.PlaceDef(this.sourceFile.getFilePath(), moduleImportPath, this.classDecl.getName(), this.getPlaceOptions(), this.getRouteIdParameter(), this.getRouteParameters(), this.getChildren(), this.getDefaultChild());
     }
     getPlaceOptions() {
         // const args = this.placeAnnotation.getArguments();
@@ -45,7 +45,6 @@ class PlaceClassScanner {
         return PlaceClassScanner.getOptionsArg(this.placeAnnotation, {
             title: '',
             path: '',
-            order: -1,
             data: null,
             authenticate: 'true'
         }, {
@@ -59,12 +58,18 @@ class PlaceClassScanner {
         if (children) {
             const initialiser = children.getStructure().initializer;
             const componentClassNames = this.extractChildComponentClassNames(initialiser);
+            // FIXME: Check for duplicates
             return componentClassNames.map(componentClassName => this.getChildRefFor(componentClassName));
         }
         else {
             return [];
         }
     }
+    getDefaultChild() {
+        const literal = PlaceClassScanner.getObjectLiteralArgument(this.placeAnnotation, 0);
+        const defaultChild = literal.getProperty('defaultChild');
+        return defaultChild ? defaultChild.getStructure().initializer : null;
+    }
     getChildRefFor(componentClassName) {
         const importDecl = this.sourceFile.getImportDeclarations().find(d => {
             return d.getNamedImports().map(i => i.getText()).includes(componentClassName);

package/schematics/place-routes/place-class-scanner.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"place-class-scanner.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-class-scanner.ts"],"names":[],"mappings":";;;;;;;;~~AACA~~,0EAA2E;AAC3E,uCASkB;AAClB,2CAAuC;AAEvC,SAAS,eAAe,CAAC,IAAU,EAAE,IAAY;IAC/C,OAAO,IAAI,CAAC,OAAO,EAAE,KAAK,qBAAU,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,2FAA2F;AACtL,CAAC;AAED,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,MAAa,iBAAiB;IAI5B,YAA6B,UAAsB,EAAmB,SAA2B,EAAW,OAAyB;QAAxG,eAAU,GAAV,UAAU,CAAY;QAAmB,cAAS,GAAT,SAAS,CAAkB;QAAW,YAAO,GAAP,OAAO,CAAkB;QACnI,SAAS,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE;YAC9B,IAAI,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;gBACnC,IAAI,CAAC,eAAe,GAAG,IAAiB,CAAC;gBACzC,sDAAsD;gBACtD,OAAO,IAAI,CAAC;aACb;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,OAAO,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,QAA2C;QACjD,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YAClB,QAAQ,CAAC,IAAI,CAAC,CAAC;SAChB;IACH,CAAC;IAED,gBAAgB,CAAC,gBAAwB;QACvC,OAAO,IAAI,oBAAQ,CACjB,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,EAC7B,gBAAgB,EAChB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EACxB,IAAI,CAAC,eAAe,EAAE,EACtB,IAAI,CAAC,mBAAmB,EAAE,EAC1B,IAAI,CAAC,kBAAkB,EAAE,EACzB,IAAI,CAAC,WAAW,EAAE,~~CACnB~~,CAAC;IACJ,CAAC;IAES,eAAe;QACvB,oDAAoD;QACpD,2BAA2B;QAC3B,4EAA4E;QAC5E,IAAI;QACJ,OAAO,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE;YAC3D,KAAK,EAAE,EAAE;YACT,IAAI,EAAE,EAAE;YACR,~~KAAK,EAAE,CAAC,CAAC;YACT,~~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~~AA3ID~~,~~8CA2IC~~;AAED,WAAiB,iBAAiB;IAEhC,SAAgB,wBAAwB,CAAC,UAAqB,EAAE,QAAgB;QAC9E,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,MAAM,GAAG,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,kCAAuB,EAAE;YAC/E,OAAO,IAAI,CAAC,QAAQ,CAA4B,CAAC;SAClD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IANe,0CAAwB,2BAMvC,CAAA;IAED,SAAgB,aAAa,CAAe,UAAqB,EAAE,QAAW,EAAE,UAAmD;QACjI,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,IAAI;KACf;QACC,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QACrF,IAAI,CAAC,qBAAqB,EAAE;YAC1B,IAAI,OAAO,CAAC,QAAQ,EAAE;gBACpB,OAAO,CAAC,KAAK,CAAC,2CAA2C,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC,CAAC;aAC1G;YACD,OAAO,QAAQ,CAAC;SACjB;aAAM;YACL,OAAO,qBAAqB,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAChE,MAAM,SAAS,GAAG,CAAC,CAAC,YAAY,EAAiC,CAAC;gBAClE,yBAAY,MAAM,IAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,WAAqB,IAAG;YAC1E,CAAC,oBAAO,QAAQ,EAAG,CAAC;SACrB;IACH,CAAC;IAhBe,+BAAa,gBAgB5B,CAAA;IAED,MAAa,kBAAkB;QAK7B,YAA6B,EAAU,EAAW,QAA6B;YAAlD,OAAE,GAAF,EAAE,CAAQ;YAAW,aAAQ,GAAR,QAAQ,CAAqB;YAC7E,MAAM,IAAI,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAc,CAAC;YACpD,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,CAAC,OAAO,EAAE,0CAA0C,IAAI,EAAE,CAAC,CAAC;aACjG;YACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC;YACxC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;QAGD,IAAI,aAAa;YACf,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,oBAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QACtF,CAAC;QAGD,IAAI,SAAS;YACX,OAAO,oBAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,QAAQ;YACV,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;QACrE,CAAC;KACF;IAZC;QADC,aAAO,EAAE;2DAGT;IAGD;QADC,aAAO,EAAE;uDAGT;IAvBU,oCAAkB,qBA4B9B,CAAA;AACH,CAAC,EAzDgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAyDjC"}
1	+ {"version":3,"file":"place-class-scanner.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-class-scanner.ts"],"names":[],"mappings":"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"}

package/schematics/place-routes/place-def.d.ts CHANGED Viewed

@@ -9,8 +9,9 @@ export declare class PlaceDef {
     readonly routeDef: PlaceDef.Parameter;
     readonly routeParameters: PlaceDef.Parameter[];
     readonly childRefs: PlaceDef.ChildRef[];
+    readonly defaultChildComponentClass: string;
     private parent;
-    constructor(sourceFilePath: string, importPath: string, componentClass: string, properties: PlaceDef.Options, routeDef: PlaceDef.Parameter, routeParameters: PlaceDef.Parameter[], childRefs: PlaceDef.ChildRef[]);
+    constructor(sourceFilePath: string, importPath: string, componentClass: string, properties: PlaceDef.Options, routeDef: PlaceDef.Parameter, routeParameters: PlaceDef.Parameter[], childRefs: PlaceDef.ChildRef[], defaultChildComponentClass: string);
     readonly path: string;
     readonly routeIdentifier: PlaceDef.Parameter;
     readonly fullPath: string;
@@ -18,7 +19,6 @@ export declare class PlaceDef {
     getPlaceDestinationCreateVisitMethod(): string;
     getPlaceDestinationVisitConstructor(): string;
     readonly placeName: string;
-    readonly order: number;
     setParent(placeDef: PlaceDef): void;
     isChild(): boolean;
     readonly activateGuardNames: string[];
@@ -27,11 +27,12 @@ export declare class PlaceDef {
     readonly authenticate: boolean;
     readonly children: PlaceDef[];
     getRouteTemplate(): string;
+    getChildRouteTemplates(): string[];
+    readonly defaultChildRef: PlaceDef;
 }
 export declare namespace PlaceDef {
     interface Options {
         path: string;
-        order: number;
         data: object;
         authenticate: string;
     }

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

@@ -6,10 +6,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const pectin_1 = require("@coolon/pectin");
 const src_1 = require("@typescript-plus/fast-memoize-decorator/dist/src");
 const place_class_scanner_1 = require("./place-class-scanner");
 class PlaceDef {
-    constructor(sourceFilePath, importPath, componentClass, properties, routeDef, routeParameters, childRefs) {
+    constructor(sourceFilePath, importPath, componentClass, properties, routeDef, routeParameters, childRefs, defaultChildComponentClass) {
         this.sourceFilePath = sourceFilePath;
         this.importPath = importPath;
         this.componentClass = componentClass;
@@ -17,6 +18,7 @@ class PlaceDef {
         this.routeDef = routeDef;
         this.routeParameters = routeParameters;
         this.childRefs = childRefs;
+        this.defaultChildComponentClass = defaultChildComponentClass;
     }
     get path() {
         return PlaceDef.stripEnclosingQuotes(this.properties.path);
@@ -46,7 +48,7 @@ class PlaceDef {
             parameterNames.push(this.routeIdentifier.parameterName);
         }
         if (this.routeParameters && this.routeParameters.length > 0) {
-            parameterNames.push("visitParams");
+            parameterNames.push('visitParams');
         }
         return `createVisit(${this.getPlaceDestinationParameterArg('visitParams')}): Visit {
       return new ${this.componentClass}Visit(${parameterNames.join(', ')});
@@ -58,7 +60,7 @@ class PlaceDef {
             parameterNames.push(this.routeIdentifier.parameterName);
         }
         if (this.routeParameters && this.routeParameters.length > 0) {
-            parameterNames.push("...visitParams");
+            parameterNames.push('...visitParams');
         }
         return `constructor(${this.getPlaceDestinationParameterArg('visitParams')}) {
       super(PlaceComponent.getDefinition(${this.componentClass}), {${parameterNames.join(', ')}});
@@ -68,9 +70,6 @@ class PlaceDef {
         const s = this.componentClass.replace(/Component$/, '');
         return s.charAt(0).toLowerCase() + s.slice(1);
     }
-    get order() {
-        return this.properties.order;
-    }
     setParent(placeDef) {
         this.parent = placeDef;
     }
@@ -83,7 +82,7 @@ class PlaceDef {
             activateGuards.push('AuthGuard');
         }
         if (this.requiresRouteGuard()) {
-            activateGuards.push('PlaceRouteGuard');
+            activateGuards.push('EnterPlaceGuard');
         }
         return activateGuards;
     }
@@ -100,29 +99,42 @@ class PlaceDef {
         return this.childRefs.map(cr => cr.placeDef);
     }
     getRouteTemplate() {
-        return this.routeIdentifier ? `{
-    path: "${this.path}",
-    redirectTo: "${this.path}/"
-  },
-  {
-    path: "${this.fullPath}",
-    component: ${this.componentClass},
-    canActivate: [${this.activateGuardNames.join(', ')}],
-    canDeactivate: [LeavePlaceGuard],
-    children:[
-      ${this.children.map(c => c.getRouteTemplate()).join(',\n')}
-    ],
-    data: { placeOrder: ${this.order} }
-  }` : `{
+        const bits = [];
+        if (this.routeIdentifier) {
+            bits.push(`{path: "${this.path}", redirectTo: "${this.path}/"},`);
+        }
+        bits.push(`{
     path: "${this.fullPath}",
     component: ${this.componentClass},
     canActivate: [${this.activateGuardNames.join(', ')}],
     canDeactivate: [LeavePlaceGuard],
     children:[
-      ${this.children.map(c => c.getRouteTemplate()).join(',\n')}
-    ],
-    data: { placeOrder: ${this.order} }
-  }`;
+      ${this.getChildRouteTemplates().join(', ')}
+    ]
+  }`);
+        return bits.join('\n');
+    }
+    getChildRouteTemplates() {
+        if (this.defaultChildRef) {
+            const redirectTo = this.defaultChildRef.routeIdentifier ? `${this.defaultChildRef.path}/` : this.defaultChildRef.path;
+            return [
+                `{path:"", redirectTo:"${redirectTo}", pathMatch:"full"}`,
+                ...this.children.map(c => c.getRouteTemplate())
+            ];
+        }
+        else {
+            return this.children.map(c => c.getRouteTemplate());
+        }
+    }
+    get defaultChildRef() {
+        if (this.defaultChildComponentClass) {
+            const placeDef = this.children.find(c => c.componentClass === this.defaultChildComponentClass);
+            if (!placeDef) {
+                pectin_1.lang.illegalState(`defaultChild is not a known child of this place, should be one of ${this.children.map(c => c.componentClass)}, got ${this.defaultChildComponentClass}`);
+            }
+            return placeDef;
+        }
+        return null;
     }
 }
 __decorate([
@@ -137,6 +149,9 @@ __decorate([
 __decorate([
     src_1.Memoize()
 ], PlaceDef.prototype, "routeModelName", null);
+__decorate([
+    src_1.Memoize()
+], PlaceDef.prototype, "defaultChildRef", null);
 exports.PlaceDef = PlaceDef;
 (function (PlaceDef) {
     function scan(sourceFile, classDecl, context) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"place-def.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-def.ts"],"names":[],"mappings":";;;;;;;;AACA,0EAA2E;AAE3E,+DAA0D;AAE1D,MAAa,QAAQ;IAInB,YACW,cAAsB,EACtB,UAAkB,EAClB,cAAsB,EACtB,UAA4B,EAC5B,QAA4B,EAC5B,eAAqC,EACrC,SAA8B;~~QAN9B~~,mBAAc,GAAd,cAAc,CAAQ;QACtB,eAAU,GAAV,UAAU,CAAQ;QAClB,mBAAc,GAAd,cAAc,CAAQ;QACtB,eAAU,GAAV,UAAU,CAAkB;QAC5B,aAAQ,GAAR,QAAQ,CAAoB;QAC5B,oBAAe,GAAf,eAAe,CAAsB;QACrC,cAAS,GAAT,SAAS,CAAqB;~~IAEzC~~,CAAC;IAGD,IAAI,IAAI;QACN,OAAO,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC7B,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC;IACd,CAAC;IAED,+BAA+B,CAAC,~~IAAW~~;~~QACzC~~,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,aAAa,IAAI,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;SACrF;QACD,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,aAAa,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvF,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,QAAQ,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrD;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,oCAAoC;QAClC,MAAM,cAAc,GAAa,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;SACzD;QACD,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3D,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,~~CAAA~~;~~SACnC~~;QAED,OAAO,eAAe,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC;mBAC1D,IAAI,CAAC,cAAc,SAAS,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;MAClE,~~CAAA~~;~~IACJ~~,CAAC;IAED,mCAAmC;QACjC,MAAM,cAAc,GAAa,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;SACzD;QAED,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3D,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,~~CAAA~~;~~SACtC~~;QAED,OAAO,eAAe,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC;2CAClC,IAAI,CAAC,cAAc,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;MACxF,~~CAAA~~;~~IACJ~~,CAAC;IAGD,IAAI,SAAS;QACX,MAAM,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACxD,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,~~IAAI,KAAK;QACP,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED,~~SAAS,CAAC,QAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;IACzB,CAAC;IAED,OAAO;QACL,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAGD,IAAI,kBAAkB;QACpB,MAAM,cAAc,GAAG,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAClC;QACD,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE;YAC7B,cAAc,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SACxC;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;IAEO,kBAAkB;QACxB,OAAO,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IACjE,CAAC;IAGD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,KAAK,MAAM,CAAC;IACjD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,gBAAgB;QACd,~~OAAO~~,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC~~;aACrB~~,IAAI,CAAC,IAAI;~~mBACH~~,IAAI,CAAC,IAAI~~;;;aAGf~~,IAAI,CAAC,QAAQ;iBACT,IAAI,CAAC,cAAc;oBAChB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;;;QAG9C,IAAI,CAAC,~~QAAQ~~,CAAC,~~GAAG~~,CAAC,CAAC,CAAC,~~EAAE~~,CAAC,CAAC,CAAC,~~gBAAgB~~,EAAE,CAAC,CAAC,~~IAAI~~,CAAC,~~KAAK~~,CAAC~~;;0BAEtC~~,IAAI,CAAC,~~KAAK;IAChC~~,CAAC,CAAC,CAAC~~;aACM~~,IAAI,CAAC,~~QAAQ;iBACT~~,IAAI,CAAC,~~cAAc~~;~~oBAChB~~,IAAI,CAAC,~~kBAAkB~~,CAAC,~~IAAI~~,CAAC,~~IAAI~~,CAAC~~;;;QAG9C~~,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,~~KAAK~~,CAAC~~;;0BAEtC~~,IAAI,CAAC,KAAK;~~IAChC~~,CAAC;~~IACH~~,CAAC;~~CAGF~~;~~AAnIC~~;IADC,aAAO,EAAE;oCAGT;AAwDD;IADC,aAAO,EAAE;yCAIT;~~AAeD~~;IADC,aAAO,EAAE;kDAUT;AAOD;IADC,aAAO,EAAE;8CAGT;~~AA9GH~~,~~4BAmJC~~;AAED,WAAiB,QAAQ;~~IAevB~~,SAAgB,IAAI,CAAC,UAAsB,EAAE,SAA2B,EAAE,OAAyB;QACjG,OAAO,IAAI,uCAAiB,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAFe,aAAI,OAEnB,CAAA;IAED,SAAgB,oBAAoB,CAAC,KAAa;QAChD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;QACrD,+CAA+C;QAC/C,OAAO,MAAM,CAAC;IAChB,CAAC;IAJe,6BAAoB,uBAInC,CAAA;IAED,MAAa,QAAQ;QAGnB,YAAqB,QAAgB,EAAW,cAAsB;YAAjD,aAAQ,GAAR,QAAQ,CAAQ;YAAW,mBAAc,GAAd,cAAc,CAAQ;QACtE,CAAC;QAED,IAAI,QAAQ;YACV,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;QAED,OAAO,CAAC,SAAqB;YAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,cAAc,KAAK,IAAI,CAAC,cAAc,CAAC,CAAC;YACrH,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;KACF;IAdY,iBAAQ,WAcpB,CAAA;AAGH,CAAC,~~EA1CgB~~,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,~~QA0CxB~~"}
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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"}

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

@@ -10,7 +10,7 @@
 //    }
 // }
-import { PlaceRouteGuard } from '@coolon/angular-ui-powerups';
+import { EnterPlaceGuard } from '@coolon/angular-ui-powerups';
 import { LeavePlaceGuard } from '@coolon/angular-ui-powerups';
 import { InteractionGuard } from '@coolon/angular-ui-powerups';
 import { NoopComponent } from '@coolon/angular-ui-powerups';

package/styles/styles.scss CHANGED Viewed

@@ -1,5 +1,5 @@
 :root {
-  --angular-ui-powerups-default-padding: var(--default-padding, 18px);
+  --aup-default-padding: var(--default-padding, 18px);
 }
 .dialog-interaction-service {