Skip to content

Commit

Permalink
fix: ci requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
CallMeSH committed Jan 16, 2025
1 parent 5d2cf18 commit 00ed542
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,13 @@ String _factories(UniversalComponentClass dataClass, String className) {
}

final factories = <String>[];
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('''
Expand Down Expand Up @@ -224,10 +227,12 @@ String? _validationString(UniversalType type) {
}

String _parametersToString(List<UniversalType> parameters) {
final sortedByRequired = List<UniversalType>.from(parameters.sorted((a, b) => a.compareTo(b)));
final sortedByRequired =
List<UniversalType>.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},',
)
Expand All @@ -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,
)}';
3 changes: 2 additions & 1 deletion swagger_parser/lib/src/parser/parser/open_api_parser.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 00ed542

Please sign in to comment.