Wrap Result in AstGenWrapper (#13)

Wrapper contains the file name and AST root.
joernio · Dec 5, 2023 · 3aad4b8 · 3aad4b8
1 parent 0815c50
commit 3aad4b8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/DotNetAstGen/AstGenWrapper.cs b/DotNetAstGen/AstGenWrapper.cs
@@ -0,0 +1,17 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace DotNetAstGen;
+
+public class AstGenWrapper
+{
+    public AstGenWrapper(string fileName, SyntaxTree tree)
+    {
+        AstRoot = tree.GetCompilationUnitRoot();
+        FileName = fileName;
+    }
+
+    public CompilationUnitSyntax AstRoot { get; set; }
+    public string FileName { get; set; }
+}
diff --git a/DotNetAstGen/Program.cs b/DotNetAstGen/Program.cs
@@ -80,24 +80,25 @@ private static void _AstForFile(FileSystemInfo rootInputPath, FileSystemInfo roo
                 var programText = streamReader.ReadToEnd();
                 var tree = CSharpSyntaxTree.ParseText(programText);
                 _logger?.LogDebug("Successfully parsed: {filePath}", fullPath);
-                var root = tree.GetCompilationUnitRoot();
-                var jsonString = JsonConvert.SerializeObject(root, Formatting.Indented, new JsonSerializerSettings
-                {
-                    ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
-                    ContractResolver =
-                        new SyntaxNodePropertiesResolver() // Comment this to see the unfiltered parser output
-                });
+                var astGenResult = new AstGenWrapper(fullPath, tree);
+                var jsonString = JsonConvert.SerializeObject(astGenResult, Formatting.Indented,
+                    new JsonSerializerSettings
+                    {
+                        ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+                        ContractResolver =
+                            new SyntaxNodePropertiesResolver() // Comment this to see the unfiltered parser output
+                    });
                 var outputName = Path.Combine(filePath.DirectoryName ?? "./",
                         $"{Path.GetFileNameWithoutExtension(fullPath)}.json")
                     .Replace(rootInputPath.FullName, rootOutputPath.FullName);
-                
+
                 // Create dirs if they do not exist
                 var outputParentDir = Path.GetDirectoryName(outputName);
                 if (outputParentDir != null)
                 {
                     Directory.CreateDirectory(outputParentDir);
                 }
-                
+
                 File.WriteAllText(outputName, jsonString);
                 _logger?.LogInformation("Successfully wrote AST to '{astJsonPath}'", outputName);
             }

diff --git a/DotNetAstGen/SyntaxNodePropertiesResolver.cs b/DotNetAstGen/SyntaxNodePropertiesResolver.cs
@@ -10,14 +10,14 @@ namespace DotNetAstGen
     internal class SyntaxNodePropertiesResolver : DefaultContractResolver
     {
         private static readonly ILogger? Logger = Program.LoggerFactory?.CreateLogger("SyntaxNodePropertiesResolver");
-        
+
         private readonly HashSet<string> _propsToAllow = new(new[]
         {
             "Value", "Usings", "Name", "Identifier", "Left", "Right", "Members", "ConstraintClauses",
             "Alias", "NamespaceOrType", "Arguments", "Expression", "Declaration", "ElementType", "Initializer", "Else",
             "Condition", "Statement", "Statements", "Variables", "WhenNotNull", "AllowsAnyExpression", "Expressions",
             "Modifiers", "ReturnType", "IsUnboundGenericName", "Default", "IsConst", "Parameters", "Types",
-            "ExplicitInterfaceSpecifier", "MetaData", "Kind"
+            "ExplicitInterfaceSpecifier", "MetaData", "Kind", "AstRoot", "FileName"
         });
 
         private readonly List<string> _regexToAllow = new(new[]