Implement a new AnnotationWhenArraySizeGreater compiler step

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Sep 2, 2024 · bb2eb0d · bb2eb0d
1 parent 446c8a5
commit bb2eb0d
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 36 deletions.
diff --git a/src/jsonschema/compile_describe.cc b/src/jsonschema/compile_describe.cc
@@ -491,6 +491,30 @@ struct DescribeVisitor {
     return unknown();
   }
 
+  auto operator()(const SchemaCompilerAnnotationWhenArraySizeGreater &) const
+      -> std::string {
+    if ((this->keyword == "prefixItems" || this->keyword == "items") &&
+        this->annotation.is_integer()) {
+      assert(this->target.is_array());
+      assert(this->annotation.is_positive());
+      std::ostringstream message;
+      if (this->annotation.to_integer() == 0) {
+        message << "The first item of the array value successfully validated "
+                   "against the first "
+                   "positional subschema";
+      } else {
+        message << "The first " << this->annotation.to_integer() + 1
+                << " items of the array value successfully validated against "
+                   "the given "
+                   "positional subschemas";
+      }
+
+      return message.str();
+    }
+
+    return unknown();
+  }
+
   auto
   operator()(const SchemaCompilerAnnotationToParent &) const -> std::string {
     if (this->keyword == "unevaluatedItems" && this->annotation.is_boolean() &&
@@ -1578,10 +1602,6 @@ struct DescribeVisitor {
     return unknown();
   }
   auto
-  operator()(const SchemaCompilerAssertionSizeEqual &) const -> std::string {
-    return unknown();
-  }
-  auto
   operator()(const SchemaCompilerLoopPropertiesRegex &) const -> std::string {
     return unknown();
   }

diff --git a/src/jsonschema/compile_evaluate.cc b/src/jsonschema/compile_evaluate.cc
@@ -507,18 +507,6 @@ auto evaluate_step(
     result = (target.is_array() || target.is_object() || target.is_string()) &&
              (target.size() < assertion.value);
     CALLBACK_POST("SchemaCompilerAssertionSizeLess", assertion);
-  } else if (std::holds_alternative<SchemaCompilerAssertionSizeEqual>(step)) {
-    SOURCEMETA_TRACE_START(trace_id, "SchemaCompilerAssertionSizeEqual");
-    const auto &assertion{std::get<SchemaCompilerAssertionSizeEqual>(step)};
-    context.push(assertion);
-    // TODO: Get rid of this
-    EVALUATE_CONDITION_GUARD("SchemaCompilerAssertionSizeEqual", assertion,
-                             instance);
-    CALLBACK_PRE(assertion, context.instance_location());
-    const auto &target{context.resolve_target(instance)};
-    result = (target.is_array() || target.is_object() || target.is_string()) &&
-             (target.size() == assertion.value);
-    CALLBACK_POST("SchemaCompilerAssertionSizeEqual", assertion);
   } else if (std::holds_alternative<SchemaCompilerAssertionEqual>(step)) {
     SOURCEMETA_TRACE_START(trace_id, "SchemaCompilerAssertionEqual");
     const auto &assertion{std::get<SchemaCompilerAssertionEqual>(step)};
@@ -909,9 +897,6 @@ auto evaluate_step(
     SOURCEMETA_TRACE_START(trace_id, "SchemaCompilerAnnotationEmit");
     const auto &annotation{std::get<SchemaCompilerAnnotationEmit>(step)};
     context.push(annotation);
-    // TODO: Get rid of this
-    EVALUATE_CONDITION_GUARD("SchemaCompilerAnnotationEmit", annotation,
-                             instance);
     // Annotations never fail
     result = true;
     const auto &current_instance_location{context.instance_location()};
@@ -942,6 +927,27 @@ auto evaluate_step(
     SOURCEMETA_TRACE_END(trace_id,
                          "SchemaCompilerAnnotationWhenArraySizeEqual");
     return result;
+  } else if (std::holds_alternative<
+                 SchemaCompilerAnnotationWhenArraySizeGreater>(step)) {
+    SOURCEMETA_TRACE_START(trace_id,
+                           "SchemaCompilerAnnotationWhenArraySizeGreater");
+    const auto &annotation{
+        std::get<SchemaCompilerAnnotationWhenArraySizeGreater>(step)};
+    context.push(annotation);
+    const auto &target{context.resolve_target(instance)};
+    EVALUATE_IMPLICIT_PRECONDITION(
+        "SchemaCompilerAnnotationWhenArraySizeGreater", annotation,
+        target.is_array() && target.size() > annotation.value.first);
+    // Annotations never fail
+    result = true;
+    const auto &current_instance_location{context.instance_location()};
+    const auto value{
+        context.annotate(current_instance_location, annotation.value.second)};
+    CALLBACK_ANNOTATION(value, annotation, current_instance_location);
+    context.pop(annotation);
+    SOURCEMETA_TRACE_END(trace_id,
+                         "SchemaCompilerAnnotationWhenArraySizeGreater");
+    return result;
   } else if (std::holds_alternative<SchemaCompilerAnnotationToParent>(step)) {
     SOURCEMETA_TRACE_START(trace_id, "SchemaCompilerAnnotationToParent");
     const auto &annotation{std::get<SchemaCompilerAnnotationToParent>(step)};

diff --git a/src/jsonschema/compile_json.cc b/src/jsonschema/compile_json.cc
@@ -217,10 +217,11 @@ struct StepVisitor {
   HANDLE_STEP("assertion", "divisible", SchemaCompilerAssertionDivisible)
   HANDLE_STEP("assertion", "string-type", SchemaCompilerAssertionStringType)
   HANDLE_STEP("assertion", "equals-any", SchemaCompilerAssertionEqualsAny)
-  HANDLE_STEP("assertion", "size-equal", SchemaCompilerAssertionSizeEqual)
   HANDLE_STEP("annotation", "emit", SchemaCompilerAnnotationEmit)
   HANDLE_STEP("annotation", "when-array-size-equal",
               SchemaCompilerAnnotationWhenArraySizeEqual)
+  HANDLE_STEP("annotation", "when-array-size-greater",
+              SchemaCompilerAnnotationWhenArraySizeGreater)
   HANDLE_STEP("annotation", "to-parent", SchemaCompilerAnnotationToParent)
   HANDLE_STEP("annotation", "basename-to-parent",
               SchemaCompilerAnnotationBasenameToParent)

diff --git a/src/jsonschema/default_compiler_draft4.h b/src/jsonschema/default_compiler_draft4.h
@@ -633,12 +633,11 @@ auto compiler_draft4_applicator_items_array(
             true, context, schema_context, relative_dynamic_context,
             SchemaCompilerValueIndexedJSON{cursor, JSON{true}},
             SchemaCompilerTemplate{}));
-        subchildren.push_back(make<SchemaCompilerAnnotationEmit>(
-            true, context, schema_context, relative_dynamic_context,
-            JSON{cursor - 1},
-            {make<SchemaCompilerAssertionSizeGreater>(
+        subchildren.push_back(
+            make<SchemaCompilerAnnotationWhenArraySizeGreater>(
                 true, context, schema_context, relative_dynamic_context,
-                SchemaCompilerValueUnsignedInteger{cursor}, {})}));
+                SchemaCompilerValueIndexedJSON{cursor, JSON{cursor - 1}},
+                SchemaCompilerTemplate{}));
       }
 
       children.push_back(make<SchemaCompilerLogicalWhenArraySizeGreater>(
@@ -659,8 +658,6 @@ auto compiler_draft4_applicator_items_array(
     }
   }
 
-  // TODO: Eventually make this a LogicalAnd, as there
-  // will be array checks in all the substeps
   return {make<SchemaCompilerLogicalWhenType>(
       true, context, schema_context, dynamic_context, JSON::Type::Array,
       std::move(children), SchemaCompilerTemplate{})};

diff --git a/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_compile.h b/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_compile.h
@@ -202,12 +202,6 @@ struct SchemaCompilerAssertionDivisible;
 /// certain type
 struct SchemaCompilerAssertionStringType;
 
-/// @ingroup jsonschema
-/// Represents a compiler assertion step that checks a given array, object, or
-/// string has a certain number of items, properties, or characters,
-/// respectively
-struct SchemaCompilerAssertionSizeEqual;
-
 /// @ingroup jsonschema
 /// Represents a compiler step that emits an annotation
 struct SchemaCompilerAnnotationEmit;
@@ -217,6 +211,11 @@ struct SchemaCompilerAnnotationEmit;
 /// array instance is equal to the given size
 struct SchemaCompilerAnnotationWhenArraySizeEqual;
 
+/// @ingroup jsonschema
+/// Represents a compiler step that emits an annotation when the size of the
+/// array instance is greater than the given size
+struct SchemaCompilerAnnotationWhenArraySizeGreater;
+
 /// @ingroup jsonschema
 /// Represents a compiler step that emits an annotation to the parent
 struct SchemaCompilerAnnotationToParent;
@@ -354,8 +353,9 @@ using SchemaCompilerTemplate = std::vector<std::variant<
     SchemaCompilerAssertionGreaterEqual, SchemaCompilerAssertionLessEqual,
     SchemaCompilerAssertionGreater, SchemaCompilerAssertionLess,
     SchemaCompilerAssertionUnique, SchemaCompilerAssertionDivisible,
-    SchemaCompilerAssertionStringType, SchemaCompilerAssertionSizeEqual,
-    SchemaCompilerAnnotationEmit, SchemaCompilerAnnotationWhenArraySizeEqual,
+    SchemaCompilerAssertionStringType, SchemaCompilerAnnotationEmit,
+    SchemaCompilerAnnotationWhenArraySizeEqual,
+    SchemaCompilerAnnotationWhenArraySizeGreater,
     SchemaCompilerAnnotationToParent, SchemaCompilerAnnotationBasenameToParent,
     SchemaCompilerLogicalOr, SchemaCompilerLogicalAnd, SchemaCompilerLogicalXor,
     SchemaCompilerLogicalTryMark, SchemaCompilerLogicalNot,
@@ -420,10 +420,11 @@ DEFINE_STEP_WITH_VALUE(Assertion, Less, SchemaCompilerValueJSON)
 DEFINE_STEP_WITH_VALUE(Assertion, Unique, SchemaCompilerValueNone)
 DEFINE_STEP_WITH_VALUE(Assertion, Divisible, SchemaCompilerValueJSON)
 DEFINE_STEP_WITH_VALUE(Assertion, StringType, SchemaCompilerValueStringType)
-DEFINE_STEP_WITH_VALUE(Assertion, SizeEqual, SchemaCompilerValueUnsignedInteger)
 DEFINE_STEP_WITH_VALUE(Annotation, Emit, SchemaCompilerValueJSON)
 DEFINE_STEP_WITH_VALUE(Annotation, WhenArraySizeEqual,
                        SchemaCompilerValueIndexedJSON)
+DEFINE_STEP_WITH_VALUE(Annotation, WhenArraySizeGreater,
+                       SchemaCompilerValueIndexedJSON)
 DEFINE_STEP_WITH_VALUE(Annotation, ToParent, SchemaCompilerValueJSON)
 DEFINE_STEP_WITH_VALUE(Annotation, BasenameToParent, SchemaCompilerValueNone)
 DEFINE_STEP_APPLICATOR(Logical, Or, SchemaCompilerValueBoolean)

diff --git a/test/jsonschema/jsonschema_test_utils.h b/test/jsonschema/jsonschema_test_utils.h
@@ -282,6 +282,12 @@
                  std::get<3>(trace_pre.at(index)))) {                          \
     EVALUATE_TRACE_PRE(index, AnnotationWhenArraySizeEqual, evaluate_path,     \
                        keyword_location, instance_location);                   \
+  } else if (std::holds_alternative<                                           \
+                 sourcemeta::jsontoolkit::                                     \
+                     SchemaCompilerAnnotationWhenArraySizeGreater>(            \
+                 std::get<3>(trace_pre.at(index)))) {                          \
+    EVALUATE_TRACE_PRE(index, AnnotationWhenArraySizeGreater, evaluate_path,   \
+                       keyword_location, instance_location);                   \
   } else {                                                                     \
     EVALUATE_TRACE_PRE(index, AnnotationEmit, evaluate_path, keyword_location, \
                        instance_location);                                     \
@@ -308,6 +314,12 @@
                  std::get<3>(trace_post.at(index)))) {                         \
     EVALUATE_TRACE_POST(index, AnnotationWhenArraySizeEqual, evaluate_path,    \
                         keyword_location, instance_location);                  \
+  } else if (std::holds_alternative<                                           \
+                 sourcemeta::jsontoolkit::                                     \
+                     SchemaCompilerAnnotationWhenArraySizeGreater>(            \
+                 std::get<3>(trace_post.at(index)))) {                         \
+    EVALUATE_TRACE_POST(index, AnnotationWhenArraySizeGreater, evaluate_path,  \
+                        keyword_location, instance_location);                  \
   } else {                                                                     \
     EVALUATE_TRACE_POST(index, AnnotationEmit, evaluate_path,                  \
                         keyword_location, instance_location);                  \