fix() - ensure packageManager is used everywhere

Author: msc-ddiaz

lib/bootstrap.ts

@@ -84,7 +84,7 @@ $injector.requirePublic("npm", "./node-package-manager");
 $injector.requirePublic("yarn", "./yarn-package-manager");
 $injector.requireCommand("package-manager|set", "./commands/package-manager-set");
 
-$injector.require("npmInstallationManager", "./npm-installation-manager");
+$injector.require("packageInstallationManager", "./package-installation-manager");
 $injector.require("dynamicHelpProvider", "./dynamic-help-provider");
 $injector.require("mobilePlatformsCapabilities", "./mobile-platforms-capabilities");
 $injector.require("commandsServiceProvider", "./providers/commands-service-provider");

lib/declarations.d.ts

@@ -54,7 +54,7 @@ interface INodePackageManager {
 	getCachePath(): Promise<string>;
 }
 
-interface INpmInstallationManager {
+interface IPackageInstallationManager {
 	install(packageName: string, packageDir: string, options?: INpmInstallOptions): Promise<any>;
 	getLatestVersion(packageName: string): Promise<string>;
 	getNextVersion(packageName: string): Promise<string>;

lib/npm-installation-manager.ts renamed to lib/package-installation-manager.ts

@@ -2,8 +2,9 @@ import * as path from "path";
 import * as semver from "semver";
 import * as constants from "./constants";
 
-export class NpmInstallationManager implements INpmInstallationManager {
-	constructor(private $npm: INodePackageManager,
+export class PackageInstallationManager implements IPackageInstallationManager {
+	constructor(
+		private $packageManager: INodePackageManager,
 		private $childProcess: IChildProcess,
 		private $logger: ILogger,
 		private $settingsService: ISettingsService,
@@ -32,7 +33,7 @@ export class NpmInstallationManager implements INpmInstallationManager {
 			return latestVersion;
 		}
 
-		const data = await this.$npm.view(packageName, { "versions": true });
+		const data = await this.$packageManager.view(packageName, { "versions": true });
 
 		const maxSatisfying = semver.maxSatisfying(data, compatibleVersionRange);
 		return maxSatisfying || latestVersion;
@@ -144,18 +145,18 @@ export class NpmInstallationManager implements INpmInstallationManager {
 			npmOptions[dependencyType] = true;
 		}
 
-		return await this.$npm.install(packageName, pathToSave, npmOptions);
+		return await this.$packageManager.install(packageName, pathToSave, npmOptions);
 	}
 
 	/**
 	 * This function must not be used with packageName being a URL or local file,
 	 * because npm view doens't work with those
 	 */
 	private async getVersion(packageName: string, version: string): Promise<string> {
-		const data: any = await this.$npm.view(packageName, { "dist-tags": true });
+		const data: any = await this.$packageManager.view(packageName, { "dist-tags": true });
 		this.$logger.trace("Using version %s. ", data[version]);
 
 		return data[version];
 	}
 }
-$injector.register("npmInstallationManager", NpmInstallationManager);
+$injector.register("packageInstallationManager", PackageInstallationManager);

lib/services/extensibility-service.ts

@@ -14,7 +14,7 @@ export class ExtensibilityService implements IExtensibilityService {
 
 	constructor(private $fs: IFileSystem,
 		private $logger: ILogger,
-		private $npm: INodePackageManager,
+		private $packageManager: INodePackageManager,
 		private $settingsService: ISettingsService,
 		private $requireService: IRequireService) {
 	}
@@ -33,7 +33,7 @@ export class ExtensibilityService implements IExtensibilityService {
 		const localPath = path.resolve(extensionName);
 		const packageName = this.$fs.exists(localPath) ? localPath : extensionName;
 
-		const installResultInfo = await this.$npm.install(packageName, this.pathToExtensions, npmOpts);
+		const installResultInfo = await this.$packageManager.install(packageName, this.pathToExtensions, npmOpts);
 		this.$logger.trace(`Finished installation of extension '${extensionName}'. Trying to load it now.`);
 
 		return this.getInstalledExtensionData(installResultInfo.name);
@@ -45,7 +45,7 @@ export class ExtensibilityService implements IExtensibilityService {
 
 		await this.assertPackageJsonExists();
 
-		await this.$npm.uninstall(extensionName, { save: true }, this.pathToExtensions);
+		await this.$packageManager.uninstall(extensionName, { save: true }, this.pathToExtensions);
 
 		this.$logger.trace(`Finished uninstallation of extension '${extensionName}'.`);
 	}
@@ -112,7 +112,7 @@ export class ExtensibilityService implements IExtensibilityService {
 		let allExtensions: INpmsSingleResultData[] = [];
 
 		try {
-			const npmsResult = await this.$npm.searchNpms("nativescript:extension");
+			const npmsResult = await this.$packageManager.searchNpms("nativescript:extension");
 			allExtensions = npmsResult.results || [];
 		} catch (err) {
 			this.$logger.trace(`Unable to find extensions via npms. Error is: ${err}`);
@@ -127,7 +127,7 @@ export class ExtensibilityService implements IExtensibilityService {
 
 			try {
 				// now get full package.json for the latest version of the package
-				const registryData = await this.$npm.getRegistryPackageData(extensionName);
+				const registryData = await this.$packageManager.getRegistryPackageData(extensionName);
 				const latestPackageData = registryData.versions[registryData["dist-tags"].latest];
 				const commands: string[] = latestPackageData && latestPackageData.nativescript && latestPackageData.nativescript.commands;
 				if (commands && commands.length) {

lib/services/init-service.ts

@@ -22,7 +22,7 @@ export class InitService implements IInitService {
 		private $projectHelper: IProjectHelper,
 		private $prompter: IPrompter,
 		private $packageManager: INodePackageManager,
-		private $npmInstallationManager: INpmInstallationManager) { }
+		private $packageInstallationManager: IPackageInstallationManager) { }
 
 	public async initialize(): Promise<void> {
 		let projectData: any = {};
@@ -100,7 +100,7 @@ export class InitService implements IInitService {
 	}
 
 	private async getVersionData(packageName: string): Promise<IStringDictionary> {
-		const latestVersion = await this.$npmInstallationManager.getLatestCompatibleVersion(packageName);
+		const latestVersion = await this.$packageInstallationManager.getLatestCompatibleVersion(packageName);
 
 		if (this.useDefaultValue) {
 			return this.buildVersionData(latestVersion);

lib/services/ios-debug-service.ts

@@ -24,7 +24,7 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 		private $hostInfo: IHostInfo,
 		private $logger: ILogger,
 		private $errors: IErrors,
-		private $npmInstallationManager: INpmInstallationManager,
+		private $packageInstallationManager: IPackageInstallationManager,
 		private $iOSDebuggerPortService: IIOSDebuggerPortService,
 		private $iOSNotification: IiOSNotification,
 		private $iOSSocketRequestExecutor: IiOSSocketRequestExecutor,
@@ -219,7 +219,7 @@ export class IOSDebugService extends DebugServiceBase implements IPlatformDebugS
 
 	private async openAppInspector(fileDescriptor: string, debugData: IDebugData, debugOptions: IDebugOptions): Promise<void> {
 		if (debugOptions.client) {
-			const inspectorPath = await this.$npmInstallationManager.getInspectorFromCache(inspectorNpmPackageName, debugData.projectDir);
+			const inspectorPath = await this.$packageInstallationManager.getInspectorFromCache(inspectorNpmPackageName, debugData.projectDir);
 
 			const inspectorSourceLocation = path.join(inspectorPath, inspectorUiDir, "Main.html");
 			const inspectorApplicationPath = path.join(inspectorPath, inspectorAppName);

lib/services/nativescript-cloud-extension-service.ts

@@ -4,7 +4,7 @@ import * as semver from "semver";
 export class NativeScriptCloudExtensionService implements INativeScriptCloudExtensionService {
 	constructor(private $extensibilityService: IExtensibilityService,
 		private $logger: ILogger,
-		private $npmInstallationManager: INpmInstallationManager) { }
+		private $packageInstallationManager: IPackageInstallationManager) { }
 
 	public install(): Promise<IExtensionData> {
 		if (!this.isInstalled()) {
@@ -21,7 +21,7 @@ export class NativeScriptCloudExtensionService implements INativeScriptCloudExte
 	public async isLatestVersionInstalled(): Promise<boolean> {
 		const extensionData = this.getExtensionData();
 		if (extensionData) {
-			const latestVersion = await this.$npmInstallationManager.getLatestVersion(constants.NATIVESCRIPT_CLOUD_EXTENSION_NAME);
+			const latestVersion = await this.$packageInstallationManager.getLatestVersion(constants.NATIVESCRIPT_CLOUD_EXTENSION_NAME);
 			return semver.eq(latestVersion, extensionData.version);
 		}
 

lib/services/platform-service.ts

@@ -28,7 +28,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		private $errors: IErrors,
 		private $fs: IFileSystem,
 		private $logger: ILogger,
-		private $npmInstallationManager: INpmInstallationManager,
+		private $packageInstallationManager: IPackageInstallationManager,
 		private $platformsData: IPlatformsData,
 		private $projectDataService: IProjectDataService,
 		private $hooksService: IHooksService,
@@ -113,7 +113,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		} else {
 			if (!version) {
 				version = this.getCurrentPlatformVersion(platform, projectData) ||
-					await this.$npmInstallationManager.getLatestCompatibleVersion(platformData.frameworkPackageName);
+					await this.$packageInstallationManager.getLatestCompatibleVersion(platformData.frameworkPackageName);
 			}
 
 			packageToInstall = `${platformData.frameworkPackageName}@${version}`;
@@ -914,8 +914,8 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 		const installedModuleDir = temp.mkdirSync("runtime-to-update");
 		let newVersion = version === constants.PackageVersion.NEXT ?
-			await this.$npmInstallationManager.getNextVersion(platformData.frameworkPackageName) :
-			version || await this.$npmInstallationManager.getLatestCompatibleVersion(platformData.frameworkPackageName);
+			await this.$packageInstallationManager.getNextVersion(platformData.frameworkPackageName) :
+			version || await this.$packageInstallationManager.getLatestCompatibleVersion(platformData.frameworkPackageName);
 		await this.$pacoteService.extractPackage(`${platformData.frameworkPackageName}@${newVersion}`, installedModuleDir);
 		const cachedPackageData = this.$fs.readJson(path.join(installedModuleDir, "package.json"));
 		newVersion = (cachedPackageData && cachedPackageData.version) || newVersion;

lib/services/project-service.ts

@@ -19,7 +19,7 @@ export class ProjectService implements IProjectService {
 		private $projectNameService: IProjectNameService,
 		private $projectTemplatesService: IProjectTemplatesService,
 		private $staticConfig: IStaticConfig,
-		private $npmInstallationManager: INpmInstallationManager) { }
+		private $packageInstallationManager: IPackageInstallationManager) { }
 
 	public async validateProjectName(opts: { projectName: string, force: boolean, pathToProject: string }) : Promise<string> {
 		let projectName = opts.projectName;
@@ -245,7 +245,7 @@ export class ProjectService implements IProjectService {
 		const projectFilePath = path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
 		const packageJsonData = this.$fs.readJson(projectFilePath);
 
-		const version = await this.$npmInstallationManager.getLatestCompatibleVersion(constants.TNS_CORE_MODULES_NAME);
+		const version = await this.$packageInstallationManager.getLatestCompatibleVersion(constants.TNS_CORE_MODULES_NAME);
 		packageJsonData.dependencies[constants.TNS_CORE_MODULES_NAME] = version;
 
 		this.$fs.writeJson(projectFilePath, packageJsonData);

lib/services/project-templates-service.ts

@@ -10,7 +10,7 @@ export class ProjectTemplatesService implements IProjectTemplatesService {
 	public constructor(private $analyticsService: IAnalyticsService,
 		private $fs: IFileSystem,
 		private $logger: ILogger,
-		private $npmInstallationManager: INpmInstallationManager,
+		private $packageInstallationManager: IPackageInstallationManager,
 		private $pacoteService: IPacoteService,
 		private $errors: IErrors) { }
 
@@ -86,15 +86,15 @@ export class ProjectTemplatesService implements IProjectTemplatesService {
 
 	/**
 	 * Install verified NativeScript template in the npm cache.
-	 * The "special" here is that npmInstallationManager will check current CLI version and will instal best matching version of the template.
-	 * For example in case CLI is version 10.12.8, npmInstallationManager will try to find latest 10.12.x version of the template.
+	 * The "special" here is that packageInstallationManager will check current CLI version and will instal best matching version of the template.
+	 * For example in case CLI is version 10.12.8, packageInstallationManager will try to find latest 10.12.x version of the template.
 	 * @param {string} templateName The name of the verified NativeScript template.
 	 * @param {string} version The version of the template specified by user.
 	 * @return {string} Path to the directory where the template is installed.
 	 */
 	private async prepareNativeScriptTemplate(templateName: string, version?: string, projectDir?: string): Promise<string> {
 		this.$logger.trace(`Using NativeScript verified template: ${templateName} with version ${version}.`);
-		return this.$npmInstallationManager.install(templateName, projectDir, { version: version, dependencyType: "save" });
+		return this.$packageInstallationManager.install(templateName, projectDir, { version: version, dependencyType: "save" });
 	}
 
 	private getTemplateNameToBeTracked(templateName: string, packageJsonContent: any): string {

lib/services/versions-service.ts

@@ -17,7 +17,7 @@ class VersionsService implements IVersionsService {
 	private projectData: IProjectData;
 
 	constructor(private $fs: IFileSystem,
-		private $npmInstallationManager: INpmInstallationManager,
+		private $packageInstallationManager: IPackageInstallationManager,
 		private $injector: IInjector,
 		private $logger: ILogger,
 		private $staticConfig: Config.IStaticConfig,
@@ -28,7 +28,7 @@ class VersionsService implements IVersionsService {
 
 	public async getNativescriptCliVersion(): Promise<IVersionInformation> {
 		const currentCliVersion = this.$staticConfig.version;
-		const latestCliVersion = await this.$npmInstallationManager.getLatestVersion(constants.NATIVESCRIPT_KEY_NAME);
+		const latestCliVersion = await this.$packageInstallationManager.getLatestVersion(constants.NATIVESCRIPT_KEY_NAME);
 
 		return {
 			componentName: constants.NATIVESCRIPT_KEY_NAME,
@@ -38,7 +38,7 @@ class VersionsService implements IVersionsService {
 	}
 
 	public async getTnsCoreModulesVersion(): Promise<IVersionInformation> {
-		const latestTnsCoreModulesVersion = await this.$npmInstallationManager.getLatestVersion(constants.TNS_CORE_MODULES_NAME);
+		const latestTnsCoreModulesVersion = await this.$packageInstallationManager.getLatestVersion(constants.TNS_CORE_MODULES_NAME);
 		const nativescriptCoreModulesInfo: IVersionInformation = {
 			componentName: constants.TNS_CORE_MODULES_NAME,
 			latestVersion: latestTnsCoreModulesVersion
@@ -72,7 +72,7 @@ class VersionsService implements IVersionsService {
 		}
 
 		const runtimesVersions: IVersionInformation[] = await Promise.all(runtimes.map(async (runtime: string) => {
-			const latestRuntimeVersion = await this.$npmInstallationManager.getLatestVersion(runtime);
+			const latestRuntimeVersion = await this.$packageInstallationManager.getLatestVersion(runtime);
 			const runtimeInformation: IVersionInformation = {
 				componentName: runtime,
 				latestVersion: latestRuntimeVersion

test/npm-installation-manager.ts

@@ -4,7 +4,10 @@ import * as ErrorsLib from "../lib/common/errors";
 import * as FsLib from "../lib/common/file-system";
 import * as HostInfoLib from "../lib/common/host-info";
 import * as LoggerLib from "../lib/common/logger";
-import * as NpmInstallationManagerLib from "../lib/npm-installation-manager";
+import * as NpmLib from "../lib/node-package-manager";
+import * as YarnLib from "../lib/yarn-package-manager";
+import * as PackageManagerLib from "../lib/package-manager";
+import * as PackageInstallationManagerLib from "../lib/package-installation-manager";
 import * as OptionsLib from "../lib/options";
 import * as StaticConfigLib from "../lib/config";
 import * as yok from "../lib/common/yok";
@@ -28,7 +31,17 @@ function createTestInjector(): IInjector {
 	testInjector.register("devicePlatformsConstants", {});
 	testInjector.register("androidResourcesMigrationService", {});
 
-	testInjector.register("npmInstallationManager", NpmInstallationManagerLib.NpmInstallationManager);
+	testInjector.register("httpClient", {});
+	testInjector.register("pacoteService", {
+		manifest: () => Promise.resolve(),
+	});
+	testInjector.register("userSettingsService", {
+		getSettingValue: async (settingName: string): Promise<void> => undefined
+	});
+	testInjector.register("npm", NpmLib.NodePackageManager);
+	testInjector.register("yarn", YarnLib.YarnPackageManager);
+	testInjector.register("packageManager", PackageManagerLib.PackageManager);
+	testInjector.register("packageInstallationManager", PackageInstallationManagerLib.PackageInstallationManager);
 
 	return testInjector;
 }
@@ -185,11 +198,11 @@ describe("Npm installation manager tests", () => {
 				const staticConfig = testInjector.resolve("staticConfig");
 				staticConfig.version = currentTestData.cliVersion;
 
-				// Mock npmInstallationManager.getLatestVersion
-				const npmInstallationManager = testInjector.resolve("npmInstallationManager");
-				npmInstallationManager.getLatestVersion = (packageName: string) => Promise.resolve(currentTestData.packageLatestVersion);
+				// Mock packageInstallationManager.getLatestVersion
+				const packageInstallationManager = testInjector.resolve("packageInstallationManager");
+				packageInstallationManager.getLatestVersion = (packageName: string) => Promise.resolve(currentTestData.packageLatestVersion);
 
-				const actualLatestCompatibleVersion = await npmInstallationManager.getLatestCompatibleVersion("", currentTestData.referenceVersion);
+				const actualLatestCompatibleVersion = await packageInstallationManager.getLatestCompatibleVersion("", currentTestData.referenceVersion);
 				assert.equal(actualLatestCompatibleVersion, currentTestData.expectedResult);
 			});
 		});

test/npm-support.ts

@@ -51,7 +51,7 @@ function createTestInjector(): IInjector {
 	testInjector.register("platformsData", PlatformsDataLib.PlatformsData);
 	testInjector.register("platformService", PlatformServiceLib.PlatformService);
 	testInjector.register("logger", stubs.LoggerStub);
-	testInjector.register("npmInstallationManager", {
+	testInjector.register("packageInstallationManager", {
 		install: () => Promise.resolve()
 	});
 	testInjector.register("prompter", {});

test/platform-commands.ts

@@ -105,7 +105,7 @@ function createTestInjector() {
 	testInjector.register('platformService', PlatformServiceLib.PlatformService);
 	testInjector.register('errors', ErrorsNoFailStub);
 	testInjector.register('logger', stubs.LoggerStub);
-	testInjector.register('npmInstallationManager', stubs.NpmInstallationManagerStub);
+	testInjector.register('packageInstallationManager', stubs.PackageInstallationManagerStub);
 	testInjector.register('projectData', stubs.ProjectDataStub);
 	testInjector.register('platformsData', PlatformsData);
 	testInjector.register('devicesService', {});