Starting to test source gen

shinyorg · Jun 1, 2024 · 23ac3ba · 23ac3ba
1 parent 4ca2e91
commit 23ac3ba
Show file tree

Hide file tree

Showing 19 changed files with 84 additions and 23 deletions.
diff --git a/Build.slnf b/Build.slnf
@@ -5,7 +5,8 @@
       "src\\Shiny.Mediator\\Shiny.Mediator.csproj",
       "src\\Shiny.Mediator.Contracts\\Shiny.Mediator.Contracts.csproj",
       "src\\Shiny.Mediator.Blazor\\Shiny.Mediator.Blazor.csproj",
-      "src\\Shiny.Mediator.Maui\\Shiny.Mediator.Maui.csproj"
+      "src\\Shiny.Mediator.Maui\\Shiny.Mediator.Maui.csproj",
+      "src\\Shiny.Mediator.SourceGenerators\\Shiny.Mediator.SourceGenerators.csproj"
     ]
   }
 }
diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj
@@ -22,7 +22,7 @@
         <ApplicationVersion>1</ApplicationVersion>
 
         <ShinyVersion>3.3.3</ShinyVersion>
-
+        <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
         <!--slower build, faster runtime in DEBUG-->
         <!-- <_MauiForceXamlCForDebug Condition="'$(Configuration)' == 'Debug'">true</_MauiForceXamlCForDebug> -->
     </PropertyGroup>

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

diff --git a/ShinyMediator.sln b/ShinyMediator.sln
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{F3
 		src\Directory.build.props = src\Directory.build.props
 		src\Directory.build.targets = src\Directory.build.targets
 		src\nuget.txt = src\nuget.txt
+		Build.slnf = Build.slnf
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shiny.Mediator.SourceGenerators", "src\Shiny.Mediator.SourceGenerators\Shiny.Mediator.SourceGenerators.csproj", "{DC52EE6B-CE7D-4711-9BF9-A174E20B3D77}"

diff --git a/readme.md b/readme.md
@@ -28,6 +28,8 @@ and dependency injection can't reach.
 
 ## Getting Started
 
+Install [Shiny.Mediator](https://www.nuget.org/packages/Shiny.Mediator) from NuGet
+
 First, let's create our request & event handlers
 
 ```

diff --git a/src/Shiny.Mediator.Blazor/Shiny.Mediator.Blazor.csproj b/src/Shiny.Mediator.Blazor/Shiny.Mediator.Blazor.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.5"/>
-         <ProjectReference Include="..\Shiny.Mediator.Contracts\Shiny.Mediator.Contracts.csproj" />
+        <ProjectReference Include="..\Shiny.Mediator\Shiny.Mediator.csproj"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/Shiny.Mediator.Contracts/Shiny.Mediator.Contracts.csproj b/src/Shiny.Mediator.Contracts/Shiny.Mediator.Contracts.csproj
@@ -1,14 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Shiny.Mediator</RootNamespace>
     </PropertyGroup>
-
-<!--    <ItemGroup>-->
-<!--        <ProjectReference Include="..\Shiny.Mediator.SourceGenerators\Shiny.Mediator.SourceGenerators.csproj"/>-->
-<!--    </ItemGroup>-->
-
 </Project>
diff --git a/src/Shiny.Mediator.Maui/Shiny.Mediator.Maui.csproj b/src/Shiny.Mediator.Maui/Shiny.Mediator.Maui.csproj
@@ -7,9 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <!--<PackageReference Include="Microsoft.Maui.Core" Version="8.0.40" />-->
         <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.40" />
-        <ProjectReference Include="..\Shiny.Mediator.Contracts\Shiny.Mediator.Contracts.csproj"/>
+        <ProjectReference Include="..\Shiny.Mediator\Shiny.Mediator.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Shiny.Mediator.SourceGenerators/MediatorSourceGenerator.cs b/src/Shiny.Mediator.SourceGenerators/MediatorSourceGenerator.cs
@@ -16,13 +16,14 @@ public void Initialize(GeneratorInitializationContext context)
     {
         context.RegisterForPostInitialization(x => x.AddSource("RegisterHandlerAttribute.g.cs", SourceText.From(
             """
-            namespace Shiny.Mediator;
-
-            [System.AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
-            public class RegisterHandlerAttribute : System.Attribute {}
+            namespace Shiny.Mediator
+            {
+                [System.AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
+                public class RegisterHandlerAttribute : System.Attribute {}
+            }
             """
         )));
-       context.RegisterForSyntaxNotifications(() => syntaxReceiver);
+       // context.RegisterForSyntaxNotifications(() => syntaxReceiver);
     }
 
 

diff --git a/src/Shiny.Mediator.SourceGenerators/Shiny.Mediator.SourceGenerators.csproj b/src/Shiny.Mediator.SourceGenerators/Shiny.Mediator.SourceGenerators.csproj
@@ -2,8 +2,8 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <DevelopmentDependency>true</DevelopmentDependency>
         <LangVersion>latest</LangVersion>
+        <IsPackable>false</IsPackable>
         <IsRoslynComponent>true</IsRoslynComponent>
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     </PropertyGroup>
@@ -14,9 +14,4 @@
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" PrivateAssets="All" />
         <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
     </ItemGroup>
-
-    <ItemGroup>
-        <None Include="build\**" PackagePath="buildTransitive\" Pack="true" />
-        <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
-    </ItemGroup>
 </Project>
diff --git a/...Shiny.Mediator.Contracts/IErrorHandler.cs → src/Shiny.Mediator/IErrorHandler.cs b/...Shiny.Mediator.Contracts/IErrorHandler.cs → src/Shiny.Mediator/IErrorHandler.cs
diff --git a/...iny.Mediator.Contracts/IEventCollector.cs → src/Shiny.Mediator/IEventCollector.cs b/...iny.Mediator.Contracts/IEventCollector.cs → src/Shiny.Mediator/IEventCollector.cs
diff --git a/...Shiny.Mediator.Contracts/IEventHandler.cs → src/Shiny.Mediator/IEventHandler.cs b/...Shiny.Mediator.Contracts/IEventHandler.cs → src/Shiny.Mediator/IEventHandler.cs
diff --git a/src/Shiny.Mediator.Contracts/IMediator.cs → src/Shiny.Mediator/IMediator.cs b/src/Shiny.Mediator.Contracts/IMediator.cs → src/Shiny.Mediator/IMediator.cs
diff --git a/...iny.Mediator.Contracts/IRequestHandler.cs → src/Shiny.Mediator/IRequestHandler.cs b/...iny.Mediator.Contracts/IRequestHandler.cs → src/Shiny.Mediator/IRequestHandler.cs
diff --git a/src/Shiny.Mediator/Shiny.Mediator.csproj b/src/Shiny.Mediator/Shiny.Mediator.csproj
@@ -8,10 +8,19 @@
 
     <ItemGroup>
         <ProjectReference Include="..\Shiny.Mediator.Contracts\Shiny.Mediator.Contracts.csproj" />
+        <ProjectReference Include="..\Shiny.Mediator.SourceGenerators\Shiny.Mediator.SourceGenerators.csproj"
+                          OutputItemType="Analyzer"
+                          ReferenceOutputAssembly="false" />
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     </ItemGroup>
 
+    <ItemGroup>
+        <None Include="..\Shiny.Mediator.SourceGenerators\bin\$(Configuration)\netstandard2.0\Shiny.Mediator.SourceGenerators.dll" 
+              Pack="true" 
+              PackagePath="analyzers/dotnet/cs" 
+              Visible="false" />
+    </ItemGroup>
 </Project>
diff --git a/src/Shiny.Mediator/build/Package.targets b/src/Shiny.Mediator/build/Package.targets
@@ -0,0 +1,5 @@
+<Project>
+    <ItemGroup Condition=" '$(ImplicitUsings)' == 'true' OR '$(ImplicitUsings)' == 'enable' ">
+        <Using Include="Shiny.Mediator" />
+    </ItemGroup>    
+</Project>
diff --git a/tests/Shiny.Mediator.Tests/Shiny.Mediator.Tests.csproj b/tests/Shiny.Mediator.Tests/Shiny.Mediator.Tests.csproj
@@ -4,9 +4,17 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+        <!--<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GF</CompilerGeneratedFilesOutputPath>-->
+<!--        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>-->
+<!--        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>-->
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.1" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" PrivateAssets="all" />
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="xunit" Version="2.8.1" />
@@ -17,6 +25,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Shiny.Mediator\Shiny.Mediator.csproj" />
+        <ProjectReference Include="..\..\src\Shiny.Mediator\Shiny.Mediator.csproj" />
+        <ProjectReference Include="..\..\src\Shiny.Mediator.SourceGenerators\Shiny.Mediator.SourceGenerators.csproj"
+                          ReferenceOutputAssembly="false"
+                          OutputItemType="Analyzer" />
     </ItemGroup>
 </Project>
diff --git a/tests/Shiny.Mediator.Tests/SourceGeneratorTests.cs b/tests/Shiny.Mediator.Tests/SourceGeneratorTests.cs
@@ -0,0 +1,42 @@
+// using FluentAssertions;
+// using Shiny.Mediator;
+//
+// namespace Shiny.Mediator.Tests;
+//
+// public class SourceGeneratorTests
+// {
+//     [Fact]
+//     public void DidRegister()
+//     {
+//         var services = new ServiceCollection();
+//         services.AddShinyMediator();
+//         // TODO: source gen call
+//         var sp = services.BuildServiceProvider();
+//
+//         sp.GetService<IEventHandler<SourceGenEvent>>().Should().NotBeNull("Event Handler not found");
+//         sp.GetService<IRequestHandler<SourceGenRequest>>().Should().NotBeNull("Request Handler not found");
+//         sp.GetService<IRequestHandler<SourceGenResponseRequest, SourceGenResponse>>().Should().NotBeNull("Request/Response Handler not found");
+//     }
+// }
+//
+// public record SourceGenRequest : IRequest;
+// public record SourceGenResponseRequest : IRequest<SourceGenResponse>;
+// public record SourceGenResponse;
+// public record SourceGenEvent : IEvent;
+//
+// [RegisterHandler]
+// public class SourceGenRequestHandler : IRequestHandler<SourceGenRequest>
+// {
+//     public Task Handle(SourceGenRequest request, CancellationToken cancellationToken) => Task.CompletedTask;
+// }
+// [RegisterHandler]
+// public class SourceGenResponseRequestHandler : IRequestHandler<SourceGenResponseRequest, SourceGenResponse>
+// {
+//     public Task<SourceGenResponse> Handle(SourceGenResponseRequest request, CancellationToken cancellationToken)
+//         => Task.FromResult(new SourceGenResponse());
+// }
+// [RegisterHandler]
+// public class SourceGenEventHandler : IEventHandler<SourceGenEvent>
+// {
+//     public Task Handle(SourceGenEvent @event, CancellationToken cancellationToken) => Task.CompletedTask;
+// }
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,8 @@ and dependency injection can't reach. @@
     ## Getting Started
+    Install [Shiny.Mediator](https://www.nuget.org/packages/Shiny.Mediator) from NuGet
     First, let's create our request & event handlers
     ```
@@ Expand Down @@