Fix unevaluatedProperties edge case bug

Author: jdesrosiers

lib/keywords/unevaluatedItems.js

@@ -33,14 +33,16 @@ const interpret = (unevaluatedItems, instance, context) => {
 const simpleApplicator = true;
 
 const plugin = {
-  beforeSchema(_url, _instance, context) {
+  beforeSchema(_url, instance, context) {
     context.evaluatedItems ??= new Set();
     context.schemaEvaluatedItems = new Set();
+    context.instanceLocation ??= Instance.uri(instance);
   },
 
-  beforeKeyword(_node, _instance, context, schemaContext) {
+  beforeKeyword(_node, instance, context, schemaContext) {
     context.evaluatedItems = new Set();
     context.schemaEvaluatedItems = schemaContext.schemaEvaluatedItems;
+    context.instanceLocation = Instance.uri(instance);
   },
 
   afterKeyword(_node, _instance, context, _valid, schemaContext) {
@@ -49,8 +51,8 @@ const plugin = {
     }
   },
 
-  afterSchema(_node, _instance, context, valid) {
-    if (valid) {
+  afterSchema(_node, instance, context, valid) {
+    if (valid && Instance.uri(instance) === context.instanceLocation) {
       for (const property of context.schemaEvaluatedItems) {
         context.evaluatedItems.add(property);
       }

lib/keywords/unevaluatedProperties.js

@@ -33,14 +33,16 @@ const interpret = (unevaluatedProperties, instance, context) => {
 const simpleApplicator = true;
 
 const plugin = {
-  beforeSchema(_url, _instance, context) {
+  beforeSchema(_url, instance, context) {
     context.evaluatedProperties ??= new Set();
     context.schemaEvaluatedProperties = new Set();
+    context.instanceLocation ??= Instance.uri(instance);
   },
 
-  beforeKeyword(_node, _instance, context, schemaContext) {
+  beforeKeyword(_node, instance, context, schemaContext) {
     context.evaluatedProperties = new Set();
     context.schemaEvaluatedProperties = schemaContext.schemaEvaluatedProperties;
+    context.instanceLocation = Instance.uri(instance);
   },
 
   afterKeyword(_node, _instance, context, _valid, schemaContext) {
@@ -49,8 +51,8 @@ const plugin = {
     }
   },
 
-  afterSchema(_node, _instance, context, valid) {
-    if (valid) {
+  afterSchema(_node, instance, context, valid) {
+    if (valid && Instance.uri(instance) === context.instanceLocation) {
       for (const property of context.schemaEvaluatedProperties) {
         context.evaluatedProperties.add(property);
       }