Skip to content

Commit

Permalink
fix: Fixed issue with two step trimmable generation.
Browse files Browse the repository at this point in the history
  • Loading branch information
@HavenDV
HavenDV committed May 30, 2024
1 parent e7af94a commit e70d101
Show file tree
Hide file tree
Showing 3 changed files with 159 additions and 164 deletions.
318 changes: 155 additions & 163 deletions src/libs/OpenApiGenerator.Core/Generation/Data.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ public static (EquatableArray<ModelData> Models, EquatableArray<EndPoint> Method
{
var (text, settings) = tuple;

Dictionary<string, ModelData> schemas = [];
EndPoint[] methods = [];
AnyOfData[] anyOfDatas = [];
var openApiDocument = text.GetOpenApiDocument(cancellationToken);

var includedOperationIds = new HashSet<string>(settings.IncludeOperationIds);
Expand Down Expand Up @@ -56,175 +53,168 @@ public static (EquatableArray<ModelData> Models, EquatableArray<EndPoint> Method
};
}

if (settings.GenerateSdk || settings.GenerateModels)
var includedModels = new HashSet<string>(settings.IncludeModels);
var excludedModels = new HashSet<string>(settings.ExcludeModels);
foreach (var tag in settings.IncludeTags)
{
var includedModels = new HashSet<string>(settings.IncludeModels);
var excludedModels = new HashSet<string>(settings.ExcludeModels);
foreach (var tag in settings.IncludeTags)
{
includedModels.UnionWith(openApiDocument.FindAllModelsForTag(tag));
}
foreach (var tag in settings.ExcludeTags)
{
excludedModels.UnionWith(openApiDocument.FindAllModelsForTag(tag));
}
var referencesOfIncludedModels = includedModels.Count == 0
? []
: new HashSet<string>(openApiDocument.Components.Schemas
.Where(schema =>
(includedModels.Count == 0 ||
includedModels.Contains(schema.Key)) &&
!excludedModels.Contains(schema.Key))
.SelectMany(schema => schema.GetReferences())
.Select(reference => reference.Id));

schemas = openApiDocument.Components.Schemas
includedModels.UnionWith(openApiDocument.FindAllModelsForTag(tag));
}
foreach (var tag in settings.ExcludeTags)
{
excludedModels.UnionWith(openApiDocument.FindAllModelsForTag(tag));
}
var referencesOfIncludedModels = includedModels.Count == 0
? []
: new HashSet<string>(openApiDocument.Components.Schemas
.Where(schema =>
(includedModels.Count == 0 ||
includedModels.Contains(schema.Key) ||
referencesOfIncludedModels.Contains(schema.Key)) &&
includedModels.Contains(schema.Key)) &&
!excludedModels.Contains(schema.Key))
.Select(schema => ModelData.FromSchema(schema, settings))
.SelectMany(model => model.WithAdditionalModels())
.ToDictionary(x => x.ClassName, x => x);

var allSchemas = schemas.Values.Concat(methods
.SelectMany(x => x.AdditionalModels))
.SelectMany(x => x.Schema.Value.Properties.Concat([x.Schema]).ToArray())
.Select(x => x.Value)
.ToArray();
var anyOfs = allSchemas
.Where(x => x.AnyOf is { Count: > 0 })
.Select(x => new AnyOfData("AnyOf", x.AnyOf.Count, settings.JsonSerializerType))
.Concat(allSchemas
.Where(x => x.Items?.AnyOf is { Count: > 0 })
.Select(x => new AnyOfData("AnyOf", x.Items.AnyOf.Count, settings.JsonSerializerType)))
.Distinct()
.ToImmutableArray();
var oneOfs = allSchemas
.Where(x => x.OneOf is { Count: > 0 })
.Select(x => new AnyOfData("OneOf", x.OneOf.Count, settings.JsonSerializerType))
.Concat(allSchemas
.Where(x => x.Items?.OneOf is { Count: > 0 })
.Select(x => new AnyOfData("OneOf", x.Items.OneOf.Count, settings.JsonSerializerType)))
.Distinct()
.ToImmutableArray();
var allOfs = allSchemas
.Where(x => x.AllOf is { Count: > 0 })
.Select(x => new AnyOfData("AllOf", x.AllOf.Count, settings.JsonSerializerType))
.Concat(allSchemas
.Where(x => x.Items?.AllOf is { Count: > 0 })
.Select(x => new AnyOfData("AllOf", x.Items.AllOf.Count, settings.JsonSerializerType)))
.Distinct()
.ToImmutableArray();

anyOfDatas =
[
..anyOfs,
..oneOfs,
..allOfs,
];
}
.SelectMany(schema => schema.GetReferences())
.Select(reference => reference.Id));

Dictionary<string, ModelData> schemas = openApiDocument.Components.Schemas
.Where(schema =>
(includedModels.Count == 0 ||
includedModels.Contains(schema.Key) ||
referencesOfIncludedModels.Contains(schema.Key)) &&
!excludedModels.Contains(schema.Key))
.Select(schema => ModelData.FromSchema(schema, settings))
.SelectMany(model => model.WithAdditionalModels())
.ToDictionary(x => x.ClassName, x => x);

if (settings.GenerateSdk || settings.GenerateMethods)
{
var operations = openApiDocument.Paths.SelectMany(path =>
path.Value.Operations
.Where(x =>
var operations = openApiDocument.Paths.SelectMany(path =>
path.Value.Operations
.Where(x =>
{
if (includedOperationIds.Count == 0 && excludedOperationIds.Count == 0)
{
if (includedOperationIds.Count == 0 && excludedOperationIds.Count == 0)
return true;
}

var methodName = x.Value.GetMethodName(path: path.Key, operationType: x.Key,
settings.MethodNamingConvention, settings.MethodNamingConventionFallback);

return (includedOperationIds.Count == 0 ||
includedOperationIds.Contains(methodName) ||
includedOperationIds.Contains(x.Value.OperationId)) &&
!excludedOperationIds.Contains(methodName) &&
!excludedOperationIds.Contains(x.Value.OperationId);
})
.Select(x => (Path: path, Operation: x)))
.ToArray();

var operationsAsMethods = operations
.Select(x => EndPoint.FromSchema(x.Operation, settings, x.Path.Key))
.ToArray();
var authorizations = openApiDocument.SecurityRequirements
.SelectMany(requirement => requirement)
.Select(x => EndPoint.FromAuthorization(x.Key.Scheme, settings))
.ToArray();

var includedTags = allTags
.Where(x =>
(settings.IncludeTags.Length == 0 ||
settings.IncludeTags.Contains(x.Name)) &&
!settings.ExcludeTags.Contains(x.Name))
.ToArray();
EndPoint[] constructors = settings.GenerateSdk || settings.GenerateConstructors ? [new EndPoint(
Id: "Constructors",
Namespace: settings.Namespace,
ClassName: settings.ClassName.Replace(".", string.Empty),
BaseUrl: openApiDocument.Servers.FirstOrDefault()?.Url ?? string.Empty,
Stream: false,
Path: string.Empty,
AuthorizationScheme: string.Empty,
Properties: settings.GroupByTags && (settings.GenerateSdk || settings.GenerateConstructors)
? [
.. includedTags.Select(x => PropertyData.Default with
{
Name = PropertyData.SanitizeName(x.Name.ToClassName()),
Type = TypeData.Default with
{
return true;
}

var methodName = x.Value.GetMethodName(path: path.Key, operationType: x.Key,
settings.MethodNamingConvention, settings.MethodNamingConventionFallback);

return (includedOperationIds.Count == 0 ||
includedOperationIds.Contains(methodName) ||
includedOperationIds.Contains(x.Value.OperationId)) &&
!excludedOperationIds.Contains(methodName) &&
!excludedOperationIds.Contains(x.Value.OperationId);
CSharpType = $"{x.Name.ToClassName()}Client",
},
Summary = x.Description ?? string.Empty,
})
.Select(x => (Path: path, Operation: x)))
.ToArray();

var operationsAsMethods = operations
.Select(x => EndPoint.FromSchema(x.Operation, settings, x.Path.Key))
.ToArray();
var authorizations = openApiDocument.SecurityRequirements
.SelectMany(requirement => requirement)
.Select(x => EndPoint.FromAuthorization(x.Key.Scheme, settings))
.ToArray();

var includedTags = allTags
.Where(x =>
(settings.IncludeTags.Length == 0 ||
settings.IncludeTags.Contains(x.Name)) &&
!settings.ExcludeTags.Contains(x.Name))
]
: [],
TargetFramework: settings.TargetFramework,
JsonSerializerType: settings.JsonSerializerType,
JsonSerializerContext: settings.JsonSerializerContext,
HttpMethod: OperationType.Get,
Summary: openApiDocument.Info?.Description?.ClearForXml() ?? string.Empty,
RequestType: TypeData.Default,
ResponseType: TypeData.Default,
AdditionalModels: [])] : [];
if (settings.GroupByTags && (settings.GenerateSdk || settings.GenerateConstructors))
{
constructors = constructors.Concat(
includedTags
.Select(x => new EndPoint(
Id: "Constructors",
Namespace: settings.Namespace,
ClassName: $"{x.Name.ToClassName()}Client",
BaseUrl: openApiDocument.Servers.FirstOrDefault()?.Url ?? string.Empty,
Stream: false,
Path: string.Empty,
AuthorizationScheme: string.Empty,
Properties: ImmutableArray<PropertyData>.Empty,
TargetFramework: settings.TargetFramework,
JsonSerializerType: settings.JsonSerializerType,
JsonSerializerContext: settings.JsonSerializerContext,
HttpMethod: OperationType.Get,
Summary: x.Description?.ClearForXml() ?? string.Empty,
RequestType: TypeData.Default,
ResponseType: TypeData.Default,
AdditionalModels: [])))
.ToArray();
EndPoint[] constructors = settings.GenerateSdk || settings.GenerateConstructors ? [new EndPoint(
Id: "Constructors",
Namespace: settings.Namespace,
ClassName: settings.ClassName.Replace(".", string.Empty),
BaseUrl: openApiDocument.Servers.FirstOrDefault()?.Url ?? string.Empty,
Stream: false,
Path: string.Empty,
AuthorizationScheme: string.Empty,
Properties: settings.GroupByTags && (settings.GenerateSdk || settings.GenerateConstructors)
? [
.. includedTags.Select(x => PropertyData.Default with
{
Name = PropertyData.SanitizeName(x.Name.ToClassName()),
Type = TypeData.Default with
{
CSharpType = $"{x.Name.ToClassName()}Client",
},
Summary = x.Description ?? string.Empty,
})
]
: [],
TargetFramework: settings.TargetFramework,
JsonSerializerType: settings.JsonSerializerType,
JsonSerializerContext: settings.JsonSerializerContext,
HttpMethod: OperationType.Get,
Summary: openApiDocument.Info?.Description?.ClearForXml() ?? string.Empty,
RequestType: TypeData.Default,
ResponseType: TypeData.Default,
AdditionalModels: [])] : [];
if (settings.GroupByTags && (settings.GenerateSdk || settings.GenerateConstructors))
{
constructors = constructors.Concat(
includedTags
.Select(x => new EndPoint(
Id: "Constructors",
Namespace: settings.Namespace,
ClassName: $"{x.Name.ToClassName()}Client",
BaseUrl: openApiDocument.Servers.FirstOrDefault()?.Url ?? string.Empty,
Stream: false,
Path: string.Empty,
AuthorizationScheme: string.Empty,
Properties: ImmutableArray<PropertyData>.Empty,
TargetFramework: settings.TargetFramework,
JsonSerializerType: settings.JsonSerializerType,
JsonSerializerContext: settings.JsonSerializerContext,
HttpMethod: OperationType.Get,
Summary: x.Description?.ClearForXml() ?? string.Empty,
RequestType: TypeData.Default,
ResponseType: TypeData.Default,
AdditionalModels: [])))
.ToArray();
}

methods = [
..operationsAsMethods,
..authorizations,
..constructors,
];
}


EndPoint[] methods = [
..operationsAsMethods,
..authorizations,
..constructors,
];

var models = schemas.Values
var allSchemas = settings.GenerateSdk || settings.GenerateModels ? schemas.Values.Concat(methods
.SelectMany(x => x.AdditionalModels))
.SelectMany(x => x.Schema.Value.Properties.Concat([x.Schema]).ToArray())
.Select(x => x.Value)
.ToArray() : [];
var anyOfs = allSchemas
.Where(x => x.AnyOf is { Count: > 0 })
.Select(x => new AnyOfData("AnyOf", x.AnyOf.Count, settings.JsonSerializerType))
.Concat(allSchemas
.Where(x => x.Items?.AnyOf is { Count: > 0 })
.Select(x => new AnyOfData("AnyOf", x.Items.AnyOf.Count, settings.JsonSerializerType)))
.Distinct()
.ToImmutableArray();
var oneOfs = allSchemas
.Where(x => x.OneOf is { Count: > 0 })
.Select(x => new AnyOfData("OneOf", x.OneOf.Count, settings.JsonSerializerType))
.Concat(allSchemas
.Where(x => x.Items?.OneOf is { Count: > 0 })
.Select(x => new AnyOfData("OneOf", x.Items.OneOf.Count, settings.JsonSerializerType)))
.Distinct()
.ToImmutableArray();
var allOfs = allSchemas
.Where(x => x.AllOf is { Count: > 0 })
.Select(x => new AnyOfData("AllOf", x.AllOf.Count, settings.JsonSerializerType))
.Concat(allSchemas
.Where(x => x.Items?.AllOf is { Count: > 0 })
.Select(x => new AnyOfData("AllOf", x.Items.AllOf.Count, settings.JsonSerializerType)))
.Distinct()
.ToImmutableArray();

AnyOfData[] anyOfDatas =
[
..anyOfs,
..oneOfs,
..allOfs,
];

var models = settings.GenerateSdk || settings.GenerateModels ? schemas.Values
.Select(model => model with
{
Schema = default,
Expand All @@ -237,10 +227,12 @@ .. includedTags.Select(x => PropertyData.Default with
}))
.GroupBy(x => x.FileNameWithoutExtension)
.Select(x => x.First())
.ToImmutableArray();
.ToImmutableArray() : [];

return (Models: models,
Methods: methods.Select(x => x with{ AdditionalModels = []}).ToImmutableArray(),
Methods: settings.GenerateSdk || settings.GenerateMethods
? methods.Select(x => x with{ AdditionalModels = []}).ToImmutableArray()
: [],
AnyOfs: anyOfDatas.ToImmutableArray());
}

Expand Down
4 changes: 3 additions & 1 deletion src/libs/OpenApiGenerator.Core/Json/SystemTextJsonSerializer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ public string GenerateConverterAttribute(string type)

private static string GetContextType(string type)
{
type = type.Replace("global::", string.Empty);
type = type.Replace("global::", string.Empty).TrimEnd('?');

return type switch
{
"System.Collections.Generic.IList<string>" => "IListString",
"string" => "String",
"object" => "Object",
_ => type,
};
}
Expand Down
1 change: 1 addition & 0 deletions ...nerator.IntegrationTests.Twitch.Data/OpenApiGenerator.IntegrationTests.Twitch.Data.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<NoWarn>$(NoWarn);CS0618</NoWarn>
</PropertyGroup>

<Import Project="../../libs/OpenApiGenerator/OpenApiGenerator.props" />
Expand Down

0 comments on commit e70d101

Please sign in to comment.