Remove files from iOS simulator

Fixes NativeScript/nativescript-cli#1210

Author: Fatme Havaluova

definitions/mobile.d.ts

@@ -302,9 +302,10 @@ declare module Mobile {
 	interface IiOSSimulatorService extends IEmulatorPlatformServices {
 		postDarwinNotification(notification: string): IFuture<void>;
 		sync(appIdentifier: string, projectFilesPath: string, notRunningSimulatorAction: () => IFuture<void>, getApplicationPathForiOSSimulatorAction: () => IFuture<string>): IFuture<void>;
-		syncFiles(appIdentifier: string, projectFilesPath: string,  projectFiles: string[], notRunningSimulatorAction: () => IFuture<void>, getApplicationPathForiOSSimulatorAction: () => IFuture<string>, relativeToProjectBasePathAction?: (projectFile: string) => string): IFuture<void>;
+		syncFiles(appIdentifier: string, projectFilesPath: string, projectFiles: string[], notRunningSimulatorAction: () => IFuture<void>, getApplicationPathForiOSSimulatorAction: () => IFuture<string>, relativeToProjectBasePathAction?: (projectFile: string) => string): IFuture<void>;
 		isSimulatorRunning(): IFuture<boolean>;
-		transferFiles(appIdentifier: string, projectFiles: string[], relativeToProjectBasePathAction?: (_projectFile: string) => string, applicationPath?: string): IFuture<void>
+		transferFiles(appIdentifier: string, projectFiles: string[], relativeToProjectBasePathAction?: (_projectFile: string) => string, applicationPath?: string): IFuture<void>;
+		removeFiles(appIdentifier: string, projectFilesPath: string, projectFiles: string[], notRunningSimulatorAction: () => IFuture<void>, getApplicationPathForiOSSimulatorAction: () => IFuture<string>, relativeToProjectBasePathAction?: (projectFile: string) => string): IFuture<void>;
 	}
 
 	interface IEmulatorSettingsService {

mobile/ios/ios-emulator-services.ts

@@ -72,6 +72,22 @@ class IosEmulatorServices implements Mobile.IiOSSimulatorService {
 		return this.syncCore(appIdentifier, notRunningSimulatorAction, syncAction, getApplicationPathForiOSSimulatorAction);
 	}
 
+	public removeFiles(appIdentifier: string, projectFilesPath: string, projectFiles: string[], notRunningSimulatorAction: () => IFuture<void>, getApplicationPathForiOSSimulatorAction: () => IFuture<string>, relativeToProjectBasePathAction?: (_projectFile: string) => string): IFuture<void> {
+		let syncAction = (applicationPath: string) => this.removeFilesCore(appIdentifier, applicationPath, projectFilesPath, projectFiles, relativeToProjectBasePathAction);
+		return this.syncCore(appIdentifier, notRunningSimulatorAction, syncAction, getApplicationPathForiOSSimulatorAction);
+	}
+
+	private removeFilesCore(appIdentifier: string, applicationPath: string, projectFilesPath: string, projectFiles: string[], relativeToProjectBasePathAction?: (_projectFile: string) => string): IFuture<void> {
+		return (() => {
+			applicationPath = applicationPath || this.getApplicationPath(appIdentifier);
+			_.each(projectFiles, projectFile => {
+				let destinationFilePath = path.join(applicationPath, relativeToProjectBasePathAction(projectFile), path.relative(projectFilesPath, projectFile));
+				this.$logger.trace(`Deleting ${destinationFilePath}.`);
+				shell.rm(destinationFilePath);
+			});
+		}).future<void>()();
+	}
+
 	public transferFiles(appIdentifier: string, projectFiles: string[], relativeToProjectBasePathAction?: (_projectFile: string) => string, applicationPath?: string): IFuture<void> {
 		return (() => {
 			applicationPath = applicationPath || this.getApplicationPath(appIdentifier);

services/usb-livesync-service-base.ts

@@ -167,28 +167,35 @@ export class UsbLiveSyncServiceBase implements IUsbLiveSyncServiceBase {
 
 	private processRemovedFile(data: ILiveSyncData, filePath: string): void {
 		this.$dispatcher.dispatch(() => (() => {
-			if (!this.isInitialized) {
-				this.$devicesService.initialize({ platform: data.platform, deviceId: this.$options.device }).wait();
-			}
+			let synciOSSimulator = this.shouldSynciOSSimulator(data.platform).wait();
+			if (synciOSSimulator) {
+				let fileToSync = data.beforeBatchLiveSyncAction ? data.beforeBatchLiveSyncAction(filePath).wait() : filePath;
+				this.$iOSEmulatorServices.removeFiles(data.appIdentifier, data.projectFilesPath, [fileToSync], data.notRunningiOSSimulatorAction, data.getApplicationPathForiOSSimulatorAction, data.iOSSimulatorRelativeToProjectBasePathAction).wait();
+			} else {
+				if (!this.isInitialized) {
+					this.$devicesService.initialize({ platform: data.platform, deviceId: this.$options.device }).wait();
+				}
 
-			let action = (device: Mobile.IDevice) => {
-				return (() => {
-					let fileToSync = data.beforeBatchLiveSyncAction ? data.beforeBatchLiveSyncAction(filePath).wait() : filePath;
-					let localToDevicePaths = this.createLocalToDevicePaths(data.platform, data.appIdentifier, data.localProjectRootPath || data.projectFilesPath, [fileToSync]);
-					let platformSpecificLiveSyncService = this.resolvePlatformSpecificLiveSyncService(data.platform, device, data.platformSpecificLiveSyncServices);
-					platformSpecificLiveSyncService.removeFile(data.appIdentifier, localToDevicePaths).wait();
-
-					let canExecuteFastLiveSync = data.canExecuteFastLiveSync && data.canExecuteFastLiveSync(filePath);
-					if (canExecuteFastLiveSync) {
-						data.fastLiveSync(filePath);
-					} else {
-						let platform = data.platform ? this.$mobileHelper.normalizePlatformName(data.platform) : this.$devicesService.platform;
-						let deviceAppData =  this.$deviceAppDataFactory.create(data.appIdentifier, this.$mobileHelper.normalizePlatformName(platform));
-						platformSpecificLiveSyncService.restartApplication(deviceAppData, localToDevicePaths).wait();
-					}
-				}).future<void>()();
-			};
-			this.$devicesService.execute(action).wait();
+				let action = (device: Mobile.IDevice) => {
+					return (() => {
+						let fileToSync = data.beforeBatchLiveSyncAction ? data.beforeBatchLiveSyncAction(filePath).wait() : filePath;
+						let localToDevicePaths = this.createLocalToDevicePaths(data.platform, data.appIdentifier, data.localProjectRootPath || data.projectFilesPath, [fileToSync]);
+						let platformSpecificLiveSyncService = this.resolvePlatformSpecificLiveSyncService(data.platform, device, data.platformSpecificLiveSyncServices);
+						platformSpecificLiveSyncService.removeFile(data.appIdentifier, localToDevicePaths).wait();
+
+						let canExecuteFastLiveSync = data.canExecuteFastLiveSync && data.canExecuteFastLiveSync(filePath);
+						if (canExecuteFastLiveSync) {
+							data.fastLiveSync(filePath);
+						} else {
+							let platform = data.platform ? this.$mobileHelper.normalizePlatformName(data.platform) : this.$devicesService.platform;
+							let deviceAppData =  this.$deviceAppDataFactory.create(data.appIdentifier, this.$mobileHelper.normalizePlatformName(platform));
+							platformSpecificLiveSyncService.restartApplication(deviceAppData, localToDevicePaths).wait();
+						}
+					}).future<void>()();
+				};
+
+				this.$devicesService.execute(action).wait();
+			}
 		}).future<void>()());
 	}