fix(tvos): address review findings for the tvOS platform integration

- Plugins keep their native code for visionOS and tvOS in platforms/ios.
  Change detection and native-file watching now resolve that folder the
  same way preparation already did (IMobileHelper.getPluginPlatformsFolderName),
  so an edit to a plugin's iOS sources is seen by tvOS/visionOS builds and
  watch mode.
- getEmulatorImages only queried iOS simulators for the iOS platform, so
  startEmulator could not find a simulator for tvOS or visionOS.
- ios-sim-portable 4.5.4 for tvOS simulator discovery
  (NativeScript/ios-sim-portable#135); also brings package-lock back in
  sync with package.json.

Author: NathanWalker

lib/common/definitions/mobile.d.ts

@@ -1108,6 +1108,12 @@ declare global {
 			isvisionOSPlatform(platform: string): boolean;
 			istvOSPlatform(platform: string): boolean;
 			isApplePlatform(platform: string): boolean;
+			/**
+			 * The platforms/<name> folder a plugin's native code for the platform is read
+			 * from. visionOS and tvOS build from the iOS native project, so they consume
+			 * platforms/ios.
+			 */
+			getPluginPlatformsFolderName(platform: string): string;
 			normalizePlatformName(platform: string): string;
 			validatePlatformName(platform: string): string;
 			buildDevicePath(...args: string[]): string;

lib/common/mobile/mobile-core/devices-service.ts

@@ -163,7 +163,7 @@ export class DevicesService
 			this.$hostInfo.isDarwin &&
 			(!options ||
 				!options.platform ||
-				this.$mobileHelper.isiOSPlatform(options.platform))
+				this.$mobileHelper.isApplePlatform(options.platform))
 		) {
 			result.ios = await this.$iOSEmulatorServices.getEmulatorImages();
 		}
@@ -1203,7 +1203,7 @@ export class DevicesService
 	private getEmulatorError(error: Error, platform: string): string {
 		let emulatorName = constants.DeviceTypes.Emulator;
 
-		if (this.$mobileHelper.isiOSPlatform(platform)) {
+		if (this.$mobileHelper.isApplePlatform(platform)) {
 			emulatorName = constants.DeviceTypes.Simulator;
 		}
 

lib/common/mobile/mobile-helper.ts

@@ -13,7 +13,7 @@ export class MobileHelper implements Mobile.IMobileHelper {
 		private $errors: IErrors,
 		private $fs: IFileSystem,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
-		private $tempService: ITempService
+		private $tempService: ITempService,
 	) {}
 
 	public get platformNames(): string[] {
@@ -65,6 +65,12 @@ export class MobileHelper implements Mobile.IMobileHelper {
 		);
 	}
 
+	public getPluginPlatformsFolderName(platform: string): string {
+		return this.isApplePlatform(platform)
+			? this.$devicePlatformsConstants.iOS.toLowerCase()
+			: platform.toLowerCase();
+	}
+
 	public normalizePlatformName(platform: string): string {
 		if (this.isAndroidPlatform(platform)) {
 			return "Android";
@@ -92,7 +98,7 @@ export class MobileHelper implements Mobile.IMobileHelper {
 			this.$errors.fail(
 				"'%s' is not a valid device platform. Valid platforms are %s.",
 				platform,
-				helpers.formatListOfNames(this.platformNames)
+				helpers.formatListOfNames(this.platformNames),
 			);
 		}
 
@@ -101,7 +107,7 @@ export class MobileHelper implements Mobile.IMobileHelper {
 
 	public buildDevicePath(...args: string[]): string {
 		return this.correctDevicePath(
-			args.join(MobileHelper.DEVICE_PATH_SEPARATOR)
+			args.join(MobileHelper.DEVICE_PATH_SEPARATOR),
 		);
 	}
 
@@ -116,15 +122,15 @@ export class MobileHelper implements Mobile.IMobileHelper {
 	public async getDeviceFileContent(
 		device: Mobile.IDevice,
 		deviceFilePath: string,
-		projectData: IProjectData
+		projectData: IProjectData,
 	): Promise<string> {
 		const uniqueFilePath = await this.$tempService.path({ suffix: ".tmp" });
 		const platform = device.deviceInfo.platform.toLowerCase();
 		try {
 			await device.fileSystem.getFile(
 				deviceFilePath,
 				projectData.projectIdentifiers[platform],
-				uniqueFilePath
+				uniqueFilePath,
 			);
 		} catch (e) {
 			return null;

lib/common/test/unit-tests/mobile/devices-service.ts

@@ -173,6 +173,9 @@ class AndroidEmulatorServices {
 	public getRunningEmulator(emulatorId: string): Promise<Mobile.IDeviceInfo> {
 		return null;
 	}
+	public async getEmulatorImages(): Promise<Mobile.IEmulatorImagesOutput> {
+		return { devices: [], errors: [] };
+	}
 }
 
 class IOSEmulatorServices {
@@ -193,6 +196,9 @@ class IOSEmulatorServices {
 	public async getRunningEmulator(): Promise<Mobile.IDeviceInfo> {
 		return null;
 	}
+	public async getEmulatorImages(): Promise<Mobile.IEmulatorImagesOutput> {
+		return { devices: [], errors: [] };
+	}
 }
 
 function createTestInjector(): IInjector {
@@ -210,19 +216,22 @@ function createTestInjector(): IInjector {
 	testInjector.register("prompter", {});
 
 	testInjector.register("mobileHelper", {
-		platformNames: ["ios", "android", "visionos"],
+		platformNames: ["ios", "android", "visionos", "tvos"],
 		validatePlatformName: (platform: string) => platform.toLowerCase(),
 		isiOSPlatform: (platform: string) =>
 			!!(platform && platform.toLowerCase() === "ios"),
 		isAndroidPlatform: (platform: string) =>
 			!!(platform && platform.toLowerCase() === "android"),
 		isvisionOSPlatform: (platform: string) =>
 			!!(platform && platform.toLowerCase() === "visionos"),
+		istvOSPlatform: (platform: string) =>
+			!!(platform && platform.toLowerCase() === "tvos"),
 		isApplePlatform: (platform: string) =>
 			!!(
 				platform &&
 				(platform.toLowerCase() === "ios" ||
-					platform.toLowerCase() === "visionos")
+					platform.toLowerCase() === "visionos" ||
+					platform.toLowerCase() === "tvos")
 			),
 	});
 
@@ -542,6 +551,26 @@ describe("devicesService", () => {
 		);
 	});
 
+	describe("getEmulatorImages", () => {
+		it("lists iOS simulators for every Apple platform", async () => {
+			testInjector.resolve("hostInfo").isDarwin = true;
+			for (const platform of ["iOS", "visionOS", "tvOS"]) {
+				const result = await devicesService.getEmulatorImages({ platform });
+				assert.isDefined(result.ios, platform);
+				assert.isUndefined(result.android, platform);
+			}
+		});
+
+		it("lists only Android emulators for Android", async () => {
+			testInjector.resolve("hostInfo").isDarwin = true;
+			const result = await devicesService.getEmulatorImages({
+				platform: "android",
+			});
+			assert.isUndefined(result.ios);
+			assert.isDefined(result.android);
+		});
+	});
+
 	describe("startEmulatorIfNecessary behaves as expected:", () => {
 		it("throws error if --device and --emulator flags are passed simultaniously", () => {
 			assert.isRejected(

lib/controllers/prepare-controller.ts

@@ -414,7 +414,9 @@ export class PrepareController
 			path.join(
 				dep.directory,
 				PLATFORMS_DIR_NAME,
-				platformData.platformNameLowerCase,
+				this.$mobileHelper.getPluginPlatformsFolderName(
+					platformData.platformNameLowerCase,
+				),
 			),
 		);
 		const pluginsPackageJsonFiles = dependencies.map((dep) =>

lib/services/plugins-service.ts

@@ -640,16 +640,10 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
 				);
 			pluginData.isPlugin = !!cacheData.nativescript;
 			pluginData.pluginPlatformsFolderPath = (platform: string) => {
-				if (
-					this.$mobileHelper.isvisionOSPlatform(platform) ||
-					this.$mobileHelper.istvOSPlatform(platform)
-				) {
-					platform = constants.PlatformTypes.ios;
-				}
 				return path.join(
 					pluginData.fullPath,
 					"platforms",
-					platform.toLowerCase(),
+					this.$mobileHelper.getPluginPlatformsFolderName(platform),
 				);
 			};
 			const data = cacheData.nativescript;