Merge pull request #3388 from NativeScript/kerezov/fix-livesync-delete

fix(livesync): delete files during livesync

Author: rosen-vladimirov

lib/definitions/livesync.d.ts

@@ -152,7 +152,7 @@ interface IProjectDataComposition {
 /**
  * Desribes object that can be passed to ensureLatestAppPackageIsInstalledOnDevice method.
  */
-interface IEnsureLatestAppPackageIsInstalledOnDeviceOptions extends IProjectDataComposition, IEnvOptions, IBundle, IRelease, ISkipNativeCheckOptional {
+interface IEnsureLatestAppPackageIsInstalledOnDeviceOptions extends IProjectDataComposition, IEnvOptions, IBundle, IRelease, ISkipNativeCheckOptional, IOptionalFilesToRemove, IOptionalFilesToSync {
 	device: Mobile.IDevice;
 	preparedPlatforms: string[];
 	rebuiltInformation: ILiveSyncBuildInfo[];

lib/definitions/platform.d.ts

@@ -296,7 +296,7 @@ interface IPlatformDataComposition {
 	platformData: IPlatformData;
 }
 
-interface ICopyAppFilesData extends IProjectDataComposition, IAppFilesUpdaterOptionsComposition, IPlatformDataComposition, IOptionalFilesToSync { }
+interface ICopyAppFilesData extends IProjectDataComposition, IAppFilesUpdaterOptionsComposition, IPlatformDataComposition, IOptionalFilesToSync, IOptionalFilesToRemove { }
 
 interface IPreparePlatformService {
 	addPlatform(info: IAddPlatformInfo): Promise<void>;
@@ -329,10 +329,18 @@ interface IOptionalFilesToSync {
 	filesToSync?: string[];
 }
 
-interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions, IOptionalFilesToSync {
+interface IOptionalFilesToRemove {
+	filesToRemove?: string[];
+}
+
+interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions, IOptionalFilesToSync, IOptionalFilesToRemove {
 	nativePrepare?: INativePrepare;
 }
 
 interface IDeployPlatformInfo extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IPlatformConfig, IEnvOptions {
 	deployOptions: IDeployPlatformOptions
 }
+
+interface IUpdateAppOptions extends IOptionalFilesToSync, IOptionalFilesToRemove {
+	beforeCopyAction: (sourceFiles: string[]) => void;
+}

lib/services/app-files-updater.ts

@@ -11,20 +11,31 @@ export class AppFilesUpdater {
 	) {
 	}
 
-	public updateApp(beforeCopyAction: (sourceFiles: string[]) => void, filesToSync?: string[]): void {
-		const sourceFiles = filesToSync || this.resolveAppSourceFiles();
+	public updateApp(updateAppOptions: IUpdateAppOptions): void {
+		this.cleanDestinationApp(updateAppOptions);
+		const sourceFiles = updateAppOptions.filesToSync || this.resolveAppSourceFiles();
 
-		beforeCopyAction(sourceFiles);
+		updateAppOptions.beforeCopyAction(sourceFiles);
 		this.copyAppSourceFiles(sourceFiles);
 	}
 
-	public cleanDestinationApp(): void {
-		// Delete the destination app in order to prevent EEXIST errors when symlinks are used.
-		let destinationAppContents = this.readDestinationDir();
-		destinationAppContents = destinationAppContents.filter(
-			(directoryName: string) => directoryName !== constants.TNS_MODULES_FOLDER_NAME);
+	public cleanDestinationApp(updateAppOptions?: IUpdateAppOptions): void {
+		let itemsToRemove: string[];
 
-		_(destinationAppContents).each((directoryItem: string) => {
+		if (updateAppOptions && updateAppOptions.filesToRemove) {
+			// We get here during LiveSync - we only want to get rid of files, that the file system watcher detected were deleted
+			itemsToRemove = updateAppOptions.filesToRemove.map(fileToRemove => path.relative(this.appSourceDirectoryPath, fileToRemove));
+		} else {
+			// We get here during the initial sync before the file system watcher is even started
+			// delete everything and prepare everything anew just to be sure
+			// Delete the destination app in order to prevent EEXIST errors when symlinks are used.
+			itemsToRemove = this.readDestinationDir();
+			itemsToRemove = itemsToRemove.filter(
+				(directoryName: string) => directoryName !== constants.TNS_MODULES_FOLDER_NAME);
+
+		}
+
+		_(itemsToRemove).each((directoryItem: string) => {
 			this.deleteDestinationItem(directoryItem);
 		});
 	}

lib/services/livesync/livesync-service.ts

@@ -368,7 +368,8 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 				projectData: options.projectData,
 				env: options.env,
 				nativePrepare: nativePrepare,
-				filesToSync: options.modifiedFiles,
+				filesToSync: options.filesToSync,
+				filesToRemove: options.filesToRemove,
 				platformTemplate: null,
 				skipModulesNativeCheck: options.skipModulesNativeCheck,
 				config: platformSpecificOptions
@@ -568,6 +569,8 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 										deviceBuildInfoDescriptor,
 										settings: latestAppPackageInstalledSettings,
 										modifiedFiles: allModifiedFiles,
+										filesToRemove: currentFilesToRemove,
+										filesToSync: currentFilesToSync,
 										bundle: liveSyncData.bundle,
 										release: liveSyncData.release,
 										env: liveSyncData.env,

lib/services/platform-service.ts

@@ -209,6 +209,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 				platformInfo.env,
 				changesInfo,
 				platformInfo.filesToSync,
+				platformInfo.filesToRemove,
 				platformInfo.nativePrepare,
 			);
 			this.$projectChangesService.savePrepareInfo(platformInfo.platform, platformInfo.projectData);
@@ -269,7 +270,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 	/* Hooks are expected to use "filesToSync" parameter, as to give plugin authors additional information about the sync process.*/
 	@helpers.hook('prepare')
-	private async preparePlatformCore(platform: string, appFilesUpdaterOptions: IAppFilesUpdaterOptions, projectData: IProjectData, platformSpecificData: IPlatformSpecificData, env: Object, changesInfo?: IProjectChangesInfo, filesToSync?: string[], nativePrepare?: INativePrepare): Promise<void> {
+	private async preparePlatformCore(platform: string, appFilesUpdaterOptions: IAppFilesUpdaterOptions, projectData: IProjectData, platformSpecificData: IPlatformSpecificData, env: Object, changesInfo?: IProjectChangesInfo, filesToSync?: string[], filesToRemove?: string[], nativePrepare?: INativePrepare): Promise<void> {
 		this.$logger.out("Preparing project...");
 
 		const platformData = this.$platformsData.getPlatformData(platform, projectData);
@@ -283,6 +284,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 			platformSpecificData,
 			changesInfo,
 			filesToSync,
+			filesToRemove,
 			env
 		});
 

lib/services/prepare-platform-service.ts

@@ -23,8 +23,13 @@ export class PreparePlatformService {
 		const appSourceDirectoryPath = path.join(copyAppFilesData.projectData.projectDir, constants.APP_FOLDER_NAME);
 
 		const appUpdater = new AppFilesUpdater(appSourceDirectoryPath, appDestinationDirectoryPath, copyAppFilesData.appFilesUpdaterOptions, this.$fs);
-		appUpdater.updateApp(sourceFiles => {
-			this.$xmlValidator.validateXmlFiles(sourceFiles);
-		}, copyAppFilesData.filesToSync);
+		const appUpdaterOptions: IUpdateAppOptions = {
+			beforeCopyAction: sourceFiles => {
+				this.$xmlValidator.validateXmlFiles(sourceFiles);
+			},
+			filesToSync: copyAppFilesData.filesToSync,
+			filesToRemove: copyAppFilesData.filesToRemove
+		};
+		appUpdater.updateApp(appUpdaterOptions);
 	}
 }