fix(source generators): resolve AsyncEnumerable issues of HttpClientP…

…roxyGenerator #6369 (#6370)
bitfoundation · Dec 21, 2023 · c122100 · c122100
1 parent 4701419
commit c122100
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 27 deletions.
diff --git a/src/SourceGenerators/Bit.SourceGenerators/HttpClientProxy/ControllerAction.cs b/src/SourceGenerators/Bit.SourceGenerators/HttpClientProxy/ControllerAction.cs
@@ -11,6 +11,8 @@ public class ControllerAction
 
     public bool DoesReturnSomething => ReturnType.ToDisplayString() is not "System.Threading.Tasks.Task" or "System.Threading.Tasks.ValueTask";
 
+    public bool DoesReturnIAsyncEnumerable => DoesReturnSomething && ReturnType.ToDisplayString().Contains("IAsyncEnumerable");
+
     public string HttpMethod { get; set; } = default!;
 
     public string Url { get; set; } = default!;

diff --git a/src/SourceGenerators/Bit.SourceGenerators/HttpClientProxy/HttpClientProxySourceGenerator.cs b/src/SourceGenerators/Bit.SourceGenerators/HttpClientProxy/HttpClientProxySourceGenerator.cs
@@ -46,8 +46,9 @@ public void Execute(GeneratorExecutionContext context)
             {{" : string.Empty)}
                 using var request = new HttpRequestMessage(HttpMethod.{action.HttpMethod}, url);
                 {(action.BodyParameter is not null ? $@"request.Content = JsonContent.Create({action.BodyParameter.Name}, options.GetTypeInfo<{action.BodyParameter.Type.ToDisplayString()}>());" : string.Empty)}
-                using var response = await httpClient.SendAsync(request{(action.HasCancellationToken ? $", {action.CancellationTokenParameterName}" : string.Empty)});
-                {(action.DoesReturnSomething ? ($"return await response.Content.ReadFromJsonAsync(options.GetTypeInfo<{action.ReturnType.GetUnderlyingType().ToDisplayString()}>(){(action.HasCancellationToken ? $", {action.CancellationTokenParameterName}" : string.Empty)});}}))!;") : string.Empty)}
+                {(action.DoesReturnIAsyncEnumerable ? "" : "using ")}var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead {(action.HasCancellationToken ? $", {action.CancellationTokenParameterName}" : string.Empty)});
+                {(action.DoesReturnSomething ? ($"return {(action.DoesReturnIAsyncEnumerable ? "" : "await")} response.Content.{(action.DoesReturnIAsyncEnumerable ? "ReadFromJsonAsAsyncEnumerable" : "ReadFromJsonAsync")}(options.GetTypeInfo<{action.ReturnType.GetUnderlyingType().ToDisplayString()}>(){(action.HasCancellationToken ? $", {action.CancellationTokenParameterName}" : string.Empty)});" +
+          $"}}))!;") : string.Empty)}
         }}
 ");
             }
@@ -114,7 +115,6 @@ public void AddQueryStrings(Dictionary<string, object?> queryString)
 
 }}
 ");
-
         context.AddSource($"HttpClientProxy.cs", finalSource.ToString());
     }
 }
diff --git a/src/SourceGenerators/Bit.SourceGenerators/HttpClientProxy/ITypeSymboExtensions.cs b/src/SourceGenerators/Bit.SourceGenerators/HttpClientProxy/ITypeSymboExtensions.cs
@@ -24,10 +24,16 @@ public static string GetHttpMethod(this IMethodSymbol method)
 
     public static ITypeSymbol GetUnderlyingType(this ITypeSymbol typeSymbol)
     {
-        return typeSymbol switch
+        if (typeSymbol is INamedTypeSymbol namedTypeSymbol)
         {
-            INamedTypeSymbol namedTypeSymbol => namedTypeSymbol.TypeArguments.FirstOrDefault() ?? namedTypeSymbol,
-            _ => typeSymbol
-        };
+            if (namedTypeSymbol.ToDisplayString().Contains("System.Collections.Generic.IAsyncEnumerable<"))
+            {
+                return namedTypeSymbol.TypeArguments.First().GetUnderlyingType();
+            }
+
+            return namedTypeSymbol.TypeArguments.FirstOrDefault() ?? namedTypeSymbol;
+        }
+
+        return typeSymbol;
     }
 }
diff --git a/...plate/Bit.Boilerplate/src/Boilerplate.Server/Controllers/Categories/CategoryController.cs b/...plate/Bit.Boilerplate/src/Boilerplate.Server/Controllers/Categories/CategoryController.cs
@@ -28,7 +28,7 @@ public async Task<PagedResult<CategoryDto>> GetCategories(ODataQueryOptions<Cate
         if (odataQuery.Top is not null)
             query = query.Take(odataQuery.Top.Value);
 
-        return new PagedResult<CategoryDto>(query.AsAsyncEnumerable(), totalCount);
+        return new PagedResult<CategoryDto>(await query.ToArrayAsync(cancellationToken), totalCount);
     }
 
     [HttpGet("{id}")]

diff --git a/...lerplate/Bit.Boilerplate/src/Boilerplate.Server/Controllers/Products/ProductController.cs b/...lerplate/Bit.Boilerplate/src/Boilerplate.Server/Controllers/Products/ProductController.cs
@@ -28,7 +28,7 @@ public async Task<PagedResult<ProductDto>> GetProducts(ODataQueryOptions<Product
         if (odataQuery.Top is not null)
             query = query.Take(odataQuery.Top.Value);
 
-        return new PagedResult<ProductDto>(query.AsAsyncEnumerable(), totalCount);
+        return new PagedResult<ProductDto>(await query.ToArrayAsync(cancellationToken), totalCount);
     }
 
     [HttpGet("{id}")]

diff --git a/...Boilerplate/Bit.Boilerplate/src/Boilerplate.Server/Controllers/Todo/TodoItemController.cs b/...Boilerplate/Bit.Boilerplate/src/Boilerplate.Server/Controllers/Todo/TodoItemController.cs
@@ -31,7 +31,7 @@ public async Task<PagedResult<TodoItemDto>> GetTodoItems(ODataQueryOptions<TodoI
         if (odataQuery.Top is not null)
             query = query.Take(odataQuery.Top.Value);
 
-        return new PagedResult<TodoItemDto>(query.AsAsyncEnumerable(), totalCount);
+        return new PagedResult<TodoItemDto>(await query.ToArrayAsync(cancellationToken), totalCount);
     }
 
     [HttpGet("{id}")]

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Boilerplate.Shared/Dtos/AppJsonContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Boilerplate.Shared/Dtos/AppJsonContext.cs
@@ -15,20 +15,17 @@ namespace Boilerplate.Shared.Dtos;
 [JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
 [JsonSerializable(typeof(Dictionary<string, object>))]
 [JsonSerializable(typeof(UserDto))]
-[JsonSerializable(typeof(List<UserDto>))]
 //#if (sample == "Todo")
 [JsonSerializable(typeof(TodoItemDto))]
-[JsonSerializable(typeof(List<TodoItemDto>))]
+[JsonSerializable(typeof(PagedResult<TodoItemDto>))]
 //#elif (sample == "Admin")
+[JsonSerializable(typeof(ProductsCountPerCategoryResponseDto))]
 [JsonSerializable(typeof(OverallAnalyticsStatsDataResponseDto))]
-[JsonSerializable(typeof(List<ProductsCountPerCategoryResponseDto>))]
-[JsonSerializable(typeof(List<ProductSaleStatResponseDto>))]
-[JsonSerializable(typeof(List<ProductPercentagePerCategoryResponseDto>))]
+[JsonSerializable(typeof(ProductSaleStatResponseDto))]
+[JsonSerializable(typeof(ProductPercentagePerCategoryResponseDto))]
 [JsonSerializable(typeof(ProductDto))]
-[JsonSerializable(typeof(List<ProductDto>))]
 [JsonSerializable(typeof(PagedResult<ProductDto>))]
 [JsonSerializable(typeof(CategoryDto))]
-[JsonSerializable(typeof(List<CategoryDto>))]
 [JsonSerializable(typeof(PagedResult<CategoryDto>))]
 //#endif
 [JsonSerializable(typeof(SignInRequestDto))]

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Boilerplate.Shared/Dtos/PagedResultDto.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Boilerplate.Shared/Dtos/PagedResultDto.cs
@@ -2,18 +2,14 @@
 
 public class PagedResult<T>
 {
-    public IAsyncEnumerable<T>? Items { get; set; }
+    public T[] Items { get; set; } = [];
 
     public long TotalCount { get; set; }
 
-    public PagedResult(IAsyncEnumerable<T> items, long totalCount)
+    [JsonConstructor]
+    public PagedResult(T[] items, long totalCount)
     {
         Items = items;
         TotalCount = totalCount;
     }
-
-    public PagedResult()
-    {
-
-    }
 }
diff --git a/...erplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppComponentBase.cs b/...erplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppComponentBase.cs
@@ -1,4 +1,6 @@
-namespace Boilerplate.Client.Core.Components;
+using System.Text.Json;
+
+namespace Boilerplate.Client.Core.Components;
 
 public partial class AppComponentBase : ComponentBase, IDisposable
 {
@@ -8,6 +10,8 @@ public partial class AppComponentBase : ComponentBase, IDisposable
 
     [AutoInject] protected HttpClient HttpClient = default!;
 
+    [AutoInject] protected JsonSerializerOptions JsonSerializerOptions = default!;
+
     /// <summary>
     /// <inheritdoc cref="IPrerenderStateService"/>
     /// </summary>

diff --git a/...te/src/Client/Boilerplate.Client.Core/Components/Pages/Categories/CategoriesPage.razor.cs b/...te/src/Client/Boilerplate.Client.Core/Components/Pages/Categories/CategoriesPage.razor.cs
@@ -62,7 +62,7 @@ private void PrepareGridDataProvider()
 
                 var data = await categoryController.GetCategories(CurrentCancellationToken);
 
-                return BitDataGridItemsProviderResult.From(await data.Items!.ToListAsync(CurrentCancellationToken)!, (int)data.TotalCount);
+                return BitDataGridItemsProviderResult.From(data.Items!, (int)data.TotalCount);
             }
             catch (Exception exp)
             {

diff --git a/...rplate/src/Client/Boilerplate.Client.Core/Components/Pages/Products/ProductsPage.razor.cs b/...rplate/src/Client/Boilerplate.Client.Core/Components/Pages/Products/ProductsPage.razor.cs
@@ -62,7 +62,7 @@ private void PrepareGridDataProvider()
 
                 var data = await productController.GetProducts(CurrentCancellationToken);
 
-                return BitDataGridItemsProviderResult.From(await data!.Items!.ToListAsync(), (int)data!.TotalCount);
+                return BitDataGridItemsProviderResult.From(data!.Items!, (int)data!.TotalCount);
             }
             catch (Exception exp)
             {

diff --git a/.../Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppRenderMode.cs b/.../Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppRenderMode.cs
@@ -1,3 +1,4 @@
+//-:cnd:noEmit
 using Microsoft.AspNetCore.Components.Web;
 
 namespace Boilerplate.Client.Core.Services;