From b17e1047f1427d2341874a7d4c85f59331dbeaf2 Mon Sep 17 00:00:00 2001
From: milad <milad.akarie@gmail.com>
Date: Tue, 30 Jul 2024 15:19:27 +0300
Subject: [PATCH] fix a bug when returning custom roue builder

---
 .../resolvers/route_parameter_resolver.dart   |  2 +-
 .../lib/src/resolvers/type_resolver.dart      | 37 ++++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/auto_route_generator/lib/src/resolvers/route_parameter_resolver.dart b/auto_route_generator/lib/src/resolvers/route_parameter_resolver.dart
index 9e95c812..4fc2f639 100644
--- a/auto_route_generator/lib/src/resolvers/route_parameter_resolver.dart
+++ b/auto_route_generator/lib/src/resolvers/route_parameter_resolver.dart
@@ -21,7 +21,7 @@ class RouteParameterResolver {
   /// Resolves a ParameterElement into a consumable [ParamConfig]
   ParamConfig resolve(ParameterElement parameterElement) {
     final paramType = parameterElement.type;
-    if (paramType is FunctionType) {
+    if (paramType is FunctionType && paramType.alias == null) {
       return _resolveFunctionType(parameterElement);
     }
     var type = _typeResolver.resolveType(paramType);
diff --git a/auto_route_generator/lib/src/resolvers/type_resolver.dart b/auto_route_generator/lib/src/resolvers/type_resolver.dart
index b5329e58..bd182d32 100644
--- a/auto_route_generator/lib/src/resolvers/type_resolver.dart
+++ b/auto_route_generator/lib/src/resolvers/type_resolver.dart
@@ -1,9 +1,12 @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart' show NullabilitySuffix;
-import 'package:analyzer/dart/element/type.dart' show DartType, ParameterizedType, RecordType;
+import 'package:analyzer/dart/element/type.dart'
+    show DartType, ParameterizedType, RecordType;
 import 'package:auto_route_generator/src/models/resolved_type.dart';
 import 'package:path/path.dart' as p;
 
+
+const _unPreferredImports = {'dart:ui'};
 /// A Helper class that resolves types
 class TypeResolver {
   /// The list of resolved libraries in [BuildStep]
@@ -21,16 +24,22 @@ class TypeResolver {
     if (libs.isEmpty || element?.source == null || _isCoreDartType(element!)) {
       return null;
     }
+
+    final  fallBackImports = <String>{};
     for (var lib in libs) {
       if (!_isCoreDartType(lib) && lib.exportNamespace.definedNames.values.contains(element)) {
         final uri = lib.source.uri;
+         if(_unPreferredImports.contains(uri.toString())){
+          fallBackImports.add(uri.toString());
+          continue;
+         }
         if (uri.scheme == 'asset') {
           return _assetToPackage(lib.source.uri);
         }
         return targetFile == null ? lib.identifier : _relative(uri, targetFile!);
       }
     }
-    return null;
+    return fallBackImports.firstOrNull;
   }
 
   String _assetToPackage(Uri uri) {
@@ -114,19 +123,29 @@ class TypeResolver {
 
   /// Resolves the given [type] to a [ResolvedType]
   ResolvedType resolveType(DartType type) {
-    if (type is RecordType) {
+    final effectiveElement = type.alias?.element ?? type.element;
+    final import = resolveImport(effectiveElement);
+    final typeArgs = <ResolvedType>[];
+    final alias = type.alias;
+    if(alias != null) {
+       typeArgs.addAll(alias.typeArguments.map(resolveType));
+    }else {
+      typeArgs.addAll(_resolveTypeArguments(type));
+    }
+    if (type is RecordType && type.alias == null) {
       return ResolvedType.record(
-        name: type.element?.name ?? 'void',
-        import: resolveImport(type.element),
+        name: effectiveElement?.displayName ?? 'void',
+        import: import,
         isNullable: type.nullabilitySuffix == NullabilitySuffix.question,
-        typeArguments: _resolveTypeArguments(type),
+        typeArguments: typeArgs,
       );
     }
+
     return ResolvedType(
-      name: type.element?.name ?? type.getDisplayString(withNullability: false),
+      name: effectiveElement?.displayName ?? type.getDisplayString(withNullability: false),
       isNullable: type.nullabilitySuffix == NullabilitySuffix.question,
-      import: resolveImport(type.element),
-      typeArguments: _resolveTypeArguments(type),
+      import: import,
+      typeArguments: typeArgs,
     );
   }
 }