generate schemas from v3 specs

Author: Fresa

src/OpenAPI.WebApiGenerator/ApiGenerator.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text.Json;
 using Corvus.Json;
-using Corvus.Json.SourceGeneratorTools;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.OpenApi;
@@ -31,35 +29,21 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
         var openapiDocumentProvider = provider.Select((array, _) => array.First());
 
-        // Get global options
-        var globalOptions =
-            context.AnalyzerConfigOptionsProvider.Select((optionsProvider, token) =>
-                new SourceGeneratorHelpers.GlobalOptions(
-                    fallbackVocabulary: Corvus.Json.CodeGeneration.Draft4.VocabularyAnalyser.DefaultVocabulary,
-                    optionalAsNullable: true,
-                    useOptionalNameHeuristics: true,
-                    alwaysAssertFormat: true,
-                    ImmutableArray<string>.Empty));
-
-        var openApiProvider = globalOptions
-            .Combine(openapiDocumentProvider)
+        var openApiProvider = openapiDocumentProvider
             .Combine(context.CompilationProvider)
             .Select((tuple, _) => (
-                Options: tuple.Left.Left,
-                OpenApiDocument: tuple.Left.Right,
+                OpenApiDocument: tuple.Left,
                 Compilation: tuple.Right
             ));
 
         context.RegisterSourceOutput(openApiProvider,
-            WithExceptionReporting<(SourceGeneratorHelpers.GlobalOptions, AdditionalText, Compilation)>(GenerateCode));
+            WithExceptionReporting<(AdditionalText, Compilation)>(GenerateCode));
     }
 
     private static void GenerateCode(SourceProductionContext context, (
-        SourceGeneratorHelpers.GlobalOptions Options, 
         AdditionalText OpenApiDocument, 
         Compilation Compilation) generatorContext)
     {
-        var globalOptions = generatorContext.Options;
         var compilation = generatorContext.Compilation;
         var rootNamespace = compilation.Assembly.Name;
 
@@ -82,18 +66,19 @@ private static void GenerateCode(SourceProductionContext context, (
                       throw new InvalidOperationException(
                           $"Could not load OpenAPI document {openApiDocumentFile.Path}");
 
+        
         var openApiUri = new JsonReference(openApi.BaseUri.ToString());
         var documentResolver = new PrepopulatedDocumentResolver();
         var openApiDocument = JsonDocument.Parse(generatorContext.OpenApiDocument.AsStream());
         if (!documentResolver.AddDocument(openApiUri, openApiDocument))
         {
             throw new InvalidOperationException("Could not add OpenApi document");
         }
-        var generationContext = new SourceGeneratorHelpers.GenerationContext(documentResolver, globalOptions);
-        var schemaGenerator = new SchemaGenerator(
-            rootNamespace,
-            context,
-            generationContext);
+        var schemaGenerator = SchemaGenerator.For(
+            openApiVersion,
+            documentResolver, 
+            rootNamespace, 
+            context);
 
         var openApiReference = new OpenApiReference<OpenApiDocument>(openApi, openApiDocument, openApiUri);
         var openApiVisitor = OpenApiVisitor.V(openApiVersion, openApiReference);

src/OpenAPI.WebApiGenerator/CodeGeneration/SchemaGenerator.cs

@@ -1,25 +1,55 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
 using Corvus.Json;
 using Corvus.Json.CodeGeneration;
 using Corvus.Json.CodeGeneration.CSharp;
 using Corvus.Json.SourceGeneratorTools;
 using Microsoft.CodeAnalysis;
+using Microsoft.OpenApi;
 using OpenAPI.WebApiGenerator.OpenApi;
 using JsonPointer = OpenAPI.WebApiGenerator.Json.JsonPointer;
 
 namespace OpenAPI.WebApiGenerator.CodeGeneration;
 
-internal sealed class SchemaGenerator(string rootNamespace,
+internal sealed class SchemaGenerator(
+    string rootNamespace,
     SourceProductionContext context,
     SourceGeneratorHelpers.GenerationContext generationContext)
 {
     private static readonly IDocumentResolver MetaSchemaResolver = SourceGeneratorHelpers.CreateMetaSchemaResolver();
     private static readonly VocabularyRegistry VocabularyRegistry = SourceGeneratorHelpers.CreateVocabularyRegistry(MetaSchemaResolver);
     private readonly Dictionary<string, TypeDeclaration> _typeCache = new();
     private readonly HashSet<string> _fileCache = [];
+
+    internal static SchemaGenerator For(
+        OpenApiSpecVersion openApiSpecVersion,
+        IDocumentResolver documentResolver,
+        string rootNamespace,
+        SourceProductionContext context)
+    {
+        var vocabulary = openApiSpecVersion switch
+        {
+            OpenApiSpecVersion.OpenApi2_0 =>
+                Corvus.Json.CodeGeneration.Draft4.VocabularyAnalyser.DefaultVocabulary,
+            OpenApiSpecVersion.OpenApi3_0 => 
+                Corvus.Json.CodeGeneration.OpenApi30.VocabularyAnalyser.DefaultVocabulary,
+            OpenApiSpecVersion.OpenApi3_1 =>
+                Corvus.Json.CodeGeneration.Draft202012.VocabularyAnalyser.DefaultVocabulary,
+            _ => throw new InvalidOperationException($"OpenAPI specification {openApiSpecVersion} is not supported")
+        };
+        var globalOptions =
+            new SourceGeneratorHelpers.GlobalOptions(
+                fallbackVocabulary: vocabulary,
+                optionalAsNullable: true,
+                useOptionalNameHeuristics: true,
+                alwaysAssertFormat: true,
+                ImmutableArray<string>.Empty);
+        var generationContext = new SourceGeneratorHelpers.GenerationContext(documentResolver, globalOptions);
+        return new SchemaGenerator(rootNamespace, context, generationContext);
+    }
 
     internal TypeDeclaration Generate(JsonReference reference)
     {

src/OpenAPI.WebApiGenerator/OpenAPI.WebApiGenerator.csproj

@@ -52,7 +52,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" PrivateAssets="all" GeneratePathProperty="true" />
-        <PackageReference Include="Corvus.Json.SourceGeneratorTools" Version="4.4.2" PrivateAssets="all" GeneratePathProperty="true" />
+        <PackageReference Include="Corvus.Json.SourceGeneratorTools" Version="4.4.3" PrivateAssets="all" GeneratePathProperty="true" />
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>