fix: fromCpp() should return the interface instead

mrousavy · mrousavy · commit 2d4bb2234710 · 2025-01-09T14:36:17.000+01:00
diff --git a/packages/nitrogen/src/syntax/kotlin/KotlinFunction.ts b/packages/nitrogen/src/syntax/kotlin/KotlinFunction.ts
@@ -196,7 +196,7 @@ namespace ${cxxNamespace} {
    */
   struct J${name}_cxx final: public jni::HybridClass<J${name}_cxx, J${name}> {
   public:
-    static jni::local_ref<J${name}_cxx::javaobject> fromCpp(const ${typename}& func) {
+    static jni::local_ref<J${name}::javaobject> fromCpp(const ${typename}& func) {
       return J${name}_cxx::newObjectCxxArgs(func);
     }
 
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_double__.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_double__.hpp
@@ -50,7 +50,7 @@ namespace margelo::nitro::image {
    */
   struct JFunc_std__shared_ptr_Promise_double___cxx final: public jni::HybridClass<JFunc_std__shared_ptr_Promise_double___cxx, JFunc_std__shared_ptr_Promise_double__> {
   public:
-    static jni::local_ref<JFunc_std__shared_ptr_Promise_double___cxx::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<double>>()>& func) {
+    static jni::local_ref<JFunc_std__shared_ptr_Promise_double__::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<double>>()>& func) {
       return JFunc_std__shared_ptr_Promise_double___cxx::newObjectCxxArgs(func);
     }
 
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double____.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double____.hpp
@@ -61,7 +61,7 @@ namespace margelo::nitro::image {
    */
   struct JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double_____cxx final: public jni::HybridClass<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double_____cxx, JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double____> {
   public:
-    static jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double_____cxx::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<double>>>>()>& func) {
+    static jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double____::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<double>>>>()>& func) {
       return JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double_____cxx::newObjectCxxArgs(func);
     }
 
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer_____.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer_____.hpp
@@ -64,7 +64,7 @@ namespace margelo::nitro::image {
    */
   struct JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer______cxx final: public jni::HybridClass<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer______cxx, JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer_____> {
   public:
-    static jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer______cxx::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::shared_ptr<ArrayBuffer>>>>>()>& func) {
+    static jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer_____::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::shared_ptr<ArrayBuffer>>>>>()>& func) {
       return JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer______cxx::newObjectCxxArgs(func);
     }
 
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp
@@ -51,7 +51,7 @@ namespace margelo::nitro::image {
    */
   struct JFunc_std__shared_ptr_Promise_std__string___cxx final: public jni::HybridClass<JFunc_std__shared_ptr_Promise_std__string___cxx, JFunc_std__shared_ptr_Promise_std__string__> {
   public:
-    static jni::local_ref<JFunc_std__shared_ptr_Promise_std__string___cxx::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::string>>()>& func) {
+    static jni::local_ref<JFunc_std__shared_ptr_Promise_std__string__::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::string>>()>& func) {
       return JFunc_std__shared_ptr_Promise_std__string___cxx::newObjectCxxArgs(func);
     }
 
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_void.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_void.hpp
@@ -36,7 +36,7 @@ namespace margelo::nitro::image {
    */
   struct JFunc_void_cxx final: public jni::HybridClass<JFunc_void_cxx, JFunc_void> {
   public:
-    static jni::local_ref<JFunc_void_cxx::javaobject> fromCpp(const std::function<void()>& func) {
+    static jni::local_ref<JFunc_void::javaobject> fromCpp(const std::function<void()>& func) {
       return JFunc_void_cxx::newObjectCxxArgs(func);
     }
 
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_void_double.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_void_double.hpp
@@ -36,7 +36,7 @@ namespace margelo::nitro::image {
    */
   struct JFunc_void_double_cxx final: public jni::HybridClass<JFunc_void_double_cxx, JFunc_void_double> {
   public:
-    static jni::local_ref<JFunc_void_double_cxx::javaobject> fromCpp(const std::function<void(double /* num */)>& func) {
+    static jni::local_ref<JFunc_void_double::javaobject> fromCpp(const std::function<void(double /* num */)>& func) {
       return JFunc_void_double_cxx::newObjectCxxArgs(func);
     }
 
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_void_std__optional_double_.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_void_std__optional_double_.hpp
@@ -37,7 +37,7 @@ namespace margelo::nitro::image {
    */
   struct JFunc_void_std__optional_double__cxx final: public jni::HybridClass<JFunc_void_std__optional_double__cxx, JFunc_void_std__optional_double_> {
   public:
-    static jni::local_ref<JFunc_void_std__optional_double__cxx::javaobject> fromCpp(const std::function<void(std::optional<double> /* maybe */)>& func) {
+    static jni::local_ref<JFunc_void_std__optional_double_::javaobject> fromCpp(const std::function<void(std::optional<double> /* maybe */)>& func) {
       return JFunc_void_std__optional_double__cxx::newObjectCxxArgs(func);
     }
 
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_void_std__string.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_void_std__string.hpp
@@ -37,7 +37,7 @@ namespace margelo::nitro::image {
    */
   struct JFunc_void_std__string_cxx final: public jni::HybridClass<JFunc_void_std__string_cxx, JFunc_void_std__string> {
   public:
-    static jni::local_ref<JFunc_void_std__string_cxx::javaobject> fromCpp(const std::function<void(const std::string& /* valueFromJs */)>& func) {
+    static jni::local_ref<JFunc_void_std__string::javaobject> fromCpp(const std::function<void(const std::string& /* valueFromJs */)>& func) {
       return JFunc_void_std__string_cxx::newObjectCxxArgs(func);
     }
 
diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_void_std__vector_Powertrain_.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JFunc_void_std__vector_Powertrain_.hpp
@@ -47,7 +47,7 @@ namespace margelo::nitro::image {
    */
   struct JFunc_void_std__vector_Powertrain__cxx final: public jni::HybridClass<JFunc_void_std__vector_Powertrain__cxx, JFunc_void_std__vector_Powertrain_> {
   public:
-    static jni::local_ref<JFunc_void_std__vector_Powertrain__cxx::javaobject> fromCpp(const std::function<void(const std::vector<Powertrain>& /* array */)>& func) {
+    static jni::local_ref<JFunc_void_std__vector_Powertrain_::javaobject> fromCpp(const std::function<void(const std::vector<Powertrain>& /* array */)>& func) {
       return JFunc_void_std__vector_Powertrain__cxx::newObjectCxxArgs(func);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ namespace ${cxxNamespace} {`
`196`	`196`	`*/`
`197`	`197`	`struct J${name}_cxx final: public jni::HybridClass<J${name}_cxx, J${name}> {`
`198`	`198`	`public:`
`199`		`- static jni::local_ref<J${name}_cxx::javaobject> fromCpp(const ${typename}& func) {`
	`199`	`+ static jni::local_ref<J${name}::javaobject> fromCpp(const ${typename}& func) {`
`200`	`200`	`return J${name}_cxx::newObjectCxxArgs(func);`
`201`	`201`	`}`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ namespace margelo::nitro::image {`
`50`	`50`	`*/`
`51`	`51`	`struct JFunc_std__shared_ptr_Promise_double___cxx final: public jni::HybridClass<JFunc_std__shared_ptr_Promise_double___cxx, JFunc_std__shared_ptr_Promise_double__> {`
`52`	`52`	`public:`
`53`		`- static jni::local_ref<JFunc_std__shared_ptr_Promise_double___cxx::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<double>>()>& func) {`
	`53`	`+ static jni::local_ref<JFunc_std__shared_ptr_Promise_double__::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<double>>()>& func) {`
`54`	`54`	`return JFunc_std__shared_ptr_Promise_double___cxx::newObjectCxxArgs(func);`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ namespace margelo::nitro::image {`
`61`	`61`	`*/`
`62`	`62`	`struct JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double_____cxx final: public jni::HybridClass<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double_____cxx, JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double____> {`
`63`	`63`	`public:`
`64`		`- static jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double_____cxx::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<double>>>>()>& func) {`
	`64`	`+ static jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double____::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<double>>>>()>& func) {`
`65`	`65`	`return JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_double_____cxx::newObjectCxxArgs(func);`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ namespace margelo::nitro::image {`
`64`	`64`	`*/`
`65`	`65`	`struct JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer______cxx final: public jni::HybridClass<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer______cxx, JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer_____> {`
`66`	`66`	`public:`
`67`		`- static jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer______cxx::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::shared_ptr<ArrayBuffer>>>>>()>& func) {`
	`67`	`+ static jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer_____::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::shared_ptr<ArrayBuffer>>>>>()>& func) {`
`68`	`68`	`return JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__shared_ptr_ArrayBuffer______cxx::newObjectCxxArgs(func);`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ namespace margelo::nitro::image {`
`51`	`51`	`*/`
`52`	`52`	`struct JFunc_std__shared_ptr_Promise_std__string___cxx final: public jni::HybridClass<JFunc_std__shared_ptr_Promise_std__string___cxx, JFunc_std__shared_ptr_Promise_std__string__> {`
`53`	`53`	`public:`
`54`		`- static jni::local_ref<JFunc_std__shared_ptr_Promise_std__string___cxx::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::string>>()>& func) {`
	`54`	`+ static jni::local_ref<JFunc_std__shared_ptr_Promise_std__string__::javaobject> fromCpp(const std::function<std::shared_ptr<Promise<std::string>>()>& func) {`
`55`	`55`	`return JFunc_std__shared_ptr_Promise_std__string___cxx::newObjectCxxArgs(func);`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ namespace margelo::nitro::image {`
`36`	`36`	`*/`
`37`	`37`	`struct JFunc_void_cxx final: public jni::HybridClass<JFunc_void_cxx, JFunc_void> {`
`38`	`38`	`public:`
`39`		`- static jni::local_ref<JFunc_void_cxx::javaobject> fromCpp(const std::function<void()>& func) {`
	`39`	`+ static jni::local_ref<JFunc_void::javaobject> fromCpp(const std::function<void()>& func) {`
`40`	`40`	`return JFunc_void_cxx::newObjectCxxArgs(func);`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ namespace margelo::nitro::image {`
`37`	`37`	`*/`
`38`	`38`	`struct JFunc_void_std__optional_double__cxx final: public jni::HybridClass<JFunc_void_std__optional_double__cxx, JFunc_void_std__optional_double_> {`
`39`	`39`	`public:`
`40`		`- static jni::local_ref<JFunc_void_std__optional_double__cxx::javaobject> fromCpp(const std::function<void(std::optional<double> /* maybe */)>& func) {`
	`40`	`+ static jni::local_ref<JFunc_void_std__optional_double_::javaobject> fromCpp(const std::function<void(std::optional<double> /* maybe */)>& func) {`
`41`	`41`	`return JFunc_void_std__optional_double__cxx::newObjectCxxArgs(func);`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ namespace margelo::nitro::image {`
`47`	`47`	`*/`
`48`	`48`	`struct JFunc_void_std__vector_Powertrain__cxx final: public jni::HybridClass<JFunc_void_std__vector_Powertrain__cxx, JFunc_void_std__vector_Powertrain_> {`
`49`	`49`	`public:`
`50`		`- static jni::local_ref<JFunc_void_std__vector_Powertrain__cxx::javaobject> fromCpp(const std::function<void(const std::vector<Powertrain>& /* array */)>& func) {`
	`50`	`+ static jni::local_ref<JFunc_void_std__vector_Powertrain_::javaobject> fromCpp(const std::function<void(const std::vector<Powertrain>& /* array */)>& func) {`
`51`	`51`	`return JFunc_void_std__vector_Powertrain__cxx::newObjectCxxArgs(func);`
`52`	`52`	`}`
`53`	`53`