Fix support for static functions with JsonKey.readValue (#1058)

and prepare to release v6.1.1

Fixes #1055

Author: kevmoo

json_serializable/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.1.1
+
+- Fix `JsonKey.readValue` support to allow static functions.
+
 ## 6.1.0
 
 - Support `JsonKey.readValue` to allow customized reading of values from source

json_serializable/lib/src/json_key_utils.dart

@@ -212,8 +212,8 @@ KeyConfig _from(FieldElement element, ClassConfig classAnnotation) {
   String? readValueFunctionName;
   final readValue = obj.read('readValue');
   if (!readValue.isNull) {
-    final objValue = readValue.objectValue.toFunctionValue()!;
-    readValueFunctionName = objValue.name;
+    readValueFunctionName =
+        readValue.objectValue.toFunctionValue()!.qualifiedName;
   }
 
   return _populateJsonKey(

json_serializable/lib/src/type_helper_ctx.dart

@@ -176,11 +176,5 @@ ConvertData? _convertData(DartObject obj, FieldElement element, bool isFrom) {
     }
   }
 
-  var name = executableElement.name;
-
-  if (executableElement is MethodElement) {
-    name = '${executableElement.enclosingElement.name}.$name';
-  }
-
-  return ConvertData(name, argType);
+  return ConvertData(executableElement.qualifiedName, argType);
 }

json_serializable/lib/src/utils.dart

@@ -207,3 +207,21 @@ String typeToCode(
   }
   throw UnimplementedError('(${type.runtimeType}) $type');
 }
+
+extension ExecutableElementExtension on ExecutableElement {
+  /// Returns the name of `this` qualified with the class name if it's a
+  /// [MethodElement].
+  String get qualifiedName {
+    if (this is FunctionElement) {
+      return name;
+    }
+
+    if (this is MethodElement) {
+      return '${enclosingElement.name}.$name';
+    }
+
+    throw UnsupportedError(
+      'Not sure how to support typeof $runtimeType',
+    );
+  }
+}

json_serializable/pubspec.yaml

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

json_serializable/test/kitchen_sink/kitchen_sink.dart

@@ -76,10 +76,6 @@ class _Factory implements k.KitchenSinkFactory<String, dynamic> {
 }
 
 Object? _valueAccessor(Map json, String key) {
-  if (key == k.trickyKeyName) {
-    return json[k.trickyKeyName] ?? json['STRING'];
-  }
-
   if (key == 'iterable') {
     return json['iterable'] ?? json['theIterable'];
   }
@@ -165,7 +161,7 @@ class KitchenSink implements k.KitchenSink {
   // Handle fields with names that collide with helper names
   Map<String, bool> val = _defaultMap();
   bool? writeNotNull;
-  @JsonKey(name: k.trickyKeyName, readValue: _valueAccessor)
+  @JsonKey(name: k.trickyKeyName, readValue: _trickyValueAccessor)
   String? string;
 
   SimpleObject simpleObject = _defaultSimpleObject();
@@ -184,6 +180,14 @@ class KitchenSink implements k.KitchenSink {
   }
 
   bool operator ==(Object other) => k.sinkEquals(this, other);
+
+  static Object? _trickyValueAccessor(Map json, String key) {
+    if (key == k.trickyKeyName) {
+      return json[k.trickyKeyName] ?? json['STRING'];
+    }
+
+    return json[key];
+  }
 }
 
 @JsonSerializable()

json_serializable/test/kitchen_sink/kitchen_sink.g.dart

@@ -75,10 +75,6 @@ class _Factory implements k.KitchenSinkFactory<dynamic, dynamic> {
 }
 
 Object? _valueAccessor(Map json, String key) {
-  if (key == k.trickyKeyName) {
-    return json[k.trickyKeyName] ?? json['STRING'];
-  }
-
   if (key == 'iterable') {
     return json['iterable'] ?? json['theIterable'];
   }
@@ -165,7 +161,7 @@ class KitchenSink implements k.KitchenSink {
   // Handle fields with names that collide with helper names
   Map<String, bool> val = _defaultMap();
   bool? writeNotNull;
-  @JsonKey(name: k.trickyKeyName, readValue: _valueAccessor)
+  @JsonKey(name: k.trickyKeyName, readValue: _trickyValueAccessor)
   String? string;
 
   SimpleObject simpleObject = _defaultSimpleObject();
@@ -184,6 +180,14 @@ class KitchenSink implements k.KitchenSink {
   }
 
   bool operator ==(Object other) => k.sinkEquals(this, other);
+
+  static Object? _trickyValueAccessor(Map json, String key) {
+    if (key == k.trickyKeyName) {
+      return json[k.trickyKeyName] ?? json['STRING'];
+    }
+
+    return json[key];
+  }
 }
 
 @JsonSerializable(

json_serializable/test/kitchen_sink/kitchen_sink.g_any_map.dart

@@ -75,10 +75,6 @@ class _Factory implements k.KitchenSinkFactory<dynamic, dynamic> {
 }
 
 Object? _valueAccessor(Map json, String key) {
-  if (key == k.trickyKeyName) {
-    return json[k.trickyKeyName] ?? json['STRING'];
-  }
-
   if (key == 'iterable') {
     return json['iterable'] ?? json['theIterable'];
   }
@@ -166,7 +162,7 @@ class KitchenSink implements k.KitchenSink {
   // Handle fields with names that collide with helper names
   Map<String, bool> val = _defaultMap();
   bool? writeNotNull;
-  @JsonKey(name: k.trickyKeyName, readValue: _valueAccessor)
+  @JsonKey(name: k.trickyKeyName, readValue: _trickyValueAccessor)
   String? string;
 
   SimpleObject simpleObject = _defaultSimpleObject();
@@ -185,6 +181,14 @@ class KitchenSink implements k.KitchenSink {
   }
 
   bool operator ==(Object other) => k.sinkEquals(this, other);
+
+  static Object? _trickyValueAccessor(Map json, String key) {
+    if (key == k.trickyKeyName) {
+      return json[k.trickyKeyName] ?? json['STRING'];
+    }
+
+    return json[key];
+  }
 }
 
 @JsonSerializable(