refactor(igx-ts): add standalone components to module imports instead

Author: damyanpetev

packages/igx-templates/IgniteUIForAngularTemplate.ts

@@ -9,7 +9,8 @@ export class IgniteUIForAngularTemplate implements Template {
 	public components: string[];
 	public controlGroup: string;
 	public listInComponentTemplates: boolean = true;
-	public addAsNgModelDeclaration: boolean = true;
+	public addAsNgModelDeclaration: boolean = false;
+	public addAsNgModelImport: boolean = true;
 	public listInCustomTemplates: boolean = false;
 	public id: string;
 	public name: string;
@@ -127,6 +128,7 @@ export class IgniteUIForAngularTemplate implements Template {
 		const mainModule = new TsUpdate(mainModulePath, false, { indentSize: 2, singleQuotes: true });
 		mainModule.addNgModuleMeta({
 				declare: this.addAsNgModelDeclaration ? [className] : [],
+				import: this.addAsNgModelImport ? [className] : [],
 				from: Util.relativePath(mainModulePath, componentFilePath, true, true),
 				export: modulePath !== "app-module.ts" ? [className] : []
 			},

spec/unit/add-spec.ts

@@ -297,7 +297,8 @@ describe("Unit - Add command", () => {
 		expect(routeSpy).toHaveBeenCalledTimes(1);
 		expect(ngMetaSpy).toHaveBeenCalledTimes(1);
 		expect(ngMetaSpy).toHaveBeenCalledWith({
-				declare: [
+				declare: [],
+				import: [
 					"TestFileName"
 				],
 				from: "../test-file-name/test-file-name",

spec/unit/base-templates/IgniteUIForAngularTemplate-spec.ts

@@ -89,7 +89,8 @@ describe("Unit - IgniteUIForAngularTemplate Base", () => {
 				.toHaveBeenCalledWith(path.join("target/path", "src/app/app-module.ts"), false, { indentSize: 2, singleQuotes: true });
 			expect(helpers.tsUpdateMock.addNgModuleMeta).toHaveBeenCalledWith(
 				{
-					declare: [
+					declare: [],
+					import: [
 						"ViewName",
 					],
 					from: "./view-name/view-name",
@@ -189,7 +190,8 @@ describe("Unit - IgniteUIForAngularTemplate Base", () => {
 				.toHaveBeenCalledWith(path.join("target/path", "src/app/app-module.ts"), false, { indentSize: 2, singleQuotes: true });
 			expect(helpers.tsUpdateMock.addNgModuleMeta).toHaveBeenCalledWith(
 				{
-					declare: [
+					declare: [],
+					import: [
 					  "ViewName",
 					],
 					from: "./view-name/view-name",
@@ -201,6 +203,68 @@ describe("Unit - IgniteUIForAngularTemplate Base", () => {
 			expect(helpers.tsUpdateMock.finalize).toHaveBeenCalled();
 		});
 
+		it("should declare in NgModule when addAsNgModelDeclaration is true", async () => {
+			const templ = new TestTemplate();
+			templ.addAsNgModelDeclaration = true;
+			templ.addAsNgModelImport = false;
+			const mockFS = {
+				fileExists: (file: string): boolean => {
+					return false;
+				},
+				readFile: (file: string, encoding?: BufferEncoding): string => {
+					return JSON.stringify({ key: "value" });
+				},
+				writeFile: (file: string, text: string): void => {},
+			};
+			spyOn(App.container, "get").and.returnValue(mockFS);
+			spyOn(templ, "fileExists").and.returnValue(true);
+			templ.registerInProject("target/path", "view name");
+			expect(helpers.tsUpdateMock.addNgModuleMeta).toHaveBeenCalledWith(
+				{
+					declare: [
+						"ViewName",
+					],
+					import: [],
+					from: "./view-name/view-name",
+					export: []
+				},
+				jasmine.any(Object),
+				true
+			);
+		});
+
+		it("should both declare and import in NgModule when both flags are true", async () => {
+			const templ = new TestTemplate();
+			templ.addAsNgModelDeclaration = true;
+			templ.addAsNgModelImport = true;
+			const mockFS = {
+				fileExists: (file: string): boolean => {
+					return false;
+				},
+				readFile: (file: string, encoding?: BufferEncoding): string => {
+					return JSON.stringify({ key: "value" });
+				},
+				writeFile: (file: string, text: string): void => {},
+			};
+			spyOn(App.container, "get").and.returnValue(mockFS);
+			spyOn(templ, "fileExists").and.returnValue(true);
+			templ.registerInProject("target/path", "view name");
+			expect(helpers.tsUpdateMock.addNgModuleMeta).toHaveBeenCalledWith(
+				{
+					declare: [
+						"ViewName",
+					],
+					import: [
+						"ViewName",
+					],
+					from: "./view-name/view-name",
+					export: []
+				},
+				jasmine.any(Object),
+				true
+			);
+		});
+
 		it("generateConfig merges variables passed under extraConfig", async () => {
 			const expected = {
 				camelCaseName: "test",