fix: check if initializer returned a different value compared to self

Author: DjDeveloperr

include/ClassMember.h

@@ -51,6 +51,7 @@ class ObjCClassMember {
                             MDSectionOffset offset, napi_value constructor);
 
   static napi_value JSCall(napi_env env, napi_callback_info cbinfo);
+  static napi_value JSCallInit(napi_env env, napi_callback_info cbinfo);
   static napi_value JSGetter(napi_env env, napi_callback_info cbinfo);
   static napi_value JSSetter(napi_env env, napi_callback_info cbinfo);
 

metadata/include/IR.h

@@ -215,6 +215,7 @@ class MemberDecl {
   std::vector<ParameterDecl> parameters;
   std::string methodSelector;
   bool isVariadic;
+  bool isInit = false;
 
   // Property
   TypeSpec propertyType;

metadata/include/Metadata.h

@@ -93,6 +93,7 @@ enum MDMemberFlag : uint8_t {
   mdMemberStatic = 1 << 3,
   mdMemberMethod = 1 << 4,
   mdMemberReturnOwned = 1 << 5,
+  mdMemberIsInit = 1 << 6,
   mdMemberNext = 1 << 7,
 };
 

metadata/metadata.ios.nsmd

@@ -20,12 +20,6 @@ MemberDecl::MemberDecl(CXCursor cursor,
     name = jsifySelector(methodSelector);
     clang_disposeString(cxname);
 
-    if ((isStatic && (name == "alloc" || name == "new")) ||
-        (!isStatic && name == "init")) {
-      returnType.kind = kTypeInstanceObject;
-      return;
-    }
-
     auto argc = clang_Cursor_getNumArguments(cursor);
 
     for (int i = 0; i < argc; i++) {
@@ -45,6 +39,19 @@ MemberDecl::MemberDecl(CXCursor cursor,
       parameters.emplace_back(param);
     }
 
+    isVariadic = clang_Cursor_isVariadic(cursor);
+
+    if (isStatic && (name.find("alloc") == 0 || name == "new")) {
+      returnType.kind = kTypeInstanceObject;
+      return;
+    }
+
+    if (!isStatic && name.find("init") == 0) {
+      isInit = true;
+      returnType.kind = kTypeInstanceObject;
+      return;
+    }
+
     returnType =
         TypeSpec(clang_getCursorResultType(cursor), classTypeParameters);
 
@@ -56,8 +63,6 @@ MemberDecl::MemberDecl(CXCursor cursor,
       returnType.isNullable = true;
     }
 
-    isVariadic = clang_Cursor_isVariadic(cursor);
-
     break;
   }
 

metadata/metadata.macos.nsmd

@@ -54,6 +54,10 @@ MDMember *MDMetadataWriter::memberFromDecl(MemberDecl &decl) {
     if (isSelectorOwned(decl.methodSelector))
       member->flags = (MDMemberFlag)(member->flags | mdMemberReturnOwned);
 
+    if (decl.isInit) {
+      member->flags = (MDMemberFlag)(member->flags | mdMemberIsInit);
+    }
+
     MDSignature *mdSignature = new MDSignature();
     mdSignature->returnType = getTypeInfo(decl.returnType);
     for (auto param : decl.parameters) {

metadata/src/IR/Member.cpp

@@ -14,6 +14,18 @@
 
 namespace objc_bridge {
 
+napi_value JS_NSObject_alloc(napi_env env, napi_callback_info cbinfo) {
+  napi_value jsThis;
+  napi_get_cb_info(env, cbinfo, nullptr, nullptr, &jsThis, nullptr);
+
+  id self;
+  napi_unwrap(env, jsThis, (void **)&self);
+
+  id result = [self alloc];
+  return ObjCBridgeState::InstanceData(env)->getObject(env, result, jsThis,
+                                                       kOwnedObject);
+}
+
 void ObjCClassMember::defineMembers(napi_env env, ObjCClassMemberMap &memberMap,
                                     MDSectionOffset offset,
                                     napi_value constructor) {
@@ -108,7 +120,9 @@
       napi_property_descriptor property = {
           .utf8name = name.c_str(),
           .name = nil,
-          .method = ObjCClassMember::JSCall,
+          .method = (flags & metagen::mdMemberIsInit) != 0
+                        ? ObjCClassMember::JSCallInit
+                        : ObjCClassMember::JSCall,
           .getter = nil,
           .setter = nil,
           .value = nil,
@@ -118,6 +132,10 @@
           .data = &kv.first->second,
       };
 
+      if (name == "alloc") {
+        property.method = JS_NSObject_alloc;
+      }
+
       napi_define_properties(env, jsObject, 1, &property);
     }
   }
@@ -173,6 +191,71 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, MethodCif *cif,
   }
 }
 
+napi_value ObjCClassMember::JSCallInit(napi_env env,
+                                       napi_callback_info cbinfo) {
+  napi_value jsThis;
+  ObjCClassMember *method;
+
+  napi_get_cb_info(env, cbinfo, nullptr, nullptr, &jsThis, (void **)&method);
+
+  id self = nil;
+  napi_unwrap(env, jsThis, (void **)&self);
+  if (self == nil) {
+    napi_throw_error(env, nullptr, "self is nil");
+    return nullptr;
+  }
+
+  MethodCif *cif = method->methodCif;
+  if (cif == nullptr) {
+    cif = method->methodCif = method->bridgeState->getMethodCif(
+        env, method->methodOrGetter.signatureOffset);
+  }
+
+  size_t argc = cif->argc;
+  napi_get_cb_info(env, cbinfo, &argc, cif->argv, &jsThis, nullptr);
+
+  void *avalues[cif->cif.nargs];
+
+  avalues[0] = (void *)&self;
+  avalues[1] = (void *)&method->methodOrGetter.selector;
+
+  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 + 2] = cif->avalues[i + 2];
+      cif->argTypes[i]->toNative(env, cif->argv[i], avalues[i + 2],
+                                 &shouldFree[i], &shouldFreeAny);
+    }
+  }
+
+  id rvalue;
+
+  objcNativeCall(env, jsThis, cif, self, avalues, &rvalue);
+
+  for (unsigned int i = 0; i < cif->argc; i++) {
+    if (shouldFree[i]) {
+      cif->argTypes[i]->free(env, *((void **)avalues[i + 2]));
+    }
+  }
+
+  napi_value constructor = jsThis;
+  if (!method->classMethod)
+    napi_get_named_property(env, jsThis, "constructor", &constructor);
+
+  napi_value result =
+      method->bridgeState->getObject(env, rvalue, constructor, kUnownedObject);
+
+  if (rvalue != self) {
+    [self retain];
+    [rvalue release];
+  }
+
+  return result;
+}
+
 napi_value ObjCClassMember::JSCall(napi_env env, napi_callback_info cbinfo) {
   napi_value jsThis;
   ObjCClassMember *method;

metadata/src/MetadataWriter/Member.cpp

@@ -71,8 +71,6 @@ void finalize_objc_object_borrowed(napi_env, void *data, void *hint) {
   bridgeState->objectRefs.erase(object);
 }
 
-Class UIPlaceholderColorClass = objc_getClass("UIPlaceholderColor");
-
 napi_value ObjCBridgeState::getObject(napi_env env, id obj,
                                       napi_value constructor,
                                       ObjectOwnership ownership) {
@@ -100,10 +98,6 @@ void finalize_objc_object_borrowed(napi_env, void *data, void *hint) {
     return nullptr;
   }
 
-  if (cls == UIPlaceholderColorClass) {
-    ownership = kBorrowedObject;
-  }
-
   bool isClass = false;
 
   if (class_isMetaClass(cls)) {
@@ -305,7 +299,6 @@ napi_value findConstructorForObject(napi_env env, ObjCBridgeState *bridgeState,
 void ObjCBridgeState::unregisterObject(id object) noexcept {
   if (objectRefs.contains(object)) {
     objectRefs.erase(object);
-    // NSLog(@"release object: %@", object);
     [object release];
   }
 }

src/ClassMember.mm

@@ -98,6 +98,15 @@ declare const AVAudioVoiceProcessingOtherAudioDuckingLevel: {
   Max: 30,
 };
 
+declare const AVAudioSessionRenderingMode: {
+  NotApplicable: 0,
+  MonoStereo: 1,
+  Surround: 2,
+  SpatialAudio: 3,
+  DolbyAudio: 4,
+  DolbyAtmos: 5,
+};
+
 declare const AVAudioSessionRecordPermission: {
   Undetermined: 1970168948,
   Denied: 1684369017,
@@ -488,6 +497,8 @@ declare class AVAudioSession extends NSObject {
   setPrefersNoInterruptionsFromSystemAlertsError(inValue: boolean, outError: interop.PointerConvertible): boolean;
 
   readonly prefersNoInterruptionsFromSystemAlerts: boolean;
+
+  readonly renderingMode: interop.Enum<typeof AVAudioSessionRenderingMode>;
 }
 
 declare class AVAudioMixingDestination extends NSObject implements AVAudioMixing {