igniteui-cli 10.1.0-alpha.0 → 10.1.0-alpha.2

package/lib/templates/IgniteUIForWebComponentsTemplate.d.ts

@@ -19,7 +19,7 @@ export declare class IgniteUIForWebComponentsTemplate implements Template {
     generateConfig(name: string, options: {}): {
         [key: string]: any;
     };
-    registerInProject(projectPath: string, fullName: string, options?: AddTemplateArgs): void;
+    registerInProject(projectPath: string, fullName: string, options?: AddTemplateArgs, defaultPath?: boolean): void;
     getExtraConfiguration(): ControlExtraConfiguration[];
     setExtraConfiguration(extraConfigKeys: {}): void;
     protected getBaseVariables(name: string): {

package/lib/templates/IgniteUIForWebComponentsTemplate.js

@@ -27,21 +27,20 @@ class IgniteUIForWebComponentsTemplate {
         }
         return Object.assign({}, options["extraConfig"], this.getBaseVariables(name));
     }
-    registerInProject(projectPath, fullName, options) {
-        cli_core_1.App.initialize(); // remove after POC
-        const routeModulePath = path.posix.join(`src/app`, `${options.routingModulePath}-routing.ts`);
-        let routingModule;
+    registerInProject(projectPath, fullName, options, defaultPath = false) {
+        if (!options.parentName) {
+            return;
+        }
+        const routeModulePath = options.parentRoutingModulePath;
+        const routingModule = new TypeScriptFileUpdate_1.TypeScriptFileUpdate(path.join(projectPath, routeModulePath));
         if (!(options && options.skipRoute) && cli_core_1.App.container.get(cli_core_1.FS_TOKEN)
             .fileExists(routeModulePath)) {
-            routingModule = new TypeScriptFileUpdate_1.TypeScriptFileUpdate(path.join(projectPath, routeModulePath));
-            routingModule.addRoute(path.join(projectPath, `src/app/${this.folderName(fullName)}/${this.fileName(fullName)}.component.ts`), this.fileName(fullName), cli_core_1.Util.nameFromPath(fullName), options);
-        }
-        if (options.routingModulePath !== "app") {
-            routingModule = new TypeScriptFileUpdate_1.TypeScriptFileUpdate(path.join(projectPath, "src/app/app-routing.ts"));
-            const routingModuleText = routingModule.targetSource.text;
-            const moduleName = options.routingModulePath.split("/")[1];
-            if (routingModuleText.indexOf(moduleName + "-routing") < 0) {
-                routingModule.addRoute(path.join(projectPath, `src/app/${options.routingModulePath}-routing.ts`), this.fileName(`${options.routingModulePath}-routing.ts`), cli_core_1.Util.nameFromPath(`${options.routingModulePath}-routing.ts`), options, options.parentName);
+            if (defaultPath) {
+                routingModule.addRoute("", options.selector, cli_core_1.Util.nameFromPath(fullName), options.routerChildren, undefined);
+            }
+            routingModule.addRoute(this.fileName(fullName), options.selector, cli_core_1.Util.nameFromPath(fullName), options.routerChildren, undefined);
+            if (options.hasChildren) {
+                routingModule.addRoute(this.fileName(`${options.modulePath}-routing.ts`), options.selector, cli_core_1.Util.nameFromPath(`${options.modulePath}-routing.ts`), options.routerChildren, options.importAlias);
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "igniteui-cli",
-  "version": "10.1.0-alpha.0",
+  "version": "10.1.0-alpha.2",
   "description": "CLI tool for creating Ignite UI projects",
   "keywords": [
     "CLI",
@@ -72,8 +72,8 @@
     "all": true
   },
   "dependencies": {
-    "@igniteui/angular-templates": "~14.1.1010-alpha.0",
-    "@igniteui/cli-core": "~10.1.0-alpha.0",
+    "@igniteui/angular-templates": "~14.1.1010-alpha.2",
+    "@igniteui/cli-core": "~10.1.0-alpha.2",
     "chalk": "^2.3.2",
     "fs-extra": "^3.0.1",
     "glob": "^7.1.2",

package/templates/webcomponents/TypeScriptFileUpdate.d.ts

@@ -1,4 +1,3 @@
-import { AddTemplateArgs } from "@igniteui/cli-core";
 import * as ts from "typescript";
 /**
  * Apply various updates to typescript files using AST
@@ -19,15 +18,15 @@ export declare class TypeScriptFileUpdate {
     constructor(targetPath: string);
     /** Applies accumulated transforms, saves and formats the file */
     finalize(): void;
-    addRoute(filePath: string, linkPath: string, linkText: string, options: AddTemplateArgs, parentName: string, routesVariable?: string): void;
+    addRoute(path: string, component: string, name: string, routerChildren: string, importAlias: string, routesVariable?: string): void;
     /** Initializes existing imports info, [re]sets import and `NgModule` edits */
     protected initState(): void;
     protected loadImportsMeta(): {
         lastIndex: number;
         modulePaths: any[];
     };
-    protected addRouteModuleEntry(targetPath: string, filePath: string, linkText: string, routesVariable: string, options: any, parentName?: string): void;
-    protected requestImport(modulePath: string, parentName: string): void;
+    protected addRouteModuleEntry(path: string, component: string, name: string, routerChildren: string, importAlias: string, routesVariable?: string): void;
+    protected requestImport(modulePath: string, routerAlias: string): void;
     /** Add `import` statements not previously found in the file  */
     protected addNewFileImports(): void;
     protected createIdentifierImport(importPath: string, as: string): ts.ImportDeclaration;

package/templates/webcomponents/TypeScriptFileUpdate.js

@@ -46,8 +46,8 @@ class TypeScriptFileUpdate {
         // reset state in case of further updates
         this.initState();
     }
-    addRoute(filePath, linkPath, linkText, options, parentName, routesVariable = DEFAULT_ROUTES_VARIABLE) {
-        this.addRouteModuleEntry(filePath, linkPath, linkText, routesVariable, options, parentName);
+    addRoute(path, component, name, routerChildren, importAlias, routesVariable = DEFAULT_ROUTES_VARIABLE) {
+        this.addRouteModuleEntry(path, component, name, routerChildren, importAlias, routesVariable);
     }
     //#region File state
     /** Initializes existing imports info, [re]sets import and `NgModule` edits */
@@ -82,28 +82,25 @@ class TypeScriptFileUpdate {
         return meta;
     }
     //#endregion File state
-    addRouteModuleEntry(targetPath, filePath, linkText, routesVariable = DEFAULT_ROUTES_VARIABLE, options, parentName) {
-        const isRouting = filePath.indexOf("routing") >= 0;
-        if (isRouting && this.targetSource.text.indexOf(filePath.slice(0, -3)) > 0) {
+    addRouteModuleEntry(path, component, name, routerChildren, importAlias, routesVariable = DEFAULT_ROUTES_VARIABLE) {
+        const isRouting = path.indexOf("routing") >= 0;
+        if (isRouting && this.targetSource.text.indexOf(path.slice(0, -3)) > 0) {
             return;
         }
-        let className;
-        const moduleName = filePath.substring(0, filePath.indexOf("-routing"));
-        const relativePath = isRouting ?
-            "./" + moduleName + "/" + filePath.slice(0, -3) : "./" + filePath + "/" + filePath;
-        const hasParent = parentName ? true : false;
-        const hasChildren = options.hasChildren ? true : false;
-        const hasNestedModule = (!hasParent && hasChildren) ? true : false;
-        className = "app-" + filePath;
-        this.requestImport(relativePath, parentName);
+        const moduleName = path.substring(0, path.indexOf("-routing"));
+        if (path) {
+            const relativePath = isRouting ?
+                "./" + moduleName + "/" + path.slice(0, -3) : "./" + path + "/" + path;
+            this.requestImport(relativePath, importAlias);
+        }
         // https://github.com/Microsoft/TypeScript/issues/14419#issuecomment-307256171
         const transformer = (context) => (rootNode) => {
             // the visitor that should be used when adding routes to the main route array
             const conditionalVisitor = (node) => {
                 if (node.kind === ts.SyntaxKind.ArrayLiteralExpression) {
-                    const newObject = this.createRouteEntry(filePath, className, linkText, hasNestedModule);
+                    const newObject = this.createRouteEntry(path, component, name, routerChildren);
                     const array = node;
-                    this.createdStringLiterals.push(filePath, linkText);
+                    this.createdStringLiterals.push(path, name);
                     const notFoundWildCard = ".*";
                     const nodes = ts.visitNodes(array.elements, visitor);
                     const errorRouteNode = nodes.filter(element => element.getText().includes(notFoundWildCard))[0];
@@ -149,13 +146,12 @@ class TypeScriptFileUpdate {
         }).transformed[0];
         this.finalize();
     }
-    requestImport(modulePath, parentName) {
+    requestImport(modulePath, routerAlias) {
         const existing = this.requestedImports.find(x => x.from === modulePath);
         if (!existing) {
-            const exportedObject = parentName ? parentName : undefined;
             // new imports, check if already exists in file
             this.requestedImports.push({
-                as: exportedObject,
+                as: routerAlias,
                 from: modulePath,
                 edit: this.importsMeta.modulePaths.indexOf(modulePath) !== -1
             });
@@ -329,12 +325,12 @@ class TypeScriptFileUpdate {
             return node;
         };
     }
-    createRouteEntry(filePath, className, linkText, hasNestedModule) {
+    createRouteEntry(filePath, className, linkText, routerAlias) {
         const routePath = ts.factory.createPropertyAssignment("path", ts.factory.createStringLiteral(filePath));
         const routeComponent = ts.factory.createPropertyAssignment("component", ts.factory.createStringLiteral(className));
         const routeData = ts.factory.createPropertyAssignment("name", ts.factory.createStringLiteral(linkText));
-        const childrenData = ts.factory.createPropertyAssignment("children", ts.factory.createStringLiteral(linkText.replace(/\s/g, "")));
-        if (hasNestedModule) {
+        if (routerAlias) {
+            const childrenData = ts.factory.createPropertyAssignment("children", ts.factory.createIdentifier(routerAlias));
             return ts.factory.createObjectLiteralExpression([routePath, routeComponent, routeData, childrenData]);
         }
         else {