Skip to content
This repository was archived by the owner on Jan 20, 2025. It is now read-only.
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/syntax.dart
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class TypeDefinition {
return "$fieldKey = DateTime.tryParse(json['$key']);";
} else if (name == 'List') {
// list of class
return "if (json['$key'] != null) {\n\t\t\t$fieldKey = <$subtype>[];\n\t\t\tjson['$key'].forEach((v) { $fieldKey!.add(new $subtype.fromJson(v)); });\n\t\t}";
return "if (json['$key'] != null) {\n\t\t\t$fieldKey = <$subtype>[];\n\t\t\tjson['$key'].forEach((v) { $fieldKey!.add($subtype.fromJson(v)); });\n\t\t}";
} else {
// class
return "$fieldKey = json['$key'] != null ? ${_buildParseClass(jsonKey)} : null;";
Expand All @@ -126,7 +126,7 @@ class TypeDefinition {
String toJsonExpression(String key, bool privateField) {
final fieldKey =
fixFieldName(key, typeDef: this, privateField: privateField);
final thisKey = 'this.$fieldKey';
final thisKey = '$fieldKey';
if (isPrimitive) {
return "data['$key'] = $thisKey;";
} else if (name == 'List') {
Expand Down Expand Up @@ -271,7 +271,7 @@ class ClassDefinition {
final privateFieldName =
fixFieldName(key, typeDef: f, privateField: true);
sb.write('if ($publicFieldName != null) {\n');
sb.write('this.$privateFieldName = $publicFieldName;\n');
sb.write('$privateFieldName = $publicFieldName;\n');
sb.write('}\n');
});
sb.write('}');
Expand All @@ -287,7 +287,7 @@ class ClassDefinition {
final f = fields[key]!;
final fieldName =
fixFieldName(key, typeDef: f, privateField: privateFields);
sb.write('this.$fieldName');
sb.write('$fieldName');
if (i != len) {
sb.write(', ');
}
Expand All @@ -311,7 +311,7 @@ class ClassDefinition {
String get _jsonGenFunc {
final sb = new StringBuffer();
sb.write(
'\tMap<String, dynamic> toJson() {\n\t\tfinal Map<String, dynamic> data = new Map<String, dynamic>();\n');
'\tMap<String, dynamic> toJson() {\n\t\tfinal Map<String, dynamic> data = <String, dynamic>{};\n');
fields.keys.forEach((k) {
sb.write('\t\t${fields[k]!.toJsonExpression(k, privateFields)}\n');
});
Expand Down