Refactor duplicate metaschema dependencies

Solutions/Corvus.Json.CodeGeneration.201909/Corvus.Json.CodeGeneration.201909.csproj

@@ -34,6 +34,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Corvus.Json.CodeGeneration\Corvus.Json.CodeGeneration.csproj" />
+    <ProjectReference Include="..\Corvus.Json.JsonSchema.Draft201909\Corvus.Json.JsonSchema.Draft201909.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Solutions/Corvus.Json.CodeGeneration.202012/Corvus.Json.CodeGeneration.202012.csproj

@@ -34,6 +34,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Corvus.Json.CodeGeneration\Corvus.Json.CodeGeneration.csproj" />
+    <ProjectReference Include="..\Corvus.Json.JsonSchema.Draft202012\Corvus.Json.JsonSchema.Draft202012.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Solutions/Corvus.Json.CodeGeneration.4/Corvus.Json.CodeGeneration.4.csproj

@@ -34,6 +34,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Corvus.Json.CodeGeneration\Corvus.Json.CodeGeneration.csproj" />
+    <ProjectReference Include="..\Corvus.Json.JsonSchema.Draft4\Corvus.Json.JsonSchema.Draft4.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Solutions/Corvus.Json.CodeGeneration.6/Corvus.Json.CodeGeneration.6.csproj

@@ -34,6 +34,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Corvus.Json.CodeGeneration\Corvus.Json.CodeGeneration.csproj" />
+    <ProjectReference Include="..\Corvus.Json.JsonSchema.Draft6\Corvus.Json.JsonSchema.Draft6.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Solutions/Corvus.Json.CodeGeneration.7/Corvus.Json.CodeGeneration.7.csproj

@@ -34,6 +34,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Corvus.Json.CodeGeneration\Corvus.Json.CodeGeneration.csproj" />
+    <ProjectReference Include="..\Corvus.Json.JsonSchema.Draft7\Corvus.Json.JsonSchema.Draft7.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Solutions/Corvus.Json.CodeGeneration.CSharp.QuickStart/Corvus.Json.CodeGeneration.CSharp.QuickStart.csproj

@@ -44,8 +44,6 @@
     <ProjectReference Include="..\Corvus.Json.CodeGeneration.CSharp\Corvus.Json.CodeGeneration.CSharp.csproj" />
     <ProjectReference Include="..\Corvus.Json.CodeGeneration.HttpClientDocumentResolver\Corvus.Json.CodeGeneration.HttpClientDocumentResolver.csproj" />
     <ProjectReference Include="..\Corvus.Json.CodeGeneration.OpenApi30\Corvus.Json.CodeGeneration.OpenApi30.csproj" />
-    <ProjectReference Include="..\Corvus.Json.CodeGeneration\Corvus.Json.CodeGeneration.csproj" />
-    <ProjectReference Include="..\Corvus.Json.ExtendedTypes\Corvus.Json.ExtendedTypes.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -77,9 +75,6 @@
     <EmbeddedResource Include="metaschema\draft2020-12\meta\unevaluated.json" />
     <EmbeddedResource Include="metaschema\draft2020-12\meta\validation.json" />
     <EmbeddedResource Include="metaschema\draft2020-12\schema.json" />
-    <EmbeddedResource Include="metaschema\draft4\schema.json" />
-    <EmbeddedResource Include="metaschema\draft6\schema.json" />
-    <EmbeddedResource Include="metaschema\draft7\schema.json" />
   </ItemGroup>
 
 </Project>

Solutions/Corvus.Json.CodeGeneration.CSharp.QuickStart/Corvus.Json.CodeGeneration.CSharp.QuickStart/CSharpGenerator.cs

@@ -110,9 +110,13 @@ public async ValueTask<IReadOnlyCollection<GeneratedCodeFile>> GenerateFilesAsyn
 
     private static PrepopulatedDocumentResolver CreateMetaschemaDocumentResolver()
     {
-        var result = new PrepopulatedDocumentResolver();
-        result.AddMetaschema();
-        return result;
+        PrepopulatedDocumentResolver documentResolver = new();
+
+        // Add support for the meta schemas we are interested in.
+        documentResolver.AddDocument(JsonSchema.Draft4.MetaSchema.Instance);
+        documentResolver.AddMetaschema();
+
+        return documentResolver;
     }
 
     private static VocabularyRegistry RegisterVocabularies(IDocumentResolver documentResolver)
@@ -136,8 +140,6 @@ private static VocabularyRegistry RegisterVocabularies(IDocumentResolver documen
 
     private static CompoundDocumentResolver CompoundWithMetaschemaResolver(IDocumentResolver metaschemaDocumentResolver, IDocumentResolver additionalResolver)
     {
-        return new(
-            additionalResolver,
-            metaschemaDocumentResolver);
+        return new(additionalResolver, metaschemaDocumentResolver);
     }
 }

Solutions/Corvus.Json.CodeGeneration.CSharp.QuickStart/Corvus.Json.CodeGeneration.CSharp.QuickStart/Metaschema.cs

@@ -16,18 +16,14 @@ internal static class Metaschema
     /// <summary>
     /// Add the standard metaschema to the document resolver.
     /// </summary>
-    /// <param name="documentResolver">The document resovler to which to apply the metaschema.</param>
+    /// <param name="documentResolver">The document resolver to which to apply the metaschema.</param>
     /// <returns>A reference to the <see cref="IDocumentResolver"/> after the operation has completed.</returns>
     internal static IDocumentResolver AddMetaschema(this IDocumentResolver documentResolver)
     {
         var assembly = Assembly.GetAssembly(typeof(Metaschema));
 
         Debug.Assert(assembly is not null, "The assembly containing this type must exist");
 
-        documentResolver.AddDocument(
-            "http://json-schema.org/draft-04/schema",
-            JsonDocument.Parse(ReadResource(assembly, "metaschema.draft4.schema.json")));
-
         documentResolver.AddDocument(
             "http://json-schema.org/draft-06/schema",
             JsonDocument.Parse(ReadResource(assembly, "metaschema.draft6.schema.json")));

Solutions/Corvus.Json.CodeGeneration.CorvusVocabulary/Corvus.Json.CodeGeneration.CorvusVocabulary.csproj

@@ -33,6 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Corvus.Json.CodeGeneration.202012\Corvus.Json.CodeGeneration.202012.csproj" />
     <ProjectReference Include="..\Corvus.Json.CodeGeneration\Corvus.Json.CodeGeneration.csproj" />
   </ItemGroup>
 

Solutions/Corvus.Json.CodeGeneration.HttpClientDocumentResolver/Corvus.Json.CodeGeneration.DocumentResolvers/HttpClientDocumentResolver.cs

@@ -72,6 +72,10 @@ public bool AddDocument(string uri, JsonDocument document)
         return this.documents.TryAdd(uri, document);
     }
 
+    /// <inheritdoc/>
+    public bool AddDocument(IMetaSchema metaSchema)
+        => this.AddDocument(metaSchema.Uri, metaSchema.Document);
+
     /// <inheritdoc/>
     public async ValueTask<JsonElement?> TryResolve(JsonReference reference)
     {

Solutions/Corvus.Json.CodeGeneration.OpenApi30/Corvus.Json.CodeGeneration.OpenApi30.csproj

@@ -34,6 +34,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Corvus.Json.CodeGeneration\Corvus.Json.CodeGeneration.csproj" />
+    <ProjectReference Include="..\Corvus.Json.JsonSchema.OpenApi30\Corvus.Json.JsonSchema.OpenApi30.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Solutions/Corvus.Json.CodeGeneration.OpenApi31/Corvus.Json.CodeGeneration.OpenApi31.csproj

@@ -35,6 +35,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Corvus.Json.CodeGeneration.202012\Corvus.Json.CodeGeneration.202012.csproj" />
     <ProjectReference Include="..\Corvus.Json.CodeGeneration\Corvus.Json.CodeGeneration.csproj" />
+    <ProjectReference Include="..\Corvus.Json.JsonSchema.OpenApi31\Corvus.Json.JsonSchema.OpenApi31.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Solutions/Corvus.Json.CodeGeneration/Corvus.Json.CodeGeneration/DocumentResolvers/CallbackDocumentResolver.cs

@@ -2,6 +2,7 @@
 // Copyright (c) Endjin Limited. All rights reserved.
 // </copyright>
 
+using System;
 using System.Text.Json;
 
 namespace Corvus.Json.CodeGeneration.DocumentResolvers;
@@ -29,6 +30,10 @@ public bool AddDocument(string uri, JsonDocument document)
         return this.resolver.AddDocument(uri, document);
     }
 
+    /// <inheritdoc/>
+    public bool AddDocument(IMetaSchema metaSchema)
+        => this.AddDocument(metaSchema.Uri, metaSchema.Document);
+
     /// <inheritdoc/>
     public void Dispose()
     {

Solutions/Corvus.Json.CodeGeneration/Corvus.Json.CodeGeneration/DocumentResolvers/CompoundDocumentResolver.cs

@@ -2,6 +2,7 @@
 // Copyright (c) Endjin Limited. All rights reserved.
 // </copyright>
 
+using System;
 using System.Text.Json;
 
 namespace Corvus.Json.CodeGeneration;
@@ -32,6 +33,10 @@ public bool AddDocument(string uri, JsonDocument document)
         return this.documents.TryAdd(uri, document);
     }
 
+    /// <inheritdoc/>
+    public bool AddDocument(IMetaSchema metaSchema)
+        => this.AddDocument(metaSchema.Uri, metaSchema.Document);
+
     /// <inheritdoc/>
     public async ValueTask<JsonElement?> TryResolve(JsonReference reference)
     {

Solutions/Corvus.Json.CodeGeneration/Corvus.Json.CodeGeneration/DocumentResolvers/FileSystemDocumentResolver.cs

@@ -74,6 +74,10 @@ public bool AddDocument(string uri, JsonDocument document)
         return this.documents.TryAdd(uri, document);
     }
 
+    /// <inheritdoc/>
+    public bool AddDocument(IMetaSchema metaSchema)
+        => this.AddDocument(metaSchema.Uri, metaSchema.Document);
+
     /// <inheritdoc/>
     public async ValueTask<JsonElement?> TryResolve(JsonReference reference)
     {

Solutions/Corvus.Json.CodeGeneration/Corvus.Json.CodeGeneration/DocumentResolvers/IDocumentResolver.cs

@@ -28,6 +28,13 @@ public interface IDocumentResolver : IDisposable
     /// <returns><c>True</c> if the document was added, otherwise false.</returns>
     bool AddDocument(string uri, JsonDocument document);
 
+    /// <summary>
+    /// Adds an existing document to the cache.
+    /// </summary>
+    /// <param name="metaSchema">The <see cref="IMetaSchema"/> document to add.</param>
+    /// <returns><c>True</c> if the document was added, otherwise false.</returns>
+    bool AddDocument(IMetaSchema metaSchema);
+
     /// <summary>
     /// Reset the document resolver.
     /// </summary>

Solutions/Corvus.Json.CodeGeneration/Corvus.Json.CodeGeneration/DocumentResolvers/PrepopulatedDocumentResolver.cs

@@ -2,6 +2,7 @@
 // Copyright (c) Endjin Limited. All rights reserved.
 // </copyright>
 
+using System;
 using System.Text.Json;
 
 namespace Corvus.Json;
@@ -31,6 +32,10 @@ public bool AddDocument(string uri, JsonDocument document)
 #endif
     }
 
+    /// <inheritdoc/>
+    public bool AddDocument(IMetaSchema metaSchema)
+        => this.AddDocument(metaSchema.Uri, metaSchema.Document);
+
     /// <inheritdoc/>
     public ValueTask<JsonElement?> TryResolve(JsonReference reference)
     {