feat: Added ModelGenerator template.

tryAGI · Dec 6, 2023 · 29d40a6 · 29d40a6
1 parent eef7188
commit 29d40a6
Show file tree

Hide file tree

Showing 31 changed files with 145 additions and 90 deletions.
diff --git a/...ibs/OpenApiGenerator/OptionsExtensions.cs → src/libs/OpenApiGenerator/Extensions.cs b/...ibs/OpenApiGenerator/OptionsExtensions.cs → src/libs/OpenApiGenerator/Extensions.cs
@@ -1,10 +1,12 @@
 using H.Generators.Extensions;
 using Microsoft.CodeAnalysis;
+using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Readers;
 using OpenApiGenerator.Models;
 
 namespace OpenApiGenerator;
 
-internal static class OptionsExtensions
+internal static class Extensions
 {
     public static IncrementalValueProvider<Settings> DetectSettings(
         this IncrementalGeneratorInitializationContext context)
@@ -35,4 +37,17 @@ public static IncrementalValueProvider<Settings> DetectSettings(
 
                 ));
     }
+
+    public static OpenApiDocument GetOpenApiDocument(
+        this AdditionalText text,
+        CancellationToken cancellationToken = default)
+    {
+        var yaml = text.GetText(cancellationToken)?.ToString() ?? string.Empty;
+        var openApiDocument = new OpenApiStringReader().Read(yaml, out _);
+
+        openApiDocument.Components ??= new OpenApiComponents();
+        openApiDocument.Components.Schemas ??= new Dictionary<string, OpenApiSchema>();
+
+        return openApiDocument;
+    }
 }
diff --git a/src/libs/OpenApiGenerator/Generators/ModelGenerator.cs b/src/libs/OpenApiGenerator/Generators/ModelGenerator.cs
@@ -1,38 +1,63 @@
-using Microsoft.CodeAnalysis;
+using System.Collections.Immutable;
+using H.Generators.Extensions;
+using Microsoft.CodeAnalysis;
+using OpenApiGenerator.Models;
 
-namespace H.Generators;
+namespace OpenApiGenerator;
 
 [Generator]
 public class ModelGenerator : IIncrementalGenerator
 {
     #region Constants
 
-    //private const string Id = "MG";
+    private const string Id = "OAMG";
 
     #endregion
 
     #region Methods
 
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
-        // var settings = context.DetectSettings();
-        //
-        // context.AdditionalTextsProvider
-        //     .Where(static text => text.Path.EndsWith(".yaml", StringComparison.InvariantCultureIgnoreCase))
-        //     .Combine(settings)
-        //     .SelectAndReportExceptions(GetSourceCode, context, Id)
-        //     .AddSource(context);
+        var settings = context.DetectSettings();
+
+        context.AdditionalTextsProvider
+            .Where(static text => text.Path.EndsWith(".yaml", StringComparison.InvariantCultureIgnoreCase))
+            .Combine(settings)
+            .SelectAndReportExceptions(PrepareData, context, Id)
+            .SelectMany(static (x, _) => x)
+            .SelectAndReportExceptions(GetSourceCode, context, Id)
+            .AddSource(context);
     }
 
-    // private static EquatableArray<FileWithName> GetSourceCode(
-    //     (AdditionalText text, Settings settings) tuple,
-    //     CancellationToken cancellationToken = default)
-    // {
-    //     var (text, settings) = tuple;
-    //     
-    //     return Sources.GenerateUsingNSwag(text, settings, cancellationToken);
-    // }
-
+    private static EquatableArray<Model> PrepareData(
+        (AdditionalText text, Settings settings) tuple,
+        CancellationToken cancellationToken = default)
+    {
+        var (text, settings) = tuple;
+        if (settings.UseNSwag)
+        {
+            return ImmutableArray<Model>.Empty;
+        }
+
+        var openApiDocument = text.GetOpenApiDocument(cancellationToken);
+
+        return openApiDocument.Components.Schemas
+            .Select(schema => new Model(
+                Name: schema.Key.ToPropertyName(),
+                Namespace: settings.Namespace,
+                Style: settings.ModelStyle,
+                Properties: Array.Empty<Property>().ToImmutableArray()))
+            .ToImmutableArray();
+    }
+
+    private static FileWithName GetSourceCode(
+        Model model,
+        CancellationToken cancellationToken = default)
+    {
+        return new FileWithName(
+            Name: $"{model.Namespace}.Models.{model.Name}.g.cs",
+            Text: Sources.GenerateModel(model, cancellationToken: cancellationToken));
+    }
 
     #endregion
 }
diff --git a/src/libs/OpenApiGenerator/Generators/NSwagGenerator.cs b/src/libs/OpenApiGenerator/Generators/NSwagGenerator.cs
@@ -1,4 +1,5 @@
-using H.Generators.Extensions;
+using System.Collections.Immutable;
+using H.Generators.Extensions;
 using Microsoft.CodeAnalysis;
 using OpenApiGenerator.Models;
 
@@ -31,10 +32,13 @@ private static EquatableArray<FileWithName> GetSourceCode(
         CancellationToken cancellationToken = default)
     {
         var (text, settings) = tuple;
+        if (!settings.UseNSwag)
+        {
+            return ImmutableArray<FileWithName>.Empty;
+        }
 
         return Sources.GenerateUsingNSwag(text, settings, cancellationToken);
     }
 
-
     #endregion
 }
diff --git a/src/libs/OpenApiGenerator/Models/Model.cs b/src/libs/OpenApiGenerator/Models/Model.cs
@@ -3,5 +3,7 @@
 namespace OpenApiGenerator.Models;
 
 internal readonly record struct Model(
+    string Name,
+    string Namespace,
     ModelStyle Style,
     EquatableArray<Property> Properties);
diff --git a/src/libs/OpenApiGenerator/Sources/Sources.Models.cs b/src/libs/OpenApiGenerator/Sources/Sources.Models.cs
@@ -1,44 +1,13 @@
-using System.Collections.Immutable;
-using H.Generators.Extensions;
-using Microsoft.CodeAnalysis;
-using Microsoft.OpenApi.Readers;
 using OpenApiGenerator.Models;
-using OpenApiSchema = Microsoft.OpenApi.Models.OpenApiSchema;
-using NSwag;
 
 namespace OpenApiGenerator;
 
 internal static partial class Sources
 {
-    public static EquatableArray<FileWithName> GenerateModel(
-        AdditionalText text,
-        Settings settings,
+    public static string GenerateModel(
+        Model model,
         CancellationToken cancellationToken = default)
     {
-        var yaml = text.GetText(cancellationToken)?.ToString() ?? string.Empty;
-        var openApi = Task.Run(() =>
-            OpenApiYamlDocument.FromYamlAsync(yaml, cancellationToken), cancellationToken).Result;
-        var openApiDocument = new OpenApiStringReader().Read(yaml, out _);
-        var schemas = openApiDocument.Components?.Schemas ?? new Dictionary<string, OpenApiSchema>();
-        var prefix = Path.GetFileName(text.Path);
-        var allAdditionalExcludedTypeNames = schemas.Keys
-            .Select(schemaKey => GetAdditionalExcludedTypeNames(schemaKey, schemas))
-            .SelectMany(x => x)
-            .ToArray();
-
-        var files = new List<FileWithName>();
-        files.AddRange(schemas.Keys.Select(schemaKey =>
-        {
-            var excludedTypeNames = schemas.Keys
-                .Where(x => x != schemaKey)
-                .Concat(allAdditionalExcludedTypeNames.Except(GetAdditionalExcludedTypeNames(schemaKey, schemas)))
-                .ToArray();
-
-            return new FileWithName(
-                Name: $"{prefix}.Models.{schemaKey}.cs",
-                Text: Generate(openApi, settings, excludedTypeNames));
-        }));
-
-        return files.ToImmutableArray();
+        return "//";
     }
 }
diff --git a/src/libs/OpenApiGenerator/Sources/Sources.NSwag.cs b/src/libs/OpenApiGenerator/Sources/Sources.NSwag.cs
@@ -1,7 +1,6 @@
 using System.Collections.Immutable;
 using H.Generators.Extensions;
 using Microsoft.CodeAnalysis;
-using Microsoft.OpenApi.Readers;
 using NJsonSchema.CodeGeneration.CSharp;
 using NSwag.CodeGeneration.CSharp;
 using NSwag.CodeGeneration.OperationNameGenerators;
@@ -19,11 +18,10 @@ public static EquatableArray<FileWithName> GenerateUsingNSwag(
         CancellationToken cancellationToken = default)
     {
         var yaml = text.GetText(cancellationToken)?.ToString() ?? string.Empty;
+        var openApiDocument = text.GetOpenApiDocument(cancellationToken);
         var openApi = Task.Run(() =>
             OpenApiYamlDocument.FromYamlAsync(yaml, cancellationToken), cancellationToken).Result;
-        var openApiDocument = new OpenApiStringReader().Read(yaml, out _);
-        var schemas = openApiDocument.Components?.Schemas ?? new Dictionary<string, OpenApiSchema>();
-        var prefix = Path.GetFileName(text.Path);
+        var schemas = openApiDocument.Components.Schemas;
         var allAdditionalExcludedTypeNames = schemas.Keys
             .Select(schemaKey => GetAdditionalExcludedTypeNames(schemaKey, schemas))
             .SelectMany(x => x)
@@ -38,14 +36,13 @@ public static EquatableArray<FileWithName> GenerateUsingNSwag(
                 .ToArray();
 
             return new FileWithName(
-                Name: $"{prefix}.Models.{schemaKey}.cs",
+                Name: $"{settings.Namespace}.Models.{schemaKey}.cs",
                 Text: Generate(openApi, settings, excludedTypeNames));
         }));
 
         return files.ToImmutableArray();
     }
 
-
     private static string[] GetAdditionalExcludedTypeNames(
         string key,
         IDictionary<string, OpenApiSchema> schemas)

diff --git a/...enerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.AbuseResponse.g.verified.cs b/...enerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.AbuseResponse.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.AbuseResponse.g.cs
+//
diff --git a/...iGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.AsnResponse.g.verified.cs b/...iGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.AsnResponse.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.AsnResponse.g.cs
+//
diff --git a/...enApiGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.Carrier.g.verified.cs b/...enApiGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.Carrier.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.Carrier.g.cs
+//
diff --git a/...enApiGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.Company.g.verified.cs b/...enApiGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.Company.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.Company.g.cs
+//
diff --git a/...erator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.DomainsResponse.g.verified.cs b/...erator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.DomainsResponse.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.DomainsResponse.g.cs
+//
diff --git a/...OpenApiGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.Error.g.verified.cs b/...OpenApiGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.Error.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.Error.g.cs
+//
diff --git a/...Generator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.FullResponse.g.verified.cs b/...Generator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.FullResponse.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.FullResponse.g.cs
+//
diff --git a/...penApiGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.Prefix.g.verified.cs b/...penApiGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.Prefix.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.Prefix.g.cs
+//
diff --git a/...enApiGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.Prefix6.g.verified.cs b/...enApiGenerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.Prefix6.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.Prefix6.g.cs
+//
diff --git a/...erator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.PrivacyResponse.g.verified.cs b/...erator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.PrivacyResponse.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.PrivacyResponse.g.cs
+//
diff --git a/...nerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.RangesResponse.g.verified.cs b/...nerator.SnapshotTests/Snapshots/YamlWithLocalFile/_#G.Models.RangesResponse.g.verified.cs
@@ -0,0 +1,2 @@
+//HintName: G.Models.RangesResponse.g.cs
+//
diff --git a/...pshots/YamlWithLocalFileUseNSwag/Tests.YamlWithLocalFileUseNSwag_Diagnostics.verified.txt b/...pshots/YamlWithLocalFileUseNSwag/Tests.YamlWithLocalFileUseNSwag_Diagnostics.verified.txt
@@ -0,0 +1 @@
+[]
diff --git a/...api.yaml.Models.AbuseResponse.verified.cs → ...Swag/_#G.Models.AbuseResponse.verified.cs b/...api.yaml.Models.AbuseResponse.verified.cs → ...Swag/_#G.Models.AbuseResponse.verified.cs
@@ -1,4 +1,4 @@
-//HintName: openapi.yaml.Models.AbuseResponse.cs
+//HintName: G.Models.AbuseResponse.cs
 //----------------------
 // <auto-generated>
 //     Generated using the NSwag toolchain v13.20.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
@@ -18,7 +18,7 @@
 #pragma warning disable 8603 // Disable "CS8603 Possible null reference return"
 #pragma warning disable 8604 // Disable "CS8604 Possible null reference argument for parameter"
 
-namespace OpenApiGenerator
+namespace G
 {
     using System = global::System;
 

diff --git a/...enapi.yaml.Models.AsnResponse.verified.cs → ...eNSwag/_#G.Models.AsnResponse.verified.cs b/...enapi.yaml.Models.AsnResponse.verified.cs → ...eNSwag/_#G.Models.AsnResponse.verified.cs
@@ -1,4 +1,4 @@
-//HintName: openapi.yaml.Models.AsnResponse.cs
+//HintName: G.Models.AsnResponse.cs
 //----------------------
 // <auto-generated>
 //     Generated using the NSwag toolchain v13.20.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
@@ -18,7 +18,7 @@
 #pragma warning disable 8603 // Disable "CS8603 Possible null reference return"
 #pragma warning disable 8604 // Disable "CS8604 Possible null reference argument for parameter"
 
-namespace OpenApiGenerator
+namespace G
 {
     using System = global::System;
 

diff --git a/...e#openapi.yaml.Models.Carrier.verified.cs → ...leUseNSwag/_#G.Models.Carrier.verified.cs b/...e#openapi.yaml.Models.Carrier.verified.cs → ...leUseNSwag/_#G.Models.Carrier.verified.cs
@@ -1,4 +1,4 @@
-//HintName: openapi.yaml.Models.Carrier.cs
+//HintName: G.Models.Carrier.cs
 //----------------------
 // <auto-generated>
 //     Generated using the NSwag toolchain v13.20.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
@@ -18,7 +18,7 @@
 #pragma warning disable 8603 // Disable "CS8603 Possible null reference return"
 #pragma warning disable 8604 // Disable "CS8604 Possible null reference argument for parameter"
 
-namespace OpenApiGenerator
+namespace G
 {
     using System = global::System;
 

diff --git a/...e#openapi.yaml.Models.Company.verified.cs → ...leUseNSwag/_#G.Models.Company.verified.cs b/...e#openapi.yaml.Models.Company.verified.cs → ...leUseNSwag/_#G.Models.Company.verified.cs
@@ -1,4 +1,4 @@
-//HintName: openapi.yaml.Models.Company.cs
+//HintName: G.Models.Company.cs
 //----------------------
 // <auto-generated>
 //     Generated using the NSwag toolchain v13.20.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
@@ -18,7 +18,7 @@
 #pragma warning disable 8603 // Disable "CS8603 Possible null reference return"
 #pragma warning disable 8604 // Disable "CS8604 Possible null reference argument for parameter"
 
-namespace OpenApiGenerator
+namespace G
 {
     using System = global::System;
 

diff --git a/...i.yaml.Models.DomainsResponse.verified.cs → ...ag/_#G.Models.DomainsResponse.verified.cs b/...i.yaml.Models.DomainsResponse.verified.cs → ...ag/_#G.Models.DomainsResponse.verified.cs
@@ -1,4 +1,4 @@
-//HintName: openapi.yaml.Models.DomainsResponse.cs
+//HintName: G.Models.DomainsResponse.cs
 //----------------------
 // <auto-generated>
 //     Generated using the NSwag toolchain v13.20.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
@@ -18,7 +18,7 @@
 #pragma warning disable 8603 // Disable "CS8603 Possible null reference return"
 #pragma warning disable 8604 // Disable "CS8604 Possible null reference argument for parameter"
 
-namespace OpenApiGenerator
+namespace G
 {
     using System = global::System;
 

diff --git a/...ile#openapi.yaml.Models.Error.verified.cs → ...FileUseNSwag/_#G.Models.Error.verified.cs b/...ile#openapi.yaml.Models.Error.verified.cs → ...FileUseNSwag/_#G.Models.Error.verified.cs
@@ -1,4 +1,4 @@
-//HintName: openapi.yaml.Models.Error.cs
+//HintName: G.Models.Error.cs
 //----------------------
 // <auto-generated>
 //     Generated using the NSwag toolchain v13.20.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
@@ -18,7 +18,7 @@
 #pragma warning disable 8603 // Disable "CS8603 Possible null reference return"
 #pragma warning disable 8604 // Disable "CS8604 Possible null reference argument for parameter"
 
-namespace OpenApiGenerator
+namespace G
 {
     using System = global::System;
 

diff --git a/...napi.yaml.Models.FullResponse.verified.cs → ...NSwag/_#G.Models.FullResponse.verified.cs b/...napi.yaml.Models.FullResponse.verified.cs → ...NSwag/_#G.Models.FullResponse.verified.cs
@@ -1,4 +1,4 @@
-//HintName: openapi.yaml.Models.FullResponse.cs
+//HintName: G.Models.FullResponse.cs
 //----------------------
 // <auto-generated>
 //     Generated using the NSwag toolchain v13.20.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
@@ -18,7 +18,7 @@
 #pragma warning disable 8603 // Disable "CS8603 Possible null reference return"
 #pragma warning disable 8604 // Disable "CS8604 Possible null reference argument for parameter"
 
-namespace OpenApiGenerator
+namespace G
 {
     using System = global::System;