@coolon/angular-ui-powerups 0.0.37 → 0.0.41

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

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@angular-devkit/core");
+const schematics_1 = require("@angular-devkit/schematics");
+const JSON5 = require("json5");
+const ts_morph_1 = require("ts-morph");
+const place_def_1 = require("./place-def");
+class PlaceBuilder {
+    constructor(options, workspace, context) {
+        this.options = options;
+        this.context = context;
+        this.projectName = options.project;
+        this.workspaceProject = workspace.projects[this.projectName];
+        this.projectType = this.workspaceProject.projectType === 'application' ? 'app' : 'lib';
+        this.sourceRoot = `${this.workspaceProject.sourceRoot}/${this.projectType}`;
+        this.typescriptProject = this.createTypeScriptProject();
+        this.context.logger.info(`sourceRoot=${this.sourceRoot}`);
+        this.context.logger.info(`projectName=${this.projectName}`);
+        this.context.logger.info(`projectType=${this.projectType}`);
+    }
+    createTypeScriptProject() {
+        // TODO: this barfs if you're not running it from teh project root directory
+        const tsConfigPath = this.workspaceProject.architect.build.options.tsConfig;
+        this.context.logger.info(`loading tsConfig from -> ${tsConfigPath}`);
+        try {
+            return new ts_morph_1.Project({
+                tsConfigFilePath: tsConfigPath
+            });
+        }
+        catch (error) {
+            this.context.logger.error(error.toString());
+            this.context.logger.fatal(`Failed to load typescript project from: ${tsConfigPath} You probably need to specify the --project option?`);
+            throw error;
+        }
+    }
+    process(tree) {
+        const placeRoots = [];
+        tree.getDir(this.sourceRoot).visit((filePath, entry) => {
+            if (filePath.endsWith('places.json') || filePath.endsWith('places.json5')) {
+                const dir = filePath.substr(0, filePath.lastIndexOf('/'));
+                placeRoots.push({ dir, config: JSON5.parse(entry.content.toString('utf-8')) });
+            }
+        });
+        const rules = placeRoots.map(placeRoot => {
+            const placeDefs = this.extractPlaceDefinitions(tree, placeRoot.dir);
+            return this.renderTemplates(placeRoot, placeDefs, tree);
+        });
+        return schematics_1.chain(rules);
+    }
+    renderTemplates(placeRoot, placeDefs, tree) {
+        // this.context.logger.info(`${this.workspaceProject.sourceRoot}/${this.projectType}`);
+        // this.context.logger.info(placeRoot.dir);
+        const files = schematics_1.apply(schematics_1.url('./templates'), [
+            schematics_1.applyTemplates(Object.assign({}, this.options, { config: placeRoot.config, placeDefs }, core_1.strings)),
+            schematics_1.move(`${placeRoot.dir}`),
+            // @see https://github.com/angular/angular-cli/issues/11337#issuecomment-448259549
+            schematics_1.forEach((fileEntry) => {
+                this.context.logger.info(fileEntry.path);
+                if (tree.exists(fileEntry.path)) {
+                    tree.overwrite(fileEntry.path, fileEntry.content);
+                }
+                return fileEntry;
+            })
+        ]);
+        return schematics_1.mergeWith(files);
+    }
+    extractPlaceDefinitions(tree, placeRoot) {
+        const importPrefix = `./${placeRoot}`;
+        const placeDefs = [];
+        this.context.logger.info(`Scanning sources in -> ${placeRoot}`);
+        tree.getDir(placeRoot).visit(filePath => {
+            if (!filePath.endsWith('.ts') || filePath.endsWith('.spec.ts')) {
+                return;
+            }
+            const content = tree.read(filePath);
+            if (!content) {
+                return;
+            }
+            const sourceFile = this.typescriptProject.getSourceFileOrThrow(`./${filePath}`);
+            const imports = sourceFile.getImportDeclarations();
+            sourceFile.getClasses().forEach((classDecl) => {
+                place_def_1.PlaceDef.scan(sourceFile, classDecl, this.context).onMatch(result => {
+                    const moduleImportPath = `.${filePath.substr(placeRoot.length, filePath.length - placeRoot.length - '.ts'.length)}`;
+                    const definition = result.createDefinition(moduleImportPath);
+                    this.context.logger.info(`${classDecl.getName()}(route: /${definition.fullPath}) -> ${moduleImportPath}`);
+                    placeDefs.push(definition);
+                });
+            });
+        });
+        placeDefs.sort((a, b) => a.order - b.order);
+        const rootPlaces = this.buildPlaceHierarchy(placeDefs);
+        return placeDefs;
+    }
+    buildPlaceHierarchy(placeDefs) {
+        const parentPlaces = placeDefs.filter(d => d.childRefs.length > 0);
+        const childPlaces = [];
+        parentPlaces.forEach(p => {
+            p.childRefs.forEach(c => {
+                const childPlaceDef = c.resolve(placeDefs);
+                if (!childPlaceDef) {
+                    throw new Error(`${p.componentClass} references child ${c.componentClass} which isn't a @Place`);
+                }
+                childPlaces.push(childPlaceDef);
+            });
+        });
+    }
+}
+exports.PlaceBuilder = PlaceBuilder;
+//# sourceMappingURL=place-builder.js.map

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

@@ -0,0 +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/{scanner.d.ts → place-class-scanner.d.ts}

@@ -1,16 +1,20 @@
 import { SchematicContext } from '@angular-devkit/schematics';
-import { ClassDeclaration, Decorator, ObjectLiteralExpression, PropertyDeclaration } from 'ts-morph';
+import { ClassDeclaration, Decorator, ObjectLiteralExpression, PropertyDeclaration, SourceFile } from 'ts-morph';
 import { PlaceDef } from './place-def';
-export declare class Scanner {
+export declare class PlaceClassScanner {
+    private readonly sourceFile;
     private readonly classDecl;
     readonly context: SchematicContext;
     private placeAnnotation;
-    constructor(classDecl: ClassDeclaration, context: SchematicContext);
+    constructor(sourceFile: SourceFile, classDecl: ClassDeclaration, context: SchematicContext);
     isPlace(): boolean;
-    onMatch(callback: (scan: Scanner) => void): void;
+    onMatch(callback: (scan: PlaceClassScanner) => void): void;
     createDefinition(moduleImportPath: string): PlaceDef;
     protected getPlaceOptions(): PlaceDef.Options;
-    protected getRouteIdParameter(): Scanner.RouteParameterInfo;
+    protected getChildren(): PlaceDef.ChildRef[];
+    getChildRefFor(componentClassName: string): PlaceDef.ChildRef;
+    private extractChildComponentClassNames;
+    protected getRouteIdParameter(): PlaceClassScanner.RouteParameterInfo;
     protected getRouteParameters(): PlaceDef.Parameter[];
     private getValueModelRouteProperties;
     private getListModelRouteProperties;
@@ -19,7 +23,7 @@ export declare class Scanner {
         property: PropertyDeclaration;
     }[];
 }
-export declare namespace Scanner {
+export declare namespace PlaceClassScanner {
     function getObjectLiteralArgument(annotation: Decorator, position: number): ObjectLiteralExpression;
     function getOptionsArg<T extends {}>(annotation: Decorator, defaults: T, options?: {
         position: number;

package/schematics/place-routes/{scanner.js → place-class-scanner.js}

@@ -13,8 +13,9 @@ function isDecoratorNode(node, name) {
     return node.getKind() === ts_morph_1.SyntaxKind.Decorator && node.getText().startsWith(`${name}(`); // NOTE: I'm only supporting the @Decorator(...) style of usage (i.e. decorator factories).
 }
 const ROUTE_PROPERTY_REGEX = /.*(ListModel|ValueModel)<(.*)>/;
-class Scanner {
-    constructor(classDecl, context) {
+class PlaceClassScanner {
+    constructor(sourceFile, classDecl, context) {
+        this.sourceFile = sourceFile;
         this.classDecl = classDecl;
         this.context = context;
         classDecl.forEachChild((node) => {
@@ -34,15 +35,14 @@ class Scanner {
         }
     }
     createDefinition(moduleImportPath) {
-        this.getRouteIdParameter();
-        return new place_def_1.PlaceDef(moduleImportPath, this.classDecl.getName(), this.getPlaceOptions(), this.getRouteIdParameter(), this.getRouteParameters());
+        return new place_def_1.PlaceDef(this.sourceFile.getFilePath(), moduleImportPath, this.classDecl.getName(), this.getPlaceOptions(), this.getRouteIdParameter(), this.getRouteParameters(), this.getChildren());
     }
     getPlaceOptions() {
         // const args = this.placeAnnotation.getArguments();
         // if (args.length !== 1) {
         //   console.error('@Place() accepts a single Options argument. got', args);
         // }
-        return Scanner.getOptionsArg(this.placeAnnotation, {
+        return PlaceClassScanner.getOptionsArg(this.placeAnnotation, {
             title: '',
             path: '',
             order: -1,
@@ -53,15 +53,40 @@ class Scanner {
             required: true
         });
     }
+    getChildren() {
+        const literal = PlaceClassScanner.getObjectLiteralArgument(this.placeAnnotation, 0);
+        const children = literal.getProperty('children');
+        if (children) {
+            const initialiser = children.getStructure().initializer;
+            const componentClassNames = this.extractChildComponentClassNames(initialiser);
+            return componentClassNames.map(componentClassName => this.getChildRefFor(componentClassName));
+        }
+        else {
+            return [];
+        }
+    }
+    getChildRefFor(componentClassName) {
+        const importDecl = this.sourceFile.getImportDeclarations().find(d => {
+            return d.getNamedImports().map(i => i.getText()).includes(componentClassName);
+        });
+        return new place_def_1.PlaceDef.ChildRef(importDecl.getModuleSpecifierSourceFile().getFilePath(), componentClassName);
+    }
+    extractChildComponentClassNames(initialiser) {
+        return initialiser.replace('[', '')
+            .replace(']', '')
+            .trim()
+            .split(',')
+            .map(s => s.trim());
+    }
     getRouteIdParameter() {
         const routeProperties = this.getDecoratedProperties('@RouteId');
         if (routeProperties.length === 1) {
             const route = routeProperties[0];
-            const routeOptions = Scanner.getOptionsArg(route.decorator, { as: '' }, {
+            const routeOptions = PlaceClassScanner.getOptionsArg(route.decorator, { as: '' }, {
                 position: 1,
                 required: false
             });
-            return new Scanner.RouteParameterInfo(routeOptions.as, route.property);
+            return new PlaceClassScanner.RouteParameterInfo(routeOptions.as, route.property);
         }
         else if (routeProperties.length > 1) {
             this.context.logger.error(`There an only be one @RouteId(), got ${routeProperties.length}`);
@@ -74,21 +99,21 @@ class Scanner {
     getValueModelRouteProperties() {
         return this.getDecoratedProperties('@RouteParameter')
             .map(p => {
-            const routeOptions = Scanner.getOptionsArg(p.decorator, { as: p.property.getName() }, {
+            const routeOptions = PlaceClassScanner.getOptionsArg(p.decorator, { as: p.property.getName() }, {
                 position: 1,
                 required: false
             });
-            return new Scanner.RouteParameterInfo(routeOptions.as, p.property);
+            return new PlaceClassScanner.RouteParameterInfo(routeOptions.as, p.property);
         });
     }
     getListModelRouteProperties() {
         return this.getDecoratedProperties('@RouteParameterList')
             .map(p => {
-            const routeOptions = Scanner.getOptionsArg(p.decorator, { as: p.property.getName() }, {
+            const routeOptions = PlaceClassScanner.getOptionsArg(p.decorator, { as: p.property.getName() }, {
                 position: 1,
                 required: false
             });
-            return new Scanner.RouteParameterInfo(routeOptions.as, p.property);
+            return new PlaceClassScanner.RouteParameterInfo(routeOptions.as, p.property);
         });
     }
     getDecoratedProperties(annotation) {
@@ -108,8 +133,8 @@ class Scanner {
         }).filter(r => !!r);
     }
 }
-exports.Scanner = Scanner;
-(function (Scanner) {
+exports.PlaceClassScanner = PlaceClassScanner;
+(function (PlaceClassScanner) {
     function getObjectLiteralArgument(annotation, position) {
         const args = annotation.getArguments();
         if (args.length > position && args[position] instanceof ts_morph_1.ObjectLiteralExpression) {
@@ -117,7 +142,7 @@ exports.Scanner = Scanner;
         }
         return null;
     }
-    Scanner.getObjectLiteralArgument = getObjectLiteralArgument;
+    PlaceClassScanner.getObjectLiteralArgument = getObjectLiteralArgument;
     function getOptionsArg(annotation, defaults, options = {
         position: 0,
         required: true
@@ -136,7 +161,7 @@ exports.Scanner = Scanner;
             }, Object.assign({}, defaults));
         }
     }
-    Scanner.getOptionsArg = getOptionsArg;
+    PlaceClassScanner.getOptionsArg = getOptionsArg;
     class RouteParameterInfo {
         constructor(as, property) {
             this.as = as;
@@ -165,6 +190,6 @@ exports.Scanner = Scanner;
     __decorate([
         src_1.Memoize()
     ], RouteParameterInfo.prototype, "modelName", null);
-    Scanner.RouteParameterInfo = RouteParameterInfo;
-})(Scanner = exports.Scanner || (exports.Scanner = {}));
-//# sourceMappingURL=scanner.js.map
+    PlaceClassScanner.RouteParameterInfo = RouteParameterInfo;
+})(PlaceClassScanner = exports.PlaceClassScanner || (exports.PlaceClassScanner = {}));
+//# sourceMappingURL=place-class-scanner.js.map

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

@@ -0,0 +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

@@ -1,13 +1,16 @@
 import { SchematicContext } from '@angular-devkit/schematics';
-import { ClassDeclaration } from 'ts-morph';
-import { Scanner } from './scanner';
+import { ClassDeclaration, SourceFile } from 'ts-morph';
+import { PlaceClassScanner } from './place-class-scanner';
 export declare class PlaceDef {
+    readonly sourceFilePath: string;
     readonly importPath: string;
     readonly componentClass: string;
     readonly properties: PlaceDef.Options;
     readonly routeDef: PlaceDef.Parameter;
     readonly routeParameters: PlaceDef.Parameter[];
-    constructor(importPath: string, componentClass: string, properties: PlaceDef.Options, routeDef: PlaceDef.Parameter, routeParameters: PlaceDef.Parameter[]);
+    readonly childRefs: PlaceDef.ChildRef[];
+    private parent;
+    constructor(sourceFilePath: string, importPath: string, componentClass: string, properties: PlaceDef.Options, routeDef: PlaceDef.Parameter, routeParameters: PlaceDef.Parameter[], childRefs: PlaceDef.ChildRef[]);
     readonly path: string;
     readonly routeIdentifier: PlaceDef.Parameter;
     readonly fullPath: string;
@@ -15,10 +18,14 @@ export declare class PlaceDef {
     getPlaceRouterGoRouteParams(): string;
     readonly placeName: string;
     readonly order: number;
+    setParent(placeDef: PlaceDef): void;
+    isChild(): boolean;
     readonly activateGuardNames: string[];
     private requiresRouteGuard;
     readonly routeModelName: string;
     readonly authenticate: boolean;
+    readonly children: PlaceDef[];
+    getRouteTemplate(): string;
 }
 export declare namespace PlaceDef {
     interface Options {
@@ -32,6 +39,14 @@ export declare namespace PlaceDef {
         modelName: string;
         typeName: string;
     }
-    function scan(classDecl: ClassDeclaration, context: SchematicContext): Scanner;
+    function scan(sourceFile: SourceFile, classDecl: ClassDeclaration, context: SchematicContext): PlaceClassScanner;
     function stripEnclosingQuotes(value: string): string;
+    class ChildRef {
+        readonly filePath: string;
+        readonly componentClass: string;
+        private _placeDef;
+        constructor(filePath: string, componentClass: string);
+        readonly placeDef: PlaceDef;
+        resolve(placeDefs: PlaceDef[]): PlaceDef;
+    }
 }

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

@@ -7,14 +7,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const src_1 = require("@typescript-plus/fast-memoize-decorator/dist/src");
-const scanner_1 = require("./scanner");
+const place_class_scanner_1 = require("./place-class-scanner");
 class PlaceDef {
-    constructor(importPath, componentClass, properties, routeDef, routeParameters) {
+    constructor(sourceFilePath, importPath, componentClass, properties, routeDef, routeParameters, childRefs) {
+        this.sourceFilePath = sourceFilePath;
         this.importPath = importPath;
         this.componentClass = componentClass;
         this.properties = properties;
         this.routeDef = routeDef;
         this.routeParameters = routeParameters;
+        this.childRefs = childRefs;
     }
     get path() {
         return PlaceDef.stripEnclosingQuotes(this.properties.path);
@@ -60,6 +62,12 @@ class PlaceDef {
     get order() {
         return this.properties.order;
     }
+    setParent(placeDef) {
+        this.parent = placeDef;
+    }
+    isChild() {
+        return !!this.parent;
+    }
     get activateGuardNames() {
         const activateGuards = [];
         if (this.authenticate) {
@@ -79,6 +87,34 @@ class PlaceDef {
     get authenticate() {
         return this.properties.authenticate === 'true';
     }
+    get children() {
+        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} }
+  }` : `{
+    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} }
+  }`;
+    }
 }
 __decorate([
     src_1.Memoize()
@@ -94,8 +130,8 @@ __decorate([
 ], PlaceDef.prototype, "routeModelName", null);
 exports.PlaceDef = PlaceDef;
 (function (PlaceDef) {
-    function scan(classDecl, context) {
-        return new scanner_1.Scanner(classDecl, context);
+    function scan(sourceFile, classDecl, context) {
+        return new place_class_scanner_1.PlaceClassScanner(sourceFile, classDecl, context);
     }
     PlaceDef.scan = scan;
     function stripEnclosingQuotes(value) {
@@ -104,5 +140,19 @@ exports.PlaceDef = PlaceDef;
         return cooked;
     }
     PlaceDef.stripEnclosingQuotes = stripEnclosingQuotes;
+    class ChildRef {
+        constructor(filePath, componentClass) {
+            this.filePath = filePath;
+            this.componentClass = componentClass;
+        }
+        get placeDef() {
+            return this._placeDef;
+        }
+        resolve(placeDefs) {
+            this._placeDef = placeDefs.find(d => d.sourceFilePath === this.filePath && d.componentClass === this.componentClass);
+            return this._placeDef;
+        }
+    }
+    PlaceDef.ChildRef = ChildRef;
 })(PlaceDef = exports.PlaceDef || (exports.PlaceDef = {}));
 //# sourceMappingURL=place-def.js.map

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":";;;;;;;;AACA,0EAA2E;AAE3E,uCAAoC;AAEpC,MAAa,QAAQ;IAEnB,YACW,UAAkB,EAClB,cAAsB,EACtB,UAA4B,EAC5B,QAA4B,EAC5B,eAAqC;QAJrC,eAAU,GAAV,UAAU,CAAQ;QAClB,mBAAc,GAAd,cAAc,CAAQ;QACtB,eAAU,GAAV,UAAU,CAAkB;QAC5B,aAAQ,GAAR,QAAQ,CAAoB;QAC5B,oBAAe,GAAf,eAAe,CAAsB;IAEhD,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,oBAAoB;QAClB,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,IAAI,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;SACjF;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,uBAAuB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC7D;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,2BAA2B;QACzB,MAAM,IAAI,GAAa,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAE1C,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC;SAChD;QAED,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5B,OAAO,sBAAsB,GAAG,QAAQ,SAAS,GAAG,CAAC;SACtD;aAAM;YACL,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;SAC/B;IACH,CAAC;IAGD,IAAI,SAAS;QACX,MAAM,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC7D,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;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;CAEF;AA9EC;IADC,aAAO,EAAE;oCAGT;AA0CD;IADC,aAAO,EAAE;yCAIT;AAOD;IADC,aAAO,EAAE;kDAUT;AAOD;IADC,aAAO,EAAE;8CAGT;AApFH,4BA0FC;AAED,WAAiB,QAAQ;IAevB,SAAgB,IAAI,CAAC,SAA2B,EAAE,OAAyB;QACzE,OAAO,IAAI,iBAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACzC,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;AAGH,CAAC,EA1BgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QA0BxB"}
+{"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 → places.ts.template}

@@ -17,16 +17,19 @@ import { <%= config.authGuard.className %> } from '<%= config.authGuard.importPa
 <% placeDefs.forEach(def => { %>import {<%= def.componentClass %>} from "<%= def.importPath %>";
 <% }); %>
 
-export const routes = [<% placeDefs.forEach(def => { %>
-    <% if (def.routeIdentifier) { %>{
-        path: '<%= def.path %>',
-        redirectTo: '<%= def.path %>/'
-    },<% } %> {
-        path: '<%= def.fullPath %>',
-        component: <%= def.componentClass %>,
-        canActivate: [<%= def.activateGuardNames.join(", ")%>],
-        canDeactivate: [LeavePlaceGuard],
-        data: { placeOrder: <%= def.order %> }
-    },
+export const ROUTES = [<% placeDefs.filter(def=> !def.isChild()).forEach(def => { %>
+    <%= def.getRouteTemplate() %>,
 <% }) %>
 ];
+
+export const ROUTE_PARAMS = {
+  <% placeDefs.forEach(def => { %>
+  <%= def.placeName %>: {
+    component: <%= def.componentClass %>,
+    routeParams(<%=def.getPlaceRouterGoArgs()%>) {
+      return <%=def.getPlaceRouterGoRouteParams()%>;
+    }
+  },
+  <% }) %>
+};
+

package/esm2015/lib/place/i-place-component.js

@@ -1,17 +0,0 @@
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/**
- * @record
- */
-export function IPlaceComponent() { }
-if (false) {
-    /** @type {?} */
-    IPlaceComponent.prototype.activatedRoute;
-    /**
-     * @return {?}
-     */
-    IPlaceComponent.prototype.onPlaceReady = function () { };
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaS1wbGFjZS1jb21wb25lbnQuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9AY29vbG9uL2FuZ3VsYXItdWktcG93ZXJ1cHMvIiwic291cmNlcyI6WyJsaWIvcGxhY2UvaS1wbGFjZS1jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUVBLHFDQUdDOzs7SUFGQyx5Q0FBd0M7Ozs7SUFDeEMseURBQWUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZSB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSVBsYWNlQ29tcG9uZW50IHtcbiAgcmVhZG9ubHkgYWN0aXZhdGVkUm91dGU6IEFjdGl2YXRlZFJvdXRlO1xuICBvblBsYWNlUmVhZHkoKTtcbn1cbiJdfQ==

package/esm2015/lib/place/i-place-service.js

@@ -1,16 +0,0 @@
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/**
- * @record
- */
-export function IPlaceService() { }
-if (false) {
-    /**
-     * @param {?} params
-     * @return {?}
-     */
-    IPlaceService.prototype.notifyRouteParametersChanged = function (params) { };
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaS1wbGFjZS1zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGNvb2xvbi9hbmd1bGFyLXVpLXBvd2VydXBzLyIsInNvdXJjZXMiOlsibGliL3BsYWNlL2ktcGxhY2Utc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBR0EsbUNBT0M7Ozs7OztJQU5DLDZFQUtHIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSVBsYWNlQ29tcG9uZW50IH0gZnJvbSAnLi9pLXBsYWNlLWNvbXBvbmVudCc7XG5pbXBvcnQgeyBSZXNvbHZlZFJvdXRlUGFyYW1ldGVyU25hcHNob3QgfSBmcm9tICcuL3JvdXRlL3Jlc29sdmVkLXJvdXRlLXBhcmFtZXRlci1zbmFwc2hvdCc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSVBsYWNlU2VydmljZSB7XG4gIG5vdGlmeVJvdXRlUGFyYW1ldGVyc0NoYW5nZWQocGFyYW1zOiB7XG4gICAgcGxhY2VDb21wb25lbnQ6IElQbGFjZUNvbXBvbmVudCxcbiAgICBuZXh0OiBSZXNvbHZlZFJvdXRlUGFyYW1ldGVyU25hcHNob3QsXG4gICAgcHJldmlvdXM6IFJlc29sdmVkUm91dGVQYXJhbWV0ZXJTbmFwc2hvdCxcbiAgICB1cGRhdGVSb3V0ZTogYm9vbGVhblxuICB9KTtcbn1cbiJdfQ==

package/esm2015/lib/place/route/resolved-parameter.js

@@ -1,16 +0,0 @@
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/**
- * @record
- * @template T
- */
-export function ResolvedParameter() { }
-if (false) {
-    /** @type {?} */
-    ResolvedParameter.prototype.parameterDef;
-    /** @type {?} */
-    ResolvedParameter.prototype.resolvedValue;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZWQtcGFyYW1ldGVyLmpzIiwic291cmNlUm9vdCI6Im5nOi8vQGNvb2xvbi9hbmd1bGFyLXVpLXBvd2VydXBzLyIsInNvdXJjZXMiOlsibGliL3BsYWNlL3JvdXRlL3Jlc29sdmVkLXBhcmFtZXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQUVBLHVDQUdDOzs7SUFGQyx5Q0FBcUM7O0lBQ3JDLDBDQUFpQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFBhcmFtZXRlckRlZmluaXRpb24gfSBmcm9tICcuL3BhcmFtZXRlci1kZWZpbml0aW9uLmNsYXNzJztcblxuZXhwb3J0IGludGVyZmFjZSBSZXNvbHZlZFBhcmFtZXRlcjxUPiB7XG4gIHBhcmFtZXRlckRlZjogUGFyYW1ldGVyRGVmaW5pdGlvbjxUPjtcbiAgcmVzb2x2ZWRWYWx1ZTogVDtcbn1cbiJdfQ==