Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2b47b77
Initial plan
jorgerangel-msft Nov 17, 2026
ee8c212
fix(http-client-csharp): preserve unknown discriminator names from la…
jorgerangel-msft Nov 17, 2026
1bd69cc
fix(http-client-csharp): guard restored names against synthesized types
jorgerangel-msft Nov 17, 2026
e026916
fix(http-client-csharp): close historical name collision guard gaps
jorgerangel-msft Nov 17, 2026
ef8efab
fix(http-client-csharp): reserve paging names across compatibility views
jorgerangel-msft Nov 17, 2026
c0e1570
fix(http-client-csharp): resolve historical unknown names independent…
jorgerangel-msft Nov 17, 2026
6c015a0
refactor(http-client-csharp): keep unknown-name changes focused
jorgerangel-msft Nov 17, 2026
0a55074
fix(http-client-csharp): resolve unknown names in BuildName
jorgerangel-msft Nov 18, 2026
25dde1f
refactor(http-client-csharp): simplify unknown model name restoration
jorgerangel-msft Nov 19, 2026
00f28e8
refactor(http-client-csharp): move proxy naming to SCM model provider
jorgerangel-msft Nov 19, 2026
04d01f6
refactor(http-client-csharp): simplify unknown model naming restoration
jorgerangel-msft Nov 20, 2026
cd727d4
fix(http-client-csharp): reject colliding historical unknown names
jorgerangel-msft Nov 20, 2026
a8547be
fix(http-client-csharp): reserve unknown model fallbacks
jorgerangel-msft Nov 20, 2026
1a524b1
fix(http-client-csharp): find historical unknown derived model
jorgerangel-msft Nov 20, 2026
b340023
fix(http-client-csharp): preserve restored unknown model compatibility
jorgerangel-msft Nov 20, 2026
4ef9247
fix(http-client-csharp): preserve legacy unknown aliases
jorgerangel-msft Nov 20, 2026
6fc953e
fix(http-client-csharp): restore unknown names from proxy attributes
jorgerangel-msft Nov 20, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json.Serialization;
using Microsoft.CodeAnalysis;
using Microsoft.TypeSpec.Generator.ClientModel.Primitives;
using Microsoft.TypeSpec.Generator.ClientModel.Snippets;
using Microsoft.TypeSpec.Generator.EmitterRpc;
Expand All @@ -31,6 +32,7 @@ namespace Microsoft.TypeSpec.Generator.ClientModel.Providers
public class ScmModelProvider : ModelProvider
{
private readonly InputModelType _inputModel;
private readonly Lazy<string?> _lastContractUnknownDiscriminatorModelName;
private readonly Dictionary<PropertyProvider, FieldProvider> _nullablePropertyPresence = [];

// MRW and multipart serialization can add an empty constructor with an implicit base() call.
Expand Down Expand Up @@ -77,12 +79,106 @@ protected override bool RequiresParameterlessBaseConstructor
public ScmModelProvider(InputModelType inputModel) : base(inputModel)
{
_inputModel = inputModel;
_lastContractUnknownDiscriminatorModelName = new(BuildLastContractUnknownDiscriminatorModelName);
Comment thread
jorgerangel-msft marked this conversation as resolved.
Resolved
IsDynamicModel = inputModel.IsDynamicModel;
// Resolve the hierarchy only after TypeFactory has registered this provider. Eager
// resolution here lets compatibility probes cache null types for recursive properties.
BaseJsonPatchProperty = new(GetBaseJsonPatchProperty);
}

protected override string BuildName()
{
if (!_inputModel.IsUnknownDiscriminatorModel ||
_lastContractUnknownDiscriminatorModelName.Value is not { } historicalName)
{
return base.BuildName();
}

var generatedName = base.BuildName();
var sourceInputModel = ScmCodeModelGenerator.Instance.SourceInputModel;
if (sourceInputModel.FindForTypeInCurrentCompilation(BuildNamespace(), historicalName) is not null)
{
return historicalName;
}

return sourceInputModel.FindForTypeInCurrentCompilation(BuildNamespace(), generatedName) is not null
? generatedName
: historicalName;
}

private string? BuildLastContractUnknownDiscriminatorModelName()
{
if (_inputModel.BaseModel is not { } baseModel ||
ScmCodeModelGenerator.Instance.TypeFactory.CreateModel(baseModel)?.LastContractView is not { } lastContractBase)
{
return null;
}

var proxyAttributes = lastContractBase.Attributes
.Where(attribute => attribute.Type.Equals(typeof(PersistableModelProxyAttribute)))
.ToArray();
if (proxyAttributes.Length != 1 ||
proxyAttributes[0].Arguments.Count != 1 ||
proxyAttributes[0].Arguments[0] is not TypeOfExpression { Type: var previousUnknownType } ||
previousUnknownType.Namespace != BuildNamespace() ||
previousUnknownType.Name == base.BuildName())
{
return null;
}

var previousUnknownTypeName = previousUnknownType.FullyQualifiedName;
var sourceInputModel = ScmCodeModelGenerator.Instance.SourceInputModel;
if (sourceInputModel.ApiCompatBaseline.IsTypeSuppressed(previousUnknownTypeName))
{
ScmCodeModelGenerator.Instance.Emitter.Info(
$"Skipping back-compat unknown discriminator model name '{previousUnknownTypeName}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; the type is an accepted removal in the ApiCompat baseline.",
BackCompatibilityChangeCategory.BaselineAcceptedRemovalSkipped);
return null;
}

if (HasUnknownDiscriminatorNameCollision(previousUnknownType.Name))
{
ScmCodeModelGenerator.Instance.Emitter.Info(
$"Skipping back-compat unknown discriminator model name '{previousUnknownTypeName}' for '{lastContractBase.Type.Namespace}.{lastContractBase.Name}'; the name is already used by another generated or custom type.",
BackCompatibilityChangeCategory.UnknownDiscriminatorModelNameSkipped);
return null;
}

return previousUnknownType.Name;
}

private bool HasUnknownDiscriminatorNameCollision(string name)
{
var typeFactory = ScmCodeModelGenerator.Instance.TypeFactory;
var sourceInputModel = ScmCodeModelGenerator.Instance.SourceInputModel;
var generatedName = base.BuildName();
var customType = sourceInputModel.FindForTypeInCurrentCompilation(BuildNamespace(), name) ??
sourceInputModel.FindForTypeInCurrentCompilation(BuildNamespace(), generatedName);
var isCustomization = customType?.Attributes.Any(attribute =>
attribute.Type.Name == "CodeGenTypeAttribute" &&
attribute.Arguments.FirstOrDefault() is LiteralExpression { Literal: string customName } &&
(customName == name || customName == generatedName)) == true;
if (customType is not null && !isCustomization)
{
return true;
}

var emittedName = customType?.Name ?? name;
if (typeFactory.IsModelNameUsedByAnotherModel(emittedName, _inputModel))
{
return true;
}

var expectedFilePath = Path.Combine("src", "Generated", "Models", $"{emittedName}.cs");
if (ScmCodeModelGenerator.Instance.InputLibrary.InputNamespace.Enums.Any(inputEnum =>
inputEnum.External is null &&
string.Equals(EnumProvider.Create(inputEnum).RelativeFilePath, expectedFilePath, StringComparison.OrdinalIgnoreCase)))
{
return true;
}
return !typeFactory.TryReserveUnknownDiscriminatorModelName(emittedName, _inputModel);
}

protected override TypeSignatureModifiers BuildDeclarationModifiers()
{
var modifiers = base.BuildDeclarationModifiers();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ public class ScmTypeFactory : TypeFactory
protected override IEnumerable<(string Name, string Namespace, string OriginalName)> GetReservedModelTypeNames()
=> ScmCodeModelGenerator.Instance.InputLibrary.InputNamespace.Clients.Select(ClientProvider.GetNameForCollisionCheck);

internal bool IsModelNameUsedByAnotherModel(string name, InputModelType exceptModel)
=> base.HasModelNameCollision(name, exceptModel);

internal bool TryReserveUnknownDiscriminatorModelName(string name, InputModelType model)
=> base.TryReserveRestoredModelName(name, model);

public virtual CSharpType MatchConditionsType => typeof(PipelineMessageClassifier);

public virtual IClientResponseApi ClientResponseApi => ClientResultProvider.Instance;
Expand Down
Loading
Loading