|
|
|
@ -22,6 +22,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
await buildStep.readAsString(inputId), |
|
|
|
await buildStep.readAsString(inputId), |
|
|
|
) as Map<String, dynamic>, |
|
|
|
) as Map<String, dynamic>, |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
final prefix = _toDartName(spec.info.title, uppercaseFirstCharacter: true); |
|
|
|
if (spec.version != '3.1.0') { |
|
|
|
if (spec.version != '3.1.0') { |
|
|
|
throw Exception('Only OpenAPI 3.1.0 is supported'); |
|
|
|
throw Exception('Only OpenAPI 3.1.0 is supported'); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -34,7 +35,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
]; |
|
|
|
]; |
|
|
|
final hasAnySecurity = spec.security?.isNotEmpty ?? false; |
|
|
|
final hasAnySecurity = spec.security?.isNotEmpty ?? false; |
|
|
|
|
|
|
|
|
|
|
|
final state = State(); |
|
|
|
final state = State(prefix); |
|
|
|
final output = <String>[ |
|
|
|
final output = <String>[ |
|
|
|
"import 'dart:convert';", |
|
|
|
"import 'dart:convert';", |
|
|
|
"import 'dart:io';", |
|
|
|
"import 'dart:io';", |
|
|
|
@ -49,7 +50,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
'', |
|
|
|
'', |
|
|
|
Extension( |
|
|
|
Extension( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
..name = 'HttpClientResponseBody' |
|
|
|
..name = '${prefix}HttpClientResponseBody' |
|
|
|
..on = refer('HttpClientResponse') |
|
|
|
..on = refer('HttpClientResponse') |
|
|
|
..methods.addAll([ |
|
|
|
..methods.addAll([ |
|
|
|
Method( |
|
|
|
Method( |
|
|
|
@ -83,7 +84,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
).accept(emitter).toString(), |
|
|
|
).accept(emitter).toString(), |
|
|
|
Class( |
|
|
|
Class( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
..name = 'Response' |
|
|
|
..name = '${prefix}Response' |
|
|
|
..types.addAll([ |
|
|
|
..types.addAll([ |
|
|
|
refer('T'), |
|
|
|
refer('T'), |
|
|
|
refer('U'), |
|
|
|
refer('U'), |
|
|
|
@ -123,8 +124,8 @@ class OpenAPIBuilder implements Builder { |
|
|
|
..returns = refer('String') |
|
|
|
..returns = refer('String') |
|
|
|
..annotations.add(refer('override')) |
|
|
|
..annotations.add(refer('override')) |
|
|
|
..lambda = true |
|
|
|
..lambda = true |
|
|
|
..body = const Code( |
|
|
|
..body = Code( |
|
|
|
r"'Response(data: $data, headers: $headers)'", |
|
|
|
"'${prefix}Response(data: \$data, headers: \$headers)'", |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
@ -181,7 +182,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
).accept(emitter).toString(), |
|
|
|
).accept(emitter).toString(), |
|
|
|
Class( |
|
|
|
Class( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
..name = 'ApiException' |
|
|
|
..name = '${prefix}ApiException' |
|
|
|
..extend = refer('_Response') |
|
|
|
..extend = refer('_Response') |
|
|
|
..implements.add(refer('Exception')) |
|
|
|
..implements.add(refer('Exception')) |
|
|
|
..constructors.addAll( |
|
|
|
..constructors.addAll( |
|
|
|
@ -210,7 +211,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
..type = refer('_Response'), |
|
|
|
..type = refer('_Response'), |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
) |
|
|
|
..body = const Code('ApiException(response.statusCode, response.headers, response.body,)'), |
|
|
|
..body = Code('${prefix}ApiException(response.statusCode, response.headers, response.body,)'), |
|
|
|
), |
|
|
|
), |
|
|
|
], |
|
|
|
], |
|
|
|
) |
|
|
|
) |
|
|
|
@ -221,8 +222,8 @@ class OpenAPIBuilder implements Builder { |
|
|
|
..returns = refer('String') |
|
|
|
..returns = refer('String') |
|
|
|
..annotations.add(refer('override')) |
|
|
|
..annotations.add(refer('override')) |
|
|
|
..lambda = true |
|
|
|
..lambda = true |
|
|
|
..body = const Code( |
|
|
|
..body = Code( |
|
|
|
r"'ApiException(statusCode: ${super.statusCode}, headers: ${super.headers}, body: ${utf8.decode(super.body)})'", |
|
|
|
"'${prefix}ApiException(statusCode: \${super.statusCode}, headers: \${super.headers}, body: \${utf8.decode(super.body)})'", |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
), |
|
|
|
@ -230,7 +231,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
if (hasAnySecurity) ...[ |
|
|
|
if (hasAnySecurity) ...[ |
|
|
|
Class( |
|
|
|
Class( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
..name = 'Authentication' |
|
|
|
..name = '${prefix}Authentication' |
|
|
|
..abstract = true |
|
|
|
..abstract = true |
|
|
|
..methods.add( |
|
|
|
..methods.add( |
|
|
|
Method( |
|
|
|
Method( |
|
|
|
@ -257,8 +258,8 @@ class OpenAPIBuilder implements Builder { |
|
|
|
(final b) { |
|
|
|
(final b) { |
|
|
|
final fields = ['username', 'password']; |
|
|
|
final fields = ['username', 'password']; |
|
|
|
b |
|
|
|
b |
|
|
|
..name = 'HttpBasicAuthentication' |
|
|
|
..name = '${prefix}HttpBasicAuthentication' |
|
|
|
..extend = refer('Authentication') |
|
|
|
..extend = refer('${prefix}Authentication') |
|
|
|
..constructors.add( |
|
|
|
..constructors.add( |
|
|
|
Constructor( |
|
|
|
Constructor( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
@ -373,7 +374,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
Field( |
|
|
|
Field( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
..name = 'authentication' |
|
|
|
..name = 'authentication' |
|
|
|
..type = refer('Authentication?') |
|
|
|
..type = refer('${prefix}Authentication?') |
|
|
|
..modifier = FieldModifier.final$, |
|
|
|
..modifier = FieldModifier.final$, |
|
|
|
), |
|
|
|
), |
|
|
|
], |
|
|
|
], |
|
|
|
@ -445,8 +446,8 @@ class OpenAPIBuilder implements Builder { |
|
|
|
..name = _toDartName(tag.name) |
|
|
|
..name = _toDartName(tag.name) |
|
|
|
..lambda = true |
|
|
|
..lambda = true |
|
|
|
..type = MethodType.getter |
|
|
|
..type = MethodType.getter |
|
|
|
..returns = refer(_clientName(tag)) |
|
|
|
..returns = refer('$prefix${_clientName(tag)}') |
|
|
|
..body = Code('${_clientName(tag)}(this)'), |
|
|
|
..body = Code('$prefix${_clientName(tag)}(this)'), |
|
|
|
), |
|
|
|
), |
|
|
|
], |
|
|
|
], |
|
|
|
], |
|
|
|
], |
|
|
|
@ -512,7 +513,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
Field( |
|
|
|
Field( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
..name = 'rootClient' |
|
|
|
..name = 'rootClient' |
|
|
|
..type = refer('Client') |
|
|
|
..type = refer('${prefix}Client') |
|
|
|
..modifier = FieldModifier.final$, |
|
|
|
..modifier = FieldModifier.final$, |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
) |
|
|
|
@ -529,7 +530,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
b |
|
|
|
b |
|
|
|
..name = isRootClient ? 'Client' : _clientName(tag) |
|
|
|
..name = '$prefix${isRootClient ? 'Client' : _clientName(tag)}' |
|
|
|
..methods.addAll( |
|
|
|
..methods.addAll( |
|
|
|
[ |
|
|
|
[ |
|
|
|
for (final path in paths.keys) ...[ |
|
|
|
for (final path in paths.keys) ...[ |
|
|
|
@ -654,6 +655,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
_toDartName('$methodName-request-$mimeType', uppercaseFirstCharacter: true), |
|
|
|
_toDartName('$methodName-request-$mimeType', uppercaseFirstCharacter: true), |
|
|
|
mediaType.schema!, |
|
|
|
mediaType.schema!, |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
final parameterName = _toDartName(result.name.replaceFirst(prefix, '')); |
|
|
|
switch (mimeType) { |
|
|
|
switch (mimeType) { |
|
|
|
case 'application/json': |
|
|
|
case 'application/json': |
|
|
|
case 'application/x-www-form-urlencoded': |
|
|
|
case 'application/x-www-form-urlencoded': |
|
|
|
@ -664,7 +666,7 @@ class OpenAPIBuilder implements Builder { |
|
|
|
b.optionalParameters.add( |
|
|
|
b.optionalParameters.add( |
|
|
|
Parameter( |
|
|
|
Parameter( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
..name = _toDartName(result.name) |
|
|
|
..name = parameterName |
|
|
|
..type = refer(_makeNullable(result.name, nullable)) |
|
|
|
..type = refer(_makeNullable(result.name, nullable)) |
|
|
|
..named = true |
|
|
|
..named = true |
|
|
|
..required = operation.requestBody!.required ?? false, |
|
|
|
..required = operation.requestBody!.required ?? false, |
|
|
|
@ -672,10 +674,10 @@ class OpenAPIBuilder implements Builder { |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
if (nullable) { |
|
|
|
if (nullable) { |
|
|
|
code.write('if (${_toDartName(result.name)} != null) {'); |
|
|
|
code.write('if ($parameterName != null) {'); |
|
|
|
} |
|
|
|
} |
|
|
|
code.write( |
|
|
|
code.write( |
|
|
|
'body = Uint8List.fromList(utf8.encode(${result.encode(result.serialize(_toDartName(result.name)), mimeType: mimeType)}));', |
|
|
|
'body = Uint8List.fromList(utf8.encode(${result.encode(result.serialize(parameterName), mimeType: mimeType)}));', |
|
|
|
); |
|
|
|
); |
|
|
|
if (nullable) { |
|
|
|
if (nullable) { |
|
|
|
code.write('}'); |
|
|
|
code.write('}'); |
|
|
|
@ -805,7 +807,9 @@ class OpenAPIBuilder implements Builder { |
|
|
|
|
|
|
|
|
|
|
|
code.write('}'); |
|
|
|
code.write('}'); |
|
|
|
} |
|
|
|
} |
|
|
|
code.write('throw ApiException.fromResponse(response); // coverage:ignore-line\n'); |
|
|
|
code.write( |
|
|
|
|
|
|
|
'throw ${prefix}ApiException.fromResponse(response); // coverage:ignore-line\n', |
|
|
|
|
|
|
|
); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
b.returns = refer('Future'); |
|
|
|
b.returns = refer('Future'); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1018,6 +1022,9 @@ bool _isParameterNullable(final bool? required, final dynamic default_) => !(req |
|
|
|
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(); |
|
|
|
|
|
|
|
|
|
|
|
class State { |
|
|
|
class State { |
|
|
|
|
|
|
|
State(this.prefix); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
final String prefix; |
|
|
|
final resolvedTypes = <String>[]; |
|
|
|
final resolvedTypes = <String>[]; |
|
|
|
final registeredJsonObjects = <String>[]; |
|
|
|
final registeredJsonObjects = <String>[]; |
|
|
|
final output = <Spec>[]; |
|
|
|
final output = <Spec>[]; |
|
|
|
@ -1032,14 +1039,14 @@ TypeResult resolveObject( |
|
|
|
required final Map<String, Map<String, String>>? extraJsonKeyValues, |
|
|
|
required final Map<String, Map<String, String>>? extraJsonKeyValues, |
|
|
|
final bool fromJsonString = false, |
|
|
|
final bool fromJsonString = false, |
|
|
|
}) { |
|
|
|
}) { |
|
|
|
if (!state.resolvedTypes.contains(identifier)) { |
|
|
|
if (!state.resolvedTypes.contains('${state.prefix}$identifier')) { |
|
|
|
state.resolvedTypes.add(identifier); |
|
|
|
state.resolvedTypes.add('${state.prefix}$identifier'); |
|
|
|
state.registeredJsonObjects.add(identifier); |
|
|
|
state.registeredJsonObjects.add('${state.prefix}$identifier'); |
|
|
|
state.output.add( |
|
|
|
state.output.add( |
|
|
|
Class( |
|
|
|
Class( |
|
|
|
(final b) { |
|
|
|
(final b) { |
|
|
|
b |
|
|
|
b |
|
|
|
..name = identifier |
|
|
|
..name = '${state.prefix}$identifier' |
|
|
|
..docs.addAll([ |
|
|
|
..docs.addAll([ |
|
|
|
if (schema.description != null && schema.description!.isNotEmpty) ...[ |
|
|
|
if (schema.description != null && schema.description!.isNotEmpty) ...[ |
|
|
|
'/// ${schema.description!}', |
|
|
|
'/// ${schema.description!}', |
|
|
|
@ -1102,7 +1109,7 @@ TypeResult resolveObject( |
|
|
|
..type = refer('Map<String, dynamic>'), |
|
|
|
..type = refer('Map<String, dynamic>'), |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
) |
|
|
|
..body = Code('_\$${identifier}FromJson(json)'), |
|
|
|
..body = Code('_\$${state.prefix}${identifier}FromJson(json)'), |
|
|
|
), |
|
|
|
), |
|
|
|
Constructor( |
|
|
|
Constructor( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
@ -1116,7 +1123,7 @@ TypeResult resolveObject( |
|
|
|
..type = refer('String'), |
|
|
|
..type = refer('String'), |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
) |
|
|
|
..body = Code('$identifier.fromJson(json.decode(data) as Map<String, dynamic>)'), |
|
|
|
..body = Code('${state.prefix}$identifier.fromJson(json.decode(data) as Map<String, dynamic>)'), |
|
|
|
), |
|
|
|
), |
|
|
|
], |
|
|
|
], |
|
|
|
) |
|
|
|
) |
|
|
|
@ -1126,7 +1133,7 @@ TypeResult resolveObject( |
|
|
|
..name = 'toJson' |
|
|
|
..name = 'toJson' |
|
|
|
..returns = refer('Map<String, dynamic>') |
|
|
|
..returns = refer('Map<String, dynamic>') |
|
|
|
..lambda = true |
|
|
|
..lambda = true |
|
|
|
..body = Code('_\$${identifier}ToJson(this)'), |
|
|
|
..body = Code('_\$${state.prefix}${identifier}ToJson(this)'), |
|
|
|
), |
|
|
|
), |
|
|
|
Method( |
|
|
|
Method( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
@ -1138,7 +1145,7 @@ TypeResult resolveObject( |
|
|
|
Parameter( |
|
|
|
Parameter( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
..name = 'data' |
|
|
|
..name = 'data' |
|
|
|
..type = refer(_makeNullable(identifier, true)), |
|
|
|
..type = refer(_makeNullable('${state.prefix}$identifier', true)), |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
) |
|
|
|
..body = const Code('data == null ? null : json.encode(data.toJson())'), |
|
|
|
..body = const Code('data == null ? null : json.encode(data.toJson())'), |
|
|
|
@ -1180,7 +1187,7 @@ TypeResult resolveObject( |
|
|
|
var fromJson = '${result.name}.fromJsonString'; |
|
|
|
var fromJson = '${result.name}.fromJsonString'; |
|
|
|
var toJson = '${result.name}.toJsonString'; |
|
|
|
var toJson = '${result.name}.toJsonString'; |
|
|
|
if (isJsonStringArray) { |
|
|
|
if (isJsonStringArray) { |
|
|
|
fromJson = '_${_toDartName('${identifier}FromJsonString')}'; |
|
|
|
fromJson = '_${_toDartName('${state.prefix}${identifier}FromJsonString')}'; |
|
|
|
if (!state.resolvedTypes.contains(fromJson)) { |
|
|
|
if (!state.resolvedTypes.contains(fromJson)) { |
|
|
|
state.resolvedTypes.add(fromJson); |
|
|
|
state.resolvedTypes.add(fromJson); |
|
|
|
state.output.add( |
|
|
|
state.output.add( |
|
|
|
@ -1200,7 +1207,7 @@ TypeResult resolveObject( |
|
|
|
), |
|
|
|
), |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
toJson = '_${_toDartName('${identifier}ToJsonString')}'; |
|
|
|
toJson = '_${_toDartName('${state.prefix}${identifier}ToJsonString')}'; |
|
|
|
if (!state.resolvedTypes.contains(toJson)) { |
|
|
|
if (!state.resolvedTypes.contains(toJson)) { |
|
|
|
state.resolvedTypes.add(toJson); |
|
|
|
state.resolvedTypes.add(toJson); |
|
|
|
state.output.add( |
|
|
|
state.output.add( |
|
|
|
@ -1253,7 +1260,7 @@ TypeResult resolveObject( |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
return TypeResultObject( |
|
|
|
return TypeResultObject( |
|
|
|
identifier, |
|
|
|
'${state.prefix}$identifier', |
|
|
|
fromJsonString: fromJsonString, |
|
|
|
fromJsonString: fromJsonString, |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1280,8 +1287,8 @@ TypeResult resolveType( |
|
|
|
fromJsonString: fromJsonString, |
|
|
|
fromJsonString: fromJsonString, |
|
|
|
); |
|
|
|
); |
|
|
|
} else if (schema.ofs != null) { |
|
|
|
} else if (schema.ofs != null) { |
|
|
|
if (!state.resolvedTypes.contains(identifier)) { |
|
|
|
if (!state.resolvedTypes.contains('${state.prefix}$identifier')) { |
|
|
|
state.resolvedTypes.add(identifier); |
|
|
|
state.resolvedTypes.add('${state.prefix}$identifier'); |
|
|
|
final results = schema.ofs! |
|
|
|
final results = schema.ofs! |
|
|
|
.map( |
|
|
|
.map( |
|
|
|
(final s) => resolveType( |
|
|
|
(final s) => resolveType( |
|
|
|
@ -1298,12 +1305,12 @@ TypeResult resolveType( |
|
|
|
(final b) { |
|
|
|
(final b) { |
|
|
|
final fields = <String, String>{}; |
|
|
|
final fields = <String, String>{}; |
|
|
|
for (final result in results) { |
|
|
|
for (final result in results) { |
|
|
|
final dartName = _toDartName(result.name); |
|
|
|
final dartName = _toDartName(result.name.replaceFirst(state.prefix, '')); |
|
|
|
fields[result.name] = _toFieldName(dartName, result.name); |
|
|
|
fields[result.name] = _toFieldName(dartName, result.name.replaceFirst(state.prefix, '')); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
b |
|
|
|
b |
|
|
|
..name = identifier |
|
|
|
..name = '${state.prefix}$identifier' |
|
|
|
..fields.addAll([ |
|
|
|
..fields.addAll([ |
|
|
|
Field( |
|
|
|
Field( |
|
|
|
(final b) { |
|
|
|
(final b) { |
|
|
|
@ -1398,7 +1405,7 @@ TypeResult resolveType( |
|
|
|
if (schema.allOf != null) ...[ |
|
|
|
if (schema.allOf != null) ...[ |
|
|
|
"assert([${fields.values.join(',')}].where((final x) => x != null).length == ${fields.length}, 'Need allOf for \$data');", |
|
|
|
"assert([${fields.values.join(',')}].where((final x) => x != null).length == ${fields.length}, 'Need allOf for \$data');", |
|
|
|
], |
|
|
|
], |
|
|
|
'return $identifier(', |
|
|
|
'return ${state.prefix}$identifier(', |
|
|
|
'data,', |
|
|
|
'data,', |
|
|
|
for (final result in results) ...[ |
|
|
|
for (final result in results) ...[ |
|
|
|
'${fields[result.name]!}: ${fields[result.name]!},', |
|
|
|
'${fields[result.name]!}: ${fields[result.name]!},', |
|
|
|
@ -1421,7 +1428,7 @@ TypeResult resolveType( |
|
|
|
..type = refer('String'), |
|
|
|
..type = refer('String'), |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
) |
|
|
|
..body = Code('$identifier.fromJson(json.decode(data))'); |
|
|
|
..body = Code('${state.prefix}$identifier.fromJson(json.decode(data))'); |
|
|
|
}, |
|
|
|
}, |
|
|
|
), |
|
|
|
), |
|
|
|
]) |
|
|
|
]) |
|
|
|
@ -1454,7 +1461,7 @@ TypeResult resolveType( |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
result = TypeResultObject(identifier); |
|
|
|
result = TypeResultObject('${state.prefix}$identifier'); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
switch (schema.type) { |
|
|
|
switch (schema.type) { |
|
|
|
case 'boolean': |
|
|
|
case 'boolean': |
|
|
|
@ -1538,12 +1545,12 @@ TypeResult resolveType( |
|
|
|
|
|
|
|
|
|
|
|
if (result != null) { |
|
|
|
if (result != null) { |
|
|
|
if (!ignoreEnum && schema.enum_ != null) { |
|
|
|
if (!ignoreEnum && schema.enum_ != null) { |
|
|
|
if (!state.resolvedTypes.contains(identifier)) { |
|
|
|
if (!state.resolvedTypes.contains('${state.prefix}$identifier')) { |
|
|
|
state.resolvedTypes.add(identifier); |
|
|
|
state.resolvedTypes.add('${state.prefix}$identifier'); |
|
|
|
state.output.add( |
|
|
|
state.output.add( |
|
|
|
Enum( |
|
|
|
Enum( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
..name = identifier |
|
|
|
..name = '${state.prefix}$identifier' |
|
|
|
..constructors.add( |
|
|
|
..constructors.add( |
|
|
|
Constructor( |
|
|
|
Constructor( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
@ -1587,7 +1594,7 @@ TypeResult resolveType( |
|
|
|
throw Exception( |
|
|
|
throw Exception( |
|
|
|
'Sorry enum values are a bit broken. ' |
|
|
|
'Sorry enum values are a bit broken. ' |
|
|
|
'See https://github.com/google/json_serializable.dart/issues/616. ' |
|
|
|
'See https://github.com/google/json_serializable.dart/issues/616. ' |
|
|
|
'Please remove the enum values on $identifier.', |
|
|
|
'Please remove the enum values on ${state.prefix}$identifier.', |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
b.annotations.add( |
|
|
|
b.annotations.add( |
|
|
|
@ -1605,7 +1612,7 @@ TypeResult resolveType( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
..name = 'fromValue' |
|
|
|
..name = 'fromValue' |
|
|
|
..static = true |
|
|
|
..static = true |
|
|
|
..returns = refer(identifier) |
|
|
|
..returns = refer('${state.prefix}$identifier') |
|
|
|
..requiredParameters.add( |
|
|
|
..requiredParameters.add( |
|
|
|
Parameter( |
|
|
|
Parameter( |
|
|
|
(final b) => b |
|
|
|
(final b) => b |
|
|
|
@ -1618,10 +1625,10 @@ TypeResult resolveType( |
|
|
|
'switch (value) {', |
|
|
|
'switch (value) {', |
|
|
|
for (final value in schema.enum_!) ...[ |
|
|
|
for (final value in schema.enum_!) ...[ |
|
|
|
'case ${_valueToEscapedValue(result!.name, value)}:', |
|
|
|
'case ${_valueToEscapedValue(result!.name, value)}:', |
|
|
|
'return $identifier.${_toDartName(value.toString())};', |
|
|
|
'return ${state.prefix}$identifier.${_toDartName(value.toString())};', |
|
|
|
], |
|
|
|
], |
|
|
|
'default:', |
|
|
|
'default:', |
|
|
|
'throw Exception(\'Can not parse $identifier from "\$value"\');', |
|
|
|
'throw Exception(\'Can not parse ${state.prefix}$identifier from "\$value"\');', |
|
|
|
'}', |
|
|
|
'}', |
|
|
|
].join(), |
|
|
|
].join(), |
|
|
|
), |
|
|
|
), |
|
|
|
@ -1630,7 +1637,7 @@ TypeResult resolveType( |
|
|
|
), |
|
|
|
), |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
result = TypeResultEnum(identifier, result); |
|
|
|
result = TypeResultEnum('${state.prefix}$identifier', result); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
return result; |
|
|
|
|
jld3103
2 years ago