fix special handling

mrousavy · Jan 9, 2025 · 62f7336 · 62f7336
1 parent 90ac8c4
commit 62f7336
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/packages/nitrogen/src/syntax/kotlin/KotlinCxxBridgedType.ts b/packages/nitrogen/src/syntax/kotlin/KotlinCxxBridgedType.ts
@@ -41,8 +41,20 @@ export class KotlinCxxBridgedType implements BridgedType<'kotlin', 'c++'> {
         // Function needs to be converted from JFunc_... to Lambda
         return true
       default:
-        return false
+        break
+    }
+    // check if any types this type references (e.g. underlying optional, array element, ...)
+    // needs special handling. if yes, we need it as well
+    const referencedTypes = getReferencedTypes(this.type)
+      .filter((t) => t !== this.type)
+      .map((t) => new KotlinCxxBridgedType(t))
+    for (const type of referencedTypes) {
+      if (type.needsSpecialHandling) {
+        return true
+      }
     }
+    // no special handling needed
+    return false
   }
 
   getRequiredImports(): SourceImport[] {

diff --git a/...ct-native-nitro-image/nitrogen/generated/android/c++/JHybridTestObjectSwiftKotlinSpec.cpp b/...ct-native-nitro-image/nitrogen/generated/android/c++/JHybridTestObjectSwiftKotlinSpec.cpp
@@ -350,7 +350,7 @@ namespace margelo::nitro::image {
   std::optional<std::function<void(double /* value */)>> JHybridTestObjectSwiftKotlinSpec::getOptionalCallback() {
     try {
 
-      static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JFunc_void_double::javaobject>()>("getOptionalCallback");
+      static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JFunc_void_double::javaobject>()>("getOptionalCallback_cxx");
       auto __result = method(_javaPart);
       return __result != nullptr ? std::make_optional(__result->cthis()->getFunction()) : std::nullopt;
 
@@ -361,7 +361,7 @@ namespace margelo::nitro::image {
   void JHybridTestObjectSwiftKotlinSpec::setOptionalCallback(const std::optional<std::function<void(double /* value */)>>& optionalCallback) {
     try {
 
-      static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<JFunc_void_double::javaobject> /* optionalCallback */)>("setOptionalCallback");
+      static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<JFunc_void_double::javaobject> /* optionalCallback */)>("setOptionalCallback_cxx");
       method(_javaPart, optionalCallback.has_value() ? JFunc_void_double::fromCpp(optionalCallback.value()) : nullptr);
 
     } catch (const jni::JniException& exc) {
@@ -1023,7 +1023,7 @@ namespace margelo::nitro::image {
   void JHybridTestObjectSwiftKotlinSpec::jsStyleObjectAsParameters(const JsStyleStruct& params) {
     try {
 
-      static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<JJsStyleStruct> /* params */)>("jsStyleObjectAsParameters");
+      static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<JJsStyleStruct> /* params */)>("jsStyleObjectAsParameters_cxx");
       method(_javaPart, JJsStyleStruct::fromCpp(params));
 
     } catch (const jni::JniException& exc) {

diff --git a/...rogen/generated/android/kotlin/com/margelo/nitro/image/HybridTestObjectSwiftKotlinSpec.kt b/...rogen/generated/android/kotlin/com/margelo/nitro/image/HybridTestObjectSwiftKotlinSpec.kt
@@ -118,6 +118,14 @@ abstract class HybridTestObjectSwiftKotlinSpec: HybridObject() {
   @set:Keep
   abstract var optionalCallback: ((value: Double) -> Unit)?
 
+  private var optionalCallback_cxx: ((value: Double) -> Unit)?
+    get() {
+      return optionalCallback
+    }
+    set(value) {
+      optionalCallback = value
+    }
+
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
@@ -347,6 +355,13 @@ abstract class HybridTestObjectSwiftKotlinSpec: HybridObject() {
   @Keep
   abstract fun jsStyleObjectAsParameters(params: JsStyleStruct): Unit
 
+  @DoNotStrip
+  @Keep
+  private fun jsStyleObjectAsParameters_cxx(params: JsStyleStruct): Unit {
+    val __result = jsStyleObjectAsParameters(params)
+    return __result
+  }
+
   @DoNotStrip
   @Keep
   abstract fun createArrayBuffer(): ArrayBuffer