From 87a2a72cc04bdab36d58dd7fc1c1eb9e69abbaa6 Mon Sep 17 00:00:00 2001
From: Julian Kalinowski <kalinowskijulian@gmail.com>
Date: Mon, 7 Aug 2023 00:37:33 +0200
Subject: [PATCH 1/2] select appropriate converter for nullable fieldtype

---
 .../type_helpers/json_converter_helper.dart   |  8 ++++
 .../test/json_serializable_test.dart          |  1 +
 .../test/src/json_converter_test_input.dart   | 45 +++++++++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/json_serializable/lib/src/type_helpers/json_converter_helper.dart b/json_serializable/lib/src/type_helpers/json_converter_helper.dart
index ce78f19d1..5e184ac95 100644
--- a/json_serializable/lib/src/type_helpers/json_converter_helper.dart
+++ b/json_serializable/lib/src/type_helpers/json_converter_helper.dart
@@ -202,6 +202,14 @@ _JsonConvertData? _typeConverterFrom(
     return null;
   }
 
+  if (targetType.isNullableType && matchingAnnotations.length == 2) {
+    final indexOfNonNullableConverter = matchingAnnotations
+        .indexWhere((element) => !element.fieldType.isNullableType);
+    if (indexOfNonNullableConverter >= 0) {
+      matchingAnnotations.removeAt(indexOfNonNullableConverter);
+    }
+  }
+
   if (matchingAnnotations.length > 1) {
     final targetTypeCode = typeToCode(targetType);
     throw InvalidGenerationSourceError(
diff --git a/json_serializable/test/json_serializable_test.dart b/json_serializable/test/json_serializable_test.dart
index 5644b51cb..a4bb672f9 100644
--- a/json_serializable/test/json_serializable_test.dart
+++ b/json_serializable/test/json_serializable_test.dart
@@ -91,6 +91,7 @@ const _expectedAnnotatedTests = {
   'JsonConvertOnField',
   'JsonConverterCtorParams',
   'JsonConverterDuplicateAnnotations',
+  'JsonConverterIssue1339',
   'JsonConverterNamedCtor',
   'JsonConverterNullableToNonNullable',
   'JsonConverterOnGetter',
diff --git a/json_serializable/test/src/json_converter_test_input.dart b/json_serializable/test/src/json_converter_test_input.dart
index ac7852f61..7e561ff67 100644
--- a/json_serializable/test/src/json_converter_test_input.dart
+++ b/json_serializable/test/src/json_converter_test_input.dart
@@ -126,6 +126,38 @@ class JsonConverterDuplicateAnnotations {
   late Duration value;
 }
 
+@ShouldGenerate(r'''
+JsonConverterIssue1339 _$JsonConverterIssue1339FromJson(
+        Map<String, dynamic> json) =>
+    JsonConverterIssue1339()
+      ..value =
+          const _DurationMillisecondConverter().fromJson(json['value'] as int)
+      ..nullableValue = _$JsonConverterFromJson<int, Duration?>(
+          json['nullableValue'],
+          const _DurationMillisecondNullConverter().fromJson);
+
+Map<String, dynamic> _$JsonConverterIssue1339ToJson(
+        JsonConverterIssue1339 instance) =>
+    <String, dynamic>{
+      'value': const _DurationMillisecondConverter().toJson(instance.value),
+      'nullableValue': const _DurationMillisecondNullConverter()
+          .toJson(instance.nullableValue),
+    };
+
+Value? _$JsonConverterFromJson<Json, Value>(
+  Object? json,
+  Value? Function(Json json) fromJson,
+) =>
+    json == null ? null : fromJson(json as Json);
+''')
+@JsonSerializable()
+@_DurationMillisecondNullConverter()
+@_DurationMillisecondConverter()
+class JsonConverterIssue1339 {
+  late Duration value;
+  late Duration? nullableValue;
+}
+
 const _durationConverter = _DurationMillisecondConverter();
 
 class _DurationMillisecondConverter implements JsonConverter<Duration, int> {
@@ -140,6 +172,19 @@ class _DurationMillisecondConverter implements JsonConverter<Duration, int> {
   int toJson(Duration object) => throw UnimplementedError();
 }
 
+class _DurationMillisecondNullConverter
+    implements JsonConverter<Duration?, int> {
+  const _DurationMillisecondNullConverter();
+
+  const _DurationMillisecondNullConverter.named();
+
+  @override
+  Duration? fromJson(int json) => throw UnimplementedError();
+
+  @override
+  int toJson(Duration? object) => throw UnimplementedError();
+}
+
 @ShouldThrow(
   'Generators with constructor arguments are not supported.',
   element: '',

From d3bcda6c00b3e5a993238c4edff69a3ef456ee4b Mon Sep 17 00:00:00 2001
From: Julian Kalinowski <kalinowskijulian@gmail.com>
Date: Tue, 8 Aug 2023 00:02:34 +0200
Subject: [PATCH 2/2] remove unused named constructor

---
 json_serializable/test/src/json_converter_test_input.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/json_serializable/test/src/json_converter_test_input.dart b/json_serializable/test/src/json_converter_test_input.dart
index 7e561ff67..8e83413b4 100644
--- a/json_serializable/test/src/json_converter_test_input.dart
+++ b/json_serializable/test/src/json_converter_test_input.dart
@@ -176,8 +176,6 @@ class _DurationMillisecondNullConverter
     implements JsonConverter<Duration?, int> {
   const _DurationMillisecondNullConverter();
 
-  const _DurationMillisecondNullConverter.named();
-
   @override
   Duration? fromJson(int json) => throw UnimplementedError();