Skip to content

Refactor generated model files and enhance string handling #65

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

Refactor generated model files and enhance string handling #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de7f95d
Refactor generated model files and enhance string handling
TimvdVooren Feb 11, 2026
3e26222
Fix union
harmjanr Jun 5, 2026
5325910
Merge pull request #1 from Harborn-digital/fix/union-fromjson-self-co…
harmjanr Jun 5, 2026
dea31ec
Fix union toJson to emit flat inner object
harmjanr Jun 5, 2026
ea9a56c
Merge pull request #2 from Harborn-digital/fix/union-tojson-flat-seri…
harmjanr Jun 5, 2026
fd160e1
Fix colliding union names for inline oneOf/anyOf inside arrays
harmjanr Jun 8, 2026
9887e1d
Merge pull request #3 from Harborn-digital/fix/oneof-array-union-naming
harmjanr Jun 9, 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
4 changes: 2 additions & 2 deletions .fvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.32.8"
}
"flutter": "3.38.5"
}
84 changes: 50 additions & 34 deletions packages/swagger_to_dart/example/lib/src/gen/api_client/advanced_client.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
library;
library advanced_client;

import 'package:dio/dio.dart' hide Headers;
import 'package:retrofit/retrofit.dart';
Expand All @@ -13,13 +13,14 @@ abstract class AdvancedClient {
String? baseUrl,
}) = _AdvancedClient;

@GET('/special/uuid')
@GET("/special/uuid")
Future<HttpResponse<Map<String, dynamic>>> advancedSpecialUuid({
@Queries() required AdvancedSpecialUuidQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Handle UUID parameters',
r'description': r'Handle UUID parameter.',
Expand Down Expand Up @@ -56,13 +57,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/special/enum')
@GET("/special/enum")
Future<HttpResponse<Map<String, dynamic>>> advancedSpecialEnum({
@Queries() required AdvancedSpecialEnumQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Handle enum parameters',
r'description': r'Handle Enum parameter.',
Expand Down Expand Up @@ -102,13 +104,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/special/literal')
@GET("/special/literal")
Future<HttpResponse<Map<String, dynamic>>> advancedSpecialLiteral({
@Queries() required AdvancedSpecialLiteralQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Handle literal type parameters',
r'description': r'Handle Literal type parameter.',
Expand Down Expand Up @@ -150,13 +153,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/collection/list')
@GET("/collection/list")
Future<HttpResponse<Map<String, dynamic>>> advancedCollectionList({
@Queries() required AdvancedCollectionListQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Collection List',
r'description': r'Handle list of strings query parameter.',
Expand Down Expand Up @@ -198,13 +202,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/collection/set')
@GET("/collection/set")
Future<HttpResponse<Map<String, dynamic>>> advancedCollectionSet({
@Queries() required AdvancedCollectionSetQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Collection Set',
r'description': r'Handle set of integers query parameter.',
Expand Down Expand Up @@ -247,13 +252,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/collection/dict')
@GET("/collection/dict")
Future<HttpResponse<Map<String, dynamic>>> advancedCollectionDict({
@Body() required Map<String, dynamic> requestBody,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Collection Dict',
r'description': r'Handle dictionary in request body.',
Expand Down Expand Up @@ -294,13 +300,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/collection/tuple')
@GET("/collection/tuple")
Future<HttpResponse<Map<String, dynamic>>> advancedCollectionTuple({
@Queries() required AdvancedCollectionTupleQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Collection Tuple',
r'description': r'Handle fixed-size tuple query parameter.',
Expand Down Expand Up @@ -347,13 +354,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/collection/variable_tuple')
@GET("/collection/variable_tuple")
Future<HttpResponse<Map<String, dynamic>>> advancedCollectionVariableTuple({
@Queries() required AdvancedCollectionVariableTupleQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Collection Variable Tuple',
r'description': r'Handle variable-size tuple query parameter.',
Expand Down Expand Up @@ -394,13 +402,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/union/simple')
@GET("/union/simple")
Future<HttpResponse<Map<String, dynamic>>> advancedUnionSimple({
@Queries() required AdvancedUnionSimpleQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Handle union type parameters',
r'description': r'Handle union type parameter.',
Expand Down Expand Up @@ -444,13 +453,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/union/optional')
@GET("/union/optional")
Future<HttpResponse<Map<String, dynamic>>> advancedUnionOptional({
@Queries() required AdvancedUnionOptionalQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Handle optional parameters',
r'description': r'Handle optional type parameter.',
Expand Down Expand Up @@ -493,13 +503,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/union/modern')
@GET("/union/modern")
Future<HttpResponse<Map<String, dynamic>>> advancedUnionModern({
@Queries() required AdvancedUnionModernQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Handle union with modern Python syntax',
r'description': r'Handle union with modern Python syntax (Python 3.10+).',
Expand Down Expand Up @@ -543,13 +554,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/custom/positive_int')
@GET("/custom/positive_int")
Future<HttpResponse<Map<String, dynamic>>> advancedCustomPositiveInt({
@Queries() required AdvancedCustomPositiveIntQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Demonstrate custom type validation',
r'description': r'Handle custom type for positive integers.',
Expand Down Expand Up @@ -600,13 +612,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/depends/query')
@GET("/depends/query")
Future<HttpResponse<Map<String, dynamic>>> advancedDependsQuery({
@Queries() required AdvancedDependsQueryQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Use dependency injection for common parameters',
r'description': r'Use dependency injection for common parameters.',
Expand Down Expand Up @@ -681,13 +694,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/depends/class')
@GET("/depends/class")
Future<HttpResponse<Map<String, dynamic>>> advancedDependsClass({
@Queries() required AdvancedDependsClassQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Use class-based dependency injection',
r'description': r'Use class-based dependency injection.',
Expand Down Expand Up @@ -728,13 +742,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/errors/not_found/{item_id}')
@GET("/errors/not_found/{item_id}")
Future<HttpResponse<Map<String, dynamic>>> advancedErrorNotFound({
@Path('item_id') required int itemId,
@Path("item_id") required int itemId,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Demonstrate 404 error handling',
r'description': r'Raise an HTTP exception if the item is not found.',
Expand Down Expand Up @@ -771,13 +786,14 @@ abstract class AdvancedClient {
},
},
});
@GET('/errors/custom')
@GET("/errors/custom")
Future<HttpResponse<Map<String, dynamic>>> advancedErrorCustom({
@Queries() required AdvancedErrorCustomQueryParameters queries,
@CancelRequest() CancelToken? cancelToken,
@SendProgress() ProgressCallback? onSendProgress,
@ReceiveProgress() ProgressCallback? onReceiveProgress,
@Extras() Map<String, dynamic>? extras = const {
@Extras()
Map<String, dynamic>? extras = const {
r'tags': [r'advanced'],
r'summary': r'Demonstrate custom error status codes',
r'description':
Expand Down
Loading