From 00ed542636a61bacfc577811e8fcb5c2dbef7b56 Mon Sep 17 00:00:00 2001 From: Charles-Henri Date: Thu, 16 Jan 2025 10:01:44 +0100 Subject: [PATCH] fix: ci requirements --- .../templates/dart_freezed_dto_template.dart | 27 ++++++++++++------- .../src/parser/parser/open_api_parser.dart | 3 ++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/swagger_parser/lib/src/generator/templates/dart_freezed_dto_template.dart b/swagger_parser/lib/src/generator/templates/dart_freezed_dto_template.dart index 18718557..efc42c59 100644 --- a/swagger_parser/lib/src/generator/templates/dart_freezed_dto_template.dart +++ b/swagger_parser/lib/src/generator/templates/dart_freezed_dto_template.dart @@ -161,10 +161,13 @@ String _factories(UniversalComponentClass dataClass, String className) { } final factories = []; - for (final discriminatorValue in dataClass.discriminator!.discriminatorValueToRefMapping.keys) { + for (final discriminatorValue + in dataClass.discriminator!.discriminatorValueToRefMapping.keys) { final factoryName = discriminatorValue.toCamel; - final discriminatorRef = dataClass.discriminator!.discriminatorValueToRefMapping[discriminatorValue]!; - final factoryParameters = dataClass.discriminator!.refProperties[discriminatorRef]!; + final discriminatorRef = dataClass + .discriminator!.discriminatorValueToRefMapping[discriminatorValue]!; + final factoryParameters = + dataClass.discriminator!.refProperties[discriminatorRef]!; final unionItemClassName = discriminatorRef.toPascal; factories.add(''' @@ -224,10 +227,12 @@ String? _validationString(UniversalType type) { } String _parametersToString(List parameters) { - final sortedByRequired = List.from(parameters.sorted((a, b) => a.compareTo(b))); + final sortedByRequired = + List.from(parameters.sorted((a, b) => a.compareTo(b))); return sortedByRequired .mapIndexed( - (i, e) => '\n${i != 0 && (e.description?.isNotEmpty ?? false) ? '\n' : ''}${descriptionComment(e.description, tab: ' ')}' + (i, e) => + '\n${i != 0 && (e.description?.isNotEmpty ?? false) ? '\n' : ''}${descriptionComment(e.description, tab: ' ')}' '${_jsonKey(e)} ${_required(e)}' '${e.toSuitableType(ProgrammingLanguage.dart)} ${e.name},', ) @@ -250,10 +255,12 @@ String _jsonKey(UniversalType t) { } /// return required if isRequired -String _required(UniversalType t) => t.isRequired && t.defaultValue == null ? 'required ' : ''; +String _required(UniversalType t) => + t.isRequired && t.defaultValue == null ? 'required ' : ''; /// return defaultValue if have -String _defaultValue(UniversalType t) => '${t.enumType != null ? '${t.type}.${protectDefaultEnum(t.defaultValue)?.toCamel}' : protectDefaultValue( - t.defaultValue, - type: t.type, - )}'; +String _defaultValue(UniversalType t) => + '${t.enumType != null ? '${t.type}.${protectDefaultEnum(t.defaultValue)?.toCamel}' : protectDefaultValue( + t.defaultValue, + type: t.type, + )}'; diff --git a/swagger_parser/lib/src/parser/parser/open_api_parser.dart b/swagger_parser/lib/src/parser/parser/open_api_parser.dart index 6fe3922e..cdd17eea 100644 --- a/swagger_parser/lib/src/parser/parser/open_api_parser.dart +++ b/swagger_parser/lib/src/parser/parser/open_api_parser.dart @@ -901,7 +901,8 @@ class OpenApiParser { // check for discriminated oneOf final discriminatedOneOfClasses = dataClasses.where( - (dc) => dc is UniversalComponentClass && dc.discriminator != null); + (dc) => dc is UniversalComponentClass && dc.discriminator != null, + ); for (final discriminatedOneOfClass in discriminatedOneOfClasses) { if (discriminatedOneOfClass is! UniversalComponentClass) { continue;