add support for diff objc class runtime name

Author: DjDeveloperr

NativeScript/CMakeLists.txt

@@ -361,11 +361,19 @@ if(TARGET_ENGINE_JSC)
 endif()
 
 if(TARGET_ENGINE_V8)
-  target_link_directories(
-    ${NAME}
-    PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/../Frameworks/v8
-  )
+  if (TARGET_PLATFORM_MACOS)
+    target_link_directories(
+      ${NAME}
+      PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}/../Frameworks/v8_macos
+    )
+  else()
+    target_link_directories(
+      ${NAME}
+      PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}/../Frameworks/v8_ios
+    )
+  endif()
 
   target_link_libraries(
     ${NAME}

NativeScript/Info.plist

@@ -0,0 +1,22 @@
+<?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>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+</dict>
+</plist>

NativeScript/ffi/Class.mm

@@ -21,10 +21,15 @@
     MDSectionOffset originalOffset = offset;
     auto nameOffset = metadata->getOffset(offset);
     offset += sizeof(MDSectionOffset);
+    auto runtimeNameOffset = metadata->getOffset(offset);
+    offset += sizeof(MDSectionOffset);
     bool hasProtocols = (nameOffset & mdSectionOffsetNext) != 0;
     nameOffset &= ~mdSectionOffsetNext;
     auto name = metadata->resolveString(nameOffset);
-
+    auto runtimeName = name;
+    if (runtimeNameOffset != MD_SECTION_OFFSET_NULL) {
+      runtimeName = metadata->resolveString(runtimeNameOffset);
+    }
     while (hasProtocols) {
       auto protocolOffset = metadata->getOffset(offset);
       offset += sizeof(MDSectionOffset);
@@ -56,7 +61,7 @@
       }
     }
 
-    auto nativeClass = objc_getClass(name);
+    auto nativeClass = objc_getClass(runtimeName);
     if (nativeClass != nil) {
       mdClassesByPointer[nativeClass] = originalOffset;
     }
@@ -406,9 +411,16 @@ napi_value toJS(napi_env env) {
   } else {
     auto nameOffset = bridgeState->metadata->getOffset(offset);
     offset += sizeof(MDSectionOffset);
+    auto runtimeNameOffset = bridgeState->metadata->getOffset(offset);
+    offset += sizeof(MDSectionOffset);
     bool hasProtocols = (nameOffset & mdSectionOffsetNext) != 0;
     nameOffset &= ~mdSectionOffsetNext;
     name = bridgeState->metadata->resolveString(nameOffset);
+    const char* runtimeName = name.c_str();
+    if (runtimeNameOffset != MD_SECTION_OFFSET_NULL) {
+      runtimeName = bridgeState->metadata->resolveString(runtimeNameOffset);
+    }
+    nativeClass = objc_getClass(runtimeName);
     while (hasProtocols) {
       auto protocolOffset = bridgeState->metadata->getOffset(offset);
       offset += sizeof(MDSectionOffset);
@@ -420,7 +432,6 @@ napi_value toJS(napi_env env) {
     hasMembers = (superClassOffset & mdSectionOffsetNext) != 0;
     superClassOffset &= ~mdSectionOffsetNext;
     offset += sizeof(MDSectionOffset);
-    nativeClass = objc_getClass(name.c_str());
   }
 
   napi_value constructor, prototype;

NativeScript/ffi/ClassMember.mm

@@ -318,6 +318,8 @@ inline id assertSelf(napi_env env, napi_value jsThis) {
     }
   }
 
+  //  NSLog(@"objcNativeCall: %p, %@", self, NSStringFromSelector(method->methodOrGetter.selector));
+
   if (!objcNativeCall(env, cif, self, avalues, rvalue)) {
     return nullptr;
   }

NativeScript/ffi/NativeScriptException.mm

@@ -36,6 +36,7 @@
   this->fullMessage_ = GetFullMessage(env, error, this->message_);
   this->name_ = name;
   napi_set_named_property(env, error, "name", napi_util::to_js_string(env, name));
+  NSLog(@"NativeScriptException::NativeScriptException: %s", this->fullMessage_.c_str());
 }
 
 std::string NativeScriptException::Description() const {

build_nativescript.sh

@@ -86,7 +86,7 @@ function cmake_build () {
 
     for arch in x86_64 arm64; do
 
-      METADATA_SIZE=$(($METADATA_SIZE > $(stat -f%z "./metadata-generator/metadata.$platform.$arch.nsmd") ? $METADATA_SIZE : $(stat -f%z "./metadata-generator/metadata.$platform.$arch.nsmd")))
+      METADATA_SIZE=$(($METADATA_SIZE > $(stat -f%z "./metadata-generator/metadata/metadata.$platform.$arch.nsmd") ? $METADATA_SIZE : $(stat -f%z "./metadata-generator/metadata.$platform.$arch.nsmd")))
 
     done
 

metadata-generator/CMakeLists.txt

@@ -77,6 +77,12 @@ target_link_libraries(
   clang
 )
 
+# Set runtime path for libclang
+set_target_properties(${NAME} PROPERTIES
+  BUILD_WITH_INSTALL_RPATH TRUE
+  INSTALL_RPATH "/Library/Developer/CommandLineTools/usr/lib"
+)
+
 install(TARGETS ${NAME}
   RUNTIME DESTINATION bin)
 

metadata-generator/deno.json

@@ -250,6 +250,7 @@ class ClassDecl {
   std::string framework;
 
   std::string name;
+  std::string runtimeName;
   std::string superClassName;
   std::vector<std::string> protocolNames;
 

metadata-generator/include/IR.h

@@ -105,6 +105,7 @@ struct MDProtocol {
 
 struct MDClass {
   MDSectionOffset name;
+  MDSectionOffset runtimeName;
   std::vector<MDSectionOffset> protocols;
   MDSectionOffset superclass;
   std::vector<MDMember *> members;
@@ -242,7 +243,7 @@ class MDSection : public std::unordered_map<MDSectionOffset, T> {
     if (stringToKey.contains(strKey)) {
       return stringToKey[strKey];
     }
-    MDSectionOffset key = section_offset;
+    MDSectionOffset key = (MDSectionOffset)section_offset;
     size_t valueSize = serde.size(value);
     section_offset += valueSize;
     section_size += valueSize;