fix: Fixed API generator to consider Aliases types

jezzsantos · jezzsantos · commit bb4e04b423c1 · 2025-10-09T12:16:42.000+13:00
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests.TestData/ADirectory/INestedAliasedDependency.cs b/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests.TestData/ADirectory/INestedAliasedDependency.cs
@@ -0,0 +1,6 @@
+namespace Tools.Generators.Web.Api.UnitTests.TestData.ADirectory;
+
+public interface INestedAliasedDependency
+{
+    
+}
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests.TestData/AnAliasedType.cs b/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests.TestData/AnAliasedType.cs
@@ -0,0 +1,6 @@
+namespace Tools.Generators.Web.Api.UnitTests.TestData;
+
+public class AnAliasedType
+{
+    
+}
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests.TestData/IAliasedDependency.cs b/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests.TestData/IAliasedDependency.cs
@@ -0,0 +1,5 @@
+﻿namespace Tools.Generators.Web.Api.UnitTests.TestData;
+
+public interface IAliasedDependency
+{
+}
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests.TestData/Tools.Generators.Web.Api.UnitTests.TestData.csproj b/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests.TestData/Tools.Generators.Web.Api.UnitTests.TestData.csproj
@@ -0,0 +1,7 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+    </PropertyGroup>
+
+</Project>
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests/MinimalApiGeneratorSpec.cs b/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests/MinimalApiGeneratorSpec.cs
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests/Tools.Generators.Web.Api.UnitTests.csproj b/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests/Tools.Generators.Web.Api.UnitTests.csproj
@@ -6,6 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\Tools.Generators.Web.Api.UnitTests.TestData\Tools.Generators.Web.Api.UnitTests.TestData.csproj" />
         <ProjectReference Include="..\Tools.Generators.Web.Api\Tools.Generators.Web.Api.csproj" Aliases="Generators" />
         <ProjectReference Include="..\..\Testing\UnitTesting.CodeAnalysis.Common\UnitTesting.CodeAnalysis.Common.csproj" />
     </ItemGroup>
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests/WebApiAssemblyVisitorSpec.cs b/src/Framework/Tools/Tools.Generators.Web.Api.UnitTests/WebApiAssemblyVisitorSpec.cs
@@ -403,7 +403,7 @@ public string AMethod(ARequest request)
                 registration.Class.Constructors.First().MethodBody.Should().BeEmpty();
                 registration.Class.TypeName.Name.Should().Be("AServiceClass");
                 registration.Class.TypeName.Namespace.Should().Be("ANamespace");
-                registration.Class.TypeName.FullName.Should().Be("ANamespace.AServiceClass");
+                registration.Class.TypeName.FullName.Should().Be("global::ANamespace.AServiceClass");
                 registration.Class.UsingNamespaces.Count().Should().Be(2);
                 registration.MethodBody.Should().Be($"    {{{Environment.NewLine}"
                                                     + $"         return \"\";{Environment.NewLine}"
@@ -458,7 +458,7 @@ public string AMethod(ARequest request)
                 registration.Class.Constructors.First().MethodBody.Should().BeEmpty();
                 registration.Class.TypeName.Name.Should().Be("AServiceClass");
                 registration.Class.TypeName.Namespace.Should().Be("ANamespace");
-                registration.Class.TypeName.FullName.Should().Be("ANamespace.AServiceClass");
+                registration.Class.TypeName.FullName.Should().Be("global::ANamespace.AServiceClass");
                 registration.Class.UsingNamespaces.Count().Should().Be(2);
                 registration.MethodBody.Should().Be($"    {{{Environment.NewLine}"
                                                     + $"         return \"\";{Environment.NewLine}"
@@ -515,7 +515,7 @@ public string AMethod(ARequest request)
                 registration.Class.Constructors.First().MethodBody.Should().BeEmpty();
                 registration.Class.TypeName.Name.Should().Be("AServiceClass");
                 registration.Class.TypeName.Namespace.Should().Be("ANamespace");
-                registration.Class.TypeName.FullName.Should().Be("ANamespace.AServiceClass");
+                registration.Class.TypeName.FullName.Should().Be("global::ANamespace.AServiceClass");
                 registration.Class.UsingNamespaces.Count().Should().Be(2);
                 registration.MethodBody.Should().Be($"    {{{Environment.NewLine}"
                                                     + $"         return \"\";{Environment.NewLine}"
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api/Extensions/SymbolExtensions.cs b/src/Framework/Tools/Tools.Generators.Web.Api/Extensions/SymbolExtensions.cs
@@ -1,3 +1,4 @@
+using Common.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
@@ -43,17 +44,41 @@ public static IEnumerable<string> GetUsingNamespaces(this INamedTypeSymbol symbo
             : symbol.DeclaringSyntaxReferences.FirstOrDefault();
         if (syntaxReference is null)
         {
-            return Enumerable.Empty<string>();
+            return [];
         }
 
-        var usingSyntaxes = syntaxReference.SyntaxTree.GetRoot()
+        var root = syntaxReference.SyntaxTree.GetRoot();
+        var usingSyntaxes = root
             .DescendantNodes()
             .OfType<UsingDirectiveSyntax>();
-
-        return usingSyntaxes.Select(us => us.Name!.ToString())
+        var aliasSyntaxes = root
+            .DescendantNodes()
+            .OfType<ExternAliasDirectiveSyntax>();
+
+        var usingDeclarations = usingSyntaxes
+            .Select(uds =>
+            {
+                if (uds.Name is QualifiedNameSyntax qualifiedName)
+                {
+                    if (uds.Alias.Exists())
+                    {
+                        return $"{uds.Alias.ToFullString()}{qualifiedName.ToFullString()}";
+                    }
+                }
+
+                return uds.Name!.ToFullString();
+            })
             .Distinct()
-            .OrderByDescending(s => s)
+            .OrderByDescending(s => s);
+        var aliasDeclarations = aliasSyntaxes
+            .Select(us => us.ToString())
+            .Distinct()
+            .OrderByDescending(s => s);
+        var namespaces = usingDeclarations
+            .Concat(aliasDeclarations)
             .ToList();
+
+        return namespaces;
     }
 
     public static bool IsClass(this ITypeSymbol type)
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api/MinimalApiGenerator.cs b/src/Framework/Tools/Tools.Generators.Web.Api/MinimalApiGenerator.cs
@@ -84,10 +84,15 @@ private static string BuildUsingList(
             .SelectMany(registration => registration.Class.UsingNamespaces)
             .Concat(RequiredUsingNamespaces)
             .Distinct()
-            .OrderByDescending(s => s)
+            .Select(s => s.StartsWith("extern alias")
+                ? s
+                : $"using {s};")
+            .OrderByDescending(s => s.StartsWith("extern alias")) // extern aliases
+            .ThenByDescending(s => !s.Contains(" = ")) // regular usings
+            .ThenByDescending(s => s) // aliased usings
             .ToList();
 
-        allNamespaces.ForEach(@using => usingList.AppendLine($"using {@using};"));
+        allNamespaces.ForEach(@using => usingList.AppendLine(@using));
 
         return usingList.ToString();
     }
@@ -123,7 +128,7 @@ private static void BuildEndpointRegistrations(
                 endpointRegistrations.AppendLine(
                     $"            {groupName}.{endPointMethodName}(\"{registration.RoutePath}\",");
                 endpointRegistrations.AppendLine(
-                    $"                async (global::System.IServiceProvider serviceProvider, global::{registration.RequestDto.FullName} request) =>");
+                    $"                async (global::System.IServiceProvider serviceProvider, {registration.RequestDto.FullName} request) =>");
                 endpointRegistrations.AppendLine(
                     $"                {methodBody})");
 
@@ -268,7 +273,7 @@ private static string BuildHandlerBody(WebApiAssemblyVisitor.ServiceOperationReg
         handlerMethod.AppendLine(
             $"                    static async Task<global::Microsoft.AspNetCore.Http.IResult>"
             + $" Handle(global::System.IServiceProvider services, "
-            + $"global::{registration.RequestDto.FullName} request, "
+            + $"{registration.RequestDto.FullName} request, "
             + $"global::System.Threading.CancellationToken cancellationToken)");
         handlerMethod.AppendLine("                    {");
 
@@ -294,7 +299,7 @@ private static string BuildHandlerBody(WebApiAssemblyVisitor.ServiceOperationReg
         }
 
         handlerMethod.AppendLine(
-            $"                        var api = new global::{registration.Class.TypeName.FullName}({callingParameters});");
+            $"                        var api = new {registration.Class.TypeName.FullName}({callingParameters});");
         var asyncAwait = registration.IsAsync
             ? "await "
             : string.Empty;
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api/Tools.Generators.Web.Api.csproj b/src/Framework/Tools/Tools.Generators.Web.Api/Tools.Generators.Web.Api.csproj
@@ -38,6 +38,9 @@
         <Compile Include="..\..\Common\Extensions\ObjectExtensions.cs">
             <Link>Reference\Common\Extensions\ObjectExtensions.cs</Link>
         </Compile>
+        <Compile Include="..\..\Infrastructure\Infrastructure.Interfaces\ICallerContextFactory.cs">
+            <Link>Reference\Infrastructure.Interfaces\ICallerContextFactory.cs</Link>
+        </Compile>
         <Compile Include="..\..\Infrastructure\Infrastructure.Web.Api.Interfaces\IWebApiService.cs">
             <Link>Reference\Infrastructure.Web.Api.Interfaces\IWebApiService.cs</Link>
         </Compile>
diff --git a/src/Framework/Tools/Tools.Generators.Web.Api/WebApiAssemblyVisitor.cs b/src/Framework/Tools/Tools.Generators.Web.Api/WebApiAssemblyVisitor.cs
@@ -1,6 +1,7 @@
 using Common.Extensions;
 using Infrastructure.Web.Api.Interfaces;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Tools.Generators.Web.Api.Extensions;
 
 namespace Tools.Generators.Web.Api;
@@ -31,8 +32,8 @@ public class WebApiAssemblyVisitor : SymbolVisitor
     private readonly INamedTypeSymbol _baseApiAttributeSymbol;
     private readonly CancellationToken _cancellationToken;
     private readonly INamedTypeSymbol _cancellationTokenSymbol;
-    private readonly INamedTypeSymbol _multipartFormDataSymbol;
     private readonly INamedTypeSymbol _formUrlEncodedSymbol;
+    private readonly INamedTypeSymbol _multipartFormDataSymbol;
     private readonly INamedTypeSymbol _routeAttributeSymbol;
     private readonly INamedTypeSymbol _serviceInterfaceSymbol;
     private readonly INamedTypeSymbol _tenantedWebRequestInterfaceSymbol;
@@ -193,12 +194,8 @@ private void AddRegistration(INamedTypeSymbol symbol)
             var operationAuthorization = FromAuthorizeAttribute(authorizeAttributes);
             var isTestingOnly = bool.Parse(routeAttributeParameters[3].Value!.ToString()!);
             var requestType = method.Parameters[0].Type;
-            var requestTypeName = requestType.Name;
-            var requestTypeNamespace = requestType.ContainingNamespace.ToDisplayString();
             var requestTypeIsMultiTenanted = requestType.IsDerivedFrom(_tenantedWebRequestInterfaceSymbol);
             var responseType = GetResponseType(method.Parameters[0].Type);
-            var responseTypeName = responseType.Name;
-            var responseTypeNamespace = responseType.ContainingNamespace.ToDisplayString();
             var methodBody = method.GetMethodBody();
             var methodName = method.Name;
             var isAsync = method.IsAsync;
@@ -209,9 +206,9 @@ private void AddRegistration(INamedTypeSymbol symbol)
             OperationRegistrations.Add(new ServiceOperationRegistration
             {
                 Class = classRegistration,
-                RequestDto = new TypeName(requestTypeNamespace, requestTypeName),
+                RequestDto = new TypeName(requestType),
                 IsRequestDtoTenanted = requestTypeIsMultiTenanted,
-                ResponseDto = new TypeName(responseTypeNamespace, responseTypeName),
+                ResponseDto = new TypeName(responseType),
                 OperationMethod = operationType,
                 OperationAccess = operationAccess,
                 OperationAuthorization = operationAuthorization,
@@ -240,7 +237,7 @@ private void AddRegistration(INamedTypeSymbol symbol)
 
         TypeName GetServiceName()
         {
-            return new TypeName(symbol.ContainingNamespace.ToDisplayString(), symbol.Name);
+            return new TypeName(symbol);
         }
 
         static OperationMethod FromOperationVerb(string? operation)
@@ -354,7 +351,7 @@ List<Constructor> GetConstructors()
                     IsInjectionCtor = isInjectionCtor,
                     CtorParameters = constructor.Parameters.Select(param => new ConstructorParameter
                         {
-                            TypeName = new TypeName(param.Type.ContainingNamespace.ToDisplayString(), param.Type.Name),
+                            TypeName = new TypeName(param),
                             VariableName = param.Name
                         })
                         .ToList(),
@@ -473,10 +470,10 @@ public record ServiceOperationRegistration
 
         public bool IsAsync { get; set; }
 
-        public bool IsMultipartFormData { get; set; }
-
         public bool IsFormUrlEncoded { get; set; }
 
+        public bool IsMultipartFormData { get; set; }
+
         public bool IsRequestDtoTenanted { get; set; }
 
         public bool IsTestingOnly { get; set; }
@@ -510,13 +507,49 @@ public OperationAuthorization(string policyName)
 
     public record TypeName
     {
-        public TypeName(string @namespace, string name)
+        public TypeName(IParameterSymbol symbol) : this(symbol, symbol.Type.ContainingNamespace.ToDisplayString(), symbol.Type.Name)
+        {
+        }
+
+        public TypeName(ITypeSymbol symbol) : this(symbol, symbol.ContainingNamespace.ToDisplayString(), symbol.Name)
+        {
+        }
+
+        public TypeName(INamedTypeSymbol symbol) : this(symbol, symbol.ContainingNamespace.ToDisplayString(),
+            symbol.Name)
         {
-            Namespace = @namespace;
+        }
+
+        private TypeName(ISymbol symbol, string @namespace, string name)
+        {
+            if (IsAliasedNamespace(symbol, @namespace, out var alias))
+            {
+                Namespace = $"{alias}::{@namespace}";
+                IsAliased = true;
+            }
+            else
+            {
+                Namespace = @namespace;
+                IsAliased = false;
+            }
+
             Name = name;
         }
 
-        public string FullName => $"{Namespace}.{Name}";
+        public string FullName
+        {
+            get
+            {
+                if (IsAliased)
+                {
+                    return $"{Namespace}.{Name}";
+                }
+
+                return $"global::{Namespace}.{Name}";
+            }
+        }
+
+        public bool IsAliased { get; }
 
         public string Name { get; }
 
@@ -534,7 +567,7 @@ public virtual bool Equals(TypeName? other)
                 return true;
             }
 
-            return Name == other.Name && Namespace == other.Namespace;
+            return Name == other.Name && Namespace == other.Namespace && IsAliased == other.IsAliased;
         }
 
         public override int GetHashCode()
@@ -543,11 +576,51 @@ public override int GetHashCode()
             var hash = 17;
             hash = hash * 23 + Namespace.GetHashCode();
             hash = hash * 23 + Name.GetHashCode();
+            hash = hash * 23 + IsAliased.GetHashCode();
             return hash;
 #else
-            return HashCode.Combine(Namespace, Name);
+            return HashCode.Combine(Namespace, Name, IsAliased);
 #endif
         }
+
+        private static bool IsAliasedNamespace(ISymbol symbol, string @namespace, out string alias)
+        {
+            alias = null!;
+            var syntaxReference = symbol.DeclaringSyntaxReferences.IsDefaultOrEmpty
+                ? null
+                : symbol.DeclaringSyntaxReferences.FirstOrDefault();
+            if (syntaxReference is null)
+            {
+                return false;
+            }
+
+            var syntax = syntaxReference.SyntaxTree.GetRoot();
+            if (syntax.NotExists())
+            {
+                return false;
+            }
+
+            var aliases = syntax
+                .DescendantNodes()
+                .OfType<UsingDirectiveSyntax>()
+                .Select(s => s.Name!.ToString())
+                .Distinct()
+                .Where(s => s.Contains("::"))
+                .ToDictionary(pair => pair.Substring(pair.IndexOf("::", StringComparison.Ordinal) + 2),
+                    pair => pair.Substring(0, pair.IndexOf("::", StringComparison.Ordinal)));
+            if (!aliases.HasAny())
+            {
+                return false;
+            }
+
+            if (!aliases.TryGetValue(@namespace, out var found))
+            {
+                return false;
+            }
+
+            alias = found;
+            return true;
+        }
     }
 
     public record ApiServiceClassRegistration
diff --git a/src/Hosts/ApiHost1/Generated/Tools.Generators.Web.Api/Tools.Generators.Web.Api.MinimalApiGenerator/MinimalApiGeneratedHandlers.g.cs b/src/Hosts/ApiHost1/Generated/Tools.Generators.Web.Api/Tools.Generators.Web.Api.MinimalApiGenerator/MinimalApiGeneratedHandlers.g.cs
diff --git a/src/SaaStack.sln b/src/SaaStack.sln

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +namespace Tools.Generators.Web.Api.UnitTests.TestData.ADirectory;
++
 +public interface INestedAliasedDependency
 +{
++
 +}