Skip to content

Fix parameter position ordering (not ignore Position property) #4870

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
nesopo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix parameter position ordering (not ignore Position property) #4870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71149bf
Fix parameter position ordering (not ingnore Position property)
nebojsapopovicFIS Apr 26, 2024
d7a7f3c
Fix moment import syntax error.
nebojsapopovicFIS Apr 26, 2024
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
4 changes: 2 additions & 2 deletions src/NSwag.CodeGeneration.TypeScript/Models/TypeScriptOperationModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ public TypeScriptOperationModel(
_settings = settings;
_generator = generator;

var parameters = GetActualParameters();
var parameters = GetActualParameters().OrderBy(p => p.Position).ToList();
Copy link
Collaborator

@lahma lahma Aug 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the ToList() calls should be removed from here and below, there's no need to materialize as list as it is done at the end anyway.


if (settings.GenerateOptionalParameters)
{
parameters = parameters
.OrderBy(p => p.Position ?? 0)
.OrderBy(p => !p.IsRequired)
.ThenBy(p => !p.IsRequired)
.ToList();
}

Expand Down
2 changes: 1 addition & 1 deletion src/NSwag.CodeGeneration.TypeScript/Templates/File.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import * as jQuery from 'jquery';
{%- endif -%}
{%- if Framework.UseMomentJS -%}

import moment from 'moment';
import * as moment from 'moment';
{%- if RequiresMomentJSDuration -%}
import 'moment-duration-format';
{%- endif -%}
Expand Down