Fix tests and decouple architecture

Author: hilalhakla

JsonClassGenerator.WinForms/MainForm.cs

@@ -409,9 +409,7 @@ private void TryLoadJsonFile( FileInfo jsonFile )
 
         private void ConfigureGenerator( JsonClassGenerator config )
         {
-            config.UsePascalCase = this.optsPascalCase.Checked;
-
-            //
+            writerConfig.UsePascalCase = this.optsPascalCase.Checked;
 
             if( this.optAttribJP.Checked )
             {

JsonClassGeneratorLib/CodeWriterConfiguration/CodeWriterConfigurationBase.cs renamed to JsonClassGeneratorLib/CodeWriterConfiguration/BaseCodeWriterConfiguration.cs

@@ -7,7 +7,7 @@
 
 namespace Xamasoft.JsonClassGenerator.CodeWriterConfiguration
 {
-    public class CodeWriterConfigurationBase
+    public class BaseCodeWriterConfiguration
     {
         /// <summary>
         /// The C# <c>namespace</c> or Java <c>package</c> that the generated types will reside in.<br />

JsonClassGeneratorLib/CodeWriterConfiguration/CSharpCodeWriterConfig.cs

@@ -9,7 +9,7 @@
 
 namespace Xamasoft.JsonClassGenerator.CodeWriterConfiguration
 {
-    public class CSharpCodeWriterConfig : CodeWriterConfigurationBase
+    public class CSharpCodeWriterConfig : BaseCodeWriterConfiguration
     {
         /// <summary>
         /// The default constructor with default property values

JsonClassGeneratorLib/CodeWriterConfiguration/DartCodeWriterConfig.cs

@@ -8,7 +8,7 @@
 
 namespace Xamasoft.JsonClassGenerator.CodeWriterConfiguration
 {
-    public class DartCodeWriterConfig : CodeWriterConfigurationBase
+    public class DartCodeWriterConfig : BaseCodeWriterConfiguration
     {
         /// <summary>
         /// The default constructor with default property values

JsonClassGeneratorLib/CodeWriterConfiguration/JavaCodeWriterConfig.cs

@@ -9,7 +9,7 @@
 
 namespace Xamasoft.JsonClassGenerator.CodeWriterConfiguration
 {
-    public class JavaCodeWriterConfig : CodeWriterConfigurationBase
+    public class JavaCodeWriterConfig : BaseCodeWriterConfiguration
     {
         /// <summary>
         /// The default constructor with default property values
@@ -31,6 +31,8 @@ public JavaCodeWriterConfig(OutputMembers outputMembers, OutputCollectionType co
         }
 
         public OutputMembers OutputMembers { get; set; }
+
+        [Obsolete("Not Implemented Yet")]
         public bool UsePascalCase { get; set; }
         public bool UseNestedClasses { get; set; }
     }

JsonClassGeneratorLib/CodeWriterConfiguration/PythonCodeWriterConfig.cs

@@ -8,7 +8,7 @@
 
 namespace Xamasoft.JsonClassGenerator.CodeWriterConfiguration
 {
-    public class PythonCodeWriterConfig : CodeWriterConfigurationBase
+    public class PythonCodeWriterConfig : BaseCodeWriterConfiguration
     {
         /// <summary>
         /// The default constructor with default property values

JsonClassGeneratorLib/CodeWriterConfiguration/TypeScriptCodeWriterConfig.cs

@@ -6,7 +6,7 @@
 
 namespace Xamasoft.JsonClassGenerator.CodeWriterConfiguration
 {
-    public class TypeScriptCodeWriterConfig : CodeWriterConfigurationBase
+    public class TypeScriptCodeWriterConfig : BaseCodeWriterConfiguration
     {
     }
 }

JsonClassGeneratorLib/CodeWriterConfiguration/VisualBasicCodeWriterConfig.cs

@@ -7,7 +7,7 @@
 
 namespace Xamasoft.JsonClassGenerator.CodeWriterConfiguration
 {
-    public class VisualBasicCodeWriterConfig : CodeWriterConfigurationBase
+    public class VisualBasicCodeWriterConfig : BaseCodeWriterConfiguration
     {
         public VisualBasicCodeWriterConfig()
         {

JsonClassGeneratorLib/CodeWriters/CSharpCodeWriter.cs

@@ -1,18 +1,20 @@
 using System;
 using System.CodeDom;
 using System.Collections.Generic;
+using System.Net.Configuration;
 using System.Runtime.Serialization.Formatters;
 using System.Text;
 using Xamasoft.JsonClassGenerator.CodeWriterConfiguration;
 using Xamasoft.JsonClassGenerator.Models;
 
 namespace Xamasoft.JsonClassGenerator.CodeWriters
 {
-    public class CSharpCodeWriter : ICodeBuilder
+    public class CSharpCodeWriter : ICodeWriter
     {
         public CSharpCodeWriter()
         {
             this.config = new CSharpCodeWriterConfig();
+
         }
 
         public CSharpCodeWriter(CSharpCodeWriterConfig writerConfig)
@@ -42,7 +44,7 @@ public string DisplayName
 
         public bool IsReservedKeyword(string word) => _reservedKeywords.Contains(word ?? string.Empty);
 
-        IReadOnlyCollection<string> ICodeBuilder.ReservedKeywords => _reservedKeywords;
+        IReadOnlyCollection<string> ICodeWriter.ReservedKeywords => _reservedKeywords;
 
         public void WriteFileStart(StringBuilder sw)
         {
@@ -96,6 +98,40 @@ public void WriteFileStart(StringBuilder sw)
             }
         }
 
+        public void WriteClassesToFile(StringBuilder sw, IEnumerable<JsonType> types, bool rootIsArray = false)
+        {
+            Boolean inNamespace = false;
+            Boolean rootNamespace = false;
+
+            WriteFileStart(sw);
+            WriteDeserializationComment(sw, rootIsArray);
+
+            foreach (JsonType type in types)
+            {
+                if (config.HasNamespace && inNamespace && rootNamespace != type.IsRoot)
+                {
+                    WriteNamespaceEnd(sw, rootNamespace);
+                    inNamespace = false;
+                }
+
+                if (config.HasNamespace && !inNamespace)
+                {
+                    WriteNamespaceStart(sw, type.IsRoot);
+                    inNamespace = true;
+                    rootNamespace = type.IsRoot;
+                }
+
+                WriteClass(sw, type);
+            }
+
+            if (config.HasNamespace && inNamespace)
+            {
+                WriteNamespaceEnd(sw, rootNamespace);
+            }
+
+            WriteFileEnd(sw);
+        }
+
         public void WriteFileEnd(StringBuilder sw)
         {
             if (config.UseNestedClasses)
@@ -204,7 +240,13 @@ public void WriteClassMembers(StringBuilder sw, JsonType type, string indentMemb
             bool first = true;
             foreach (JsonFieldInfo field in type.Fields)
             {
-                string classPropertyName = this.GetCSharpPascalCaseName(field.MemberName);
+                string classPropertyName = field.MemberName;
+
+                if (config.UsePascalCase || field.ContainsSpecialChars)
+                    classPropertyName = field.MemberName.ToTitleCase();
+
+                classPropertyName = this.CheckSyntax(classPropertyName);
+
                 string propertyAttribute = GetCSharpJsonAttributeCode(field);
 
                 // If we are using record types and this is not the first iteration, add a comma and newline to the previous line
@@ -366,7 +408,11 @@ private void WriteClassConstructor(StringBuilder sw, JsonType type, string inden
                 {
                     // Writes something like: `[JsonProperty("foobar")] string foobar,`
 
-                    string ctorParameterName = this.GetCSharpCamelCaseName(field.MemberName);
+                    string ctorParameterName = field.MemberName;
+                    if (config.UsePascalCase || field.ContainsSpecialChars)
+                        ctorParameterName = ctorParameterName.ToTitleCase();
+
+                    ctorParameterName = this.GetCSharpCamelCaseName(ctorParameterName);
 
                     bool isLast = Object.ReferenceEquals(field, lastField);
                     string comma = isLast ? "" : ",";
@@ -394,8 +440,12 @@ private void WriteClassConstructor(StringBuilder sw, JsonType type, string inden
 
             foreach (JsonFieldInfo field in type.Fields)
             {
-                string ctorParameterName = this.GetCSharpCamelCaseName(field.MemberName);
-                string classPropertyName = this.GetCSharpPascalCaseName(field.MemberName);
+                string classPropertyName = field.MemberName;
+                if (config.UsePascalCase || field.ContainsSpecialChars)
+                    classPropertyName = classPropertyName.ToTitleCase();
+
+                string ctorParameterName = field.MemberName.ToTitleCase();
+                ctorParameterName = this.GetCSharpCamelCaseName(ctorParameterName);
 
                 sw.AppendFormat(indentBodies + "this.{0} = {1};{2}", /*0:*/ classPropertyName, /*1:*/ ctorParameterName, /*2:*/ Environment.NewLine);
             }
@@ -550,7 +600,7 @@ private string GetCSharpCamelCaseName(string camelCaseFromJson)
             return name;
         }
         /// <summary>Converts an identifier from JSON into a C#-safe PascalCase identifier.</summary>
-        private string GetCSharpPascalCaseName(string name)
+        private string CheckSyntax(string name)
         {
             // Check if property is a reserved keyword
             if (this.IsReservedKeyword(name)) name = "@" + name;

JsonClassGeneratorLib/CodeWriters/DartCodeWriter.cs

@@ -9,7 +9,7 @@
 
 namespace Xamasoft.JsonClassGenerator.CodeWriters
 {
-    public class DartCodeWriter : ICodeBuilder
+    public class DartCodeWriter : ICodeWriter
     {
         private readonly DartCodeWriterConfig config;
 
@@ -194,6 +194,40 @@ public void WriteFileEnd(StringBuilder sw)
             return;
         }
 
+        public void WriteClassesToFile(StringBuilder sw, IEnumerable<JsonType> types, bool rootIsArray = false)
+        {
+            Boolean inNamespace = false;
+            Boolean rootNamespace = false;
+
+            WriteFileStart(sw);
+            WriteDeserializationComment(sw, rootIsArray);
+
+            foreach (JsonType type in types)
+            {
+                if (config.HasNamespace && inNamespace && rootNamespace != type.IsRoot)
+                {
+                    WriteNamespaceEnd(sw, rootNamespace);
+                    inNamespace = false;
+                }
+
+                if (config.HasNamespace && !inNamespace)
+                {
+                    WriteNamespaceStart(sw, type.IsRoot);
+                    inNamespace = true;
+                    rootNamespace = type.IsRoot;
+                }
+
+                WriteClass(sw, type);
+            }
+
+            if (config.HasNamespace && inNamespace)
+            {
+                WriteNamespaceEnd(sw, rootNamespace);
+            }
+
+            WriteFileEnd(sw);
+        }
+
         public void WriteFileStart(StringBuilder sw)
         {
             sw.AppendLine("/* ");