Skip to content

Feature/swagger fix #813

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
merged 2 commits into from
Sep 22, 2025
Merged

Feature/swagger fix #813

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
ef28394
fix: #711 generate List twice for content.schema.items
Ali1Ammar Aug 9, 2025
a5627c7
fix: sanitize path keys in Swagger model generation
Ali1Ammar Aug 9, 2025
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
12 changes: 10 additions & 2 deletions lib/src/code_generators/swagger_models_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,11 @@ abstract class SwaggerModelsGenerator extends SwaggerGeneratorBase {
if (neededSchema != null &&
neededSchema.type == kObject &&
neededSchema.properties.isNotEmpty) {
final pathText = key.split('/').map((e) => e.pascalCase).join();
final pathText = key
.split('/')
.map((e) => e.replaceAll('}', '').replaceAll('{', ''))
.map((e) => e.pascalCase)
.join();
final requestText = operation.pascalCase;

results['$pathText$requestText\$Response'] = neededSchema;
Expand All @@ -255,7 +259,11 @@ abstract class SwaggerModelsGenerator extends SwaggerGeneratorBase {
final itemsSchema = neededSchema?.items;

if (itemsSchema?.properties.isNotEmpty == true) {
final pathText = key.split('/').map((e) => e.pascalCase).join();
final pathText = key
.split('/')
.map((e) => e.replaceAll('}', '').replaceAll('{', ''))
.map((e) => e.pascalCase)
.join();
final requestText = operation.pascalCase;
results['$pathText$requestText\$Response'] = neededSchema!;
}
Expand Down
8 changes: 7 additions & 1 deletion lib/src/code_generators/swagger_requests_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,12 @@ class SwaggerRequestsGenerator extends SwaggerGeneratorBase {
results.add(response);
} else if (successResponse.content?.schema?.properties.isNotEmpty == true) {
results.add(response);
} else if (successResponse
.content?.schema?.items?.properties.isNotEmpty ==
true) {
final itemClassName = '$response\$Item';

results.add(itemClassName);
} else if (successResponse.content?.schema?.allOf.isNotEmpty == true &&
successResponse.content?.schema?.title.isNotEmpty == true) {
results.add(response);
Expand Down Expand Up @@ -1239,7 +1245,7 @@ class SwaggerRequestsGenerator extends SwaggerGeneratorBase {

final typeName = getValidatedClassName('$requestText\$Response');

return typeName.asList();
return typeName;
} else if (itemsType.isNotEmpty) {
final parameterType = _mapParameterName(itemsType, itemsFormat, '');
return parameterType.asList();
Expand Down