Add test project for GuidMapper and enhance converters in ClassVisitor and PropertyVisitor

machibuse · machibuse · commit 05e366e9870e · 2025-07-17T21:57:00.000+02:00
diff --git a/Source/Porticle.Grpc.GuidMapper.Tests/Class1.cs b/Source/Porticle.Grpc.GuidMapper.Tests/Class1.cs
@@ -0,0 +1,5 @@
+﻿namespace Porticle.Grpc.GuidMapper.Tests;
+
+public class Class1
+{
+}
diff --git a/Source/Porticle.Grpc.GuidMapper.Tests/Porticle.Grpc.GuidMapper.Tests.csproj b/Source/Porticle.Grpc.GuidMapper.Tests/Porticle.Grpc.GuidMapper.Tests.csproj
@@ -0,0 +1,9 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+</Project>
diff --git a/Source/Porticle.Grpc.GuidMapper/ClassVisitor.cs b/Source/Porticle.Grpc.GuidMapper/ClassVisitor.cs
@@ -25,9 +25,23 @@ public class ClassVisitor : CSharpSyntaxRewriter
         var propertyVisitor = new PropertyVisitor();
         node = (ClassDeclarationSyntax)propertyVisitor.Visit(node);
 
-        node = node.AddMembers(ClassFromSource(ListWrappers.RepeatedFieldGuidWrapper));
-        node = node.AddMembers(ClassFromSource(ListWrappers.RepeatedFieldNullableGuidWrapper));
-        node = node.AddMembers(ClassFromSource(ListWrappers.RepeatedFieldNullableStringWrapper));
+        if (propertyVisitor.NeedGuidConverter)
+        {
+            node = node.AddMembers(ClassFromSource(ListWrappers.RepeatedFieldGuidWrapper));
+        }
+        
+        if (propertyVisitor.NeedNullableGuidConverter)
+        {
+            node = node.AddMembers(ClassFromSource(ListWrappers.RepeatedFieldNullableGuidWrapper));
+        }
+        
+        if (propertyVisitor.NeedNullableStringConverter)
+        {
+            node = node.AddMembers(ClassFromSource(ListWrappers.RepeatedFieldNullableStringWrapper));
+        }
+        
+        
+        
         
         Console.WriteLine("Visit Methods for "+propertyVisitor.ReplaceProps.Count+" props");
         var methodVisitor = new MethodVisitor(propertyVisitor.ReplaceProps);
diff --git a/Source/Porticle.Grpc.GuidMapper/PropertyVisitor.cs b/Source/Porticle.Grpc.GuidMapper/PropertyVisitor.cs
@@ -78,6 +78,7 @@ public class PropertyVisitor : CSharpSyntaxRewriter
             {
                 if (isNullable)
                 {
+                    NeedNullableGuidConverter = true;
                     var newReturnExpression = SyntaxFactory.InvocationExpression(
                         SyntaxFactory.ParseExpression("new RepeatedFieldNullableGuidWrapper"), // Die Methode
                         SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(originalReturnExpression))));
@@ -89,6 +90,7 @@ public class PropertyVisitor : CSharpSyntaxRewriter
                 }
                 else
                 {
+                    NeedGuidConverter = true;
                     var newReturnExpression = SyntaxFactory.InvocationExpression(
                         SyntaxFactory.ParseExpression("new RepeatedFieldGuidWrapper"), // Die Methode
                         SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(originalReturnExpression))));
@@ -104,6 +106,7 @@ public class PropertyVisitor : CSharpSyntaxRewriter
             {
                 if (isNullable)
                 {
+                    NeedNullableStringConverter = true;
                     var newReturnExpression = SyntaxFactory.InvocationExpression(
                         SyntaxFactory.ParseExpression("new RepeatedFieldNullableStringWrapper"), // Die Methode
                         SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(originalReturnExpression))));
diff --git a/Source/Porticle.Grpc.sln b/Source/Porticle.Grpc.sln
@@ -2,6 +2,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Porticle.Grpc.GuidMapper", "Porticle.Grpc.GuidMapper\Porticle.Grpc.GuidMapper.csproj", "{5EF937F2-BE28-4634-A6D4-C7CACADCF1D7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Porticle.Grpc.GuidMapper.Tests", "Porticle.Grpc.GuidMapper.Tests\Porticle.Grpc.GuidMapper.Tests.csproj", "{FC37AFB0-CE1E-473B-B5A3-BFA678C4B770}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -12,5 +14,9 @@ Global
 		{5EF937F2-BE28-4634-A6D4-C7CACADCF1D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EF937F2-BE28-4634-A6D4-C7CACADCF1D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EF937F2-BE28-4634-A6D4-C7CACADCF1D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC37AFB0-CE1E-473B-B5A3-BFA678C4B770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC37AFB0-CE1E-473B-B5A3-BFA678C4B770}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC37AFB0-CE1E-473B-B5A3-BFA678C4B770}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC37AFB0-CE1E-473B-B5A3-BFA678C4B770}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +namespace Porticle.Grpc.GuidMapper.Tests;
++
 +public class Class1
 +{
 +}
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ public class PropertyVisitor : CSharpSyntaxRewriter`
`78`	`78`	`{`
`79`	`79`	`if (isNullable)`
`80`	`80`	`{`
	`81`	`+ NeedNullableGuidConverter = true;`
`81`	`82`	`var newReturnExpression = SyntaxFactory.InvocationExpression(`
`82`	`83`	`SyntaxFactory.ParseExpression("new RepeatedFieldNullableGuidWrapper"), // Die Methode`
`83`	`84`	`SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(originalReturnExpression))));`
`@@ -89,6 +90,7 @@ public class PropertyVisitor : CSharpSyntaxRewriter`
`89`	`90`	`}`
`90`	`91`	`else`
`91`	`92`	`{`
	`93`	`+ NeedGuidConverter = true;`
`92`	`94`	`var newReturnExpression = SyntaxFactory.InvocationExpression(`
`93`	`95`	`SyntaxFactory.ParseExpression("new RepeatedFieldGuidWrapper"), // Die Methode`
`94`	`96`	`SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(originalReturnExpression))));`
`@@ -104,6 +106,7 @@ public class PropertyVisitor : CSharpSyntaxRewriter`
`104`	`106`	`{`
`105`	`107`	`if (isNullable)`
`106`	`108`	`{`
	`109`	`+ NeedNullableStringConverter = true;`
`107`	`110`	`var newReturnExpression = SyntaxFactory.InvocationExpression(`
`108`	`111`	`SyntaxFactory.ParseExpression("new RepeatedFieldNullableStringWrapper"), // Die Methode`
`109`	`112`	`SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(SyntaxFactory.Argument(originalReturnExpression))));`