feat(nsconfig): read app folder path from nsconfig

KristianDD · KristianDD · commit 0dea0cdc1bf6 · 2018-02-07T15:50:23.000+02:00
diff --git a/lib/commands/test-init.ts b/lib/commands/test-init.ts
@@ -68,7 +68,7 @@ class TestInitCommand implements ICommand {
 
 		await this.$pluginsService.add('nativescript-unit-test-runner', this.$projectData);
 
-		const testsDir = path.join(projectDir, 'app/tests');
+		const testsDir = path.join(this.$projectData.appDirectoryPath, 'tests');
 		let shouldCreateSampleTests = true;
 		if (this.$fs.exists(testsDir)) {
 			this.$logger.info('app/tests/ directory already exists, will not create an example test project.');
diff --git a/lib/constants.ts b/lib/constants.ts
@@ -30,6 +30,7 @@ export const APK_DIR = "apk";
 export const RESOURCES_DIR = "res";
 export const CONFIG_NS_FILE_NAME = "nsconfig.json";
 export const CONFIG_NS_APP_RESOURCES_ENTRY = "app_resources";
+export const CONFIG_NS_APP_ENTRY = "app_folder";
 
 export class PackageVersion {
 	static NEXT = "next";
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -69,6 +69,7 @@ interface IProjectData extends IProjectDir {
 	 * @returns {void}
 	 */
 	initializeProjectData(projectDir?: string): void;
+	getAppDirectoryPath(projectDir?: string): string;
 	getAppResourcesDirectoryPath(projectDir?: string): string;
 }
 
diff --git a/lib/project-data.ts b/lib/project-data.ts
@@ -32,7 +32,9 @@ export class ProjectData implements IProjectData {
 	public projectFilePath: string;
 	public projectId: string;
 	public projectName: string;
-	public appDirectoryPath: string;
+	get appDirectoryPath(): string {
+		return this.getAppDirectoryPath();
+	}
 	get appResourcesDirectoryPath(): string {
 		return this.getAppResourcesDirectoryPath();
 	}
@@ -70,7 +72,6 @@ export class ProjectData implements IProjectData {
 					this.projectName = this.$projectHelper.sanitizeName(path.basename(projectDir));
 					this.platformsDir = path.join(projectDir, constants.PLATFORMS_DIR_NAME);
 					this.projectFilePath = projectFilePath;
-					this.appDirectoryPath = path.join(projectDir, constants.APP_FOLDER_NAME);
 					this.projectId = data.id;
 					this.dependencies = fileContent.dependencies;
 					this.devDependencies = fileContent.devDependencies;
@@ -106,7 +107,28 @@ export class ProjectData implements IProjectData {
 			}
 		}
 
-		return absoluteAppResourcesDirPath || path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME);
+		return absoluteAppResourcesDirPath || path.join(this.getAppDirectoryPath(projectDir), constants.APP_RESOURCES_FOLDER_NAME);
+	}
+
+	public getAppDirectoryPath(projectDir?: string): string {
+		if (!projectDir) {
+			projectDir = this.projectDir;
+		}
+
+		const configNSFilePath = path.join(projectDir, constants.CONFIG_NS_FILE_NAME);
+		let absoluteAppDirPath: string;
+
+		if (this.$fs.exists(configNSFilePath)) {
+			const configNS = this.$fs.readJson(configNSFilePath);
+
+			if (configNS && configNS[constants.CONFIG_NS_APP_ENTRY]) {
+				const appDirPath = configNS[constants.CONFIG_NS_APP_ENTRY];
+
+				absoluteAppDirPath = path.resolve(projectDir, appDirPath);
+			}
+		}
+
+		return absoluteAppDirPath || path.join(projectDir, constants.APP_FOLDER_NAME);
 	}
 
 	private getProjectType(): string {
diff --git a/lib/providers/project-files-provider.ts b/lib/providers/project-files-provider.ts
@@ -16,11 +16,13 @@ export class ProjectFilesProvider extends ProjectFilesProviderBase {
 		const platformData = this.$platformsData.getPlatformData(platform.toLowerCase(), projectData);
 		const parsedFilePath = this.getPreparedFilePath(filePath, projectFilesConfig);
 		let mappedFilePath = "";
+		let relativePath;
 		if (parsedFilePath.indexOf(constants.NODE_MODULES_FOLDER_NAME) > -1) {
-			const relativePath = path.relative(path.join(projectData.projectDir, constants.NODE_MODULES_FOLDER_NAME), parsedFilePath);
+			relativePath = path.relative(path.join(projectData.projectDir, constants.NODE_MODULES_FOLDER_NAME), parsedFilePath);
 			mappedFilePath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, constants.TNS_MODULES_FOLDER_NAME, relativePath);
 		} else {
-			mappedFilePath = path.join(platformData.appDestinationDirectoryPath, path.relative(projectData.projectDir, parsedFilePath));
+			relativePath = path.relative(projectData.appDirectoryPath, parsedFilePath);
+			mappedFilePath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, relativePath);
 		}
 
 		const appResourcesDirectoryPath = projectData.appResourcesDirectoryPath;
diff --git a/lib/services/livesync/livesync-service.ts b/lib/services/livesync/livesync-service.ts
@@ -3,7 +3,7 @@ import * as choki from "chokidar";
 import { EOL } from "os";
 import { EventEmitter } from "events";
 import { hook } from "../../common/helpers";
-import { APP_FOLDER_NAME, PACKAGE_JSON_FILE_NAME, LiveSyncTrackActionNames, USER_INTERACTION_NEEDED_EVENT_NAME, DEBUGGER_ATTACHED_EVENT_NAME, DEBUGGER_DETACHED_EVENT_NAME, TrackActionNames } from "../../constants";
+import { PACKAGE_JSON_FILE_NAME, LiveSyncTrackActionNames, USER_INTERACTION_NEEDED_EVENT_NAME, DEBUGGER_ATTACHED_EVENT_NAME, DEBUGGER_DETACHED_EVENT_NAME, TrackActionNames } from "../../constants";
 import { FileExtensions, DeviceTypes, DeviceDiscoveryEventNames } from "../../common/constants";
 import { cache } from "../../common/decorators";
 
@@ -513,7 +513,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 	}
 
 	private async startWatcher(projectData: IProjectData, liveSyncData: ILiveSyncInfo): Promise<void> {
-		const pattern = [APP_FOLDER_NAME];
+		const pattern = [path.relative(projectData.projectDir, projectData.appDirectoryPath)];
 
 		if (liveSyncData.watchAllFiles) {
 			const productionDependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(projectData.projectDir);
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -563,10 +563,9 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 	public async cleanDestinationApp(platformInfo: IPreparePlatformInfo): Promise<void> {
 		await this.ensurePlatformInstalled(platformInfo.platform, platformInfo.platformTemplate, platformInfo.projectData, platformInfo.config);
 
-		const appSourceDirectoryPath = path.join(platformInfo.projectData.projectDir, constants.APP_FOLDER_NAME);
 		const platformData = this.$platformsData.getPlatformData(platformInfo.platform, platformInfo.projectData);
 		const appDestinationDirectoryPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
-		const appUpdater = new AppFilesUpdater(appSourceDirectoryPath, appDestinationDirectoryPath, platformInfo.appFilesUpdaterOptions, this.$fs);
+		const appUpdater = new AppFilesUpdater(platformInfo.projectData.appDirectoryPath, appDestinationDirectoryPath, platformInfo.appFilesUpdaterOptions, this.$fs);
 		appUpdater.cleanDestinationApp();
 	}
 
diff --git a/lib/services/prepare-platform-service.ts b/lib/services/prepare-platform-service.ts
@@ -20,9 +20,8 @@ export class PreparePlatformService {
 
 		// Copy app folder to native project
 		this.$fs.ensureDirectoryExists(appDestinationDirectoryPath);
-		const appSourceDirectoryPath = path.join(copyAppFilesData.projectData.projectDir, constants.APP_FOLDER_NAME);
 
-		const appUpdater = new AppFilesUpdater(appSourceDirectoryPath, appDestinationDirectoryPath, copyAppFilesData.appFilesUpdaterOptions, this.$fs);
+		const appUpdater = new AppFilesUpdater(copyAppFilesData.projectData.appDirectoryPath, appDestinationDirectoryPath, copyAppFilesData.appFilesUpdaterOptions, this.$fs);
 		appUpdater.updateApp(sourceFiles => {
 			this.$xmlValidator.validateXmlFiles(sourceFiles);
 		});
diff --git a/lib/services/project-service.ts b/lib/services/project-service.ts
@@ -101,7 +101,7 @@ export class ProjectService implements IProjectService {
 	private async extractTemplate(projectDir: string, realTemplatePath: string): Promise<void> {
 		this.$fs.ensureDirectoryExists(projectDir);
 
-		const appDestinationPath = path.join(projectDir, constants.APP_FOLDER_NAME);
+		const appDestinationPath = this.$projectData.getAppDirectoryPath(projectDir);
 		this.$fs.createDirectory(appDestinationPath);
 
 		this.$logger.trace(`Copying application from '${realTemplatePath}' into '${appDestinationPath}'.`);
@@ -111,7 +111,7 @@ export class ProjectService implements IProjectService {
 	}
 
 	private async ensureAppResourcesExist(projectDir: string): Promise<void> {
-		const appPath = path.join(projectDir, constants.APP_FOLDER_NAME),
+		const appPath = this.$projectData.getAppDirectoryPath(projectDir),
 			appResourcesDestinationPath = this.$projectData.getAppResourcesDirectoryPath(projectDir);
 
 		if (!this.$fs.exists(appResourcesDestinationPath)) {
@@ -138,7 +138,7 @@ export class ProjectService implements IProjectService {
 	}
 
 	private removeMergedDependencies(projectDir: string, templatePackageJsonData: any): void {
-		const extractedTemplatePackageJsonPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.PACKAGE_JSON_FILE_NAME);
+		const extractedTemplatePackageJsonPath = path.join(this.$projectData.getAppDirectoryPath(projectDir), constants.PACKAGE_JSON_FILE_NAME);
 		for (const key in templatePackageJsonData) {
 			if (constants.PackageJsonKeysToKeep.indexOf(key) === -1) {
 				delete templatePackageJsonData[key];

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ interface IProjectData extends IProjectDir {`
`69`	`69`	`* @returns {void}`
`70`	`70`	`*/`
`71`	`71`	`initializeProjectData(projectDir?: string): void;`
	`72`	`+ getAppDirectoryPath(projectDir?: string): string;`
`72`	`73`	`getAppResourcesDirectoryPath(projectDir?: string): string;`
`73`	`74`	`}`
`74`	`75`