cleanup

Author: DjDeveloperr

include/Class.h

@@ -24,11 +24,13 @@ class BridgedClass {
 
   BridgedClass *superclass;
 
+  napi_env env;
   napi_ref constructor;
   napi_ref prototype;
 
   BridgedClass() {}
   BridgedClass(napi_env env, MDSectionOffset offset);
+  ~BridgedClass();
 };
 
 } // namespace objc_bridge

src/Class.mm

@@ -209,10 +209,6 @@
   return nullptr;
 }
 
-// Common function used to define Objective-C properties & methods on a JS
-// constructor/prototype. This is used for both the main constructor/prototype,
-// as well as supercall constructor/prototype.
-
 std::string NativeObjectName = "NativeObject";
 
 // Bridge an Objective-C class to JavaScript on the fly. Runtime introspection
@@ -227,6 +223,8 @@
 BridgedClass::BridgedClass(napi_env env, MDSectionOffset offset) {
   NAPI_PREAMBLE
 
+  this->env = env;
+
   metadataOffset = offset;
 
   auto bridgeData = ObjCBridgeData::InstanceData(env);
@@ -267,18 +265,10 @@
                     (void *)this, 0, nil, &constructor);
 
   if (nativeClass != nil) {
-    NAPI_GUARD(
-        napi_wrap(env, constructor, (void *)nativeClass, nil, nil, nil)) {
-      NAPI_THROW_LAST_ERROR
-      return;
-    }
+    napi_wrap(env, constructor, (void *)nativeClass, nil, nil, nil);
   }
 
-  NAPI_GUARD(
-      napi_get_named_property(env, constructor, "prototype", &prototype)) {
-    NAPI_THROW_LAST_ERROR
-    return;
-  }
+  napi_get_named_property(env, constructor, "prototype", &prototype);
 
   napi_value superConstructor = nil, superPrototype = nil;
 
@@ -310,24 +300,10 @@
     superclass = nullptr;
   }
 
-  napi_value classExternal;
-  NAPI_GUARD(napi_create_external(env, (void *)nativeClass, nil, nil,
-                                  &classExternal)) {
-    NAPI_THROW_LAST_ERROR
-    return;
-  }
-
-  NAPI_GUARD(
-      napi_set_named_property(env, constructor, "__class__", classExternal)) {
-    NAPI_THROW_LAST_ERROR
-    return;
-  }
-
   this->constructor = make_ref(env, constructor);
   this->prototype = make_ref(env, prototype);
 
   if (isNativeObject) {
-    // Define custom inspect property.
     napi_property_descriptor property = {
         .utf8name = nil,
         .name = jsSymbolFor(env, "nodejs.util.inspect.custom"),
@@ -340,7 +316,6 @@
     };
 
     napi_define_properties(env, prototype, 1, &property);
-    // napi_define_properties(env, constructor, 1, &property);
 
     napi_value global, Symbol, SymbolDispose;
     napi_get_global(env, &global);
@@ -464,4 +439,9 @@
   }
 }
 
-} // namespace objc_bridge
+BridgedClass::~BridgedClass() {
+  napi_delete_reference(env, constructor);
+  napi_delete_reference(env, prototype);
+}
+
+} // namespace objc_bridge

src/CustomClass.mm

@@ -125,14 +125,17 @@ void addProtocol(napi_env env, ObjCBridgeData *bridgeData, Class cls,
 extern char name_buf[512];
 
 void ObjCBridgeData::registerClass(napi_env env, napi_value constructor) {
-  napi_value classExternal, prototype, registered;
-  napi_get_named_property(env, constructor, "__class__", &classExternal);
+  napi_value prototype;
   napi_get_named_property(env, constructor, "prototype", &prototype);
 
+  napi_value superConstructor;
+  napi_get_prototype(env, constructor, &superConstructor);
   Class superClassNative = nullptr;
-  napi_get_value_external(env, classExternal, (void **)&superClassNative);
+  napi_unwrap(env, superConstructor, (void **)&superClassNative);
 
   if (superClassNative == nullptr) {
+    // If the class does not inherit from a native class,
+    // by default it inherits from NSObject.
     superClassNative = [NSObject class];
   }
 
@@ -152,18 +155,9 @@ void addProtocol(napi_env env, ObjCBridgeData *bridgeData, Class cls,
 
   napi_value properties;
 
-  napi_value jsGlobal, jsObject, jsObjectGetOwnPropertyNames;
-  napi_get_global(env, &jsGlobal);
-  napi_get_named_property(env, jsGlobal, "Object", &jsObject);
-  napi_get_named_property(env, jsObject, "getOwnPropertyNames",
-                          &jsObjectGetOwnPropertyNames);
-
-  napi_call_function(env, jsObject, jsObjectGetOwnPropertyNames, 1, &prototype,
-                     &properties);
-
-  // napi_get_all_property_names(env, prototype, napi_key_own_only,
-  //                             napi_key_skip_symbols,
-  //                             napi_key_numbers_to_strings, &properties);
+  napi_get_all_property_names(env, prototype, napi_key_own_only,
+                              napi_key_skip_symbols,
+                              napi_key_numbers_to_strings, &properties);
 
   uint32_t propertyCount = 0;
   napi_get_array_length(env, properties, &propertyCount);
@@ -180,12 +174,9 @@ void addProtocol(napi_env env, ObjCBridgeData *bridgeData, Class cls,
     napi_get_named_property(env, constructor, "ObjCExposedMethods",
                             &exposedMethods);
 
-    // napi_get_all_property_names(
-    //     env, exposedMethods, napi_key_own_only, napi_key_skip_symbols,
-    //     napi_key_numbers_to_strings, &exposedMethodNames);
-
-    napi_call_function(env, jsObject, jsObjectGetOwnPropertyNames, 1,
-                       &exposedMethods, &exposedMethodNames);
+    napi_get_all_property_names(
+        env, exposedMethods, napi_key_own_only, napi_key_skip_symbols,
+        napi_key_numbers_to_strings, &exposedMethodNames);
 
     uint32_t exposedMethodCount = 0;
     napi_get_array_length(env, exposedMethodNames, &exposedMethodCount);
@@ -284,17 +275,8 @@ void addProtocol(napi_env env, ObjCBridgeData *bridgeData, Class cls,
 
   classesByPointer[cls] = bridgedClass;
 
-  void *alreadyWrapped;
-  napi_unwrap(env, constructor, &alreadyWrapped);
-  if (alreadyWrapped != nullptr) {
-    napi_remove_wrap(env, constructor, &alreadyWrapped);
-  }
   napi_wrap(env, constructor, (void *)cls, nullptr, nullptr, nullptr);
 
-  napi_value external;
-  napi_create_external(env, (void *)cls, nullptr, nullptr, &external);
-  napi_set_named_property(env, constructor, "__class__", external);
-
   napi_value jsTrue;
   napi_get_boolean(env, true, &jsTrue);
   napi_set_named_property(env, constructor, "__objc_msgSendSuper__", jsTrue);