feat: interop.addMethod and addProtocol APIs (#24)

* addMethod and addProtocol API

* fix

Author: DjDeveloperr

include/ClassBuilder.h

@@ -20,7 +20,8 @@ class ClassBuilder : public ObjCClass {
 
   void addProtocol(ObjCProtocol *protocol);
   MethodDescriptor *lookupMethodDescriptor(std::string &name);
-  void addMethod(std::string &name, MethodDescriptor *desc, napi_value key);
+  void addMethod(std::string &name, MethodDescriptor *desc, napi_value key,
+                 napi_value func = nullptr);
 
   void build();
 

include/Interop.h

@@ -9,6 +9,8 @@ namespace objc_bridge {
 
 void registerInterop(napi_env env, napi_value global);
 
+napi_value interop_addMethod(napi_env env, napi_callback_info info);
+napi_value interop_addProtocol(napi_env env, napi_callback_info info);
 napi_value interop_adopt(napi_env env, napi_callback_info info);
 napi_value interop_free(napi_env env, napi_callback_info info);
 napi_value interop_sizeof(napi_env env, napi_callback_info info);

src/ClassBuilder.mm

@@ -118,13 +118,16 @@
 }
 
 void ClassBuilder::addMethod(std::string &name, MethodDescriptor *desc,
-                             napi_value key) {
+                             napi_value key, napi_value func) {
   switch (desc->kind) {
   case kMethodDescEncoding: {
     const char *encoding = desc->encoding.c_str();
     auto closure = new Closure(encoding, false);
     closure->env = env;
-    closure->propertyName = name;
+    if (func != nullptr)
+      closure->func = make_ref(env, func);
+    else
+      closure->propertyName = name;
     closure->thisConstructor = constructor;
     class_replaceMethod(nativeClass, desc->selector, (IMP)closure->fnptr,
                         encoding);
@@ -136,7 +139,10 @@
     auto closure = new Closure(bridgeState->metadata, desc->signatureOffset,
                                false, &encoding, true);
     closure->env = env;
-    closure->propertyName = name;
+    if (func != nullptr)
+      closure->func = make_ref(env, func);
+    else
+      closure->propertyName = name;
     closure->thisConstructor = constructor;
     class_replaceMethod(nativeClass, desc->selector, (IMP)closure->fnptr,
                         encoding.c_str());

src/Interop.mm

@@ -172,6 +172,24 @@ void registerInterop(napi_env env, napi_value global) {
           .data = nullptr,
           .method = interop_adopt,
       },
+      {
+          .utf8name = "addMethod",
+          .attributes = napi_enumerable,
+          .getter = nullptr,
+          .setter = nullptr,
+          .value = nullptr,
+          .data = nullptr,
+          .method = interop_addMethod,
+      },
+      {
+          .utf8name = "addProtocol",
+          .attributes = napi_enumerable,
+          .getter = nullptr,
+          .setter = nullptr,
+          .value = nullptr,
+          .data = nullptr,
+          .method = interop_addProtocol,
+      },
       {
           .utf8name = "free",
           .attributes = napi_enumerable,
@@ -219,11 +237,65 @@ void registerInterop(napi_env env, napi_value global) {
       },
   };
 
-  napi_define_properties(env, interop, 9, properties);
+  napi_define_properties(env, interop, 11, properties);
 
   napi_set_named_property(env, global, "interop", interop);
 }
 
+napi_value interop_addMethod(napi_env env, napi_callback_info info) {
+  napi_value argv[2];
+  size_t argc = 2;
+  napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr);
+
+  ClassBuilder *builder = nullptr;
+  napi_unwrap(env, argv[0], (void **)&builder);
+  if (builder == nullptr) {
+    napi_throw_error(env, nullptr, "Invalid class");
+    return nullptr;
+  }
+
+  napi_value name;
+  napi_get_named_property(env, argv[1], "name", &name);
+
+  static char funcNameBuf[512];
+  napi_get_value_string_utf8(env, name, funcNameBuf, 512, nullptr);
+  std::string funcName = funcNameBuf;
+
+  MethodDescriptor *desc = builder->lookupMethodDescriptor(funcName);
+  if (desc == nullptr) {
+    napi_throw_error(env, nullptr, "Invalid method, descriptor not found");
+    return nullptr;
+  }
+
+  builder->addMethod(funcName, desc, name, argv[1]);
+
+  return nullptr;
+}
+
+napi_value interop_addProtocol(napi_env env, napi_callback_info info) {
+  napi_value argv[2];
+  size_t argc = 2;
+  napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr);
+
+  ClassBuilder *builder = nullptr;
+  napi_unwrap(env, argv[0], (void **)&builder);
+  if (builder == nullptr) {
+    napi_throw_error(env, nullptr, "Invalid class");
+    return nullptr;
+  }
+
+  ObjCProtocol *proto = nullptr;
+  napi_unwrap(env, argv[1], (void **)&proto);
+  if (proto == nullptr) {
+    napi_throw_error(env, nullptr, "Invalid protocol");
+    return nullptr;
+  }
+
+  builder->addProtocol(proto);
+
+  return nullptr;
+}
+
 napi_value interop_adopt(napi_env env, napi_callback_info info) {
   napi_value arg;
   size_t argc = 1;