fix: Generate a shadow ordinal field for Kotlin Enums (#360)

mrousavy · Nov 20, 2024 · 7a32224 · 7a32224
1 parent b824b15
commit 7a32224
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 10 deletions.
diff --git a/packages/nitrogen/src/syntax/kotlin/KotlinEnum.ts b/packages/nitrogen/src/syntax/kotlin/KotlinEnum.ts
@@ -21,7 +21,11 @@ import com.facebook.proguard.annotations.DoNotStrip
 @DoNotStrip
 @Keep
 enum class ${enumType.enumName} {
-  ${indent(members.join(',\n'), '  ')}
+  ${indent(members.join(',\n'), '  ')};
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }
   `.trim()
 
@@ -58,7 +62,7 @@ namespace ${cxxNamespace} {
     [[maybe_unused]]
     ${enumType.enumName} toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<${enumType.enumName}>(ordinal);
     }

diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JImageFormat.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JImageFormat.hpp
@@ -28,7 +28,7 @@ namespace margelo::nitro::image {
     [[maybe_unused]]
     ImageFormat toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<ImageFormat>(ordinal);
     }

diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JOldEnum.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JOldEnum.hpp
@@ -28,7 +28,7 @@ namespace margelo::nitro::image {
     [[maybe_unused]]
     OldEnum toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<OldEnum>(ordinal);
     }

diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JPixelFormat.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JPixelFormat.hpp
@@ -28,7 +28,7 @@ namespace margelo::nitro::image {
     [[maybe_unused]]
     PixelFormat toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<PixelFormat>(ordinal);
     }

diff --git a/packages/react-native-nitro-image/nitrogen/generated/android/c++/JPowertrain.hpp b/packages/react-native-nitro-image/nitrogen/generated/android/c++/JPowertrain.hpp
@@ -28,7 +28,7 @@ namespace margelo::nitro::image {
     [[maybe_unused]]
     Powertrain toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<Powertrain>(ordinal);
     }

diff --git a/...tive-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/ImageFormat.kt b/...tive-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/ImageFormat.kt
@@ -17,5 +17,9 @@ import com.facebook.proguard.annotations.DoNotStrip
 @Keep
 enum class ImageFormat {
   JPG,
-  PNG
+  PNG;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }
diff --git a/...t-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/OldEnum.kt b/...t-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/OldEnum.kt
@@ -18,5 +18,9 @@ import com.facebook.proguard.annotations.DoNotStrip
 enum class OldEnum {
   FIRST,
   SECOND,
-  THIRD
+  THIRD;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }
diff --git a/...tive-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/PixelFormat.kt b/...tive-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/PixelFormat.kt
@@ -18,5 +18,9 @@ import com.facebook.proguard.annotations.DoNotStrip
 enum class PixelFormat {
   RGB,
   YUV_8BIT,
-  YUV_10BIT
+  YUV_10BIT;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }
diff --git a/...ative-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/Powertrain.kt b/...ative-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/Powertrain.kt
@@ -18,5 +18,9 @@ import com.facebook.proguard.annotations.DoNotStrip
 enum class Powertrain {
   ELECTRIC,
   GAS,
-  HYBRID
+  HYBRID;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }