Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JsonConverter]: Support generators with constructor arguments #1375

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[JsonConverter]: Support generators with constructor arguments #1375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
78 changes: 68 additions & 10 deletions json_serializable/lib/src/type_helpers/json_converter_helper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,20 +114,22 @@ class _JsonConvertData {

_JsonConvertData.className(
String className,
String? arguments,
String accessor,
this.jsonType,
this.fieldType,
) : accessString = 'const $className${_withAccessor(accessor)}()',
) : accessString = 'const $className${_withAccessor(accessor)}(${arguments ?? ''})',
isGeneric = false;

_JsonConvertData.genericClass(
String className,
String? arguments,
String genericTypeArg,
String accessor,
this.jsonType,
this.fieldType,
) : accessString =
'$className<$genericTypeArg>${_withAccessor(accessor)}()',
'$className<$genericTypeArg>${_withAccessor(accessor)}(${arguments ?? ''})',
isGeneric = true;

_JsonConvertData.propertyAccess(
Expand Down Expand Up @@ -230,18 +232,13 @@ _JsonConvertData? _typeConverterFrom(
}

final reviver = ConstantReader(match.annotation).revive();

if (reviver.namedArguments.isNotEmpty ||
reviver.positionalArguments.isNotEmpty) {
throw InvalidGenerationSourceError(
'Generators with constructor arguments are not supported.',
element: match.elementAnnotation?.element,
);
}
// Support generators with constructor arguments
String? arguments = _argsFromRevivable(reviver);

if (match.genericTypeArg != null) {
return _JsonConvertData.genericClass(
match.annotation.type!.element!.name!,
arguments,
match.genericTypeArg!,
reviver.accessor,
match.jsonType,
Expand All @@ -251,12 +248,73 @@ _JsonConvertData? _typeConverterFrom(

return _JsonConvertData.className(
match.annotation.type!.element!.name!,
arguments,
reviver.accessor,
match.jsonType,
match.fieldType,
);
}

String? _argsFromRevivable(Revivable reviver) {
String? arguments, positionalArguments, namedArguments;
if (reviver.positionalArguments.isNotEmpty) {
positionalArguments = reviver.positionalArguments.map((DartObject arg) => _argumentValueFromDartObject(arg)).join(', ');
}
if (reviver.namedArguments.isNotEmpty) {
namedArguments = reviver.namedArguments.keys
.map((String key) {
dynamic arg = _argumentValueFromDartObject(reviver.namedArguments[key]);
if (null != arg) return '$key: $arg';
return null;
})
.where(_isNotEmpty)
.join(', ');
}
arguments = <String?>[positionalArguments, namedArguments].where(_isNotEmpty).join(', ');
return arguments;
}

bool _isNotEmpty(dynamic element) => null != element;

dynamic _argumentValueFromDartObject(DartObject? obj) {
try {
if (null != obj) {
if (obj.type?.isDartCoreString == true) {
return '\'${obj.toStringValue()}\'';
} else if (obj.type?.isDartCoreInt == true) {
return obj.toIntValue();
} else if (obj.type?.isDartCoreDouble == true) {
return obj.toDoubleValue();
} else if (obj.type?.isDartCoreBool == true) {
return obj.toBoolValue();
} else if (obj.type?.isDartCoreIterable == true || obj.type?.isDartCoreList == true) {
return obj.toListValue();
} else if (obj.type?.isDartCoreMap == true) {
return obj.toMapValue();
} else if (obj.type?.isDartCoreSet == true) {
return obj.toSetValue();
} else if (obj.type?.isDartCoreSymbol == true) {
return obj.toSymbolValue();
} else {
ExecutableElement? executable = obj.toFunctionValue();
if (null != executable) {
return executable.displayName;
} else if (null != obj.type) {
String? typeDisplayString = obj.type?.getDisplayString(withNullability: false);
if (null != typeDisplayString && typeDisplayString != 'Null') {
final reviver = ConstantReader(obj).revive();
String? arguments = _argsFromRevivable(reviver);
return '$typeDisplayString(${arguments ?? ''})';
}
}
}
}
} catch (e) {
print(e);
}
return null;
}

class _ConverterMatch {
final DartObject annotation;
final DartType fieldType;
Expand Down