Merge branch 'feat/pkg-mngr-impl' into refactor/pkg-mgr-replace

Author: msc-ddiaz

lib/package-manager.ts

@@ -1,5 +1,5 @@
 
-import { exported } from './common/decorators';
+import { cache, exported, invokeInit } from './common/decorators';
 export class PackageManager implements INodePackageManager {
 	private packageManager: INodePackageManager;
 
@@ -9,47 +9,62 @@ export class PackageManager implements INodePackageManager {
 		private $options: IOptions,
 		private $yarn: INodePackageManager,
 		private $userSettingsService: IUserSettingsService
-	) {
-		this._determinePackageManager();
+	) {}
+
+	@cache()
+	protected async init(): Promise<void> {
+		this.packageManager = await this._determinePackageManager();
 	}
+
 	@exported("packageManager")
+	@invokeInit()
 	public install(packageName: string, pathToSave: string, config: INodePackageManagerInstallOptions): Promise<INpmInstallResultInfo> {
 		return this.packageManager.install(packageName, pathToSave, config);
 	}
 	@exported("packageManager")
+	@invokeInit()
 	public uninstall(packageName: string, config?: IDictionary<string | boolean>, path?: string): Promise<string> {
 		return this.packageManager.uninstall(packageName, config, path);
 	}
 	@exported("packageManager")
+	@invokeInit()
 	public view(packageName: string, config: Object): Promise<any> {
 		return this.packageManager.view(packageName, config);
 	}
 	@exported("packageManager")
+	@invokeInit()
 	public search(filter: string[], config: IDictionary<string | boolean>): Promise<string> {
 		return this.packageManager.search(filter, config);
 	}
+
+	@invokeInit()
 	public searchNpms(keyword: string): Promise<INpmsResult> {
 		return this.packageManager.searchNpms(keyword);
 	}
+
+	@invokeInit()
 	public getRegistryPackageData(packageName: string): Promise<any> {
 		return this.packageManager.getRegistryPackageData(packageName);
 	}
+
+	@invokeInit()
 	public getCachePath(): Promise<string> {
 		return this.packageManager.getCachePath();
 	}
 
-	private _determinePackageManager(): void {
-		this.$userSettingsService.getSettingValue('packageManager')
-		.then((pm: string) => {
-			if (pm === 'yarn' || this.$options.yarn) {
-				this.packageManager = this.$yarn;
-			} else {
-				this.packageManager = this.$npm;
-			}
-		})
-		.catch((err) => {
+	private async _determinePackageManager(): Promise<INodePackageManager> {
+		let pm = null;
+		try {
+			pm = await this.$userSettingsService.getSettingValue('packageManager');
+		} catch (err) {
 			this.$errors.fail(`Unable to read package manager config from user settings ${err}`);
-		});
+		}
+
+		if (pm === 'yarn' || this.$options.yarn) {
+			return this.$yarn;
+		} else {
+			return this.$npm;
+		}
 	}
 }
 

lib/yarn-package-manager.ts

@@ -79,7 +79,8 @@ export class YarnPackageManager extends BasePackageManager implements INodePacka
 
 	@exported("yarn")
 	public search(filter: string[], config: IDictionary<string | boolean>): Promise<string> {
-		throw new Error("Method not implemented. Yarn does not support searching for packages in the registry.");
+		this.$errors.fail("Method not implemented. Yarn does not support searching for packages in the registry.");
+		return null;
 	}
 
 	public async searchNpms(keyword: string): Promise<INpmsResult> {
@@ -102,7 +103,8 @@ export class YarnPackageManager extends BasePackageManager implements INodePacka
 
 	@exported("yarn")
 	getCachePath(): Promise<string> {
-		throw new Error("Method not implemented.");
+		this.$errors.fail("Method not implemented");
+		return null;
 	}
 }