Skip to content

Commit 3f15941

Browse files
provokateurinprovokateurin
committed
feat(dynamite): Remove need for double fix and format
Signed-off-by: provokateurin <kate@provokateurin.de>
1 parent 207623c commit 3f15941

17 files changed

+353
-115
lines changed

‎packages/dynamite/dynamite/lib/src/models/type_result/type_result.dart

+6-2
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,13 @@ sealed class TypeResult {
107107
String deserialize(String object, [String? serializerName]) {
108108
final buffer = StringBuffer()
109109
..write(serializerName ?? r'_$jsonSerializers')
110-
..write('.deserialize(')
110+
..writeln('.deserialize(')
111111
..write(object)
112-
..write(', specifiedType: $fullType)');
112+
..writeln(',')
113+
..write('specifiedType: ')
114+
..write(fullType)
115+
..writeln(',')
116+
..write(')');
113117

114118
if (!nullable) {
115119
buffer.write('!');

‎packages/dynamite/dynamite/test/type_result_test.dart

+35-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ void main() {
2020
);
2121
expect(
2222
type.deserialize('value'),
23-
r'_$jsonSerializers.deserialize(value, specifiedType: const FullType(BuiltList, [FullType(String)]))! as BuiltList<String>',
23+
r'''
24+
_$jsonSerializers.deserialize(
25+
value,
26+
specifiedType: const FullType(BuiltList, [FullType(String)]),
27+
)! as BuiltList<String>''',
2428
);
2529
});
2630

@@ -44,7 +48,11 @@ void main() {
4448
);
4549
expect(
4650
type.deserialize('value'),
47-
r'_$jsonSerializers.deserialize(value, specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(String)])]))! as BuiltList<BuiltList<String>>',
51+
r'''
52+
_$jsonSerializers.deserialize(
53+
value,
54+
specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(String)])]),
55+
)! as BuiltList<BuiltList<String>>''',
4856
);
4957
});
5058

@@ -79,7 +87,11 @@ void main() {
7987
);
8088
expect(
8189
type.deserialize('value'),
82-
r'_$jsonSerializers.deserialize(value, specifiedType: const FullType(BuiltMap, [FullType(String), FullType(int)]))! as BuiltMap<String, int>',
90+
r'''
91+
_$jsonSerializers.deserialize(
92+
value,
93+
specifiedType: const FullType(BuiltMap, [FullType(String), FullType(int)]),
94+
)! as BuiltMap<String, int>''',
8395
);
8496
});
8597

@@ -106,7 +118,11 @@ void main() {
106118
);
107119
expect(
108120
type.deserialize('value'),
109-
r'_$jsonSerializers.deserialize(value, specifiedType: const FullType(BuiltMap, [FullType(String), FullType(BuiltMap, [FullType(String), FullType(int)])]))! as BuiltMap<String, BuiltMap<String, int>>',
121+
r'''
122+
_$jsonSerializers.deserialize(
123+
value,
124+
specifiedType: const FullType(BuiltMap, [FullType(String), FullType(BuiltMap, [FullType(String), FullType(int)])]),
125+
)! as BuiltMap<String, BuiltMap<String, int>>''',
110126
);
111127
});
112128

@@ -142,7 +158,11 @@ void main() {
142158
);
143159
expect(
144160
type.deserialize('value'),
145-
r'_$jsonSerializers.deserialize(value, specifiedType: const FullType(CustomType, [FullType(String)]))! as CustomType<String>',
161+
r'''
162+
_$jsonSerializers.deserialize(
163+
value,
164+
specifiedType: const FullType(CustomType, [FullType(String)]),
165+
)! as CustomType<String>''',
146166
);
147167
});
148168

@@ -162,7 +182,11 @@ void main() {
162182
);
163183
expect(
164184
type.deserialize('value'),
165-
r'_$jsonSerializers.deserialize(value, specifiedType: const FullType(ContentString, [FullType(int)]))! as ContentString<int>',
185+
r'''
186+
_$jsonSerializers.deserialize(
187+
value,
188+
specifiedType: const FullType(ContentString, [FullType(int)]),
189+
)! as ContentString<int>''',
166190
);
167191
});
168192

@@ -191,7 +215,11 @@ void main() {
191215
);
192216
expect(
193217
type.deserialize('value'),
194-
r'_$jsonSerializers.deserialize(value, specifiedType: const FullType(String))! as String',
218+
r'''
219+
_$jsonSerializers.deserialize(
220+
value,
221+
specifiedType: const FullType(String),
222+
)! as String''',
195223
);
196224
});
197225

‎packages/dynamite/dynamite_end_to_end_test/lib/any_of.openapi.dart

+24-6
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,17 @@ class _$0c9017d9a03ba2eb2f15acadeab85bbeSerializer implements PrimitiveSerialize
237237
}) {
238238
ObjectAnyOf0? objectAnyOf0;
239239
try {
240-
objectAnyOf0 = serializers.deserialize(data, specifiedType: const FullType(ObjectAnyOf0))! as ObjectAnyOf0;
240+
objectAnyOf0 = serializers.deserialize(
241+
data,
242+
specifiedType: const FullType(ObjectAnyOf0),
243+
)! as ObjectAnyOf0;
241244
} catch (_) {}
242245
ObjectAnyOf1? objectAnyOf1;
243246
try {
244-
objectAnyOf1 = serializers.deserialize(data, specifiedType: const FullType(ObjectAnyOf1))! as ObjectAnyOf1;
247+
objectAnyOf1 = serializers.deserialize(
248+
data,
249+
specifiedType: const FullType(ObjectAnyOf1),
250+
)! as ObjectAnyOf1;
245251
} catch (_) {}
246252
return (objectAnyOf0: objectAnyOf0, objectAnyOf1: objectAnyOf1);
247253
}
@@ -313,11 +319,17 @@ class _$fba45e085ee99d64c5141852d4323e3dSerializer implements PrimitiveSerialize
313319
}) {
314320
MixedAnyOf1? mixedAnyOf1;
315321
try {
316-
mixedAnyOf1 = serializers.deserialize(data, specifiedType: const FullType(MixedAnyOf1))! as MixedAnyOf1;
322+
mixedAnyOf1 = serializers.deserialize(
323+
data,
324+
specifiedType: const FullType(MixedAnyOf1),
325+
)! as MixedAnyOf1;
317326
} catch (_) {}
318327
String? string;
319328
try {
320-
string = serializers.deserialize(data, specifiedType: const FullType(String))! as String;
329+
string = serializers.deserialize(
330+
data,
331+
specifiedType: const FullType(String),
332+
)! as String;
321333
} catch (_) {}
322334
return (mixedAnyOf1: mixedAnyOf1, string: string);
323335
}
@@ -389,11 +401,17 @@ class _$b6d67dc2a96424d2f407f8e51557f3deSerializer implements PrimitiveSerialize
389401
}) {
390402
num? $num;
391403
try {
392-
$num = serializers.deserialize(data, specifiedType: const FullType(num))! as num;
404+
$num = serializers.deserialize(
405+
data,
406+
specifiedType: const FullType(num),
407+
)! as num;
393408
} catch (_) {}
394409
String? string;
395410
try {
396-
string = serializers.deserialize(data, specifiedType: const FullType(String))! as String;
411+
string = serializers.deserialize(
412+
data,
413+
specifiedType: const FullType(String),
414+
)! as String;
397415
} catch (_) {}
398416
return ($num: $num, string: string);
399417
}

‎packages/dynamite/dynamite_end_to_end_test/lib/documentation.openapi.dart

+8-2
Original file line numberDiff line numberDiff line change
@@ -412,11 +412,17 @@ class _$b2c4857c0136baea42828d89c87c757dSerializer implements PrimitiveSerialize
412412
}) {
413413
int? $int;
414414
try {
415-
$int = serializers.deserialize(data, specifiedType: const FullType(int))! as int;
415+
$int = serializers.deserialize(
416+
data,
417+
specifiedType: const FullType(int),
418+
)! as int;
416419
} catch (_) {}
417420
String? string;
418421
try {
419-
string = serializers.deserialize(data, specifiedType: const FullType(String))! as String;
422+
string = serializers.deserialize(
423+
data,
424+
specifiedType: const FullType(String),
425+
)! as String;
420426
} catch (_) {}
421427
return ($int: $int, string: string);
422428
}

‎packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart

+64-18
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,17 @@ class _$fc0451dbdd462718bd075afd2e3ce0ecSerializer implements PrimitiveSerialize
328328
}) {
329329
BaseOneOf1? baseOneOf1;
330330
try {
331-
baseOneOf1 = serializers.deserialize(data, specifiedType: const FullType(BaseOneOf1))! as BaseOneOf1;
331+
baseOneOf1 = serializers.deserialize(
332+
data,
333+
specifiedType: const FullType(BaseOneOf1),
334+
)! as BaseOneOf1;
332335
} catch (_) {}
333336
double? $double;
334337
try {
335-
$double = serializers.deserialize(data, specifiedType: const FullType(double))! as double;
338+
$double = serializers.deserialize(
339+
data,
340+
specifiedType: const FullType(double),
341+
)! as double;
336342
} catch (_) {}
337343
return (baseOneOf1: baseOneOf1, $double: $double);
338344
}
@@ -404,11 +410,17 @@ class _$ce3c7b262d1c503446a436c461be5be9Serializer implements PrimitiveSerialize
404410
}) {
405411
BaseAnyOf1? baseAnyOf1;
406412
try {
407-
baseAnyOf1 = serializers.deserialize(data, specifiedType: const FullType(BaseAnyOf1))! as BaseAnyOf1;
413+
baseAnyOf1 = serializers.deserialize(
414+
data,
415+
specifiedType: const FullType(BaseAnyOf1),
416+
)! as BaseAnyOf1;
408417
} catch (_) {}
409418
int? $int;
410419
try {
411-
$int = serializers.deserialize(data, specifiedType: const FullType(int))! as int;
420+
$int = serializers.deserialize(
421+
data,
422+
specifiedType: const FullType(int),
423+
)! as int;
412424
} catch (_) {}
413425
return (baseAnyOf1: baseAnyOf1, $int: $int);
414426
}
@@ -498,25 +510,39 @@ class _$8da5087c0b3f2cce06998d453af8ad19Serializer implements PrimitiveSerialize
498510
}) {
499511
BaseAllOf? baseAllOf;
500512
try {
501-
baseAllOf = serializers.deserialize(data, specifiedType: const FullType(BaseAllOf))! as BaseAllOf;
513+
baseAllOf = serializers.deserialize(
514+
data,
515+
specifiedType: const FullType(BaseAllOf),
516+
)! as BaseAllOf;
502517
} catch (_) {}
503518
BaseAnyOf? baseAnyOf;
504519
try {
505-
baseAnyOf = (serializers.deserialize(data, specifiedType: const FullType(BaseAnyOf))! as BaseAnyOf)
520+
baseAnyOf = (serializers.deserialize(
521+
data,
522+
specifiedType: const FullType(BaseAnyOf),
523+
)! as BaseAnyOf)
506524
..validateAnyOf();
507525
} catch (_) {}
508526
BaseNestedOneOf3? baseNestedOneOf3;
509527
try {
510-
baseNestedOneOf3 =
511-
serializers.deserialize(data, specifiedType: const FullType(BaseNestedOneOf3))! as BaseNestedOneOf3;
528+
baseNestedOneOf3 = serializers.deserialize(
529+
data,
530+
specifiedType: const FullType(BaseNestedOneOf3),
531+
)! as BaseNestedOneOf3;
512532
} catch (_) {}
513533
BaseOneOf1? baseOneOf1;
514534
try {
515-
baseOneOf1 = serializers.deserialize(data, specifiedType: const FullType(BaseOneOf1))! as BaseOneOf1;
535+
baseOneOf1 = serializers.deserialize(
536+
data,
537+
specifiedType: const FullType(BaseOneOf1),
538+
)! as BaseOneOf1;
516539
} catch (_) {}
517540
double? $double;
518541
try {
519-
$double = serializers.deserialize(data, specifiedType: const FullType(double))! as double;
542+
$double = serializers.deserialize(
543+
data,
544+
specifiedType: const FullType(double),
545+
)! as double;
520546
} catch (_) {}
521547
return (
522548
baseAllOf: baseAllOf,
@@ -612,25 +638,39 @@ class _$523892e2348458a2bdb28f9f942dca37Serializer implements PrimitiveSerialize
612638
}) {
613639
BaseAllOf? baseAllOf;
614640
try {
615-
baseAllOf = serializers.deserialize(data, specifiedType: const FullType(BaseAllOf))! as BaseAllOf;
641+
baseAllOf = serializers.deserialize(
642+
data,
643+
specifiedType: const FullType(BaseAllOf),
644+
)! as BaseAllOf;
616645
} catch (_) {}
617646
BaseAnyOf1? baseAnyOf1;
618647
try {
619-
baseAnyOf1 = serializers.deserialize(data, specifiedType: const FullType(BaseAnyOf1))! as BaseAnyOf1;
648+
baseAnyOf1 = serializers.deserialize(
649+
data,
650+
specifiedType: const FullType(BaseAnyOf1),
651+
)! as BaseAnyOf1;
620652
} catch (_) {}
621653
BaseNestedAnyOf3? baseNestedAnyOf3;
622654
try {
623-
baseNestedAnyOf3 =
624-
serializers.deserialize(data, specifiedType: const FullType(BaseNestedAnyOf3))! as BaseNestedAnyOf3;
655+
baseNestedAnyOf3 = serializers.deserialize(
656+
data,
657+
specifiedType: const FullType(BaseNestedAnyOf3),
658+
)! as BaseNestedAnyOf3;
625659
} catch (_) {}
626660
BaseOneOf? baseOneOf;
627661
try {
628-
baseOneOf = (serializers.deserialize(data, specifiedType: const FullType(BaseOneOf))! as BaseOneOf)
662+
baseOneOf = (serializers.deserialize(
663+
data,
664+
specifiedType: const FullType(BaseOneOf),
665+
)! as BaseOneOf)
629666
..validateOneOf();
630667
} catch (_) {}
631668
int? $int;
632669
try {
633-
$int = serializers.deserialize(data, specifiedType: const FullType(int))! as int;
670+
$int = serializers.deserialize(
671+
data,
672+
specifiedType: const FullType(int),
673+
)! as int;
634674
} catch (_) {}
635675
return (
636676
baseAllOf: baseAllOf,
@@ -708,11 +748,17 @@ class _$abe6d27882a5771a98ede04cd64de567Serializer implements PrimitiveSerialize
708748
}) {
709749
BaseOneOf1? baseOneOf1;
710750
try {
711-
baseOneOf1 = serializers.deserialize(data, specifiedType: const FullType(BaseOneOf1))! as BaseOneOf1;
751+
baseOneOf1 = serializers.deserialize(
752+
data,
753+
specifiedType: const FullType(BaseOneOf1),
754+
)! as BaseOneOf1;
712755
} catch (_) {}
713756
num? $num;
714757
try {
715-
$num = serializers.deserialize(data, specifiedType: const FullType(num))! as num;
758+
$num = serializers.deserialize(
759+
data,
760+
specifiedType: const FullType(num),
761+
)! as num;
716762
} catch (_) {}
717763
return (baseOneOf1: baseOneOf1, $num: $num);
718764
}

0 commit comments

Comments
 (0)