Skip to content
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

Version/2.11.6 #655

Merged
merged 21 commits into from
Sep 22, 2023
Merged

Version/2.11.6 #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2c826d8
Fixed some issues
Jun 7, 2023
f064936
formatted code
Jun 7, 2023
352d09f
updated SDK
Jun 7, 2023
861dfac
Updated SDK and version
Jun 7, 2023
d320f12
Fixed generation of lists of classes
Jun 7, 2023
fbda249
Fixed generation $Items classes
Jun 7, 2023
1ade0c7
Updated pubspec and changelog
Jun 7, 2023
fe41f12
Fixed #524
Jun 9, 2023
173d9aa
Fixed #598 Generation of query enum parameters
Jun 23, 2023
a09e442
Merge branch 'master' into version/2.11.6
Jun 23, 2023
16b5e3f
Fixed conflicts
Jun 23, 2023
d1c7d2f
Fixed some issues in swaggers
Jul 5, 2023
6ae1b7d
Updated changelog and pubspec
Jul 5, 2023
ff4d14e
Fix #583, #637, #619 and update readme (#638)
romainboucher Sep 8, 2023
3466b48
Merge branch 'master' into version/2.11.6
Sep 8, 2023
290deb0
Fixed generation of some fields
Sep 22, 2023
d3a77eb
Removed test
Sep 22, 2023
8283674
Fixed classes named List
Sep 22, 2023
a71a9e9
Fixed generation of query parameters with ref default type
Sep 22, 2023
dead103
Merge branch 'master' into version/2.11.6
Sep 22, 2023
d99e4f9
Fixed generation of DateTime parameters
Sep 22, 2023
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
3 changes: 3 additions & 0 deletions lib/src/code_generators/constants.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ const kPath = 'path';
const kOptionalBody = 'optionalBody';
const kFormData = 'formData';
const kMultipart = 'multipart';
const kDateTimeFormat = 'date-time';

const kDefaultBodyParameter = 'Object';
const kField = 'Field';
Expand Down Expand Up @@ -90,6 +91,8 @@ const kBody = 'body';
const kPartFile = 'partFile';
const kPart = 'part';

const kDateTimeType = 'DateTime';

const kDynamic = 'dynamic';

const supportedRequestTypes = ['get', 'post', 'put', 'delete', 'head', 'patch'];
Expand Down
19 changes: 17 additions & 2 deletions 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 @@ -632,6 +632,17 @@ class SwaggerRequestsGenerator extends SwaggerGeneratorBase {
if (parameter.schema!.items != null || parameter.schema!.type == kArray) {
return (parameter.schema!.ref.getRef() + modelPostfix).asList();
}

final ref = parameter.schema?.ref;

if (ref != null) {
final neededSchema = root.allSchemas[ref.getUnformattedRef()];

if (kBasicTypesMap.containsKey(neededSchema?.type)) {
return kBasicTypesMap[neededSchema?.type]!;
}
}

return (parameter.schema!.ref.getRef() + modelPostfix);
} else if (parameter.schema?.type == kArray &&
parameter.schema?.items?.type.isNotEmpty == true) {
Expand All @@ -646,6 +657,10 @@ class SwaggerRequestsGenerator extends SwaggerGeneratorBase {
}

if (parameter.schema?.type.isNotEmpty == true) {
if (parameter.schema?.format == kDateTimeFormat) {
return kDateTimeType;
}

return _mapParameterName(parameter.schema!.type, format, modelPostfix);
}

Expand Down Expand Up @@ -1205,8 +1220,8 @@ class SwaggerRequestsGenerator extends SwaggerGeneratorBase {
final contentSchemaType = content.schema?.type ?? '';
if (contentSchemaType.isNotEmpty == true) {
if (contentSchemaType == 'string' &&
content.schema?.format == 'date-time') {
return 'DateTime';
content.schema?.format == kDateTimeFormat) {
return kDateTimeType;
}
return kBasicTypesMap[contentSchemaType];
}
Expand Down