Rename namespaces in the JSI codebase to reflect that it doesn't just…

… support Hermes (#4079)

Rework the namespace names in our Hermes/JSI layer to more accurately reflect that we support JSI, and to remove ambiguities and namespace clashes.

This closes RJS-1337.

CHANGELOG.md

@@ -16,7 +16,7 @@ NOTE: This is an early (alpha) release with Hermes/JSI support: We expect crashe
 * File format: generates Realms with format v22 (reads and upgrades file format v5 or later for non-synced Realm, upgrades file format v10 or later for synced Realms).
 
 ### Internal
-* None.
+* Restructured C++ namespaces and files to reflect that we support JSI, not just Hermes.
 
 10.20.0-alpha.1 Release notes (2021-9-22)
 =============================================================

RealmJS.podspec

@@ -58,7 +58,7 @@ Pod::Spec.new do |s|
                                 'HEADER_SEARCH_PATHS' => [
                                   '"$(PODS_TARGET_SRCROOT)/react-native/ios/RealmReact/"',
                                   '"$(PODS_TARGET_SRCROOT)/src/"',
-                                  '"$(PODS_TARGET_SRCROOT)/src/hermes/"',
+                                  '"$(PODS_TARGET_SRCROOT)/src/jsi/"',
                                   '"$(PODS_ROOT)/Headers/Public/React-Core/"'
                                   #"'#{app_path}/ios/Pods/Headers/Public/React-Core'" # Use this line instead of 👆 while linting
                                 ].join(' ')

react-native/ios/RealmReact/RealmReact.mm

@@ -19,7 +19,7 @@
 #import "RealmReact.h"
 #import "RealmAnalytics.h"
 
-#import <realm-js-ios/hermes_init.h>
+#import <realm-js-ios/jsi_init.h>
 
 #import <React/RCTBridge+Private.h>
 #import <jsi/jsi.h>
@@ -94,7 +94,7 @@ - (void)removeListenerForEvent:(NSString *)eventName handler:(RealmReactEventHan
 }
 
 - (void)invalidate {
-    realm_hermes_invalidate_caches();
+    realm_jsi_invalidate_caches();
 }
 
 - (void)dealloc {
@@ -130,7 +130,7 @@ - (void)setBridge:(RCTBridge *)bridge {
 
             auto& rt = *static_cast<facebook::jsi::Runtime*>(bridge.runtime);
             auto exports = jsi::Object(rt);
-            realm_hermes_init(rt, exports);
+            realm_jsi_init(rt, exports);
         } queue:RCTJSThread];
     }
 }

scripts/build-ios.sh

@@ -108,7 +108,7 @@ done
 
 rm -rf _include
 mkdir -p _include/realm-js-ios
-cp "$PROJECT_ROOT"/src/hermes/hermes_init.h _include/realm-js-ios/
+cp "$PROJECT_ROOT"/src/jsi/jsi_init.h _include/realm-js-ios/
 
 rm -rf ../realm-js-ios.xcframework
 xcodebuild -create-xcframework \

src/CMakeLists.txt

@@ -7,9 +7,9 @@ target_include_directories(realm-js-shared PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 if(DEFINED CMAKE_JS_VERSION)
     add_subdirectory(node)
 elseif(ANDROID)
-    add_subdirectory(hermes)
+    add_subdirectory(jsi)
     add_subdirectory(android)
 elseif(CMAKE_SYSTEM_NAME STREQUAL iOS)
-    add_subdirectory(hermes)
+    add_subdirectory(jsi)
     add_subdirectory(ios)
 endif()

src/android/io_realm_react_RealmReactModule.cpp

@@ -21,7 +21,7 @@
 #include <android/asset_manager_jni.h>
 #include <jsi/jsi.h>
 
-#include <hermes/hermes_init.h>
+#include <jsi/jsi_init.h>
 #include "platform.hpp"
 #include "jni_utils.hpp"
 #include "hack.hpp"
@@ -101,12 +101,12 @@ JNIEXPORT void JNICALL Java_io_realm_react_RealmReactModule_install(JNIEnv*, jcl
         __android_log_print(ANDROID_LOG_VERBOSE, "JSRealm", "Building an exports object");
         auto exports = jsi::Object(*runtime);
         __android_log_print(ANDROID_LOG_VERBOSE, "JSRealm", "Initializing ...");
-        realm_hermes_init(*runtime, exports);
+        realm_jsi_init(*runtime, exports);
     }
 }
 
 JNIEXPORT void JNICALL Java_io_realm_react_RealmReactModule_invalidateCaches(JNIEnv*, jclass)
 {
     __android_log_print(ANDROID_LOG_VERBOSE, "JSRealm", "invalidateCaches");
-    realm_hermes_invalidate_caches();
+    realm_jsi_invalidate_caches();
 }

src/hermes/CMakeLists.txt → src/jsi/CMakeLists.txt

@@ -2,7 +2,7 @@ set(REACT_NATIVE_ROOT_DIR "${PACKAGE_ROOT_DIR}/node_modules/react-native")
 set(JSI_HEADER_DIR "${REACT_NATIVE_ROOT_DIR}/ReactCommon/jsi")
 
 add_library(realm-js-hermes OBJECT
-    hermes_init.cpp
+    jsi_init.cpp
 )
 
 target_include_directories(realm-js-hermes PRIVATE ${JSI_HEADER_DIR})