Skip to content

Commit a613a17

Browse files
knaeckeKamiknaeckeKami
committed
format
1 parent e0b1ae4 commit a613a17

File tree

13 files changed

+109
-69
lines changed

13 files changed

+109
-69
lines changed

‎codegen/end_to_end_test/test/schema/scalars_test.dart‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ void main() {
5050
final scalar = GISODate(isoString);
5151

5252
test('correctly serializes and deserializes', () {
53-
expect(serializers.deserializeWith(GISODate.serializer, isoString), equals(scalar));
54-
expect(serializers.serializeWith(GISODate.serializer, scalar), equals(isoString));
53+
expect(serializers.deserializeWith(GISODate.serializer, isoString),
54+
equals(scalar));
55+
expect(serializers.serializeWith(GISODate.serializer, scalar),
56+
equals(isoString));
5557
});
5658
});
5759

@@ -102,8 +104,11 @@ void main() {
102104
final data = GReviewWithDateData(
103105
(b) => b
104106
..createReview.stars = 1
105-
..createReview.seenOn.add(DateTime.fromMillisecondsSinceEpoch(1591892597000))
106-
..createReview.createdAt = DateTime.fromMillisecondsSinceEpoch(1591892597000),
107+
..createReview
108+
.seenOn
109+
.add(DateTime.fromMillisecondsSinceEpoch(1591892597000))
110+
..createReview.createdAt =
111+
DateTime.fromMillisecondsSinceEpoch(1591892597000),
107112
);
108113

109114
test('correctly overrides scalars in data types', () {

‎codegen/gql_build/lib/src/schema_builder.dart‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ class SchemaBuilder implements Builder {
1515
final EnumFallbackConfig enumFallbackConfig;
1616
final bool generatePossibleTypesMap;
1717

18-
SchemaBuilder(this.typeOverrides, this.enumFallbackConfig, this.generatePossibleTypesMap);
18+
SchemaBuilder(this.typeOverrides, this.enumFallbackConfig,
19+
this.generatePossibleTypesMap);
1920

2021
@override
2122
Map<String, List<String>> get buildExtensions => {
@@ -26,10 +27,13 @@ class SchemaBuilder implements Builder {
2627
FutureOr<void> build(BuildStep buildStep) async {
2728
final doc = await readDocument(buildStep);
2829

29-
final generatedPartUrl =
30-
buildStep.inputId.changeExtension(generatedFileExtension(schemaExtension)).uri.path;
30+
final generatedPartUrl = buildStep.inputId
31+
.changeExtension(generatedFileExtension(schemaExtension))
32+
.uri
33+
.path;
3134

32-
final schemaUrl = outputAssetId(buildStep.inputId, schemaExtension).uri.toString();
35+
final schemaUrl =
36+
outputAssetId(buildStep.inputId, schemaExtension).uri.toString();
3337
final allocator = GqlAllocator(
3438
buildStep.inputId.uri.toString(),
3539
outputAssetId(buildStep.inputId, schemaExtension).uri.toString(),
@@ -38,8 +42,10 @@ class SchemaBuilder implements Builder {
3842

3943
final library = buildSchemaLibrary(
4044
doc, basename(generatedPartUrl), typeOverrides, enumFallbackConfig,
41-
generatePossibleTypesMap: generatePossibleTypesMap, allocator: allocator);
45+
generatePossibleTypesMap: generatePossibleTypesMap,
46+
allocator: allocator);
4247

43-
return writeDocument(library, buildStep, schemaExtension, schemaUrl, allocator);
48+
return writeDocument(
49+
library, buildStep, schemaExtension, schemaUrl, allocator);
4450
}
4551
}

‎codegen/gql_build/lib/src/serializer_builder.dart‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ class SerializerBuilder implements Builder {
2929
static final _generatedFiles = Glob("lib/**.gql.dart");
3030

3131
// create a path for the serializers output in same directory as schema
32-
List<String> get pathSegments => outputAssetId(schemaId, serializerExtension).pathSegments
33-
..removeLast()
34-
..add("serializers.gql.dart");
32+
List<String> get pathSegments =>
33+
outputAssetId(schemaId, serializerExtension).pathSegments
34+
..removeLast()
35+
..add("serializers.gql.dart");
3536

3637
@override
3738
Map<String, List<String>> get buildExtensions => {
@@ -51,22 +52,27 @@ class SerializerBuilder implements Builder {
5152

5253
/// BuiltValue classes with serializers. These will be added automatically
5354
/// using `@SerializersFor`.
54-
final builtClasses = SplayTreeSet<ClassElement>((a, b) => a.name.compareTo(b.name));
55+
final builtClasses =
56+
SplayTreeSet<ClassElement>((a, b) => a.name.compareTo(b.name));
5557

5658
/// Non BuiltValue classes with serializers (i.e. inline fragment classes).
5759
/// These need to be added manually since `@SerializersFor` only recognizes
5860
/// BuiltValue classes.
59-
final nonBuiltClasses = SplayTreeSet<ClassElement>((a, b) => a.name.compareTo(b.name));
61+
final nonBuiltClasses =
62+
SplayTreeSet<ClassElement>((a, b) => a.name.compareTo(b.name));
6063

6164
final hasSerializer = (ClassElement c) => c.fields.any((field) =>
6265
field.isStatic &&
6366
field.name == "serializer" &&
6467
field.type.element?.name == "Serializer" &&
65-
field.type.element?.source?.uri.toString() == "package:built_value/serializer.dart");
68+
field.type.element?.source?.uri.toString() ==
69+
"package:built_value/serializer.dart");
6670

6771
final isBuiltValue = (ClassElement c) => c.allSupertypes.any((interface) =>
68-
(interface.element.name == "Built" || interface.element.name == "EnumClass") &&
69-
interface.element.source.uri.toString() == "package:built_value/built_value.dart");
72+
(interface.element.name == "Built" ||
73+
interface.element.name == "EnumClass") &&
74+
interface.element.source.uri.toString() ==
75+
"package:built_value/built_value.dart");
7076

7177
await for (final input in buildStep.findAssets(_generatedFiles)) {
7278
final lib = await buildStep.resolver.libraryFor(input);

‎codegen/gql_build/lib/src/var_builder.dart‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ class VarBuilder implements Builder {
3030
final doc = await readDocument(buildStep);
3131
final schema = await readDocument(buildStep, schemaId);
3232

33-
final generatedPartUrl =
34-
buildStep.inputId.changeExtension(generatedFileExtension(varExtension)).uri.path;
33+
final generatedPartUrl = buildStep.inputId
34+
.changeExtension(generatedFileExtension(varExtension))
35+
.uri
36+
.path;
3537

3638
final schemaUrl = outputAssetId(schemaId, schemaExtension).uri.toString();
3739
final allocator = GqlAllocator(
@@ -40,8 +42,8 @@ class VarBuilder implements Builder {
4042
schemaUrl,
4143
);
4244

43-
final library = buildVarLibrary(
44-
doc, addTypenames(schema), basename(generatedPartUrl), typeOverrides, allocator);
45+
final library = buildVarLibrary(doc, addTypenames(schema),
46+
basename(generatedPartUrl), typeOverrides, allocator);
4547

4648
return writeDocument(
4749
library,

‎codegen/gql_code_builder/lib/schema.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ Code buildPossibleTypes(DocumentNode document) {
4242
// wrap the map in a literal for codegen
4343
final possibleTypesLiteral = literalMap(possibleTypesMap);
4444
// assign the literal to a const variable named "possibleTypes"
45-
return declareConst("possibleTypesMap", type: Reference("Map<String, Set<String>>"))
45+
return declareConst("possibleTypesMap",
46+
type: Reference("Map<String, Set<String>>"))
4647
.assign(possibleTypesLiteral)
4748
.statement;
4849
}

‎codegen/gql_code_builder/lib/src/built_class.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ Class builtClass({
7878
),
7979
if (getters != null) ...getters,
8080
// Serialization methods
81-
if(!hasCustomSerializer)
82-
buildSerializerGetter(className).rebuild(
83-
(b) => b..body = Code("_\$${toCamelCase(className)}Serializer"),
84-
),
81+
if (!hasCustomSerializer)
82+
buildSerializerGetter(className).rebuild(
83+
(b) => b..body = Code("_\$${toCamelCase(className)}Serializer"),
84+
),
8585
buildToJsonGetter(
8686
className,
8787
isOverride: superclassSelections.isNotEmpty,

‎codegen/gql_code_builder/lib/src/common.dart‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ Method buildOptionalGetter({
203203
..isNullable = true
204204
..url = "package:gql_exec/value.dart"
205205
..symbol = "Value"
206-
..types.add((baseGetter.returns as TypeReference).rebuild((b3) => b3..isNullable = false))));
206+
..types.add((baseGetter.returns as TypeReference)
207+
.rebuild((b3) => b3..isNullable = false))));
207208
return optionalGetter;
208209
}
209210

@@ -263,5 +264,6 @@ Method buildFromJsonGetter(String className) => Method(
263264
..lambda = true
264265
..body = refer("serializers", "#serializer")
265266
.property("deserializeWith")
266-
.call([refer(className).property("serializer"), refer("json")]).code,
267+
.call(
268+
[refer(className).property("serializer"), refer("json")]).code,
267269
);

‎codegen/gql_code_builder/lib/src/schema.dart‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class _SchemaBuilderVisitor extends SimpleVisitor<List<Spec>?> {
3232
final EnumFallbackConfig enumFallbackConfig;
3333
final Allocator allocator;
3434

35-
_SchemaBuilderVisitor(
36-
this.schemaSource, this.typeOverrides, this.enumFallbackConfig, this.allocator);
35+
_SchemaBuilderVisitor(this.schemaSource, this.typeOverrides,
36+
this.enumFallbackConfig, this.allocator);
3737

3838
@override
3939
List<Spec> visitDocumentNode(
@@ -58,16 +58,18 @@ class _SchemaBuilderVisitor extends SimpleVisitor<List<Spec>?> {
5858
schemaSource,
5959
typeOverrides,
6060
);
61-
final serializer =
62-
nullAwareJsonSerializerClass(inputClass, allocator, schemaSource, typeOverrides);
61+
final serializer = nullAwareJsonSerializerClass(
62+
inputClass, allocator, schemaSource, typeOverrides);
6363
return [inputClass, serializer];
6464
}
6565

6666
@override
6767
List<Spec> visitScalarTypeDefinitionNode(
6868
ScalarTypeDefinitionNode node,
6969
) =>
70-
typeOverrides.containsKey(node.name.value) ? [] : [buildScalarClass(node)];
70+
typeOverrides.containsKey(node.name.value)
71+
? []
72+
: [buildScalarClass(node)];
7173

7274
@override
7375
List<Spec> visitEnumTypeDefinitionNode(

‎codegen/gql_code_builder/lib/src/schema/input.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ List<Class> buildInputClasses(
1919
schemaSource,
2020
typeOverrides,
2121
);
22-
final serializer =
23-
nullAwareJsonSerializerClass(inputClass, allocator, schemaSource, typeOverrides);
22+
final serializer = nullAwareJsonSerializerClass(
23+
inputClass, allocator, schemaSource, typeOverrides);
2424
return [inputClass, serializer];
2525
}).toList();
2626

‎codegen/gql_code_builder/lib/var.dart‎

Lines changed: 46 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@ Library buildVarLibrary(
3333
.toList();
3434

3535
Map<String, FragmentDefinitionNode> _fragmentMap(SourceNode source) => {
36-
for (var def in source.document.definitions.whereType<FragmentDefinitionNode>())
36+
for (var def
37+
in source.document.definitions.whereType<FragmentDefinitionNode>())
3738
def.name.value: def,
3839
for (var import in source.imports) ..._fragmentMap(import)
3940
};
4041

41-
final fragmentVarClasses =
42-
docSource.document.definitions.whereType<FragmentDefinitionNode>().map((frag) {
42+
final fragmentVarClasses = docSource.document.definitions
43+
.whereType<FragmentDefinitionNode>()
44+
.map((frag) {
4345
final varTypes = fragmentVarTypes(
4446
fragment: frag,
4547
fragmentMap: _fragmentMap(docSource),
@@ -86,18 +88,19 @@ Library buildVarLibrary(
8688
);
8789
}
8890

89-
Method nullAwareJsonSerializerField(Node op, String className) => Method((b) => b
90-
..annotations
91-
.add(CodeExpression(Code("BuiltValueSerializer(custom: true, serializeNulls: true)")))
92-
..static = true
93-
..type = MethodType.getter
94-
..lambda = true
95-
..returns = TypeReference((b2) => b2
96-
..symbol = "Serializer"
97-
..url = "package:built_value/serializer.dart"
98-
..types.add(refer(className)))
99-
..name = "serializer"
100-
..body = Code("${className}Serializer()"));
91+
Method nullAwareJsonSerializerField(Node op, String className) =>
92+
Method((b) => b
93+
..annotations.add(CodeExpression(
94+
Code("BuiltValueSerializer(custom: true, serializeNulls: true)")))
95+
..static = true
96+
..type = MethodType.getter
97+
..lambda = true
98+
..returns = TypeReference((b2) => b2
99+
..symbol = "Serializer"
100+
..url = "package:built_value/serializer.dart"
101+
..types.add(refer(className)))
102+
..name = "serializer"
103+
..body = Code("${className}Serializer()"));
101104

102105
Class nullAwareJsonSerializerClass(
103106
Class base,
@@ -131,7 +134,8 @@ Class nullAwareJsonSerializerClass(
131134
..returns = refer("Iterable<Object?>")
132135
..requiredParameters.add(Parameter((b) => b
133136
..name = "serializers"
134-
..type = refer("Serializers", "package:built_value/serializer.dart")))
137+
..type =
138+
refer("Serializers", "package:built_value/serializer.dart")))
135139
..requiredParameters.add(Parameter((b) => b
136140
..name = "object"
137141
..type = refer(base.name)))
@@ -140,13 +144,15 @@ Class nullAwareJsonSerializerClass(
140144
..named = true
141145
..type = refer("FullType", "package:built_value/serializer.dart")
142146
..defaultTo = Code("FullType.unspecified")))
143-
..body = _serializerBody(base, allocator, schemaSource, typeOverrides)),
147+
..body =
148+
_serializerBody(base, allocator, schemaSource, typeOverrides)),
144149
Method((b) => b
145150
..name = "deserialize"
146151
..returns = refer(base.name)
147152
..requiredParameters.add(Parameter((b) => b
148153
..name = "serializers"
149-
..type = refer("Serializers", "package:built_value/serializer.dart")))
154+
..type =
155+
refer("Serializers", "package:built_value/serializer.dart")))
150156
..requiredParameters.add(Parameter((b) => b
151157
..name = "serialized"
152158
..type = refer("Iterable<Object?>")))
@@ -155,20 +161,22 @@ Class nullAwareJsonSerializerClass(
155161
..named = true
156162
..type = refer("FullType", "package:built_value/serializer.dart")
157163
..defaultTo = Code("FullType.unspecified")))
158-
..body = _deserializerBody(base, allocator, schemaSource, typeOverrides)),
164+
..body =
165+
_deserializerBody(base, allocator, schemaSource, typeOverrides)),
159166
]));
160167

161168
Code _serializerBody(Class base, Allocator allocator, SourceNode schemaSource,
162169
Map<String, Reference> typeOverrides) {
163170
final vars = <Code>[];
164171

165-
for (final field
166-
in base.methods.where((field) => !field.static && field.type == MethodType.getter)) {
172+
for (final field in base.methods
173+
.where((field) => !field.static && field.type == MethodType.getter)) {
167174
final isOptionalValue = isValue(field.returns!);
168175
final statements = <Code>[];
169176

170177
if (isOptionalValue) {
171-
final realType = (field.returns as TypeReference).types.first as TypeReference;
178+
final realType =
179+
(field.returns as TypeReference).types.first as TypeReference;
172180

173181
final _valueVarName = "_\$${field.name}value";
174182

@@ -221,22 +229,28 @@ String _generateFieldDeserializers(
221229
SourceNode schemaSource,
222230
Map<String, Reference> typeOverrides,
223231
) =>
224-
clazz.methods.where((field) => field.type == MethodType.getter && !field.static).map((field) {
232+
clazz.methods
233+
.where((field) => field.type == MethodType.getter && !field.static)
234+
.map((field) {
225235
var type = field.returns!;
226236
final isWrappedValue = isValue(type);
227237
if (isWrappedValue) {
228238
type = (type as TypeReference).types.first;
229239
}
230240
final fullType = _generateFullType(type as TypeReference, allocator);
231241

232-
final typeDefNode = getTypeDefinitionNode(schemaSource.document, type.symbol.substring(1));
242+
final typeDefNode = getTypeDefinitionNode(
243+
schemaSource.document, type.symbol.substring(1));
233244

234-
print(typeDefNode.runtimeType.toString() + " " + (typeDefNode?.name.value.toString() ?? ""));
245+
print(typeDefNode.runtimeType.toString() +
246+
" " +
247+
(typeDefNode?.name.value.toString() ?? ""));
235248

236249
//TODO this feels flaky, find a better way
237250
final isBuilder = type.url != null &&
238251
!isWrappedValue &&
239-
(typeDefNode is! ScalarTypeDefinitionNode && typeDefNode is! EnumTypeDefinitionNode);
252+
(typeDefNode is! ScalarTypeDefinitionNode &&
253+
typeDefNode is! EnumTypeDefinitionNode);
240254

241255
/// TODO check for wireName
242256
@@ -289,9 +303,11 @@ bool isValue(Reference ref) {
289303
}
290304

291305
String _getWireName(Method m) {
292-
final annotation =
293-
m.annotations.firstWhereOrNull((a) => a is InvokeExpression && a.name == "BuiltValueField")
294-
as InvokeExpression?;
306+
final annotation = m.annotations.firstWhereOrNull(
307+
(a) => a is InvokeExpression && a.name == "BuiltValueField")
308+
as InvokeExpression?;
295309
if (annotation == null) return m.name!;
296-
return (annotation.namedArguments["wireName"] as LiteralExpression?)?.literal ?? m.name!;
310+
return (annotation.namedArguments["wireName"] as LiteralExpression?)
311+
?.literal ??
312+
m.name!;
297313
}

0 commit comments

Comments
 (0)