Make fs.deleteDirectory sync

Author: rosen-vladimirov

lib/services/android-project-service.ts

@@ -182,7 +182,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				.map(dir => path.join(resDestinationDir, dir.dirName));
 			this.$logger.trace("Directories to clean:");
 			this.$logger.trace(directoriesToClean);
-			Future.wait(_.map(directoriesToClean, dir => this.$fs.deleteDirectory(dir)));
+			_.map(directoriesToClean, dir => this.$fs.deleteDirectory(dir));
 		}).future<void>()();
 	}
 
@@ -327,7 +327,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			let valuesDirRegExp = /^values/;
 			let resourcesDirs = this.$fs.readDirectory(resourcesDirPath).wait().filter(resDir => !resDir.match(valuesDirRegExp));
 			_.each(resourcesDirs, resourceDir => {
-				this.$fs.deleteDirectory(path.join(this.getAppResourcesDestinationDirectoryPath().wait(), resourceDir)).wait();
+				this.$fs.deleteDirectory(path.join(this.getAppResourcesDestinationDirectoryPath().wait(), resourceDir));
 			});
 		}).future<void>()();
 	}
@@ -372,11 +372,12 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}).future<void>()();
 	}
 
+	// TODO: Remove IFuture, reason: fs.deleteDirectory - blocked as the other implementation of the interface has async operations.
 	public removePluginNativeCode(pluginData: IPluginData): IFuture<void> {
 		return (() => {
 			try {
-				this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, "configurations", pluginData.name)).wait();
-				this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, "src", pluginData.name)).wait();
+				this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, "configurations", pluginData.name));
+				this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, "src", pluginData.name));
 			} catch (e) {
 				if (e.code === "ENOENT") {
 					this.$logger.debug("No native code jars found: " + e.message);

lib/services/app-files-updater.ts

@@ -47,7 +47,7 @@ export class AppFilesUpdater {
 	}
 
 	protected deleteDestinationItem(directoryItem: string): void {
-		this.fs.deleteDirectory(path.join(this.appDestinationDirectoryPath, directoryItem)).wait();
+		this.fs.deleteDirectory(path.join(this.appDestinationDirectoryPath, directoryItem));
 	}
 
 	protected readSourceDir(): string[] {

lib/services/ios-project-service.ts

@@ -541,7 +541,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 
 			filterFile(this.platformData.configurationFileName);
 
-			this.$fs.deleteDirectory(this.getAppResourcesDestinationDirectoryPath().wait()).wait();
+			this.$fs.deleteDirectory(this.getAppResourcesDestinationDirectoryPath().wait());
 		}).future<void>()();
 	}
 

lib/services/platform-service.ts

@@ -101,7 +101,7 @@ export class PlatformService implements IPlatformService {
 				let coreModuleName = this.addPlatformCore(platformData, frameworkDir).wait();
 				this.$npm.uninstall(coreModuleName, {save: true}, this.$projectData.projectDir).wait();
 			} catch (err) {
-				this.$fs.deleteDirectory(platformPath).wait();
+				this.$fs.deleteDirectory(platformPath);
 				throw err;
 			} finally {
 				spinner.stop();
@@ -292,7 +292,7 @@ export class PlatformService implements IPlatformService {
 				let appResourcesDestination = platformData.platformProjectService.getAppResourcesDestinationDirectoryPath().wait();
 				this.$fs.ensureDirectoryExists(appResourcesDestination).wait();
 				shell.cp("-Rf", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), appResourcesDestination);
-				this.$fs.deleteDirectory(appResourcesDirectoryPath).wait();
+				this.$fs.deleteDirectory(appResourcesDirectoryPath);
 			}
 		}).future<void>()();
 	}
@@ -406,7 +406,7 @@ export class PlatformService implements IPlatformService {
 				let platformData = this.$platformsData.getPlatformData(platform);
 
 				let platformDir = path.join(this.$projectData.platformsDir, platform);
-				this.$fs.deleteDirectory(platformDir).wait();
+				this.$fs.deleteDirectory(platformDir);
 				this.$projectDataService.removeProperty(platformData.frameworkPackageName).wait();
 
 				this.$logger.out(`Platform ${platform} successfully removed.`);

lib/services/project-service.ts

@@ -85,7 +85,7 @@ export class ProjectService implements IProjectService {
 				// TODO: plamen5kov: remove later (put only so tests pass (need to fix tests))
 				this.$logger.trace(`Using NativeScript verified template: ${templateName} with version undefined.`);
 			} catch (err) {
-				this.$fs.deleteDirectory(projectDir).wait();
+				this.$fs.deleteDirectory(projectDir);
 				throw err;
 			}
 			this.$logger.printMarkdown("Project `%s` was successfully created.", projectName);

lib/services/project-templates-service.ts

@@ -34,7 +34,7 @@ export class ProjectTemplatesService implements IProjectTemplatesService {
 
 			if(realTemplatePath) {
 				//this removes dependencies from templates so they are not copied to app folder
-				this.$fs.deleteDirectory(path.join(realTemplatePath, constants.NODE_MODULES_FOLDER_NAME)).wait();
+				this.$fs.deleteDirectory(path.join(realTemplatePath, constants.NODE_MODULES_FOLDER_NAME));
 				return realTemplatePath;
 			}
 

lib/tools/node-modules/node-modules-builder.ts

@@ -102,7 +102,7 @@ export class NodeModulesBuilder implements INodeModulesBuilder {
 				let tnsModulesPath = path.join(projectDir, constants.NODE_MODULES_FOLDER_NAME, constants.TNS_CORE_MODULES_NAME);
 				let tnsModulesInApp = this.$fs.readDirectory(tnsModulesPath).wait();
 				let modulesToDelete = _.difference(currentPreparedTnsModules, tnsModulesInApp);
-				_.each(modulesToDelete, moduleName => this.$fs.deleteDirectory(path.join(absoluteOutputPath, moduleName)).wait());
+				_.each(modulesToDelete, moduleName => this.$fs.deleteDirectory(path.join(absoluteOutputPath, moduleName)));
 			}
 
 			if (!lastModifiedTime || isNodeModulesModified) {

test/project-service.ts

@@ -155,7 +155,7 @@ describe("Project Service Tests", () => {
 			}).wait();
 			npmInstallationManager.install("tns-template-hello-world", defaultTemplateDir, {dependencyType: "save"}).wait();
 			defaultTemplatePath = path.join(defaultTemplateDir, "node_modules", "tns-template-hello-world");
-			fs.deleteDirectory(path.join(defaultTemplatePath, "node_modules")).wait();
+			fs.deleteDirectory(path.join(defaultTemplatePath, "node_modules"));
 
 			let defaultSpecificVersionTemplateDir = temp.mkdirSync("defaultTemplateSpeciffic");
 			fs.writeJson(path.join(defaultSpecificVersionTemplateDir, "package.json"), {
@@ -168,7 +168,7 @@ describe("Project Service Tests", () => {
 			}).wait();
 			npmInstallationManager.install("tns-template-hello-world", defaultSpecificVersionTemplateDir, {version: "1.4.0", dependencyType: "save"}).wait();
 			defaultSpecificVersionTemplatePath = path.join(defaultSpecificVersionTemplateDir, "node_modules", "tns-template-hello-world");
-			fs.deleteDirectory(path.join(defaultSpecificVersionTemplatePath, "node_modules")).wait();
+			fs.deleteDirectory(path.join(defaultSpecificVersionTemplatePath, "node_modules"));
 
 			let angularTemplateDir = temp.mkdirSync("angularTemplate");
 			fs.writeJson(path.join(angularTemplateDir, "package.json"), {
@@ -181,7 +181,7 @@ describe("Project Service Tests", () => {
 			}).wait();
 			npmInstallationManager.install("tns-template-hello-world-ng", angularTemplateDir, {dependencyType: "save"}).wait();
 			angularTemplatePath = path.join(angularTemplateDir, "node_modules", "tns-template-hello-world-ng");
-			fs.deleteDirectory(path.join(angularTemplatePath, "node_modules")).wait();
+			fs.deleteDirectory(path.join(angularTemplatePath, "node_modules"));
 
 			let typescriptTemplateDir = temp.mkdirSync("typescriptTemplate");
 			fs.writeJson(path.join(typescriptTemplateDir, "package.json"), {
@@ -194,7 +194,7 @@ describe("Project Service Tests", () => {
 			}).wait();
 			npmInstallationManager.install("tns-template-hello-world-ts", typescriptTemplateDir, {dependencyType: "save"}).wait();
 			typescriptTemplatePath = path.join(typescriptTemplateDir, "node_modules", "tns-template-hello-world-ts");
-			fs.deleteDirectory(path.join(typescriptTemplatePath, "node_modules")).wait();
+			fs.deleteDirectory(path.join(typescriptTemplatePath, "node_modules"));
 		});
 
 		it("creates valid project from default template", () => {

test/project-templates-service.ts

@@ -25,7 +25,6 @@ function createTestInjector(configuration?: {shouldNpmInstallThrow: boolean, npm
 			if(directory.indexOf("node_modules") !== -1) {
 				isDeleteDirectoryCalledForNodeModulesDir = true;
 			}
-			return Future.fromResult();
 		}
 
 	});