Merge pull request #4839 from NativeScript/kddimitrov/fix-update-invalid-tag

Kddimitrov/fix update invalid tag

Author: KristianDD

docs/man_pages/general/update.md

@@ -7,13 +7,15 @@ position: 16
 
 ### Description
 
-Updates the project with the latest versions of iOS/Android runtimes and cross-platform modules.
+Updates the project with the latest versions of iOS/Android runtimes, cross-platform modules and "nativescript-dev-webpack".
 In order to get the latest development release instead, pass `next` as argument:
 `tns update next`
 
 You can also switch to specific version by passing it to the command:
 `tns update 5.0.0`
 
+**NOTE:** The provided version should be an existing version of the project template for this project type.
+
 ### Commands
 
 Usage | Synopsis

docs/man_pages/project/configuration/update.md

@@ -10,7 +10,7 @@ export class UpdateControllerBase {
 		protected $packageInstallationManager: IPackageInstallationManager,
 		protected $packageManager: IPackageManager,
 		protected $pacoteService: IPacoteService) {
-		this.getPackageManifest = _.memoize(this._getManifestManifest, (...args) => {
+		this.getPackageManifest = _.memoize(this._getPackageManifest, (...args) => {
 			return args.join("@");
 		});
 	}
@@ -73,11 +73,13 @@ export class UpdateControllerBase {
 		return maxDependencyVersion;
 	}
 
-	private async _getManifestManifest(templateName: string, version?: string) {
-		const packageVersion = semver.valid(version) ||
-			await this.$packageManager.getTagVersion(templateName, version) ||
-			await this.$packageInstallationManager.getLatestCompatibleVersionSafe(templateName);
+	private async _getPackageManifest(templateName: string, version: string): Promise<any> {
+		const packageVersion = semver.valid(version) || await this.$packageManager.getTagVersion(templateName, version);
 
-		return await this.$pacoteService.manifest(`${templateName}@${packageVersion}`, { fullMetadata: true });
+		if (packageVersion && semver.valid(packageVersion)) {
+			return await this.$pacoteService.manifest(`${templateName}@${packageVersion}`, { fullMetadata: true });
+		} else {
+			throw new Error(`Failed to get information for package: ${templateName}@${version}`);
+		}
 	}
 }

lib/controllers/update-controller-base.ts

@@ -19,6 +19,7 @@ export class UpdateController extends UpdateControllerBase implements IUpdateCon
 	static readonly backupFolder: string = ".update_backup";
 	static readonly updateFailMessage: string = "Could not update the project!";
 	static readonly backupFailMessage: string = "Could not backup project folders!";
+	static readonly failedToGetTemplateManifestMessage = "Failed to get template information for the specified version. Original error: %s";
 
 	constructor(
 		protected $fs: IFileSystem,
@@ -29,6 +30,7 @@ export class UpdateController extends UpdateControllerBase implements IUpdateCon
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $addPlatformService: IAddPlatformService,
 		private $logger: ILogger,
+		private $errors: IErrors,
 		private $pluginsService: IPluginsService,
 		protected $pacoteService: IPacoteService,
 		private $projectDataService: IProjectDataService) {
@@ -58,8 +60,7 @@ export class UpdateController extends UpdateControllerBase implements IUpdateCon
 
 	public async shouldUpdate({ projectDir, version }: { projectDir: string, version?: string }): Promise<boolean> {
 		const projectData = this.$projectDataService.getProjectData(projectDir);
-		const templateName = this.getTemplateName(projectData);
-		const templateManifest = await this.getPackageManifest(templateName, version);
+		const templateManifest = await this.getTemplateManifest(projectData, version);
 		const dependencies = this.getUpdatableDependencies(templateManifest.dependencies);
 		const devDependencies = this.getUpdatableDependencies(templateManifest.devDependencies);
 
@@ -92,8 +93,7 @@ export class UpdateController extends UpdateControllerBase implements IUpdateCon
 	}
 
 	private async updateProject(projectData: IProjectData, version: string): Promise<void> {
-		const templateName = this.getTemplateName(projectData);
-		const templateManifest = await this.getPackageManifest(templateName, version);
+		const templateManifest = await this.getTemplateManifest(projectData, version);
 		const dependencies = this.getUpdatableDependencies(templateManifest.dependencies);
 		const devDependencies = this.getUpdatableDependencies(templateManifest.devDependencies);
 
@@ -208,6 +208,19 @@ export class UpdateController extends UpdateControllerBase implements IUpdateCon
 
 		return template;
 	}
+
+	private async getTemplateManifest(projectData: IProjectData, version: string): Promise<any> {
+		let templateManifest;
+		const templateName = this.getTemplateName(projectData);
+		version = version || await this.$packageInstallationManager.getLatestCompatibleVersionSafe(templateName);
+		try {
+			templateManifest = await this.getPackageManifest(templateName, version);
+		} catch (err) {
+			this.$errors.fail(UpdateController.failedToGetTemplateManifestMessage, err.message);
+		}
+
+		return templateManifest;
+	}
 }
 
 $injector.register("updateController", UpdateController);