Skip to content

Fix system model base provider resolution #11585

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

Merged
Wei Hu (live1206) merged 1 commit into from
Aug 11, 2026
+38 −0
Merged

Fix system model base provider resolution #11585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions .../http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Providers/ModelProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,16 @@ private static bool IsDiscriminator(InputProperty property)
return modelProvider;
}

if (CustomCodeView?.BaseType is null && _inputModel.BaseModel is not null)
{
var inputBaseModelProvider = CodeModelGenerator.Instance.TypeFactory.CreateModel(_inputModel.BaseModel);
if (inputBaseModelProvider is not null && inputBaseModelProvider.Type.AreNamesEqual(baseType))
{
CodeModelGenerator.Instance.TypeFactory.CSharpTypeMap[baseType] = inputBaseModelProvider;
return inputBaseModelProvider;
}
}

if (CustomCodeView?.BaseType != null && !string.IsNullOrEmpty(baseType.Namespace))
{
foreach (var (mapKey, mapValue) in CodeModelGenerator.Instance.TypeFactory.CSharpTypeMap)
Expand Down
28 changes: 28 additions & 0 deletions ...p/generator/Microsoft.TypeSpec.Generator/test/Providers/SystemObjectModelProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,34 @@ public void CanRepresentExternalBaseChainWithoutSeparateInheritedProperties()
Assert.AreEqual("ResourceType", provider.Properties[0].Name);
}

[Test]
public void BaseSystemProviderIsCreatedFromInputModelHierarchy()
{
var baseInputModel = InputFactory.Model(
"SystemException",
properties: [InputFactory.Property("message", InputPrimitiveType.String)]);
var derivedInputModel = InputFactory.Model(
"ArgumentException",
properties: [InputFactory.Property("paramName", InputPrimitiveType.String)],
baseModel: baseInputModel);

var baseSystemType = new CSharpType(typeof(SystemException));
var derivedSystemType = new CSharpType(typeof(ArgumentException));
MockHelpers.LoadMockGenerator(
inputModelTypes: [baseInputModel, derivedInputModel],
createModelCore: model => model == baseInputModel
? new SystemObjectModelProvider(baseSystemType, model)
: new SystemObjectModelProvider(derivedSystemType, model));

var provider = CodeModelGenerator.Instance.TypeFactory.CreateModel(derivedInputModel);

Assert.IsNotNull(provider);
Assert.IsNotNull(provider!.BaseModelProvider);
Assert.IsInstanceOf<SystemObjectModelProvider>(provider.BaseModelProvider);
Assert.AreEqual("SystemException", provider.BaseModelProvider!.Name);
Assert.AreEqual("Message", provider.BaseModelProvider.Properties.Single().Name);
}

// -------------------------------------------------------------------
// 3. Property deduplication: properties matching framework base are skipped
// -------------------------------------------------------------------
Expand Down
Loading