Add x86_64 and universal simulator slices

.changeset/bright-parts-roll.md

@@ -0,0 +1,6 @@
+---
+"cmake-rn": patch
+"react-native-node-api": patch
+---
+
+Add x86_64 and universal simulator triplets

.github/workflows/check.yml

@@ -98,7 +98,7 @@ jobs:
       - run: npm ci
       - run: npm run bootstrap
         env:
-          CMAKE_RN_TRIPLETS: arm64-apple-ios-sim
+          CMAKE_RN_TRIPLETS: arm64;x86_64-apple-ios-sim
           FERRIC_TARGETS: aarch64-apple-ios-sim
       - run: npm run pod-install
         working-directory: apps/test-app

packages/cmake-rn/src/cli.ts

@@ -187,7 +187,7 @@ program = program.action(
     for (const platform of Object.values(platforms)) {
       // Forcing the types a bit here, since the platform id option is dynamically added
       if ((baseOptions as Record<string, unknown>)[platform.id]) {
-        for (const triplet of platform.triplets) {
+        for (const triplet of await platform.defaultTriplets("all")) {
           triplets.add(triplet);
         }
       }
@@ -196,7 +196,9 @@ program = program.action(
     if (triplets.size === 0) {
       for (const platform of Object.values(platforms)) {
         if (platform.isSupportedByHost()) {
-          for (const triplet of await platform.defaultTriplets()) {
+          for (const triplet of await platform.defaultTriplets(
+            "current-development",
+          )) {
             triplets.add(triplet);
           }
         }
@@ -217,6 +219,11 @@ program = program.action(
     const tripletContexts = [...triplets].map((triplet) => {
       const platform = findPlatformForTriplet(triplet);
 
+      assert(
+        platform.isSupportedByHost(),
+        `Triplet '${triplet}' cannot be built, as the '${platform.name}' platform is not supported on a '${process.platform}' host.`,
+      );
+
       return {
         triplet,
         platform,

packages/cmake-rn/src/platforms/android.ts

@@ -100,13 +100,21 @@ export const platform: Platform<Triplet[], AndroidOpts> = {
     "i686-linux-android",
     "x86_64-linux-android",
   ],
-  defaultTriplets() {
-    if (process.arch === "arm64") {
-      return ["aarch64-linux-android"];
-    } else if (process.arch === "x64") {
-      return ["x86_64-linux-android"];
+  defaultTriplets(mode) {
+    if (mode === "all") {
+      return [...this.triplets];
+    } else if (mode === "current-development") {
+      // We're applying a heuristic to determine the current simulators
+      // TODO: Run a command to probe the currently running emulators instead
+      if (process.arch === "arm64") {
+        return ["aarch64-linux-android"];
+      } else if (process.arch === "x64") {
+        return ["x86_64-linux-android"];
+      } else {
+        return [];
+      }
     } else {
-      return [];
+      throw new Error(`Unexpected mode: ${mode as string}`);
     }
   },
   amendCommand(command) {

packages/cmake-rn/src/platforms/apple.ts

@@ -62,13 +62,22 @@ const XCODE_SDK_NAMES = {
   "x86_64-apple-darwin": "macosx",
   "arm64-apple-darwin": "macosx",
   "arm64;x86_64-apple-darwin": "macosx",
+
   "arm64-apple-ios": "iphoneos",
   "arm64-apple-ios-sim": "iphonesimulator",
-  "arm64-apple-tvos": "appletvos",
+  "x86_64-apple-ios-sim": "iphonesimulator",
+  "arm64;x86_64-apple-ios-sim": "iphonesimulator",
+
   // "x86_64-apple-tvos": "appletvos",
+  "arm64-apple-tvos": "appletvos",
+  "x86_64-apple-tvos-sim": "appletvsimulator",
   "arm64-apple-tvos-sim": "appletvsimulator",
+  "arm64;x86_64-apple-tvos-sim": "appletvsimulator",
+
   "arm64-apple-visionos": "xros",
   "arm64-apple-visionos-sim": "xrsimulator",
+  "x86_64-apple-visionos-sim": "xrsimulator",
+  "arm64;x86_64-apple-visionos-sim": "xrsimulator",
 } satisfies Record<Triplet, XcodeSDKName>;
 
 type CMakeSystemName = "Darwin" | "iOS" | "tvOS" | "watchOS" | "visionOS";
@@ -77,27 +86,44 @@ const CMAKE_SYSTEM_NAMES = {
   "x86_64-apple-darwin": "Darwin",
   "arm64-apple-darwin": "Darwin",
   "arm64;x86_64-apple-darwin": "Darwin",
+
   "arm64-apple-ios": "iOS",
   "arm64-apple-ios-sim": "iOS",
-  "arm64-apple-tvos": "tvOS",
+  "x86_64-apple-ios-sim": "iOS",
+  "arm64;x86_64-apple-ios-sim": "iOS",
+
   // "x86_64-apple-tvos": "appletvos",
+  "arm64-apple-tvos": "tvOS",
   "arm64-apple-tvos-sim": "tvOS",
+  "x86_64-apple-tvos-sim": "tvOS",
+  "arm64;x86_64-apple-tvos-sim": "tvOS",
+
   "arm64-apple-visionos": "visionOS",
+  "x86_64-apple-visionos-sim": "visionOS",
   "arm64-apple-visionos-sim": "visionOS",
+  "arm64;x86_64-apple-visionos-sim": "visionOS",
 } satisfies Record<Triplet, CMakeSystemName>;
 
 const DESTINATION_BY_TRIPLET = {
+  "x86_64-apple-darwin": "generic/platform=macOS",
+  "arm64-apple-darwin": "generic/platform=macOS",
+  "arm64;x86_64-apple-darwin": "generic/platform=macOS",
+
   "arm64-apple-ios": "generic/platform=iOS",
   "arm64-apple-ios-sim": "generic/platform=iOS Simulator",
+  "x86_64-apple-ios-sim": "generic/platform=iOS Simulator",
+  "arm64;x86_64-apple-ios-sim": "generic/platform=iOS Simulator",
+
   "arm64-apple-tvos": "generic/platform=tvOS",
   // "x86_64-apple-tvos": "generic/platform=tvOS",
+  "x86_64-apple-tvos-sim": "generic/platform=tvOS Simulator",
   "arm64-apple-tvos-sim": "generic/platform=tvOS Simulator",
+  "arm64;x86_64-apple-tvos-sim": "generic/platform=tvOS Simulator",
+
   "arm64-apple-visionos": "generic/platform=visionOS",
   "arm64-apple-visionos-sim": "generic/platform=visionOS Simulator",
-  // TODO: Verify that the three following destinations are correct and actually work
-  "x86_64-apple-darwin": "generic/platform=macOS,arch=x86_64",
-  "arm64-apple-darwin": "generic/platform=macOS,arch=arm64",
-  "arm64;x86_64-apple-darwin": "generic/platform=macOS",
+  "x86_64-apple-visionos-sim": "generic/platform=visionOS Simulator",
+  "arm64;x86_64-apple-visionos-sim": "generic/platform=visionOS Simulator",
 } satisfies Record<Triplet, string>;
 
 type AppleArchitecture = "arm64" | "x86_64" | "arm64;x86_64";
@@ -106,30 +132,24 @@ export const APPLE_ARCHITECTURES = {
   "x86_64-apple-darwin": "x86_64",
   "arm64-apple-darwin": "arm64",
   "arm64;x86_64-apple-darwin": "arm64;x86_64",
+
   "arm64-apple-ios": "arm64",
   "arm64-apple-ios-sim": "arm64",
-  "arm64-apple-tvos": "arm64",
+  "x86_64-apple-ios-sim": "x86_64",
+  "arm64;x86_64-apple-ios-sim": "arm64;x86_64",
+
   // "x86_64-apple-tvos": "x86_64",
+  "arm64-apple-tvos": "arm64",
   "arm64-apple-tvos-sim": "arm64",
+  "x86_64-apple-tvos-sim": "x86_64",
+  "arm64;x86_64-apple-tvos-sim": "arm64;x86_64",
+
   "arm64-apple-visionos": "arm64",
+  "x86_64-apple-visionos-sim": "x86_64",
   "arm64-apple-visionos-sim": "arm64",
+  "arm64;x86_64-apple-visionos-sim": "arm64;x86_64",
 } satisfies Record<Triplet, AppleArchitecture>;
 
-export function createPlistContent(values: Record<string, string>) {
-  return [
-    '<?xml version="1.0" encoding="UTF-8"?>',
-    '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">',
-    '<plist version="1.0">',
-    "<dict>",
-    ...Object.entries(values).flatMap(([key, value]) => [
-      `<key>${key}</key>`,
-      `<string>${value}</string>`,
-    ]),
-    "</dict>",
-    "</plist>",
-  ].join("\n");
-}
-
 const xcframeworkExtensionOption = new Option(
   "--xcframework-extension",
   "Don't rename the xcframework to .apple.node",
@@ -171,16 +191,46 @@ export const platform: Platform<Triplet[], AppleOpts> = {
   id: "apple",
   name: "Apple",
   triplets: [
+    "arm64-apple-darwin",
+    "x86_64-apple-darwin",
     "arm64;x86_64-apple-darwin",
+
     "arm64-apple-ios",
     "arm64-apple-ios-sim",
+    "x86_64-apple-ios-sim",
+    "arm64;x86_64-apple-ios-sim",
+
     "arm64-apple-tvos",
+    "x86_64-apple-tvos-sim",
     "arm64-apple-tvos-sim",
+    "arm64;x86_64-apple-tvos-sim",
+
     "arm64-apple-visionos",
+    "x86_64-apple-visionos-sim",
     "arm64-apple-visionos-sim",
+    "arm64;x86_64-apple-visionos-sim",
   ],
-  defaultTriplets() {
-    return process.arch === "arm64" ? ["arm64-apple-ios-sim"] : [];
+  defaultTriplets(mode) {
+    if (mode === "all") {
+      return [
+        "arm64;x86_64-apple-darwin",
+
+        "arm64-apple-ios",
+        "arm64;x86_64-apple-ios-sim",
+
+        "arm64-apple-tvos",
+        "arm64;x86_64-apple-tvos-sim",
+
+        "arm64-apple-visionos",
+        "arm64;x86_64-apple-visionos-sim",
+      ];
+    } else if (mode === "current-development") {
+      // We're applying a heuristic to determine the current simulators
+      // TODO: Run a command to probe the currently running simulators instead
+      return ["arm64;x86_64-apple-ios-sim"];
+    } else {
+      throw new Error(`Unexpected mode: ${mode as string}`);
+    }
   },
   amendCommand(command) {
     return command.addOption(xcframeworkExtensionOption);

packages/cmake-rn/src/platforms/types.ts

@@ -33,6 +33,7 @@ export type Platform<
   Triplets extends string[] = string[],
   Opts extends cli.OptionValues = Record<string, unknown>,
   Command = ExtendedCommand<Opts>,
+  Triplet extends string = Triplets[number],
 > = {
   /**
    * Used to identify the platform in the CLI.
@@ -47,9 +48,11 @@ export type Platform<
    */
   triplets: Readonly<Triplets>;
   /**
-   * Get the limited subset of triplets that should be built by default for this platform, to support a development workflow.
+   * Get the limited subset of triplets that should be built by default for this platform.
    */
-  defaultTriplets(): Triplets[number][] | Promise<Triplets[number][]>;
+  defaultTriplets(
+    mode: "current-development" | "all",
+  ): Triplet[] | Promise<Triplet[]>;
   /**
    * Implement this to add any platform specific options to the command.
    */
@@ -62,15 +65,15 @@ export type Platform<
    * Configure all projects for this platform.
    */
   configure(
-    triplets: TripletContext<Triplets[number]>[],
+    triplets: TripletContext<Triplet>[],
     options: BaseOpts & Opts,
     spawn: Spawn,
   ): Promise<void>;
   /**
    * Platform specific command to build a triplet project.
    */
   build(
-    context: TripletContext<Triplets[number]>,
+    context: TripletContext<Triplet>,
     options: BaseOpts & Opts,
   ): Promise<void>;
   /**
@@ -81,7 +84,7 @@ export type Platform<
      * Location of the final prebuilt artefact.
      */
     outputPath: string,
-    triplets: TripletContext<Triplets[number]>[],
+    triplets: TripletContext<Triplet>[],
     options: BaseOpts & Opts,
   ): Promise<void>;
 };

packages/ferric/src/cargo.ts

@@ -22,7 +22,7 @@ const APPLE_XCFRAMEWORK_CHILDS_PER_TARGET: Record<AppleTargetName, string> = {
   "aarch64-apple-darwin": "macos-arm64_x86_64", // Universal
   "x86_64-apple-darwin": "macos-arm64_x86_64", // Universal
   "aarch64-apple-ios": "ios-arm64",
-  "aarch64-apple-ios-sim": "ios-arm64-simulator",
+  "aarch64-apple-ios-sim": "ios-arm64_x86_64-simulator", // Universal
   // "aarch64-apple-ios-macabi": "", // Catalyst
   // "x86_64-apple-ios": "ios-x86_64",
   // "x86_64-apple-ios-macabi": "ios-x86_64-simulator",

packages/host/src/node/prebuilds/apple.ts

@@ -6,24 +6,8 @@ import os from "node:os";
 import plist from "@expo/plist";
 import { spawn } from "@react-native-node-api/cli-utils";
 
-import { AppleTriplet } from "./triplets.js";
 import { determineLibraryBasename } from "../path-utils.js";
 
-type AppleArchitecture = "arm64" | "x86_64" | "arm64;x86_64";
-
-export const APPLE_ARCHITECTURES = {
-  "x86_64-apple-darwin": "x86_64",
-  "arm64-apple-darwin": "arm64",
-  "arm64;x86_64-apple-darwin": "arm64;x86_64",
-  "arm64-apple-ios": "arm64",
-  "arm64-apple-ios-sim": "arm64",
-  "arm64-apple-tvos": "arm64",
-  // "x86_64-apple-tvos": "x86_64",
-  "arm64-apple-tvos-sim": "arm64",
-  "arm64-apple-visionos": "arm64",
-  "arm64-apple-visionos-sim": "arm64",
-} satisfies Record<AppleTriplet, AppleArchitecture>;
-
 type XCframeworkOptions = {
   frameworkPaths: string[];
   outputPath: string;

packages/host/src/node/prebuilds/triplets.ts

@@ -11,16 +11,25 @@ export const ANDROID_TRIPLETS = [
 export type AndroidTriplet = (typeof ANDROID_TRIPLETS)[number];
 
 export const APPLE_TRIPLETS = [
-  "arm64;x86_64-apple-darwin",
   "x86_64-apple-darwin",
   "arm64-apple-darwin",
+  "arm64;x86_64-apple-darwin",
+
   "arm64-apple-ios",
+  "x86_64-apple-ios-sim",
   "arm64-apple-ios-sim",
+  "arm64;x86_64-apple-ios-sim",
+
   "arm64-apple-tvos",
-  "arm64-apple-tvos-sim",
   // "x86_64-apple-tvos",
+  "x86_64-apple-tvos-sim",
+  "arm64-apple-tvos-sim",
+  "arm64;x86_64-apple-tvos-sim",
+
   "arm64-apple-visionos",
+  "x86_64-apple-visionos-sim",
   "arm64-apple-visionos-sim",
+  "arm64;x86_64-apple-visionos-sim",
 ] as const;
 
 export type AppleTriplet = (typeof APPLE_TRIPLETS)[number];