Merge pull request #3362 from NativeScript/kerezov/speedup-livesync

refactor(livesync): speedup livesync

Author: Mitko-Kerezov

lib/commands/appstore-upload.ts

@@ -60,6 +60,7 @@ export class PublishIOS implements ICommand {
 			const platformInfo: IPreparePlatformInfo = {
 				platform,
 				appFilesUpdaterOptions,
+				skipModulesNativeCheck: !this.$options.syncAllFiles,
 				platformTemplate: this.$options.platformTemplate,
 				projectData: this.$projectData,
 				config: this.$options,

lib/commands/build.ts

@@ -18,6 +18,7 @@ export class BuildCommandBase extends BundleBase {
 		const platformInfo: IPreparePlatformInfo = {
 			platform,
 			appFilesUpdaterOptions,
+			skipModulesNativeCheck: !this.$options.syncAllFiles,
 			platformTemplate: this.$options.platformTemplate,
 			projectData: this.$projectData,
 			config: this.$options,

lib/commands/prepare.ts

@@ -14,6 +14,7 @@ export class PrepareCommand implements ICommand {
 		const platformInfo: IPreparePlatformInfo = {
 			platform: args[0],
 			appFilesUpdaterOptions,
+			skipModulesNativeCheck: !this.$options.syncAllFiles,
 			platformTemplate: this.$options.platformTemplate,
 			projectData: this.$projectData,
 			config: this.$options,

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 {
+interface IEnsureLatestAppPackageIsInstalledOnDeviceOptions extends IProjectDataComposition, IEnvOptions, IBundle, IRelease, ISkipNativeCheckOptional {
 	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 { }
+interface ICopyAppFilesData extends IProjectDataComposition, IAppFilesUpdaterOptionsComposition, IPlatformDataComposition, IOptionalFilesToSync { }
 
 interface IPreparePlatformService {
 	addPlatform(info: IAddPlatformInfo): Promise<void>;
@@ -319,14 +319,17 @@ interface IPreparePlatformCoreInfo extends IPreparePlatformInfoBase {
 	changesInfo?: IProjectChangesInfo;
 }
 
-interface IPreparePlatformInfo extends IPreparePlatformInfoBase, IPlatformConfig, IPlatformTemplate { }
+interface IPreparePlatformInfo extends IPreparePlatformInfoBase, IPlatformConfig, IPlatformTemplate, ISkipNativeCheckOptional { }
 
 interface IPlatformConfig {
 	config: IPlatformOptions;
 }
 
-interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions {
+interface IOptionalFilesToSync {
 	filesToSync?: string[];
+}
+
+interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions, IOptionalFilesToSync {
 	nativePrepare?: INativePrepare;
 }
 

lib/definitions/project-changes.d.ts

@@ -23,7 +23,17 @@ interface IProjectChangesInfo extends IAddedNativePlatform {
 	readonly changesRequirePrepare: boolean;
 }
 
-interface IProjectChangesOptions extends IAppFilesUpdaterOptions, IProvision, ITeamIdentifier {
+/**
+ * Describes interface for controlling checking node_modules for native changes.
+ */
+interface ISkipNativeCheckOptional {
+	/**
+	 * Designates node_modules should not be checked for native changes.
+	 */
+	skipModulesNativeCheck?: boolean;
+}
+
+interface IProjectChangesOptions extends IAppFilesUpdaterOptions, IProvision, ITeamIdentifier, ISkipNativeCheckOptional {
 	nativePlatformStatus?: "1" | "2" | "3";
 }
 

lib/services/app-files-updater.ts

@@ -4,17 +4,15 @@ import * as constants from "../constants";
 import * as fs from "fs";
 
 export class AppFilesUpdater {
-	constructor(
-		private appSourceDirectoryPath: string,
+	constructor(private appSourceDirectoryPath: string,
 		private appDestinationDirectoryPath: string,
 		public options: IAppFilesUpdaterOptions,
 		public fs: IFileSystem
 	) {
 	}
 
-	public updateApp(beforeCopyAction: (sourceFiles: string[]) => void): void {
-		this.cleanDestinationApp();
-		const sourceFiles = this.resolveAppSourceFiles();
+	public updateApp(beforeCopyAction: (sourceFiles: string[]) => void, filesToSync?: string[]): void {
+		const sourceFiles = filesToSync || this.resolveAppSourceFiles();
 
 		beforeCopyAction(sourceFiles);
 		this.copyAppSourceFiles(sourceFiles);

lib/services/livesync/livesync-service.ts

@@ -370,6 +370,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 				nativePrepare: nativePrepare,
 				filesToSync: options.modifiedFiles,
 				platformTemplate: null,
+				skipModulesNativeCheck: options.skipModulesNativeCheck,
 				config: platformSpecificOptions
 			};
 
@@ -459,6 +460,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 					deviceBuildInfoDescriptor,
 					liveSyncData,
 					settings,
+					skipModulesNativeCheck: !liveSyncData.watchAllFiles,
 					bundle: liveSyncData.bundle,
 					release: liveSyncData.release,
 					env: liveSyncData.env
@@ -568,7 +570,8 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 										modifiedFiles: allModifiedFiles,
 										bundle: liveSyncData.bundle,
 										release: liveSyncData.release,
-										env: liveSyncData.env
+										env: liveSyncData.env,
+										skipModulesNativeCheck: !liveSyncData.watchAllFiles
 									}, { skipNativePrepare: deviceBuildInfoDescriptor.skipNativePrepare });
 
 									const service = this.getLiveSyncService(device.deviceInfo.platform);

lib/services/platform-service.ts

@@ -190,7 +190,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 	public async preparePlatform(platformInfo: IPreparePlatformInfo): Promise<boolean> {
 		const platformData = this.$platformsData.getPlatformData(platformInfo.platform, platformInfo.projectData);
 
-		const changesInfo = await this.initialPrepare(platformInfo.platform, platformData, platformInfo.appFilesUpdaterOptions, platformInfo.platformTemplate, platformInfo.projectData, platformInfo.config, platformInfo.nativePrepare);
+		const changesInfo = await this.initialPrepare(platformInfo.platform, platformData, platformInfo.appFilesUpdaterOptions, platformInfo.platformTemplate, platformInfo.projectData, platformInfo.config, platformInfo.nativePrepare, platformInfo);
 		const requiresNativePrepare = (!platformInfo.nativePrepare || !platformInfo.nativePrepare.skipNativePrepare) && changesInfo.nativePlatformStatus === constants.NativePlatformStatus.requiresPrepare;
 
 		if (changesInfo.hasChanges || platformInfo.appFilesUpdaterOptions.bundle || requiresNativePrepare) {
@@ -237,7 +237,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		}
 	}
 
-	private async initialPrepare(platform: string, platformData: IPlatformData, appFilesUpdaterOptions: IAppFilesUpdaterOptions, platformTemplate: string, projectData: IProjectData, config: IPlatformOptions, nativePrepare?: INativePrepare): Promise<IProjectChangesInfo> {
+	private async initialPrepare(platform: string, platformData: IPlatformData, appFilesUpdaterOptions: IAppFilesUpdaterOptions, platformTemplate: string, projectData: IProjectData, config: IPlatformOptions, nativePrepare?: INativePrepare, skipNativeCheckOptions?: ISkipNativeCheckOptional): Promise<IProjectChangesInfo> {
 		this.validatePlatform(platform, projectData);
 
 		await this.trackProjectType(projectData);
@@ -254,7 +254,14 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 		const bundle = appFilesUpdaterOptions.bundle;
 		const nativePlatformStatus = (nativePrepare && nativePrepare.skipNativePrepare) ? constants.NativePlatformStatus.requiresPlatformAdd : constants.NativePlatformStatus.requiresPrepare;
-		const changesInfo = await this.$projectChangesService.checkForChanges(platform, projectData, { bundle, release: appFilesUpdaterOptions.release, provision: config.provision, teamId: config.teamId, nativePlatformStatus });
+		const changesInfo = await this.$projectChangesService.checkForChanges(platform, projectData, {
+			bundle,
+			release: appFilesUpdaterOptions.release,
+			provision: config.provision,
+			teamId: config.teamId,
+			nativePlatformStatus,
+			skipModulesNativeCheck: skipNativeCheckOptions.skipModulesNativeCheck
+		});
 
 		this.$logger.trace("Changes info in prepare platform:", changesInfo);
 		return changesInfo;

lib/services/prepare-platform-service.ts

@@ -25,6 +25,6 @@ export class PreparePlatformService {
 		const appUpdater = new AppFilesUpdater(appSourceDirectoryPath, appDestinationDirectoryPath, copyAppFilesData.appFilesUpdaterOptions, this.$fs);
 		appUpdater.updateApp(sourceFiles => {
 			this.$xmlValidator.validateXmlFiles(sourceFiles);
-		});
+		}, copyAppFilesData.filesToSync);
 	}
 }