diff --git a/example/lib/example.g.dart b/example/lib/example.g.dart index f497bc0e7..a7dfa5dfc 100644 --- a/example/lib/example.g.dart +++ b/example/lib/example.g.dart @@ -23,8 +23,8 @@ Map _$PersonToJson(Person instance) => { 'firstName': instance.firstName, if (instance.middleName case final value?) 'middleName': value, 'lastName': instance.lastName, - 'date-of-birth': instance.dateOfBirth.toIso8601String(), - 'last-order': instance.lastOrder?.toIso8601String(), + 'date-of-birth': instance.dateOfBirth.toUtc().toIso8601String(), + 'last-order': instance.lastOrder?.toUtc().toIso8601String(), 'orders': instance.orders, }; diff --git a/example/lib/tuple_example.g.dart b/example/lib/tuple_example.g.dart index f4a537901..3d0297e10 100644 --- a/example/lib/tuple_example.g.dart +++ b/example/lib/tuple_example.g.dart @@ -42,7 +42,7 @@ Map _$ConcreteClassToJson(ConcreteClass instance) => { 'tuple1': instance.tuple1.toJson( (value) => value, - (value) => value.toIso8601String(), + (value) => value.toUtc().toIso8601String(), ), 'tuple2': instance.tuple2.toJson( (value) => value.inMicroseconds, diff --git a/json_serializable/README.md b/json_serializable/README.md index 713ff4c1e..afdf3a4e7 100644 --- a/json_serializable/README.md +++ b/json_serializable/README.md @@ -66,7 +66,7 @@ Person _$PersonFromJson(Map json) => Person( Map _$PersonToJson(Person instance) => { 'firstName': instance.firstName, 'lastName': instance.lastName, - 'dateOfBirth': instance.dateOfBirth?.toIso8601String(), + 'dateOfBirth': instance.dateOfBirth?.toUtc().toIso8601String(), }; ``` diff --git a/json_serializable/example/example.g.dart b/json_serializable/example/example.g.dart index 0ed069cae..a807ca18c 100644 --- a/json_serializable/example/example.g.dart +++ b/json_serializable/example/example.g.dart @@ -19,5 +19,5 @@ Person _$PersonFromJson(Map json) => Person( Map _$PersonToJson(Person instance) => { 'firstName': instance.firstName, 'lastName': instance.lastName, - 'dateOfBirth': instance.dateOfBirth?.toIso8601String(), + 'dateOfBirth': instance.dateOfBirth?.toUtc().toIso8601String(), }; diff --git a/json_serializable/lib/src/type_helpers/to_from_string.dart b/json_serializable/lib/src/type_helpers/to_from_string.dart index 5c6174ad0..c78f2caa0 100644 --- a/json_serializable/lib/src/type_helpers/to_from_string.dart +++ b/json_serializable/lib/src/type_helpers/to_from_string.dart @@ -15,7 +15,7 @@ final bigIntString = ToFromStringHelper( final dateTimeString = ToFromStringHelper( 'DateTime.parse', - 'toIso8601String()', + 'toUtc().toIso8601String()', 'DateTime', ); diff --git a/json_serializable/test/integration/json_test_example.g.dart b/json_serializable/test/integration/json_test_example.g.dart index bf56859ed..fad9627dd 100644 --- a/json_serializable/test/integration/json_test_example.g.dart +++ b/json_serializable/test/integration/json_test_example.g.dart @@ -37,7 +37,7 @@ Map _$PersonToJson(Person instance) => { 'firstName': instance.firstName, 'lastName': instance.lastName, 'middleName': instance.middleName, - 'dateOfBirth': instance.dateOfBirth?.toIso8601String(), + 'dateOfBirth': instance.dateOfBirth?.toUtc().toIso8601String(), r'$house': _$CategoryEnumMap[instance.house]!, 'order': instance.order, 'customOrders': instance.customOrders, @@ -119,7 +119,8 @@ Item _$ItemFromJson(Map json) => Item( Map _$ItemToJson(Item instance) => { 'price': instance.price, if (instance.itemNumber case final value?) 'item-number': value, - 'saleDates': instance.saleDates?.map((e) => e.toIso8601String()).toList(), + 'saleDates': + instance.saleDates?.map((e) => e.toUtc().toIso8601String()).toList(), 'rates': instance.rates, 'geoPoint': _toJsonGeoPoint(instance.geoPoint), }; @@ -169,7 +170,7 @@ Map _$MapKeyVarietyToJson(MapKeyVariety instance) => 'intIntMap': instance.intIntMap?.map((k, e) => MapEntry(k.toString(), e)), 'uriIntMap': instance.uriIntMap?.map((k, e) => MapEntry(k.toString(), e)), 'dateTimeIntMap': instance.dateTimeIntMap - ?.map((k, e) => MapEntry(k.toIso8601String(), e)), + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), 'bigIntMap': instance.bigIntMap?.map((k, e) => MapEntry(k.toString(), e)), }; diff --git a/json_serializable/test/integration/json_test_example.g_any_map.g.dart b/json_serializable/test/integration/json_test_example.g_any_map.g.dart index ef2ad4f95..9874e5ee1 100644 --- a/json_serializable/test/integration/json_test_example.g_any_map.g.dart +++ b/json_serializable/test/integration/json_test_example.g_any_map.g.dart @@ -37,7 +37,7 @@ Map _$PersonToJson(Person instance) => { 'firstName': instance.firstName, 'lastName': instance.lastName, 'middleName': instance.middleName, - 'dateOfBirth': instance.dateOfBirth?.toIso8601String(), + 'dateOfBirth': instance.dateOfBirth?.toUtc().toIso8601String(), r'$house': _$CategoryEnumMap[instance.house]!, 'order': instance.order, 'customOrders': instance.customOrders, @@ -119,7 +119,8 @@ Item _$ItemFromJson(Map json) => Item( Map _$ItemToJson(Item instance) => { 'price': instance.price, if (instance.itemNumber case final value?) 'item-number': value, - 'saleDates': instance.saleDates?.map((e) => e.toIso8601String()).toList(), + 'saleDates': + instance.saleDates?.map((e) => e.toUtc().toIso8601String()).toList(), 'rates': instance.rates, 'geoPoint': _toJsonGeoPoint(instance.geoPoint), }; @@ -168,7 +169,7 @@ Map _$MapKeyVarietyToJson(MapKeyVariety instance) => 'intIntMap': instance.intIntMap?.map((k, e) => MapEntry(k.toString(), e)), 'uriIntMap': instance.uriIntMap?.map((k, e) => MapEntry(k.toString(), e)), 'dateTimeIntMap': instance.dateTimeIntMap - ?.map((k, e) => MapEntry(k.toIso8601String(), e)), + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), 'bigIntMap': instance.bigIntMap?.map((k, e) => MapEntry(k.toString(), e)), }; diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g.dart index 6d376fdfe..0255fa4ec 100644 --- a/json_serializable/test/kitchen_sink/kitchen_sink.g.dart +++ b/json_serializable/test/kitchen_sink/kitchen_sink.g.dart @@ -101,7 +101,7 @@ KitchenSink _$KitchenSinkFromJson(Map json) => KitchenSink( Map _$KitchenSinkToJson(KitchenSink instance) => { 'no-42': instance.ctorValidatedNo42, - 'dateTime': instance.dateTime?.toIso8601String(), + 'dateTime': instance.dateTime?.toUtc().toIso8601String(), 'bigInt': instance.bigInt?.toString(), 'iterable': instance.iterable?.toList(), 'dynamicIterable': instance.dynamicIterable.toList(), @@ -112,21 +112,23 @@ Map _$KitchenSinkToJson(KitchenSink instance) => 'objectSet': instance.objectSet.toList(), 'intSet': instance.intSet.toList(), 'dateTimeSet': - instance.dateTimeSet.map((e) => e.toIso8601String()).toList(), - 'datetime-iterable': - instance.dateTimeIterable.map((e) => e.toIso8601String()).toList(), + instance.dateTimeSet.map((e) => e.toUtc().toIso8601String()).toList(), + 'datetime-iterable': instance.dateTimeIterable + .map((e) => e.toUtc().toIso8601String()) + .toList(), 'list': instance.list, 'dynamicList': instance.dynamicList, 'objectList': instance.objectList, 'intList': instance.intList, - 'dateTimeList': - instance.dateTimeList.map((e) => e.toIso8601String()).toList(), + 'dateTimeList': instance.dateTimeList + .map((e) => e.toUtc().toIso8601String()) + .toList(), 'nullableSimpleObjectList': instance.nullableSimpleObjectList, 'map': instance.map, 'stringStringMap': instance.stringStringMap, 'dynamicIntMap': instance.dynamicIntMap, 'objectDateTimeMap': instance.objectDateTimeMap - .map((k, e) => MapEntry(k, e.toIso8601String())), + .map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), 'nullableSimpleObjectMap': instance.nullableSimpleObjectMap, 'crazyComplex': instance.crazyComplex .map((e) => e?.map((k, e) => MapEntry( @@ -134,7 +136,8 @@ Map _$KitchenSinkToJson(KitchenSink instance) => e?.map((k, e) => MapEntry( k, e - ?.map((e) => e?.map((e) => e.toIso8601String()).toList()) + ?.map((e) => + e?.map((e) => e.toUtc().toIso8601String()).toList()) .toList()))))) .toList(), 'val': instance.val, diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart index 69301303d..9e3898f49 100644 --- a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart +++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.g.dart @@ -93,7 +93,7 @@ KitchenSink _$KitchenSinkFromJson(Map json) => KitchenSink( Map _$KitchenSinkToJson(KitchenSink instance) => { 'no-42': instance.ctorValidatedNo42, - 'dateTime': instance.dateTime?.toIso8601String(), + 'dateTime': instance.dateTime?.toUtc().toIso8601String(), 'bigInt': instance.bigInt?.toString(), 'iterable': instance.iterable?.toList(), 'dynamicIterable': instance.dynamicIterable.toList(), @@ -104,21 +104,23 @@ Map _$KitchenSinkToJson(KitchenSink instance) => 'objectSet': instance.objectSet.toList(), 'intSet': instance.intSet.toList(), 'dateTimeSet': - instance.dateTimeSet.map((e) => e.toIso8601String()).toList(), - 'datetime-iterable': - instance.dateTimeIterable.map((e) => e.toIso8601String()).toList(), + instance.dateTimeSet.map((e) => e.toUtc().toIso8601String()).toList(), + 'datetime-iterable': instance.dateTimeIterable + .map((e) => e.toUtc().toIso8601String()) + .toList(), 'list': instance.list, 'dynamicList': instance.dynamicList, 'objectList': instance.objectList, 'intList': instance.intList, - 'dateTimeList': - instance.dateTimeList.map((e) => e.toIso8601String()).toList(), + 'dateTimeList': instance.dateTimeList + .map((e) => e.toUtc().toIso8601String()) + .toList(), 'nullableSimpleObjectList': instance.nullableSimpleObjectList, 'map': instance.map, 'stringStringMap': instance.stringStringMap, 'dynamicIntMap': instance.dynamicIntMap, 'objectDateTimeMap': instance.objectDateTimeMap - .map((k, e) => MapEntry(k, e.toIso8601String())), + .map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), 'nullableSimpleObjectMap': instance.nullableSimpleObjectMap, 'crazyComplex': instance.crazyComplex .map((e) => e?.map((k, e) => MapEntry( @@ -126,7 +128,8 @@ Map _$KitchenSinkToJson(KitchenSink instance) => e?.map((k, e) => MapEntry( k, e - ?.map((e) => e?.map((e) => e.toIso8601String()).toList()) + ?.map((e) => + e?.map((e) => e.toUtc().toIso8601String()).toList()) .toList()))))) .toList(), 'val': instance.val, diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart index c004dcc74..7e3512c2e 100644 --- a/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart +++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_any_map__checked.g.dart @@ -144,7 +144,7 @@ KitchenSink _$KitchenSinkFromJson(Map json) => $checkedCreate( Map _$KitchenSinkToJson(KitchenSink instance) => { 'no-42': instance.ctorValidatedNo42, - 'dateTime': instance.dateTime?.toIso8601String(), + 'dateTime': instance.dateTime?.toUtc().toIso8601String(), 'bigInt': instance.bigInt?.toString(), 'iterable': instance.iterable?.toList(), 'dynamicIterable': instance.dynamicIterable.toList(), @@ -155,21 +155,23 @@ Map _$KitchenSinkToJson(KitchenSink instance) => 'objectSet': instance.objectSet.toList(), 'intSet': instance.intSet.toList(), 'dateTimeSet': - instance.dateTimeSet.map((e) => e.toIso8601String()).toList(), - 'datetime-iterable': - instance.dateTimeIterable.map((e) => e.toIso8601String()).toList(), + instance.dateTimeSet.map((e) => e.toUtc().toIso8601String()).toList(), + 'datetime-iterable': instance.dateTimeIterable + .map((e) => e.toUtc().toIso8601String()) + .toList(), 'list': instance.list, 'dynamicList': instance.dynamicList, 'objectList': instance.objectList, 'intList': instance.intList, - 'dateTimeList': - instance.dateTimeList.map((e) => e.toIso8601String()).toList(), + 'dateTimeList': instance.dateTimeList + .map((e) => e.toUtc().toIso8601String()) + .toList(), 'nullableSimpleObjectList': instance.nullableSimpleObjectList, 'map': instance.map, 'stringStringMap': instance.stringStringMap, 'dynamicIntMap': instance.dynamicIntMap, 'objectDateTimeMap': instance.objectDateTimeMap - .map((k, e) => MapEntry(k, e.toIso8601String())), + .map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), 'nullableSimpleObjectMap': instance.nullableSimpleObjectMap, 'crazyComplex': instance.crazyComplex .map((e) => e?.map((k, e) => MapEntry( @@ -177,7 +179,8 @@ Map _$KitchenSinkToJson(KitchenSink instance) => e?.map((k, e) => MapEntry( k, e - ?.map((e) => e?.map((e) => e.toIso8601String()).toList()) + ?.map((e) => + e?.map((e) => e.toUtc().toIso8601String()).toList()) .toList()))))) .toList(), 'val': instance.val, diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart index 39b0eb184..427ad3502 100644 --- a/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart +++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_exclude_null.g.dart @@ -101,7 +101,7 @@ KitchenSink _$KitchenSinkFromJson(Map json) => KitchenSink( Map _$KitchenSinkToJson(KitchenSink instance) => { if (instance.ctorValidatedNo42 case final value?) 'no-42': value, - if (instance.dateTime?.toIso8601String() case final value?) + if (instance.dateTime?.toUtc().toIso8601String() case final value?) 'dateTime': value, if (instance.bigInt?.toString() case final value?) 'bigInt': value, if (instance.iterable?.toList() case final value?) 'iterable': value, @@ -113,21 +113,23 @@ Map _$KitchenSinkToJson(KitchenSink instance) => 'objectSet': instance.objectSet.toList(), 'intSet': instance.intSet.toList(), 'dateTimeSet': - instance.dateTimeSet.map((e) => e.toIso8601String()).toList(), - 'datetime-iterable': - instance.dateTimeIterable.map((e) => e.toIso8601String()).toList(), + instance.dateTimeSet.map((e) => e.toUtc().toIso8601String()).toList(), + 'datetime-iterable': instance.dateTimeIterable + .map((e) => e.toUtc().toIso8601String()) + .toList(), 'list': instance.list, 'dynamicList': instance.dynamicList, 'objectList': instance.objectList, 'intList': instance.intList, - 'dateTimeList': - instance.dateTimeList.map((e) => e.toIso8601String()).toList(), + 'dateTimeList': instance.dateTimeList + .map((e) => e.toUtc().toIso8601String()) + .toList(), 'nullableSimpleObjectList': instance.nullableSimpleObjectList, 'map': instance.map, 'stringStringMap': instance.stringStringMap, 'dynamicIntMap': instance.dynamicIntMap, 'objectDateTimeMap': instance.objectDateTimeMap - .map((k, e) => MapEntry(k, e.toIso8601String())), + .map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), 'nullableSimpleObjectMap': instance.nullableSimpleObjectMap, 'crazyComplex': instance.crazyComplex .map((e) => e?.map((k, e) => MapEntry( @@ -135,7 +137,8 @@ Map _$KitchenSinkToJson(KitchenSink instance) => e?.map((k, e) => MapEntry( k, e - ?.map((e) => e?.map((e) => e.toIso8601String()).toList()) + ?.map((e) => + e?.map((e) => e.toUtc().toIso8601String()).toList()) .toList()))))) .toList(), 'val': instance.val, diff --git a/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.g.dart b/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.g.dart index 0115b3fff..9b73f139f 100644 --- a/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.g.dart +++ b/json_serializable/test/kitchen_sink/kitchen_sink.g_explicit_to_json.g.dart @@ -101,7 +101,7 @@ KitchenSink _$KitchenSinkFromJson(Map json) => KitchenSink( Map _$KitchenSinkToJson(KitchenSink instance) => { 'no-42': instance.ctorValidatedNo42, - 'dateTime': instance.dateTime?.toIso8601String(), + 'dateTime': instance.dateTime?.toUtc().toIso8601String(), 'bigInt': instance.bigInt?.toString(), 'iterable': instance.iterable?.toList(), 'dynamicIterable': instance.dynamicIterable.toList(), @@ -112,22 +112,24 @@ Map _$KitchenSinkToJson(KitchenSink instance) => 'objectSet': instance.objectSet.toList(), 'intSet': instance.intSet.toList(), 'dateTimeSet': - instance.dateTimeSet.map((e) => e.toIso8601String()).toList(), - 'datetime-iterable': - instance.dateTimeIterable.map((e) => e.toIso8601String()).toList(), + instance.dateTimeSet.map((e) => e.toUtc().toIso8601String()).toList(), + 'datetime-iterable': instance.dateTimeIterable + .map((e) => e.toUtc().toIso8601String()) + .toList(), 'list': instance.list, 'dynamicList': instance.dynamicList, 'objectList': instance.objectList, 'intList': instance.intList, - 'dateTimeList': - instance.dateTimeList.map((e) => e.toIso8601String()).toList(), + 'dateTimeList': instance.dateTimeList + .map((e) => e.toUtc().toIso8601String()) + .toList(), 'nullableSimpleObjectList': instance.nullableSimpleObjectList.map((e) => e?.toJson()).toList(), 'map': instance.map, 'stringStringMap': instance.stringStringMap, 'dynamicIntMap': instance.dynamicIntMap, 'objectDateTimeMap': instance.objectDateTimeMap - .map((k, e) => MapEntry(k, e.toIso8601String())), + .map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), 'nullableSimpleObjectMap': instance.nullableSimpleObjectMap .map((k, e) => MapEntry(k, e?.toJson())), 'crazyComplex': instance.crazyComplex @@ -136,7 +138,8 @@ Map _$KitchenSinkToJson(KitchenSink instance) => e?.map((k, e) => MapEntry( k, e - ?.map((e) => e?.map((e) => e.toIso8601String()).toList()) + ?.map((e) => + e?.map((e) => e.toUtc().toIso8601String()).toList()) .toList()))))) .toList(), 'val': instance.val, diff --git a/json_serializable/test/supported_types/input.type_datetime.g.dart b/json_serializable/test/supported_types/input.type_datetime.g.dart index 461e30ebb..f55bdfb5d 100644 --- a/json_serializable/test/supported_types/input.type_datetime.g.dart +++ b/json_serializable/test/supported_types/input.type_datetime.g.dart @@ -17,8 +17,8 @@ SimpleClass _$SimpleClassFromJson(Map json) => SimpleClass( Map _$SimpleClassToJson(SimpleClass instance) => { - 'value': instance.value.toIso8601String(), - 'withDefault': instance.withDefault.toIso8601String(), + 'value': instance.value.toUtc().toIso8601String(), + 'withDefault': instance.withDefault.toUtc().toIso8601String(), }; SimpleClassNullable _$SimpleClassNullableFromJson(Map json) => @@ -32,6 +32,6 @@ SimpleClassNullable _$SimpleClassNullableFromJson(Map json) => Map _$SimpleClassNullableToJson( SimpleClassNullable instance) => { - 'value': instance.value?.toIso8601String(), - 'withDefault': instance.withDefault?.toIso8601String(), + 'value': instance.value?.toUtc().toIso8601String(), + 'withDefault': instance.withDefault?.toUtc().toIso8601String(), }; diff --git a/json_serializable/test/supported_types/input.type_iterable.g.dart b/json_serializable/test/supported_types/input.type_iterable.g.dart index a9264f393..f65a6e1bb 100644 --- a/json_serializable/test/supported_types/input.type_iterable.g.dart +++ b/json_serializable/test/supported_types/input.type_iterable.g.dart @@ -136,7 +136,7 @@ SimpleClassOfDateTime _$SimpleClassOfDateTimeFromJson( Map _$SimpleClassOfDateTimeToJson( SimpleClassOfDateTime instance) => { - 'value': instance.value.map((e) => e.toIso8601String()).toList(), + 'value': instance.value.map((e) => e.toUtc().toIso8601String()).toList(), }; SimpleClassNullableOfDateTime _$SimpleClassNullableOfDateTimeFromJson( @@ -149,7 +149,7 @@ SimpleClassNullableOfDateTime _$SimpleClassNullableOfDateTimeFromJson( Map _$SimpleClassNullableOfDateTimeToJson( SimpleClassNullableOfDateTime instance) => { - 'value': instance.value?.map((e) => e.toIso8601String()).toList(), + 'value': instance.value?.map((e) => e.toUtc().toIso8601String()).toList(), }; SimpleClassOfDateTimeNullable _$SimpleClassOfDateTimeNullableFromJson( @@ -162,7 +162,7 @@ SimpleClassOfDateTimeNullable _$SimpleClassOfDateTimeNullableFromJson( Map _$SimpleClassOfDateTimeNullableToJson( SimpleClassOfDateTimeNullable instance) => { - 'value': instance.value.map((e) => e?.toIso8601String()).toList(), + 'value': instance.value.map((e) => e?.toUtc().toIso8601String()).toList(), }; SimpleClassNullableOfDateTimeNullable @@ -176,7 +176,8 @@ SimpleClassNullableOfDateTimeNullable Map _$SimpleClassNullableOfDateTimeNullableToJson( SimpleClassNullableOfDateTimeNullable instance) => { - 'value': instance.value?.map((e) => e?.toIso8601String()).toList(), + 'value': + instance.value?.map((e) => e?.toUtc().toIso8601String()).toList(), }; SimpleClassOfDouble _$SimpleClassOfDoubleFromJson(Map json) => diff --git a/json_serializable/test/supported_types/input.type_list.g.dart b/json_serializable/test/supported_types/input.type_list.g.dart index f86a6d00c..e5c9a9714 100644 --- a/json_serializable/test/supported_types/input.type_list.g.dart +++ b/json_serializable/test/supported_types/input.type_list.g.dart @@ -144,7 +144,7 @@ SimpleClassOfDateTime _$SimpleClassOfDateTimeFromJson( Map _$SimpleClassOfDateTimeToJson( SimpleClassOfDateTime instance) => { - 'value': instance.value.map((e) => e.toIso8601String()).toList(), + 'value': instance.value.map((e) => e.toUtc().toIso8601String()).toList(), }; SimpleClassNullableOfDateTime _$SimpleClassNullableOfDateTimeFromJson( @@ -158,7 +158,7 @@ SimpleClassNullableOfDateTime _$SimpleClassNullableOfDateTimeFromJson( Map _$SimpleClassNullableOfDateTimeToJson( SimpleClassNullableOfDateTime instance) => { - 'value': instance.value?.map((e) => e.toIso8601String()).toList(), + 'value': instance.value?.map((e) => e.toUtc().toIso8601String()).toList(), }; SimpleClassOfDateTimeNullable _$SimpleClassOfDateTimeNullableFromJson( @@ -172,7 +172,7 @@ SimpleClassOfDateTimeNullable _$SimpleClassOfDateTimeNullableFromJson( Map _$SimpleClassOfDateTimeNullableToJson( SimpleClassOfDateTimeNullable instance) => { - 'value': instance.value.map((e) => e?.toIso8601String()).toList(), + 'value': instance.value.map((e) => e?.toUtc().toIso8601String()).toList(), }; SimpleClassNullableOfDateTimeNullable @@ -187,7 +187,8 @@ SimpleClassNullableOfDateTimeNullable Map _$SimpleClassNullableOfDateTimeNullableToJson( SimpleClassNullableOfDateTimeNullable instance) => { - 'value': instance.value?.map((e) => e?.toIso8601String()).toList(), + 'value': + instance.value?.map((e) => e?.toUtc().toIso8601String()).toList(), }; SimpleClassOfDouble _$SimpleClassOfDoubleFromJson(Map json) => diff --git a/json_serializable/test/supported_types/input.type_map.g.dart b/json_serializable/test/supported_types/input.type_map.g.dart index 5c8a3ea82..46a8348a9 100644 --- a/json_serializable/test/supported_types/input.type_map.g.dart +++ b/json_serializable/test/supported_types/input.type_map.g.dart @@ -74,7 +74,7 @@ Map _$SimpleClassOfDateTimeToBigIntToJson( SimpleClassOfDateTimeToBigInt instance) => { 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), e.toString())), + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e.toString())), }; SimpleClassNullableOfDateTimeToBigInt @@ -90,7 +90,7 @@ Map _$SimpleClassNullableOfDateTimeToBigIntToJson( SimpleClassNullableOfDateTimeToBigInt instance) => { 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), e.toString())), + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e.toString())), }; SimpleClassOfDynamicToBigInt _$SimpleClassOfDynamicToBigIntFromJson( @@ -324,7 +324,7 @@ Map _$SimpleClassOfDateTimeToBigIntNullableToJson( SimpleClassOfDateTimeToBigIntNullable instance) => { 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), e?.toString())), + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e?.toString())), }; SimpleClassNullableOfDateTimeToBigIntNullable @@ -341,7 +341,7 @@ Map _$SimpleClassNullableOfDateTimeToBigIntNullableToJson( SimpleClassNullableOfDateTimeToBigIntNullable instance) => { 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), e?.toString())), + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e?.toString())), }; SimpleClassOfDynamicToBigIntNullable @@ -570,7 +570,8 @@ SimpleClassOfDateTimeToBool _$SimpleClassOfDateTimeToBoolFromJson( Map _$SimpleClassOfDateTimeToBoolToJson( SimpleClassOfDateTimeToBool instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToBool @@ -584,7 +585,8 @@ SimpleClassNullableOfDateTimeToBool Map _$SimpleClassNullableOfDateTimeToBoolToJson( SimpleClassNullableOfDateTimeToBool instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToBool _$SimpleClassOfDynamicToBoolFromJson( @@ -790,7 +792,8 @@ SimpleClassOfDateTimeToBoolNullable Map _$SimpleClassOfDateTimeToBoolNullableToJson( SimpleClassOfDateTimeToBoolNullable instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToBoolNullable @@ -805,7 +808,8 @@ SimpleClassNullableOfDateTimeToBoolNullable Map _$SimpleClassNullableOfDateTimeToBoolNullableToJson( SimpleClassNullableOfDateTimeToBoolNullable instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToBoolNullable _$SimpleClassOfDynamicToBoolNullableFromJson( @@ -989,7 +993,7 @@ Map _$SimpleClassOfBigIntToDateTimeToJson( SimpleClassOfBigIntToDateTime instance) => { 'value': instance.value - .map((k, e) => MapEntry(k.toString(), e.toIso8601String())), + .map((k, e) => MapEntry(k.toString(), e.toUtc().toIso8601String())), }; SimpleClassNullableOfBigIntToDateTime @@ -1005,7 +1009,7 @@ Map _$SimpleClassNullableOfBigIntToDateTimeToJson( SimpleClassNullableOfBigIntToDateTime instance) => { 'value': instance.value - ?.map((k, e) => MapEntry(k.toString(), e.toIso8601String())), + ?.map((k, e) => MapEntry(k.toString(), e.toUtc().toIso8601String())), }; SimpleClassOfDateTimeToDateTime _$SimpleClassOfDateTimeToDateTimeFromJson( @@ -1019,8 +1023,8 @@ SimpleClassOfDateTimeToDateTime _$SimpleClassOfDateTimeToDateTimeFromJson( Map _$SimpleClassOfDateTimeToDateTimeToJson( SimpleClassOfDateTimeToDateTime instance) => { - 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), e.toIso8601String())), + 'value': instance.value.map((k, e) => + MapEntry(k.toUtc().toIso8601String(), e.toUtc().toIso8601String())), }; SimpleClassNullableOfDateTimeToDateTime @@ -1035,8 +1039,8 @@ SimpleClassNullableOfDateTimeToDateTime Map _$SimpleClassNullableOfDateTimeToDateTimeToJson( SimpleClassNullableOfDateTimeToDateTime instance) => { - 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), e.toIso8601String())), + 'value': instance.value?.map((k, e) => + MapEntry(k.toUtc().toIso8601String(), e.toUtc().toIso8601String())), }; SimpleClassOfDynamicToDateTime _$SimpleClassOfDynamicToDateTimeFromJson( @@ -1050,7 +1054,8 @@ SimpleClassOfDynamicToDateTime _$SimpleClassOfDynamicToDateTimeFromJson( Map _$SimpleClassOfDynamicToDateTimeToJson( SimpleClassOfDynamicToDateTime instance) => { - 'value': instance.value.map((k, e) => MapEntry(k, e.toIso8601String())), + 'value': instance.value + .map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), }; SimpleClassNullableOfDynamicToDateTime @@ -1065,7 +1070,8 @@ SimpleClassNullableOfDynamicToDateTime Map _$SimpleClassNullableOfDynamicToDateTimeToJson( SimpleClassNullableOfDynamicToDateTime instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k, e.toIso8601String())), + 'value': instance.value + ?.map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), }; SimpleClassOfEnumTypeToDateTime _$SimpleClassOfEnumTypeToDateTimeFromJson( @@ -1080,8 +1086,8 @@ SimpleClassOfEnumTypeToDateTime _$SimpleClassOfEnumTypeToDateTimeFromJson( Map _$SimpleClassOfEnumTypeToDateTimeToJson( SimpleClassOfEnumTypeToDateTime instance) => { - 'value': instance.value - .map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e.toIso8601String())), + 'value': instance.value.map((k, e) => + MapEntry(_$EnumTypeEnumMap[k]!, e.toUtc().toIso8601String())), }; SimpleClassNullableOfEnumTypeToDateTime @@ -1097,8 +1103,8 @@ SimpleClassNullableOfEnumTypeToDateTime Map _$SimpleClassNullableOfEnumTypeToDateTimeToJson( SimpleClassNullableOfEnumTypeToDateTime instance) => { - 'value': instance.value - ?.map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e.toIso8601String())), + 'value': instance.value?.map((k, e) => + MapEntry(_$EnumTypeEnumMap[k]!, e.toUtc().toIso8601String())), }; SimpleClassOfIntToDateTime _$SimpleClassOfIntToDateTimeFromJson( @@ -1113,7 +1119,7 @@ Map _$SimpleClassOfIntToDateTimeToJson( SimpleClassOfIntToDateTime instance) => { 'value': instance.value - .map((k, e) => MapEntry(k.toString(), e.toIso8601String())), + .map((k, e) => MapEntry(k.toString(), e.toUtc().toIso8601String())), }; SimpleClassNullableOfIntToDateTime _$SimpleClassNullableOfIntToDateTimeFromJson( @@ -1128,7 +1134,7 @@ Map _$SimpleClassNullableOfIntToDateTimeToJson( SimpleClassNullableOfIntToDateTime instance) => { 'value': instance.value - ?.map((k, e) => MapEntry(k.toString(), e.toIso8601String())), + ?.map((k, e) => MapEntry(k.toString(), e.toUtc().toIso8601String())), }; SimpleClassOfObjectToDateTime _$SimpleClassOfObjectToDateTimeFromJson( @@ -1142,7 +1148,8 @@ SimpleClassOfObjectToDateTime _$SimpleClassOfObjectToDateTimeFromJson( Map _$SimpleClassOfObjectToDateTimeToJson( SimpleClassOfObjectToDateTime instance) => { - 'value': instance.value.map((k, e) => MapEntry(k, e.toIso8601String())), + 'value': instance.value + .map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), }; SimpleClassNullableOfObjectToDateTime @@ -1157,7 +1164,8 @@ SimpleClassNullableOfObjectToDateTime Map _$SimpleClassNullableOfObjectToDateTimeToJson( SimpleClassNullableOfObjectToDateTime instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k, e.toIso8601String())), + 'value': instance.value + ?.map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), }; SimpleClassOfStringToDateTime _$SimpleClassOfStringToDateTimeFromJson( @@ -1171,7 +1179,8 @@ SimpleClassOfStringToDateTime _$SimpleClassOfStringToDateTimeFromJson( Map _$SimpleClassOfStringToDateTimeToJson( SimpleClassOfStringToDateTime instance) => { - 'value': instance.value.map((k, e) => MapEntry(k, e.toIso8601String())), + 'value': instance.value + .map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), }; SimpleClassNullableOfStringToDateTime @@ -1186,7 +1195,8 @@ SimpleClassNullableOfStringToDateTime Map _$SimpleClassNullableOfStringToDateTimeToJson( SimpleClassNullableOfStringToDateTime instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k, e.toIso8601String())), + 'value': instance.value + ?.map((k, e) => MapEntry(k, e.toUtc().toIso8601String())), }; SimpleClassOfUriToDateTime _$SimpleClassOfUriToDateTimeFromJson( @@ -1201,7 +1211,7 @@ Map _$SimpleClassOfUriToDateTimeToJson( SimpleClassOfUriToDateTime instance) => { 'value': instance.value - .map((k, e) => MapEntry(k.toString(), e.toIso8601String())), + .map((k, e) => MapEntry(k.toString(), e.toUtc().toIso8601String())), }; SimpleClassNullableOfUriToDateTime _$SimpleClassNullableOfUriToDateTimeFromJson( @@ -1216,7 +1226,7 @@ Map _$SimpleClassNullableOfUriToDateTimeToJson( SimpleClassNullableOfUriToDateTime instance) => { 'value': instance.value - ?.map((k, e) => MapEntry(k.toString(), e.toIso8601String())), + ?.map((k, e) => MapEntry(k.toString(), e.toUtc().toIso8601String())), }; SimpleClassOfBigIntToDateTimeNullable @@ -1233,7 +1243,7 @@ Map _$SimpleClassOfBigIntToDateTimeNullableToJson( SimpleClassOfBigIntToDateTimeNullable instance) => { 'value': instance.value - .map((k, e) => MapEntry(k.toString(), e?.toIso8601String())), + .map((k, e) => MapEntry(k.toString(), e?.toUtc().toIso8601String())), }; SimpleClassNullableOfBigIntToDateTimeNullable @@ -1250,7 +1260,7 @@ Map _$SimpleClassNullableOfBigIntToDateTimeNullableToJson( SimpleClassNullableOfBigIntToDateTimeNullable instance) => { 'value': instance.value - ?.map((k, e) => MapEntry(k.toString(), e?.toIso8601String())), + ?.map((k, e) => MapEntry(k.toString(), e?.toUtc().toIso8601String())), }; SimpleClassOfDateTimeToDateTimeNullable @@ -1266,8 +1276,8 @@ SimpleClassOfDateTimeToDateTimeNullable Map _$SimpleClassOfDateTimeToDateTimeNullableToJson( SimpleClassOfDateTimeToDateTimeNullable instance) => { - 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), e?.toIso8601String())), + 'value': instance.value.map((k, e) => + MapEntry(k.toUtc().toIso8601String(), e?.toUtc().toIso8601String())), }; SimpleClassNullableOfDateTimeToDateTimeNullable @@ -1283,8 +1293,8 @@ SimpleClassNullableOfDateTimeToDateTimeNullable Map _$SimpleClassNullableOfDateTimeToDateTimeNullableToJson( SimpleClassNullableOfDateTimeToDateTimeNullable instance) => { - 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), e?.toIso8601String())), + 'value': instance.value?.map((k, e) => + MapEntry(k.toUtc().toIso8601String(), e?.toUtc().toIso8601String())), }; SimpleClassOfDynamicToDateTimeNullable @@ -1300,7 +1310,8 @@ SimpleClassOfDynamicToDateTimeNullable Map _$SimpleClassOfDynamicToDateTimeNullableToJson( SimpleClassOfDynamicToDateTimeNullable instance) => { - 'value': instance.value.map((k, e) => MapEntry(k, e?.toIso8601String())), + 'value': instance.value + .map((k, e) => MapEntry(k, e?.toUtc().toIso8601String())), }; SimpleClassNullableOfDynamicToDateTimeNullable @@ -1316,7 +1327,8 @@ SimpleClassNullableOfDynamicToDateTimeNullable Map _$SimpleClassNullableOfDynamicToDateTimeNullableToJson( SimpleClassNullableOfDynamicToDateTimeNullable instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k, e?.toIso8601String())), + 'value': instance.value + ?.map((k, e) => MapEntry(k, e?.toUtc().toIso8601String())), }; SimpleClassOfEnumTypeToDateTimeNullable @@ -1332,8 +1344,8 @@ SimpleClassOfEnumTypeToDateTimeNullable Map _$SimpleClassOfEnumTypeToDateTimeNullableToJson( SimpleClassOfEnumTypeToDateTimeNullable instance) => { - 'value': instance.value - .map((k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e?.toIso8601String())), + 'value': instance.value.map((k, e) => + MapEntry(_$EnumTypeEnumMap[k]!, e?.toUtc().toIso8601String())), }; SimpleClassNullableOfEnumTypeToDateTimeNullable @@ -1349,8 +1361,8 @@ SimpleClassNullableOfEnumTypeToDateTimeNullable Map _$SimpleClassNullableOfEnumTypeToDateTimeNullableToJson( SimpleClassNullableOfEnumTypeToDateTimeNullable instance) => { - 'value': instance.value?.map( - (k, e) => MapEntry(_$EnumTypeEnumMap[k]!, e?.toIso8601String())), + 'value': instance.value?.map((k, e) => + MapEntry(_$EnumTypeEnumMap[k]!, e?.toUtc().toIso8601String())), }; SimpleClassOfIntToDateTimeNullable _$SimpleClassOfIntToDateTimeNullableFromJson( @@ -1366,7 +1378,7 @@ Map _$SimpleClassOfIntToDateTimeNullableToJson( SimpleClassOfIntToDateTimeNullable instance) => { 'value': instance.value - .map((k, e) => MapEntry(k.toString(), e?.toIso8601String())), + .map((k, e) => MapEntry(k.toString(), e?.toUtc().toIso8601String())), }; SimpleClassNullableOfIntToDateTimeNullable @@ -1383,7 +1395,7 @@ Map _$SimpleClassNullableOfIntToDateTimeNullableToJson( SimpleClassNullableOfIntToDateTimeNullable instance) => { 'value': instance.value - ?.map((k, e) => MapEntry(k.toString(), e?.toIso8601String())), + ?.map((k, e) => MapEntry(k.toString(), e?.toUtc().toIso8601String())), }; SimpleClassOfObjectToDateTimeNullable @@ -1399,7 +1411,8 @@ SimpleClassOfObjectToDateTimeNullable Map _$SimpleClassOfObjectToDateTimeNullableToJson( SimpleClassOfObjectToDateTimeNullable instance) => { - 'value': instance.value.map((k, e) => MapEntry(k, e?.toIso8601String())), + 'value': instance.value + .map((k, e) => MapEntry(k, e?.toUtc().toIso8601String())), }; SimpleClassNullableOfObjectToDateTimeNullable @@ -1415,7 +1428,8 @@ SimpleClassNullableOfObjectToDateTimeNullable Map _$SimpleClassNullableOfObjectToDateTimeNullableToJson( SimpleClassNullableOfObjectToDateTimeNullable instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k, e?.toIso8601String())), + 'value': instance.value + ?.map((k, e) => MapEntry(k, e?.toUtc().toIso8601String())), }; SimpleClassOfStringToDateTimeNullable @@ -1431,7 +1445,8 @@ SimpleClassOfStringToDateTimeNullable Map _$SimpleClassOfStringToDateTimeNullableToJson( SimpleClassOfStringToDateTimeNullable instance) => { - 'value': instance.value.map((k, e) => MapEntry(k, e?.toIso8601String())), + 'value': instance.value + .map((k, e) => MapEntry(k, e?.toUtc().toIso8601String())), }; SimpleClassNullableOfStringToDateTimeNullable @@ -1447,7 +1462,8 @@ SimpleClassNullableOfStringToDateTimeNullable Map _$SimpleClassNullableOfStringToDateTimeNullableToJson( SimpleClassNullableOfStringToDateTimeNullable instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k, e?.toIso8601String())), + 'value': instance.value + ?.map((k, e) => MapEntry(k, e?.toUtc().toIso8601String())), }; SimpleClassOfUriToDateTimeNullable _$SimpleClassOfUriToDateTimeNullableFromJson( @@ -1463,7 +1479,7 @@ Map _$SimpleClassOfUriToDateTimeNullableToJson( SimpleClassOfUriToDateTimeNullable instance) => { 'value': instance.value - .map((k, e) => MapEntry(k.toString(), e?.toIso8601String())), + .map((k, e) => MapEntry(k.toString(), e?.toUtc().toIso8601String())), }; SimpleClassNullableOfUriToDateTimeNullable @@ -1480,7 +1496,7 @@ Map _$SimpleClassNullableOfUriToDateTimeNullableToJson( SimpleClassNullableOfUriToDateTimeNullable instance) => { 'value': instance.value - ?.map((k, e) => MapEntry(k.toString(), e?.toIso8601String())), + ?.map((k, e) => MapEntry(k.toString(), e?.toUtc().toIso8601String())), }; SimpleClassOfBigIntToDouble _$SimpleClassOfBigIntToDoubleFromJson( @@ -1522,7 +1538,8 @@ SimpleClassOfDateTimeToDouble _$SimpleClassOfDateTimeToDoubleFromJson( Map _$SimpleClassOfDateTimeToDoubleToJson( SimpleClassOfDateTimeToDouble instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToDouble @@ -1537,7 +1554,8 @@ SimpleClassNullableOfDateTimeToDouble Map _$SimpleClassNullableOfDateTimeToDoubleToJson( SimpleClassNullableOfDateTimeToDouble instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToDouble _$SimpleClassOfDynamicToDoubleFromJson( @@ -1753,7 +1771,8 @@ SimpleClassOfDateTimeToDoubleNullable Map _$SimpleClassOfDateTimeToDoubleNullableToJson( SimpleClassOfDateTimeToDoubleNullable instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToDoubleNullable @@ -1768,7 +1787,8 @@ SimpleClassNullableOfDateTimeToDoubleNullable Map _$SimpleClassNullableOfDateTimeToDoubleNullableToJson( SimpleClassNullableOfDateTimeToDoubleNullable instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToDoubleNullable @@ -1994,8 +2014,8 @@ SimpleClassOfDateTimeToDuration _$SimpleClassOfDateTimeToDurationFromJson( Map _$SimpleClassOfDateTimeToDurationToJson( SimpleClassOfDateTimeToDuration instance) => { - 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), e.inMicroseconds)), + 'value': instance.value.map( + (k, e) => MapEntry(k.toUtc().toIso8601String(), e.inMicroseconds)), }; SimpleClassNullableOfDateTimeToDuration @@ -2011,8 +2031,8 @@ SimpleClassNullableOfDateTimeToDuration Map _$SimpleClassNullableOfDateTimeToDurationToJson( SimpleClassNullableOfDateTimeToDuration instance) => { - 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), e.inMicroseconds)), + 'value': instance.value?.map( + (k, e) => MapEntry(k.toUtc().toIso8601String(), e.inMicroseconds)), }; SimpleClassOfDynamicToDuration _$SimpleClassOfDynamicToDurationFromJson( @@ -2246,8 +2266,8 @@ SimpleClassOfDateTimeToDurationNullable Map _$SimpleClassOfDateTimeToDurationNullableToJson( SimpleClassOfDateTimeToDurationNullable instance) => { - 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), e?.inMicroseconds)), + 'value': instance.value.map( + (k, e) => MapEntry(k.toUtc().toIso8601String(), e?.inMicroseconds)), }; SimpleClassNullableOfDateTimeToDurationNullable @@ -2263,8 +2283,8 @@ SimpleClassNullableOfDateTimeToDurationNullable Map _$SimpleClassNullableOfDateTimeToDurationNullableToJson( SimpleClassNullableOfDateTimeToDurationNullable instance) => { - 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), e?.inMicroseconds)), + 'value': instance.value?.map( + (k, e) => MapEntry(k.toUtc().toIso8601String(), e?.inMicroseconds)), }; SimpleClassOfDynamicToDurationNullable @@ -2502,7 +2522,8 @@ SimpleClassOfDateTimeToDynamic _$SimpleClassOfDateTimeToDynamicFromJson( Map _$SimpleClassOfDateTimeToDynamicToJson( SimpleClassOfDateTimeToDynamic instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToDynamic @@ -2517,7 +2538,8 @@ SimpleClassNullableOfDateTimeToDynamic Map _$SimpleClassNullableOfDateTimeToDynamicToJson( SimpleClassNullableOfDateTimeToDynamic instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToDynamic _$SimpleClassOfDynamicToDynamicFromJson( @@ -2723,8 +2745,8 @@ SimpleClassOfDateTimeToEnumType _$SimpleClassOfDateTimeToEnumTypeFromJson( Map _$SimpleClassOfDateTimeToEnumTypeToJson( SimpleClassOfDateTimeToEnumType instance) => { - 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e]!)), + 'value': instance.value.map((k, e) => + MapEntry(k.toUtc().toIso8601String(), _$EnumTypeEnumMap[e]!)), }; SimpleClassNullableOfDateTimeToEnumType @@ -2740,8 +2762,8 @@ SimpleClassNullableOfDateTimeToEnumType Map _$SimpleClassNullableOfDateTimeToEnumTypeToJson( SimpleClassNullableOfDateTimeToEnumType instance) => { - 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e]!)), + 'value': instance.value?.map((k, e) => + MapEntry(k.toUtc().toIso8601String(), _$EnumTypeEnumMap[e]!)), }; SimpleClassOfDynamicToEnumType _$SimpleClassOfDynamicToEnumTypeFromJson( @@ -2974,8 +2996,8 @@ SimpleClassOfDateTimeToEnumTypeNullable Map _$SimpleClassOfDateTimeToEnumTypeNullableToJson( SimpleClassOfDateTimeToEnumTypeNullable instance) => { - 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e])), + 'value': instance.value.map((k, e) => + MapEntry(k.toUtc().toIso8601String(), _$EnumTypeEnumMap[e])), }; SimpleClassNullableOfDateTimeToEnumTypeNullable @@ -2991,8 +3013,8 @@ SimpleClassNullableOfDateTimeToEnumTypeNullable Map _$SimpleClassNullableOfDateTimeToEnumTypeNullableToJson( SimpleClassNullableOfDateTimeToEnumTypeNullable instance) => { - 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), _$EnumTypeEnumMap[e])), + 'value': instance.value?.map((k, e) => + MapEntry(k.toUtc().toIso8601String(), _$EnumTypeEnumMap[e])), }; SimpleClassOfDynamicToEnumTypeNullable @@ -3230,7 +3252,8 @@ SimpleClassOfDateTimeToFromJsonDynamicParam Map _$SimpleClassOfDateTimeToFromJsonDynamicParamToJson( SimpleClassOfDateTimeToFromJsonDynamicParam instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToFromJsonDynamicParam @@ -3247,8 +3270,8 @@ Map _$SimpleClassNullableOfDateTimeToFromJsonDynamicParamToJson( SimpleClassNullableOfDateTimeToFromJsonDynamicParam instance) => { - 'value': - instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToFromJsonDynamicParam @@ -3481,7 +3504,8 @@ SimpleClassOfDateTimeToFromJsonNullableObjectParam Map _$SimpleClassOfDateTimeToFromJsonNullableObjectParamToJson( SimpleClassOfDateTimeToFromJsonNullableObjectParam instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToFromJsonNullableObjectParam @@ -3498,7 +3522,8 @@ Map _$SimpleClassNullableOfDateTimeToFromJsonNullableObjectParamToJson( SimpleClassNullableOfDateTimeToFromJsonNullableObjectParam instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToFromJsonNullableObjectParam @@ -3739,7 +3764,8 @@ SimpleClassOfDateTimeToFromJsonObjectParam Map _$SimpleClassOfDateTimeToFromJsonObjectParamToJson( SimpleClassOfDateTimeToFromJsonObjectParam instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToFromJsonObjectParam @@ -3755,7 +3781,8 @@ SimpleClassNullableOfDateTimeToFromJsonObjectParam Map _$SimpleClassNullableOfDateTimeToFromJsonObjectParamToJson( SimpleClassNullableOfDateTimeToFromJsonObjectParam instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToFromJsonObjectParam @@ -3984,7 +4011,8 @@ SimpleClassOfDateTimeToInt _$SimpleClassOfDateTimeToIntFromJson( Map _$SimpleClassOfDateTimeToIntToJson( SimpleClassOfDateTimeToInt instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToInt _$SimpleClassNullableOfDateTimeToIntFromJson( @@ -3998,7 +4026,8 @@ SimpleClassNullableOfDateTimeToInt _$SimpleClassNullableOfDateTimeToIntFromJson( Map _$SimpleClassNullableOfDateTimeToIntToJson( SimpleClassNullableOfDateTimeToInt instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToInt _$SimpleClassOfDynamicToIntFromJson( @@ -4206,7 +4235,8 @@ SimpleClassOfDateTimeToIntNullable _$SimpleClassOfDateTimeToIntNullableFromJson( Map _$SimpleClassOfDateTimeToIntNullableToJson( SimpleClassOfDateTimeToIntNullable instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToIntNullable @@ -4221,7 +4251,8 @@ SimpleClassNullableOfDateTimeToIntNullable Map _$SimpleClassNullableOfDateTimeToIntNullableToJson( SimpleClassNullableOfDateTimeToIntNullable instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToIntNullable _$SimpleClassOfDynamicToIntNullableFromJson( @@ -4434,7 +4465,8 @@ SimpleClassOfDateTimeToNum _$SimpleClassOfDateTimeToNumFromJson( Map _$SimpleClassOfDateTimeToNumToJson( SimpleClassOfDateTimeToNum instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToNum _$SimpleClassNullableOfDateTimeToNumFromJson( @@ -4448,7 +4480,8 @@ SimpleClassNullableOfDateTimeToNum _$SimpleClassNullableOfDateTimeToNumFromJson( Map _$SimpleClassNullableOfDateTimeToNumToJson( SimpleClassNullableOfDateTimeToNum instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToNum _$SimpleClassOfDynamicToNumFromJson( @@ -4654,7 +4687,8 @@ SimpleClassOfDateTimeToNumNullable _$SimpleClassOfDateTimeToNumNullableFromJson( Map _$SimpleClassOfDateTimeToNumNullableToJson( SimpleClassOfDateTimeToNumNullable instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToNumNullable @@ -4669,7 +4703,8 @@ SimpleClassNullableOfDateTimeToNumNullable Map _$SimpleClassNullableOfDateTimeToNumNullableToJson( SimpleClassNullableOfDateTimeToNumNullable instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToNumNullable _$SimpleClassOfDynamicToNumNullableFromJson( @@ -4880,7 +4915,8 @@ SimpleClassOfDateTimeToObject _$SimpleClassOfDateTimeToObjectFromJson( Map _$SimpleClassOfDateTimeToObjectToJson( SimpleClassOfDateTimeToObject instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToObject @@ -4895,7 +4931,8 @@ SimpleClassNullableOfDateTimeToObject Map _$SimpleClassNullableOfDateTimeToObjectToJson( SimpleClassNullableOfDateTimeToObject instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToObject _$SimpleClassOfDynamicToObjectFromJson( @@ -5109,7 +5146,8 @@ SimpleClassOfDateTimeToObjectNullable Map _$SimpleClassOfDateTimeToObjectNullableToJson( SimpleClassOfDateTimeToObjectNullable instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToObjectNullable @@ -5124,7 +5162,8 @@ SimpleClassNullableOfDateTimeToObjectNullable Map _$SimpleClassNullableOfDateTimeToObjectNullableToJson( SimpleClassNullableOfDateTimeToObjectNullable instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToObjectNullable @@ -5373,8 +5412,8 @@ SimpleClassOfDateTimeToRecord _$SimpleClassOfDateTimeToRecordFromJson( Map _$SimpleClassOfDateTimeToRecordToJson( SimpleClassOfDateTimeToRecord instance) => { - 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), { + 'value': instance.value.map( + (k, e) => MapEntry(k.toUtc().toIso8601String(), { r'$1': e.$1, r'$2': e.$2, 'truth': e.truth, @@ -5402,8 +5441,8 @@ SimpleClassNullableOfDateTimeToRecord Map _$SimpleClassNullableOfDateTimeToRecordToJson( SimpleClassNullableOfDateTimeToRecord instance) => { - 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), { + 'value': instance.value?.map( + (k, e) => MapEntry(k.toUtc().toIso8601String(), { r'$1': e.$1, r'$2': e.$2, 'truth': e.truth, @@ -5780,7 +5819,8 @@ SimpleClassOfDateTimeToString _$SimpleClassOfDateTimeToStringFromJson( Map _$SimpleClassOfDateTimeToStringToJson( SimpleClassOfDateTimeToString instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToString @@ -5795,7 +5835,8 @@ SimpleClassNullableOfDateTimeToString Map _$SimpleClassNullableOfDateTimeToStringToJson( SimpleClassNullableOfDateTimeToString instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToString _$SimpleClassOfDynamicToStringFromJson( @@ -6003,7 +6044,8 @@ SimpleClassOfDateTimeToStringNullable Map _$SimpleClassOfDateTimeToStringNullableToJson( SimpleClassOfDateTimeToStringNullable instance) => { - 'value': instance.value.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassNullableOfDateTimeToStringNullable @@ -6018,7 +6060,8 @@ SimpleClassNullableOfDateTimeToStringNullable Map _$SimpleClassNullableOfDateTimeToStringNullableToJson( SimpleClassNullableOfDateTimeToStringNullable instance) => { - 'value': instance.value?.map((k, e) => MapEntry(k.toIso8601String(), e)), + 'value': instance.value + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e)), }; SimpleClassOfDynamicToStringNullable @@ -6233,7 +6276,7 @@ Map _$SimpleClassOfDateTimeToUriToJson( SimpleClassOfDateTimeToUri instance) => { 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), e.toString())), + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e.toString())), }; SimpleClassNullableOfDateTimeToUri _$SimpleClassNullableOfDateTimeToUriFromJson( @@ -6248,7 +6291,7 @@ Map _$SimpleClassNullableOfDateTimeToUriToJson( SimpleClassNullableOfDateTimeToUri instance) => { 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), e.toString())), + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e.toString())), }; SimpleClassOfDynamicToUri _$SimpleClassOfDynamicToUriFromJson( @@ -6473,7 +6516,7 @@ Map _$SimpleClassOfDateTimeToUriNullableToJson( SimpleClassOfDateTimeToUriNullable instance) => { 'value': instance.value - .map((k, e) => MapEntry(k.toIso8601String(), e?.toString())), + .map((k, e) => MapEntry(k.toUtc().toIso8601String(), e?.toString())), }; SimpleClassNullableOfDateTimeToUriNullable @@ -6490,7 +6533,7 @@ Map _$SimpleClassNullableOfDateTimeToUriNullableToJson( SimpleClassNullableOfDateTimeToUriNullable instance) => { 'value': instance.value - ?.map((k, e) => MapEntry(k.toIso8601String(), e?.toString())), + ?.map((k, e) => MapEntry(k.toUtc().toIso8601String(), e?.toString())), }; SimpleClassOfDynamicToUriNullable _$SimpleClassOfDynamicToUriNullableFromJson( diff --git a/json_serializable/test/supported_types/input.type_record.g.dart b/json_serializable/test/supported_types/input.type_record.g.dart index bc37b7cd2..6085326ab 100644 --- a/json_serializable/test/supported_types/input.type_record.g.dart +++ b/json_serializable/test/supported_types/input.type_record.g.dart @@ -237,8 +237,8 @@ Map _$SimpleClassOfDateTimeToJson( SimpleClassOfDateTime instance) => { 'value': { - r'$1': instance.value.$1.toIso8601String(), - 'named': instance.value.named.toIso8601String(), + r'$1': instance.value.$1.toUtc().toIso8601String(), + 'named': instance.value.named.toUtc().toIso8601String(), }, }; @@ -260,8 +260,8 @@ Map _$SimpleClassNullableOfDateTimeToJson( 'value': instance.value == null ? null : { - r'$1': instance.value!.$1.toIso8601String(), - 'named': instance.value!.named.toIso8601String(), + r'$1': instance.value!.$1.toUtc().toIso8601String(), + 'named': instance.value!.named.toUtc().toIso8601String(), }, }; @@ -285,8 +285,8 @@ Map _$SimpleClassOfDateTimeNullableToJson( SimpleClassOfDateTimeNullable instance) => { 'value': { - r'$1': instance.value.$1?.toIso8601String(), - 'named': instance.value.named?.toIso8601String(), + r'$1': instance.value.$1?.toUtc().toIso8601String(), + 'named': instance.value.named?.toUtc().toIso8601String(), }, }; @@ -313,8 +313,8 @@ Map _$SimpleClassNullableOfDateTimeNullableToJson( 'value': instance.value == null ? null : { - r'$1': instance.value!.$1?.toIso8601String(), - 'named': instance.value!.named?.toIso8601String(), + r'$1': instance.value!.$1?.toUtc().toIso8601String(), + 'named': instance.value!.named?.toUtc().toIso8601String(), }, }; diff --git a/json_serializable/test/supported_types/input.type_set.g.dart b/json_serializable/test/supported_types/input.type_set.g.dart index 234afad93..266c097d3 100644 --- a/json_serializable/test/supported_types/input.type_set.g.dart +++ b/json_serializable/test/supported_types/input.type_set.g.dart @@ -146,7 +146,7 @@ SimpleClassOfDateTime _$SimpleClassOfDateTimeFromJson( Map _$SimpleClassOfDateTimeToJson( SimpleClassOfDateTime instance) => { - 'value': instance.value.map((e) => e.toIso8601String()).toList(), + 'value': instance.value.map((e) => e.toUtc().toIso8601String()).toList(), }; SimpleClassNullableOfDateTime _$SimpleClassNullableOfDateTimeFromJson( @@ -160,7 +160,7 @@ SimpleClassNullableOfDateTime _$SimpleClassNullableOfDateTimeFromJson( Map _$SimpleClassNullableOfDateTimeToJson( SimpleClassNullableOfDateTime instance) => { - 'value': instance.value?.map((e) => e.toIso8601String()).toList(), + 'value': instance.value?.map((e) => e.toUtc().toIso8601String()).toList(), }; SimpleClassOfDateTimeNullable _$SimpleClassOfDateTimeNullableFromJson( @@ -174,7 +174,7 @@ SimpleClassOfDateTimeNullable _$SimpleClassOfDateTimeNullableFromJson( Map _$SimpleClassOfDateTimeNullableToJson( SimpleClassOfDateTimeNullable instance) => { - 'value': instance.value.map((e) => e?.toIso8601String()).toList(), + 'value': instance.value.map((e) => e?.toUtc().toIso8601String()).toList(), }; SimpleClassNullableOfDateTimeNullable @@ -189,7 +189,8 @@ SimpleClassNullableOfDateTimeNullable Map _$SimpleClassNullableOfDateTimeNullableToJson( SimpleClassNullableOfDateTimeNullable instance) => { - 'value': instance.value?.map((e) => e?.toIso8601String()).toList(), + 'value': + instance.value?.map((e) => e?.toUtc().toIso8601String()).toList(), }; SimpleClassOfDouble _$SimpleClassOfDoubleFromJson(Map json) =>