Skip to content

Fix nullability of non-required Asset fields #55

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
PhiFry merged 1 commit into from
Apr 29, 2026
Merged

Fix nullability of non-required Asset fields #55

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions code_generator/lib/src/fields/asset_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ base class AssetField extends BaseField {
);

@override
Expression buildInitializer(CodeExpression valueExpression) =>
initializerFromRequired(isRequired, valueExpression, type.nonNullable.invokeNamed("fromJson", valueExpression));
Expression buildInitializer(CodeExpression valueExpression) {
if (isRequired) return type.nonNullable.invokeNamed("fromJson", valueExpression);
return valueExpression
.equalTo(literalNull)
.or(valueExpression.index(literalString('filename')).equalTo(literalNull))
.conditional(literalNull, type.nonNullable.invokeNamed("fromJson", valueExpression));
}
}
3 changes: 2 additions & 1 deletion code_generator/test/field_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,8 @@ void main() {
);
expect(
field.buildInitializer(valueExpression.expression),
emitter.equalsCode("$valueExpression == null ? null : Asset.fromJson($valueExpression)"),
emitter.equalsCode(
"$valueExpression == null || $valueExpression [ 'filename' ] == null ? null : Asset.fromJson($valueExpression)"),
);
});
test("Test required asset", () {
Expand Down
Loading