Skip to content

Fix enum values in FormData to use toJson method like query parameters #805

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 3 commits into from
Oct 22, 2025
Merged

Fix enum values in FormData to use toJson method like query parameters #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee074c4
Initial plan
Copilot Oct 20, 2025
843dcdf
Fix enum values in FormData to use toJson method like query parameters
Copilot Oct 20, 2025
a883c9b
Add helper methods to reduce code duplication for enum serialization
Copilot Oct 20, 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
27 changes: 16 additions & 11 deletions generator/lib/src/generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1871,6 +1871,20 @@ if (T != dynamic &&
return dartType.element3.getMethod2('toJson') != null;
}

/// Gets the expression for serializing an enum value in FormData as a string.
/// Uses toJson() if available, otherwise uses .name.
String _getEnumValueExpression(DartType enumType, String variableName) {
return _hasToJson(enumType) ? '$variableName.toJson()' : '$variableName.name';
}

/// Gets the Reference for serializing an enum value in FormData.
/// Uses toJson() if available, otherwise uses .name.
Expression _getEnumValueReference(DartType enumType, String variableName) {
return _hasToJson(enumType)
? refer(variableName).property('toJson').call([])
: refer(variableName).property('name');
}

/// Generates the query parameters code block.
void _generateQueries(
MethodElement2 m,
Expand Down Expand Up @@ -2455,7 +2469,7 @@ MultipartFile.fromBytes(i,
_isExactly(BuiltList, innerType)))) {
var value = '';
if (innerType != null && _isEnum(innerType)) {
value = 'i';
value = _getEnumValueExpression(innerType, 'i');
} else if (_isBasicType(innerType)) {
value = 'i';
if (innerType != null && !_isExactly(String, innerType)) {
Expand Down Expand Up @@ -2553,16 +2567,7 @@ MultipartFile.fromFileSync(i.path,
if (_isExactly(String, p.type))
refer(p.displayName)
else if (_isEnum(p.type))
_hasToJson(p.type)
? refer(p.displayName)
.property('toJson')
.call([])
.ifNullThen(
refer(
p.displayName,
).property('toString').call([]),
)
: refer(p.displayName).property('toString').call([])
_getEnumValueReference(p.type, p.displayName)
else
refer(p.displayName).property('toString').call([]),
]),
Expand Down
6 changes: 2 additions & 4 deletions generator/test/src/generator_test_src.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,12 +1344,10 @@ enum TestEnumWithToJson {
final _data = FormData.fromMap(map);
''', contains: true)
@ShouldGenerate('''
_data.fields.add(MapEntry('enumValue', enumValue.toString()));
_data.fields.add(MapEntry('enumValue', enumValue.name));
''', contains: true)
@ShouldGenerate('''
_data.fields.add(
MapEntry('enumValue', enumValue.toJson() ?? enumValue.toString()),
);
_data.fields.add(MapEntry('enumValue', enumValue.toJson()));
''', contains: true)
@ShouldGenerate('''
final _data = FormData();
Expand Down
Loading