Initial source generator working

shinyorg · Jun 7, 2024 · 4299b16 · 4299b16
1 parent fa8e91b
commit 4299b16
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 36 deletions.
diff --git a/Sample/MauiProgram.cs b/Sample/MauiProgram.cs
@@ -44,9 +44,7 @@ public static MauiApp CreateMauiApp()
             .UseMaui()
             .UseBlazor()
         );
-        builder.Services.AddSingletonAsImplementedInterfaces<SingletonEventHandler>();
-        builder.Services.AddSingletonAsImplementedInterfaces<SingletonRequestHandler>();
-        builder.Services.AddSingletonAsImplementedInterfaces<MyRequestMiddleware>();
+        builder.Services.AddDiscoveredMediatorHandlersFromSample();
 
         builder.Services.AddSingleton<AppSqliteConnection>();
         builder.Services.AddMauiBlazorWebView();

diff --git a/Sample/MyRequestMiddleware.cs b/Sample/MyRequestMiddleware.cs
@@ -3,7 +3,7 @@
 namespace Sample;
 
 
-// [RegisterMiddleware]
+[RegisterMiddleware]
 public class MyRequestMiddleware(AppSqliteConnection conn) : IRequestMiddleware<MyMessageRequest, MyMessageResponse>
 {
     public async Task<MyMessageResponse> Process(MyMessageRequest request, RequestHandlerDelegate<MyMessageResponse> next, IRequestHandler<MyMessageRequest, MyMessageResponse> requestHandler, CancellationToken cancellationToken)

diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj
@@ -103,7 +103,9 @@
         <ProjectReference Include="..\src\Shiny.Mediator.Blazor\Shiny.Mediator.Blazor.csproj" />
         <ProjectReference Include="..\src\Shiny.Mediator.Contracts\Shiny.Mediator.Contracts.csproj"/>
         <ProjectReference Include="..\src\Shiny.Mediator.Maui\Shiny.Mediator.Maui.csproj"/>
-        <ProjectReference Include="..\src\Shiny.Mediator.SourceGenerators\Shiny.Mediator.SourceGenerators.csproj"/>
         <ProjectReference Include="..\src\Shiny.Mediator\Shiny.Mediator.csproj"/>
+        <ProjectReference Include="..\src\Shiny.Mediator.SourceGenerators\Shiny.Mediator.SourceGenerators.csproj"
+                          OutputItemType="Analyzer"
+                          ReferenceOutputAssembly="false" />
     </ItemGroup>
 </Project>
diff --git a/Sample/SingletonEventHandler.cs b/Sample/SingletonEventHandler.cs
@@ -1,6 +1,7 @@
 namespace Sample;
 
 
+[RegisterHandler]
 public class SingletonEventHandler(IMediator mediator, AppSqliteConnection data) : IEventHandler<MyMessageEvent>
 {
     public async Task Handle(MyMessageEvent @event, CancellationToken cancellationToken)

diff --git a/Sample/SingletonRequestHandler.cs b/Sample/SingletonRequestHandler.cs
@@ -1,7 +1,7 @@
 namespace Sample;
 
 
-// [RegisterHandler]
+[RegisterHandler]
 public class SingletonRequestHandler(IMediator mediator, AppSqliteConnection data) : IRequestHandler<MyMessageRequest, MyMessageResponse>
 {
     public async Task<MyMessageResponse> Handle(MyMessageRequest request, CancellationToken cancellationToken)

diff --git a/src/Shiny.Mediator.SourceGenerators/Extensions.cs b/src/Shiny.Mediator.SourceGenerators/Extensions.cs
@@ -0,0 +1,13 @@
+using Microsoft.CodeAnalysis;
+
+namespace Shiny.Mediator.SourceGenerators;
+
+
+static class Extensions
+{
+    public static string? GetMSBuildProperty(this GeneratorExecutionContext context, string propertyName)
+    {
+        context.AnalyzerConfigOptions.GlobalOptions.TryGetValue($"build_property.{propertyName}", out var value);
+        return value;
+    }    
+}
diff --git a/src/Shiny.Mediator.SourceGenerators/MediatorSourceGenerator.cs b/src/Shiny.Mediator.SourceGenerators/MediatorSourceGenerator.cs
@@ -1,4 +1,6 @@
-using System.Text;
+using System;
+using System.Linq;
+using System.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 using SourceGeneratorsKit;
@@ -26,14 +28,14 @@ public void Initialize(GeneratorInitializationContext context)
                 #nullable disable
                 
                 [System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple = false)]
-                internal sealed class RegisterHandlerAttribute: System.Attribute
+                public sealed class RegisterHandlerAttribute: System.Attribute
                 {
-                    public RegisterHandlerAttribute(bool IsSingleton = true) {}
+                    public RegisterHandlerAttribute() {}
                 }
                 
-                internal sealed class RegisterMiddlewareAttribute: System.Attribute
+                public sealed class RegisterMiddlewareAttribute: System.Attribute
                 {
-                    public RegisterMiddlewareAttribute(bool IsSingleton = true) {}
+                    public RegisterMiddlewareAttribute() {}
                 }
                 """,
                 Encoding.UTF8
@@ -48,26 +50,31 @@ public void Execute(GeneratorExecutionContext context)
         if (!(context.SyntaxContextReceiver is SyntaxReceiver))
             return;
 
-        // TODO: detect double registration of request handlers
-        // TODO: I need the namespace to be the global namespace
+        // TODO: detect double registration of request handlers?
+        // TODO: scopes
+        // TODO: open middleware
         // TODO: this will be registered with multiple AddDiscoveredMediatorHandlers in the main app
-
+
+        var nameSpace = context.GetMSBuildProperty("RootNamespace") ?? context.Compilation.AssemblyName;
+        var assName = context.Compilation.AssemblyName?.Replace(".", "_");
+
         var sb = new StringBuilder();
         sb
-            .AppendLine("namespace Shiny.Mediator;")
+            .AppendLine($"namespace {nameSpace};")
             .AppendLine()
             .AppendLine("public static class __ShinyMediatorSourceGenExtensions {")
-            .AppendLine(
-                "\tpublic static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddDiscoveredMediatorHandlers(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services) {");
-
-        foreach (var classSymbol in this.syntaxReceiver.Classes)
-            sb.AppendLine($"\t\tservices.AddSingletonAsImplementedInterfaces<{classSymbol.ToDisplayString()}>();");
+            .AppendLine($"\tpublic static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddDiscoveredMediatorHandlersFrom{assName}(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services)")
+            .AppendLine("\t{");
+
+        var classes = this.syntaxReceiver.Classes.Select(x => x.ToDisplayString()).Distinct();
+        foreach (var cls in classes)
+            sb.AppendLine($"\t\tservices.AddSingletonAsImplementedInterfaces<{cls}>();");
 
         sb
-            .AppendLine("\treturn services;")
+            .AppendLine("\t\treturn services;")
             .AppendLine("\t}")
             .AppendLine("}");
 
-        context.AddSource("__MediatorHandlersRegistration.g.cs", SourceText.From(sb.ToString()));
+        context.AddSource("__MediatorHandlersRegistration.g.cs", SourceText.From(sb.ToString(), Encoding.UTF8));
     }
 }
diff --git a/src/Shiny.Mediator.SourceGenerators/RegisterHandlerAttributeSyntaxReceiver.cs b/src/Shiny.Mediator.SourceGenerators/RegisterHandlerAttributeSyntaxReceiver.cs
@@ -12,19 +12,20 @@ protected override bool ShouldCollectClassSymbol(INamedTypeSymbol classSymbol)
     {
         var hasAttribute = classSymbol.HasAttribute("RegisterHandlerAttribute");
         if (hasAttribute)
-        {
-            // TODO: log error
-            if (classSymbol.IsImplements("Shiny.Mediator.IEventHandler`1"))
-                return false;
-
-            if (classSymbol.IsImplements("Shiny.Mediator.IRequestHandler`1"))
-                return false;
-        }
-        hasAttribute = classSymbol.HasAttribute("RegisterMiddleware");
+            return true;
+        // if (hasAttribute)
+        // {
+        //     // TODO: log error
+        //     if (classSymbol.IsImplements("Shiny.Mediator.IEventHandler`1"))
+        //         return false;
+        //
+        //     if (classSymbol.IsImplements("Shiny.Mediator.IRequestHandler`1"))
+        //         return false;
+        // }
+        hasAttribute = classSymbol.HasAttribute("RegisterMiddlewareAttribute");
         if (hasAttribute)
-        {
             return true;
-        }
+
         return false;
     }
 }
diff --git a/src/Shiny.Mediator/Shiny.Mediator.csproj b/src/Shiny.Mediator/Shiny.Mediator.csproj
@@ -8,9 +8,9 @@
 
     <ItemGroup>
         <ProjectReference Include="..\Shiny.Mediator.Contracts\Shiny.Mediator.Contracts.csproj" />
-        <ProjectReference Include="..\Shiny.Mediator.SourceGenerators\Shiny.Mediator.SourceGenerators.csproj"
-                          OutputItemType="Analyzer"
-                          ReferenceOutputAssembly="false" />
+<!--        <ProjectReference Include="..\Shiny.Mediator.SourceGenerators\Shiny.Mediator.SourceGenerators.csproj"-->
+<!--                          OutputItemType="Analyzer"-->
+<!--                          ReferenceOutputAssembly="false" />-->
     </ItemGroup>
 
     <ItemGroup>