Skip to content

[http-client-csharp] Fix spread model parameter matching to use wire name #10111

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

Open
JoshLove-msft wants to merge 4 commits into
base: main
Choose a base branch
from
+24 −4
Open

[http-client-csharp] Fix spread model parameter matching to use wire name #10111

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
6eb86ca
fix: match spread parameters by wire name instead of C# name
JoshLove-msft Mar 22, 2026
b5eeea1
fix: resolve CS8602/CS0165 nullable warnings in spread parameter matc…
JoshLove-msft Mar 23, 2026
bb43c9b
regen: update test project baselines after spread fix
JoshLove-msft Mar 23, 2026
a65a97c
fix: fall back to name-based matching when wire name unavailable
JoshLove-msft Mar 23, 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
24 changes: 22 additions & 2 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 @@ -278,7 +278,21 @@ private IEnumerable<MethodBodyStatement> GetStackVariablesForProtocolParamConver

private List<ValueExpression> GetSpreadConversion(TypeProvider spreadSource)
{
var convenienceMethodParams = ConvenienceMethodParameters.ToDictionary(p => p.Name);
// 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);
}

List<ValueExpression> expressions = new(spreadSource.Properties.Count);
// we should make this find more deterministic
var ctor = spreadSource.CanonicalView.Constructors.First(c =>
Expand All @@ -287,7 +301,13 @@ private List<ValueExpression> GetSpreadConversion(TypeProvider spreadSource)

foreach (var param in ctor.Signature.Parameters)
{
if (convenienceMethodParams.TryGetValue(param.Name, out var convenienceParam))
var wireName = param.Property?.WireInfo?.SerializedName;
if (!(wireName != null && convenienceMethodParamsByWireName.TryGetValue(wireName, out var convenienceParam)))
{
convenienceMethodParamsByName.TryGetValue(param.Name, out convenienceParam);
}

if (convenienceParam != null)
{
if (convenienceParam.Type.IsList)
{
Expand Down
4 changes: 2 additions & 2 deletions ...csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/SampleTypeSpecClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ public virtual ClientResult<Thing> AnonymousBody(string name, BinaryData require
Argument.AssertNotNullOrEmpty(propertyWithSpecialDocs, nameof(propertyWithSpecialDocs));

Thing spreadModel = new Thing(
default,
name,
requiredUnion,
"accept",
requiredNullableString,
Expand Down Expand Up @@ -770,7 +770,7 @@ public virtual async Task<ClientResult<Thing>> AnonymousBodyAsync(string name, B
Argument.AssertNotNullOrEmpty(propertyWithSpecialDocs, nameof(propertyWithSpecialDocs));

Thing spreadModel = new Thing(
default,
name,
requiredUnion,
"accept",
requiredNullableString,
Expand Down
Loading