fix enums, still need to resolve Any?

analysis_options.yaml

@@ -20,6 +20,7 @@ analyzer:
     # Ignore generated files
     - '**/*.g.dart'
     - '**/*.gen.jni.dart'
+    - '**/*.gen.ffi.dart'
     - '**/*.mocks.dart' # Mockito @GenerateMocks
 
 linter:

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

@@ -194,7 +194,7 @@ class _FfiType {
 
   String get fullFfiName {
     if (type.baseName == 'List' || type.baseName == 'Map') {
-      return ffiName + ffiCollectionTypeAnnotations;
+      return ffiName;
     }
     return ffiName;
   }
@@ -263,7 +263,7 @@ class _FfiType {
     String asType = ' as ${getDartReturnType(true)}';
     String castCall = '';
     final String codecCall =
-        '_PigeonFfiCodec.readValue($varName)${_getForceNonNullSymbol(!type.isNullable)}';
+        '_PigeonFfiCodec.readValue($varName${type.isEnum ? ', ${type.baseName}' : ''})${_getForceNonNullSymbol(!type.isNullable)}';
     String primitiveGetter(String converter, bool classField) {
       return classField &&
               !type.isNullable &&
@@ -322,14 +322,17 @@ class _FfiType {
             type.baseName == 'bool')) {
       return name;
     }
-    return '_PigeonFfiCodec.writeValue<${getFfiCallReturnType(type.isNullable)}>($name)';
+    return '_PigeonFfiCodec.writeValue<${ffiType.ffiName}>($name)';
   }
 
   String getFfiCallReturnType(bool forceUnwrap, {bool forceNullable = false}) {
     if (type.isEnum && forceNullable) {
       return 'NSNumber?';
     }
-    return '$ffiName$ffiCollectionTypeAnnotations${_getNullableSymbol(forceNullable || type.isNullable)}';
+    if (type.baseName == 'List') {
+      return 'NSArray?';
+    }
+    return '$ffiName${_getNullableSymbol(forceNullable || type.isNullable)}';
   }
 
   String getDartReturnType(bool forceUnwrap) {
@@ -1708,12 +1711,10 @@ class DartGenerator extends StructuredGenerator<InternalDartOptions> {
                 final _FfiType returnType = _FfiType.fromTypeDeclaration(
                   method.returnType,
                 );
-                final String methodCallReturnString = returnType.type.isVoid &&
+                final String methodCallReturnString = returnType.type.isVoid ||
                         method.isAsynchronous
                     ? ''
-                    : (returnType.type.isVoid)
-                        ? ''
-                        : 'final ${returnType.getFfiCallReturnType(method.isAsynchronous, forceNullable: true)} res = ';
+                    : 'final ${returnType.getFfiCallReturnType(method.isAsynchronous, forceNullable: true)} res = ';
                 indent.writeln(
                     'final ffi_bridge.${generatorOptions.ffiErrorClassName} error = ffi_bridge.${generatorOptions.ffiErrorClassName}();');
                 indent.writeln(
@@ -2679,6 +2680,9 @@ class _PigeonFfiCodec {
           return value.doubleValue;
         case const (bool):
           return value.boolValue;
+        ${root.enums.map((Enum enumDefinition) => '''
+case const (${enumDefinition.name}):
+          return ${enumDefinition.name}.fromNSNumber(value);''').join('\n')}
         default:
           throw ArgumentError.value(value);
       }
@@ -2708,16 +2712,16 @@ class _PigeonFfiCodec {
       //     list[i] = value.as(NSDoubleArray.type)[i];
       //   }
       //   return list;
-    } else if (value is NSMutableArray) {
+    } else if (value is NSArray) {
       final List<Object?> res = <Object?>[];
       for (int i = 0; i < value.length; i++) {
-        res.add(readValue(value[i] as NSObject?));
+        res.add(readValue(value[i]));
       }
       return res;
     } else if (value is NSDictionary) {
       final Map<Object?, Object?> res = <Object?, Object?>{};
       for (final MapEntry<NSCopying?, ObjCObjectBase?> entry in value.entries) {
-        res[readValue(entry.key as NSObject?)] = readValue(entry.value as NSObject?);
+        res[readValue(entry.key)] = readValue(entry.value);
       }
       return res;
     } else if (ffi_bridge.NSNumberWrapper.isInstance(value)) {

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

@@ -150,7 +150,7 @@ class InternalSwiftOptions extends InternalOptions {
   /// Module to use for FFI.
   final String? ffiModuleName;
 
-  /// The directory that the app exists in, this is required for Jni APIs.
+  /// The directory that the app exists in, this is required for FFi APIs.
   final String? appDirectory;
 }
 
@@ -283,6 +283,7 @@ class SwiftGenerator extends StructuredGenerator<InternalSwiftOptions> {
   void _writeFfiCodec(Indent indent, Root root) {
     indent.newln();
     indent.format('''
+@available(iOS 13, macOS 16.0.0, *)
 class _PigeonFfiCodec {
   static func readValue(value: NSObject?, type: String?) -> Any? {
     if (isNullish(value)) {
@@ -326,7 +327,7 @@ class _PigeonFfiCodec {
       //     list[i] = value.as(NSDoubleArray.type)[i]
       //   //   }
       //   return list
-    if (value is NSMutableArray) {
+    if (value is NSMutableArray || value is NSArray) {
       var res: Array<Any?> = []
       for i in 0..<(value as! NSMutableArray).count {
           res.append(readValue(value: (value as! NSMutableArray)[i] as? NSObject, type: nil))
@@ -336,7 +337,7 @@ class _PigeonFfiCodec {
     if (value is NSDictionary) {
       var res: Dictionary<AnyHashable?, Any?> = Dictionary()
       for (key, value) in (value as! NSDictionary) {
-          res[readValue(value: key as? NSObject, type: nil) as! AnyHashable?] = readValue(value: value as? NSObject, type: nil)
+          res[readValue(value: key as? NSObject, type: nil) as? AnyHashable] = readValue(value: value as? NSObject, type: nil)
       }
       return res
     } 
@@ -403,14 +404,14 @@ class _PigeonFfiCodec {
     if (value is Array<Any>) {
       let res: NSMutableArray = NSMutableArray()
       for i in 0..<(value as! NSMutableArray).count {
-        res.add(writeValue(value: (value as! NSMutableArray)[i])!)
+        res.add(writeValue(value: (value as! NSMutableArray)[i]) as! NSObject)
       }
       return res
     }
     if (value is Dictionary<AnyHashable, Any>) {
       let res: NSMutableDictionary = NSMutableDictionary()
       for (key, value) in (value as! NSDictionary) {
-         res.setObject(writeValue(value: value) as Any, forKey: writeValue(value: key) as! NSCopying)
+         res.setObject(writeValue(value: value) as! NSObject, forKey: writeValue(value: key) as! NSCopying)
       }
       return res
     }
@@ -955,6 +956,7 @@ if (wrapped == nil) {
       for (final Method method in api.methods) {
         addDocumentationComments(
             indent, method.documentationComments, _docCommentSpec);
+        indent.writeln('@available(iOS 13, macOS 16.0.0, *)');
         indent.write(_getMethodSignature(
           name: method.name,
           parameters: method.parameters,
@@ -972,7 +974,7 @@ if (wrapped == nil) {
               indent.writeln(
                   'return try ${_swiftToFfiConversion(method.returnType, 'api!.${method.name}(${method.parameters.map((NamedType param) {
                         return '${param.name}: ${_ffiToSwiftConversion(param)}';
-                      }).join(', ')})')}');
+                      }).join(', ')})')}${method.returnType.baseName == 'List' || method.returnType.baseName == 'Map' ? ' as? ${_ffiTypeForBuiltinGenericDartType(method.returnType)}' : ''}');
             },
             addTrailingNewline: false,
           );