Merge pull request #261 from NativeScript/fatme/remove-tns-releated-code-from-common

Move tns related code to common

Author: Fatme

lib/common

@@ -30,4 +30,5 @@ interface IPlatformProjectService {
 	buildProject(projectRoot: string): IFuture<void>;
 	isPlatformPrepared(projectRoot: string): IFuture<boolean>;
 	addLibrary(platformData: IPlatformData, libraryPath: string): IFuture<void>;
+	getDebugOnDeviceSetup(): Mobile.IDebugOnDeviceSetup;
 }

lib/definitions/project.d.ts

@@ -123,6 +123,10 @@ class AndroidProjectService implements IPlatformProjectService {
 		}).future<string>()();
     }
 
+	public getDebugOnDeviceSetup(): Mobile.IDebugOnDeviceSetup {
+		return { };
+	}
+
     private updateMetadata(projectRoot: string): void {
         var projMetadataDir = path.join(projectRoot, "assets", "metadata");
         var libsmetadataDir = path.join(projectRoot, "../../lib", this.platformData.normalizedPlatformName, AndroidProjectService.METADATA_DIRNAME);

lib/services/android-project-service.ts

@@ -20,7 +20,8 @@ class IOSProjectService implements  IPlatformProjectService {
 		private $childProcess: IChildProcess,
 		private $errors: IErrors,
 		private $logger: ILogger,
-		private $iOSEmulatorServices: Mobile.IEmulatorPlatformServices) { }
+		private $iOSEmulatorServices: Mobile.IEmulatorPlatformServices,
+		private $npm: INodePackageManager) { }
 
 	public get platformData(): IPlatformData {
 		return {
@@ -195,6 +196,25 @@ class IOSProjectService implements  IPlatformProjectService {
         }).future<void>()();
     }
 
+	public getDebugOnDeviceSetup(): Mobile.IDebugOnDeviceSetup {
+		var tnsIosPackage = "";
+		if(options.frameworkPath) {
+			if(this.$fs.getFsStats(options.frameworkPath).wait().isFile()) {
+				this.$errors.fail("frameworkPath option must be path to directory which contains tns-ios framework");
+			}
+
+			tnsIosPackage = path.resolve(options.frameworkPath);
+		} else {
+			tnsIosPackage = this.$npm.install("tns-ios").wait();
+		}
+
+		var safariPath = path.join(tnsIosPackage, "WebInspectorUI/Safari/Main.html");
+
+		return {
+			frontEndPath: safariPath
+		}
+	}
+
     private validateDynamicFramework(libraryPath: string): IFuture<void> {
         return (() => {
             var infoPlistPath = path.join(libraryPath, "Info.plist");

lib/services/ios-project-service.ts

@@ -210,14 +210,13 @@ export class PlatformService implements IPlatformService {
 	public debugOnDevice(platform: string): IFuture<void> {
 		return (() => {
 			platform = platform.toLowerCase();
-
+			var platformData = this.$platformsData.getPlatformData(platform);
 			var packageFile = "";
+			var platformData = this.$platformsData.getPlatformData(platform);
 
 			if (options["debug-brk"]) {
 				this.preparePlatform(platform).wait();
 
-				var platformData = this.$platformsData.getPlatformData(platform);
-
 				var cachedDeviceOption = options.forDevice;
 				options.forDevice = true;
 				this.buildPlatform(platform).wait();
@@ -227,8 +226,10 @@ export class PlatformService implements IPlatformService {
 				this.$logger.out("Using ", packageFile);
 			}
 
+			var debuggerSetup = platformData.platformProjectService.getDebugOnDeviceSetup();
+
 			this.$devicesServices.initialize({platform: platform, deviceId: options.device}).wait();
-			var action = (device: Mobile.IDevice): IFuture<void> => { return device.debug(packageFile, this.$projectData.projectId); };
+			var action = (device: Mobile.IDevice): IFuture<void> => { return device.debug(packageFile, this.$projectData.projectId, debuggerSetup)};
 			this.$devicesServices.execute(action).wait();
 
 		}).future<void>()();

lib/services/platform-service.ts

@@ -273,6 +273,9 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
     addLibrary(platformData: IPlatformData, libraryPath: string): IFuture<void> {
         return Future.fromResult();
     }
+	getDebugOnDeviceSetup(): Mobile.IDebugOnDeviceSetup {
+		return null;
+	}
 }
 
 export class ProjectDataService implements IProjectDataService {