fix: enhance unevaluatedProperties handling for composite rules (#28)

Author: vadyvas

lib/vocabularies/unevaluated/unevaluatedProperties.ts

@@ -47,14 +47,16 @@ const def: CodeKeywordDefinition = {
             : gen.if(unevaluatedStatic(props, key), () => unevaluatedPropCode(key))
         )
 
-      if (isForced && it.errorPath.emptyStr()) {
+      if (isForced && it.errorPath.emptyStr() && !it.compositeRule) {
         // $refs are compiled into functions
         // We need to check in runtime if function was called from allOf.
         // We need to check only on the top level of the function:
         // it is ensured with `it.errorPath.emptyStr()` check
         gen.if(_`${N.isAllOfVariant} === 0`, staticCheck)
       } else {
-        staticCheck()
+        if (!it.compositeRule || cxt.schema !== undefined) {
+          staticCheck()
+        }
       }
     }
 

spec/default_unevaluated_properties.spec.ts

@@ -191,6 +191,75 @@ describe("defaultUnevaluatedProperties=false option", function () {
       assertInvalid(schemas, {foo: {baz: 1}})
       assertInvalid(schemas, {foo: {bar: "string", baz: 1}})
     })
+
+    it("should work correctly with anyOf", () => {
+      const schema1 = {
+        type: "object",
+        properties: {
+          address: {type: "string"},
+        },
+        anyOf: [
+          {
+            type: "object",
+            required: ["firstName", "lastName"],
+            properties: {
+              firstName: {type: "string"},
+              lastName: {type: "string"},
+            },
+          },
+          {
+            type: "object",
+            required: ["name"],
+            properties: {
+              name: {type: "string"},
+            },
+          },
+        ],
+      }
+
+      const schemas = [schema1]
+      assertInvalid(schemas, {})
+      assertValid(schemas, {address: "someWhere", firstName: "John", lastName: "Doe"})
+      assertValid(schemas, {address: "someWhere", name: "John Doe"})
+      assertInvalid(schemas, {address: "someWhere", firstName: "John"})
+      assertInvalid(schemas, {address: "someWhere", foo: 1})
+      assertValid(schemas, {firstName: "John", lastName: "Doe"})
+    })
+
+    it("should work correctly with oneOf", () => {
+      const schema1 = {
+        type: "object",
+        properties: {
+          address: {type: "string"},
+        },
+        oneOf: [
+          {
+            type: "object",
+            required: ["firstName", "lastName"],
+            properties: {
+              firstName: {type: "string"},
+              lastName: {type: "string"},
+            },
+          },
+          {
+            type: "object",
+            required: ["name"],
+            properties: {
+              name: {type: "string"},
+            },
+          },
+        ],
+      }
+
+      const schemas = [schema1]
+
+      assertInvalid(schemas, {})
+      assertValid(schemas, {address: "someWhere", firstName: "John", lastName: "Doe"})
+      assertValid(schemas, {address: "someWhere", name: "John Doe"})
+      assertInvalid(schemas, {firstName: "John", lastName: "Doe", name: "JD"})
+      assertInvalid(schemas, {address: "someWhere", foo: 1})
+      assertValid(schemas, {firstName: "John", lastName: "Doe"})
+    })
   })
 
   describe("validation with $refs", () => {