Fixes to single-file enums and intersections

Author: skovlund

src/DataverseProxyGenerator.Core/Generation/CSharpProxyGenerator.cs

@@ -1,5 +1,6 @@
 using DataverseProxyGenerator.Core.Domain;
 using DataverseProxyGenerator.Core.Generation.Generators;
+using DataverseProxyGenerator.Core.Generation.Mappers;
 using DataverseProxyGenerator.Core.Templates;
 
 namespace DataverseProxyGenerator.Core.Generation;
@@ -72,7 +73,7 @@ private static (Dictionary<string, HashSet<ColumnSignature>> InterfaceColumns, D
         return BuildIntersectionData(config.IntersectMapping, tableDict, tableColumns);
     }
 
-    private IEnumerable<GeneratedFile> GenerateSingleFile(
+    private static IEnumerable<GeneratedFile> GenerateSingleFile(
         List<TableModel> tablesList,
         Dictionary<string, HashSet<ColumnSignature>> interfaceColumns,
         Dictionary<string, List<string>> tableToInterfaces,
@@ -93,7 +94,9 @@ private static object CreateSingleFileTemplateModel(
         Dictionary<string, List<string>> tableToInterfaces,
         GenerationContext context)
     {
-        var globalOptionsets = GetGlobalOptionsets(tablesList).ToList();
+        var globalOptionsets = GetGlobalOptionsets(tablesList)
+            .Select(enumCol => EnumMapper.MapToTemplateModel(enumCol, context))
+            .ToList();
         var interfaces = CreateInterfaceModels(interfaceColumns, tablesList);
 
         // Add interface lists to tables (without modifying TableModel structure)
@@ -140,6 +143,14 @@ private static List<object> CreateInterfaceModels(
             Name = kvp.Key,
             Columns = kvp.Value.Select(sig => FindMatchingColumn(sig, tablesList))
                 .Where(c => c != null)
+                .Select(col => new
+                {
+                    SchemaName = Utilities.GenerationUtilities.SanitizeName(col!.SchemaName),
+                    col!.LogicalName,
+                    col.DisplayName,
+                    col.Description,
+                    TypeSignature = Utilities.GenerationUtilities.GetTypeSignature(col),
+                })
                 .ToList(),
         }).ToList<object>();
     }

src/DataverseProxyGenerator.Core/Generation/Mappers/EnumMapper.cs

@@ -10,7 +10,7 @@ public static object MapToTemplateModel(EnumColumnModel input, GenerationContext
         ArgumentNullException.ThrowIfNull(context);
         ArgumentNullException.ThrowIfNull(input);
 
-        var sanitizedOptionSetName = DataverseProxyGenerator.Core.Generation.Utilities.GenerationUtilities.SanitizeName(input.OptionsetName, "UnknownOptionSet");
+        var sanitizedOptionSetName = GenerationUtilities.SanitizeName(input.OptionsetName, "UnknownOptionSet");
 
         // Generate unique enum member names to handle duplicate labels using groupBy approach
         var sanitizedOptions = input.OptionsetValues
@@ -42,4 +42,4 @@ public static object MapToTemplateModel(EnumColumnModel input, GenerationContext
             version = context.Version,
         };
     }
-}
+}

src/DataverseProxyGenerator.Core/Generation/Mappers/HelperFileMapper.cs

@@ -12,4 +12,4 @@ public static object MapToTemplateModel(string templateName, GenerationContext c
             version = context.Version,
         };
     }
-}
+}

src/DataverseProxyGenerator.Core/Generation/Mappers/IntersectionInterfaceMapper.cs

@@ -28,4 +28,4 @@ public static object MapToTemplateModel((string InterfaceName, IEnumerable<Colum
             version = context.Version,
         };
     }
-}
+}

src/DataverseProxyGenerator.Core/Generation/Mappers/ProxyClassMapper.cs

@@ -45,4 +45,4 @@ public static object MapToTemplateModel((TableModel Table, IReadOnlyList<string>
             version = context.Version,
         };
     }
-}
+}

src/DataverseProxyGenerator.Core/Generation/Mappers/XrmContextMapper.cs

@@ -17,4 +17,4 @@ public static object MapToTemplateModel(IEnumerable<TableModel> input, Generatio
             version = context.Version,
         };
     }
-}
+}

src/DataverseProxyGenerator.Core/Generation/Utilities/FilePathHelper.cs

@@ -35,6 +35,7 @@ public static string GetIntersectionInterfaceFilePath(string sanitizedName)
     /// <summary>
     /// Gets the output path for the Xrm context class file.
     /// </summary>
+    /// <param name="sanitizedName">The sanitized name for the context file.</param>
     /// <returns>The relative file path.</returns>
     public static string GetXrmContextFilePath(string sanitizedName)
     {

src/DataverseProxyGenerator.Core/Generation/Utilities/GenerationUtilities.cs

@@ -24,4 +24,4 @@ public static string GetTypeSignature(ColumnModel column)
     {
         return TypeSignatureHelper.GetPropertyTypeSignature(column);
     }
-}
+}

src/DataverseProxyGenerator.Core/Templates/SingleFile.scriban-cs

@@ -216,19 +216,22 @@ public interface {{interface.Name}}
 [System.CodeDom.Compiler.GeneratedCode("DataverseProxyGenerator", "{{version}}")]
 [DataContract]
 #pragma warning disable CS8981
-public enum {{optionsetName}}
+public enum {{optionset.optionsetName}}
 #pragma warning restore CS8981
 {
-    {{~ for pair in optionset.Values | array.sort "Value" ~}}
+    {{~ for pair in optionset.optionsetValues | array.sort "Value" ~}}
     [EnumMember]
     {{~ for loc in pair.Localizations ~}}
     [OptionSetMetadata("{{ loc.Value }}", {{ loc.Key }})]
     {{~ end ~}}
     {{ pair.Name }} = {{ pair.Value }},
+    {{~ if !for.last ~}}
+
+    {{~ end ~}}
     {{~ end ~}}
 }
-{{~ end ~}}
 
+{{~ end ~}}
 // ============================================================================
 // ATTRIBUTE CLASSES
 // ============================================================================