From e0b25ea6a347bae35391f52182535be918930aba Mon Sep 17 00:00:00 2001 From: alnkesq <141324281+alnkesq@users.noreply.github.com> Date: Fri, 23 Oct 2026 01:37:30 +0200 Subject: [PATCH] Optional C# parameters must come after all mandatory parameters when generating XRPC controllers. --- src/CarpaNet.SourceGen/Generation/XrpcEndpointGenerator.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CarpaNet.SourceGen/Generation/XrpcEndpointGenerator.cs b/src/CarpaNet.SourceGen/Generation/XrpcEndpointGenerator.cs index f67793c..3d3cf9f 100644 --- a/src/CarpaNet.SourceGen/Generation/XrpcEndpointGenerator.cs +++ b/src/CarpaNet.SourceGen/Generation/XrpcEndpointGenerator.cs @@ -232,7 +232,10 @@ private static List BuildQueryParameters( { var requiredProps = def.Parameters.Required ?? new List(); - foreach (var prop in def.Parameters.Properties) + var mandatoryProperties = def.Parameters.Properties.Where(x => requiredProps.Contains(x.Key)); + var optionalProperties = def.Parameters.Properties.Where(x => !requiredProps.Contains(x.Key)); + + foreach (var prop in mandatoryProperties.Concat(optionalProperties)) { var isRequired = requiredProps.Contains(prop.Key); var csharpType = ResolveParameterType(prop.Value, currentNsid, registry);