Fix coding style. Improve implmentation. Add try-catch block for prepareNodeModules.

Author: e2l3n

lib/node-package-manager.ts

@@ -56,9 +56,7 @@ export class NodePackageManager implements INodePackageManager {
 	}
 
 	public executeNpmCommand(npmCommandName: string, currentWorkingDirectory: string): IFuture<any> {
-		return (() => {
-			return this.$childProcess.exec(npmCommandName, { cwd: currentWorkingDirectory }).wait();
-		}).future<any>()();
+		return this.$childProcess.exec(npmCommandName, { cwd: currentWorkingDirectory });
 	}
 
 	private loadAndExecute(commandName: string, args: any[], opts?: { config?: any, subCommandName?: string }): IFuture<any> {

lib/services/platform-service.ts

@@ -175,10 +175,16 @@ export class PlatformService implements IPlatformService {
 			platformData.platformProjectService.prepareProject().wait();
 
 			// Process node_modules folder
-			this.$pluginsService.ensureAllDependenciesAreInstalled().wait();
-			let tnsModulesDestinationPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, PlatformService.TNS_MODULES_FOLDER_NAME);
-			this.$broccoliBuilder.prepareNodeModules(tnsModulesDestinationPath, this.$projectData.projectDir, platform, lastModifiedTime).wait();
-
+			try {
+				this.$pluginsService.ensureAllDependenciesAreInstalled().wait();
+				let tnsModulesDestinationPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, PlatformService.TNS_MODULES_FOLDER_NAME);
+				this.$broccoliBuilder.prepareNodeModules(tnsModulesDestinationPath, this.$projectData.projectDir, platform, lastModifiedTime).wait();
+			} catch(error) {
+				this.$logger.debug(error);
+				this.$logger.error("Processing tns core modules failed.");
+				shell.rm("-rf", appResourcesDirectoryPath);
+			}
+			
 			// Process platform specific files
 			let directoryPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
 			let excludedDirs = [constants.APP_RESOURCES_FOLDER_NAME];

lib/services/project-service.ts

@@ -116,10 +116,10 @@ export class ProjectService implements IProjectService {
 			let tnsModulesVersion: string = this.$options.tnsModulesVersion;
 			let packageName: string  = constants.TNS_CORE_MODULES_NAME;
 			if (tnsModulesVersion) {
-				packageName = packageName.concat("@" + tnsModulesVersion);
+				packageName = `${packageName}@${tnsModulesVersion}`;
 			}
 
-			this.$npm.executeNpmCommand("npm install " + packageName + " --save --save-exact", projectDir).wait();
+			this.$npm.executeNpmCommand(`npm install ${packageName} --save --save-exact`, projectDir).wait();
 		}).future<void>()();
 	}
 

test/project-service.ts

@@ -2,9 +2,9 @@
 "use strict";
 
 import yok = require('../lib/common/yok');
-import ChildProcessLib = require("../lib/common/child-process");
 import stubs = require('./stubs');
-import constants = require("./../lib/constants");
+import * as constants from "./../lib/constants";
+import * as ChildProcessLib from "../lib/common/child-process";
 
 import ProjectServiceLib = require("../lib/services/project-service");
 import ProjectDataServiceLib = require("../lib/services/project-data-service");
@@ -88,7 +88,7 @@ class ProjectIntegrationTest {
 			assert.equal(actualAppId, expectedAppId);
 
 			let tnsCoreModulesRecord = fs.readJson(tnsProjectFilePath).wait()["dependencies"][constants.TNS_CORE_MODULES_NAME];
-			assert.isTrue(tnsCoreModulesRecord != null);
+			assert.isTrue(tnsCoreModulesRecord !== null);
 
 			var actualFiles = fs.enumerateFilesInDirectorySync(options.copyFrom);
 			var expectedFiles = fs.enumerateFilesInDirectorySync(appDirectoryPath);