Merge pull request #20 from Cabazure/alias-support

Add support for using aliases

Author: rickykaare

.github/workflows/release.yml

@@ -54,15 +54,6 @@ jobs:
           reporter: dotnet-trx
           fail-on-error: true
 
-      - name: 📋 Test Report
-        uses: dorny/test-reporter@v1
-        if: always()
-        with:
-          name: Test Report
-          path: "**/test-results.trx"
-          reporter: dotnet-trx
-          fail-on-error: true
-
       - name: 📭 Restore coverage history
         uses: dawidd6/action-download-artifact@v6
         with:

Cabazure.Client.sln

@@ -16,6 +16,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9FD398E9-51D6-4C0E-AD0A-D85A4B9D014F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{115ACFA6-5271-4A7B-844D-FFEA0A4F6BB7}"
+	ProjectSection(SolutionItems) = preProject
+		test\.editorconfig = test\.editorconfig
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{3932F1A3-4272-4E08-83F6-E1EB7DCED0FC}"
 EndProject
@@ -27,6 +30,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureRest.Contracts", "samp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureRest.TestApp", "samples\AzureRest\AzureRest.TestApp\AzureRest.TestApp.csproj", "{CF5F841E-FC86-441D-8075-49EA5F280AB8}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		Directory.Build.props = Directory.Build.props
+		LICENSE = LICENSE
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\ci.yml = .github\workflows\ci.yml
+		.github\workflows\release-preview.yml = .github\workflows\release-preview.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +99,7 @@ Global
 		{469837C7-D9B8-4867-A1CD-747DBA16213B} = {D2D03799-0BB4-45C1-9D35-60F364C154EE}
 		{C19CB361-795D-49FF-8821-E4C739EE5020} = {D2D03799-0BB4-45C1-9D35-60F364C154EE}
 		{CF5F841E-FC86-441D-8075-49EA5F280AB8} = {D2D03799-0BB4-45C1-9D35-60F364C154EE}
+		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3DD1DF42-FFAB-4F35-B264-B128D2778D40}

src/Cabazure.Client/ClientEndpointGenerator.cs

@@ -38,20 +38,21 @@ private static void ProcessEndpoint(
 
         var usingStatements = endpoint
             .Usings
-            .Append("System.Net")
-            .Append("System.Net.Http")
-            .Append("Cabazure.Client")
-            .Append("Cabazure.Client.Builder")
-            .Where(us => us != endpoint.Namespace)
+            .Append("using System.Net;")
+            .Append("using System.Net.Http;")
+            .Append("using Cabazure.Client;")
+            .Append("using Cabazure.Client.Builder;")
+            .Where(us => us != $"using {endpoint.Namespace};")
             .Distinct()
-            .OrderByDescending(us => us.StartsWith("System", StringComparison.Ordinal))
+            .OrderByDescending(us => us.StartsWith("using System", StringComparison.Ordinal))
+            .ThenBy(us => us.Contains('='))
             .ThenBy(us => us)
             .ToArray();
         if (usingStatements.Length > 0)
         {
             foreach (var us in usingStatements)
             {
-                source.AppendLine($"using {us};");
+                source.AppendLine(us);
             }
             source.AppendLine();
         }
@@ -171,7 +172,7 @@ private static void GenerateEndpointMethod(
                 """;
 
         var parameters = string.Join(
-            ",", 
+            ",",
             method.Parameters.Select(p => $"\n{indention}        {p}"));
 
         source.AppendLine();

src/Cabazure.Client/Descriptors/EndpointDescriptor.cs

@@ -54,7 +54,8 @@ public record EndpointDescriptor(
 
         var usings = @interface
             .GetUsings()
-            .Select(u => u.Name?.ToString())
+            .ToArray()
+            .Select(u => u.ToString())
             .OfType<string>()
             .ToImmutableArray();
 

test/Cabazure.Client.Tests/ClientEndpointGeneratorTests.CanGenerate_UsingAliases#TestEndpoint.g.verified.cs

@@ -0,0 +1 @@
+

test/Cabazure.Client.Tests/ClientEndpointGeneratorTests.CanGenerate_Using_Alias#TestEndpoint.g.verified.cs

@@ -0,0 +1,46 @@
+//HintName: TestEndpoint.g.cs
+// <auto-generated/>
+#nullable enable
+using System.Net;
+using System.Net.Http;
+using Cabazure.Client;
+using Cabazure.Client.Builder;
+using TypeAlias = System.Text.Json.Nodes.JsonArray;
+
+internal partial class TestEndpoint : ITestEndpoint
+{
+    private readonly IHttpClientFactory factory;
+    private readonly IMessageRequestFactory requestFactory;
+
+    public TestEndpoint(
+        IHttpClientFactory factory,
+        IMessageRequestFactory requestFactory)
+    {
+        this.factory = factory;
+        this.requestFactory = requestFactory;
+    }
+
+    public async Task<EndpointResponse> ExecuteAsync(
+        TypeAlias body,
+        ClientRequestOptions options,
+        CancellationToken cancellationToken)
+    {
+        var client = factory.CreateClient("ClientName");
+
+        using var requestMessage = requestFactory
+            .FromTemplate("ClientName", "/items")
+            .WithBody(body)
+            .WithRequestOptions(options)
+            .Build(HttpMethod.Get);
+
+        using var response = await client
+            .WithRequestOptions(options)
+            .SendAsync(requestMessage, cancellationToken);
+
+        return await requestFactory
+            .FromResponse("ClientName", response)
+            .AddSuccessResponse(HttpStatusCode.OK)
+            .GetAsync(cancellationToken);
+    }
+}
+#nullable disable

test/Cabazure.Client.Tests/ClientEndpointGeneratorTests.cs

@@ -287,4 +287,20 @@ public Task<EndpointResponse<string[]>> ExecuteAsync(
                     CancellationToken cancellationToken);
             }
             """);
+
+    [Fact]
+    public Task CanGenerate_Using_Alias()
+        => TestHelper.VerifyEndpoint("""
+            using TypeAlias = System.Text.Json.Nodes.JsonArray;
+
+            [ClientEndpoint("ClientName")]
+            public interface ITestEndpoint
+            {
+                [Get("/items")]
+                public Task<EndpointResponse> ExecuteAsync(
+                    [Body] TypeAlias body,
+                    ClientRequestOptions options,
+                    CancellationToken cancellationToken);
+            }
+            """);
 }