Fix support for Duration fields with default values

json_serializable/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 6.3.1
+
+- Fixed support for `Duration` fields with default values.
+  ([#1170](https://github.com/google/json_serializable.dart/issues/1170))
+
 ## 6.3.0
 
 - Added support for generating `_$ExampleFieldMap`, which can be used by other

json_serializable/lib/src/type_helper.dart

@@ -6,7 +6,6 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 
 import 'type_helpers/config_types.dart';
-import 'utils.dart';
 
 /// Context information provided in calls to [TypeHelper.serialize] and
 /// [TypeHelper.deserialize].
@@ -85,12 +84,3 @@ abstract class TypeHelper<T extends TypeHelperContext> {
     bool defaultProvided,
   );
 }
-
-Object commonNullPrefix(
-  bool nullable,
-  String expression,
-  Object unsafeExpression,
-) =>
-    nullable
-        ? ifNullOrElse(expression, 'null', '$unsafeExpression')
-        : unsafeExpression;

json_serializable/lib/src/type_helpers/duration_helper.dart

@@ -6,6 +6,7 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:source_gen/source_gen.dart' show TypeChecker;
 import 'package:source_helper/source_helper.dart';
 
+import '../default_container.dart';
 import '../type_helper.dart';
 
 class DurationHelper extends TypeHelper {
@@ -33,7 +34,7 @@ class DurationHelper extends TypeHelper {
   }
 
   @override
-  String? deserialize(
+  Object? deserialize(
     DartType targetType,
     String expression,
     TypeHelperContext context,
@@ -43,11 +44,10 @@ class DurationHelper extends TypeHelper {
       return null;
     }
 
-    return commonNullPrefix(
-      targetType.isNullableType,
+    return DefaultContainer(
       expression,
       'Duration(microseconds: $expression as int)',
-    ).toString();
+    );
   }
 }
 

json_serializable/lib/src/type_helpers/to_from_string.dart

@@ -5,7 +5,7 @@
 import 'package:analyzer/dart/element/type.dart';
 import 'package:source_gen/source_gen.dart';
 
-import '../type_helper.dart';
+import '../utils.dart';
 
 final bigIntString = ToFromStringHelper(
   'BigInt.parse',
@@ -76,7 +76,8 @@ class ToFromStringHelper {
 
     final parseParam = isString ? expression : '$expression as String';
 
-    return commonNullPrefix(nullable, expression, '$_parse($parseParam)')
-        .toString();
+    final output = '$_parse($parseParam)';
+
+    return nullable ? ifNullOrElse(expression, 'null', output) : output;
   }
 }

json_serializable/pubspec.yaml

@@ -1,5 +1,5 @@
 name: json_serializable
-version: 6.3.0
+version: 6.3.1
 description: >-
   Automatically generate code for converting to and from JSON by annotating
   Dart classes.

json_serializable/test/default_value/default_value.dart

@@ -59,6 +59,8 @@ class DefaultValue implements dvi.DefaultValue {
   })
   Map<String, List<String>> fieldMapListString;
 
+  Duration durationField;
+
   @JsonKey(defaultValue: Greek.beta)
   Greek fieldEnum;
 
@@ -83,6 +85,7 @@ class DefaultValue implements dvi.DefaultValue {
     this.fieldMapSimple,
     this.fieldMapListString,
     this.fieldEnum, {
+    this.durationField = Duration.zero,
     this.constClass = const ConstClass('value'),
     this.valueFromConverter = const ConstClass('value'),
     this.valueFromFunction = const ConstClass('value'),

json_serializable/test/default_value/default_value.g_any_map__checked.dart

@@ -62,6 +62,8 @@ class DefaultValue implements dvi.DefaultValue {
   })
   Map<String, List<String>> fieldMapListString;
 
+  Duration durationField;
+
   @JsonKey(defaultValue: Greek.beta)
   Greek fieldEnum;
 
@@ -86,6 +88,7 @@ class DefaultValue implements dvi.DefaultValue {
     this.fieldMapSimple,
     this.fieldMapListString,
     this.fieldEnum, {
+    this.durationField = Duration.zero,
     this.constClass = const ConstClass('value'),
     this.valueFromConverter = const ConstClass('value'),
     this.valueFromFunction = const ConstClass('value'),

json_serializable/test/default_value/default_value_interface.dart

@@ -27,6 +27,8 @@ abstract class DefaultValue {
 
   Map<String, List<String>> get fieldMapListString;
 
+  Duration get durationField;
+
   Greek get fieldEnum;
 
   ConstClass get constClass;

json_serializable/test/default_value/default_value_test.dart

@@ -24,6 +24,7 @@ const _defaultInstance = {
   'fieldMapListString': {
     'root': ['child']
   },
+  'durationField': 0,
   'fieldEnum': 'beta',
   'constClass': {'field': 'value'},
   'valueFromConverter': 'value',
@@ -44,6 +45,7 @@ const _otherValues = {
   'fieldMapListString': {
     'root2': ['alpha']
   },
+  'durationField': 1,
   'fieldEnum': 'delta',
   'constClass': {'field': 'otherValue'},
   'valueFromConverter': 'otherValue',

json_serializable/test/default_value/implicit_default_value.dart

@@ -34,6 +34,8 @@ class DefaultValueImplicit implements dvi.DefaultValue {
 
   final Map<String, List<String>> fieldMapListString;
 
+  final Duration durationField;
+
   final Greek fieldEnum;
 
   final ConstClass constClass;
@@ -59,6 +61,7 @@ class DefaultValueImplicit implements dvi.DefaultValue {
       'root': ['child']
     },
     this.fieldEnum = Greek.beta,
+    this.durationField = const Duration(),
     this.constClass = const ConstClass('value'),
     this.valueFromConverter = const ConstClass('value'),
     this.valueFromFunction = const ConstClass('value'),