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.

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

Add support for generic nullable return and inner return types #568

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions generator/lib/src/generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ You should create a new class to encapsulate the response.
);
} else {
mapperCode = refer(
'${_displayString(returnType)}.fromJson($_resultVar.data!)',
'${_displayString(returnType, withNullability: (returnType.isNullable || (innerReturnType?.isNullable ?? false)))}.fromJson($_resultVar.data!)',
);
}
break;
Expand Down Expand Up @@ -1104,7 +1104,11 @@ You should create a new class to encapsulate the response.
final sendProgress = args.remove(_onSendProgress);
final receiveProgress = args.remove(_onReceiveProgress);

final type = refer(_displayString(_getResponseType(m.returnType)));
final responseType = _getResponseType(m.returnType);
final innerType = _getResponseInnerType(m.returnType);
final type = refer(_displayString(responseType,
withNullability: ((responseType?.isNullable ?? false) ||
(innerType?.isNullable ?? false))));

final composeArguments = <String, Expression>{
_queryParamsVar: queryParams,
Expand Down