Fix property name for safe flatten (#51751)

Author: live1206

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Extensions/StringExtensions.cs

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Humanizer;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.Generator.Management.Extensions
+{
+    internal static class StringExtensions
+    {
+        public static IEnumerable<string> SplitByCamelCase(this string camelCase)
+        {
+            return camelCase.Humanize().Split(' ').Select(w => w.FirstCharToUpperCase());
+        }
+
+        public static string FirstCharToUpperCase(this string str)
+        {
+            if (string.IsNullOrEmpty(str) || char.IsUpper(str[0]))
+                return str;
+
+            return char.ToUpper(str[0]) + str.Substring(1);
+        }
+    }
+}

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/ManagementClientGenerator.cs

@@ -50,14 +50,15 @@ protected override void Configure()
             base.Configure();
             // Include Azure.ResourceManager
             AddMetadataReference(MetadataReference.CreateFromFile(typeof(ArmClient).Assembly.Location));
+            // renaming should come first
+            AddVisitor(new NameVisitor());
+            AddVisitor(new SerializationVisitor());
+            AddVisitor(new SafeFlattenVisitor());
             AddVisitor(new RestClientVisitor());
             AddVisitor(new ResourceVisitor());
             AddVisitor(new SystemObjectModelVisitor());
-            AddVisitor(new NameVisitor());
             AddVisitor(new TypeFilterVisitor());
-            AddVisitor(new SerializationVisitor());
             AddVisitor(new PaginationVisitor());
-            AddVisitor(new SafeFlattenVisitor());
             AddVisitor(new ModelFactoryVisitor());
         }
     }

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Utilities/PropertyHelpers.cs

@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Azure.Generator.Management.Extensions;
+using Humanizer;
+using Microsoft.TypeSpec.Generator.Providers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.Generator.Management.Utilities
+{
+    internal class PropertyHelpers
+    {
+        public static string GetCombinedPropertyName(PropertyProvider innerProperty, PropertyProvider immediateParentProperty)
+        {
+            var immediateParentPropertyName = GetPropertyName(immediateParentProperty);
+
+            if (innerProperty.Type.Equals(typeof(bool)) || innerProperty.Type.Equals(typeof(bool?)))
+            {
+                return innerProperty.Name.Equals("Enabled", StringComparison.Ordinal) ? $"{immediateParentPropertyName}{innerProperty.Name}" : innerProperty.Name;
+            }
+
+            if (innerProperty.Name.Equals("Id", StringComparison.Ordinal))
+                return $"{immediateParentPropertyName}{innerProperty.Name}";
+
+            if (immediateParentPropertyName.EndsWith(innerProperty.Name, StringComparison.Ordinal))
+                return immediateParentPropertyName;
+
+            var parentWords = immediateParentPropertyName.SplitByCamelCase();
+            if (immediateParentPropertyName.EndsWith("Profile", StringComparison.Ordinal) ||
+                immediateParentPropertyName.EndsWith("Policy", StringComparison.Ordinal) ||
+                immediateParentPropertyName.EndsWith("Configuration", StringComparison.Ordinal) ||
+                immediateParentPropertyName.EndsWith("Properties", StringComparison.Ordinal) ||
+                immediateParentPropertyName.EndsWith("Settings", StringComparison.Ordinal))
+            {
+                parentWords = parentWords.Take(parentWords.Count() - 1);
+            }
+
+            var parentWordArray = parentWords.ToArray();
+            var parentWordsHash = new HashSet<string>(parentWordArray);
+            var nameWords = innerProperty.Name.SplitByCamelCase().ToArray();
+            var lastWord = string.Empty;
+            for (int i = 0; i < nameWords.Length; i++)
+            {
+                var word = nameWords[i];
+                lastWord = word;
+                if (parentWordsHash.Contains(word))
+                {
+                    if (i == nameWords.Length - 2 && parentWordArray.Length >= 2 && word.Equals(parentWordArray[parentWordArray.Length - 2], StringComparison.Ordinal))
+                    {
+                        parentWords = parentWords.Take(parentWords.Count() - 2);
+                        break;
+                    }
+                    {
+                        return innerProperty.Name;
+                    }
+                }
+
+                //need to depluralize the last word and check
+                if (i == nameWords.Length - 1 && parentWordsHash.Contains(lastWord.Pluralize()))
+                    return innerProperty.Name;
+            }
+
+            immediateParentPropertyName = string.Join("", parentWords);
+
+            return $"{immediateParentPropertyName}{innerProperty.Name}";
+        }
+
+        private static string GetPropertyName(PropertyProvider property)
+        {
+            const string properties = "Properties";
+            if (property.Name.Equals(properties, StringComparison.Ordinal))
+            {
+                string typeName = property.Type.Name;
+                int index = typeName.IndexOf(properties);
+                if (index > -1 && index + properties.Length == typeName.Length)
+                    return typeName.Substring(0, index);
+
+                return typeName;
+            }
+            return property.Name;
+        }
+    }
+}

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Visitors/NameVisitor.cs

@@ -74,23 +74,20 @@ internal class NameVisitor : ScmLibraryVisitor
 
         if (TryTransformUrlToUri(model.Name, out var newName))
         {
-            UpdateConstructors(type, newName);
             UpdateSerialization(type, newName, type.Name);
             type.Update(name: newName);
         }
 
         if (_knownTypes.Contains(model.Name))
         {
             newName = $"{ManagementClientGenerator.Instance.TypeFactory.ResourceProviderName}{model.Name}";
-            UpdateConstructors(type, newName);
             UpdateSerialization(type, newName, type.Name);
             type.Update(name: newName);
         }
 
         if (inputLibrary.TryFindEnclosingResourceNameForResourceUpdateModel(model, out var enclosingResourceName))
         {
             newName = $"{enclosingResourceName}Patch";
-            UpdateConstructors(type, newName);
             UpdateSerialization(type, newName, type.Name);
             type.Update(name: newName);
 
@@ -103,16 +100,6 @@ internal class NameVisitor : ScmLibraryVisitor
         return base.PreVisitModel(model, type);
     }
 
-    // TODO: we will remove this manual updated when https://github.com/microsoft/typespec/issues/8079 is resolved
-    private static void UpdateConstructors(ModelProvider type, string newName)
-    {
-        foreach (var constructor in type.Constructors)
-        {
-            // Update the constructor name to match the model name
-            constructor.Signature.Update(name: newName);
-        }
-    }
-
     // TODO: we will remove this manual updated when https://github.com/microsoft/typespec/issues/8079 is resolved
     private void UpdateSerialization(ModelProvider type, string newName, string originalName)
     {

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Visitors/SafeFlattenVisitor.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Azure.Generator.Management.Utilities;
 using Microsoft.TypeSpec.Generator.ClientModel;
 using Microsoft.TypeSpec.Generator.Expressions;
 using Microsoft.TypeSpec.Generator.Input;
@@ -40,22 +41,22 @@ internal class SafeFlattenVisitor : ScmLibraryVisitor
                     var propertyTypeProvider = ManagementClientGenerator.Instance.TypeFactory.CreateModel(propertyModelType)!;
                     if (propertyTypeProvider.Properties.Count == 1)
                     {
-                        var singleProperty = propertyTypeProvider.Properties.Single();
+                        var innerProperty = propertyTypeProvider.Properties.Single();
 
                         // make the current property internal
-                        var internalProperty = type!.Properties.Single(p => p.Type.AreNamesEqual(propertyTypeProvider.Type)); // type equal not working here, so we use AreNamesEqual
-                        internalizedProperties.Add(internalProperty);
+                        var immediateParentProperty = type!.Properties.Single(p => p.Type.AreNamesEqual(propertyTypeProvider.Type)); // type equal not working here, so we use AreNamesEqual
+                        internalizedProperties.Add(immediateParentProperty);
 
                         // flatten the single property to public and associate it with the internal property
-                        var (isFlattenedPropertyReadOnly, includeGetterNullCheck, includeSetterNullCheck) = GetFlags(property.IsReadOnly, singleProperty, propertyTypeProvider, propertyTypeProvider);
-                        var flattenPropertyName = $"{internalProperty.Name}{singleProperty.Name}"; // TODO: handle name conflicts
+                        var (isFlattenedPropertyReadOnly, includeGetterNullCheck, includeSetterNullCheck) = GetFlags(property.IsReadOnly, innerProperty, propertyTypeProvider, propertyTypeProvider);
+                        var flattenPropertyName = PropertyHelpers.GetCombinedPropertyName(innerProperty, immediateParentProperty); // TODO: handle name conflicts
                         var flattenPropertyBody = new MethodPropertyBody(
-                            BuildGetter(includeGetterNullCheck, internalProperty, propertyTypeProvider, singleProperty),
-                            isFlattenedPropertyReadOnly ? null : BuildSetter(includeSetterNullCheck, propertyTypeProvider, internalProperty, singleProperty)
+                            BuildGetter(includeGetterNullCheck, immediateParentProperty, propertyTypeProvider, innerProperty),
+                            isFlattenedPropertyReadOnly ? null : BuildSetter(includeSetterNullCheck, propertyTypeProvider, immediateParentProperty, innerProperty)
                         );
-                        var flattenedProperty = new PropertyProvider(singleProperty.Description, singleProperty.Modifiers, singleProperty.Type, flattenPropertyName, flattenPropertyBody, type, singleProperty.ExplicitInterface, singleProperty.WireInfo, singleProperty.Attributes);
+                        var flattenedProperty = new PropertyProvider(innerProperty.Description, innerProperty.Modifiers, innerProperty.Type, flattenPropertyName, flattenPropertyBody, type, innerProperty.ExplicitInterface, innerProperty.WireInfo, innerProperty.Attributes);
                         flattenedProperties.Add(flattenedProperty);
-                        flattenedPropertyMap.Add(internalProperty.Type, flattenedProperty);
+                        flattenedPropertyMap.Add(immediateParentProperty.Type, flattenedProperty);
                     }
                 }
             }