objects and enums

packages/pigeon/example/app/lib/src/messages.g.dart

@@ -47,7 +47,7 @@ bool _deepEquals(Object? a, Object? b) {
 
 enum Code {
   one,
-  two,
+  two;
 }
 
 class MessageData {

packages/pigeon/lib/src/ast.dart

@@ -545,35 +545,38 @@ class TypeDeclaration {
 
   /// Returns duplicated `TypeDeclaration` with attached `associatedEnum` value.
   TypeDeclaration copyWithEnum(Enum enumDefinition) {
-    enumDefinition.associatedType = this;
-    return TypeDeclaration(
+    final TypeDeclaration newType = TypeDeclaration(
       baseName: baseName,
       isNullable: isNullable,
       associatedEnum: enumDefinition,
       typeArguments: typeArguments,
     );
+    enumDefinition.associatedType = newType;
+    return newType;
   }
 
   /// Returns duplicated `TypeDeclaration` with attached `associatedClass` value.
   TypeDeclaration copyWithClass(Class classDefinition) {
-    classDefinition.associatedType = this;
-    return TypeDeclaration(
+    final TypeDeclaration newType = TypeDeclaration(
       baseName: baseName,
       isNullable: isNullable,
       associatedClass: classDefinition,
       typeArguments: typeArguments,
     );
+    classDefinition.associatedType = newType;
+    return newType;
   }
 
   /// Returns duplicated `TypeDeclaration` with attached `associatedProxyApi` value.
   TypeDeclaration copyWithProxyApi(AstProxyApi proxyApiDefinition) {
-    proxyApiDefinition.associatedType = this;
-    return TypeDeclaration(
+    final TypeDeclaration newType = TypeDeclaration(
       baseName: baseName,
       isNullable: isNullable,
       associatedProxyApi: proxyApiDefinition,
       typeArguments: typeArguments,
     );
+    proxyApiDefinition.associatedType = newType;
+    return newType;
   }
 
   /// Returns duplicated `TypeDeclaration` with attached `associatedProxyApi` value.

packages/pigeon/lib/src/dart/dart_generator.dart

@@ -130,27 +130,62 @@ class _JniType {
       );
     }
     _JniType? jniType = _jniTypeForDartType[type.baseName];
-    jniType = jniType ??
+    if (type.isClass) {
+      jniType = jniType ??
+          _JniType(
+            typeName: type.baseName,
+            jniName: 'bridge.${type.baseName}',
+            getToDartCall: (
+              TypeDeclaration type, {
+              String? varName,
+              bool forceConversion = false,
+            }) =>
+                '${type.baseName}.fromJni($varName)${_getForceNonNullSymbol(!type.isNullable)}',
+            getToJniCall: (
+              NamedType field,
+              _JniType jniType, {
+              bool forceNonNull = false,
+            }) =>
+                _wrapInNullCheckIfNullable(
+                    field.type, field.name, '${field.name}.toJni()'),
+            isBuiltIn: false,
+            nonNullableNeedsUnwrapping: true,
+          );
+    } else if (type.isEnum) {
+      jniType = jniType ??
+          _JniType(
+            typeName: type.baseName,
+            jniName: 'bridge.${type.baseName}',
+            getToDartCall: (
+              TypeDeclaration type, {
+              String? varName,
+              bool forceConversion = false,
+            }) =>
+                '${type.baseName}.fromJni($varName)${_getForceNonNullSymbol(!type.isNullable)}',
+            getToJniCall: (
+              NamedType field,
+              _JniType jniType, {
+              bool forceNonNull = false,
+            }) =>
+                _wrapInNullCheckIfNullable(field.type, field.name,
+                    '${field.name}${_getForceNonNullSymbol(type.isNullable && forceNonNull)}.toJni()'),
+            isBuiltIn: false,
+            nonNullableNeedsUnwrapping: true,
+          );
+    }
+    return jniType ??
         _JniType(
-          typeName: type.baseName,
-          jniName: 'bridge.${type.baseName}',
-          getToDartCall: (
-            TypeDeclaration type, {
-            String? varName,
-            bool forceConversion = false,
-          }) =>
-              '${type.baseName}.fromJni($varName)${_getForceNonNullSymbol(!type.isNullable)}',
-          getToJniCall: (
-            NamedType field,
-            _JniType jniType, {
-            bool forceNonNull = false,
-          }) =>
-              _wrapInNullCheckIfNullable(
-                  field.type, field.name, '${field.name}.toJni()'),
-          isBuiltIn: false,
-          nonNullableNeedsUnwrapping: true,
-        );
-    return jniType;
+            typeName: '',
+            jniName: '',
+            isBuiltIn: false,
+            getToDartCall:
+                (_, {bool forceConversion = true, String varName = ''}) => '',
+            getToJniCall: (
+              _,
+              __, {
+              bool forceNonNull = true,
+            }) =>
+                '');
   }
 
   final String typeName;
@@ -324,13 +359,13 @@ final Map<String, _JniType> _jniTypeForDartType = <String, _JniType>{
       String varName = '',
       bool forceConversion = false,
     }) =>
-        '_PigeonJniCodec.readValue($varName)',
+        '_PigeonJniCodec.readValue($varName)${_getForceNonNullSymbol(!type.isNullable)}',
     getToJniCall: (
       NamedType field,
       _JniType jniType, {
       bool forceNonNull = false,
     }) =>
-        '_PigeonJniCodec.writeValue(${field.name})',
+        '_PigeonJniCodec.writeValue(${field.name})${_getForceNonNullSymbol(!field.type.isNullable)}',
     isBuiltIn: true,
     nonNullableNeedsUnwrapping: true,
   ),
@@ -433,12 +468,30 @@ class DartGenerator extends StructuredGenerator<InternalDartOptions> {
     indent.newln();
     addDocumentationComments(
         indent, anEnum.documentationComments, _docCommentSpec);
-    indent.write('enum ${anEnum.name} ');
-    indent.addScoped('{', '}', () {
+    indent.addScoped('enum ${anEnum.name} {', '}', () {
       for (final EnumMember member in anEnum.members) {
+        final String separatorSymbol =
+            member == anEnum.members.last ? ';' : ',';
         addDocumentationComments(
             indent, member.documentationComments, _docCommentSpec);
-        indent.writeln('${member.name},');
+        indent.writeln('${member.name}$separatorSymbol');
+      }
+
+      if (generatorOptions.useJni) {
+        final _JniType jniType =
+            _JniType.fromTypeDeclaration(anEnum.associatedType);
+        indent.newln();
+        indent.writeScoped('${jniType.jniName} toJni() {', '}', () {
+          indent.writeln('return ${jniType.jniName}.Companion.ofRaw(index)!;');
+        });
+
+        indent.newln();
+        indent.writeScoped(
+            'static ${anEnum.name}? fromJni(${jniType.jniName}? jniEnum) {',
+            '}', () {
+          indent.writeln(
+              'return jniEnum == null ? null : ${anEnum.name}.values[jniEnum.getRaw()];');
+        });
       }
     });
   }
@@ -574,7 +627,7 @@ class DartGenerator extends StructuredGenerator<InternalDartOptions> {
             in getFieldsInSerializationOrder(classDefinition)) {
           final _JniType jniType = _JniType.fromTypeDeclaration(field.type);
           indent.writeln(
-              '${field.name}: jniClass.${jniType.getJniGetterMethodName(field.name)}${jniType.getToDartCall(field.type)},');
+              '${field.name}: ${jniType.getToDartCall(field.type, varName: 'jniClass.${jniType.getJniGetterMethodName(field.name)}')},');
         }
       });
     });
@@ -1486,7 +1539,7 @@ final BinaryMessenger? ${varNamePrefix}binaryMessenger;
     indent.newln();
     indent.format('''
 class _PigeonJniCodec {
-  Object? readValue(JObject? value) {
+  static Object? readValue(JObject? value) {
     if (value == null) {
       return null;
     } else if (value.isA<JLong>(JLong.type)) {
@@ -1527,7 +1580,7 @@ class _PigeonJniCodec {
     }
   }
 
-  JObject? writeValue(Object? value) {
+  static JObject? writeValue(Object? value) {
     if (value == null) {
       return null;
     } else if (value is bool) {

packages/pigeon/lib/src/kotlin/jnigen_yaml_generator.dart

@@ -73,6 +73,9 @@ class JnigenYamlGenerator extends Generator<InternalJnigenYamlOptions> {
       for (final Class dataClass in root.classes) {
         indent.writeln("- '${dataClass.name}'");
       }
+      for (final Enum enumType in root.enums) {
+        indent.writeln("- '${enumType.name}'");
+      }
     });
   }
 }

packages/pigeon/pigeons/jni_tests.dart

@@ -8,27 +8,36 @@ import 'package:pigeon/pigeon.dart';
   dartOptions: DartOptions(useJni: true),
   kotlinOptions: KotlinOptions(useJni: true),
 ))
+enum SomeEnum {
+  value1,
+  value2,
+  value3,
+}
+
 class SomeTypes {
   const SomeTypes(
     this.aString,
     this.anInt,
     this.aDouble,
     this.aBool,
-    // this.anObject,
+    this.anObject,
+    this.anEnum,
   );
   final String aString;
   final int anInt;
   final double aDouble;
   final bool aBool;
-  // final Object anObject;
+  final Object anObject;
+  final SomeEnum anEnum;
 }
 
 class SomeNullableTypes {
   String? aString;
   int? anInt;
   double? aDouble;
   bool? aBool;
-  // Object? anObject;
+  Object? anObject;
+  SomeEnum? anEnum;
 }
 
 @HostApi()
@@ -38,8 +47,9 @@ abstract class JniMessageApi {
   int echoInt(int request);
   double echoDouble(double request);
   bool echoBool(bool request);
-  // Object echoObj(Object request);
+  Object echoObj(Object request);
   SomeTypes sendSomeTypes(SomeTypes someTypes);
+  SomeEnum sendSomeEnum(SomeEnum anEnum);
 }
 
 @HostApi()
@@ -48,7 +58,9 @@ abstract class JniMessageApiNullable {
   int? echoInt(int? request);
   double? echoDouble(double? request);
   bool? echoBool(bool? request);
+  Object? echoObj(Object? request);
   SomeNullableTypes? sendSomeNullableTypes(SomeNullableTypes? someTypes);
+  SomeEnum? sendSomeEnum(SomeEnum? anEnum);
 }
 
 @HostApi()
@@ -64,7 +76,11 @@ abstract class JniMessageApiAsync {
   @async
   bool echoBool(bool request);
   @async
+  Object echoObj(Object request);
+  @async
   SomeTypes sendSomeTypes(SomeTypes someTypes);
+  @async
+  SomeEnum sendSomeEnum(SomeEnum anEnum);
 }
 
 @HostApi()
@@ -78,5 +94,9 @@ abstract class JniMessageApiNullableAsync {
   @async
   bool? echoBool(bool? request);
   @async
+  Object? echoObj(Object? request);
+  @async
   SomeNullableTypes? sendSomeNullableTypes(SomeNullableTypes? someTypes);
+  @async
+  SomeEnum? sendSomeEnum(SomeEnum? anEnum);
 }

packages/pigeon/platform_tests/shared_test_plugin_code/lib/example_app.dart

@@ -5,6 +5,7 @@
 import 'package:flutter/material.dart';
 
 import 'generated.dart';
+import 'src/generated/jni_tests.gen.dart';
 
 void main() {
   runApp(const ExampleApp());
@@ -39,6 +40,18 @@ class _ExampleAppState extends State<ExampleApp> {
       // Make a single trivial call just to validate that everything is wired
       // up.
       await api.noop();
+      final JniMessageApi? jniMessage = JniMessageApi.getInstance();
+      print('before sendSomeTypes');
+      final SomeTypes toSend = SomeTypes(
+        aString: 'hi',
+        anInt: 5,
+        aDouble: 5.0,
+        aBool: false,
+        anObject: 'obj',
+        anEnum: SomeEnum.value2,
+      );
+      final SomeTypes sync = jniMessage!.sendSomeTypes(toSend);
+      print(sync);
     } catch (e) {
       setState(() {
         status = 'Failed: $e';