Format enum now has the same visibility as EnumClass

Fixes #3

Author: Genbox

Src/FastEnum.Tests.CodeGen/BugTests.cs

@@ -10,29 +10,48 @@ public class BugTests
     [Fact]
     public void TestUlongBug()
     {
-        string code = """
-[FastEnum]
-public enum TestEnum : ulong
-{
-    None = 0,
-    Max = ulong.MaxValue
-}
-""";
+        const string code = """
+                            [FastEnum]
+                            public enum TestEnum : ulong
+                            {
+                                None = 0,
+                                Max = ulong.MaxValue
+                            }
+                            """;
+
         Assert.NotEmpty(TestHelper.GetGeneratedOutput<EnumGenerator>(code));
     }
 
     [Fact]
     public void TestNegativeValueBug()
     {
-        string code = """
-[FastEnum]
-public enum TestEnum : long
-{
-    None = 0,
-    Min = long.MinValue
-}
-""";
+        const string code = """
+                            [FastEnum]
+                            public enum TestEnum : long
+                            {
+                                None = 0,
+                                Min = long.MinValue
+                            }
+                            """;
 
         Assert.NotEmpty(TestHelper.GetGeneratedOutput<EnumGenerator>(code));
     }
+
+    [Fact]
+    public async Task TestIssue3()
+    {
+        const string code = """
+                            [FastEnum(EnumsClassVisibility = Visibility.Internal, ExtensionClassVisibility = Visibility.Internal)]
+                            public enum TestEnum
+                            {
+                                None = 0,
+                                Value
+                            }
+                            """;
+
+        await Verify(TestHelper.GetGeneratedOutput<EnumGenerator>(code))
+              .UseFileName(nameof(TestIssue3))
+              .UseDirectory("Issues")
+              .DisableDiff();
+    }
 }

Src/FastEnum.Tests.CodeGen/Issues/TestIssue3.verified.txt

@@ -0,0 +1,180 @@
+// <auto-generated />
+#nullable enable
+using System;
+
+[Flags]
+internal enum TestEnumFormat : byte
+{
+    None = 0,
+    Name = 1,
+    Value = 2,
+    Default = Name | Value
+}
+// <auto-generated />
+#nullable enable
+using System;
+
+internal static partial class Enums
+{
+    internal static partial class TestEnum
+    {
+        public const int MemberCount = 2;
+        public const bool IsFlagEnum = false;
+
+        public static string[] GetMemberNames() => _names ??= new string[] {
+                "None",
+                "Value"
+            };
+
+        public static global::TestEnum[] GetMemberValues() => _values ??= new global::TestEnum[] {
+                global::TestEnum.None,
+                global::TestEnum.Value
+            };
+
+        public static Int32[] GetUnderlyingValues() => _underlyingValues ??= new Int32[] {
+                0,
+                1
+            };
+
+        public static bool TryParse(string value, out global::TestEnum result, TestEnumFormat format = TestEnumFormat.Default, StringComparison comparison = StringComparison.Ordinal)
+        {
+            if (format.HasFlag(TestEnumFormat.Name))
+            {
+                if (value.Equals("None", comparison))
+                {
+                    result = global::TestEnum.None;
+                    return true;
+                }
+
+                if (value.Equals("Value", comparison))
+                {
+                    result = global::TestEnum.Value;
+                    return true;
+                }
+            }
+            if (format.HasFlag(TestEnumFormat.Value))
+            {
+                if (value.Equals("0", comparison))
+                {
+                    result = global::TestEnum.None;
+                    return true;
+                }
+
+                if (value.Equals("1", comparison))
+                {
+                    result = global::TestEnum.Value;
+                    return true;
+                }
+            }
+            result = default;
+            return false;
+        }
+
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+        public static bool TryParse(ReadOnlySpan<char> value, out global::TestEnum result, TestEnumFormat format = TestEnumFormat.Default, StringComparison comparison = StringComparison.Ordinal)
+        {
+            if (format.HasFlag(TestEnumFormat.Name))
+            {
+                if (value.Equals("None", comparison))
+                {
+                    result = global::TestEnum.None;
+                    return true;
+                }
+
+                if (value.Equals("Value", comparison))
+                {
+                    result = global::TestEnum.Value;
+                    return true;
+                }
+            }
+            if (format.HasFlag(TestEnumFormat.Value))
+            {
+                if (value.Equals("0", comparison))
+                {
+                    result = global::TestEnum.None;
+                    return true;
+                }
+
+                if (value.Equals("1", comparison))
+                {
+                    result = global::TestEnum.Value;
+                    return true;
+                }
+            }
+            result = default;
+            return false;
+        }
+
+        public static global::TestEnum Parse(ReadOnlySpan<char> value, TestEnumFormat format = TestEnumFormat.Default, StringComparison comparison = StringComparison.Ordinal)
+        {
+            if (!TryParse(value, out global::TestEnum result, format, comparison))
+                throw new ArgumentOutOfRangeException($"Invalid value: {value.ToString()}");
+
+            return result;
+        }
+#endif
+
+        public static global::TestEnum Parse(string value, TestEnumFormat format = TestEnumFormat.Default, StringComparison comparison = StringComparison.Ordinal)
+        {
+            if (!TryParse(value, out global::TestEnum result, format, comparison))
+                throw new ArgumentOutOfRangeException($"Invalid value: {value}");
+
+            return result;
+        }
+
+        public static bool IsDefined(global::TestEnum input)
+        {
+            Int32[] _isDefinedValues = GetUnderlyingValues();
+
+            for (int i = 0; i < _isDefinedValues.Length; i++)
+            {
+                if (_isDefinedValues[i] == (Int32)input)
+                    return true;
+            }
+
+            return false;
+        }
+
+        private static string[]? _names;
+        private static global::TestEnum[]? _values;
+        private static Int32[]? _underlyingValues;
+
+    }
+}
+// <auto-generated />
+#nullable enable
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+internal static partial class TestEnumExtensions
+{
+    public static string GetString(this global::TestEnum value) => value switch
+    {
+        global::TestEnum.None => "None",
+        global::TestEnum.Value => "Value",
+        _ => value.ToString()
+    };
+
+    public static bool TryGetUnderlyingValue(this global::TestEnum value, out Int32 underlyingValue)
+    {
+        switch (value)
+        {
+            case global::TestEnum.None:
+                underlyingValue = 0;
+                return true;
+            case global::TestEnum.Value:
+                underlyingValue = 1;
+                return true;
+        }
+        underlyingValue = default;
+        return false;
+    }
+
+    public static Int32 GetUnderlyingValue(this global::TestEnum value)
+    {
+        if (!TryGetUnderlyingValue(value, out Int32 underlyingValue))
+            throw new ArgumentOutOfRangeException($"Invalid value: {value}");
+
+        return underlyingValue;
+    }
+}

Src/FastEnum.Tests.CodeGen/Resources/EnumTransform.input.verified.txt

@@ -3,7 +3,7 @@
 using System;
 
 [Flags]
-public enum MyEnum1Format : byte
+internal enum MyEnum1Format : byte
 {
     None = 0,
     Name = 1,
@@ -152,7 +152,7 @@ internal static partial class MyEnum1Extensions
 using System;
 
 [Flags]
-public enum MyEnum2Format : byte
+internal enum MyEnum2Format : byte
 {
     None = 0,
     Name = 1,
@@ -301,7 +301,7 @@ internal static partial class MyEnum2Extensions
 using System;
 
 [Flags]
-public enum MyEnum3Format : byte
+internal enum MyEnum3Format : byte
 {
     None = 0,
     Name = 1,
@@ -450,7 +450,7 @@ internal static partial class MyEnum3Extensions
 using System;
 
 [Flags]
-public enum MyEnum4Format : byte
+internal enum MyEnum4Format : byte
 {
     None = 0,
     Name = 1,

Src/FastEnum.Tests.CodeGen/Resources/InternalEnum.input.verified.txt

@@ -5,7 +5,7 @@ using System;
 namespace Some.Namespace.Here;
 
 [Flags]
-public enum MyEnumFormat : byte
+internal enum MyEnumFormat : byte
 {
     None = 0,
     Name = 1,

Src/FastEnum.Tests.CodeGen/Resources/NestedType.input.verified.txt

@@ -5,7 +5,7 @@ using System;
 namespace Some.Namespace.Here;
 
 [Flags]
-public enum MyEnumFormat : byte
+internal enum MyEnumFormat : byte
 {
     None = 0,
     Name = 1,

Src/FastEnum.Tests.CodeGen/Resources/OmitValue.input.verified.txt

@@ -3,7 +3,7 @@
 using System;
 
 [Flags]
-public enum MyEnumFormat : byte
+internal enum MyEnumFormat : byte
 {
     None = 0,
     Name = 1,

Src/FastEnum.Tests.CodeGen/Resources/VisibilityOverride.input.verified.txt

@@ -3,7 +3,7 @@
 using System;
 
 [Flags]
-public enum MyPublicEnumFormat : byte
+internal enum MyPublicEnumFormat : byte
 {
     None = 0,
     Name = 1,

Src/FastEnum/Generators/EnumFormatCode.cs

@@ -1,19 +1,23 @@
 using Genbox.FastEnum.Data;
+using Microsoft.CodeAnalysis;
 
 namespace Genbox.FastEnum.Generators;
 
 internal static class EnumFormatCode
 {
     internal static string Generate(EnumSpec es)
     {
+        FastEnumData op = es.Data;
+
         string? ns = es.Data.EnumsClassNamespace ?? es.Namespace; //We use the same namespace as the Enums class
         string cn = es.Data.EnumNameOverride ?? es.Name;
+        string vi = op.EnumsClassVisibility == Visibility.Inherit ? (es.AccessChain[0] == Accessibility.Public ? "public" : "internal") : op.EnumsClassVisibility.ToString().ToLowerInvariant();
 
         string res = $$"""
 using System;
 {{(ns != null ? "\nnamespace " + ns + ";\n" : null)}}
 [Flags]
-public enum {{cn}}Format : byte
+{{vi}} enum {{cn}}Format : byte
 {
     None = 0,
     Name = 1,