Merge pull request #330 from gregsdennis/schema/absolute-schema-locat…

…ion-fix fix absolute schema location in output
json-everything · Sep 4, 2022 · 7e1d8f5 · 7e1d8f5
2 parents 59579ab + 8ff18d0
commit 7e1d8f5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/JsonSchema/DynamicRefKeyword.cs b/JsonSchema/DynamicRefKeyword.cs
@@ -121,7 +121,7 @@ public void Validate(ValidationContext context)
 		}
 
 		context.NavigatedReferences.Add(navigation);
-		context.Push(newUri: newUri);
+		context.Push(newUri: schema.BaseUri ?? newUri);
 		schema.ValidateSubschema(context);
 		var result = context.LocalResult.IsValid;
 		context.Pop();

diff --git a/JsonSchema/JsonSchema.cs b/JsonSchema/JsonSchema.cs
@@ -158,6 +158,7 @@ public void RegisterSubschemas(SchemaRegistry registry, Uri currentUri)
 		var refKeyword = Keywords.OfType<RefKeyword>().SingleOrDefault();
 		var refMatters = refKeyword != null &&
 						 (registry.ValidatingAs == Draft.Draft6 || registry.ValidatingAs == Draft.Draft7);
+		UpdateBaseUri(currentUri);
 		if (idKeyword != null && !refMatters)
 		{
 			currentUri = idKeyword.UpdateUri(currentUri);

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>3.2.0</Version>
-		<FileVersion>3.2.0.0</FileVersion>
+		<Version>3.2.1</Version>
+		<FileVersion>3.2.1.0</FileVersion>
 		<AssemblyVersion>3.0.0.0</AssemblyVersion>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<AssemblyName>JsonSchema.Net</AssemblyName>

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 @@
+# [3.2.1](https://github.com/gregsdennis/json-everything/pull/330)
+
+Fixed absolute schema location in output.  The JSON Schema team identified some edge cases involving `$dynamicRef` where the wrong URI was reported.
+
 # [3.2.0](https://github.com/gregsdennis/json-everything/pull/300)
 
 Added `JsonSchemaBuilderExtensions.PatternProperties()` overloads that take strings in place of `Regex`es.  There is no syntax highlighting support for these overloads, however.