Expose saveBuildInfoFile

Expose
* saveBuildInfoFile - method which should be used in cloud builds
* livesyncService - which can be used to perform livesync with require-d tns

Author: Dimitar Kerezov

lib/bootstrap.ts

@@ -104,7 +104,7 @@ $injector.require("devicePathProvider", "./device-path-provider");
 
 $injector.requireCommand("platform|clean", "./commands/platform-clean");
 
-$injector.require("liveSyncService", "./services/livesync/livesync-service"); // The name is used in https://github.com/NativeScript/nativescript-dev-typescript
+$injector.requirePublicClass("liveSyncService", "./services/livesync/livesync-service"); // The name is used in https://github.com/NativeScript/nativescript-dev-typescript
 $injector.require("debugLiveSyncService", "./services/livesync/debug-livesync-service");
 $injector.require("androidLiveSyncService", "./services/livesync/android-livesync-service");
 $injector.require("iOSLiveSyncService", "./services/livesync/ios-livesync-service");

lib/common

@@ -195,6 +195,15 @@ interface IPlatformService extends NodeJS.EventEmitter {
 	 * @returns {Promise<void>}
 	 */
 	trackActionForPlatform(actionData: ITrackPlatformAction): Promise<void>;
+
+	/**
+	 * Saves build information in a proprietary file.
+	 * @param {string} platform The build platform.
+	 * @param {string} projectDir The project's directory.
+	 * @param {string} buildInfoFileDirname The directory where the build file should be written to.
+	 * @returns {void}
+	 */
+	saveBuildInfoFile(platform: string, projectDir: string, buildInfoFileDirname: string): void
 }
 
 interface IAddPlatformCoreOptions extends IPlatformSpecificData, ICreateProjectOptions { }

lib/definitions/platform.d.ts

@@ -1,8 +1,8 @@
 import * as path from "path";
 import * as choki from "chokidar";
 import { EventEmitter } from "events";
-import { exported } from "../../common/decorators";
 import { hook } from "../../common/helpers";
+import { FileExtensions } from "../../common/constants";
 
 const LiveSyncEvents = {
 	liveSyncStopped: "liveSyncStopped",
@@ -30,8 +30,6 @@ export class LiveSyncService extends EventEmitter implements ILiveSyncService {
 		super();
 	}
 
-	// TODO: Add finishLivesync method in the platform specific services
-	@exported("liveSyncService")
 	@hook("liveSync")
 	public async liveSync(deviceDescriptors: ILiveSyncDeviceInfo[],
 		liveSyncData: ILiveSyncInfo): Promise<void> {
@@ -54,7 +52,6 @@ export class LiveSyncService extends EventEmitter implements ILiveSyncService {
 		}
 	}
 
-	@exported("liveSyncService")
 	public async stopLiveSync(projectDir: string, deviceIdentifiers?: string[], ): Promise<void> {
 		const liveSyncProcessInfo = this.liveSyncProcessesInfo[projectDir];
 
@@ -91,7 +88,12 @@ export class LiveSyncService extends EventEmitter implements ILiveSyncService {
 
 				// Kill typescript watcher
 				// TODO: Pass the projectDir in hooks args.
-				await this.$hooksService.executeAfterHooks('watch');
+				const projectData = this.$projectDataService.getProjectData(projectDir);
+				await this.$hooksService.executeAfterHooks('watch', {
+					hookArgs: {
+						projectData
+					}
+				});
 
 				this.emit(LiveSyncEvents.liveSyncStopped, { projectDir });
 			}
@@ -155,7 +157,10 @@ export class LiveSyncService extends EventEmitter implements ILiveSyncService {
 		if (preparedPlatforms.indexOf(platform) === -1) {
 			preparedPlatforms.push(platform);
 			// TODO: fix args cast to any
-			await this.$platformService.preparePlatform(platform, <any>{}, null, projectData, <any>{}, modifiedFiles);
+			await this.$platformService.preparePlatform(platform, {
+				bundle: false,
+				release: false,
+			}, null, projectData, <any>{}, modifiedFiles);
 		}
 
 		const rebuildInfo = _.find(rebuiltInformation, info => info.isEmulator === device.isEmulator && info.platform === platform);
@@ -169,18 +174,16 @@ export class LiveSyncService extends EventEmitter implements ILiveSyncService {
 
 		// TODO: fix args cast to any
 		const shouldBuild = await this.$platformService.shouldBuild(platform, projectData, <any>{ buildForDevice: !device.isEmulator }, deviceBuildInfoDescriptor.outputPath);
+		let pathToBuildItem = null;
 		if (shouldBuild) {
-			const pathToBuildItem = await deviceBuildInfoDescriptor.buildAction();
+			pathToBuildItem = await deviceBuildInfoDescriptor.buildAction();
 			// Is it possible to return shouldBuild for two devices? What about android device and android emulator?
 			rebuiltInformation.push({ isEmulator: device.isEmulator, platform, pathToBuildItem });
-			await this.$platformService.installApplication(device, { release: false }, projectData, pathToBuildItem, deviceBuildInfoDescriptor.outputPath);
-
 		}
 
 		const shouldInstall = await this.$platformService.shouldInstall(device, projectData, deviceBuildInfoDescriptor.outputPath);
 		if (shouldInstall) {
-
-			await this.$platformService.installApplication(device, { release: false }, projectData, null, deviceBuildInfoDescriptor.outputPath);
+			await this.$platformService.installApplication(device, { release: false }, projectData, pathToBuildItem, deviceBuildInfoDescriptor.outputPath);
 		}
 	}
 
@@ -319,7 +322,11 @@ export class LiveSyncService extends EventEmitter implements ILiveSyncService {
 				this.liveSyncProcessesInfo[liveSyncData.projectDir].timer = timeoutTimer;
 			};
 
-			await this.$hooksService.executeBeforeHooks('watch');
+			await this.$hooksService.executeBeforeHooks('watch', {
+				hookArgs: {
+					projectData
+				}
+			});
 
 			const watcherOptions: choki.WatchOptions = {
 				ignoreInitial: true,
@@ -345,7 +352,10 @@ export class LiveSyncService extends EventEmitter implements ILiveSyncService {
 						filesToRemove.push(filePath);
 					}
 
-					startTimeout();
+					// Do not sync typescript files directly - wait for javascript changes to occur in order to restart the app only once
+					if (path.extname(filePath) !== FileExtensions.TYPESCRIPT_FILE) {
+						startTimeout();
+					}
 				});
 
 			this.liveSyncProcessesInfo[liveSyncData.projectDir].watcherInfo = { watcher, pattern };

lib/services/livesync/livesync-service.ts

@@ -438,23 +438,31 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 		await attachAwaitDetach(constants.BUILD_OUTPUT_EVENT_NAME, platformData.platformProjectService, handler, platformData.platformProjectService.buildProject(platformData.projectRoot, projectData, buildConfig));
 
-		let prepareInfo = this.$projectChangesService.getPrepareInfo(platform, projectData);
-		let buildInfoFilePath = this.getBuildOutputPath(platform, platformData, buildConfig);
-		let buildInfoFile = path.join(buildInfoFilePath, buildInfoFileName);
-		let buildInfo: IBuildInfo = {
+		const buildInfoFilePath = this.getBuildOutputPath(platform, platformData, buildConfig);
+		this.saveBuildInfoFile(platform, projectData.projectDir, buildInfoFilePath);
+
+		this.$logger.out("Project successfully built.");
+	}
+
+	public saveBuildInfoFile(platform: string, projectDir: string, buildInfoFileDirname: string): void {
+		let buildInfoFile = path.join(buildInfoFileDirname, buildInfoFileName);
+
+		let prepareInfo = this.$projectChangesService.getPrepareInfo(platform, this.$projectDataService.getProjectData(projectDir));
+		let buildInfo = {
 			prepareTime: prepareInfo.changesRequireBuildTime,
 			buildTime: new Date().toString()
 		};
+
 		this.$fs.writeJson(buildInfoFile, buildInfo);
-		this.$logger.out("Project successfully built.");
 	}
 
 	public async shouldInstall(device: Mobile.IDevice, projectData: IProjectData, outputPath?: string): Promise<boolean> {
 		let platform = device.deviceInfo.platform;
-		let platformData = this.$platformsData.getPlatformData(platform, projectData);
 		if (!(await device.applicationManager.isApplicationInstalled(projectData.projectId))) {
 			return true;
 		}
+
+		let platformData = this.$platformsData.getPlatformData(platform, projectData);
 		let deviceBuildInfo: IBuildInfo = await this.getDeviceBuildInfo(device, projectData);
 		let localBuildInfo = this.getBuildInfo(platform, platformData, { buildForDevice: !device.isEmulator }, outputPath);
 		return !localBuildInfo || !deviceBuildInfo || deviceBuildInfo.buildTime !== localBuildInfo.buildTime;

lib/services/platform-service.ts

@@ -20,6 +20,7 @@ describe("nativescript-cli-lib", () => {
 		deviceLogProvider: null,
 		npm: ["install", "uninstall", "view", "search"],
 		extensibilityService: ["loadExtensions", "loadExtension", "getInstalledExtensions", "installExtension", "uninstallExtension"],
+		liveSyncService: ["liveSync", "stopLiveSync"],
 		analyticsService: ["startEqatecMonitor"],
 		debugService: ["debug"]
 	};

test/nativescript-cli-lib.ts

@@ -623,6 +623,10 @@ export class PlatformServiceStub extends EventEmitter implements IPlatformServic
 		return [];
 	}
 
+	public saveBuildInfoFile(platform: string, projectDir: string, buildInfoFileDirname: string): void {
+		return;
+	}
+
 	public async removePlatforms(platforms: string[]): Promise<void> {
 
 	}