Resolve comments

Author: AmrAhmed119

pkgs/swift2objc/lib/src/transformer/_core/primitive_wrappers.dart

@@ -2,6 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:collection/collection.dart';
+
 import '../../ast/_core/interfaces/declaration.dart';
 import '../../ast/_core/shared/referred_type.dart';
 import '../../ast/declarations/built_in/built_in_declaration.dart';
@@ -11,13 +13,6 @@ import '../../parser/_core/utils.dart';
 import '../../transformer/_core/utils.dart';
 import '../transform.dart';
 
-final primitiveWrappers = <ReferredType, ReferredType>{
-  intType: _createWrapperClass(intType),
-  floatType: _createWrapperClass(floatType),
-  doubleType: _createWrapperClass(doubleType),
-  boolType: _createWrapperClass(boolType),
-};
-
 ReferredType _createWrapperClass(DeclaredType primitiveType) {
   final property = PropertyDeclaration(
     id: primitiveType.id.addIdSuffix('wrappedInstance'),
@@ -40,29 +35,31 @@ ReferredType _createWrapperClass(DeclaredType primitiveType) {
 
 (ReferredType, bool) getWrapperIfNeeded(
   ReferredType type,
-  bool isThrows,
+  bool shouldWrapPrimitives,
   TransformationMap transformationMap,
 ) {
-  if (type is! DeclaredType || !_isPrimitiveType(type) || !isThrows) {
+  if (type is! DeclaredType || !shouldWrapPrimitives) {
     return (type, false);
   }
 
   final wrapper = getPrimitiveWrapper(type);
+  if (wrapper == null) {
+    return (type, false);
+  }
+
   transformationMap[type.declaration] = (wrapper as DeclaredType).declaration;
   return (wrapper, true);
 }
 
-ReferredType getPrimitiveWrapper(DeclaredType other) {
-  return primitiveWrappers.entries
-      .firstWhere(
-        (entry) => entry.key.sameAs(other),
-      )
-      .value;
-}
+ReferredType? getPrimitiveWrapper(DeclaredType other) {
+  final primitiveWrappers = <(ReferredType, ReferredType)>[
+    (intType, _createWrapperClass(intType)),
+    (floatType, _createWrapperClass(floatType)),
+    (doubleType, _createWrapperClass(doubleType)),
+    (boolType, _createWrapperClass(boolType)),
+  ];
 
-bool _isPrimitiveType(DeclaredType type) {
-  return type.name == 'Int' ||
-      type.name == 'Float' ||
-      type.name == 'Double' ||
-      type.name == 'Bool';
+  return primitiveWrappers
+      .firstWhereOrNull((pair) => pair.$1.sameAs(other))
+      ?.$2;
 }

pkgs/swift2objc/lib/src/transformer/_core/utils.dart

@@ -18,11 +18,14 @@ import 'unique_namer.dart';
 
 (String value, ReferredType type) maybeWrapValue(ReferredType type,
     String value, UniqueNamer globalNamer, TransformationMap transformationMap,
-    {bool iswrapperPrimitive = false}) {
-  if (iswrapperPrimitive) {
-    final wrapper = getPrimitiveWrapper(type as DeclaredType) as DeclaredType;
-    return ('${wrapper.name}($value)', wrapper);
+    {bool shouldWrapPrimitives = false}) {
+  if (shouldWrapPrimitives) {
+    final (wrappedType, returnsWrappedPrimitive) =
+        getWrapperIfNeeded(type, shouldWrapPrimitives, transformationMap);
+    assert(returnsWrappedPrimitive);
+    return ('${(wrappedType as DeclaredType).name}($value)', wrappedType);
   }
+
   if (type.isObjCRepresentable) {
     return (value, type);
   }

pkgs/swift2objc/lib/src/transformer/transformers/transform_function.dart

@@ -91,8 +91,13 @@ MethodDeclaration _transformFunction(
     transformationMap,
   );
 
-  final (type, isWrapper) = getWrapperIfNeeded(
-      transformedReturnType, originalFunction.throws, transformationMap);
+  final shouldWrapPrimitives = originalFunction.throws &&
+      transformedReturnType is DeclaredType &&
+      getPrimitiveWrapper(transformedReturnType) != null;
+
+  final (_, type) = maybeWrapValue(
+      transformedReturnType, '', globalNamer, transformationMap,
+      shouldWrapPrimitives: shouldWrapPrimitives);
 
   final transformedMethod = MethodDeclaration(
     id: originalFunction.id,
@@ -112,7 +117,7 @@ MethodDeclaration _transformFunction(
     transformedMethod,
     globalNamer,
     transformationMap,
-    isWrapper,
+    shouldWrapPrimitives,
     originalCallGenerator: originalCallStatementGenerator,
   );
 
@@ -150,7 +155,7 @@ List<String> _generateStatements(
   MethodDeclaration transformedMethod,
   UniqueNamer globalNamer,
   TransformationMap transformationMap,
-  bool isWrapper, {
+  bool shouldWrapPrimitives, {
   required String Function(String arguments) originalCallGenerator,
 }) {
   final localNamer = UniqueNamer();
@@ -180,7 +185,7 @@ List<String> _generateStatements(
     resultName,
     globalNamer,
     transformationMap,
-    iswrapperPrimitive: isWrapper,
+    shouldWrapPrimitives: shouldWrapPrimitives,
   );
 
   assert(wrapperType.sameAs(transformedMethod.returnType));

pkgs/swift2objc/lib/src/transformer/transformers/transform_variable.dart

@@ -81,7 +81,7 @@ Declaration _transformVariable(
       if (originalVariable.async) 'await'
     ].join(' ');
 
-    final (type, isWrapper) = getWrapperIfNeeded(
+    final (type, _) = getWrapperIfNeeded(
         transformedType, originalVariable.throws, transformationMap);
 
     return MethodDeclaration(

pkgs/swift2objc/pubspec.yaml

@@ -15,6 +15,7 @@ topics:
   - codegen
 
 dependencies:
+  collection: ^1.19.1
   logging: ^1.3.0
   meta: ^1.16.0
   path: ^1.9.0