Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions doc/AutoWasm版本日志.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# 版本功能更新记录

## v2026.05.15
- 🛠`ApiInvoker` -> `ApiClient`
- 🛠重构`WebControllerGenerator`代码,支持`MinimalApi`模式(默认)
```csharp

[assembly: WebControllerAssembly(Mode = ApiMode.Controller)]
[assembly: WebControllerAssembly]

// minimal api 模式
app.MapAutoWasmApiEndPoints();
// controller 模式
app.MapControllers();
```

## v2026.02.12
- ⚡️方法标注`WebMethodNotSupportedAttribute`时,理应同时处理为`ApiInvokeNotSupported`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//namespace AutoWasmApiGenerator;

//[Generator(LanguageNames.CSharp)]
//public class ApiInvokeErrorResultGenerator : IIncrementalGenerator
//public class ApiClientErrorResultGenerator : IIncrementalGenerator
//{
// public void Initialize(IncrementalGeneratorInitializationContext context)
// {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@
namespace AutoWasmApiGenerator
{
[Generator(LanguageNames.CSharp)]
public class ApiInvokerGenerator : IIncrementalGenerator
public class ApiClientGenerator : IIncrementalGenerator
{
private const string CUSTOM_JSON_OPTION = "AutoWasmApiGenerator.AutoWasmApiGeneratorJsonHelper.Option";

public void Initialize(IncrementalGeneratorInitializationContext context)
{
//var list = context.SyntaxProvider.ForAttributeWithMetadataName(
// ApiInvokerAssemblyAttributeFullName,
// ApiClientAssemblyAttributeFullName,
// static (node, token) => true,
// static (c, t) => c);

context.RegisterSourceOutput(context.CompilationProvider, static (context, compilation) =>
{
try
{
if (!compilation.Assembly.HasAttribute(ApiInvokerAssemblyAttributeFullName))
if (!compilation.Assembly.HasAttribute(ApiClientAssemblyAttributeFullName))
{
return;
}
_ = compilation.Assembly.GetAttribute(ApiInvokerAssemblyAttributeFullName, out var asmAttributeData);
_ = compilation.Assembly.GetAttribute(ApiClientAssemblyAttributeFullName, out var asmAttributeData);
var all = compilation.GetAllSymbols(WebControllerAttributeFullName);
foreach (var item in all)
{
Expand All @@ -54,7 +54,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
id: "ERROR00001",
title: "生成错误",
messageFormat: ex.Message,
category: typeof(ApiInvokerGenerator).FullName!,
category: typeof(ApiClientGenerator).FullName!,
defaultSeverity: DiagnosticSeverity.Warning,
isEnabledByDefault: true
), Location.None));
Expand Down Expand Up @@ -98,7 +98,7 @@ private static bool CreateCodeFile(INamedTypeSymbol interfaceSymbol
members.AddRange(fields);
members.Add(constructor);

file = CodeFile.New($"{interfaceSymbol.FormatFileName()}ApiInvoker.g.cs")
file = CodeFile.New($"{interfaceSymbol.FormatFileName()}ApiClient.g.cs")
.AddUsings("using Microsoft.Extensions.DependencyInjection;")
.AddMembers(ns.AddMembers(invokeClass.AddMembers([.. members])));

Expand Down Expand Up @@ -127,7 +127,7 @@ private static (MethodBuilder?, Diagnostic?) BuildMethod(INamedTypeSymbol iSymbo
.Generic([.. methodSymbol.GetTypeParameters()])
.ReturnType(methodSymbol.ReturnType.ToDisplayString())
.AddParameter([.. methodSymbol.Parameters.Select(p => $"{p.Type.ToDisplayString()} {p.Name}")])
.AddGeneratedCodeAttribute(typeof(ApiInvokerGenerator))
.AddGeneratedCodeAttribute(typeof(ApiClientGenerator))
.Lambda("throw new global::System.NotSupportedException()");
return (b, null);
}
Expand Down Expand Up @@ -489,7 +489,7 @@ string CheckFieldNameAndType(IFieldSymbol field)
.Async()
.ReturnType(methodSymbol.ReturnType.ToDisplayString())
.AddParameter([.. methodSymbol.Parameters.Select(p => $"{p.Type.ToDisplayString()} {p.Name}")])
.AddGeneratedCodeAttribute(typeof(ApiInvokerGenerator))
.AddGeneratedCodeAttribute(typeof(ApiClientGenerator))
.AddBody([.. statements]);
return (builder, null);
}
Expand Down Expand Up @@ -589,7 +589,7 @@ private static IEnumerable<FieldBuilder> BuildField()
.MemberType("global::System.Net.Http.IHttpClientFactory")
.FieldName("clientFactory");
yield return FieldBuilder.Default
.MemberType("global::AutoWasmApiGenerator.IGeneratedApiInvokeDelegatingHandler")
.MemberType("global::AutoWasmApiGenerator.IGeneratedApiClientDelegatingHandler")
.FieldName("delegatingHandler");
yield return FieldBuilder.Default
.MemberType("global::System.IServiceProvider")
Expand All @@ -606,31 +606,31 @@ private static ConstructorBuilder BuildConstructor(INamedTypeSymbol classSymbol)

parameters.Add("global::System.IServiceProvider services");
body.Add("serviceProvider = services");
body.Add("delegatingHandler = services.GetService<global::AutoWasmApiGenerator.IGeneratedApiInvokeDelegatingHandler>() ?? global::AutoWasmApiGenerator.GeneratedApiInvokeDelegatingHandler.Default");
body.Add("delegatingHandler = services.GetService<global::AutoWasmApiGenerator.IGeneratedApiClientDelegatingHandler>() ?? global::AutoWasmApiGenerator.GeneratedApiClientDelegatingHandler.Default");


return ConstructorBuilder.Default
.MethodName($"{FormatClassName(classSymbol.MetadataName)}ApiInvoker")
.MethodName($"{FormatClassName(classSymbol.MetadataName)}ApiClient")
.AddParameter([.. parameters])
.AddBody([.. body]);
}

private static ClassBuilder CreateHttpClassBuilder(INamedTypeSymbol interfaceSymbol)
{
// IEnumerable<string> additionalAttribute = [];
// if (interfaceSymbol.GetAttribute(ApiInvokerAttributeFullName, out var data))
// if (interfaceSymbol.GetAttribute(ApiClientAttributeFullName, out var data))
// {
// //var o = data.GetAttributeValue(nameof(ApiInvokerGeneraAttribute.Attribute));
// additionalAttribute = interfaceSymbol.GetAttributeInitInfo(ApiInvokerAttributeFullName, data!);
// //var o = data.GetAttributeValue(nameof(ApiClientGeneraAttribute.Attribute));
// additionalAttribute = interfaceSymbol.GetAttributeInitInfo(ApiClientAttributeFullName, data!);
// }
var attchAttribute = "AutoWasmApiGenerator.Attributes.GeneratedByAutoWasmApiGeneratorAttribute";
(string, string?)[] attrParams = [
("InterfaceType", $"typeof({interfaceSymbol.ToDisplayString()})"),
("Part", "AutoWasmApiGenerator.Attributes.PartType.ApiInvoker")
("Part", "AutoWasmApiGenerator.Attributes.PartType.ApiClient")
];
return ClassBuilder.Default
.ClassName($"{FormatClassName(interfaceSymbol.MetadataName)}ApiInvoker")
.AddGeneratedCodeAttribute(typeof(ApiInvokerGenerator))
.ClassName($"{FormatClassName(interfaceSymbol.MetadataName)}ApiClient")
.AddGeneratedCodeAttribute(typeof(ApiClientGenerator))
.Attribute(attchAttribute, attrParams)
// .Attribute([.. additionalAttribute.Select(i => i.ToString())])
.BaseType(interfaceSymbol.ToDisplayString());
Expand Down
Loading
Loading