Restore weak-node-api symlinks

Author: kraenhansen

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

@@ -192,15 +192,11 @@ export async function linkFlatFramework({
   }
 }
 
-export async function linkVersionedFramework({
-  frameworkPath,
-  newLibraryName,
-}: LinkFrameworkOptions) {
-  assert.equal(
-    process.platform,
-    "darwin",
-    "Linking Apple addons are only supported on macOS",
-  );
+/**
+ * NPM packages aren't preserving internal symlinks inside versioned frameworks.
+ * This function attempts to restore those.
+ */
+export async function restoreFrameworkLinks(frameworkPath: string) {
   // Reconstruct missing symbolic links if needed
   const versionAPath = path.join(frameworkPath, "Versions", "A");
   const versionCurrentPath = path.join(frameworkPath, "Versions", "Current");
@@ -210,31 +206,47 @@ export async function linkVersionedFramework({
       versionCurrentPath,
     );
   }
-  const frameworkInfoPath = path.join(
-    frameworkPath,
-    "Versions",
-    "Current",
-    "Resources",
-    "Info.plist",
+
+  const { CFBundleExecutable } = await readFrameworkInfo(
+    path.join(frameworkPath, "Versions", "Current", "Resources", "Info.plist"),
   );
-  const frameworkInfo = await readFrameworkInfo(frameworkInfoPath);
+
   const libraryRealPath = path.join(
     frameworkPath,
     "Versions",
     "Current",
-    frameworkInfo.CFBundleExecutable,
-  );
-  const libraryLinkPath = path.join(
-    frameworkPath,
-    frameworkInfo.CFBundleExecutable,
+    CFBundleExecutable,
   );
+  const libraryLinkPath = path.join(frameworkPath, CFBundleExecutable);
   // Reconstruct missing symbolic links if needed
   if (fs.existsSync(libraryRealPath) && !fs.existsSync(libraryLinkPath)) {
     await fs.promises.symlink(
       path.relative(path.dirname(libraryLinkPath), libraryRealPath),
       libraryLinkPath,
     );
   }
+}
+
+export async function linkVersionedFramework({
+  frameworkPath,
+  newLibraryName,
+}: LinkFrameworkOptions) {
+  assert.equal(
+    process.platform,
+    "darwin",
+    "Linking Apple addons are only supported on macOS",
+  );
+
+  await restoreFrameworkLinks(frameworkPath);
+
+  const frameworkInfoPath = path.join(
+    frameworkPath,
+    "Versions",
+    "Current",
+    "Resources",
+    "Info.plist",
+  );
+  const frameworkInfo = await readFrameworkInfo(frameworkInfoPath);
   // Update install name
   await spawn(
     "install_name_tool",

packages/host/src/node/cli/program.ts

@@ -1,6 +1,7 @@
 import assert from "node:assert/strict";
 import path from "node:path";
 import { EventEmitter } from "node:stream";
+import fs from "node:fs";
 
 import {
   Command,
@@ -26,8 +27,9 @@ import {
 import { command as vendorHermes } from "./hermes";
 import { packageNameOption, pathSuffixOption } from "./options";
 import { linkModules, pruneLinkedModules, ModuleLinker } from "./link-modules";
-import { linkXcframework } from "./apple";
+import { linkXcframework, restoreFrameworkLinks } from "./apple";
 import { linkAndroidDir } from "./android";
+import { weakNodeApiPath } from "../weak-node-api";
 
 // We're attaching a lot of listeners when spawning in parallel
 EventEmitter.defaultMaxListeners = 100;
@@ -169,6 +171,38 @@ program
             await pruneLinkedModules(platform, modules);
           }
         }
+
+        if (apple) {
+          await oraPromise(
+            async () => {
+              const xcframeworkPath = path.join(
+                weakNodeApiPath,
+                "weak-node-api.xcframework",
+              );
+              await Promise.all(
+                [
+                  path.join(xcframeworkPath, "macos-x86_64"),
+                  path.join(xcframeworkPath, "macos-arm64"),
+                  path.join(xcframeworkPath, "macos-arm64_x86_64"),
+                ].map(async (slicePath) => {
+                  const frameworkPath = path.join(
+                    slicePath,
+                    "weak-node-api.framework",
+                  );
+                  if (fs.existsSync(frameworkPath)) {
+                    await restoreFrameworkLinks(frameworkPath);
+                  }
+                }),
+              );
+            },
+            {
+              text: "Restoring weak-node-api symlinks",
+              successText: "Restored weak-node-api symlinks",
+              failText: (error) =>
+                `Failed to restore weak-node-api symlinks: ${error.message}`,
+            },
+          );
+        }
       },
     ),
   );