Skip to content

fix: use wire info from original property for spread parameter matching #10123

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
JoshLove-msft merged 3 commits into from
Mar 24, 2026
Merged

fix: use wire info from original property for spread parameter matching #10123

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c2a2e2
fix: use wire info from original property for spread parameter matching
JoshLove-msft Mar 24, 2026
76e0370
fix: null check wireName instead of defaulting to string.Empty
JoshLove-msft Mar 24, 2026
66da9aa
fix: resolve wire name from model properties for custom constructors
JoshLove-msft Mar 24, 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
41 changes: 36 additions & 5 deletions ...tor/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProviderCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,16 +281,39 @@ private List<ValueExpression> GetSpreadConversion(TypeProvider spreadSource)
// Match convenience method parameters to constructor parameters by wire (serialized) name
// to handle cases where C# names diverge due to @clientName renames, @encodedName,
// or casing differences between the convenience parameters and model properties.
// Falls back to C# name matching for parameters without wire information.
var convenienceMethodParamsByWireName = new Dictionary<string, ParameterProvider>(StringComparer.OrdinalIgnoreCase);
var convenienceMethodParamsByName = new Dictionary<string, ParameterProvider>(StringComparer.OrdinalIgnoreCase);
foreach (var p in ConvenienceMethodParameters)
{
if (p.WireInfo?.SerializedName != null)
{
convenienceMethodParamsByWireName.TryAdd(p.WireInfo.SerializedName, p);
}
convenienceMethodParamsByName.TryAdd(p.Name, p);
}

// For customized properties (where OriginalName identifies the original property),
// use the original property's wire info to ensure the dictionary has the correct mapping.
foreach (var property in spreadSource.CanonicalView.Properties)
{
if (property.OriginalName != null && property.WireInfo?.SerializedName is { } wireName)
{
var matchedParam = ConvenienceMethodParameters.FirstOrDefault(
p => string.Equals(p.WireInfo?.SerializedName, wireName, StringComparison.OrdinalIgnoreCase));
if (matchedParam != null)
{
convenienceMethodParamsByWireName.TryAdd(wireName, matchedParam);
}
}
}

// Build a lookup from property name to wire name so we can resolve wire names
// for custom constructor parameters that don't have a Property reference.
var propertyWireNames = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
foreach (var property in spreadSource.CanonicalView.Properties)
{
if (property.WireInfo?.SerializedName is { } propWireName)
{
propertyWireNames.TryAdd(property.Name, propWireName);
}
}

List<ValueExpression> expressions = new(spreadSource.Properties.Count);
Expand All @@ -301,10 +324,18 @@ private List<ValueExpression> GetSpreadConversion(TypeProvider spreadSource)

foreach (var param in ctor.Signature.Parameters)
{
// Get wire name from the parameter's property if available, otherwise resolve
// from the model's properties by matching the parameter name to a property name.
var wireName = param.Property?.WireInfo?.SerializedName;
if (!(wireName != null && convenienceMethodParamsByWireName.TryGetValue(wireName, out var convenienceParam)))
if (wireName == null)
{
propertyWireNames.TryGetValue(param.Name, out wireName);
}

ParameterProvider? convenienceParam = null;
if (wireName != null)
{
convenienceMethodParamsByName.TryGetValue(param.Name, out convenienceParam);
convenienceMethodParamsByWireName.TryGetValue(wireName, out convenienceParam);
}

if (convenienceParam != null)
Expand Down
Loading