Properties and classes PascalCase formattings

Author: alekshura

Compentio.SourceConfig/Compentio.SourceConfig.Generator/Compentio.SourceConfig.csproj

@@ -15,17 +15,6 @@
     <None Include="$(PKGSystem_Text_Json)\lib\netstandard2.0\System.Text.Json.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
     <None Include="$(PKGSystem_Text_Encodings_Web)\lib\netstandard2.0\System.Text.Encodings.Web.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>
-  
-  <PropertyGroup>
-    <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
-  </PropertyGroup>
-
-  <Target Name="GetDependencyTargetPaths">
-    <ItemGroup>
-      <TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Json)\lib\netstandard2.0\System.Text.Json.dll" IncludeRuntimeDependency="false" />
-      <TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Encodings_Web)\lib\netstandard2.0\System.Text.Encodings.Web.dll" IncludeRuntimeDependency="false" />
-    </ItemGroup>
-  </Target>
 
   <ItemGroup>
     <None Include="..\..\Compentio.Assets\Logo.png">
@@ -39,7 +28,7 @@
     <LangVersion>9.0</LangVersion>
     <IsRoslynComponent>true</IsRoslynComponent>
     <Nullable>enable</Nullable>
-    <Version>1.0.9</Version>
+    <Version>1.0.10</Version>
     <Description>Code generator for objects that are based on *.json configuration files: when developer adds some file or new properties to existng json configuration file the POCO objects for this configuration generated.</Description>
     <PackageIcon>Logo.png</PackageIcon>
     <PackageIconUrl />

Compentio.SourceConfig/Compentio.SourceConfig.Generator/Context/ConfigurationFileContext.cs

@@ -1,4 +1,5 @@
-using System;
+using Compentio.SourceConfig.Extensions;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -99,11 +100,7 @@ public bool ShouldBeMerged(string filePath)
         private string FormatClassName(string className)
         {
             var originName = className.Split('.').Where(item => !string.IsNullOrWhiteSpace(item)).First();
-
-            if (string.IsNullOrWhiteSpace(originName))
-                return string.Concat(className[0].ToString().ToUpper(), className.Substring(1));
-
-            return string.Concat(originName[0].ToString().ToUpper(), originName.Substring(1)).Replace("settings", "Settings");
+            return originName.FromatClassName();
         }
 
         private Dictionary<string, object> Deserialize(string content)

Compentio.SourceConfig/Compentio.SourceConfig.Generator/Extensions/FormatingExtensions.cs

@@ -0,0 +1,34 @@
+namespace Compentio.SourceConfig.Extensions
+{
+    static class FormatingExtensions
+    {
+        public static string FromatClassName(this string input)
+        {
+            return ToPascalCase(input).Replace("settings", "Settings");
+        }
+
+        public static string FromatPropertyName(this string input)
+        {
+            var underscore = "_";
+            var tmp = input
+                .Replace(".", underscore)
+                .Replace("$", underscore);
+
+            if (tmp[0].Equals(underscore))
+                tmp.Replace(underscore, string.Empty);
+
+            return ToPascalCase(tmp);
+        }
+
+        private static string ToPascalCase(string input)
+        {
+            if (string.IsNullOrWhiteSpace(input))
+                return string.Empty;
+
+            if (input.Length == 1)
+                return input.ToUpper();
+
+            return string.Concat(input[0].ToString().ToUpper(), input.Substring(1));
+        }
+    }
+}

Compentio.SourceConfig/Compentio.SourceConfig.Generator/Generators/ICodeGenerator.cs

@@ -1,4 +1,5 @@
 using Compentio.SourceConfig.Context;
+using Compentio.SourceConfig.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
@@ -66,18 +67,18 @@ public class {_configurationFileContext.ClassName}
                 if (value is JsonElement element && element.ValueKind == JsonValueKind.Array)
                 {
                     var propertyType = GetPropertyTypeName(element.EnumerateArray().FirstOrDefault());
-                    sourceBuilder.Append($"public IEnumerable<{propertyType}> {FormatPropertyName(key)} {{ get; set; }}");
+                    sourceBuilder.Append($"public IEnumerable<{propertyType}> {key.FromatPropertyName()} {{ get; set; }}");
                 }
                 else
                 {
-                    sourceBuilder.Append($"public string {FormatPropertyName(key)} {{ get; set; }}");
+                    sourceBuilder.Append($"public string {key.FromatPropertyName()} {{ get; set; }}");
                 }
             }
 
             foreach (var item in _configurationFileContext.ConfigClasses)
             {
                 var key = item.Key;
-                sourceBuilder.Append($"public {FormatPropertyName(key)} {FormatPropertyName(key)}{{ get; set; }}");
+                sourceBuilder.Append($"public {key.FromatPropertyName()} {key.FromatPropertyName()}{{ get; set; }}");
             }
 
             sourceBuilder.Append("}");
@@ -94,14 +95,15 @@ private void BuildConfigClass(KeyValuePair<string, object> classInfo, StringBuil
         {
             var nestedClasses = new StringBuilder();
 
-            stringBuilder.Append($"public class {classInfo.Key}");
+            stringBuilder.Append("[ExcludeFromCodeCoverage]");
+            stringBuilder.Append($"public class {classInfo.Key.FromatClassName()}");
             stringBuilder.Append("{");
 
             foreach (var item in (Dictionary<string, object>)classInfo.Value)
             {
                 if (item.Value is Dictionary<string, object>)
                 {
-                    stringBuilder.Append($"public {item.Key} {FormatPropertyName(item.Key)} {{ get; set; }}");
+                    stringBuilder.Append($"public {item.Key} {item.Key.FromatPropertyName()} {{ get; set; }}");
                     BuildConfigClass(item, nestedClasses);
                 }
                 else
@@ -110,11 +112,11 @@ private void BuildConfigClass(KeyValuePair<string, object> classInfo, StringBuil
                     var propertyType = GetPropertyTypeName(prop);
                     if (prop.ValueKind == JsonValueKind.Array)
                     {
-                        stringBuilder.Append($"public IEnumerable<{propertyType}> {FormatPropertyName(item.Key)} {{ get; set; }}");
+                        stringBuilder.Append($"public IEnumerable<{propertyType}> {item.Key.FromatPropertyName()} {{ get; set; }}");
                     }
                     else
                     {
-                        stringBuilder.Append($"public {propertyType} {FormatPropertyName(item.Key)} {{ get; set; }}");
+                        stringBuilder.Append($"public {propertyType} {item.Key.FromatPropertyName()} {{ get; set; }}");
                     }
                 }
             }
@@ -132,13 +134,5 @@ private string GetPropertyTypeName(JsonElement value)
                 _ => "string",
             };
         }
-
-        private string FormatPropertyName(string origin)
-        {
-            var underscore = "_";
-            return origin
-                .Replace(".", underscore)
-                .Replace("$", underscore);
-        }
     }
 }