Skip to content

Commit c426729

Browse files
ikbendewilliamikbendewilliam
committed
#123 Fixed formatting
1 parent d786676 commit c426729

File tree

2 files changed

+68
-32
lines changed

2 files changed

+68
-32
lines changed

‎lib/writer/enum_model_writer.dart

+15-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ class EnumModelWriter {
2020

2121
sb.writeln('enum ${jsonModel.name} {');
2222
jsonModel.fields?.forEach((key) {
23-
final jsonValue = key.value == null || key.value?.isEmpty == null ? key.serializedName : key.value;
23+
final jsonValue = key.value == null || key.value?.isEmpty == null
24+
? key.serializedName
25+
: key.value;
2426
final description = key.description;
2527
if (description != null) {
2628
sb.writeln(' ///$description');
@@ -37,7 +39,9 @@ class EnumModelWriter {
3739
..writeln('const ${jsonModel.name}Mapping = {');
3840

3941
jsonModel.fields?.forEach((key) {
40-
final jsonValue = key.value == null || key.value?.isEmpty == null ? key.serializedName : key.value;
42+
final jsonValue = key.value == null || key.value?.isEmpty == null
43+
? key.serializedName
44+
: key.value;
4145
sb
4246
..write(' ${jsonModel.name}.${key.name}: ')
4347
..writeln('\'$jsonValue\',');
@@ -49,7 +53,9 @@ class EnumModelWriter {
4953
..writeln('const reverse${jsonModel.name}Mapping = {');
5054

5155
jsonModel.fields?.forEach((key) {
52-
final jsonValue = key.value == null || key.value?.isEmpty == null ? key.serializedName : key.value;
56+
final jsonValue = key.value == null || key.value?.isEmpty == null
57+
? key.serializedName
58+
: key.value;
5359
sb
5460
..write(' \'$jsonValue\': ')
5561
..writeln('${jsonModel.name}.${key.name},');
@@ -60,12 +66,15 @@ class EnumModelWriter {
6066
if (jsonModel.generateExtensions) {
6167
sb
6268
..writeln()
63-
..writeln('extension ${jsonModel.name}Extension on ${jsonModel.name} {')
64-
..writeln(' String get stringValue => ${jsonModel.name}Mapping[this]!;')
69+
..writeln(
70+
'extension ${jsonModel.name}Extension on ${jsonModel.name} {')
71+
..writeln(
72+
' String get stringValue => ${jsonModel.name}Mapping[this]!;')
6573
..writeln('}')
6674
..writeln()
6775
..writeln('extension ${jsonModel.name}StringExtension on String {')
68-
..writeln(' ${jsonModel.name}? get as${jsonModel.name} => reverse${jsonModel.name}Mapping[this];')
76+
..writeln(
77+
' ${jsonModel.name}? get as${jsonModel.name} => reverse${jsonModel.name}Mapping[this];')
6978
..writeln('}');
7079
}
7180
}

‎lib/writer/object_model_writer.dart

+53-26
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import '../util/case_util.dart';
1111
import '../util/type_checker.dart';
1212

1313
class ObjectModelWriter {
14-
static const autoGeneratedWarning = '// GENERATED CODE - DO NOT MODIFY BY HAND';
14+
static const autoGeneratedWarning =
15+
'// GENERATED CODE - DO NOT MODIFY BY HAND';
1516
final PubspecConfig pubspecConfig;
1617
final ObjectModel jsonModel;
1718
final List<Field> extendsFields;
@@ -28,8 +29,10 @@ class ObjectModelWriter {
2829
final sb = StringBuffer()
2930
..writeln(autoGeneratedWarning)
3031
..writeln();
31-
final imports = <String>{}..add("import 'package:json_annotation/json_annotation.dart';");
32-
for (final element in (jsonModel.extraImports ?? pubspecConfig.extraImports)) {
32+
final imports = <String>{}
33+
..add("import 'package:json_annotation/json_annotation.dart';");
34+
for (final element
35+
in (jsonModel.extraImports ?? pubspecConfig.extraImports)) {
3336
imports.add('import \'$element\';');
3437
}
3538
final extendsModel = jsonModel.extendsModel;
@@ -42,7 +45,8 @@ class ObjectModelWriter {
4245

4346
for (final field in jsonModel.fields) {
4447
final type = field.type;
45-
if (!TypeChecker.isKnownDartType(type.name) && type.name != jsonModel.name) {
48+
if (!TypeChecker.isKnownDartType(type.name) &&
49+
type.name != jsonModel.name) {
4650
imports.addAll(_getImportsFromPath(type.name));
4751
}
4852
if (type is MapType && !TypeChecker.isKnownDartType(type.valueName)) {
@@ -73,7 +77,8 @@ class ObjectModelWriter {
7377
} else {
7478
sb.writeln('@JsonSerializable()');
7579
}
76-
(jsonModel.extraAnnotations ?? pubspecConfig.extraAnnotations).forEach(sb.writeln);
80+
(jsonModel.extraAnnotations ?? pubspecConfig.extraAnnotations)
81+
.forEach(sb.writeln);
7782

7883
for (final converter in jsonModel.converters) {
7984
sb.writeln('@$converter()');
@@ -114,7 +119,8 @@ class ObjectModelWriter {
114119
}
115120

116121
if (key.unknownEnumValue != null) {
117-
sb.write(', unknownEnumValue: ${key.type.name}.${key.unknownEnumValue}');
122+
sb.write(
123+
', unknownEnumValue: ${key.type.name}.${key.unknownEnumValue}');
118124
}
119125

120126
final fieldModel = yamlConfig.getModelByName(key.type);
@@ -137,22 +143,29 @@ class ObjectModelWriter {
137143
sb.writeln('${_getKeyType(key)} ${key.name};');
138144
}
139145

140-
final anyNonFinal = jsonModel.fields.any((element) => element.nonFinal) || extendsFields.any((element) => element.nonFinal);
146+
final anyNonFinal = jsonModel.fields.any((element) => element.nonFinal) ||
147+
extendsFields.any((element) => element.nonFinal);
141148
sb
142149
..writeln()
143150
..writeln(' ${anyNonFinal ? '' : 'const '}${jsonModel.name}({');
144151

145-
for (final key in jsonModel.fields.where((key) => (key.isRequired && !key.hasDefaultValue))) {
152+
for (final key in jsonModel.fields
153+
.where((key) => (key.isRequired && !key.hasDefaultValue))) {
146154
sb.writeln(' required this.${key.name}${_fillDefaulValue(key)},');
147155
}
148-
for (final key in extendsFields.where((key) => (key.isRequired && !key.hasDefaultValue))) {
149-
sb.writeln(' required ${_getKeyType(key)} ${key.name}${_fillDefaulValue(key)},');
156+
for (final key in extendsFields
157+
.where((key) => (key.isRequired && !key.hasDefaultValue))) {
158+
sb.writeln(
159+
' required ${_getKeyType(key)} ${key.name}${_fillDefaulValue(key)},');
150160
}
151-
for (final key in jsonModel.fields.where((key) => !(key.isRequired && !key.hasDefaultValue))) {
161+
for (final key in jsonModel.fields
162+
.where((key) => !(key.isRequired && !key.hasDefaultValue))) {
152163
sb.writeln(' this.${key.name}${_fillDefaulValue(key)},');
153164
}
154-
for (final key in extendsFields.where((key) => !(key.isRequired && !key.hasDefaultValue))) {
155-
sb.writeln(' ${_getKeyType(key)} ${key.name}${_fillDefaulValue(key)},');
165+
for (final key in extendsFields
166+
.where((key) => !(key.isRequired && !key.hasDefaultValue))) {
167+
sb.writeln(
168+
' ${_getKeyType(key)} ${key.name}${_fillDefaulValue(key)},');
156169
}
157170
if (extendsModel != null) {
158171
sb.writeln(' }) : super(');
@@ -168,21 +181,25 @@ class ObjectModelWriter {
168181
..writeln();
169182
}
170183
if (jsonModel.generateForGenerics) {
171-
sb.writeln(' factory ${jsonModel.name}.fromJson(Object? json) => _\$${jsonModel.name}FromJson(json as Map<String, dynamic>); // ignore: avoid_as');
184+
sb.writeln(
185+
' factory ${jsonModel.name}.fromJson(Object? json) => _\$${jsonModel.name}FromJson(json as Map<String, dynamic>); // ignore: avoid_as');
172186
} else {
173-
sb.writeln(' factory ${jsonModel.name}.fromJson(Map<String, dynamic> json) => _\$${jsonModel.name}FromJson(json);');
187+
sb.writeln(
188+
' factory ${jsonModel.name}.fromJson(Map<String, dynamic> json) => _\$${jsonModel.name}FromJson(json);');
174189
}
175190
sb.writeln();
176191
if (extendsModel != null) {
177192
sb.writeln(' @override');
178193
}
179-
sb.writeln(' Map<String, dynamic> toJson() => _\$${jsonModel.name}ToJson(this);');
194+
sb.writeln(
195+
' Map<String, dynamic> toJson() => _\$${jsonModel.name}ToJson(this);');
180196

181197
if (jsonModel.staticCreate ?? pubspecConfig.staticCreate) {
182198
sb
183199
..writeln()
184200
..writeln(' // ignore: prefer_constructors_over_static_methods')
185-
..writeln(' static ${jsonModel.name} create(${jsonModel.generateForGenerics ? 'Object? json' : 'Map<String, dynamic> json'}) => ${jsonModel.name}.fromJson(json);');
201+
..writeln(
202+
' static ${jsonModel.name} create(${jsonModel.generateForGenerics ? 'Object? json' : 'Map<String, dynamic> json'}) => ${jsonModel.name}.fromJson(json);');
186203
}
187204

188205
if (jsonModel.equalsAndHashCode ?? pubspecConfig.equalsHashCode) {
@@ -193,7 +210,8 @@ class ObjectModelWriter {
193210
..writeln(' identical(this, other) ||')
194211
..writeln(' other is ${jsonModel.name} &&')
195212
..write(' runtimeType == other.runtimeType');
196-
for (final field in jsonModel.fields.where((field) => !field.ignoreEquality)) {
213+
for (final field
214+
in jsonModel.fields.where((field) => !field.ignoreEquality)) {
197215
sb.write(' &&\n ${field.name} == other.${field.name}');
198216
}
199217
if (extendsModel != null) {
@@ -205,7 +223,8 @@ class ObjectModelWriter {
205223
..writeln(' @override')
206224
..writeln(' int get hashCode =>');
207225
var c = 0;
208-
for (final field in jsonModel.fields.where((field) => !field.ignoreEquality)) {
226+
for (final field
227+
in jsonModel.fields.where((field) => !field.ignoreEquality)) {
209228
if (c++ > 0) sb.write(' ^\n');
210229
sb.write(' ${field.name}.hashCode');
211230
}
@@ -246,7 +265,8 @@ class ObjectModelWriter {
246265
}
247266

248267
String _getKeyType(Field key) {
249-
final nullableFlag = key.isRequired || key.type.name == 'dynamic' ? '' : '?';
268+
final nullableFlag =
269+
key.isRequired || key.type.name == 'dynamic' ? '' : '?';
250270
final keyType = key.type;
251271
if (keyType is ArrayType) {
252272
return 'List<${keyType.name}>$nullableFlag';
@@ -286,7 +306,8 @@ class ObjectModelWriter {
286306
if (path.endsWith('.dart')) {
287307
imports.add("import '$pathWithPackage';");
288308
} else {
289-
imports.add("import '$pathWithPackage/${reCaseFieldName.snakeCase}.dart';");
309+
imports.add(
310+
"import '$pathWithPackage/${reCaseFieldName.snakeCase}.dart';");
290311
}
291312
}
292313
}
@@ -302,19 +323,25 @@ class ObjectModelWriter {
302323
}
303324

304325
void createRetrofitMappers(StringBuffer sb) {
305-
final hasConstructorTearOffs = pubspecConfig.languageVersion?.isAtLeast(2, 15) ?? false;
326+
final hasConstructorTearOffs =
327+
pubspecConfig.languageVersion?.isAtLeast(2, 15) ?? false;
306328
sb
307329
..writeln()
308330
..writeln(hasConstructorTearOffs
309331
? 'const deserialize${jsonModel.name} = ${jsonModel.name}.fromJson;'
310332
: '${jsonModel.name} deserialize${jsonModel.name}(Map<String, dynamic> json) => ${jsonModel.name}.fromJson(json);')
311333
..writeln()
312-
..writeln('Map<String, dynamic> serialize${jsonModel.name}(${jsonModel.name} object) => object.toJson();')
334+
..writeln(
335+
'Map<String, dynamic> serialize${jsonModel.name}(${jsonModel.name} object) => object.toJson();')
313336
..writeln()
314-
..writeln('List<${jsonModel.name}> deserialize${jsonModel.name}List(List<Map<String, dynamic>> jsonList)')
315-
..writeln(hasConstructorTearOffs ? ' => jsonList.map(${jsonModel.name}.fromJson).toList();' : ' => jsonList.map((json) => ${jsonModel.name}.fromJson(json)).toList();')
337+
..writeln(
338+
'List<${jsonModel.name}> deserialize${jsonModel.name}List(List<Map<String, dynamic>> jsonList)')
339+
..writeln(hasConstructorTearOffs
340+
? ' => jsonList.map(${jsonModel.name}.fromJson).toList();'
341+
: ' => jsonList.map((json) => ${jsonModel.name}.fromJson(json)).toList();')
316342
..writeln()
317-
..writeln('List<Map<String, dynamic>> serialize${jsonModel.name}List(List<${jsonModel.name}> objects)')
343+
..writeln(
344+
'List<Map<String, dynamic>> serialize${jsonModel.name}List(List<${jsonModel.name}> objects)')
318345
..writeln(' => objects.map((object) => object.toJson()).toList();');
319346
}
320347
}

0 commit comments

Comments
 (0)