refactor(catalyst): name the platform catalyst rather than macos

farfromrefug · claude · farfromrefug · commit 26860f89c5f1 · 2026-08-11T17:39:11.000+02:00
`ns run macos` is being taken by a separate effort that builds a native macOS
app against a macOS runtime. That is a different product from a Mac Catalyst
build -- the iOS app rebuilt against the macOS SDK -- so this one takes the name
that says what it actually is: `ns build catalyst`, `ns run catalyst`,
preparing into platforms/catalyst.

Only the platform identifier changes; the build, device and LiveSync behaviour
is untouched.

Co-Authored-By: Claude Opus 5 &lt;noreply@anthropic.com&gt;
diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts
@@ -183,7 +183,7 @@ injector.requireCommand("run|ios", "./commands/run");
 injector.requireCommand("run|android", "./commands/run");
 injector.requireCommand("run|vision", "./commands/run");
 injector.requireCommand("run|visionos", "./commands/run");
-injector.requireCommand("run|macos", "./commands/run");
+injector.requireCommand("run|catalyst", "./commands/run");
 injector.requireCommand("typings", "./commands/typings");
 
 injector.requireCommand("preview", "./commands/preview");
@@ -199,7 +199,7 @@ injector.requireCommand("build|ios", "./commands/build");
 injector.requireCommand("build|android", "./commands/build");
 injector.requireCommand("build|vision", "./commands/build");
 injector.requireCommand("build|visionos", "./commands/build");
-injector.requireCommand("build|macos", "./commands/build");
+injector.requireCommand("build|catalyst", "./commands/build");
 injector.requireCommand("deploy", "./commands/deploy");
 
 injector.requireCommand("embed", "./commands/embedding/embed");
diff --git a/lib/commands/build.ts b/lib/commands/build.ts
@@ -282,7 +282,7 @@ injector.registerCommand("build|visionos", BuildVisionOsCommand);
 /**
  * Builds the iOS target against the macOS SDK as a Mac Catalyst app.
  */
-export class BuildMacOsCommand extends BuildIosCommand implements ICommand {
+export class BuildCatalystCommand extends BuildIosCommand implements ICommand {
 	constructor(
 		protected $options: IOptions,
 		$errors: IErrors,
@@ -311,12 +311,12 @@ export class BuildMacOsCommand extends BuildIosCommand implements ICommand {
 
 	public async execute(args: string[]): Promise<void> {
 		await this.executeCore([
-			this.$devicePlatformsConstants.macOS.toLowerCase(),
+			this.$devicePlatformsConstants.Catalyst.toLowerCase(),
 		]);
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {
-		const platform = this.$devicePlatformsConstants.macOS;
+		const platform = this.$devicePlatformsConstants.Catalyst;
 		if (!this.$options.force) {
 			await this.$migrateController.validate({
 				projectDir: this.$projectData.projectDir,
@@ -335,4 +335,4 @@ export class BuildMacOsCommand extends BuildIosCommand implements ICommand {
 	}
 }
 
-injector.registerCommand("build|macos", BuildMacOsCommand);
+injector.registerCommand("build|catalyst", BuildCatalystCommand);
diff --git a/lib/commands/run.ts b/lib/commands/run.ts
@@ -30,20 +30,20 @@ export class RunCommandBase implements ICommand {
 		private $migrateController: IMigrateController,
 		private $options: IOptions,
 		private $projectData: IProjectData,
-		private $keyCommandHelper: IKeyCommandHelper
+		private $keyCommandHelper: IKeyCommandHelper,
 	) {}
 
 	public allowedParameters: ICommandParameter[] = [];
 	public async execute(args: string[]): Promise<void> {
 		await this.$liveSyncCommandHelper.executeCommandLiveSync(
 			this.platform,
-			this.liveSyncCommandHelperAdditionalOptions
+			this.liveSyncCommandHelperAdditionalOptions,
 		);
 
 		if (process.env.NS_IS_INTERACTIVE) {
 			this.$keyCommandHelper.attachKeyCommands(
 				this.platform as IKeyCommandPlatform,
-				"run"
+				"run",
 			);
 		}
 	}
@@ -64,7 +64,7 @@ export class RunCommandBase implements ICommand {
 			: [
 					this.$devicePlatformsConstants.Android,
 					this.$devicePlatformsConstants.iOS,
-			  ];
+				];
 
 		if (!this.$options.force) {
 			await this.$migrateController.validate({
@@ -100,7 +100,7 @@ export class RunIosCommand implements ICommand {
 		protected $injector: IInjector,
 		protected $options: IOptions,
 		protected $platformValidationService: IPlatformValidationService,
-		protected $projectDataService: IProjectDataService
+		protected $projectDataService: IProjectDataService,
 	) {}
 
 	public async execute(args: string[]): Promise<void> {
@@ -113,11 +113,11 @@ export class RunIosCommand implements ICommand {
 		if (
 			!this.$platformValidationService.isPlatformSupportedForOS(
 				this.platform,
-				projectData
+				projectData,
 			)
 		) {
 			this.$errors.fail(
-				`Applications for platform ${this.platform} can not be built on this OS`
+				`Applications for platform ${this.platform} can not be built on this OS`,
 			);
 		}
 
@@ -127,7 +127,7 @@ export class RunIosCommand implements ICommand {
 				this.$options.provision,
 				this.$options.teamId,
 				projectData,
-				this.platform.toLowerCase()
+				this.platform.toLowerCase(),
 			));
 		return result;
 	}
@@ -154,7 +154,7 @@ export class RunAndroidCommand implements ICommand {
 		private $injector: IInjector,
 		private $options: IOptions,
 		private $platformValidationService: IPlatformValidationService,
-		private $projectData: IProjectData
+		private $projectData: IProjectData,
 	) {}
 
 	public async execute(args: string[]): Promise<void> {
@@ -167,11 +167,11 @@ export class RunAndroidCommand implements ICommand {
 		if (
 			!this.$platformValidationService.isPlatformSupportedForOS(
 				this.$devicePlatformsConstants.Android,
-				this.$projectData
+				this.$projectData,
 			)
 		) {
 			this.$errors.fail(
-				`Applications for platform ${this.$devicePlatformsConstants.Android} can not be built on this OS`
+				`Applications for platform ${this.$devicePlatformsConstants.Android} can not be built on this OS`,
 			);
 		}
 
@@ -190,7 +190,7 @@ export class RunAndroidCommand implements ICommand {
 			this.$options.provision,
 			this.$options.teamId,
 			this.$projectData,
-			this.$devicePlatformsConstants.Android.toLowerCase()
+			this.$devicePlatformsConstants.Android.toLowerCase(),
 		);
 	}
 }
@@ -208,15 +208,15 @@ export class RunVisionOSCommand extends RunIosCommand {
 		protected $injector: IInjector,
 		protected $options: IOptions,
 		protected $platformValidationService: IPlatformValidationService,
-		protected $projectDataService: IProjectDataService
+		protected $projectDataService: IProjectDataService,
 	) {
 		super(
 			$devicePlatformsConstants,
 			$errors,
 			$injector,
 			$options,
 			$platformValidationService,
-			$projectDataService
+			$projectDataService,
 		);
 	}
 }
@@ -227,9 +227,9 @@ injector.registerCommand("run|visionos", RunVisionOSCommand);
 /**
  * Runs the Mac Catalyst build of the app on this machine.
  */
-export class RunMacOSCommand extends RunIosCommand {
+export class RunCatalystCommand extends RunIosCommand {
 	public get platform(): string {
-		return this.$devicePlatformsConstants.macOS;
+		return this.$devicePlatformsConstants.Catalyst;
 	}
 
 	constructor(
@@ -251,4 +251,4 @@ export class RunMacOSCommand extends RunIosCommand {
 	}
 }
 
-injector.registerCommand("run|macos", RunMacOSCommand);
+injector.registerCommand("run|catalyst", RunCatalystCommand);
diff --git a/lib/common/definitions/mobile.d.ts b/lib/common/definitions/mobile.d.ts
@@ -1211,7 +1211,7 @@ declare global {
 			isAndroidPlatform(platform: string): boolean;
 			isiOSPlatform(platform: string): boolean;
 			isvisionOSPlatform(platform: string): boolean;
-			ismacOSPlatform(platform: string): boolean;
+			isCatalystPlatform(platform: string): boolean;
 			isApplePlatform(platform: string): boolean;
 			normalizePlatformName(platform: string): string;
 			validatePlatformName(platform: string): string;
@@ -1256,12 +1256,12 @@ declare global {
 			iOS: string;
 			Android: string;
 			visionOS: string;
-			macOS: string;
+			Catalyst: string;
 
 			isiOS(value: string): boolean;
 			isAndroid(value: string): boolean;
 			isvisionOS(value: string): boolean;
-			ismacOS(value: string): boolean;
+			isCatalyst(value: string): boolean;
 		}
 
 		interface IDeviceApplication {
diff --git a/lib/common/mobile/device-platforms-constants.ts b/lib/common/mobile/device-platforms-constants.ts
@@ -7,7 +7,7 @@ export class DevicePlatformsConstants
 	public Android = "Android";
 	public visionOS = "visionOS";
 	// Not a runtime of its own: iOS rebuilt against the macOS SDK.
-	public macOS = "macOS";
+	public Catalyst = "Catalyst";
 
 	public isiOS(value: string) {
 		return value.toLowerCase() === this.iOS.toLowerCase();
@@ -21,8 +21,8 @@ export class DevicePlatformsConstants
 		return value.toLowerCase() === this.visionOS.toLowerCase();
 	}
 
-	public ismacOS(value: string) {
-		return value.toLowerCase() === this.macOS.toLowerCase();
+	public isCatalyst(value: string) {
+		return value.toLowerCase() === this.Catalyst.toLowerCase();
 	}
 }
 injector.register("devicePlatformsConstants", DevicePlatformsConstants);
diff --git a/lib/common/mobile/mac/mac-catalyst-application-manager.ts b/lib/common/mobile/mac/mac-catalyst-application-manager.ts
@@ -134,7 +134,7 @@ export class MacCatalystApplicationManager extends ApplicationManagerBase {
 		const action = (data: Buffer | string) => {
 			this.$deviceLogProvider.logData(
 				data.toString(),
-				this.$devicePlatformsConstants.macOS,
+				this.$devicePlatformsConstants.Catalyst,
 				this.device.deviceInfo.identifier,
 			);
 		};
diff --git a/lib/common/mobile/mac/mac-catalyst-device.ts b/lib/common/mobile/mac/mac-catalyst-device.ts
@@ -42,7 +42,7 @@ export class MacCatalystDevice implements Mobile.IMacCatalystDevice {
 			model: "Mac",
 			version: os.release(),
 			vendor: "Apple",
-			platform: this.$devicePlatformsConstants.macOS,
+			platform: this.$devicePlatformsConstants.Catalyst,
 			status: constants.CONNECTED_STATUS,
 			errorHelp: null,
 			isTablet: false,
@@ -81,7 +81,7 @@ export class MacCatalystDevice implements Mobile.IMacCatalystDevice {
 
 	private getBuiltApplicationBundlePath(): string {
 		const projectData = this.$projectDataService.getProjectData();
-		const platform = this.$devicePlatformsConstants.macOS;
+		const platform = this.$devicePlatformsConstants.Catalyst;
 		const platformData = this.$platformsDataService.getPlatformData(
 			platform.toLowerCase(),
 			projectData,
diff --git a/lib/common/mobile/mobile-core/ios-device-discovery.ts b/lib/common/mobile/mobile-core/ios-device-discovery.ts
@@ -23,8 +23,8 @@ export class IOSDeviceDiscovery extends DeviceDiscovery {
 			options &&
 			options.platform &&
 			(!this.$mobileHelper.isApplePlatform(options.platform) ||
-				// macOS runs on this machine, not over usbmux.
-				this.$mobileHelper.ismacOSPlatform(options.platform) ||
+				// Catalyst runs on this machine, not over usbmux.
+				this.$mobileHelper.isCatalystPlatform(options.platform) ||
 				options.emulator)
 		) {
 			return;
diff --git a/lib/common/mobile/mobile-core/mac-catalyst-discovery.ts b/lib/common/mobile/mobile-core/mac-catalyst-discovery.ts
@@ -26,7 +26,7 @@ export class MacCatalystDeviceDiscovery extends DeviceDiscovery {
 		if (
 			!options ||
 			!options.platform ||
-			!this.$mobileHelper.ismacOSPlatform(options.platform)
+			!this.$mobileHelper.isCatalystPlatform(options.platform)
 		) {
 			return;
 		}
diff --git a/lib/common/mobile/mobile-helper.ts b/lib/common/mobile/mobile-helper.ts
@@ -21,7 +21,7 @@ export class MobileHelper implements Mobile.IMobileHelper {
 			this.$devicePlatformsConstants.iOS,
 			this.$devicePlatformsConstants.Android,
 			this.$devicePlatformsConstants.visionOS,
-			this.$devicePlatformsConstants.macOS,
+			this.$devicePlatformsConstants.Catalyst,
 		];
 	}
 
@@ -49,10 +49,10 @@ export class MobileHelper implements Mobile.IMobileHelper {
 		);
 	}
 
-	public ismacOSPlatform(platform: string): boolean {
+	public isCatalystPlatform(platform: string): boolean {
 		return !!(
 			platform &&
-			this.$devicePlatformsConstants.macOS.toLowerCase() ===
+			this.$devicePlatformsConstants.Catalyst.toLowerCase() ===
 				platform.toLowerCase()
 		);
 	}
@@ -61,7 +61,7 @@ export class MobileHelper implements Mobile.IMobileHelper {
 		return (
 			this.isiOSPlatform(platform) ||
 			this.isvisionOSPlatform(platform) ||
-			this.ismacOSPlatform(platform)
+			this.isCatalystPlatform(platform)
 		);
 	}
 
@@ -72,8 +72,8 @@ export class MobileHelper implements Mobile.IMobileHelper {
 			return "iOS";
 		} else if (this.isvisionOSPlatform(platform)) {
 			return "visionOS";
-		} else if (this.ismacOSPlatform(platform)) {
-			return "macOS";
+		} else if (this.isCatalystPlatform(platform)) {
+			return "Catalyst";
 		}
 
 		return undefined;
diff --git a/lib/constants.ts b/lib/constants.ts
@@ -360,14 +360,14 @@ export const enum PlatformTypes {
 	ios = "ios",
 	android = "android",
 	visionos = "visionos",
-	macos = "macos",
+	catalyst = "catalyst",
 }
 
 export type SupportedPlatform =
 	| PlatformTypes.ios
 	| PlatformTypes.android
 	| PlatformTypes.visionos
-	| PlatformTypes.macos;
+	| PlatformTypes.catalyst;
 
 export const PODFILE_NAME = "Podfile";
 
diff --git a/lib/controllers/platform-controller.ts b/lib/controllers/platform-controller.ts
@@ -188,7 +188,7 @@ export class PlatformController implements IPlatformController {
 		projectData: IProjectData,
 		nativePrepare: INativePrepare
 	): boolean {
-		// Mac Catalyst reports iOS but prepares into platforms/macos.
+		// Mac Catalyst reports iOS but prepares into platforms/catalyst.
 		const platformDirectory = platformData.projectRoot;
 		const platformName = path.basename(platformDirectory);
 		const hasPlatformDirectory = this.$fs.exists(platformDirectory);
diff --git a/lib/controllers/prepare-controller.ts b/lib/controllers/prepare-controller.ts
@@ -97,7 +97,7 @@ export class PrepareController extends EventEmitter {
 		return this.prepareCore(prepareData, projectData);
 	}
 
-	// Catalyst reports iOS in platform data, but events must say macos.
+	// Catalyst reports iOS in platform data, but events must say catalyst.
 	private getRequestedPlatform(prepareData: IPrepareData): string {
 		return prepareData.platform.toLowerCase();
 	}
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -138,7 +138,7 @@ interface INsConfigIOS extends INsConfigPlaform {
 
 interface INSConfigVisionOS extends INsConfigIOS {}
 
-interface INSConfigMacOS extends INsConfigIOS {}
+interface INSConfigCatalyst extends INsConfigIOS {}
 
 interface INsConfigAndroid extends INsConfigPlaform {
 	v8Flags?: string;
@@ -199,7 +199,7 @@ interface INsConfig {
 	ios?: INsConfigIOS;
 	android?: INsConfigAndroid;
 	visionos?: INSConfigVisionOS;
-	macos?: INSConfigMacOS;
+	catalyst?: INSConfigCatalyst;
 	ignoredNativeDependencies?: string[];
 	hooks?: INsConfigHooks[];
 	projectName?: string;
diff --git a/lib/device-path-provider.ts b/lib/device-path-provider.ts
@@ -17,7 +17,7 @@ export class DevicePathProvider implements IDevicePathProvider {
 		options: IDeviceProjectRootOptions
 	): Promise<string> {
 		let projectRoot = "";
-		if (this.$mobileHelper.ismacOSPlatform(device.deviceInfo.platform)) {
+		if (this.$mobileHelper.isCatalystPlatform(device.deviceInfo.platform)) {
 			projectRoot = (<Mobile.IMacCatalystDevice>device).applicationBundlePath;
 			if (!projectRoot) {
 				this.$errors.fail("Unable to get application path on device.");
diff --git a/lib/project-data.ts b/lib/project-data.ts
diff --git a/lib/services/bundler/bundler-compiler-service.ts b/lib/services/bundler/bundler-compiler-service.ts
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
diff --git a/lib/services/platform/add-platform-service.ts b/lib/services/platform/add-platform-service.ts
diff --git a/lib/services/platforms-data-service.ts b/lib/services/platforms-data-service.ts
diff --git a/lib/services/project-data-service.ts b/lib/services/project-data-service.ts

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ export class DevicePlatformsConstants`
`7`	`7`	`public Android = "Android";`
`8`	`8`	`public visionOS = "visionOS";`
`9`	`9`	`// Not a runtime of its own: iOS rebuilt against the macOS SDK.`
`10`		`- public macOS = "macOS";`
	`10`	`+ public Catalyst = "Catalyst";`
`11`	`11`
`12`	`12`	`public isiOS(value: string) {`
`13`	`13`	`return value.toLowerCase() === this.iOS.toLowerCase();`
`@@ -21,8 +21,8 @@ export class DevicePlatformsConstants`
`21`	`21`	`return value.toLowerCase() === this.visionOS.toLowerCase();`
`22`	`22`	`}`
`23`	`23`
`24`		`- public ismacOS(value: string) {`
`25`		`- return value.toLowerCase() === this.macOS.toLowerCase();`
	`24`	`+ public isCatalyst(value: string) {`
	`25`	`+ return value.toLowerCase() === this.Catalyst.toLowerCase();`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`injector.register("devicePlatformsConstants", DevicePlatformsConstants);`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export class MacCatalystDeviceDiscovery extends DeviceDiscovery {`
`26`	`26`	`if (`
`27`	`27`	`!options \|\|`
`28`	`28`	`!options.platform \|\|`
`29`		`- !this.$mobileHelper.ismacOSPlatform(options.platform)`
	`29`	`+ !this.$mobileHelper.isCatalystPlatform(options.platform)`
`30`	`30`	`) {`
`31`	`31`	`return;`
`32`	`32`	`}`