Perform better schema checks in Draft 4 compiler (#765)

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Jun 7, 2024 · 1175a47 · 1175a47
1 parent 0ae8f1b
commit 1175a47
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/jsonschema/default_compiler_draft4.h b/src/jsonschema/default_compiler_draft4.h
@@ -408,7 +408,7 @@ auto compiler_draft4_applicator_not(const SchemaCompilerContext &context)
 auto compiler_draft4_applicator_items(const SchemaCompilerContext &context)
     -> SchemaCompilerTemplate {
   const auto subcontext{applicate(context)};
-  if (context.value.is_object()) {
+  if (is_schema(context.value)) {
     return {make<SchemaCompilerLoopItems>(
         context, SchemaCompilerValueUnsignedInteger{0},
         compile(subcontext, empty_pointer, empty_pointer),
@@ -480,16 +480,18 @@ auto compiler_draft4_applicator_dependencies(
   const auto subcontext{applicate(context)};
 
   for (const auto &entry : context.value.as_object()) {
-    if (entry.second.is_object()) {
-      children.push_back(make<SchemaCompilerInternalContainer>(
-          subcontext, SchemaCompilerValueNone{},
-          compile(subcontext, {entry.first}, empty_pointer),
-
-          // TODO: As an optimization, avoid this condition if the subschema
-          // declares `required` and includes the given key
-          {make<SchemaCompilerAssertionDefines>(
-              subcontext, entry.first, {},
-              SchemaCompilerTargetType::Instance)}));
+    if (is_schema(entry.second)) {
+      if (!entry.second.is_boolean() || !entry.second.to_boolean()) {
+        children.push_back(make<SchemaCompilerInternalContainer>(
+            subcontext, SchemaCompilerValueNone{},
+            compile(subcontext, {entry.first}, empty_pointer),
+
+            // TODO: As an optimization, avoid this condition if the subschema
+            // declares `required` and includes the given key
+            {make<SchemaCompilerAssertionDefines>(
+                subcontext, entry.first, {},
+                SchemaCompilerTargetType::Instance)}));
+      }
     } else if (entry.second.is_array()) {
       std::set<JSON::String> properties;
       for (const auto &property : entry.second.as_array()) {