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

Merge pull request #169 from provokateurin/fix/content-strings 

Fix content strings
pull/171/head
Kate 2 years ago committed by GitHub
parent
d8e76b7160 23987704bf
commit
c8f1eb4ba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 23 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. 2
      packages/dynamite/lib/src/models/schema.dart
  2. 32
      packages/dynamite/lib/src/openapi_builder.dart
  3. 4
      packages/dynamite/lib/src/type_result/list.dart
  4. 8
      packages/dynamite/lib/src/type_result/object.dart

2
packages/dynamite/lib/src/models/schema.dart
Unescape View File

@ -67,5 +67,5 @@ class Schema {
final Discriminator? discriminator; final Discriminator? discriminator;
bool get isJsonString => type == 'string' && contentMediaType == 'application/json' && contentSchema != null; bool get isContentString => type == 'string' && (contentMediaType?.isNotEmpty ?? false) && contentSchema != null;
} }

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

@ -603,7 +603,7 @@ class OpenAPIBuilder implements Builder {
if (nullable) { if (nullable) {
code.write('if (${_toDartName(parameter.name)} != null) {'); code.write('if (${_toDartName(parameter.name)} != null) {');
} }
final isPlainList = result is TypeResultList && !result.fromJsonString; final isPlainList = result is TypeResultList && !result.fromContentString;
final value = result.encode( final value = result.encode(
result.serialize(_toDartName(parameter.name)), result.serialize(_toDartName(parameter.name)),
onlyChildren: isPlainList && parameter.in_ == 'query', onlyChildren: isPlainList && parameter.in_ == 'query',
@ -1039,7 +1039,7 @@ TypeResult resolveObject(
final Schema schema, { final Schema schema, {
required final Map<String, String>? extraJsonSerializableValues, required final Map<String, String>? extraJsonSerializableValues,
required final Map<String, Map<String, String>>? extraJsonKeyValues, required final Map<String, Map<String, String>>? extraJsonKeyValues,
final bool fromJsonString = false, final bool fromContentString = false,
}) { }) {
if (!state.resolvedTypes.contains('${state.prefix}$identifier')) { if (!state.resolvedTypes.contains('${state.prefix}$identifier')) {
state.resolvedTypes.add('${state.prefix}$identifier'); state.resolvedTypes.add('${state.prefix}$identifier');
@ -1181,14 +1181,14 @@ TypeResult resolveObject(
], ],
]); ]);
final hasDifferentName = _toDartName(propertyName) != propertyName; final hasDifferentName = _toDartName(propertyName) != propertyName;
final isJsonString = propertySchema.isJsonString; final isContentString = propertySchema.isContentString;
final isJsonStringArray = result is TypeResultList && (propertySchema.items?.isJsonString ?? false); final isContentStringArray = isContentString && result is TypeResultList;
final hasExtraJsonKeyValues = final hasExtraJsonKeyValues =
extraJsonKeyValues != null && extraJsonKeyValues.containsKey(propertyName); extraJsonKeyValues != null && extraJsonKeyValues.containsKey(propertyName);
if (hasDifferentName || isJsonString || isJsonStringArray || hasExtraJsonKeyValues) { if (hasDifferentName || isContentString || isContentStringArray || hasExtraJsonKeyValues) {
var fromJson = '${result.name}.fromJsonString'; var fromJson = '${result.name}.fromJsonString';
var toJson = '${result.name}.toJsonString'; var toJson = '${result.name}.toJsonString';
if (isJsonStringArray) { if (isContentStringArray) {
fromJson = '_${_toDartName('${state.prefix}${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);
@ -1216,7 +1216,7 @@ TypeResult resolveObject(
Method( Method(
(final b) => b (final b) => b
..name = toJson ..name = toJson
..returns = refer('List<String>?') ..returns = refer('String?')
..lambda = true ..lambda = true
..requiredParameters.addAll([ ..requiredParameters.addAll([
Parameter( Parameter(
@ -1226,7 +1226,7 @@ TypeResult resolveObject(
), ),
]) ])
..body = Code( ..body = Code(
'data == null ? null : ${result.encode(result.serialize('data'), mimeType: 'application/json', onlyChildren: true)};', 'data == null ? null : ${result.encode(result.serialize('data'), mimeType: 'application/json')};',
), ),
), ),
); );
@ -1240,7 +1240,7 @@ TypeResult resolveObject(
if (hasDifferentName) ...{ if (hasDifferentName) ...{
'name': refer("'$propertyName'"), 'name': refer("'$propertyName'"),
}, },
if (isJsonString || isJsonStringArray) ...{ if (isContentString || isContentStringArray) ...{
'fromJson': refer(fromJson), 'fromJson': refer(fromJson),
'toJson': refer(toJson), 'toJson': refer(toJson),
}, },
@ -1263,7 +1263,7 @@ TypeResult resolveObject(
} }
return TypeResultObject( return TypeResultObject(
'${state.prefix}$identifier', '${state.prefix}$identifier',
fromJsonString: fromJsonString, fromContentString: fromContentString,
); );
} }
@ -1275,7 +1275,7 @@ TypeResult resolveType(
final Map<String, String>? extraJsonSerializableValues, final Map<String, String>? extraJsonSerializableValues,
final Map<String, Map<String, String>>? extraJsonKeyValues, final Map<String, Map<String, String>>? extraJsonKeyValues,
final bool ignoreEnum = false, final bool ignoreEnum = false,
final bool fromJsonString = false, final bool fromContentString = false,
}) { }) {
TypeResult? result; TypeResult? result;
if (schema.ref != null) { if (schema.ref != null) {
@ -1286,7 +1286,7 @@ TypeResult resolveType(
name, name,
spec.components!.schemas![name]!, spec.components!.schemas![name]!,
extraJsonSerializableValues: extraJsonSerializableValues, extraJsonSerializableValues: extraJsonSerializableValues,
fromJsonString: fromJsonString, fromContentString: fromContentString,
); );
} else if (schema.ofs != null) { } else if (schema.ofs != null) {
if (!state.resolvedTypes.contains('${state.prefix}$identifier')) { if (!state.resolvedTypes.contains('${state.prefix}$identifier')) {
@ -1482,14 +1482,14 @@ TypeResult resolveType(
break; break;
} }
if (schema.isJsonString) { if (schema.isContentString) {
result = resolveType( result = resolveType(
spec, spec,
state, state,
identifier, identifier,
schema.contentSchema!, schema.contentSchema!,
extraJsonSerializableValues: extraJsonSerializableValues, extraJsonSerializableValues: extraJsonSerializableValues,
fromJsonString: true, fromContentString: true,
); );
break; break;
} }
@ -1510,7 +1510,7 @@ TypeResult resolveType(
result = TypeResultList( result = TypeResultList(
'List<${subResult.name}>', 'List<${subResult.name}>',
subResult, subResult,
fromJsonString: fromJsonString, fromContentString: fromContentString,
); );
} else { } else {
result = TypeResultList( result = TypeResultList(
@ -1539,7 +1539,7 @@ TypeResult resolveType(
schema, schema,
extraJsonSerializableValues: extraJsonSerializableValues, extraJsonSerializableValues: extraJsonSerializableValues,
extraJsonKeyValues: extraJsonKeyValues, extraJsonKeyValues: extraJsonKeyValues,
fromJsonString: fromJsonString, fromContentString: fromContentString,
); );
break; break;
} }

4
packages/dynamite/lib/src/type_result/list.dart
Unescape View File

@ -4,11 +4,11 @@ class TypeResultList extends TypeResult {
TypeResultList( TypeResultList(
super.name, super.name,
this.subType, { this.subType, {
this.fromJsonString = false, this.fromContentString = false,
}); });
final TypeResult subType; final TypeResult subType;
final bool fromJsonString; final bool fromContentString;
@override @override
String serialize(final String object) => '$object.map((final e) => ${subType.serialize('e')}).toList()'; String serialize(final String object) => '$object.map((final e) => ${subType.serialize('e')}).toList()';

8
packages/dynamite/lib/src/type_result/object.dart
Unescape View File

@ -3,14 +3,14 @@ part of '../../dynamite.dart';
class TypeResultObject extends TypeResult { class TypeResultObject extends TypeResult {
TypeResultObject( TypeResultObject(
super.name, { super.name, {
this.fromJsonString = false, this.fromContentString = false,
}); });
final bool fromJsonString; final bool fromContentString;
@override @override
String serialize(final String object) { String serialize(final String object) {
if (fromJsonString) { if (fromContentString) {
return '$name.toJsonString($object)'; return '$name.toJsonString($object)';
} }
return '$object.toJson()'; return '$object.toJson()';
@ -34,7 +34,7 @@ class TypeResultObject extends TypeResult {
@override @override
String deserialize(final String object) { String deserialize(final String object) {
if (fromJsonString) { if (fromContentString) {
return '$name.fromJsonString($object as String)'; return '$name.fromJsonString($object as String)';
} }
return '$name.fromJson($object as Map<String, dynamic>)'; return '$name.fromJson($object as Map<String, dynamic>)';

Write Preview
Loading…
Cancel
Save