Skip to content

dynamite: Correctly await responses where necessary #463

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
provokateurin merged 1 commit into from
Jul 13, 2023
Merged

dynamite: Correctly await responses where necessary #463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions packages/dynamite/dynamite/lib/src/openapi_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ class OpenAPIBuilder implements Builder {

String? dataType;
String? dataValue;
bool? dataNeedsAwait;
if (response.content != null) {
if (response.content!.length > 1) {
throw Exception('Can not work with multiple mime types right now');
Expand All @@ -625,20 +626,24 @@ class OpenAPIBuilder implements Builder {
if (mimeType == '*/*' || mimeType.startsWith('image/')) {
dataType = 'Uint8List';
dataValue = 'response.bodyBytes';
dataNeedsAwait = true;
} else if (mimeType.startsWith('text/')) {
dataType = 'String';
dataValue = 'await response.body';
dataValue = 'response.body';
dataNeedsAwait = true;
} else if (mimeType == 'application/json') {
dataType = result.name;
if (result.name == 'dynamic') {
dataValue = '';
} else if (result.name == 'String') {
// avoid unnecessary_await_in_return lint
dataValue = 'response.body';
dataNeedsAwait = true;
} else if (result is TypeResultEnum || result is TypeResultBase) {
dataValue = result.deserialize(result.decode('await response.body'));
dataNeedsAwait = false;
} else {
dataValue = result.deserialize('await response.jsonBody');
dataNeedsAwait = false;
}
} else {
throw Exception('Can not parse mime type "$mimeType"');
Expand All @@ -649,7 +654,7 @@ class OpenAPIBuilder implements Builder {
if (headersType != null && dataType != null) {
b.returns = refer('Future<${classPrefix}Response<$dataType, $headersType>>');
code.write(
'return ${classPrefix}Response<$dataType, $headersType>($dataValue, $headersValue,);',
'return ${classPrefix}Response<$dataType, $headersType>(${dataNeedsAwait ?? false ? 'await ' : ''}$dataValue, $headersValue,);',
);
} else if (headersType != null) {
b.returns = refer('Future<$headersType>');
Expand Down