Skip to content

Commit 4eea860

Browse files
committed
Format Dart files
1 parent 4cc3d7e commit 4eea860

20 files changed

+18872
-16020
lines changed

example/test.dtos.dart

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,57 +16,54 @@ IncludeTypes: Hello.*
1616

1717
import 'package:servicestack/servicestack.dart';
1818

19-
class HelloResponse implements IConvertible
20-
{
21-
String? result;
19+
class HelloResponse implements IConvertible {
20+
String? result;
2221

23-
HelloResponse({this.result});
24-
HelloResponse.fromJson(Map<String, dynamic> json) { fromMap(json); }
22+
HelloResponse({this.result});
23+
HelloResponse.fromJson(Map<String, dynamic> json) {
24+
fromMap(json);
25+
}
2526

26-
fromMap(Map<String, dynamic> json) {
27-
result = json['result'];
28-
return this;
29-
}
27+
fromMap(Map<String, dynamic> json) {
28+
result = json['result'];
29+
return this;
30+
}
3031

31-
Map<String, dynamic> toJson() => {
32-
'result': result
33-
};
32+
Map<String, dynamic> toJson() => {'result': result};
3433

35-
getTypeName() => "HelloResponse";
36-
TypeContext? context = _ctx;
34+
getTypeName() => "HelloResponse";
35+
TypeContext? context = _ctx;
3736
}
3837

3938
// @Route("/hello")
4039
// @Route("/hello/{Name}")
41-
class Hello implements IReturn<HelloResponse>, IConvertible, IPost
42-
{
43-
// @required()
44-
String? name;
40+
class Hello implements IReturn<HelloResponse>, IConvertible, IPost {
41+
// @required()
42+
String? name;
4543

46-
String? title;
44+
String? title;
4745

48-
Hello({this.name,this.title});
49-
Hello.fromJson(Map<String, dynamic> json) { fromMap(json); }
46+
Hello({this.name, this.title});
47+
Hello.fromJson(Map<String, dynamic> json) {
48+
fromMap(json);
49+
}
5050

51-
fromMap(Map<String, dynamic> json) {
52-
name = json['name'];
53-
title = json['title'];
54-
return this;
55-
}
51+
fromMap(Map<String, dynamic> json) {
52+
name = json['name'];
53+
title = json['title'];
54+
return this;
55+
}
5656

57-
Map<String, dynamic> toJson() => {
58-
'name': name,
59-
'title': title
60-
};
57+
Map<String, dynamic> toJson() => {'name': name, 'title': title};
6158

62-
createResponse() => HelloResponse();
63-
getResponseTypeName() => "HelloResponse";
64-
getTypeName() => "Hello";
65-
TypeContext? context = _ctx;
59+
createResponse() => HelloResponse();
60+
getResponseTypeName() => "HelloResponse";
61+
getTypeName() => "Hello";
62+
TypeContext? context = _ctx;
6663
}
6764

68-
TypeContext _ctx = TypeContext(library: 'test.servicestack.net', types: <String, TypeInfo> {
69-
'HelloResponse': TypeInfo(TypeOf.Class, create:() => HelloResponse()),
70-
'Hello': TypeInfo(TypeOf.Class, create:() => Hello()),
65+
TypeContext _ctx =
66+
TypeContext(library: 'test.servicestack.net', types: <String, TypeInfo>{
67+
'HelloResponse': TypeInfo(TypeOf.Class, create: () => HelloResponse()),
68+
'Hello': TypeInfo(TypeOf.Class, create: () => Hello()),
7169
});
72-

lib/client.dart

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -709,14 +709,16 @@ class JsonServiceClient implements IServiceClient {
709709
/// - 'contentType': String (optional, defaults to 'application/octet-stream')
710710
/// [responseAs] Optional type to deserialize response as
711711
Future<T> postFileWithRequest<T>(
712-
IReturn<T> request,
713-
UploadFile file, {
714-
RequestFilter? requestFilter,
715-
ResponseFilter? responseFilter,
716-
}) async {
717-
718-
return await postFilesWithRequestAs<T>(combinePaths([this.replyBaseUrl, nameOf(request)]),
719-
request, [file], responseAs: request.createResponse(), requestFilter: requestFilter, responseFilter: responseFilter);
712+
IReturn<T> request,
713+
UploadFile file, {
714+
RequestFilter? requestFilter,
715+
ResponseFilter? responseFilter,
716+
}) async {
717+
return await postFilesWithRequestAs<T>(
718+
combinePaths([this.replyBaseUrl, nameOf(request)]), request, [file],
719+
responseAs: request.createResponse(),
720+
requestFilter: requestFilter,
721+
responseFilter: responseFilter);
720722
}
721723

722724
/// Posts files with a request DTO using multipart/form-data
@@ -729,14 +731,16 @@ class JsonServiceClient implements IServiceClient {
729731
/// - 'contentType': String (optional, defaults to 'application/octet-stream')
730732
/// [responseAs] Optional type to deserialize response as
731733
Future<T> postFilesWithRequest<T>(
732-
IReturn<T> request,
733-
List<UploadFile> files, {
734-
RequestFilter? requestFilter,
735-
ResponseFilter? responseFilter,
736-
}) async {
737-
738-
return await postFilesWithRequestAs<T>(combinePaths([this.replyBaseUrl, nameOf(request)]),
739-
request, files, responseAs: request.createResponse(), requestFilter: requestFilter, responseFilter: responseFilter);
734+
IReturn<T> request,
735+
List<UploadFile> files, {
736+
RequestFilter? requestFilter,
737+
ResponseFilter? responseFilter,
738+
}) async {
739+
return await postFilesWithRequestAs<T>(
740+
combinePaths([this.replyBaseUrl, nameOf(request)]), request, files,
741+
responseAs: request.createResponse(),
742+
requestFilter: requestFilter,
743+
responseFilter: responseFilter);
740744
}
741745

742746
/// Posts files with a request DTO using multipart/form-data
@@ -750,13 +754,13 @@ class JsonServiceClient implements IServiceClient {
750754
/// - 'contentType': String (optional, defaults to 'application/octet-stream')
751755
/// [responseAs] Optional type to deserialize response as
752756
Future<T> postFilesWithRequestAs<T>(
753-
String requestUri,
754-
dynamic request,
755-
List<UploadFile> files, {
756-
T? responseAs,
757-
RequestFilter? requestFilter,
758-
ResponseFilter? responseFilter,
759-
}) async {
757+
String requestUri,
758+
dynamic request,
759+
List<UploadFile> files, {
760+
T? responseAs,
761+
RequestFilter? requestFilter,
762+
ResponseFilter? responseFilter,
763+
}) async {
760764
var uri = createUri(toAbsoluteUrl(requestUri))!;
761765
var req = await client.postUrl(uri);
762766

@@ -786,17 +790,16 @@ class JsonServiceClient implements IServiceClient {
786790
if (entry.value != null) {
787791
// Convert value to JSON string and remove quotes for simple values
788792
var valueJson = json.encode(entry.value);
789-
var value = (entry.value is String || entry.value is num || entry.value is bool) && valueJson.contains('"')
790-
? valueJson.substring(1, valueJson.length - 1) // Remove quotes for simple types
791-
: valueJson; // Keep full JSON for complex types
792-
793-
_writeMultipartField(
794-
output,
795-
boundary,
796-
entry.key,
797-
utf8.encode(value),
798-
'text/plain; charset=utf-8'
799-
);
793+
var value = (entry.value is String ||
794+
entry.value is num ||
795+
entry.value is bool) &&
796+
valueJson.contains('"')
797+
? valueJson.substring(
798+
1, valueJson.length - 1) // Remove quotes for simple types
799+
: valueJson; // Keep full JSON for complex types
800+
801+
_writeMultipartField(output, boundary, entry.key, utf8.encode(value),
802+
'text/plain; charset=utf-8');
800803
}
801804
}
802805
}
@@ -808,7 +811,8 @@ class JsonServiceClient implements IServiceClient {
808811
var contentType = file.contentType ?? 'application/octet-stream';
809812
var fileData = file.contents ?? Uint8List(0);
810813

811-
_writeMultipartFile(output, boundary, fieldName, fileName, fileData, contentType);
814+
_writeMultipartFile(
815+
output, boundary, fieldName, fileName, fileData, contentType);
812816
}
813817

814818
// Write final boundary
@@ -839,7 +843,6 @@ class JsonServiceClient implements IServiceClient {
839843
return await handleError(null, e);
840844
}
841845
}
842-
843846
}
844847

845848
Future<String> readFully(HttpClientResponse response) async {
@@ -895,8 +898,7 @@ String _generateBoundary() {
895898
void _writeMultipartField(BytesBuilder output, String boundary, String name,
896899
List<int> value, String contentType) {
897900
output.add(utf8.encode('--$boundary\r\n'));
898-
output.add(utf8.encode(
899-
'Content-Disposition: form-data; name="$name"\r\n'));
901+
output.add(utf8.encode('Content-Disposition: form-data; name="$name"\r\n'));
900902
output.add(utf8.encode('Content-Type: $contentType\r\n\r\n'));
901903
output.add(value);
902904
output.add(utf8.encode('\r\n'));

0 commit comments

Comments
 (0)