Merge pull request #423 from gregsdennis/schema/registration-should-a…

…lways-initialize registration with inferred uri should still initialize the schema
gregsdennis · Mar 29, 2023 · ea67872 · ea67872
2 parents 88cfea8 + 012067d
commit ea67872
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 13 deletions.
diff --git a/JsonSchema.Tests/Files/Issue419_config.json b/JsonSchema.Tests/Files/Issue419_config.json
@@ -0,0 +1,7 @@
+{
+  "global": {
+    "timeSpan": {
+      "weekly": true
+    }
+  }
+}
diff --git a/JsonSchema.Tests/Files/Issue419_level1.json b/JsonSchema.Tests/Files/Issue419_level1.json
@@ -0,0 +1,11 @@
+{
+	"$id": "level1.json",
+	"properties": {
+		"timeSpan": {
+			"$ref": "level2.json"
+		}
+	},
+	"required": [
+		"timeSpan"
+	]
+}
diff --git a/JsonSchema.Tests/Files/Issue419_level2.json b/JsonSchema.Tests/Files/Issue419_level2.json
@@ -0,0 +1,11 @@
+{
+	"$id": "level2.json",
+	"required": [
+		"weekly"
+	],
+	"properties": {
+		"weekly": {
+			"type": "boolean"
+		}
+	}
+}
diff --git a/JsonSchema.Tests/Files/Issue419_root.json b/JsonSchema.Tests/Files/Issue419_root.json
@@ -0,0 +1,12 @@
+{
+  "$id": "root.json",
+  "type": "object",
+  "required": [
+    "global"
+  ],
+  "properties": {
+    "global": {
+      "$ref": "level1.json"
+    }
+  }
+}
diff --git a/JsonSchema.Tests/GithubTests.cs b/JsonSchema.Tests/GithubTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
@@ -13,6 +12,17 @@ namespace Json.Schema.Tests;
 
 public class GithubTests
 {
+	private static string GetFile(int issue, string name)
+	{
+		return Path.Combine(TestContext.CurrentContext.WorkDirectory, "Files", $"Issue{issue}_{name}.json")
+			.AdjustForPlatform();
+	}
+
+	private static string GetResource(int issue, string name)
+	{
+		return File.ReadAllText(GetFile(issue, name));
+	}
+
 	[Test]
 	public void Issue18_SomethingNotValidatingRight()
 	{
@@ -517,14 +527,6 @@ public void Evaluate(EvaluationContext context)
 		}
 	}
 
-	private static string GetResource(int issue, string name)
-	{
-		var path = Path.Combine(TestContext.CurrentContext.WorkDirectory, "Files", $"Issue{issue}_{name}.json")
-			.AdjustForPlatform();
-
-		return File.ReadAllText(path);
-	}
-
 	[Test]
 	public void Issue191_SelfReferentialCustomMetaschemaShouldError()
 	{
@@ -764,4 +766,22 @@ public void Issue417_BundleWithItemsFails()
 			.Build();
 		multiItemSchema.Bundle(); // throws
 	}
+
+	[Test]
+	public void Issue419_SecondLevelReferences()
+	{
+		var level2 = JsonSchema.FromFile(GetFile(419, "level2"));
+		SchemaRegistry.Global.Register(level2);
+
+		var level1 = JsonSchema.FromFile(GetFile(419, "level1"));
+		SchemaRegistry.Global.Register(level1);
+
+		var rootSchema = JsonSchema.FromFile(GetFile(419, "root"));
+
+		var config = JsonNode.Parse(GetResource(419, "config"));
+
+		var result = rootSchema.Evaluate(config);
+
+		result.AssertValid();
+	}
 }
diff --git a/JsonSchema/JsonSchema.csproj b/JsonSchema/JsonSchema.csproj
@@ -12,8 +12,8 @@
 		<PackageProjectUrl>https://github.com/gregsdennis/json-everything</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/gregsdennis/json-everything</RepositoryUrl>
 		<PackageTags>json-schema validation schema json</PackageTags>
-		<Version>4.0.1</Version>
-		<FileVersion>4.0.1.0</FileVersion>
+		<Version>4.0.2</Version>
+		<FileVersion>4.0.2.0</FileVersion>
 		<AssemblyVersion>4.0.0.0</AssemblyVersion>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<AssemblyName>JsonSchema.Net</AssemblyName>

diff --git a/JsonSchema/SchemaRegistry.cs b/JsonSchema/SchemaRegistry.cs
@@ -73,7 +73,7 @@ internal void InitializeMetaSchemas()
 	/// <param name="document">The schema.</param>
 	public void Register(IBaseDocument document)
 	{
-		RegisterSchema(document.BaseUri, document);
+		Register(document.BaseUri, document);
 	}
 
 	/// <summary>

diff --git a/json-everything.net/wwwroot/md/release-notes/json-logic.md b/json-everything.net/wwwroot/md/release-notes/json-logic.md
@@ -1,4 +1,4 @@
-# [4.0.3](https://github.com/gregsdennis/json-everything/pull/422) {#release-logic-4.0.3}
+# [4.0.4](https://github.com/gregsdennis/json-everything/pull/422) {#release-logic-4.0.4}
 
 [#420](https://github.com/gregsdennis/json-everything/issues/404) - `<=` not working for the "between" case.  Thanks to [@alexkharuk](https://github.com/alexkharuk) for finding and fixing this issue.
 

diff --git a/json-everything.net/wwwroot/md/release-notes/json-schema.md b/json-everything.net/wwwroot/md/release-notes/json-schema.md
@@ -1,3 +1,7 @@
+# [4.0.2](https://github.com/gregsdennis/json-everything/pull/423) {#release-schema-4.0.2}
+
+[#419](https://github.com/gregsdennis/json-everything/issues/419) - Fixed an issue with schema registration and populating IDs.  Thanks to [@lennver](https://github.com/lennver) for providing reproduction for this issue.
+
 # [4.0.1](https://github.com/gregsdennis/json-everything/pull/418) {#release-schema-4.0.1}
 
 - Add `IIdKeyword` to potentially support using an ID keyword other than `$id` (foot gun, generally, please don't use)