nested classes

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

@@ -317,7 +317,6 @@ class _FfiType {
       return _wrapInNullCheckIfNullable(
         nullable: type.isNullable,
         varName: name,
-        ifNull: '${ffiType.ffiName}.alloc()',
         code:
             '$name${_getForceNonNullSymbol(type.isNullable && forceNonNull)}.toFfi()',
       );
@@ -1027,19 +1026,19 @@ class DartGenerator extends StructuredGenerator<InternalDartOptions> {
   }
 
   void _writeToJni(Indent indent, Class classDefinition) {
-    indent.writeScoped('jni_bridge.${classDefinition.name} toJni() {', '}', () {
-      indent.writeScoped('return jni_bridge.${classDefinition.name} (', ');',
-          () {
-        for (final NamedType field in getFieldsInSerializationOrder(
-          classDefinition,
-        )) {
-          final _JniType jniType = _JniType.fromTypeDeclaration(field.type);
-          indent.writeln(
-            '${field.name}: ${jniType.getToJniCall(field.type, field.name, jniType, forceNonNull: true)},',
-          );
-        }
-      });
-    });
+    // indent.writeScoped('jni_bridge.${classDefinition.name} toJni() {', '}', () {
+    //   indent.writeScoped('return jni_bridge.${classDefinition.name} (', ');',
+    //       () {
+    //     for (final NamedType field in getFieldsInSerializationOrder(
+    //       classDefinition,
+    //     )) {
+    //       final _JniType jniType = _JniType.fromTypeDeclaration(field.type);
+    //       indent.writeln(
+    //         '${field.name}: ${jniType.getToJniCall(field.type, field.name, jniType, forceNonNull: true)},',
+    //       );
+    //     }
+    //   });
+    // });
   }
 
   void _writeToFfi(Indent indent, Class classDefinition) {
@@ -1070,27 +1069,27 @@ class DartGenerator extends StructuredGenerator<InternalDartOptions> {
   }
 
   void _writeFromJni(Indent indent, Class classDefinition) {
-    final _JniType jniClass = _JniType.fromClass(classDefinition);
-    indent.writeScoped(
-      'static ${jniClass.type.baseName}? fromJni(${jniClass.jniName}? jniClass) {',
-      '}',
-      () {
-        indent.writeScoped(
-          'return jniClass == null ? null : ${jniClass.type.baseName}(',
-          ');',
-          () {
-            for (final NamedType field in getFieldsInSerializationOrder(
-              classDefinition,
-            )) {
-              final _JniType jniType = _JniType.fromTypeDeclaration(field.type);
-              indent.writeln(
-                '${field.name}: ${jniType.getToDartCall(field.type, varName: 'jniClass.${jniType.getJniGetterMethodName(field.name)}')},',
-              );
-            }
-          },
-        );
-      },
-    );
+    // final _JniType jniClass = _JniType.fromClass(classDefinition);
+    // indent.writeScoped(
+    //   'static ${jniClass.type.baseName}? fromJni(${jniClass.jniName}? jniClass) {',
+    //   '}',
+    //   () {
+    //     indent.writeScoped(
+    //       'return jniClass == null ? null : ${jniClass.type.baseName}(',
+    //       ');',
+    //       () {
+    //         for (final NamedType field in getFieldsInSerializationOrder(
+    //           classDefinition,
+    //         )) {
+    //           final _JniType jniType = _JniType.fromTypeDeclaration(field.type);
+    //           indent.writeln(
+    //             '${field.name}: ${jniType.getToDartCall(field.type, varName: 'jniClass.${jniType.getJniGetterMethodName(field.name)}')},',
+    //           );
+    //         }
+    //       },
+    //     );
+    //   },
+    // );
   }
 
   void _writeFromFfi(Indent indent, Class classDefinition) {
@@ -2491,9 +2490,9 @@ class _PigeonJniCodec {
     ${root.classes.map((Class dataClass) {
       final _JniType jniType = _JniType.fromClass(dataClass);
       return '''
-      } else if (value.isA<${jniType.jniName}>(
-          ${jniType.jniName}.type)) {
-        return ${jniType.type.baseName}.fromJni(value.as(${jniType.jniName}.type));
+      // } else if (value.isA<${jniType.jniName}>(
+      //     ${jniType.jniName}.type)) {
+      //   return ${jniType.type.baseName}.fromJni(value.as(${jniType.jniName}.type));
         ''';
     }).join()}
     ${root.enums.map((Enum enumDefinition) {
@@ -2622,8 +2621,8 @@ class _PigeonJniCodec {
     ${root.classes.map((Class dataClass) {
       final _JniType jniType = _JniType.fromClass(dataClass);
       return '''
-      } else if (value is ${jniType.type.baseName}) {
-        return value.toJni() as T;
+      // } else if (value is ${jniType.type.baseName}) {
+      //   return value.toJni() as T;
         ''';
     }).join()}
     ${root.enums.map((Enum enumDefinition) {

packages/pigeon/lib/src/swift/swift_generator.dart

@@ -789,6 +789,9 @@ if (wrapped == nil) {
     });
   }
 
+  /////////// THESE NEED TO BE RECONCILED
+  // TODO
+
   String _varToObjc(String varName, TypeDeclaration type) {
     final String nullable = type.isNullable ? '?' : '';
     switch (type.baseName) {
@@ -808,6 +811,9 @@ if (wrapped == nil) {
         if (type.isEnum && type.isNullable) {
           return _numberToObjc(varName, getter: '!.rawValue');
         }
+        if (type.isClass) {
+          return '${type.baseName}Bridge.fromSwift($varName)';
+        }
         return varName;
     }
   }
@@ -838,10 +844,48 @@ if (wrapped == nil) {
               ? 'isNullish($varName) ? nil : ${type.baseName}.init(rawValue: $varName!.intValue)'
               : varName;
         }
+        if (type.isClass) {
+          final String checkNullish =
+              type.isNullable ? 'isNullish($varName) ? nil : ' : '';
+          return '$checkNullish$varName${nullable.isEmpty ? '' : '!'}.toSwift()';
+        }
         return varName;
     }
   }
 
+  String _ffiToSwiftConversion(NamedType param) {
+    final String nullable = param.type.isNullable ? '?' : '';
+    if (param.type.isEnum && param.type.isNullable) {
+      return 'isNullish(${param.name}) ? nil : ${param.type.baseName}(rawValue: ${param.name}!.intValue)${param.type.isNullable ? '' : '!'}';
+    }
+    if (param.type.isClass) {
+      final String checkNullish =
+          param.type.isNullable ? 'isNullish(${param.name}) ? nil : ' : '';
+      return '$checkNullish${param.name}$nullable.toSwift()';
+    }
+    if (param.type.baseName == 'Object') {
+      return ' _PigeonFfiCodec.readValue(value: ${param.name} as? NSObject, type: nil) as Any';
+    }
+    return '${param.name}${_conversionToObjcRequired(param.type) ? '$nullable.${toLowerCamelCase(_swiftTypeForBuiltinDartType(param.type)!)}Value' : ''}';
+  }
+
+  String _swiftToFfiConversion(TypeDeclaration type, String toConvert) {
+    if (type.isEnum) {
+      return 'NSNumber(value: $toConvert.rawValue)';
+    } else if (type.baseName == 'Object') {
+      return '_PigeonFfiCodec.writeValue(value: $toConvert, isObject: true)';
+    }
+    final String nullable = type.isNullable ? '?' : '';
+    if (_conversionToObjcRequired(type)) {
+      if (type.isClass) {
+        return '${type.baseName}Bridge.fromSwift($toConvert)';
+      }
+      return '$toConvert as$nullable ${_ffiTypeForBuiltinDartType(type)}';
+    }
+    return toConvert;
+  }
+  //////////
+
   void _writeClassInit(Indent indent, List<NamedType> fields, String objc,
       {bool useFfi = false}) {
     indent.writeScoped('${objc}init(', ')', () {
@@ -3396,7 +3440,7 @@ String _swiftTypeForDartType(
   }
   return _swiftTypeForBuiltinDartType(type, mapKey: mapKey, useFfi: useFfi) ??
       _swiftTypeForProxyApiType(type) ??
-      type.baseName;
+      (useFfi && type.isClass ? '${type.baseName}Bridge' : type.baseName);
 }
 
 String _ffiTypeForDartType(TypeDeclaration type,
@@ -3423,36 +3467,6 @@ String _nullSafeFfiTypeForDartType(TypeDeclaration type,
   return '${_ffiTypeForDartType(type, collectionSubType: collectionSubType, forceNullable: forceNullable)}${(type.isNullable && type.baseName != 'Object') || forceNullable ? '?' : ''}';
 }
 
-String _ffiToSwiftConversion(NamedType param) {
-  final String nullable = param.type.isNullable ? '?' : '';
-  if (param.type.isEnum && param.type.isNullable) {
-    return 'isNullish(${param.name}) ? nil : ${param.type.baseName}(rawValue: ${param.name}!.intValue)${param.type.isNullable ? '' : '!'}';
-  }
-  if (param.type.isClass) {
-    return '${param.name}$nullable.toSwift()';
-  }
-  if (param.type.baseName == 'Object') {
-    return ' _PigeonFfiCodec.readValue(value: ${param.name} as? NSObject, type: nil) as Any';
-  }
-  return '${param.name}${_conversionToObjcRequired(param.type) ? '$nullable.${toLowerCamelCase(_swiftTypeForBuiltinDartType(param.type)!)}Value' : ''}';
-}
-
-String _swiftToFfiConversion(TypeDeclaration type, String toConvert) {
-  if (type.isEnum) {
-    return 'NSNumber(value: $toConvert.rawValue)';
-  } else if (type.baseName == 'Object') {
-    return '_PigeonFfiCodec.writeValue(value: $toConvert, isObject: true)';
-  }
-  final String nullable = type.isNullable ? '?' : '';
-  if (_conversionToObjcRequired(type)) {
-    if (type.isClass) {
-      return '${type.baseName}Bridge.fromSwift($toConvert)';
-    }
-    return '$toConvert as$nullable ${_ffiTypeForBuiltinDartType(type)}';
-  }
-  return toConvert;
-}
-
 String _getMethodSignature({
   required String name,
   required Iterable<Parameter> parameters,

packages/pigeon/pigeons/ni_tests.dart

@@ -260,29 +260,29 @@ class NIAllNullableTypesWithoutRecursion {
 //   Map<int?, Map<Object?, Object?>?>? mapMap;
 }
 
-// /// A class for testing nested class handling.
-// ///
-// /// This is needed to test nested nullable and non-nullable classes,
-// /// `NIAllNullableTypes` is non-nullable here as it is easier to instantiate
-// /// than `NIAllTypes` when testing doesn't require both (ie. testing null classes).
-// class NIAllClassesWrapper {
-//   NIAllClassesWrapper(
-//     this.allNullableTypes,
-//     this.allNullableTypesWithoutRecursion,
-//     this.allTypes,
-//     this.classList,
-//     this.classMap,
-//     this.nullableClassList,
-//     this.nullableClassMap,
-//   );
-//   NIAllNullableTypes allNullableTypes;
-//   NIAllNullableTypesWithoutRecursion? allNullableTypesWithoutRecursion;
-//   NIAllTypes? allTypes;
-//   List<NIAllTypes?> classList;
-//   List<NIAllNullableTypesWithoutRecursion?>? nullableClassList;
-//   Map<int?, NIAllTypes?> classMap;
-//   Map<int?, NIAllNullableTypesWithoutRecursion?>? nullableClassMap;
-// }
+/// A class for testing nested class handling.
+///
+/// This is needed to test nested nullable and non-nullable classes,
+/// `NIAllNullableTypes` is non-nullable here as it is easier to instantiate
+/// than `NIAllTypes` when testing doesn't require both (ie. testing null classes).
+class NIAllClassesWrapper {
+  NIAllClassesWrapper(
+    // this.allNullableTypes,
+    this.allNullableTypesWithoutRecursion,
+    this.allTypes,
+    // this.classList,
+    // this.classMap,
+    // this.nullableClassList,
+    // this.nullableClassMap,
+  );
+  // NIAllNullableTypes allNullableTypes;
+  NIAllNullableTypesWithoutRecursion? allNullableTypesWithoutRecursion;
+  NIAllTypes? allTypes;
+  // List<NIAllTypes?> classList;
+  // List<NIAllNullableTypesWithoutRecursion?>? nullableClassList;
+  // Map<int?, NIAllTypes?> classMap;
+  // Map<int?, NIAllNullableTypesWithoutRecursion?>? nullableClassMap;
+}
 
 /// The core interface that each host language plugin must implement in
 /// platform_test integration tests.
@@ -426,10 +426,10 @@ abstract class NIHostIntegrationCoreApi {
   // Map<int, NIAllNullableTypes> echoNonNullClassMap(
   //     Map<int, NIAllNullableTypes> classMap);
 
-  // /// Returns the passed class to test nested class serialization and deserialization.
-  // @ObjCSelector('echoClassWrapper:')
+  /// Returns the passed class to test nested class serialization and deserialization.
+  @ObjCSelector('echoClassWrapper:')
   // @SwiftFunction('echo(_:)')
-  // NIAllClassesWrapper echoClassWrapper(NIAllClassesWrapper wrapper);
+  NIAllClassesWrapper echoClassWrapper(NIAllClassesWrapper wrapper);
 
   /// Returns the passed enum to test serialization and deserialization.
   @ObjCSelector('echoEnum:')

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

@@ -41,11 +41,16 @@ class _ExampleAppState extends State<ExampleApp> {
       // Make a single trivial call just to validate that everything is wired
       // up.
       // await api.noop();
-      // final NIHostIntegrationCoreApiForNativeInterop? api =
-      //     NIHostIntegrationCoreApiForNativeInterop.getInstance();
+      final NIHostIntegrationCoreApiForNativeInterop? api =
+          NIHostIntegrationCoreApiForNativeInterop.getInstance();
       // api!.noop();
       // api.echoAllNullableTypesWithoutRecursion(
       //     genericNIAllNullableTypesWithoutRecursion);
+      final NIAllClassesWrapper classWrapper = classWrapperMaker();
+      classWrapper.allTypes = null;
+      final NIAllClassesWrapper receivedClassWrapper =
+          api!.echoClassWrapper(classWrapper);
+      print(receivedClassWrapper);
     } catch (e) {
       setState(() {
         status = 'Failed: $e';

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

@@ -224,29 +224,29 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {
 //       expect(receivedObject.allNullableTypes.aNullableString, sentString);
 //     });
 
-//     testWidgets('nested classes can serialize and deserialize correctly',
-//         (WidgetTester _) async {
-//       final NIHostIntegrationCoreApiForNativeInterop? api =
-//           NIHostIntegrationCoreApiForNativeInterop.getInstance();
-//       final NIAllClassesWrapper classWrapper = classWrapperMaker();
+    testWidgets('nested classes can serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final NIHostIntegrationCoreApiForNativeInterop? api =
+          NIHostIntegrationCoreApiForNativeInterop.getInstance();
+      final NIAllClassesWrapper classWrapper = classWrapperMaker();
+      final NIAllClassesWrapper receivedClassWrapper =
+          api!.echoClassWrapper(classWrapper);
 
-//       final NIAllClassesWrapper receivedClassWrapper =
-//           api!.echoClassWrapper(classWrapper);
-//       expect(classWrapper, receivedClassWrapper);
-//     });
+      expect(classWrapper, receivedClassWrapper);
+    });
 
-//     testWidgets('nested null classes can serialize and deserialize correctly',
-//         (WidgetTester _) async {
-//       final NIHostIntegrationCoreApiForNativeInterop? api =
-//           NIHostIntegrationCoreApiForNativeInterop.getInstance();
-//       final NIAllClassesWrapper classWrapper = classWrapperMaker();
+    testWidgets('nested null classes can serialize and deserialize correctly',
+        (WidgetTester _) async {
+      final NIHostIntegrationCoreApiForNativeInterop? api =
+          NIHostIntegrationCoreApiForNativeInterop.getInstance();
+      final NIAllClassesWrapper classWrapper = classWrapperMaker();
 
-//       classWrapper.allTypes = null;
+      classWrapper.allTypes = null;
 
-//       final NIAllClassesWrapper receivedClassWrapper =
-//           api!.echoClassWrapper(classWrapper);
-//       expect(classWrapper, receivedClassWrapper);
-//     });
+      final NIAllClassesWrapper receivedClassWrapper =
+          api!.echoClassWrapper(classWrapper);
+      expect(classWrapper, receivedClassWrapper);
+    });
 
 //     testWidgets(
 //         'Arguments of multiple types serialize and deserialize correctly',

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

@@ -447,14 +447,14 @@ final NIAllTypes genericNIAllTypes = NIAllTypes(
 //   recursiveClassMap: allNullableTypesMap,
 // );
 
-// NIAllClassesWrapper classWrapperMaker() {
-//   return NIAllClassesWrapper(
+NIAllClassesWrapper classWrapperMaker() {
+  return NIAllClassesWrapper(
 //     allNullableTypes: recursiveNIAllNullableTypes,
-//     allNullableTypesWithoutRecursion: genericNIAllNullableTypesWithoutRecursion,
-//     allTypes: genericNIAllTypes,
+    allNullableTypesWithoutRecursion: genericNIAllNullableTypesWithoutRecursion,
+    allTypes: genericNIAllTypes,
 //     classList: allTypesClassList,
 //     classMap: allTypesClassMap,
 //     nullableClassList: allNullableTypesWithoutRecursionClassList,
 //     nullableClassMap: allNullableTypesWithoutRecursionClassMap,
-//   );
-// }
+  );
+}