improve build workflow, fix issue with quickjs

Author: DjDeveloperr

NativeScript/CMakeLists.txt

@@ -14,6 +14,10 @@ set(CMAKE_CXX_STANDARD 20)
 
 set(BUILD_FRAMEWORK TRUE)
 
+set(COMMON_FLAGS "-O3 -Wno-shorten-64-to-32")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
+
 # Arguments
 
 set(TARGET_PLATFORM "macos" CACHE STRING "Target platform for the Objective-C bridge")
@@ -274,7 +278,11 @@ if(TARGET_PLATFORM_MACOS)
 
   set(METADATA_FILE "metadata.macos.nsmd")
 elseif(TARGET_PLATFORM_IOS)
-  set(METADATA_FILE "metadata.ios.nsmd")
+  if(TARGET_PLATFORM_SIM)
+    set(METADATA_FILE "metadata.ios-sim.nsmd")
+  else()
+    set(METADATA_FILE "metadata.ios.nsmd")
+  endif()
 endif()
 
 if(NOT METADATA_SIZE EQUAL 0)

NativeScript/ffi/CFunction.mm

@@ -15,27 +15,26 @@
 
     napi_property_descriptor prop = {
         .utf8name = name,
-        .attributes =
-            (napi_property_attributes)(napi_enumerable | napi_configurable),
+        .method = CFunction::jsCall,
         .getter = nullptr,
         .setter = nullptr,
         .value = nullptr,
-        .data = (void *)((size_t)originalOffset),
-        .method = CFunction::jsCall,
+        .attributes = (napi_property_attributes)(napi_enumerable | napi_configurable),
+        .data = (void*)((size_t)originalOffset),
     };
 
     napi_define_properties(env, global, 1, &prop);
   }
 }
 
-CFunction *ObjCBridgeState::getCFunction(napi_env env, MDSectionOffset offset) {
+CFunction* ObjCBridgeState::getCFunction(napi_env env, MDSectionOffset offset) {
   auto cached = cFunctionCache.find(offset);
   if (cached != cFunctionCache.end()) {
     return cached->second;
   }
 
-  auto sigOffset = metadata->signaturesOffset +
-                   metadata->getOffset(offset + sizeof(MDSectionOffset));
+  auto sigOffset =
+      metadata->signaturesOffset + metadata->getOffset(offset + sizeof(MDSectionOffset));
 
   auto cFunction = new CFunction(dlsym(self_dl, metadata->getString(offset)));
   cFunction->cif = getCFunctionCif(env, sigOffset);
@@ -45,7 +44,7 @@
 }
 
 napi_value CFunction::jsCall(napi_env env, napi_callback_info cbinfo) {
-  void *_offset;
+  void* _offset;
 
   napi_get_cb_info(env, cbinfo, nullptr, nullptr, nullptr, &_offset);
 
@@ -58,8 +57,8 @@
   size_t argc = cif->argc;
   napi_get_cb_info(env, cbinfo, &argc, cif->argv, nullptr, nullptr);
 
-  void *avalues[cif->argc];
-  void *rvalue = cif->rvalue;
+  void* avalues[cif->argc];
+  void* rvalue = cif->rvalue;
 
   bool shouldFreeAny = false;
   bool shouldFree[cif->argc];
@@ -68,8 +67,7 @@
     for (unsigned int i = 0; i < cif->argc; i++) {
       shouldFree[i] = false;
       avalues[i] = cif->avalues[i];
-      cif->argTypes[i]->toNative(env, cif->argv[i], avalues[i], &shouldFree[i],
-                                 &shouldFreeAny);
+      cif->argTypes[i]->toNative(env, cif->argv[i], avalues[i], &shouldFree[i], &shouldFreeAny);
     }
   }
 
@@ -78,7 +76,7 @@
   if (shouldFreeAny) {
     for (unsigned int i = 0; i < cif->argc; i++) {
       if (shouldFree[i]) {
-        cif->argTypes[i]->free(env, *((void **)avalues[i]));
+        cif->argTypes[i]->free(env, *((void**)avalues[i]));
       }
     }
   }
@@ -92,4 +90,4 @@
   }
 }
 
-} // namespace objc_bridge
+}  // namespace objc_bridge

NativeScript/ffi/Cif.mm

@@ -1,18 +1,19 @@
 #include "Cif.h"
+#include <Foundation/Foundation.h>
+#include <iostream>
+#include <vector>
+#include "Metadata.h"
 #include "MetadataReader.h"
 #include "ObjCBridge.h"
 #include "TypeConv.h"
 #include "Util.h"
-#include <Foundation/Foundation.h>
-#include <iostream>
-#include <vector>
 
 namespace objc_bridge {
 
 // Essentially, we cache libffi structures per unique method signature,
 // this helps us avoid the overhead of creating them on the fly for each
 // invocation.
-Cif *ObjCBridgeState::getMethodCif(napi_env env, Method method) {
+Cif* ObjCBridgeState::getMethodCif(napi_env env, Method method) {
   auto encoding = std::string(method_getTypeEncoding(method));
   auto find = this->cifs[encoding];
   if (find != nullptr) {
@@ -25,7 +26,7 @@
   return cif;
 }
 
-Cif *ObjCBridgeState::getMethodCif(napi_env env, MDSectionOffset offset) {
+Cif* ObjCBridgeState::getMethodCif(napi_env env, MDSectionOffset offset) {
   auto find = this->mdMethodSignatureCache[offset];
   if (find != nullptr) {
     return find;
@@ -37,7 +38,7 @@
   return cif;
 }
 
-Cif *ObjCBridgeState::getBlockCif(napi_env env, MDSectionOffset offset) {
+Cif* ObjCBridgeState::getBlockCif(napi_env env, MDSectionOffset offset) {
   auto find = this->mdBlockSignatureCache[offset];
   if (find != nullptr) {
     return find;
@@ -49,7 +50,7 @@
   return cif;
 }
 
-Cif *ObjCBridgeState::getCFunctionCif(napi_env env, MDSectionOffset offset) {
+Cif* ObjCBridgeState::getCFunctionCif(napi_env env, MDSectionOffset offset) {
   auto find = this->mdFunctionSignatureCache[offset];
   if (find != nullptr) {
     return find;
@@ -65,15 +66,15 @@
   auto signature = [NSMethodSignature signatureWithObjCTypes:encoding.c_str()];
   unsigned long numberOfArguments = signature.numberOfArguments;
   this->argc = (int)numberOfArguments - 2;
-  this->argv = (napi_value *)malloc(sizeof(napi_value) * this->argc);
+  this->argv = (napi_value*)malloc(sizeof(napi_value) * this->argc);
 
   unsigned int argc = (unsigned int)numberOfArguments;
 
-  const char *returnType = signature.methodReturnType;
+  const char* returnType = signature.methodReturnType;
   this->returnType = TypeConv::Make(env, &returnType);
 
-  ffi_type *rtype = this->returnType->type;
-  ffi_type **atypes = (ffi_type **)malloc(sizeof(ffi_type *) * argc);
+  ffi_type* rtype = this->returnType->type;
+  ffi_type** atypes = (ffi_type**)malloc(sizeof(ffi_type*) * argc);
 
   unsigned long methodReturnLength = signature.methodReturnLength;
   unsigned long frameLength = signature.frameLength;
@@ -82,13 +83,13 @@
   this->rvalueLength = methodReturnLength;
   this->frameLength = frameLength;
 
-  this->avalues = (void **)malloc(sizeof(void *) * argc);
-  this->shouldFree = (bool *)malloc(sizeof(bool) * this->argc);
+  this->avalues = (void**)malloc(sizeof(void*) * argc);
+  this->shouldFree = (bool*)malloc(sizeof(bool) * this->argc);
   memset(this->shouldFree, false, sizeof(bool) * this->argc);
   this->shouldFreeAny = false;
 
   for (int i = 0; i < numberOfArguments; i++) {
-    const char *argenc = [signature getArgumentTypeAtIndex:i];
+    const char* argenc = [signature getArgumentTypeAtIndex:i];
 
     auto argTypeInfo = TypeConv::Make(env, &argenc);
     atypes[i] = argTypeInfo->type;
@@ -107,21 +108,20 @@
   }
 
   if (status != FFI_OK) {
-    std::cout << "Failed to prepare CIF, libffi returned error:" << status
-              << std::endl;
+    std::cout << "Failed to prepare CIF, libffi returned error:" << status << std::endl;
     return;
   }
 }
 
-Cif::Cif(napi_env env, MDMetadataReader *reader, MDSectionOffset offset,
-         bool isMethod, bool isBlock) {
+Cif::Cif(napi_env env, MDMetadataReader* reader, MDSectionOffset offset, bool isMethod,
+         bool isBlock) {
   auto returnTypeKind = reader->getTypeKind(offset);
-  bool next = (returnTypeKind & mdTypeFlagNext) != 0;
-  isVariadic = (returnTypeKind & mdTypeFlagVariadic) != 0;
+  bool next = ((MDTypeFlag)returnTypeKind & mdTypeFlagNext) != 0;
+  isVariadic = ((MDTypeFlag)returnTypeKind & mdTypeFlagVariadic) != 0;
 
   returnType = TypeConv::Make(env, reader, &offset);
 
-  ffi_type **atypes = nullptr;
+  ffi_type** atypes = nullptr;
 
   auto implicitArgs = isMethod ? 2 : isBlock ? 1 : 0;
 
@@ -130,7 +130,7 @@
   if (next || isMethod || isBlock) {
     while (next) {
       auto argTypeKind = reader->getTypeKind(offset);
-      next = (argTypeKind & mdTypeFlagNext) != 0;
+      next = ((MDTypeFlag)argTypeKind & mdTypeFlagNext) != 0;
       auto argTypeInfo = TypeConv::Make(env, reader, &offset);
       std::string enc;
       argTypeInfo->encode(&enc);
@@ -141,11 +141,11 @@
 
     auto totalArgc = argc + implicitArgs;
 
-    argv = (napi_value *)malloc(sizeof(napi_value) * argc);
-    shouldFree = (bool *)malloc(sizeof(bool) * argc);
+    argv = (napi_value*)malloc(sizeof(napi_value) * argc);
+    shouldFree = (bool*)malloc(sizeof(bool) * argc);
 
-    atypes = (ffi_type **)malloc(sizeof(ffi_type *) * totalArgc);
-    avalues = (void **)malloc(sizeof(void *) * argc);
+    atypes = (ffi_type**)malloc(sizeof(ffi_type*) * totalArgc);
+    avalues = (void**)malloc(sizeof(void*) * argc);
 
     if (isMethod) {
       atypes[0] = &ffi_type_pointer;
@@ -167,12 +167,11 @@
     shouldFree = nullptr;
   }
 
-  ffi_status status = ffi_prep_cif(&cif, FFI_DEFAULT_ABI, argc + implicitArgs,
-                                   returnType->type, atypes);
+  ffi_status status =
+      ffi_prep_cif(&cif, FFI_DEFAULT_ABI, argc + implicitArgs, returnType->type, atypes);
 
   if (status != FFI_OK) {
-    std::cout << "Failed to prepare CIF, libffi returned error: " << status
-              << std::endl;
+    std::cout << "Failed to prepare CIF, libffi returned error: " << status << std::endl;
     return;
   }
 
@@ -184,4 +183,4 @@
   rvalueLength = cif.rtype->size;
 }
 
-} // namespace objc_bridge
+}  // namespace objc_bridge