Fix compilation flags and add new features

Author: DjDeveloperr

CMakeLists.txt

@@ -8,7 +8,7 @@ project(ObjCBridge)
 set(NAME ObjCBridge)
 set(VERSION 0.1.0)
 
-set(CMAKE_C_FLAGS "-fobjective-c")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjective-c")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-shorten-64-to-32")
 set(CMAKE_CXX_FLAGS_DEBUG "-g")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")

examples/class.js

@@ -17,20 +17,12 @@ class MyClass extends NSObject {
 const myClass = MyClass.new();
 console.log(myClass);
 
+console.log(NSObject.class() === NSObject, MyClass.class() === MyClass);
+
 MyClass.prototype.init = function () {
-  console.log("MyClass.prototype.init()", this);
+  console.log("MyClass.init() (patched)", this);
   return this;
 };
 
 const myClass2 = MyClass.new();
 console.log(myClass2);
-
-// deno-lint-ignore ban-ts-comment
-// @ts-expect-error
-MyClass.prototype.init = 0;
-
-try {
-  MyClass.new();
-} catch (e) {
-  console.log("Expected Error:", e);
-}

include/MethodCif.h

@@ -16,6 +16,7 @@ class MethodCif {
   unsigned int argc;
   size_t frameLength;
   size_t rvalueLength;
+  bool isVariadic = false;
 
   void *rvalue;
   void **avalues;

lib/inline_functions.d.ts

@@ -1,16 +1,16 @@
 export {};
 
 declare global {
-  function CGMakePoint(x: number, y: number): { x: number; y: number };
-  let NSMakePoint: typeof CGMakePoint;
+  function CGPointMake(x: number, y: number): { x: number; y: number };
+  let NSMakePoint: typeof CGPointMake;
 
-  function CGMakeSize(
+  function CGSizeMake(
     width: number,
     height: number,
   ): { width: number; height: number };
-  let NSMakeSize: typeof CGMakeSize;
+  let NSMakeSize: typeof CGSizeMake;
 
-  function CGMakeRect(
+  function CGRectMake(
     x: number,
     y: number,
     width: number,
@@ -19,7 +19,7 @@ declare global {
     origin: { x: number; y: number };
     size: { width: number; height: number };
   };
-  let NSMakeRect: typeof CGMakeRect;
+  let NSMakeRect: typeof CGRectMake;
 
   function UIMakeEdgeInsets(
     top: number,

src/Closure.mm

@@ -49,16 +49,14 @@ void JSIMP(ffi_cif *cif, void *ret, void *args[], void *data) {
 
   napi_value argv[cif->nargs - 2];
   for (int i = 2; i < cif->nargs; i++) {
-    argv[i - 2] = closure->argTypes[i]->toJS(env, args[i], kBlockParam);
+    argv[i - 2] = closure->argTypes[i]->toJS(env, args[i], 0);
   }
 
   // Clear any pending exceptions before calling the function.
   napi_get_and_clear_last_exception(env, &result);
 
-  auto pool = objc_autoreleasePoolPush();
   napi_status status =
       napi_call_function(env, thisArg, func, cif->nargs - 2, argv, &result);
-  objc_autoreleasePoolPop(pool);
 
   bool shouldFree;
   closure->returnType->toNative(env, result, ret, &shouldFree, &shouldFree);
@@ -100,16 +98,14 @@ void callJSBlockFromMainThread(napi_env env, napi_value js_cb, void *context,
 
   napi_value argv[ctx->cif->nargs - 1];
   for (int i = 0; i < ctx->cif->nargs - 1; i++) {
-    argv[i] = closure->argTypes[i]->toJS(env, ctx->args[i + 1], kBlockParam);
+    argv[i] = closure->argTypes[i]->toJS(env, ctx->args[i + 1], 0);
   }
 
   // Clear any pending exceptions before calling the function.
   napi_get_and_clear_last_exception(env, &result);
 
-  auto pool = objc_autoreleasePoolPush();
   napi_status status = napi_call_function(env, thisArg, func,
                                           ctx->cif->nargs - 1, argv, &result);
-  objc_autoreleasePoolPop(pool);
 
   bool shouldFree;
   closure->returnType->toNative(env, result, ctx->ret, &shouldFree,

src/CustomClass.mm

@@ -145,6 +145,8 @@ void addProtocol(napi_env env, ObjCBridgeData *bridgeData, Class cls,
   napi_get_named_property(env, constructor, "name", &className);
   napi_get_value_string_utf8(env, className, name_buf, 512, nullptr);
   std::string name = name_buf;
+  name += "_";
+  name += std::to_string(rand());
 
   Class cls = objc_allocateClassPair(superClassNative, name.c_str(), 0);
 

src/InlineFunctions.mm

@@ -5,15 +5,15 @@
 
 static const char *inlineFunctionsSource = R"(
 
-globalThis.CGMakePoint = globalThis.NSMakePoint = function CGMakePoint(x, y) {
+globalThis.CGPointMake = globalThis.NSMakePoint = function CGMakePoint(x, y) {
   return { x, y };
 };
 
-globalThis.CGMakeSize = globalThis.NSMakeSize = function CGMakeSize(width, height) {
+globalThis.CGSizeMake = globalThis.NSMakeSize = function CGMakeSize(width, height) {
   return { width, height };
 };
 
-globalThis.CGMakeRect = globalThis.NSMakeRect = function CGMakeRect(x, y, width, height) {
+globalThis.CGRectMake = globalThis.NSMakeRect = function CGMakeRect(x, y, width, height) {
   return { origin: { x, y }, size: { width, height } };
 };
 

src/MethodCif.mm

@@ -93,6 +93,7 @@
                      MDSectionOffset offset, bool isMethod) {
   auto returnTypeKind = reader->getTypeKind(offset);
   bool next = (returnTypeKind & mdTypeFlagNext) != 0;
+  isVariadic = (returnTypeKind & mdTypeFlagVariadic) != 0;
 
   returnType = TypeConv::Make(env, reader, &offset);
 

src/NativeCall.mm

@@ -58,7 +58,7 @@ 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?
   bool supercall = false;
-  // napi_has_named_property(env, jsThis, "__objc_msgSendSuper__", &supercall);
+  napi_has_named_property(env, jsThis, "__objc_msgSendSuper__", &supercall);
 
 #if defined(__x86_64__)
   bool isStret = cif->returnType->type->size > 16 &&
@@ -132,6 +132,8 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
     }
   }
 
+  // NSLog(@"[call] %s", sel_getName(method->selector));
+
   objcNativeCall(env, jsThis, cif, self, avalues, rvalue);
 
   for (unsigned int i = 0; i < cif->argc; i++) {

src/Object.mm

@@ -1,4 +1,5 @@
 #include "ObjCBridge.h"
+#include "node_api_util.h"
 
 #import <Foundation/Foundation.h>
 
@@ -180,16 +181,29 @@ napi_value findConstructorForObject(napi_env env, ObjCBridgeData *bridgeData,
       return value;
     }
 
+    // It was collected, but not unregistered yet.
     unregisterObject(obj);
   }
 
+  auto findClass = classesByPointer.find(obj);
+  if (findClass != classesByPointer.end()) {
+    return get_ref_value(env, findClass->second->constructor);
+  }
+
   auto cls = object_getClass(obj);
 
   auto mdFindByPointer = mdClassesByPointer.find(cls);
   if (mdFindByPointer != mdClassesByPointer.end()) {
     classOffset = mdFindByPointer->second;
   }
 
+  auto findByPointer = classesByPointer.find(cls);
+  if (findByPointer != classesByPointer.end()) {
+    return getObject(env, obj,
+                     get_ref_value(env, findByPointer->second->constructor),
+                     ownership);
+  }
+
   napi_value constructor = nullptr;
   if (classOffset != 0) {
     auto bridgedCls = getClass(env, classOffset);
@@ -205,7 +219,7 @@ napi_value findConstructorForObject(napi_env env, ObjCBridgeData *bridgeData,
     if (proto == nullptr) {
       return nullptr;
     }
-
+    
     constructor = get_ref_value(env, proto->constructor);
   } else {
     constructor = findConstructorForObject(env, this, obj, cls);