Small improvements to code generation

Geco/Common/BaseGenerator.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Humanizer;
 
 namespace Geco.Common
 {
@@ -100,7 +101,7 @@ protected void Comma()
         }
 
         /// <summary>
-        ///     Write comma , on the previous line if a new line is written
+        ///     Write comma , on the previous line if a new line is written with the same indent. Changing indent removes comma.
         /// </summary>
         protected void CommaIfNewLine()
         {
@@ -163,6 +164,20 @@ protected void WD(string text = "", bool write = true)
                 Dedent();
         }
 
+        /// <summary>
+        ///     Write on Previous line
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="write"></param>
+        protected void WP(string text, bool write = true)
+        {
+            if (write)
+            {
+                _tw.Write(text);
+                if (OutputToConsole) Console.Write(text);
+            }
+        }
+
         /// <summary>
         ///     Write line with current indent
         /// </summary>
@@ -207,6 +222,7 @@ protected void W(string text = "", bool write = true)
         protected void Indent()
         {
             _indent++;
+            commaNewLine = false;
         }
 
         /// <summary>
@@ -215,18 +231,39 @@ protected void Indent()
         protected void Dedent()
         {
             _indent--;
+            commaNewLine = false;
         }
 
+        /// <summary>
+        ///     Returns a string with comma joined values
+        /// </summary>
         protected string CommaJoin(IEnumerable<string> values)
         {
             return string.Join(", ", values);
         }
 
+        /// <summary>
+        ///     Returns a string with comma joined values
+        /// </summary>
         protected string CommaJoin<T>(IEnumerable<T> values, Func<T, string> selector)
         {
             return string.Join(", ", values.Select(selector));
         }
 
+        /// <summary>
+        /// Pluralizes the input term if collection contains more than one element
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="inputTern">The input term singular</param>
+        /// <param name="collection">The collection that determines the pluralization</param>
+        /// <returns>The inputTerm pluralized if collection has more than 1 element, inputTerm unchanged otherwise</returns>
+        public string Pluralize<T>(string inputTern, IReadOnlyCollection<T> collection)
+        {
+            if (collection?.Count > 1)
+                return inputTern.Pluralize();
+            return inputTern;
+        }
+
         protected IDisposable OnBlockEnd(Action action = null, bool write = true)
         {
             return new DisposableAction(write ? action : null);

Geco/Database/EntityFrameworkCoreReverseModelGenerator.cs

@@ -30,7 +30,7 @@ public EntityFrameworkCoreReverseModelGenerator(IMetadataProvider provider, IInf
 
         protected override void Generate()
         {
-            IgnoreUnsuportedColumns();
+            IgnoreUnsupportedColumns();
             FilterTables();
             WriteEntityFiles();
             WriteContextFile();
@@ -59,7 +59,7 @@ private void WriteEntityFiles()
 
         private void WriteContextFile()
         {
-            using (BeginFile($"{options.ContextName ?? Inf.Pascalise(Db.Name)}.cs"))
+            using (BeginFile($"{options.ContextName ?? Inf.Pascalise(Db.Name)}.Context.cs"))
             using (WriteHeader())
             {
                 W($"[GeneratedCode(\"Geco\", \"{Assembly.GetEntryAssembly().GetName().Version}\")]",
@@ -170,7 +170,8 @@ private void WriteDbSets()
                 var className = table.Metadata["Class"];
                 var plural = Inf.Pluralise(className);
                 table.Metadata["DbSet"] = plural;
-                W($"public virtual DbSet<{className}> {plural} {{ get; set; }}");
+                W($"public virtual DbSet<{className}> {plural} {{ get; set; }}", options.AdvancedGeneration == false);
+                W($"public virtual DbSet<{className}> {plural} => Set<{className}>();", options.AdvancedGeneration);
             }
         }
 
@@ -245,8 +246,8 @@ private void WriteEntity(Table table)
                         foreach (var column in fk.FromColumns) column.Metadata["NavProperty"] = propertyName;
                         W("[JsonIgnore]", options.JsonSerialization);
                         W($"public {targetClassName} {propertyName} {{ get; set; }}");
+                        WP($" //{Pluralize("Column", fk.FromColumns)}: {CommaJoin(fk.FromColumns, c => c.Name)}, FK: {fk.Name}", options.GenerateComments);
                     }
-
                     W();
                 }
 
@@ -329,7 +330,7 @@ private void WriteModelBuilderConfigurations()
                         IW($".HasColumnName(\"{column.Name}\")");
                         W($".HasColumnType(\"{GetColumnType(column)}\")");
                         if (!string.IsNullOrEmpty(column.DefaultValue))
-                            W($".HasDefaultValueSql(\"{RemoveExtraParantesis(column.DefaultValue)}\")");
+                            W($".HasDefaultValueSql(\"{RemoveExtraParenthesis(column.DefaultValue)}\")");
                         if (IsString(column.DataType) && !column.IsNullable) W(".IsRequired()");
                         if (IsString(column.DataType) && column.MaxLength != -1)
                             W($".HasMaxLength({column.MaxLength})");
@@ -454,14 +455,14 @@ private string GetColumnType(Column column)
             return column.DataType;
         }
 
-        private string RemoveExtraParantesis(string stringValue)
+        private string RemoveExtraParenthesis(string stringValue)
         {
             if (stringValue.StartsWith("(") && stringValue.EndsWith(")"))
-                return RemoveExtraParantesis(stringValue.Substring(1, stringValue.Length - 2));
+                return RemoveExtraParenthesis(stringValue.Substring(1, stringValue.Length - 2));
             return stringValue;
         }
 
-        private void IgnoreUnsuportedColumns()
+        private void IgnoreUnsupportedColumns()
         {
             foreach (var schema in Db.Schemas)
             foreach (var table in schema.Tables)

Geco/Database/EntityFrameworkCoreReverseModelGeneratorOptions.cs

@@ -19,5 +19,6 @@ public class EntityFrameworkCoreReverseModelGeneratorOptions
         public string TablesRegex { get; set; }
         public List<string> ExcludedTables { get; } = new List<string>();
         public string ExcludedTablesRegex { get; set; }
+        public bool AdvancedGeneration { get; set; }
     }
 }