Merge pull request #820 from NativeScript/totev/guard-npm-assert

Guard against errors in npm

Author: teobugslayer

lib/node-package-manager.ts

@@ -6,10 +6,6 @@ import * as npm from "npm";
 
 export class NodePackageManager implements INodePackageManager {
 	constructor(private $childProcess: IChildProcess,
-		private $logger: ILogger,
-		private $errors: IErrors,
-		private $fs: IFileSystem,
-		private $lockfile: ILockFile,
 		private $options: IOptions) { }
 
 	public getCache(): string {
@@ -18,7 +14,7 @@ export class NodePackageManager implements INodePackageManager {
 
 	public load(config?: any): IFuture<void> {
 		let future = new Future<void>();
-		npm.load(config, (err) => {
+		npm.load(config, (err: Error) => {
 			if(err) {
 				future.throw(err);
 			} else {

lib/services/platform-service.ts

@@ -75,11 +75,11 @@ export class PlatformService implements IPlatformService {
 				npmOptions["version"] = version;
 			}
 
-			let downloadedPackagePath = this.$npmInstallationManager.install(packageToInstall, npmOptions).wait();
-			let frameworkDir = path.join(downloadedPackagePath, constants.PROJECT_FRAMEWORK_FOLDER_NAME);
-			frameworkDir = path.resolve(frameworkDir);
-
 			try {
+				let downloadedPackagePath = this.$npmInstallationManager.install(packageToInstall, npmOptions).wait();
+				let frameworkDir = path.join(downloadedPackagePath, constants.PROJECT_FRAMEWORK_FOLDER_NAME);
+				frameworkDir = path.resolve(frameworkDir);
+
 				this.addPlatformCore(platformData, frameworkDir).wait();
 			} catch(err) {
 				this.$fs.deleteDirectory(platformPath).wait();