fix: preserve receiver identity for base initializers

Author: DjDeveloperr

NativeScript/ffi/shared/bridge/ClassBuilder.mm

@@ -80,6 +80,31 @@ void rememberNativeApiKnownExposedMethod(
   return std::nullopt;
 }
 
+Value callNativeApiBaseObjectSelector(
+    Runtime& runtime, const std::shared_ptr<NativeApiBridge>& bridge,
+    const Object& receiverObject,
+    const std::shared_ptr<NativeApiObjectHostObject>& receiverHostObject,
+    id receiver, const std::string& selectorName,
+    const NativeApiMember* member, const Value* args, size_t count,
+    Class dispatchClass) {
+  Value result = receiverHostObject->callObjectSelector(
+      runtime, selectorName, member, args, count, dispatchClass);
+
+  if (selectorName.rfind("init", 0) != 0 || receiver == nil) {
+    return result;
+  }
+
+  id resultObject =
+      NativeApiObjectHostObject::nativeObjectFromValue(runtime, result);
+  if (resultObject != receiver) {
+    return result;
+  }
+
+  bridge->rememberRoundTripValue(runtime, receiver,
+                                 Value(runtime, receiverObject));
+  return Value(runtime, receiverObject);
+}
+
 const char* nativeApiEngineFastEnumerationEncoding() {
   static const char* encoding = nullptr;
   if (encoding == nullptr) {
@@ -825,8 +850,9 @@ throw JSError(
       if (actualArgc == 0) {
         Class dispatchClass =
             dispatchSuperclassForEngineDerivedReceiver(receiver, baseClass);
-        return receiverHostObject->callObjectSelector(
-            runtime, propertyMember->selectorName, propertyMember, nullptr, 0,
+        return callNativeApiBaseObjectSelector(
+            runtime, bridge, receiverObject, receiverHostObject, receiver,
+            propertyMember->selectorName, propertyMember, nullptr, 0,
             dispatchClass);
       }
       if (actualArgc == 1 && !propertyMember->setterSelectorName.empty() &&
@@ -836,9 +862,10 @@ throw JSError(
         NativeApiMember setterMember = *propertyMember;
         setterMember.selectorName = propertyMember->setterSelectorName;
         setterMember.signatureOffset = propertyMember->setterSignatureOffset;
-        return receiverHostObject->callObjectSelector(
-            runtime, setterMember.selectorName, &setterMember, args + 3,
-            actualArgc, dispatchClass);
+        return callNativeApiBaseObjectSelector(
+            runtime, bridge, receiverObject, receiverHostObject, receiver,
+            setterMember.selectorName, &setterMember, args + 3, actualArgc,
+            dispatchClass);
       }
     }
   }
@@ -849,7 +876,7 @@ throw JSError(
 
   Class dispatchClass =
       dispatchSuperclassForEngineDerivedReceiver(receiver, baseClass);
-  return receiverHostObject->callObjectSelector(runtime, member->selectorName,
-                                                member, args + 3, actualArgc,
-                                                dispatchClass);
+  return callNativeApiBaseObjectSelector(
+      runtime, bridge, receiverObject, receiverHostObject, receiver,
+      member->selectorName, member, args + 3, actualArgc, dispatchClass);
 }

packages/react-native/test/runtime-instance-selector-base-dispatch.test.js

@@ -27,4 +27,27 @@ for (const relativePath of [
   );
 }
 
+for (const relativePath of [
+  "NativeScript/ffi/shared/bridge/ClassBuilder.mm",
+  "packages/react-native/native-api/ffi/shared/bridge/ClassBuilder.mm",
+]) {
+  const source = fs.readFileSync(path.join(repoRoot, relativePath), "utf8");
+
+  assert(
+    source.includes("Value callNativeApiBaseObjectSelector("),
+    `${relativePath}: base dispatch should go through the receiver-preserving helper`,
+  );
+  assert(
+    source.includes('selectorName.rfind("init", 0) != 0') &&
+      source.includes("NativeApiObjectHostObject::nativeObjectFromValue(runtime, result)") &&
+      source.includes("bridge->rememberRoundTripValue(runtime, receiver,") &&
+      source.includes("return Value(runtime, receiverObject);"),
+    `${relativePath}: base initializer dispatch should preserve receiver wrapper identity when init returns self`,
+  );
+  assert(
+    source.includes("return callNativeApiBaseObjectSelector("),
+    `${relativePath}: __invokeBase should use receiver-preserving selector calls`,
+  );
+}
+
 console.log("runtime instance selector base dispatch tests passed");