- Add support for wrapping all non-nullable strings with #nullable enable by a global setting

- Add support for wrapping all nullable strings to string? by a global setting

Author: machibuse

Source/Porticle.Grpc.TypeMapper/ClassVisitor.cs

@@ -5,7 +5,7 @@
 
 namespace Porticle.Grpc.TypeMapper;
 
-public class ClassVisitor(TaskLoggingHelper log) : CSharpSyntaxRewriter
+public class ClassVisitor(TaskLoggingHelper log, bool wrapAllNonNullableStrings, bool wrapAllNullableStringValues) : CSharpSyntaxRewriter
 {
     public override SyntaxNode? VisitClassDeclaration(ClassDeclarationSyntax node)
     {
@@ -19,7 +19,7 @@ public class ClassVisitor(TaskLoggingHelper log) : CSharpSyntaxRewriter
         var trivia = node.GetLeadingTrivia().Add(SyntaxFactory.Comment("/// <remark>" + marker + "</remark>")).Add(SyntaxFactory.CarriageReturnLineFeed);
         node = node.WithLeadingTrivia(trivia);
 
-        var propertyVisitor = new PropertyVisitor(log);
+        var propertyVisitor = new PropertyVisitor(log, wrapAllNonNullableStrings, wrapAllNullableStringValues);
         node = (ClassDeclarationSyntax)propertyVisitor.Visit(node);
 
         if (propertyVisitor.NeedGuidConverter) node = node.AddMembers(ClassFromSource(ListWrappers.RepeatedFieldGuidWrapper));

Source/Porticle.Grpc.TypeMapper/PropertyVisitor.cs

@@ -5,7 +5,7 @@
 
 namespace Porticle.Grpc.TypeMapper;
 
-public class PropertyVisitor(TaskLoggingHelper log) : CSharpSyntaxRewriter
+public class PropertyVisitor(TaskLoggingHelper log, bool wrapAllNonNullableStrings, bool wrapAllNullableStringValues) : CSharpSyntaxRewriter
 {
     public HashSet<PropertyToField> ReplaceProps = new();
 
@@ -25,7 +25,10 @@ public class PropertyVisitor(TaskLoggingHelper log) : CSharpSyntaxRewriter
         {
             if (property.GetLeadingTrivia().ToFullString().Contains("[GrpcGuid]")) return ConvertToGuidProperty(property);
 
-            if (property.GetLeadingTrivia().ToFullString().Contains("[NullableString]")) return ConvertToNullableStringProperty(property);
+            if (wrapAllNullableStringValues || property.GetLeadingTrivia().ToFullString().Contains("[NullableString]"))
+                return ConvertToNullableStringProperty(property, wrapAllNullableStringValues);
+
+            if (wrapAllNonNullableStrings) return ConvertToNonNullableStringProperty(property);
 
             return null;
         }
@@ -180,21 +183,23 @@ public class PropertyVisitor(TaskLoggingHelper log) : CSharpSyntaxRewriter
             .WithType(SyntaxFactory.NullableType(property.Type.WithoutTrivia()).WithTriviaFrom(property.Type));
     }
 
-    private PropertyDeclarationSyntax? ConvertToNullableStringProperty(PropertyDeclarationSyntax property)
+    private PropertyDeclarationSyntax? ConvertToNullableStringProperty(PropertyDeclarationSyntax property, bool wrapAllNullableStringValues)
     {
         var setter = property.AccessorList?.Accessors.FirstOrDefault(a => a.IsKind(SyntaxKind.SetAccessorDeclaration));
 
         if (setter?.Body == null)
         {
-            log.LogError($"No setter found in property {property.Identifier}");
+            if (!wrapAllNullableStringValues) log.LogError($"No setter found in property {property.Identifier}");
+
             return null;
         }
 
         var isNullable = !setter.Body.ToFullString().Contains("ProtoPreconditions.CheckNotNull");
 
         if (!isNullable)
         {
-            log.LogError($"String property {property.Identifier} ist not nullable");
+            if (!wrapAllNullableStringValues) log.LogError($"String property {property.Identifier} ist not nullable");
+
             return null;
         }
 
@@ -212,6 +217,29 @@ public class PropertyVisitor(TaskLoggingHelper log) : CSharpSyntaxRewriter
             .WithTrailingTrivia(property.GetTrailingTrivia().AddRange(trailingTrivia));
     }
 
+    private PropertyDeclarationSyntax? ConvertToNonNullableStringProperty(PropertyDeclarationSyntax property)
+    {
+        var setter = property.AccessorList?.Accessors.FirstOrDefault(a => a.IsKind(SyntaxKind.SetAccessorDeclaration));
+
+        if (setter?.Body == null) return null;
+
+        var isNullable = !setter.Body.ToFullString().Contains("ProtoPreconditions.CheckNotNull");
+
+        if (isNullable) return null;
+
+        var enableDirective =
+            SyntaxFactory.Trivia(SyntaxFactory.NullableDirectiveTrivia(SyntaxFactory.Token(SyntaxKind.EnableKeyword).WithLeadingTrivia(SyntaxFactory.Space), true));
+        var disableDirective =
+            SyntaxFactory.Trivia(SyntaxFactory.NullableDirectiveTrivia(SyntaxFactory.Token(SyntaxKind.DisableKeyword).WithLeadingTrivia(SyntaxFactory.Space), true));
+
+        var leadingTrivia = SyntaxFactory.TriviaList(enableDirective, SyntaxFactory.ElasticCarriageReturnLineFeed);
+        var trailingTrivia = SyntaxFactory.TriviaList(SyntaxFactory.ElasticCarriageReturnLineFeed, disableDirective);
+
+        return property
+            .WithLeadingTrivia(leadingTrivia.AddRange(property.GetLeadingTrivia()))
+            .WithTrailingTrivia(property.GetTrailingTrivia().AddRange(trailingTrivia));
+    }
+
     private PropertyDeclarationSyntax? ConvertToGuidProperty(PropertyDeclarationSyntax property)
     {
         var setter = property.GetSetter();

Source/Porticle.Grpc.TypeMapper/ProtoPostProcessor.cs

@@ -48,7 +48,7 @@ public override bool Execute()
                 var root = tree.GetRoot();
                 File.WriteAllText(filePath + "_", root.ToFullString());
 
-                var classVisitor = new ClassVisitor(Log);
+                var classVisitor = new ClassVisitor(Log, WrapAllNonNullableStrings, WrapAllNullableStringValues);
                 root = classVisitor.Visit(root);
 
                 File.WriteAllText(filePath, root.ToFullString());