diff --git a/json_serializable/CHANGELOG.md b/json_serializable/CHANGELOG.md index 0fd1ed5e5..d4e683d06 100644 --- a/json_serializable/CHANGELOG.md +++ b/json_serializable/CHANGELOG.md @@ -1,3 +1,7 @@ +## 6.6.1 + +- Fix bug when `JsonKey.includeToJson` is `false`. + ## 6.6.0 - Support for `JsonKey.includeFromJson` and `JsonKey.includeToJson`. diff --git a/json_serializable/lib/src/generator_helper.dart b/json_serializable/lib/src/generator_helper.dart index 1b8621156..501df9469 100644 --- a/json_serializable/lib/src/generator_helper.dart +++ b/json_serializable/lib/src/generator_helper.dart @@ -151,5 +151,5 @@ extension on KeyConfig { bool get explicitYesToJson => includeToJson == true; - bool get explicitNoToJson => includeFromJson == false; + bool get explicitNoToJson => includeToJson == false; } diff --git a/json_serializable/pubspec.yaml b/json_serializable/pubspec.yaml index 0807ca23f..678000181 100644 --- a/json_serializable/pubspec.yaml +++ b/json_serializable/pubspec.yaml @@ -1,5 +1,5 @@ name: json_serializable -version: 6.6.0 +version: 6.6.1 description: >- Automatically generate code for converting to and from JSON by annotating Dart classes. diff --git a/json_serializable/test/field_matrix_test.dart b/json_serializable/test/field_matrix_test.dart index 0e18091f9..8f1abff1a 100644 --- a/json_serializable/test/field_matrix_test.dart +++ b/json_serializable/test/field_matrix_test.dart @@ -40,16 +40,16 @@ const _expectedResult = { 'without': {'aField': null, 'field': null, 'zField': null} }, 'ToJsonTrueFromJsonFalsePublic: field: null': { - 'with': {'aField': null, 'zField': null}, - 'without': {'aField': null, 'zField': null} + 'with': {'aField': null, 'field': null, 'zField': null}, + 'without': {'aField': null, 'field': null, 'zField': null} }, 'ToJsonFalseFromJsonNullPublic: field: 42': { - 'with': {'aField': null, 'field': 42, 'zField': null}, - 'without': {'aField': null, 'field': null, 'zField': null} + 'with': {'aField': null, 'zField': null}, + 'without': {'aField': null, 'zField': null} }, 'ToJsonFalseFromJsonTruePublic: field: 42': { - 'with': {'aField': null, 'field': 42, 'zField': null}, - 'without': {'aField': null, 'field': null, 'zField': null} + 'with': {'aField': null, 'zField': null}, + 'without': {'aField': null, 'zField': null} }, 'ToJsonFalseFromJsonFalsePublic: field: null': { 'with': {'aField': null, 'zField': null}, @@ -76,16 +76,16 @@ const _expectedResult = { 'without': {'aField': null, 'field': null, 'zField': null} }, 'ToJsonTrueFromJsonFalsePrivate: _field: null': { - 'with': {'aField': null, 'zField': null}, - 'without': {'aField': null, 'zField': null} + 'with': {'aField': null, 'field': null, 'zField': null}, + 'without': {'aField': null, 'field': null, 'zField': null} }, 'ToJsonFalseFromJsonNullPrivate: _field: null': { 'with': {'aField': null, 'zField': null}, 'without': {'aField': null, 'zField': null} }, 'ToJsonFalseFromJsonTruePrivate: _field: 42': { - 'with': {'aField': null, 'field': 42, 'zField': null}, - 'without': {'aField': null, 'field': null, 'zField': null} + 'with': {'aField': null, 'zField': null}, + 'without': {'aField': null, 'zField': null} }, 'ToJsonFalseFromJsonFalsePrivate: _field: null': { 'with': {'aField': null, 'zField': null}, diff --git a/json_serializable/test/field_matrix_test.field_matrix.g.dart b/json_serializable/test/field_matrix_test.field_matrix.g.dart index dd948315f..cdb054b03 100644 --- a/json_serializable/test/field_matrix_test.field_matrix.g.dart +++ b/json_serializable/test/field_matrix_test.field_matrix.g.dart @@ -91,6 +91,7 @@ Map _$ToJsonTrueFromJsonFalsePublicToJson( ToJsonTrueFromJsonFalsePublic instance) => { 'aField': instance.aField, + 'field': instance.field, 'zField': instance.zField, }; @@ -105,7 +106,6 @@ Map _$ToJsonFalseFromJsonNullPublicToJson( ToJsonFalseFromJsonNullPublic instance) => { 'aField': instance.aField, - 'field': instance.field, 'zField': instance.zField, }; @@ -120,7 +120,6 @@ Map _$ToJsonFalseFromJsonTruePublicToJson( ToJsonFalseFromJsonTruePublic instance) => { 'aField': instance.aField, - 'field': instance.field, 'zField': instance.zField, }; @@ -217,6 +216,7 @@ Map _$ToJsonTrueFromJsonFalsePrivateToJson( ToJsonTrueFromJsonFalsePrivate instance) => { 'aField': instance.aField, + 'field': instance._field, 'zField': instance.zField, }; @@ -244,7 +244,6 @@ Map _$ToJsonFalseFromJsonTruePrivateToJson( ToJsonFalseFromJsonTruePrivate instance) => { 'aField': instance.aField, - 'field': instance._field, 'zField': instance.zField, };