aurora
/
nextcloud-neon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

dynamite: Support response headers

pull/130/head
jld3103 3 years ago
parent
d5af8790f4
commit
90eab74b03
No known key found for this signature in database
GPG Key ID: 9062417B9E8EB7B3
1 changed files with 154 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 175
      packages/dynamite/lib/src/openapi_builder.dart

175
packages/dynamite/lib/src/openapi_builder.dart
Unescape View File

@ -76,6 +76,54 @@ class OpenAPIBuilder implements Builder {
Class( Class(
(final b) => b (final b) => b
..name = 'Response' ..name = 'Response'
..types.addAll([
refer('T'),
refer('U'),
])
..fields.addAll([
Field(
(final b) => b
..name = 'data'
..type = refer('T')
..modifier = FieldModifier.final$,
),
Field(
(final b) => b
..name = 'headers'
..type = refer('U')
..modifier = FieldModifier.final$,
),
])
..constructors.add(
Constructor(
(final b) => b
..requiredParameters.addAll(
['data', 'headers'].map(
(final name) => Parameter(
(final b) => b
..name = name
..toThis = true,
),
),
),
),
)
..methods.add(
Method(
(final b) => b
..name = 'toString'
..returns = refer('String')
..annotations.add(refer('override'))
..lambda = true
..body = const Code(
r"'Response(data: $data, headers: $headers)'",
),
),
),
).accept(emitter).toString(),
Class(
(final b) => b
..name = '_Response'
..fields.addAll([ ..fields.addAll([
Field( Field(
(final b) => b (final b) => b
@ -117,15 +165,16 @@ class OpenAPIBuilder implements Builder {
..returns = refer('String') ..returns = refer('String')
..annotations.add(refer('override')) ..annotations.add(refer('override'))
..lambda = true ..lambda = true
..body = ..body = const Code(
const Code(r"'Response(statusCode: $statusCode, headers: $headers, body: ${utf8.decode(body)})'"), r"'_Response(statusCode: $statusCode, headers: $headers, body: ${utf8.decode(body)})'",
),
), ),
), ),
).accept(emitter).toString(), ).accept(emitter).toString(),
Class( Class(
(final b) => b (final b) => b
..name = 'ApiException' ..name = 'ApiException'
..extend = refer('Response') ..extend = refer('_Response')
..implements.add(refer('Exception')) ..implements.add(refer('Exception'))
..constructors.addAll( ..constructors.addAll(
[ [
@ -150,7 +199,7 @@ class OpenAPIBuilder implements Builder {
Parameter( Parameter(
(final b) => b (final b) => b
..name = 'response' ..name = 'response'
..type = refer('Response'), ..type = refer('_Response'),
), ),
) )
..body = const Code('ApiException(response.statusCode, response.headers, response.body,)'), ..body = const Code('ApiException(response.statusCode, response.headers, response.body,)'),
@ -258,6 +307,7 @@ class OpenAPIBuilder implements Builder {
final Schema schema, { final Schema schema, {
final bool ignoreEnum = false, final bool ignoreEnum = false,
final Map<String, String>? extraJsonSerializableValues, final Map<String, String>? extraJsonSerializableValues,
final Map<String, Map<String, String>>? extraJsonKeyValues,
}) { }) {
TypeResolveResult? result; TypeResolveResult? result;
if (schema.ref != null) { if (schema.ref != null) {
@ -557,6 +607,15 @@ class OpenAPIBuilder implements Builder {
[], [],
{ {
'name': refer("'$propertyName'"), 'name': refer("'$propertyName'"),
if (extraJsonKeyValues != null) ...{
for (final p in extraJsonKeyValues.keys) ...{
if (p == propertyName) ...{
for (final key in extraJsonKeyValues[p]!.keys) ...{
key: refer(extraJsonKeyValues[p]![key]!),
},
},
},
},
}, },
), ),
); );
@ -699,14 +758,6 @@ class OpenAPIBuilder implements Builder {
paths[path] = PathItem( paths[path] = PathItem(
description: pathItem.description, description: pathItem.description,
parameters: pathItem.parameters, parameters: pathItem.parameters,
get: null,
put: null,
post: null,
delete: null,
options: null,
head: null,
patch: null,
trace: null,
); );
} }
paths[path] = paths[path]!.copyWithOperations({method: operation}); paths[path] = paths[path]!.copyWithOperations({method: operation});
@ -829,7 +880,7 @@ class OpenAPIBuilder implements Builder {
Method( Method(
(final b) => b (final b) => b
..name = 'doRequest' ..name = 'doRequest'
..returns = refer('Future<Response>') ..returns = refer('Future<_Response>')
..modifier = MethodModifier.async ..modifier = MethodModifier.async
..requiredParameters.addAll([ ..requiredParameters.addAll([
Parameter( Parameter(
@ -859,6 +910,7 @@ class OpenAPIBuilder implements Builder {
for (final header in {...baseHeaders, ...headers}.entries) { for (final header in {...baseHeaders, ...headers}.entries) {
request.headers.add(header.key, header.value); request.headers.add(header.key, header.value);
} }
<<<<<<< Updated upstream
if (body != null) { if (body != null) {
request.add(body.toList()); request.add(body.toList());
} }
@ -875,6 +927,11 @@ class OpenAPIBuilder implements Builder {
responseHeaders[name] = values.last; responseHeaders[name] = values.last;
}); });
return Response( return Response(
=======
final response = await http.Response.fromStream(await request.send());
return _Response(
>>>>>>> Stashed changes
response.statusCode, response.statusCode,
responseHeaders, responseHeaders,
await response.bodyBytes, await response.bodyBytes,
@ -913,6 +970,7 @@ class OpenAPIBuilder implements Builder {
Method( Method(
(final b) { (final b) {
final operation = paths[path]!.operations[httpMethod]!; final operation = paths[path]!.operations[httpMethod]!;
final operationId = operation.operationId ?? _toDartName('$httpMethod-$path');
final pathParameters = <spec_parameter.Parameter>[ final pathParameters = <spec_parameter.Parameter>[
if (paths[path]!.parameters != null) ...paths[path]!.parameters!, if (paths[path]!.parameters != null) ...paths[path]!.parameters!,
]; ];
@ -920,7 +978,7 @@ class OpenAPIBuilder implements Builder {
...pathParameters, ...pathParameters,
if (operation.parameters != null) ...operation.parameters!, if (operation.parameters != null) ...operation.parameters!,
]; ];
final methodName = _toDartName(operation.operationId ?? _toDartName('$httpMethod-$path')); final methodName = _toDartName(operationId);
b b
..name = methodName ..name = methodName
..modifier = MethodModifier.async; ..modifier = MethodModifier.async;
@ -986,7 +1044,7 @@ class OpenAPIBuilder implements Builder {
break; break;
case 'query': case 'query':
code.write( code.write(
"queryParameters['${parameter.name}'] = ${_toDartName(parameter.name)}$enumValueGetter.toString();", "queryParameters['${parameter.name}${result.isList ? '[]' : ''}'] = ${_toDartName(parameter.name)}$enumValueGetter${result.isList ? '.map((final x) => x.toString()).toList()' : '.toString()'};",
); );
break; break;
case 'header': case 'header':
@ -1064,6 +1122,51 @@ class OpenAPIBuilder implements Builder {
for (final statusCode in operation.responses!.keys) { for (final statusCode in operation.responses!.keys) {
final response = operation.responses![statusCode]!; final response = operation.responses![statusCode]!;
code.write('if (response.statusCode == $statusCode) {'); code.write('if (response.statusCode == $statusCode) {');
String? headersType;
String? headersValue;
if (response.headers != null) {
final identifier =
'${tag != null ? _toDartName(tag.name, uppercaseFirstCharacter: true) : null}${_toDartName(operationId, uppercaseFirstCharacter: true)}Headers';
final headerParseFunctions = <String, String>{};
for (final headerName in response.headers!.keys) {
final functionIdentifier = '_${_toDartName('${identifier}Parse$headerName')}';
headerParseFunctions[headerName] = functionIdentifier;
final result = resolveType(
identifier,
response.headers![headerName]!.schema!,
);
output.add(
'${result.typeName} $functionIdentifier(final Map data, final String key) => ${_parseFromStringFunctionForType('data[key]', result)};',
);
}
final result = resolveType(
identifier,
Schema(
type: 'object',
properties: {
for (final headerName in response.headers!.keys) ...{
headerName.toLowerCase(): response.headers![headerName]!.schema!,
},
},
),
extraJsonSerializableValues: {
'disallowUnrecognizedKeys': 'false',
},
extraJsonKeyValues: {
for (final headerName in response.headers!.keys) ...{
headerName.toLowerCase(): {
'readValue': headerParseFunctions[headerName]!,
},
},
},
);
headersType = result.typeName;
headersValue = _deserializeFunctionForType('response.headers', result);
}
String? dataType;
String? dataValue;
if (response.content != null) { if (response.content != null) {
if (response.content!.length > 1) { if (response.content!.length > 1) {
throw Exception('Can not work with multiple mime types right now'); throw Exception('Can not work with multiple mime types right now');
@ -1077,26 +1180,38 @@ class OpenAPIBuilder implements Builder {
); );
switch (mimeType) { switch (mimeType) {
case 'application/json': case 'application/json':
b.returns = refer('Future<${result.typeName}>'); dataType = result.typeName;
code.write('return ${_deserializeFunctionForType( dataValue = _deserializeFunctionForType(
result.isBaseType result.isBaseType
? 'utf8.decode(response.body)' ? 'utf8.decode(response.body)'
: 'json.decode(utf8.decode(response.body))', : 'json.decode(utf8.decode(response.body))',
result, result,
)};'); );
break; break;
case 'image/png': case 'image/png':
b.returns = refer('Future<Uint8List>'); dataType = 'Uint8List';
code.write('return response.body;'); dataValue = 'response.body';
break; break;
default: default:
throw Exception('Can not parse mime type "$mimeType"'); throw Exception('Can not parse mime type "$mimeType"');
} }
} }
}
if (headersType != null && dataType != null) {
b.returns = refer('Future<Response<$dataType, $headersType>>');
code.write('return Response<$dataType, $headersType>($dataValue, $headersValue,);');
} else if (headersType != null) {
b.returns = refer('Future<$headersType>');
code.write('return $headersValue;');
} else if (dataType != null) {
b.returns = refer('Future<$dataType>');
code.write('return $dataValue;');
} else { } else {
code.write('return;');
b.returns = refer('Future'); b.returns = refer('Future');
code.write('return;');
} }
code.write('}'); code.write('}');
} }
code.write('throw ApiException.fromResponse(response); // coverage:ignore-line\n'); code.write('throw ApiException.fromResponse(response); // coverage:ignore-line\n');
@ -1373,6 +1488,24 @@ String _deserializeFunctionForType(final String object, final TypeResolveResult
} }
} }
String _parseFromStringFunctionForType(final String object, final TypeResolveResult result) {
final o = '$object as String';
if (result.isBaseType) {
switch (result.typeName) {
case 'String':
return o;
case 'int':
return 'int.parse($o)';
default:
throw Exception('Can not parse "${result.typeName}" from String');
}
} else if (result.isEnum) {
return _parseFromStringFunctionForType(o, result.subType!);
} else {
return 'json.decode($o)';
}
}
bool _isParameterNullable(final bool? required, final dynamic default_) => !(required ?? false) && default_ == null; bool _isParameterNullable(final bool? required, final dynamic default_) => !(required ?? false) && default_ == null;
String _valueToEscapedValue(final String type, final dynamic value) => type == 'String' ? "'$value'" : value.toString(); String _valueToEscapedValue(final String type, final dynamic value) => type == 'String' ? "'$value'" : value.toString();

Write Preview
Loading…
Cancel
Save