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

Merge pull request #241 from Leptopoda/feature/built_value_split 

Feature/built value split
pull/245/head
Kate 3 years ago committed by GitHub
parent
59cc93d554 bdcc43d560
commit
74e519840c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24575 additions and 3744 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 152
      packages/dynamite/lib/src/openapi_builder.dart
  2. 6118
      packages/nextcloud/lib/src/nextcloud.openapi.dart
  3. 22040
      packages/nextcloud/lib/src/nextcloud.openapi.g.dart
  4. 7
      packages/nextcloud/test/notes.dart
  5. 2
      tool/format.sh

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

@ -1249,88 +1249,69 @@ TypeResult resolveObject(
b
..name = '${state.prefix}$identifier'
..docs.addAll(_descriptionToDocs(schema.description))
..annotations.add(
refer('JsonSerializable').call(
[],
{
if (schema.additionalProperties != null) ...{
'disallowUnrecognizedKeys': refer('false'),
},
if (extraJsonSerializableValues != null) ...{
for (final key in extraJsonSerializableValues.keys) ...{
key: refer(extraJsonSerializableValues[key]!),
},
},
},
..abstract = true
..implements.add(
refer(
'Built<${state.prefix}$identifier, ${state.prefix}${identifier}Builder>',
),
)
..constructors.addAll(
[
Constructor(
(final b) => b
..optionalParameters.addAll(
schema.properties!.keys.map(
(final propertyName) => Parameter(
(final b) {
final propertySchema = schema.properties![propertyName]!;
b
..name = _toDartName(propertyName)
..toThis = true
..named = true
..required =
(schema.required ?? []).contains(propertyName) && propertySchema.default_ == null;
if (propertySchema.default_ != null) {
final value = propertySchema.default_!.toString();
final result = resolveType(
spec,
state,
propertySchema.type!,
propertySchema,
);
b.defaultTo = Code(_valueToEscapedValue(result, value));
}
},
),
),
..constructors.addAll([
Constructor(
(final b) => b
..name = '_'
..constant = true,
),
Constructor(
(final b) => b
..factory = true
..lambda = true
..optionalParameters.add(
Parameter(
(final b) => b
..name = 'b'
..type = refer('void Function(${state.prefix}${identifier}Builder)?'),
),
),
Constructor(
(final b) => b
..factory = true
..name = 'fromJson'
..lambda = true
..requiredParameters.add(
Parameter(
(final b) => b
..name = 'json'
..type = refer('Map<String, dynamic>'),
),
)
..body = Code('_\$${state.prefix}${identifier}FromJson(json)'),
),
Constructor(
(final b) => b
..factory = true
..name = 'fromJsonString'
..lambda = true
..requiredParameters.add(
Parameter(
(final b) => b
..name = 'data'
..type = refer('String'),
),
)
..body = Code('${state.prefix}$identifier.fromJson(json.decode(data) as Map<String, dynamic>)'),
),
],
)
)
..redirect = refer('_\$${state.prefix}$identifier'),
),
])
..methods.addAll([
Method(
(final b) => b
..static = true
..name = 'fromJson'
..lambda = true
..returns = refer('${state.prefix}$identifier')
..requiredParameters.add(
Parameter(
(final b) => b
..name = 'json'
..type = refer('Map<String, dynamic>'),
),
)
..body = const Code('serializers.deserializeWith(serializer, json)!'),
),
Method(
(final b) => b
..static = true
..name = 'fromJsonString'
..lambda = true
..returns = refer('${state.prefix}$identifier')
..requiredParameters.add(
Parameter(
(final b) => b
..name = 'data'
..type = refer('String'),
),
)
..body = const Code('serializers.fromJson(serializer, data)!'),
),
Method(
(final b) => b
..name = 'toJson'
..returns = refer('Map<String, dynamic>')
..lambda = true
..body = Code('_\$${state.prefix}${identifier}ToJson(this)'),
..body = const Code('serializers.serializeWith(serializer, this) as Map<String, dynamic>'),
),
Method(
(final b) => b
@ -1345,12 +1326,10 @@ TypeResult resolveObject(
..type = refer(_makeNullable('${state.prefix}$identifier', true)),
),
)
..body = const Code('data == null ? null : json.encode(data.toJson())'),
..body = const Code('data == null ? null : serializers.toJson(serializer, data)'),
),
])
..fields.addAll([
for (final propertyName in schema.properties!.keys) ...[
Field(
Method(
(final b) {
final propertySchema = schema.properties![propertyName]!;
final result = resolveType(
@ -1363,13 +1342,13 @@ TypeResult resolveObject(
b
..name = _toDartName(propertyName)
..type = refer(
..returns = refer(
_makeNullable(
result.name,
!(schema.required ?? []).contains(propertyName),
),
)
..modifier = FieldModifier.final$
..type = MethodType.getter
..docs.addAll(_descriptionToDocs(propertySchema.description));
final hasDifferentName = _toDartName(propertyName) != propertyName;
final isContentString = propertySchema.isContentString;
@ -1378,7 +1357,7 @@ TypeResult resolveObject(
final arguments = <String, Expression>{
if (hasDifferentName) ...{
'name': refer("'$propertyName'"),
'wireName': literalString(propertyName),
},
if (hasExtraJsonKeyValues) ...{
for (final key in extraJsonKeyValues[propertyName]!.keys) ...{
@ -1447,12 +1426,21 @@ TypeResult resolveObject(
if (arguments.isNotEmpty) {
b.annotations.add(
refer('JsonKey').call([], arguments),
refer('BuiltValueField').call([], arguments),
);
}
},
)
),
],
Method(
(final b) => b
..name = 'serializer'
..returns = refer('Serializer<${state.prefix}$identifier>')
..lambda = true
..static = true
..body = Code("_\$${_toCamelCase('${state.prefix}$identifier')}Serializer")
..type = MethodType.getter,
),
]);
},
),

6118
packages/nextcloud/lib/src/nextcloud.openapi.dart
View File

File diff suppressed because it is too large Load Diff

22040
packages/nextcloud/lib/src/nextcloud.openapi.g.dart
View File

File diff suppressed because it is too large Load Diff

7
packages/nextcloud/test/notes.dart
Unescape View File

@ -122,9 +122,10 @@ Future run(final DockerImage image) async {
test('Update settings', () async {
var response = await client.notes.updateSettings(
notesSettings: NextcloudNotesSettings(
notesPath: 'Test Notes',
fileSuffix: '.txt',
noteMode: NextcloudNotesSettings_NoteMode.preview,
(final b) => b
..notesPath = 'Test Notes'
..fileSuffix = '.txt'
..noteMode = NextcloudNotesSettings_NoteMode.preview,
),
);
expect(response.notesPath, 'Test Notes');

2
tool/format.sh
Unescape View File

@ -5,4 +5,6 @@ cd "$(dirname "$0")/.."
(
cd packages
fvm dart format --fix --line-length 120 .
# mitigate dart format bug
fvm dart format --fix --line-length 120 .
)

Write Preview
Loading…
Cancel
Save