Replace "hash" paths with path suffix

Author: kraenhansen

apps/test-app/babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
   presets: ['module:@react-native/babel-preset'],
-  // plugins: [['module:react-native-node-api-modules/babel-plugin', { naming: "hash" }]],
-  plugins: [['module:react-native-node-api-modules/babel-plugin', { naming: "package-name" }]],
+  // plugins: [['module:react-native-node-api-modules/babel-plugin', { stripPathSuffix: true }]],
+  plugins: ['module:react-native-node-api-modules/babel-plugin'],
 };

packages/react-native-node-api-modules/react-native-node-api-modules.podspec

@@ -6,11 +6,13 @@ require_relative "./scripts/patch-hermes"
 
 NODE_PATH ||= `which node`.strip
 CLI_COMMAND ||= "'#{NODE_PATH}' '#{File.join(__dir__, "dist/node/cli/run.js")}'"
-COPY_FRAMEWORKS_COMMAND ||= "#{CLI_COMMAND} copy-xcframeworks '#{Pod::Config.instance.installation_root}'"
+STRIP_PATH_SUFFIX ||= ENV['NODE_API_MODULES_STRIP_PATH_SUFFIX'] === "true"
+COPY_FRAMEWORKS_COMMAND ||= "#{CLI_COMMAND} xcframeworks copy --podfile '#{Pod::Config.instance.installation_root}' #{STRIP_PATH_SUFFIX ? '--strip-path-suffix' : ''}"
 
 # We need to run this now to ensure the xcframeworks are copied vendored_frameworks are considered
 XCFRAMEWORKS_DIR ||= File.join(__dir__, "xcframeworks")
 unless defined?(@xcframeworks_copied)
+  puts "Executing #{COPY_FRAMEWORKS_COMMAND}"
   system(COPY_FRAMEWORKS_COMMAND) or raise "Failed to copy xcframeworks"
   # Setting a flag to avoid running this command on every require
   @xcframeworks_copied = true

packages/react-native-node-api-modules/src/node/babel-plugin/plugin.test.ts

@@ -40,17 +40,17 @@ describe("plugin", () => {
 
     const ADDON_1_REQUIRE_ARG = getLibraryInstallName(
       path.join(tempDirectoryPath, "addon-1"),
-      "hash"
+      { stripPathSuffix: false }
     );
     const ADDON_2_REQUIRE_ARG = getLibraryInstallName(
       path.join(tempDirectoryPath, "addon-2"),
-      "hash"
+      { stripPathSuffix: false }
     );
 
     {
       const result = transformFileSync(
         path.join(tempDirectoryPath, "./addon-1.js"),
-        { plugins: [[plugin, { naming: "hash" }]] }
+        { plugins: [[plugin, { stripPathSuffix: false }]] }
       );
       assert(result);
       const { code } = result;

packages/react-native-node-api-modules/src/node/babel-plugin/plugin.ts

@@ -9,20 +9,18 @@ import {
   isNodeApiModule,
   replaceWithNodeExtension,
   NamingStrategy,
-  NAMING_STATEGIES,
 } from "../path-utils";
 
 type PluginOptions = {
-  naming?: NamingStrategy;
+  stripPathSuffix?: boolean;
 };
 
 function assertOptions(opts: unknown): asserts opts is PluginOptions {
   assert(typeof opts === "object" && opts !== null, "Expected an object");
-  if ("naming" in opts) {
-    assert(typeof opts.naming === "string", "Expected 'naming' to be a string");
+  if ("stripPathSuffix" in opts) {
     assert(
-      NAMING_STATEGIES.includes(opts.naming as NamingStrategy),
-      "Expected 'naming' to be either 'hash' or 'package-name'"
+      typeof opts.stripPathSuffix === "boolean",
+      "Expected 'stripPathSuffix' to be a boolean"
     );
   }
 }
@@ -54,7 +52,7 @@ export function plugin(): PluginObj {
     visitor: {
       CallExpression(p) {
         assertOptions(this.opts);
-        const { naming = "package-name" } = this.opts;
+        const { stripPathSuffix = false } = this.opts;
         if (typeof this.filename !== "string") {
           // This transformation only works when the filename is known
           return;
@@ -77,15 +75,17 @@ export function plugin(): PluginObj {
               const relativePath = path.join(from, id);
               // TODO: Support traversing the filesystem to find the Node-API module
               if (isNodeApiModule(relativePath)) {
-                replaceWithRequireNodeAddon(p.parentPath, relativePath, naming);
+                replaceWithRequireNodeAddon(p.parentPath, relativePath, {
+                  stripPathSuffix,
+                });
               }
             }
           } else if (
             !path.isAbsolute(id) &&
             isNodeApiModule(path.join(from, id))
           ) {
             const relativePath = path.join(from, id);
-            replaceWithRequireNodeAddon(p, relativePath, naming);
+            replaceWithRequireNodeAddon(p, relativePath, { stripPathSuffix });
           }
         }
       },

packages/react-native-node-api-modules/src/node/cli/helpers.ts

@@ -8,7 +8,7 @@ import { spawn } from "bufout";
 import { packageDirectorySync } from "pkg-dir";
 import { readPackageSync } from "read-pkg";
 
-import { NamingStrategy, hashModulePath } from "../path-utils.js";
+import { NamingStrategy, getLibraryName } from "../path-utils.js";
 
 // Must be in all xcframeworks to be considered as Node-API modules
 export const MAGIC_FILENAME = "react-native-node-api-module";
@@ -182,16 +182,8 @@ type RebuildXcframeworkOptions = {
 type VendoredXcframework = {
   originalPath: string;
   outputPath: string;
-} & (
-  | {
-      hash: string;
-      packageName?: never;
-    }
-  | {
-      hash?: never;
-      packageName: string;
-    }
-);
+  libraryName: string;
+};
 
 type VendoredXcframeworkResult = VendoredXcframework & {
   skipped: boolean;
@@ -201,24 +193,16 @@ export function determineVendoredXcframeworkDetails(
   modulePath: string,
   naming: NamingStrategy
 ): VendoredXcframework {
-  if (naming === "hash") {
-    const hash = hashModulePath(modulePath);
-    return {
-      hash,
-      originalPath: modulePath,
-      outputPath: path.join(XCFRAMEWORKS_PATH, `node-api-${hash}.xcframework`),
-    };
-  } else {
-    const packageRoot = packageDirectorySync({ cwd: modulePath });
-    assert(packageRoot, `Could not find package root from ${modulePath}`);
-    const { name } = readPackageSync({ cwd: packageRoot });
-    assert(name, `Could not find package name from ${packageRoot}`);
-    return {
-      packageName: name,
-      originalPath: modulePath,
-      outputPath: path.join(XCFRAMEWORKS_PATH, `${name}.xcframework`),
-    };
-  }
+  const packageRoot = packageDirectorySync({ cwd: modulePath });
+  assert(packageRoot, `Could not find package root from ${modulePath}`);
+  const { name } = readPackageSync({ cwd: packageRoot });
+  assert(name, `Could not find package name from ${packageRoot}`);
+  const libraryName = getLibraryName(modulePath, naming);
+  return {
+    originalPath: modulePath,
+    outputPath: path.join(XCFRAMEWORKS_PATH, `${libraryName}.xcframework`),
+    libraryName,
+  };
 }
 
 export function hasDuplicatesWhenVendored(
@@ -243,13 +227,8 @@ export async function vendorXcframework({
 }: RebuildXcframeworkOptions): Promise<VendoredXcframeworkResult> {
   // Copy the xcframework to the output directory and rename the framework and binary
   const details = determineVendoredXcframeworkDetails(modulePath, naming);
-  const { outputPath } = details;
-  const discriminator =
-    typeof details.hash === "string" ? details.hash : details.packageName;
-  const tempPath = path.join(
-    XCFRAMEWORKS_PATH,
-    `node-api-${discriminator}-temp`
-  );
+  const { outputPath, libraryName: newLibraryName } = details;
+  const tempPath = path.join(XCFRAMEWORKS_PATH, `${newLibraryName}.temp`);
   try {
     if (incremental && existsSync(outputPath)) {
       const moduleModified = getLatestMtime(modulePath);
@@ -284,10 +263,6 @@ export async function vendorXcframework({
                 ".framework"
               );
               const oldLibraryPath = path.join(frameworkPath, oldLibraryName);
-              const newLibraryName = path.basename(
-                details.outputPath,
-                ".xcframework"
-              );
               const newFrameworkPath = path.join(
                 tripletPath,
                 `${newLibraryName}.framework`