Merge pull request #30 from bonsai-rx/casing-rules

Fix naming convention edge cases
bonsai-rx · Jan 19, 2024 · 7238c97 · 7238c97
2 parents 67c26cd + 37073bf
commit 7238c97
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/Bonsai.Sgen.Tests/CasingGenerationTests.cs b/Bonsai.Sgen.Tests/CasingGenerationTests.cs
@@ -33,7 +33,9 @@ private static Task<JsonSchema> CreateTestSchema()
           ""bar"": {
             ""enum"": [
                ""This is a string A"",
-               ""This is a string B""
+               ""This is a string B"",
+               ""snake_case_with_3_numbers"",
+               ""hyphen-case-with-3-numbers""
             ],
             ""title"": ""StringEnum"",
             ""type"": ""string""
@@ -46,13 +48,15 @@ private static Task<JsonSchema> CreateTestSchema()
         }
 
         [TestMethod]
-        public async Task GenerateFromSnakeCase_GeneratePascalCaseNames()
+        public async Task GenerateFromSnakeAndHyphenCase_GeneratePascalCaseNames()
         {
             var schema = await CreateTestSchema();
             var generator = TestHelper.CreateGenerator(schema);
             var code = generator.GenerateFile();
             Assert.IsTrue(code.Contains("public ThingContainer BaseType"), "Incorrect casing for property type or name.");
-            Assert.IsTrue(code.Contains("ThisIsAStringA = 0,"), "Incorrect casing for enum name.");
+            Assert.IsTrue(code.Contains("ThisIsAStringA = 0"), "Incorrect casing for enum name.");
+            Assert.IsTrue(code.Contains("SnakeCaseWith3Numbers = 2"), "Incorrect casing for enum name.");
+            Assert.IsTrue(code.Contains("HyphenCaseWith3Numbers = 3"), "Incorrect casing for enum name.");
             CompilerTestHelper.CompileFromSource(code);
         }
     }

diff --git a/Bonsai.Sgen/CSharpEnumNameGenerator.cs b/Bonsai.Sgen/CSharpEnumNameGenerator.cs
@@ -1,6 +1,5 @@
 using NJsonSchema;
 using NJsonSchema.CodeGeneration;
-using YamlDotNet.Serialization.NamingConventions;
 
 namespace Bonsai.Sgen
 {
@@ -11,7 +10,7 @@ internal class CSharpEnumNameGenerator : IEnumNameGenerator
         public string Generate(int index, string name, object value, JsonSchema schema)
         {
             var defaultName = defaultGenerator.Generate(index, name, value, schema);
-            return PascalCaseNamingConvention.Instance.Apply(defaultName);
+            return CSharpNamingConvention.Instance.Apply(defaultName);
         }
     }
 }
diff --git a/Bonsai.Sgen/CSharpNamingConvention.cs b/Bonsai.Sgen/CSharpNamingConvention.cs
@@ -0,0 +1,19 @@
+using YamlDotNet.Serialization;
+using YamlDotNet.Serialization.NamingConventions;
+
+namespace Bonsai.Sgen
+{
+    internal class CSharpNamingConvention : INamingConvention
+    {
+        public static readonly INamingConvention Instance = new CSharpNamingConvention();
+
+        private CSharpNamingConvention()
+        {
+        }
+
+        public string Apply(string value)
+        {
+            return PascalCaseNamingConvention.Instance.Apply(value).Replace("_", string.Empty);
+        }
+    }
+}
diff --git a/Bonsai.Sgen/CSharpPropertyNameGenerator.cs b/Bonsai.Sgen/CSharpPropertyNameGenerator.cs
@@ -1,5 +1,4 @@
 using NJsonSchema;
-using YamlDotNet.Serialization.NamingConventions;
 
 namespace Bonsai.Sgen
 {
@@ -8,7 +7,7 @@ internal class CSharpPropertyNameGenerator : NJsonSchema.CodeGeneration.CSharp.C
         public override string Generate(JsonSchemaProperty property)
         {
             var defaultName = base.Generate(property);
-            return PascalCaseNamingConvention.Instance.Apply(defaultName);
+            return CSharpNamingConvention.Instance.Apply(defaultName);
         }
     }
 }
diff --git a/Bonsai.Sgen/CSharpTypeNameGenerator.cs b/Bonsai.Sgen/CSharpTypeNameGenerator.cs
@@ -1,5 +1,4 @@
 using NJsonSchema;
-using YamlDotNet.Serialization.NamingConventions;
 
 namespace Bonsai.Sgen
 {
@@ -8,7 +7,7 @@ internal class CSharpTypeNameGenerator : DefaultTypeNameGenerator
         protected override string Generate(JsonSchema schema, string typeNameHint)
         {
             var defaultName = base.Generate(schema, typeNameHint);
-            return PascalCaseNamingConvention.Instance.Apply(defaultName);
+            return CSharpNamingConvention.Instance.Apply(defaultName);
         }
     }
 }