refactor(dynamite): unify code generation

Signed-off-by: Nikolas Rimikis <leptopoda@users.noreply.github.com>

packages/dynamite/dynamite/lib/src/builder/client.dart

@@ -79,20 +79,20 @@ List<Class> generateDynamiteOverrides(final State state) => [
                       ..type = refer('HttpClientResponse'),
                   ),
                 )
-                ..body = Block.of([
-                  const Code('String body;'),
-                  const Code('try {'),
-                  const Code('body = await response.body;'),
-                  const Code('} on FormatException {'),
-                  const Code("body = 'binary';"),
-                  const Code('}'),
-                  const Code(''),
-                  Code('return ${state.classPrefix}ApiException('),
-                  const Code('response.statusCode,'),
-                  const Code('response.responseHeaders,'),
-                  const Code('body,'),
-                  const Code(');'),
-                ]),
+                ..body = Code('''
+String body;
+try {
+  body = await response.body;
+} on FormatException {
+  body = 'binary';
+}
+
+return ${state.classPrefix}ApiException(
+  response.statusCode,
+  response.responseHeaders,
+  body,
+);
+'''),
             ),
             Method(
               (final b) => b

packages/dynamite/dynamite/lib/src/builder/header_serializer.dart

@@ -85,26 +85,26 @@ Spec buildHeaderSerializer(final State state, final String identifier, final Ope
                     ..defaultTo = const Code('FullType.unspecified'),
                 ),
               )
-              ..body = Block.of([
-                Code('final result = new ${state.classPrefix}${identifier}Builder();'),
-                const Code(''),
-                const Code('final iterator = serialized.iterator;'),
-                const Code('while (iterator.moveNext()) {'),
-                const Code('final key = iterator.current! as String;'),
-                const Code('iterator.moveNext();'),
-                const Code('final value = iterator.current! as String;'),
-                const Code('switch (key) {'),
-                ...deserializeProperty(state, identifier, spec, schema),
-                const Code('}'),
-                const Code('}'),
-                const Code(''),
-                const Code('return result.build();'),
-              ]);
+              ..body = Code('''
+final result = new ${state.classPrefix}${identifier}Builder();
+
+final iterator = serialized.iterator;
+while (iterator.moveNext()) {
+  final key = iterator.current! as String;
+  iterator.moveNext();
+  final value = iterator.current! as String;
+  switch (key) {
+    ${deserializeProperty(state, identifier, spec, schema).join('\n')}
+  }
+}
+
+return result.build();
+''');
           }),
         ]),
     );
 
-Iterable<Code> deserializeProperty(
+Iterable<String> deserializeProperty(
   final State state,
   final String identifier,
   final OpenAPI spec,
@@ -121,15 +121,15 @@ Iterable<Code> deserializeProperty(
       nullable: isDartParameterNullable(schema.required?.contains(propertyName), propertySchema),
     );
 
-    yield Code("case '$propertyName':");
+    yield "case '$propertyName':";
     if (result.className != 'String') {
       if (result is TypeResultBase || result is TypeResultEnum) {
-        yield Code('result.${toDartName(propertyName)} = ${result.deserialize(result.decode('value!'))};');
+        yield 'result.${toDartName(propertyName)} = ${result.deserialize(result.decode('value!'))};';
       } else {
-        yield Code('result.${toDartName(propertyName)}.replace(${result.deserialize(result.decode('value!'))});');
+        yield 'result.${toDartName(propertyName)}.replace(${result.deserialize(result.decode('value!'))});';
       }
     } else {
-      yield Code('result.${toDartName(propertyName)} = value!;');
+      yield 'result.${toDartName(propertyName)} = value!;';
     }
   }
 }