Split system object type (Azure#51595)

* wip

* Create SystemObjectModelTypeProvider and make InheritableSystemObjectModelProvider a subtype of it

Author: live1206

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

@@ -52,7 +52,7 @@ protected override void Configure()
             AddMetadataReference(MetadataReference.CreateFromFile(typeof(ArmClient).Assembly.Location));
             AddVisitor(new RestClientVisitor());
             AddVisitor(new ResourceVisitor());
-            AddVisitor(new InheritableSystemObjectModelVisitor());
+            AddVisitor(new SystemObjectModelVisitor());
             AddVisitor(new NameVisitor());
             AddVisitor(new TypeFilterVisitor());
             AddVisitor(new SerializationVisitor());

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

@@ -184,7 +184,7 @@ protected override TypeProvider[] BuildTypeProviders()
             var extensions = BuildExtensions(resources);
 
             return [
-                .. base.BuildTypeProviders().Where(t => t is not InheritableSystemObjectModelProvider),
+                .. base.BuildTypeProviders().Where(t => t is not SystemObjectModelProvider),
                 ArmOperation,
                 GenericArmOperation,
                 .. resources,

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

@@ -67,11 +67,12 @@ private string BuildResourceProviderName()
         /// <inheritdoc/>
         protected override CSharpType? CreateCSharpTypeCore(InputType inputType)
         {
-            if (inputType is InputModelType model && KnownManagementTypes.TryGetManagementType(model.CrossLanguageDefinitionId, out var replacedType))
+            if (inputType is InputModelType model && (KnownManagementTypes.TryGetInheritableSystemType(model.CrossLanguageDefinitionId, out var replacedType) || KnownManagementTypes.TryGetSystemType(model.CrossLanguageDefinitionId, out replacedType)))
             {
                 return replacedType;
             }
-            else if (inputType is InputPrimitiveType primitiveType && KnownManagementTypes.TryGetPrimitiveType(primitiveType.CrossLanguageDefinitionId, out var csharpType))
+
+            if (inputType is InputPrimitiveType primitiveType && KnownManagementTypes.TryGetPrimitiveType(primitiveType.CrossLanguageDefinitionId, out var csharpType))
             {
                 return csharpType;
             }
@@ -81,10 +82,15 @@ private string BuildResourceProviderName()
         /// <inheritdoc/>
         protected override ModelProvider? CreateModelCore(InputModelType model)
         {
-            if (KnownManagementTypes.TryGetManagementType(model.CrossLanguageDefinitionId, out var replacedType))
+            if (KnownManagementTypes.TryGetInheritableSystemType(model.CrossLanguageDefinitionId, out var replacedType))
             {
                 return new InheritableSystemObjectModelProvider(replacedType.FrameworkType, model);
             }
+
+            if (KnownManagementTypes.TryGetSystemType(model.CrossLanguageDefinitionId, out replacedType))
+            {
+                return new SystemObjectModelProvider(replacedType.FrameworkType, model);
+            }
             return base.CreateModelCore(model);
         }
 

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

@@ -28,17 +28,21 @@ internal class KnownManagementTypes
         public delegate MethodBodyStatement SerializationExpression(ValueExpression value, ScopedApi<Utf8JsonWriter> writer, ScopedApi<ModelReaderWriterOptions> options, SerializationFormat format);
         public delegate ValueExpression DeserializationExpression(CSharpType valueType, ScopedApi<JsonElement> element, SerializationFormat format);
 
-        private static readonly IReadOnlyDictionary<string, CSharpType> _idToTypeMap = new Dictionary<string, CSharpType>()
+        private static readonly IReadOnlyDictionary<string, CSharpType> _idToInheritableSystemTypeMap = new Dictionary<string, CSharpType>()
+        {
+            ["Azure.ResourceManager.CommonTypes.ProxyResource"] = typeof(ResourceData),
+            ["Azure.ResourceManager.CommonTypes.Resource"] = typeof(ResourceData),
+            ["Azure.ResourceManager.CommonTypes.TrackedResource"] = typeof(TrackedResourceData),
+        };
+
+        private static readonly IReadOnlyDictionary<string, CSharpType> _idToSystemTypeMap = new Dictionary<string, CSharpType>()
         {
             ["Azure.ResourceManager.CommonTypes.ExtendedLocation"] = typeof(ExtendedLocation),
             ["Azure.ResourceManager.CommonTypes.ExtendedLocationType"] = typeof(ExtendedLocationType),
             ["Azure.ResourceManager.CommonTypes.ManagedServiceIdentity"] = typeof(ManagedServiceIdentity),
             ["Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType"] = typeof(ManagedServiceIdentityType),
             ["Azure.ResourceManager.CommonTypes.OperationStatusResult"] = typeof(OperationStatusResult),
-            ["Azure.ResourceManager.CommonTypes.ProxyResource"] = typeof(ResourceData),
-            ["Azure.ResourceManager.CommonTypes.Resource"] = typeof(ResourceData),
             ["Azure.ResourceManager.CommonTypes.SystemData"] = typeof(SystemData),
-            ["Azure.ResourceManager.CommonTypes.TrackedResource"] = typeof(TrackedResourceData),
             ["Azure.ResourceManager.CommonTypes.UserAssignedIdentity"] = typeof(UserAssignedIdentity),
         };
 
@@ -66,11 +70,13 @@ private static ValueExpression DeserializeNewInstanceStringLikeType(CSharpType v
             [typeof(ResourceType)] = DeserializeNewInstanceStringLikeType,
         };
 
-        private static readonly HashSet<CSharpType> _knownTypes = _idToTypeMap.Values.ToHashSet(new CSharpFullNameComparer());
+        private static readonly HashSet<CSharpType> _knownTypes = _idToInheritableSystemTypeMap.Values.Concat(_idToSystemTypeMap.Values).ToHashSet(new CSharpFullNameComparer());
 
         public static bool IsKnownManagementType(CSharpType type) => _knownTypes.Contains(type);
 
-        public static bool TryGetManagementType(string id, [MaybeNullWhen(false)] out CSharpType type) => _idToTypeMap.TryGetValue(id, out type);
+        public static bool TryGetInheritableSystemType(string id, [MaybeNullWhen(false)] out CSharpType type) => _idToInheritableSystemTypeMap.TryGetValue(id, out type);
+
+        public static bool TryGetSystemType(string id, [MaybeNullWhen(false)] out CSharpType type) => _idToSystemTypeMap.TryGetValue(id, out type);
 
         // The comparison could be CSharpType from Azure.ResourceManager, which is a framework type
         // and CSharpType from InheritableSystemObjectModelProvider, which is not a framework type, they should still be equal if namespace and name match

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

@@ -2,28 +2,14 @@
 // Licensed under the MIT License.
 
 using Microsoft.TypeSpec.Generator.Input;
-using Microsoft.TypeSpec.Generator.Providers;
 using System;
 
 namespace Azure.Generator.Management.Providers
 {
-    internal class InheritableSystemObjectModelProvider : ModelProvider
+    internal class InheritableSystemObjectModelProvider : SystemObjectModelProvider
     {
-        internal readonly Type _type;
-
-        public InheritableSystemObjectModelProvider(Type type, InputModelType inputModel) : base(inputModel)
+        public InheritableSystemObjectModelProvider(Type type, InputModelType inputModel) : base(type, inputModel)
         {
-            _type = type;
-            CrossLanguageDefinitionId = inputModel.CrossLanguageDefinitionId;
         }
-
-        internal string CrossLanguageDefinitionId { get; }
-
-        protected override string BuildName() => _type.Name;
-
-        protected override string BuildRelativeFilePath()
-            => throw new InvalidOperationException("This type should not be writing in generation");
-
-        protected override string BuildNamespace() => _type.Namespace!;
     }
 }

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

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.TypeSpec.Generator.Input;
+using Microsoft.TypeSpec.Generator.Providers;
+using System;
+
+namespace Azure.Generator.Management.Providers
+{
+    internal class SystemObjectModelProvider : ModelProvider
+    {
+        internal readonly Type _type;
+
+        public SystemObjectModelProvider(Type type, InputModelType inputModel) : base(inputModel)
+        {
+            _type = type;
+            CrossLanguageDefinitionId = inputModel.CrossLanguageDefinitionId;
+        }
+
+        internal string CrossLanguageDefinitionId { get; }
+
+        protected override string BuildName() => _type.Name;
+
+        protected override string BuildRelativeFilePath()
+            => throw new InvalidOperationException("This type should not be writing in generation");
+
+        protected override string BuildNamespace() => _type.Namespace!;
+    }
+}

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Visitors/InheritableSystemObjectModelVisitor.cs renamed to eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Visitors/SystemObjectModelVisitor.cs

@@ -18,11 +18,11 @@
 
 namespace Azure.Generator.Management.Visitors;
 
-internal class InheritableSystemObjectModelVisitor : ScmLibraryVisitor
+internal class SystemObjectModelVisitor : ScmLibraryVisitor
 {
     protected override ModelProvider? PreVisitModel(InputModelType model, ModelProvider? type)
     {
-        if (type is InheritableSystemObjectModelProvider systemType)
+        if (type is SystemObjectModelProvider systemType)
         {
             UpdateNamespace(systemType);
         }
@@ -41,7 +41,7 @@ internal class InheritableSystemObjectModelVisitor : ScmLibraryVisitor
             UpdateModelFactory(modelFactory);
         }
 
-        if (type is InheritableSystemObjectModelProvider systemType)
+        if (type is SystemObjectModelProvider systemType)
         {
             UpdateNamespace(systemType);
         }
@@ -68,7 +68,7 @@ private static void UpdateModelFactory(ModelFactoryProvider modelFactory)
         modelFactory.Update(methods: methods);
     }
 
-    private static void UpdateNamespace(InheritableSystemObjectModelProvider systemType)
+    private static void UpdateNamespace(SystemObjectModelProvider systemType)
     {
         // This is needed because we updated the namespace with NamespaceVisitor in Azure generator earlier
         systemType.Update(@namespace: systemType._type.Namespace);