not there yet

packages/pigeon/mock_handler_tester/test/message.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.2.5), do not edit directly.
+// Autogenerated from Pigeon (v10.1.1), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 

packages/pigeon/mock_handler_tester/test/test.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Autogenerated from Pigeon (v9.2.5), do not edit directly.
+// Autogenerated from Pigeon (v10.1.1), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import
 // ignore_for_file: avoid_relative_lib_imports

packages/pigeon/pigeons/core_tests.dart

@@ -25,6 +25,7 @@ class AllTypes {
     this.aMap = const <String?, Object?>{},
     this.anEnum = AnEnum.one,
     this.aString = '',
+    required this.aClass,
   });
 
   bool aBool;
@@ -41,6 +42,7 @@ class AllTypes {
   Map aMap;
   AnEnum anEnum;
   String aString;
+  AllNullableTypes aClass;
 }
 
 // A class containing all supported nullable types.
@@ -61,6 +63,7 @@ class AllNullableTypes {
     this.nullableMapWithObject,
     this.aNullableEnum,
     this.aNullableString,
+    this.aNullableClass,
   );
 
   bool? aNullableBool;
@@ -80,6 +83,7 @@ class AllNullableTypes {
   Map<String?, Object?>? nullableMapWithObject;
   AnEnum? aNullableEnum;
   String? aNullableString;
+  AllTypes? aNullableClass;
 }
 
 // A class for testing nested object handling.
@@ -92,7 +96,7 @@ class AllNullableTypesWrapper {
 /// platform_test integration tests.
 @HostApi()
 abstract class HostIntegrationCoreApi {
-  // ========== Syncronous method tests ==========
+  // ========== Synchronous method tests ==========
 
   /// A no-op function taking no arguments and returning no value, to sanity
   /// test basic calling.
@@ -342,7 +346,7 @@ abstract class HostIntegrationCoreApi {
   /// Returns the passed map, to test serialization and deserialization asynchronously.
   @async
   @ObjCSelector('echoAsyncNullableMap:')
-  @SwiftFunction('echAsyncoNullable(_:)')
+  @SwiftFunction('echoAsyncNullable(_:)')
   Map<String?, Object?>? echoAsyncNullableMap(Map<String?, Object?>? aMap);
 
   // ========== Flutter API test wrappers ==========

packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java

@@ -229,6 +229,19 @@ public void setAString(@NonNull String setterArg) {
       this.aString = setterArg;
     }
 
+    private @NonNull AllNullableTypes aClass;
+
+    public @NonNull AllNullableTypes getAClass() {
+      return aClass;
+    }
+
+    public void setAClass(@NonNull AllNullableTypes setterArg) {
+      if (setterArg == null) {
+        throw new IllegalStateException("Nonnull field \"aClass\" is null.");
+      }
+      this.aClass = setterArg;
+    }
+
     /** Constructor is non-public to enforce null safety; use Builder. */
     AllTypes() {}
 
@@ -318,6 +331,13 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable AllNullableTypes aClass;
+
+      public @NonNull Builder setAClass(@NonNull AllNullableTypes setterArg) {
+        this.aClass = setterArg;
+        return this;
+      }
+
       public @NonNull AllTypes build() {
         AllTypes pigeonReturn = new AllTypes();
         pigeonReturn.setABool(aBool);
@@ -332,13 +352,14 @@ public static final class Builder {
         pigeonReturn.setAMap(aMap);
         pigeonReturn.setAnEnum(anEnum);
         pigeonReturn.setAString(aString);
+        pigeonReturn.setAClass(aClass);
         return pigeonReturn;
       }
     }
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<Object>(12);
+      ArrayList<Object> toListResult = new ArrayList<Object>(13);
       toListResult.add(aBool);
       toListResult.add(anInt);
       toListResult.add(anInt64);
@@ -351,6 +372,7 @@ ArrayList<Object> toList() {
       toListResult.add(aMap);
       toListResult.add(anEnum == null ? null : anEnum.index);
       toListResult.add(aString);
+      toListResult.add((aClass == null) ? null : aClass.toList());
       return toListResult;
     }
 
@@ -384,6 +406,9 @@ ArrayList<Object> toList() {
       pigeonResult.setAnEnum(anEnum == null ? null : AnEnum.values()[(int) anEnum]);
       Object aString = list.get(11);
       pigeonResult.setAString((String) aString);
+      Object aClass = list.get(12);
+      pigeonResult.setAClass(
+          (aClass == null) ? null : AllNullableTypes.fromList((ArrayList<Object>) aClass));
       return pigeonResult;
     }
   }
@@ -540,6 +565,16 @@ public void setANullableString(@Nullable String setterArg) {
       this.aNullableString = setterArg;
     }
 
+    private @Nullable AllTypes aNullableClass;
+
+    public @Nullable AllTypes getANullableClass() {
+      return aNullableClass;
+    }
+
+    public void setANullableClass(@Nullable AllTypes setterArg) {
+      this.aNullableClass = setterArg;
+    }
+
     public static final class Builder {
 
       private @Nullable Boolean aNullableBool;
@@ -648,6 +683,13 @@ public static final class Builder {
         return this;
       }
 
+      private @Nullable AllTypes aNullableClass;
+
+      public @NonNull Builder setANullableClass(@Nullable AllTypes setterArg) {
+        this.aNullableClass = setterArg;
+        return this;
+      }
+
       public @NonNull AllNullableTypes build() {
         AllNullableTypes pigeonReturn = new AllNullableTypes();
         pigeonReturn.setANullableBool(aNullableBool);
@@ -665,13 +707,14 @@ public static final class Builder {
         pigeonReturn.setNullableMapWithObject(nullableMapWithObject);
         pigeonReturn.setANullableEnum(aNullableEnum);
         pigeonReturn.setANullableString(aNullableString);
+        pigeonReturn.setANullableClass(aNullableClass);
         return pigeonReturn;
       }
     }
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<Object>(15);
+      ArrayList<Object> toListResult = new ArrayList<Object>(16);
       toListResult.add(aNullableBool);
       toListResult.add(aNullableInt);
       toListResult.add(aNullableInt64);
@@ -687,6 +730,7 @@ ArrayList<Object> toList() {
       toListResult.add(nullableMapWithObject);
       toListResult.add(aNullableEnum == null ? null : aNullableEnum.index);
       toListResult.add(aNullableString);
+      toListResult.add((aNullableClass == null) ? null : aNullableClass.toList());
       return toListResult;
     }
 
@@ -731,6 +775,9 @@ ArrayList<Object> toList() {
           aNullableEnum == null ? null : AnEnum.values()[(int) aNullableEnum]);
       Object aNullableString = list.get(14);
       pigeonResult.setANullableString((String) aNullableString);
+      Object aNullableClass = list.get(15);
+      pigeonResult.setANullableClass(
+          (aNullableClass == null) ? null : AllTypes.fromList((ArrayList<Object>) aNullableClass));
       return pigeonResult;
     }
   }

packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/test/java/com/example/alternate_language_test_plugin/AllDatatypesTest.java

@@ -8,6 +8,7 @@
 import static org.mockito.Mockito.*;
 
 import com.example.alternate_language_test_plugin.CoreTests.AllNullableTypes;
+import com.example.alternate_language_test_plugin.CoreTests.AllTypes;
 import com.example.alternate_language_test_plugin.CoreTests.FlutterIntegrationCoreApi;
 import io.flutter.plugin.common.BinaryMessenger;
 import java.nio.ByteBuffer;
@@ -54,6 +55,7 @@ public void nullValues() {
           assertNull(everything.getANullableList());
           assertNull(everything.getANullableMap());
           assertNull(everything.getNullableMapWithObject());
+          assertNull(everything.getANullableClass());
         });
     assertTrue(didCall[0]);
   }
@@ -84,6 +86,19 @@ private static boolean floatArraysEqual(double[] x, double[] y) {
 
   @Test
   public void hasValues() {
+    AllTypes allEverything = new AllTypes();
+    allEverything.setABool(false);
+    allEverything.setAnInt(1234L);
+    allEverything.setADouble(2.0);
+    allEverything.setAString("hello");
+    allEverything.setAByteArray(new byte[] {1, 2, 3, 4});
+    allEverything.setA4ByteArray(new int[] {1, 2, 3, 4});
+    allEverything.setA8ByteArray(new long[] {1, 2, 3, 4});
+    allEverything.setAFloatArray(new double[] {0.5, 0.25, 1.5, 1.25});
+    allEverything.setAList(Arrays.asList(new int[] {1, 2, 3}));
+    allEverything.setAMap(makeMap("hello", 1234));
+    allEverything.setAClass(new AllNullableTypes());
+
     AllNullableTypes everything = new AllNullableTypes();
     everything.setANullableBool(false);
     everything.setANullableInt(1234L);
@@ -96,6 +111,8 @@ public void hasValues() {
     everything.setANullableList(Arrays.asList(new int[] {1, 2, 3}));
     everything.setANullableMap(makeMap("hello", 1234));
     everything.setNullableMapWithObject(makeStringMap("hello", 1234));
+    everything.setANullableClass(allEverything);
+
     BinaryMessenger binaryMessenger = mock(BinaryMessenger.class);
     doAnswer(
             invocation -> {
@@ -140,6 +157,9 @@ public void hasValues() {
           assertArrayEquals(
               everything.getNullableMapWithObject().values().toArray(),
               result.getNullableMapWithObject().values().toArray());
+          // assertThat(everything.getANullableClass())
+          //     .usingRecursiveComparison()
+          //     .isEqualTo(result.getANullableClass());
         });
     assertTrue(didCall[0]);
   }

packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h

@@ -39,7 +39,8 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
                         aList:(NSArray *)aList
                          aMap:(NSDictionary *)aMap
                        anEnum:(AnEnum)anEnum
-                      aString:(NSString *)aString;
+                      aString:(NSString *)aString
+                       aClass:(AllNullableTypes *)aClass;
 @property(nonatomic, strong) NSNumber *aBool;
 @property(nonatomic, strong) NSNumber *anInt;
 @property(nonatomic, strong) NSNumber *anInt64;
@@ -52,6 +53,7 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
 @property(nonatomic, strong) NSDictionary *aMap;
 @property(nonatomic, assign) AnEnum anEnum;
 @property(nonatomic, copy) NSString *aString;
+@property(nonatomic, strong) AllNullableTypes *aClass;
 @end
 
 @interface AllNullableTypes : NSObject
@@ -70,7 +72,8 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
                (nullable NSDictionary<NSString *, NSString *> *)nullableMapWithAnnotations
                 nullableMapWithObject:(nullable NSDictionary<NSString *, id> *)nullableMapWithObject
                         aNullableEnum:(AnEnum)aNullableEnum
-                      aNullableString:(nullable NSString *)aNullableString;
+                      aNullableString:(nullable NSString *)aNullableString
+                       aNullableClass:(nullable AllTypes *)aNullableClass;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt64;
@@ -87,6 +90,7 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
 @property(nonatomic, strong, nullable) NSDictionary<NSString *, id> *nullableMapWithObject;
 @property(nonatomic, assign) AnEnum aNullableEnum;
 @property(nonatomic, copy, nullable) NSString *aNullableString;
+@property(nonatomic, strong, nullable) AllTypes *aNullableClass;
 @end
 
 @interface AllNullableTypesWrapper : NSObject

packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m

@@ -66,7 +66,8 @@ + (instancetype)makeWithABool:(NSNumber *)aBool
                         aList:(NSArray *)aList
                          aMap:(NSDictionary *)aMap
                        anEnum:(AnEnum)anEnum
-                      aString:(NSString *)aString {
+                      aString:(NSString *)aString
+                       aClass:(AllNullableTypes *)aClass {
   AllTypes *pigeonResult = [[AllTypes alloc] init];
   pigeonResult.aBool = aBool;
   pigeonResult.anInt = anInt;
@@ -80,6 +81,7 @@ + (instancetype)makeWithABool:(NSNumber *)aBool
   pigeonResult.aMap = aMap;
   pigeonResult.anEnum = anEnum;
   pigeonResult.aString = aString;
+  pigeonResult.aClass = aClass;
   return pigeonResult;
 }
 + (AllTypes *)fromList:(NSArray *)list {
@@ -107,6 +109,8 @@ + (AllTypes *)fromList:(NSArray *)list {
   pigeonResult.anEnum = [GetNullableObjectAtIndex(list, 10) integerValue];
   pigeonResult.aString = GetNullableObjectAtIndex(list, 11);
   NSAssert(pigeonResult.aString != nil, @"");
+  pigeonResult.aClass = [AllNullableTypes nullableFromList:(GetNullableObjectAtIndex(list, 12))];
+  NSAssert(pigeonResult.aClass != nil, @"");
   return pigeonResult;
 }
 + (nullable AllTypes *)nullableFromList:(NSArray *)list {
@@ -126,6 +130,7 @@ - (NSArray *)toList {
     (self.aMap ?: [NSNull null]),
     @(self.anEnum),
     (self.aString ?: [NSNull null]),
+    (self.aClass ? [self.aClass toList] : [NSNull null]),
   ];
 }
 @end
@@ -146,7 +151,8 @@ + (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
                (nullable NSDictionary<NSString *, NSString *> *)nullableMapWithAnnotations
                 nullableMapWithObject:(nullable NSDictionary<NSString *, id> *)nullableMapWithObject
                         aNullableEnum:(AnEnum)aNullableEnum
-                      aNullableString:(nullable NSString *)aNullableString {
+                      aNullableString:(nullable NSString *)aNullableString
+                       aNullableClass:(nullable AllTypes *)aNullableClass {
   AllNullableTypes *pigeonResult = [[AllNullableTypes alloc] init];
   pigeonResult.aNullableBool = aNullableBool;
   pigeonResult.aNullableInt = aNullableInt;
@@ -163,6 +169,7 @@ + (instancetype)makeWithANullableBool:(nullable NSNumber *)aNullableBool
   pigeonResult.nullableMapWithObject = nullableMapWithObject;
   pigeonResult.aNullableEnum = aNullableEnum;
   pigeonResult.aNullableString = aNullableString;
+  pigeonResult.aNullableClass = aNullableClass;
   return pigeonResult;
 }
 + (AllNullableTypes *)fromList:(NSArray *)list {
@@ -182,6 +189,7 @@ + (AllNullableTypes *)fromList:(NSArray *)list {
   pigeonResult.nullableMapWithObject = GetNullableObjectAtIndex(list, 12);
   pigeonResult.aNullableEnum = [GetNullableObjectAtIndex(list, 13) integerValue];
   pigeonResult.aNullableString = GetNullableObjectAtIndex(list, 14);
+  pigeonResult.aNullableClass = [AllTypes nullableFromList:(GetNullableObjectAtIndex(list, 15))];
   return pigeonResult;
 }
 + (nullable AllNullableTypes *)nullableFromList:(NSArray *)list {
@@ -204,6 +212,7 @@ - (NSArray *)toList {
     (self.nullableMapWithObject ?: [NSNull null]),
     @(self.aNullableEnum),
     (self.aNullableString ?: [NSNull null]),
+    (self.aNullableClass ? [self.aNullableClass toList] : [NSNull null]),
   ];
 }
 @end

packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h

@@ -39,7 +39,8 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
                         aList:(NSArray *)aList
                          aMap:(NSDictionary *)aMap
                        anEnum:(AnEnum)anEnum
-                      aString:(NSString *)aString;
+                      aString:(NSString *)aString
+                       aClass:(AllNullableTypes *)aClass;
 @property(nonatomic, strong) NSNumber *aBool;
 @property(nonatomic, strong) NSNumber *anInt;
 @property(nonatomic, strong) NSNumber *anInt64;
@@ -52,6 +53,7 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
 @property(nonatomic, strong) NSDictionary *aMap;
 @property(nonatomic, assign) AnEnum anEnum;
 @property(nonatomic, copy) NSString *aString;
+@property(nonatomic, strong) AllNullableTypes *aClass;
 @end
 
 @interface AllNullableTypes : NSObject
@@ -70,7 +72,8 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
                (nullable NSDictionary<NSString *, NSString *> *)nullableMapWithAnnotations
                 nullableMapWithObject:(nullable NSDictionary<NSString *, id> *)nullableMapWithObject
                         aNullableEnum:(AnEnum)aNullableEnum
-                      aNullableString:(nullable NSString *)aNullableString;
+                      aNullableString:(nullable NSString *)aNullableString
+                       aNullableClass:(nullable AllTypes *)aNullableClass;
 @property(nonatomic, strong, nullable) NSNumber *aNullableBool;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt;
 @property(nonatomic, strong, nullable) NSNumber *aNullableInt64;
@@ -87,6 +90,7 @@ typedef NS_ENUM(NSUInteger, AnEnum) {
 @property(nonatomic, strong, nullable) NSDictionary<NSString *, id> *nullableMapWithObject;
 @property(nonatomic, assign) AnEnum aNullableEnum;
 @property(nonatomic, copy, nullable) NSString *aNullableString;
+@property(nonatomic, strong, nullable) AllTypes *aNullableClass;
 @end
 
 @interface AllNullableTypesWrapper : NSObject