Skip to content

Small changes to generator and tests - will land as separate commits #229

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
Jun 7, 2018
Merged

Small changes to generator and tests - will land as separate commits #229

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
41fb48f
fix: Added missing `checked` parameter to withDefaultHelpers constructor
kevmoo Jun 7, 2018
a30ed48
test: update default_value tests to include a includeIfNull: false field
kevmoo Jun 7, 2018
ddc4b02
cleanup: update _serializeField to change named arg to positional
kevmoo Jun 7, 2018
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 json_serializable/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

* Added support for `Uri` conversion.

* Added missing `checked` parameter to the
`JsonSerializableGenerator.withDefaultHelpers` constructor.

## 0.5.6

* Added support for `JsonSerializable.disallowUnrecognizedKeys`.
Expand Down
13 changes: 6 additions & 7 deletions json_serializable/lib/src/generator_helper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ class ${_wrapperClassName(true)} extends \$JsonMapWrapper {
var valueAccess = '_v.${field.name}';
_buffer.writeln('''
case ${_safeNameAccess(field)}:
return ${_serializeField(field, accessOverride: valueAccess)};''');
return ${_serializeField(field, valueAccess)};''');
}

_buffer.writeln('''
Expand Down Expand Up @@ -356,7 +356,7 @@ class ${_wrapperClassName(true)} extends \$JsonMapWrapper {
safeFieldAccess = 'this.$safeFieldAccess';
}

var expression = _serializeField(field, accessOverride: safeFieldAccess);
var expression = _serializeField(field, safeFieldAccess);
if (_writeJsonValueNaive(field)) {
if (directWrite) {
_buffer.writeln(' $safeJsonKeyString: $expression,');
Expand Down Expand Up @@ -394,7 +394,8 @@ class ${_wrapperClassName(true)} extends \$JsonMapWrapper {
_buffer.writeln('=> <String, dynamic>{');

_buffer.writeAll(fields.map((field) {
var value = '${_safeNameAccess(field)}: ${_serializeField(field)}';
var value =
'${_safeNameAccess(field)}: ${_serializeField(field, field.name)}';
return ' $value';
}), ',\n');

Expand All @@ -405,11 +406,9 @@ class ${_wrapperClassName(true)} extends \$JsonMapWrapper {
_buffer.writeln('};');
}

String _serializeField(FieldElement field, {String accessOverride}) {
accessOverride ??= field.name;

String _serializeField(FieldElement field, String accessExpression) {
try {
return _getHelperContext(field).serialize(field.type, accessOverride);
return _getHelperContext(field).serialize(field.type, accessExpression);
} on UnsupportedTypeError catch (e) {
throw _createInvalidGenerationError('toJson', field, e);
}
Expand Down
9 changes: 6 additions & 3 deletions json_serializable/lib/src/json_serializable_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,15 @@ class JsonSerializableGenerator
/// the built-in helpers:
/// [JsonHelper], [DateTimeHelper], and [UriHelper].
factory JsonSerializableGenerator.withDefaultHelpers(
Iterable<TypeHelper> typeHelpers,
{bool useWrappers: false,
bool anyMap: false}) =>
Iterable<TypeHelper> typeHelpers, {
bool useWrappers: false,
bool anyMap: false,
bool checked: false,
}) =>
new JsonSerializableGenerator(
useWrappers: useWrappers,
anyMap: anyMap,
checked: checked,
typeHelpers:
new List.unmodifiable(typeHelpers.followedBy(_defaultHelpers)));

Expand Down
2 changes: 1 addition & 1 deletion json_serializable/test/default_value/default_value.checked.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class DefaultValue extends Object
@JsonKey(defaultValue: true)
bool fieldBool;

@JsonKey(defaultValue: 'string')
@JsonKey(defaultValue: 'string', includeIfNull: false)
String fieldString;

@JsonKey(defaultValue: _intValue)
Expand Down
34 changes: 22 additions & 12 deletions json_serializable/test/default_value/default_value.checked.g.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,26 @@ abstract class _$DefaultValueSerializerMixin {
Map<String, int> get fieldMapSimple;
Map<String, List<String>> get fieldMapListString;
Greek get fieldEnum;
Map<String, dynamic> toJson() => <String, dynamic>{
'fieldBool': fieldBool,
'fieldString': fieldString,
'fieldInt': fieldInt,
'fieldDouble': fieldDouble,
'fieldListEmpty': fieldListEmpty,
'fieldMapEmpty': fieldMapEmpty,
'fieldListSimple': fieldListSimple,
'fieldMapSimple': fieldMapSimple,
'fieldMapListString': fieldMapListString,
'fieldEnum': fieldEnum?.toString()?.split('.')?.last
};
Map<String, dynamic> toJson() {
var val = <String, dynamic>{
'fieldBool': fieldBool,
};

void writeNotNull(String key, dynamic value) {
if (value != null) {
val[key] = value;
}
}

writeNotNull('fieldString', fieldString);
val['fieldInt'] = fieldInt;
val['fieldDouble'] = fieldDouble;
val['fieldListEmpty'] = fieldListEmpty;
val['fieldMapEmpty'] = fieldMapEmpty;
val['fieldListSimple'] = fieldListSimple;
val['fieldMapSimple'] = fieldMapSimple;
val['fieldMapListString'] = fieldMapListString;
val['fieldEnum'] = fieldEnum?.toString()?.split('.')?.last;
return val;
}
}
2 changes: 1 addition & 1 deletion json_serializable/test/default_value/default_value.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class DefaultValue extends Object
@JsonKey(defaultValue: true)
bool fieldBool;

@JsonKey(defaultValue: 'string')
@JsonKey(defaultValue: 'string', includeIfNull: false)
String fieldString;

@JsonKey(defaultValue: _intValue)
Expand Down
34 changes: 22 additions & 12 deletions json_serializable/test/default_value/default_value.g.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,26 @@ abstract class _$DefaultValueSerializerMixin {
Map<String, int> get fieldMapSimple;
Map<String, List<String>> get fieldMapListString;
Greek get fieldEnum;
Map<String, dynamic> toJson() => <String, dynamic>{
'fieldBool': fieldBool,
'fieldString': fieldString,
'fieldInt': fieldInt,
'fieldDouble': fieldDouble,
'fieldListEmpty': fieldListEmpty,
'fieldMapEmpty': fieldMapEmpty,
'fieldListSimple': fieldListSimple,
'fieldMapSimple': fieldMapSimple,
'fieldMapListString': fieldMapListString,
'fieldEnum': fieldEnum?.toString()?.split('.')?.last
};
Map<String, dynamic> toJson() {
var val = <String, dynamic>{
'fieldBool': fieldBool,
};

void writeNotNull(String key, dynamic value) {
if (value != null) {
val[key] = value;
}
}

writeNotNull('fieldString', fieldString);
val['fieldInt'] = fieldInt;
val['fieldDouble'] = fieldDouble;
val['fieldListEmpty'] = fieldListEmpty;
val['fieldMapEmpty'] = fieldMapEmpty;
val['fieldListSimple'] = fieldListSimple;
val['fieldMapSimple'] = fieldMapSimple;
val['fieldMapListString'] = fieldMapListString;
val['fieldEnum'] = fieldEnum?.toString()?.split('.')?.last;
return val;
}
}