chore(nsconfig): fix comments

Author: KristianDD

lib/definitions/project.d.ts

@@ -53,6 +53,11 @@ interface IProjectService {
 	isValidNativeScriptProject(pathToProject?: string): boolean;
 }
 
+interface INsConfig {
+	appPath?: string;
+	appResourcesPath?:string;
+}
+
 interface IProjectData extends IProjectDir {
 	projectName: string;
 	platformsDir: string;
@@ -63,7 +68,7 @@ interface IProjectData extends IProjectDir {
 	appDirectoryPath: string;
 	appResourcesDirectoryPath: string;
 	projectType: string;
-	nsConfig: any;
+	nsConfig: INsConfig;
 	/**
 	 * Initializes project data with the given project directory. If none supplied defaults to --path option or cwd.
 	 * @param {string} projectDir Project root directory.

lib/project-data.ts

@@ -55,9 +55,8 @@ export class ProjectData implements IProjectData {
 			const projectFilePath = this.getProjectFilePath(projectDir);
 
 			if (this.$fs.exists(projectFilePath)) {
-				let packageJsonContent: any = null;
-				packageJsonContent = this.$fs.readText(projectFilePath);
-				const nsConfigContent: any = this.getNsConfigContent(projectDir);
+				const packageJsonContent = this.$fs.readText(projectFilePath);
+				const nsConfigContent = this.getNsConfigContent(projectDir);
 
 				this.initializeProjectDataFromContent(packageJsonContent, nsConfigContent, projectDir);
 			}
@@ -72,9 +71,9 @@ export class ProjectData implements IProjectData {
 		projectDir = projectDir || this.$projectHelper.projectDir || "";
 		const projectFilePath = this.getProjectFilePath(projectDir);
 		// If no project found, projectDir should be null
-		let nsData: any = null;
-		let nsConfig: any = null;
-		let packageJsonData: any = null;
+		let nsData = null;
+		let nsConfig: INsConfig = null;
+		let packageJsonData = null;
 
 		try {
 			packageJsonData = parseJson(packageJsonContent);
@@ -86,7 +85,7 @@ export class ProjectData implements IProjectData {
 		}
 
 		try {
-			nsConfig = nsconfigContent ? parseJson(nsconfigContent) : null;
+			nsConfig = nsconfigContent ? <INsConfig>parseJson(nsconfigContent) : null;
 		} catch (err) {
 			this.$errors.failWithoutHelp(`The NativeScript configuration file ${constants.CONFIG_NS_FILE_NAME} is corrupted. ${EOL}` +
 				`Consider restoring an earlier version from your source control or backup.${EOL}` +
@@ -125,15 +124,9 @@ export class ProjectData implements IProjectData {
 	}
 
 	public getAppResourcesDirectoryPath(projectDir?: string): string {
-		if (!projectDir) {
-			projectDir = this.projectDir;
-		}
-
-		if (!projectDir) {
-			return null;
-		}
+		const appResourcesRelativePath = this.getAppResourcesRelativeDirectoryPath();
 
-		return path.resolve(projectDir, this.getAppResourcesRelativeDirectoryPath());
+		return this.resolveToProjectDir(appResourcesRelativePath, projectDir);
 	}
 
 	public getAppResourcesRelativeDirectoryPath(): string {
@@ -145,15 +138,9 @@ export class ProjectData implements IProjectData {
 	}
 
 	public getAppDirectoryPath(projectDir?: string): string {
-		if (!projectDir) {
-			projectDir = this.projectDir;
-		}
-
-		if (!projectDir) {
-			return null;
-		}
+		const appRelativePath = this.getAppDirectoryRelativePath();
 
-		return path.resolve(projectDir, this.getAppDirectoryRelativePath());
+		return this.resolveToProjectDir(appRelativePath, projectDir);
 	}
 
 	public getAppDirectoryRelativePath(): string {
@@ -174,6 +161,18 @@ export class ProjectData implements IProjectData {
 		return this.$fs.readText(configNSFilePath);
 	}
 
+	private resolveToProjectDir(pathToResolve: string, projectDir?: string): string {
+		if (!projectDir) {
+			projectDir = this.projectDir;
+		}
+
+		if (!projectDir) {
+			return null;
+		}
+
+		return path.resolve(projectDir, pathToResolve);
+	}
+
 	private getProjectType(): string {
 		let detectedProjectType = _.find(ProjectData.PROJECT_TYPES, (projectType) => projectType.isDefaultProjectType).type;
 

lib/services/app-files-updater.ts

@@ -78,8 +78,8 @@ export class AppFilesUpdater {
 
 		// exclude the app_resources directory from being enumerated
 		// for copying if it is present in the application sources dir
-		const appResourcesPath = projectData.appResourcesDirectoryPath;
-		sourceFiles = sourceFiles.filter(dirName => !path.normalize(dirName).startsWith(path.normalize(appResourcesPath)));
+		const appResourcesPathNormalized = path.normalize(projectData.appResourcesDirectoryPath);
+		sourceFiles = sourceFiles.filter(dirName => !path.normalize(dirName).startsWith(appResourcesPathNormalized));
 
 		return sourceFiles;
 	}

lib/services/prepare-platform-js-service.ts

@@ -103,7 +103,7 @@ export class PreparePlatformJSService extends PreparePlatformService implements
 		}
 	}
 
-	private copyAppResourcesFiles(config: IPreparePlatformJSInfo) {
+	private copyAppResourcesFiles(config: IPreparePlatformJSInfo): void {
 		const appDestinationDirectoryPath = path.join(config.platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
 		const appResourcesSourcePath = config.projectData.appResourcesDirectoryPath;
 

lib/services/project-data-service.ts

@@ -36,6 +36,7 @@ export class ProjectDataService implements IProjectDataService {
 
 	// TODO: Add tests
 	// TODO: Remove $projectData and replace it with $projectDataService.getProjectData
+	@exported("projectDataService")
 	public getProjectData(projectDir: string): IProjectData {
 		const projectDataInstance = this.$injector.resolve<IProjectData>(ProjectData);
 		projectDataInstance.initializeProjectData(projectDir);