igniteui-cli 13.2.0 → 13.2.1-beta.0

package/lib/templates/AngularTemplate.js

@@ -40,21 +40,42 @@ class AngularTemplate {
         // tslint:disable-next-line:variable-name
         const TsUpdate = 
         // tslint:disable-next-line:no-submodule-imports
-        require("@igniteui/cli-core/typescript").TypeScriptFileUpdate;
+        require("@igniteui/angular-templates").AngularTypeScriptFileUpdate;
+        const componentPath = path.join(projectPath, `src/app/components/${this.folderName(name)}/${this.fileName(name)}.component.ts`);
+        const className = `${cli_core_1.Util.className(cli_core_1.Util.nameFromPath(name))}Component`;
         if (!(options && options.skipRoute)) {
             //1) import the component class name,
             //2) and populate the Routes array with the path and component
             //for example: { path: "combo", component: ComboComponent }
-            const routingModule = new TsUpdate(path.join(projectPath, "src/app/app-routing.module.ts"));
-            routingModule.addRoute(path.join(projectPath, `src/app/components/${this.folderName(name)}/${this.fileName(name)}.component.ts`), this.folderName(name), //path
-            cli_core_1.Util.nameFromPath(name) //text
-            );
+            const routingModulePath = path.join(projectPath, "src/app/app-routing.module.ts");
+            const routingModule = new TsUpdate(routingModulePath, false, { singleQuotes: false });
+            routingModule.addRoute({
+                path: this.folderName(name),
+                identifierName: className,
+                modulePath: cli_core_1.Util.relativePath(routingModulePath, componentPath, true, true),
+                data: { text: cli_core_1.Util.nameFromPath(name) }
+            });
+            const content = routingModule.finalize();
+            if (content) {
+                // add to a finalize override in the NG File Update instead?
+                cli_core_1.TypeScriptUtils.saveFile(routingModulePath, content);
+            }
         }
         //3) add an import of the component class from its file location.
         //4) populate the declarations portion of the @NgModule with the component class name.
-        const mainModule = new TsUpdate(path.join(projectPath, `src/app/${modulePath}`));
-        mainModule.addDeclaration(path.join(projectPath, `src/app/components/${this.folderName(name)}/${this.fileName(name)}.component.ts`), modulePath !== "app.module.ts");
-        mainModule.finalize();
+        const mainModulePath = path.join(projectPath, `src/app/${modulePath}`);
+        const relativePath = cli_core_1.Util.relativePath(mainModulePath, componentPath, true, true);
+        const mainModule = new TsUpdate(mainModulePath, false, { singleQuotes: false });
+        mainModule.addNgModuleMeta({
+            declare: [className],
+            from: relativePath,
+            export: modulePath !== "app.module.ts" ? [className] : []
+        });
+        const content = mainModule.finalize();
+        if (content) {
+            // add to a finalize override in the NG File Update instead?
+            cli_core_1.TypeScriptUtils.saveFile(mainModulePath, content);
+        }
         this.ensureSourceFiles(projectPath);
     }
     getExtraConfiguration() {

package/migrations/update-5_0_0/index.js

@@ -13,6 +13,7 @@ exports.setVirtual = exports.NgTreeFileSystem = void 0;
 // tslint:disable:no-implicit-dependencies
 const core_1 = require("@angular-devkit/core");
 const cli_core_1 = require("@igniteui/cli-core");
+const angular_templates_1 = require("@igniteui/angular-templates");
 //#region Temp duplicate of schematics pack fs
 class NgTreeFileSystem {
     constructor(tree) {
@@ -51,9 +52,9 @@ function default_1() {
         context.logger.info(`Applying migration for Ignite UI CLI 5.0.0`);
         if (tree.exists(moduleFile)) {
             setVirtual(tree);
-            const mainModule = new cli_core_1.TypeScriptFileUpdate(moduleFile);
+            const mainModule = new angular_templates_1.AngularTypeScriptFileUpdate(moduleFile, false, { indentSize: 2 });
             mainModule.addNgModuleMeta({ import: "HammerModule", from: "@angular/platform-browser" });
-            mainModule.finalize();
+            cli_core_1.TypeScriptUtils.saveFile(moduleFile, mainModule.finalize());
         }
     });
 }

package/package.json

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

package/templates/webcomponents/igc-ts/accordion/default/index.js

@@ -12,8 +12,5 @@ class IgcAccordionTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIFo
         this.name = "Accordion";
         this.description = "basic IgcAccordion";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcAccordionTemplate();

package/templates/webcomponents/igc-ts/avatar/default/index.js

@@ -12,8 +12,5 @@ class IgcAvatarTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWe
         this.name = "Avatar";
         this.description = "basic IgcAvatar";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcAvatarTemplate();

package/templates/webcomponents/igc-ts/badge/default/index.js

@@ -12,8 +12,5 @@ class IgcBadgeTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWeb
         this.name = "Badge";
         this.description = "basic IgcBadge";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcBadgeTemplate();

package/templates/webcomponents/igc-ts/button/default/index.js

@@ -12,8 +12,5 @@ class IgcBButtonTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForW
         this.name = "Button";
         this.description = "basic IgcButton";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcBButtonTemplate();

package/templates/webcomponents/igc-ts/button-group/default/index.js

@@ -12,8 +12,5 @@ class IgcTabsTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWebC
         this.name = "Button group";
         this.description = "basic IgcButtonGroup";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcTabsTemplate();

package/templates/webcomponents/igc-ts/calendar/default/index.js

@@ -12,8 +12,5 @@ class IgcCalendarTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIFor
         this.name = "Calendar";
         this.description = "basic IgcCalendar";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcCalendarTemplate();

package/templates/webcomponents/igc-ts/card/default/index.js

@@ -12,8 +12,5 @@ class IgcCardTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWebC
         this.name = "Card";
         this.description = "basic IgcCard";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcCardTemplate();

package/templates/webcomponents/igc-ts/checkbox/default/index.js

@@ -12,8 +12,5 @@ class IgcCheckboxTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIFor
         this.name = "Checkbox";
         this.description = "basic IgcCheckbox";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcCheckboxTemplate();

package/templates/webcomponents/igc-ts/chip/default/index.js

@@ -12,8 +12,5 @@ class IgcChipTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWebC
         this.name = "Chip";
         this.description = "Basic IgcChip";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcChipTemplate();

package/templates/webcomponents/igc-ts/circular-progress/default/index.js

@@ -12,8 +12,5 @@ class IgcCircularProgressTemplate extends IgniteUIForWebComponentsTemplate_1.Ign
         this.name = "Circular Progress";
         this.description = "Basic Circular Progress";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcCircularProgressTemplate();

package/templates/webcomponents/igc-ts/custom-templates/subscription-form/index.js

@@ -11,8 +11,5 @@ class IgcSubscriptionFormTemplate extends IgniteUIForWebComponentsTemplate_1.Ign
         this.name = "Subscription Form";
         this.description = "Subscription form with inputs, buttons and a checkbox inside";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcSubscriptionFormTemplate();

package/templates/webcomponents/igc-ts/date-time-input/default/index.js

@@ -12,8 +12,5 @@ class IgcDateTimeInputTemplate extends IgniteUIForWebComponentsTemplate_1.Ignite
         this.name = "Date Time Input";
         this.description = "basic IgcDateTimeInput";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcDateTimeInputTemplate();

package/templates/webcomponents/igc-ts/dock-manager/default/index.js

@@ -13,8 +13,5 @@ class IgcDockManagerTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUI
         this.description = "Dock Manager with most functionalities and docking options";
         this.packages = ["igniteui-dockmanager@~1.12.4"];
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcDockManagerTemplate();

package/templates/webcomponents/igc-ts/dropdown/default/index.js

@@ -12,8 +12,5 @@ class IgcDropdownTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIFor
         this.name = "Dropdown";
         this.description = "IgcDropdown with groups and disabled items";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcDropdownTemplate();

package/templates/webcomponents/igc-ts/expansion-panel/default/index.js

@@ -12,8 +12,5 @@ class IgcDropdownTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIFor
         this.name = "Expansion Panel";
         this.description = "A lightweight accordion component";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcDropdownTemplate();

package/templates/webcomponents/igc-ts/financial-chart/default/index.js

@@ -16,8 +16,5 @@ class IgcFinancialChartTemplate extends IgniteUIForWebComponentsTemplate_1.Ignit
             "igniteui-webcomponents-charts@~4.2.5"
         ];
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcFinancialChartTemplate();

package/templates/webcomponents/igc-ts/form/default/index.js

@@ -12,8 +12,5 @@ class IgcFormTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWebC
         this.name = "Form";
         this.description = "basic IgcForm";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcFormTemplate();

package/templates/webcomponents/igc-ts/grid/default/index.js

@@ -18,8 +18,5 @@ class IgcGridTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWebC
             "igniteui-webcomponents-layouts@~4.2.5"
         ];
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcGridTemplate();

package/templates/webcomponents/igc-ts/grid/grid-editing/index.js

@@ -12,8 +12,5 @@ class IgcGridEditingTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUI
         this.name = "Grid Editing";
         this.description = "IgcGrid with editing enabled";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcGridEditingTemplate();

package/templates/webcomponents/igc-ts/grid/grid-summaries/index.js

@@ -12,8 +12,5 @@ class IgcGridSummariesTemplate extends IgniteUIForWebComponentsTemplate_1.Ignite
         this.name = "Grid Summaries";
         this.description = "IgcGrid with column summaries";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcGridSummariesTemplate();

package/templates/webcomponents/igc-ts/icon/default/index.js

@@ -12,8 +12,5 @@ class IgcIconTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWebC
         this.name = "Icon";
         this.description = "basic IgcIcon";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcIconTemplate();

package/templates/webcomponents/igc-ts/icon-button/default/index.js

@@ -12,8 +12,5 @@ class IgcIconButtonTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIF
         this.name = "Icon Button";
         this.description = "basic IgcIconButton";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcIconButtonTemplate();

package/templates/webcomponents/igc-ts/input/default/index.js

@@ -12,8 +12,5 @@ class IgcInputTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWeb
         this.name = "Input";
         this.description = "basic IgcInput";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcInputTemplate();

package/templates/webcomponents/igc-ts/linear-gauge/default/index.js

@@ -16,8 +16,5 @@ class IgcLinearGaugeTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUI
             "igniteui-webcomponents-gauges@~4.2.5"
         ];
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcLinearGaugeTemplate();

package/templates/webcomponents/igc-ts/linear-progress/default/index.js

@@ -16,8 +16,5 @@ class IgcLinearProgressComponent extends IgniteUIForWebComponentsTemplate_1.Igni
             "igniteui-webcomponents-charts@~4.2.5"
         ];
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcLinearProgressComponent();

package/templates/webcomponents/igc-ts/list/default/index.js

@@ -12,8 +12,5 @@ class IgcListTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWebC
         this.name = "List";
         this.description = "basic IgcList";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcListTemplate();

package/templates/webcomponents/igc-ts/navbar/default/index.js

@@ -12,8 +12,5 @@ class IgcNavbarTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWe
         this.name = "Navbar";
         this.description = "basic IgcNavbar";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcNavbarTemplate();

package/templates/webcomponents/igc-ts/pie-chart/default/index.js

@@ -16,8 +16,5 @@ class IgcPieChartTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIFor
             "igniteui-webcomponents-charts@~4.2.5"
         ];
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcPieChartTemplate();

package/templates/webcomponents/igc-ts/radial-gauge/default/index.js

@@ -16,8 +16,5 @@ class IgcradialGaugeTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUI
             "igniteui-webcomponents-gauges@~4.2.5"
         ];
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcradialGaugeTemplate();

package/templates/webcomponents/igc-ts/radio-group/default/index.js

@@ -12,8 +12,5 @@ class IgcRadioGroupTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIF
         this.name = "Radio Group";
         this.description = "basic IgcRadioGroup";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcRadioGroupTemplate();

package/templates/webcomponents/igc-ts/rating/default/index.js

@@ -12,8 +12,5 @@ class IgcRatingComponent extends IgniteUIForWebComponentsTemplate_1.IgniteUIForW
         this.name = "Rating";
         this.description = "Basic Rating";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcRatingComponent();

package/templates/webcomponents/igc-ts/ripple/default/index.js

@@ -12,8 +12,5 @@ class IgcRippleTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWe
         this.name = "Ripple";
         this.description = "basic IgcRipple";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcRippleTemplate();

package/templates/webcomponents/igc-ts/slider/default/index.js

@@ -12,8 +12,5 @@ class IgcSliderComponent extends IgniteUIForWebComponentsTemplate_1.IgniteUIForW
         this.name = "Slider";
         this.description = `Basic slider component`;
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcSliderComponent();

package/templates/webcomponents/igc-ts/switch/default/index.js

@@ -12,8 +12,5 @@ class IgcSwitchTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWe
         this.name = "Switch";
         this.description = "basic IgcSwitch";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcSwitchTemplate();

package/templates/webcomponents/igc-ts/tabs/default/index.js

@@ -12,8 +12,5 @@ class IgcTabsTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWebC
         this.name = "Tabs";
         this.description = "basic IgcTabs";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcTabsTemplate();

package/templates/webcomponents/igc-ts/text-area/default/index.js

@@ -12,8 +12,5 @@ class IgcTextareaComponent extends IgniteUIForWebComponentsTemplate_1.IgniteUIFo
         this.name = "Text area";
         this.description = "basic IgcTextarea";
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcTextareaComponent();

package/templates/webcomponents/igc-ts/text-area/index.js

@@ -11,8 +11,5 @@ class IgcTextareaComponent extends cli_core_1.BaseComponent {
         this.group = "Data Entry & Display";
         this.description = `Basic text area component`;
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcTextareaComponent();

package/templates/webcomponents/igc-ts/tree/default/index.js

@@ -18,8 +18,5 @@ class IgcTreeTemplate extends IgniteUIForWebComponentsTemplate_1.IgniteUIForWebC
             "igniteui-webcomponents-layouts@~4.2.5"
         ];
     }
-    addClassDeclaration(mainModule, projPath, name, modulePath) {
-        // not applicable with custom module
-    }
 }
 module.exports = new IgcTreeTemplate();