Refactor NativeCall into ClassMember and CFunction

Author: DjDeveloperr

CMakeLists.txt

@@ -89,7 +89,7 @@ set(LIB_SOURCE_FILES
   src/Block.mm
   src/Class.mm
   src/Closure.mm
-  src/NativeCall.mm
+  src/ClassMember.mm
   src/MethodCif.mm
   src/TypeConv.mm
   src/Util.mm

include/CFunction.h

@@ -10,6 +10,8 @@ typedef struct CFunction {
   MethodCif *cif;
 } CFunction;
 
+napi_value JS_CFunction(napi_env env, napi_callback_info cbinfo);
+
 } // namespace objc_bridge
 
 #endif /* C_FUNCTION_H */

include/Class.h

@@ -1,8 +1,8 @@
 #ifndef BRIDGED_CLASS_H
 #define BRIDGED_CLASS_H
 
+#include "ClassMember.h"
 #include "MetadataReader.h"
-#include "NativeCall.h"
 #include "node_api_util.h"
 #include "objc/message.h"
 #include "objc/runtime.h"

include/NativeCall.h include/ClassMember.hinclude/NativeCall.h renamed to include/ClassMember.h

@@ -6,7 +6,6 @@
 
 namespace objc_bridge {
 
-napi_value JS_CFunction(napi_env env, napi_callback_info cbinfo);
 napi_value JS_BridgedMethod(napi_env env, napi_callback_info cbinfo);
 napi_value JS_BridgedGetter(napi_env env, napi_callback_info cbinfo);
 napi_value JS_BridgedSetter(napi_env env, napi_callback_info cbinfo);

src/CFunction.mm

@@ -1,5 +1,5 @@
 #include "CFunction.h"
-#include "NativeCall.h"
+#include "ClassMember.h"
 #include "ObjCBridge.h"
 
 namespace objc_bridge {
@@ -54,4 +54,46 @@
   return cFunction;
 }
 
+NAPI_FUNCTION(CFunction) {
+  void *_offset;
+
+  napi_get_cb_info(env, cbinfo, nullptr, nullptr, nullptr, &_offset);
+
+  auto bridgeState = ObjCBridgeState::InstanceData(env);
+  MDSectionOffset offset = (MDSectionOffset)((size_t)_offset);
+
+  auto func = bridgeState->getCFunction(env, offset);
+  auto cif = func->cif;
+
+  size_t argc = cif->argc;
+  napi_get_cb_info(env, cbinfo, &argc, cif->argv, nullptr, nullptr);
+
+  void *avalues[cif->argc];
+  void *rvalue = cif->rvalue;
+
+  bool shouldFreeAny = false;
+  bool shouldFree[cif->argc];
+
+  if (cif->argc > 0) {
+    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->call(func->fnptr, rvalue, avalues);
+
+  if (shouldFreeAny) {
+    for (unsigned int i = 0; i < cif->argc; i++) {
+      if (shouldFree[i]) {
+        cif->argTypes[i]->free(env, *((void **)avalues[i]));
+      }
+    }
+  }
+
+  return cif->returnType->toJS(env, rvalue);
+}
+
 } // namespace objc_bridge

src/Class.mm

@@ -1,7 +1,7 @@
 #include "Class.h"
+#include "ClassMember.h"
 #include "Metadata.h"
 #include "MetadataReader.h"
-#include "NativeCall.h"
 #include "ObjCBridge.h"
 #include "Protocol.h"
 #include "Util.h"

src/NativeCall.mm src/ClassMember.mmsrc/NativeCall.mm renamed to src/ClassMember.mm

@@ -1,4 +1,4 @@
-#include "NativeCall.h"
+#include "ClassMember.h"
 #include "MetadataReader.h"
 #include "ObjCBridge.h"
 #include "TypeConv.h"
@@ -12,48 +12,6 @@
 
 namespace objc_bridge {
 
-NAPI_FUNCTION(CFunction) {
-  void *_offset;
-
-  napi_get_cb_info(env, cbinfo, nullptr, nullptr, nullptr, &_offset);
-
-  auto bridgeState = ObjCBridgeState::InstanceData(env);
-  MDSectionOffset offset = (MDSectionOffset)((size_t)_offset);
-
-  auto func = bridgeState->getCFunction(env, offset);
-  auto cif = func->cif;
-
-  size_t argc = cif->argc;
-  napi_get_cb_info(env, cbinfo, &argc, cif->argv, nullptr, nullptr);
-
-  void *avalues[cif->argc];
-  void *rvalue = cif->rvalue;
-
-  bool shouldFreeAny = false;
-  bool shouldFree[cif->argc];
-
-  if (cif->argc > 0) {
-    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->call(func->fnptr, rvalue, avalues);
-
-  if (shouldFreeAny) {
-    for (unsigned int i = 0; i < cif->argc; i++) {
-      if (shouldFree[i]) {
-        cif->argTypes[i]->free(env, *((void **)avalues[i]));
-      }
-    }
-  }
-
-  return cif->returnType->toJS(env, rvalue);
-}
-
 inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
                            id self, void **avalues, void *rvalue) {
   // TODO: This seems bad for performance. Is there a better way?

src/ObjCBridge.mm

@@ -2,12 +2,12 @@
 #include "AutoreleasePool.h"
 #include "Block.h"
 #include "Class.h"
+#include "ClassMember.h"
 #include "Enum.h"
 #include "InlineFunctions.h"
 #include "Interop.h"
 #include "Metadata.h"
 #include "MetadataReader.h"
-#include "NativeCall.h"
 #include "ObjectRef.h"
 #include "Struct.h"
 #include "TypeConv.h"

src/Protocol.mm

@@ -1,6 +1,6 @@
 #include "Protocol.h"
+#include "ClassMember.h"
 #include "MetadataReader.h"
-#include "NativeCall.h"
 #include "ObjCBridge.h"
 #include "Util.h"
 #include "node_api_util.h"