Skip to content

Fix MPG generator to emit model factory methods for models with flattened read-only properties #54447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
+19 −6
Draft

Fix MPG generator to emit model factory methods for models with flattened read-only properties #54447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
777d053
Initial plan
Copilot Dec 11, 2025
3bb9792
Fix MPG generator to defer model factory type filtering until after f…
Copilot Dec 11, 2025
4d0cbc2
Address code review feedback - simplify ModelFactoryVisitor
Copilot Dec 11, 2025
bc04ea7
Improve logic to handle multiple ModelFactoryProvider instances
Copilot Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...tp-client-csharp-mgmt/generator/Azure.Generator.Management/src/ManagementOutputLibrary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ private HashSet<CSharpType> ModelFactoryModels
{
get
{
BuildModelTypes();
EnsureModelTypesBuilt();
return _modelFactoryModels!;
}
}
Expand All @@ -225,12 +225,15 @@ private HashSet<CSharpType> AllModelTypes
{
get
{
BuildModelTypes();
EnsureModelTypesBuilt();
return _allModelTypes!;
}
}

private void BuildModelTypes()
/// <summary>
/// Ensures model types are built. This should be called after all model modifications (like flattening) are complete.
/// </summary>
internal void EnsureModelTypesBuilt()
{
if (_modelFactoryModels is not null && _allModelTypes is not null)
{
Expand Down
16 changes: 13 additions & 3 deletions ...ient-csharp-mgmt/generator/Azure.Generator.Management/src/Visitors/ModelFactoryVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,20 @@ internal class ModelFactoryVisitor : ScmLibraryVisitor
{ "ETag", "etag" }
};

protected override TypeProvider? VisitType(TypeProvider type)
private bool _modelTypesEnsured = false;

protected override TypeProvider? PostVisitType(TypeProvider type)
{
// Process model factory after all models have been visited
if (type is ModelFactoryProvider modelFactory)
{
// Ensure model types are built once, now that all flattening is complete
if (!_modelTypesEnsured)
{
ManagementClientGenerator.Instance.OutputLibrary.EnsureModelTypesBuilt();
_modelTypesEnsured = true;
}

var updatedMethods = new List<MethodProvider>();
foreach (var method in modelFactory.Methods)
{
Expand All @@ -39,9 +49,9 @@ internal class ModelFactoryVisitor : ScmLibraryVisitor
}
}
modelFactory.Update(methods: updatedMethods);
return modelFactory;
}
return base.VisitType(type);

return base.PostVisitType(type);
}

private void FixArgumentNullExceptionXmlDoc(MethodProvider method)
Expand Down