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);