Merge pull request #4848 from NativeScript/tachev/skip-migration-on-force

feat: skip migration check based on --force

Author: Dimitar Tachev

lib/commands/build.ts

@@ -74,7 +74,9 @@ export class BuildIosCommand extends BuildCommandBase implements ICommand {
 
 	public async canExecute(args: string[]): Promise<boolean | ICanExecuteCommandOutput> {
 		const platform = this.$devicePlatformsConstants.iOS;
-		await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [platform] });
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [platform] });
+		}
 
 		super.validatePlatform(platform);
 
@@ -120,7 +122,9 @@ export class BuildAndroidCommand extends BuildCommandBase implements ICommand {
 
 	public async canExecute(args: string[]): Promise<boolean | ICanExecuteCommandOutput> {
 		const platform = this.$devicePlatformsConstants.Android;
-		await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [platform] });
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [platform] });
+		}
 		this.$androidBundleValidatorHelper.validateRuntimeVersion(this.$projectData);
 		let result = await super.canExecuteCommandBase(platform, { notConfiguredEnvOptions: { hideSyncToPreviewAppOption: true } });
 		if (result.canExecute) {

lib/commands/debug.ts

@@ -53,7 +53,9 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 	}
 
 	public async canExecute(args: string[]): Promise<ICanExecuteCommandOutput> {
-		await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [this.platform] });
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [this.platform] });
+		}
 
 		this.$androidBundleValidatorHelper.validateNoAab();
 

lib/commands/prepare.ts

@@ -33,7 +33,11 @@ export class PrepareCommand extends ValidatePlatformCommandBase implements IComm
 		const platform = args[0];
 		const result = await this.$platformCommandParameter.validate(platform) &&
 			await this.$platformValidationService.validateOptions(this.$options.provision, this.$options.teamId, this.$projectData, platform);
-		await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [platform] });
+
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [platform] });
+		}
+
 		if (!result) {
 			return false;
 		}

lib/commands/preview.ts

@@ -41,7 +41,9 @@ export class PreviewCommand implements ICommand {
 			this.$errors.fail(`The arguments '${args.join(" ")}' are not valid for the preview command.`);
 		}
 
-		await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [] });
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [] });
+		}
 
 		await this.$networkConnectivityValidator.validate();
 		return true;

lib/commands/run.ts

@@ -14,6 +14,7 @@ export class RunCommandBase implements ICommand {
 		private $hostInfo: IHostInfo,
 		private $liveSyncCommandHelper: ILiveSyncCommandHelper,
 		private $migrateController: IMigrateController,
+		private $options: IOptions,
 		private $projectData: IProjectData
 	) { }
 
@@ -36,7 +37,11 @@ export class RunCommandBase implements ICommand {
 		this.$androidBundleValidatorHelper.validateNoAab();
 		this.$projectData.initializeProjectData();
 		const platforms = this.platform ? [this.platform] : [this.$devicePlatformsConstants.Android, this.$devicePlatformsConstants.iOS];
-		await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms });
+
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms });
+		}
+
 		await this.$liveSyncCommandHelper.validatePlatform(this.platform);
 
 		return true;

lib/commands/test.ts

@@ -49,7 +49,9 @@ abstract class TestCommandBase {
 	}
 
 	async canExecute(args: string[]): Promise<boolean | ICanExecuteCommandOutput> {
-		await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [this.platform] });
+		if (!this.$options.force) {
+			await this.$migrateController.validate({ projectDir: this.$projectData.projectDir, platforms: [this.platform] });
+		}
 
 		this.$projectData.initializeProjectData();
 		this.$analyticsService.setShouldDispose(this.$options.justlaunch || !this.$options.watch);

lib/controllers/migrate-controller.ts

@@ -26,6 +26,7 @@ Running this command will ${MigrateController.COMMON_MIGRATE_MESSAGE}`;
 		private $addPlatformService: IAddPlatformService,
 		private $pluginsService: IPluginsService,
 		private $projectDataService: IProjectDataService,
+		private $platformValidationService: IPlatformValidationService,
 		private $resources: IResourceLoader) {
 		super($fs, $platformCommandHelper, $platformsDataService, $packageInstallationManager, $packageManager, $pacoteService);
 	}
@@ -159,6 +160,9 @@ Running this command will ${MigrateController.COMMON_MIGRATE_MESSAGE}`;
 
 		for (let platform of platforms) {
 			platform = platform && platform.toLowerCase();
+			if (!this.$platformValidationService.isValidPlatform(platform, projectData)) {
+				continue;
+			}
 
 			const hasRuntimeDependency = this.hasRuntimeDependency({ platform, projectData });
 			if (hasRuntimeDependency && await this.shouldUpdateRuntimeVersion(this.verifiedPlatformVersions[platform.toLowerCase()], platform, projectData, allowInvalidVersions)) {

lib/declarations.d.ts

@@ -1021,6 +1021,11 @@ interface IPlatformValidationService {
 	 */
 	validatePlatform(platform: string, projectData: IProjectData): void;
 
+	/**
+	 * Returns whether the passed platform is a valid one (from the supported ones)
+	 */
+	isValidPlatform(platform: string, projectData: IProjectData): boolean;
+
 	/**
 	 * Gets first chance to validate the options provided as command line arguments.
 	 * If no platform is provided or a falsy (null, undefined, "", false...) platform is provided,

lib/services/platform/platform-validation-service.ts

@@ -11,14 +11,25 @@ export class PlatformValidationService implements IPlatformValidationService {
 		private $platformsDataService: IPlatformsDataService
 	) { }
 
-	public validatePlatform(platform: string, projectData: IProjectData): void {
+	public isValidPlatform(platform: string, projectData: IProjectData): boolean {
 		if (!platform) {
-			this.$errors.fail("No platform specified.");
+			return false;
 		}
 
 		platform = platform.split("@")[0].toLowerCase();
-
 		if (!this.$platformsDataService.getPlatformData(platform, projectData)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	public validatePlatform(platform: string, projectData: IProjectData): void {
+		if (!platform) {
+			this.$errors.fail("No platform specified.");
+		}
+
+		if (!this.isValidPlatform(platform, projectData)) {
 			const platformNames = helpers.formatListOfNames(this.$mobileHelper.platformNames);
 			this.$errors.fail(`Invalid platform ${platform}. Valid platforms are ${platformNames}.`);
 		}