chore: fix pr comments

Author: DimitarTachev

lib/controllers/migrate-controller.ts

@@ -46,7 +46,7 @@ export class MigrateController extends UpdateControllerBase implements IMigrateC
 		{ packageName: "nativescript-dev-sass", isDev: true, replaceWith: "node-sass" },
 		{ packageName: "nativescript-dev-typescript", isDev: true, replaceWith: "typescript" },
 		{ packageName: "nativescript-dev-less", isDev: true, shouldRemove: true, warning: "LESS CSS is not supported out of the box. In order to enable it, follow the steps in this feature request: https://github.com/NativeScript/nativescript-dev-webpack/issues/967" },
-		{ packageName: constants.WEBPACK_PLUGIN_NAME, isDev: true, shouldAddIfMissing: true, verifiedVersion: "1.0.0-rc-2019-07-08-114453-02" },
+		{ packageName: constants.WEBPACK_PLUGIN_NAME, isDev: true, shouldAddIfMissing: true, verifiedVersion: "1.0.0-rc-2019-07-08-135456-03" },
 		{ packageName: "nativescript-camera", verifiedVersion: "4.5.0" },
 		{ packageName: "nativescript-geolocation", verifiedVersion: "5.1.0" },
 		{ packageName: "nativescript-imagepicker", verifiedVersion: "6.2.0" },
@@ -160,7 +160,7 @@ export class MigrateController extends UpdateControllerBase implements IMigrateC
 
 	private async cleanUpProject(projectData: IProjectData): Promise<void> {
 		this.$logger.info("Clean old project artefacts.");
-		this.$projectDataService.removeNsConfigProperty(projectData.projectDir, "useLegacyWorkflow");
+		this.$projectDataService.removeNSConfigProperty(projectData.projectDir, "useLegacyWorkflow");
 		this.$fs.deleteDirectory(path.join(projectData.projectDir, constants.HOOKS_DIR_NAME));
 		this.$fs.deleteDirectory(path.join(projectData.projectDir, constants.PLATFORMS_DIR_NAME));
 		this.$fs.deleteDirectory(path.join(projectData.projectDir, constants.NODE_MODULES_FOLDER_NAME));

lib/definitions/project.d.ts

@@ -150,7 +150,7 @@ interface IProjectDataService {
 	 * @param {string} propertyName The name of the property to be removed.
 	 * @returns {void}
 	 */
-	removeNsConfigProperty(projectDir: string, propertyName: string): void;
+	removeNSConfigProperty(projectDir: string, propertyName: string): void;
 
 	/**
 	 * Removes dependency from package.json

lib/services/project-data-service.ts

@@ -127,7 +127,7 @@ export class ProjectDataService implements IProjectDataService {
 		};
 	}
 
-	public removeNsConfigProperty(projectDir: string, propertyName: string): void {
+	public removeNSConfigProperty(projectDir: string, propertyName: string): void {
 		this.$logger.trace(`Removing "${propertyName}" property from nsconfig.`);
 		this.updateNsConfigValue(projectDir, null, [propertyName]);
 		this.$logger.trace(`"${propertyName}" property successfully removed.`);
@@ -219,7 +219,7 @@ export class ProjectDataService implements IProjectDataService {
 			try {
 				result = <INsConfig>parseJson(nsConfigContent);
 			} catch (e) {
-				// invalid nsconfig => null
+				this.$logger.trace("The `nsconfig` content is not a valid JSON. Parse error: ", e);
 			}
 		}
 

test/services/project-data-service.ts

@@ -2,10 +2,11 @@ import { Yok } from "../../lib/common/yok";
 import { assert } from "chai";
 import { ProjectDataService } from "../../lib/services/project-data-service";
 import { LoggerStub, ProjectDataStub } from "../stubs";
-import { NATIVESCRIPT_PROPS_INTERNAL_DELIMITER, PACKAGE_JSON_FILE_NAME, AssetConstants, ProjectTypes } from '../../lib/constants';
+import { NATIVESCRIPT_PROPS_INTERNAL_DELIMITER, PACKAGE_JSON_FILE_NAME, CONFIG_NS_FILE_NAME, AssetConstants, ProjectTypes } from '../../lib/constants';
 import { DevicePlatformsConstants } from "../../lib/common/mobile/device-platforms-constants";
 import { basename, join } from "path";
 import { FileSystem } from "../../lib/common/file-system";
+import { regExpEscape } from "../../lib/common/helpers";
 
 const CLIENT_NAME_KEY_IN_PROJECT_FILE = "nativescript";
 
@@ -41,7 +42,7 @@ const testData: any = [
 	}
 ];
 
-const createTestInjector = (readTextData?: string): IInjector => {
+const createTestInjector = (packageJsonContent?: string, nsConfigContent?: string): IInjector => {
 	const testInjector = new Yok();
 	testInjector.register("projectData", ProjectDataStub);
 	testInjector.register("staticConfig", {
@@ -55,10 +56,14 @@ const createTestInjector = (readTextData?: string): IInjector => {
 		},
 
 		readText: (filename: string, encoding?: IReadFileOptions | string): string => {
-			return readTextData;
+			if (filename.indexOf("package.json") > -1) {
+				return packageJsonContent;
+			} else if (filename.indexOf("nsconfig.json") > -1) {
+				return nsConfigContent;
+			}
 		},
 
-		exists: (filePath: string): boolean => basename(filePath) === PACKAGE_JSON_FILE_NAME,
+		exists: (filePath: string): boolean => (basename(filePath) === PACKAGE_JSON_FILE_NAME || basename(filePath) === CONFIG_NS_FILE_NAME),
 
 		readJson: (filePath: string): any => null,
 
@@ -91,7 +96,7 @@ const createTestInjector = (readTextData?: string): IInjector => {
 	return testInjector;
 };
 
-describe("projectDataService", () => {
+describe.only("projectDataService", () => {
 	const generateJsonDataFromTestData = (currentTestData: any, skipNativeScriptKey?: boolean) => {
 		const props = currentTestData.propertyName.split(NATIVESCRIPT_PROPS_INTERNAL_DELIMITER);
 		const data: any = {};
@@ -245,6 +250,66 @@ describe("projectDataService", () => {
 		});
 	});
 
+	describe("removeNSConfigProperty", () => {
+
+		const generateExpectedDataFromTestData = (currentTestData: any) => {
+			const props = currentTestData.propertyName.split(NATIVESCRIPT_PROPS_INTERNAL_DELIMITER);
+			props.splice(props.length - 1, 1);
+
+			const data: any = {};
+			let currentData: any = data;
+
+			_.each(props, (prop) => {
+				currentData = currentData[prop] = {};
+			});
+
+			return data;
+		};
+
+		_.each(testData, currentTestData => {
+
+			it(currentTestData.description, () => {
+				const testInjector = createTestInjector(null, generateFileContentFromTestData(currentTestData, true));
+				const fs: IFileSystem = testInjector.resolve("fs");
+
+				let dataPassedToWriteJson: any = null;
+				fs.writeJson = (filename: string, data: any, space?: string, encoding?: string): void => {
+					dataPassedToWriteJson = data;
+				};
+
+				const projectDataService: IProjectDataService = testInjector.resolve("projectDataService");
+				const propDelimiterRegExp = new RegExp(regExpEscape(NATIVESCRIPT_PROPS_INTERNAL_DELIMITER), "g");
+				const propertySelector = currentTestData.propertyName.replace(propDelimiterRegExp, ".");
+				projectDataService.removeNSConfigProperty("projectDir", propertySelector);
+
+				assert.deepEqual(dataPassedToWriteJson, generateExpectedDataFromTestData(currentTestData));
+			});
+
+		});
+
+		it("removes only the selected property", () => {
+			const initialData: any = {};
+			initialData[CLIENT_NAME_KEY_IN_PROJECT_FILE] = {
+				"root": {
+					"id": "1",
+					"constantItem": "myValue"
+				}
+			};
+
+			const testInjector = createTestInjector(JSON.stringify(initialData));
+			const fs: IFileSystem = testInjector.resolve("fs");
+
+			let dataPassedToWriteJson: any = null;
+			fs.writeJson = (filename: string, data: any, space?: string, encoding?: string): void => {
+				dataPassedToWriteJson = data;
+			};
+
+			const projectDataService: IProjectDataService = testInjector.resolve("projectDataService");
+			projectDataService.removeNSProperty("projectDir", getPropertyName(["root", "id"]));
+			assert.deepEqual(dataPassedToWriteJson, { nativescript: { root: { constantItem: "myValue" } } });
+		});
+	});
+
 	describe("removeDependency", () => {
 		it("removes specified dependency from project file", () => {
 			const currentTestData = {

test/stubs.ts

@@ -506,7 +506,7 @@ export class ProjectDataService implements IProjectDataService {
 
 	removeNSProperty(propertyName: string): void { }
 
-	removeNsConfigProperty(projectDir: string, propertyName: string): void { }
+	removeNSConfigProperty(projectDir: string, propertyName: string): void { }
 
 	removeDependency(dependencyName: string): void { }