Entity names are pascal cased and singularized

ErikEJ · Aug 1, 2024 · f22fb20 · f22fb20
1 parent 3f881dd
commit f22fb20
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 58 deletions.
diff --git a/src/Core/RevEng.Core.80/DabBuilder.cs b/src/Core/RevEng.Core.80/DabBuilder.cs
@@ -110,7 +110,7 @@ public string GetDabConfigCmdFile()
                     dbObject.Columns
                     .Select(c => c.Name).ToList());
 
-                var type = dbObject.Name.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase);
+                var type = GenerateEntityName(dbObject.Name.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase));
 
                 if (dbObject.PrimaryKey != null)
                 {
@@ -134,7 +134,7 @@ public string GetDabConfigCmdFile()
                     dbObject.Columns
                     .Select(c => c.Name).ToList());
 
-                var type = dbObject.Name.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase);
+                var type = GenerateEntityName(dbObject.Name.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase));
 
                 if (dbObject.PrimaryKey == null)
                 {
@@ -165,11 +165,11 @@ public string GetDabConfigCmdFile()
                     continue;
                 }
 
-                var type = dbObject.Name.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase);
+                var type = GenerateEntityName(dbObject.Name.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase));
 
                 foreach (var fk in dbObject.ForeignKeys)
                 {
-                    var fkType = fk.PrincipalTable.Name.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase);
+                    var fkType =  GenerateEntityName(fk.PrincipalTable.Name.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase));
                     sb.AppendLine(CultureInfo.InvariantCulture, $"dab update {type} --relationship {fkType} --target.entity {fkType} --cardinality one");
                     sb.AppendLine(CultureInfo.InvariantCulture, $"dab update {fkType} --relationship {type} --target.entity {type} --cardinality many");
                 }
@@ -183,7 +183,7 @@ public string GetDabConfigCmdFile()
 
                 foreach (var procedure in procedures.Routines)
                 {
-                    var type = procedure.Name.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase);
+                    var type = GenerateEntityName(procedure.Name.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase));
 
                     sb.AppendLine(CultureInfo.InvariantCulture, $"dab add \"{type}\" --source \"[{procedure.Schema}].[{procedure.Name}]\" --source.type \"stored-procedure\" --permissions \"anonymous:execute\" --rest.methods \"get\" --graphql.operation \"query\" ");
                 }
@@ -205,6 +205,41 @@ private static bool BreaksOn(DatabaseTable dbObject)
                 || !dbObject.Columns.Any();
         }
 
+        private static string GenerateEntityName(string value)
+        {
+            var candidateStringBuilder = new StringBuilder();
+            var previousLetterCharInWordIsLowerCase = false;
+            var isFirstCharacterInWord = true;
+
+            foreach (var c in value)
+            {
+                var isNotLetterOrDigit = !char.IsLetterOrDigit(c);
+                if (isNotLetterOrDigit
+                    || (previousLetterCharInWordIsLowerCase && char.IsUpper(c)))
+                {
+                    isFirstCharacterInWord = true;
+                    previousLetterCharInWordIsLowerCase = false;
+                    if (isNotLetterOrDigit)
+                    {
+                        continue;
+                    }
+                }
+
+                candidateStringBuilder.Append(
+                    isFirstCharacterInWord ? char.ToUpperInvariant(c) : char.ToLowerInvariant(c));
+                isFirstCharacterInWord = false;
+                if (char.IsLower(c))
+                {
+                    previousLetterCharInWordIsLowerCase = true;
+                }
+            }
+
+            var pluralizer = new HumanizerPluralizer();
+            var candidate = candidateStringBuilder.ToString();
+
+            return pluralizer.Singularize(candidate);
+        }
+
         private void RemoveExcludedColumns(DatabaseTable dbObject)
         {
             var excludedColumns = options.Tables.Find(t => t.Name == $"[{dbObject.Schema}].[{dbObject.Name}]")?.ExcludedColumns;

diff --git a/test/Ef7Playground/Ef7Playground/dab-options.json b/test/Ef7Playground/Ef7Playground/dab-options.json
@@ -1,7 +1,8 @@
 {
-   "ConnectionString": "Data Source=(local);Initial Catalog=Chinook;Integrated Security=true;",
-   "Dacpac": "C:\\Code\\Github\\EFCorePowerTools\\src\\Core\\NUnitTestCore\\Dacpac\\Chinook.dacpac",
-   "DatabaseType": 8,
+   "ConnectionString": null,
+   "ConnectionStringName": "dab-connection-string",
+   "Dacpac": null,
+   "DatabaseType": 3,
    "ProjectPath": "C:\\Code\\Github\\EFCorePowerTools\\test\\Ef7Playground\\Ef7Playground",
    "Tables": [
       {