Make sure that variables wrapped in rfl::DefaultVal are not marked as required; fixes #679

include/rfl/parsing/FieldVariantParser.hpp

@@ -9,6 +9,9 @@
 #include "../Tuple.hpp"
 #include "../Variant.hpp"
 #include "../always_false.hpp"
+#include "../internal/no_duplicate_field_names.hpp"
+#include "../internal/to_ptr_field.hpp"
+#include "../make_named_tuple.hpp"
 #include "../visit.hpp"
 #include "FieldVariantReader.hpp"
 #include "Parser_base.hpp"

include/rfl/parsing/ParserDefaultVal.hpp

@@ -64,8 +64,8 @@ struct ParserDefaultVal {
   static schema::Type to_schema(
       std::map<std::string, schema::Type>* _definitions) {
     using U = std::remove_cvref_t<T>;
-    return schema::Type{
-        Parser<R, W, U, ProcessorsType>::to_schema(_definitions)};
+    return schema::Type{schema::Type::DefaultVal{Ref<schema::Type>::make(
+        Parser<R, W, U, ProcessorsType>::to_schema(_definitions))}};
   }
 };
 

include/rfl/parsing/schema/Type.hpp

@@ -57,8 +57,10 @@ struct RFL_API Type {
     Ref<Type> type_;
   };
 
-  struct Literal {
-    std::vector<std::string> values_;
+  /// All values are assumed to be required unless explicitly stated otherwise
+  /// using this or the Optional wrapper.
+  struct DefaultVal {
+    Ref<Type> type_;
   };
 
   struct DescribedLiteral {
@@ -69,13 +71,17 @@ struct RFL_API Type {
     std::vector<ValueWithDescription> values_;
   };
 
+  struct Literal {
+    std::vector<std::string> values_;
+  };
+
   struct Object {
     rfl::Object<Type> types_;
     std::shared_ptr<Type> additional_properties_;
   };
 
   /// All values are assumed to be required unless explicitly stated otherwise
-  /// using this wrapper.
+  /// using this wrapper or the DefaultVal wrapper.
   struct Optional {
     Ref<Type> type_;
   };
@@ -106,10 +112,10 @@ struct RFL_API Type {
 
   using VariantType =
       rfl::Variant<Boolean, Bytestring, Vectorstring, Int32, Int64, UInt32,
-                   UInt64, Integer, Float, Double, String, AnyOf, Deprecated,
-                   Description, DescribedLiteral, FixedSizeTypedArray, Literal,
-                   Object, Optional, Reference, StringMap, Tuple, TypedArray,
-                   Validated>;
+                   UInt64, Integer, Float, Double, String, AnyOf, DefaultVal,
+                   Deprecated, Description, DescribedLiteral,
+                   FixedSizeTypedArray, Literal, Object, Optional, Reference,
+                   StringMap, Tuple, TypedArray, Validated>;
 
   /**
    * @brief Default constructor.

src/rfl/json/to_schema.cpp

@@ -48,7 +48,8 @@ bool is_optional(const parsing::schema::Type& _t) {
       return is_optional(*_v.type_);
 
     } else {
-      return std::is_same_v<T, parsing::schema::Type::Optional>;
+      return std::is_same_v<T, parsing::schema::Type::Optional> ||
+             std::is_same_v<T, parsing::schema::Type::DefaultVal>;
     }
   });
 }
@@ -221,6 +222,9 @@ schema::Type type_to_json_schema_type(const parsing::schema::Type& _type,
       }
       return schema::Type{.value = schema::Type::AnyOf{.anyOf = any_of}};
 
+    } else if constexpr (std::is_same<T, Type::DefaultVal>()) {
+      return type_to_json_schema_type(*_t.type_, _no_required);
+
     } else if constexpr (std::is_same<T, Type::Deprecated>()) {
       auto res = type_to_json_schema_type(*_t.type_, _no_required);
       const auto update_prediction = [&](auto _v) -> schema::Type {

tests/json/test_json_schema5.cpp

@@ -3,8 +3,6 @@
 #include <rfl/json.hpp>
 #include <string>
 
-#include "write_and_read.hpp"
-
 namespace test_json_schema5 {
 
 using Age = rfl::Validator<std::optional<unsigned int>, rfl::Minimum<0>,
@@ -16,13 +14,14 @@ struct Person {
                    std::optional<std::string>>
       last_name;
   Age age;
+  rfl::DefaultVal<std::string> nickname;
 };
 
 TEST(json, test_json_schema5) {
   const auto json_schema = rfl::json::to_schema<Person>();
 
   const std::string expected =
-      R"({"$schema":"https://json-schema.org/draft/2020-12/schema","$ref":"#/$defs/test_json_schema5__Person","$defs":{"test_json_schema5__Person":{"type":"object","properties":{"first_name":{"type":"string","description":"Given name of this person"},"last_name":{"description":"Optional family name of this person","anyOf":[{"type":"string"},{"type":"null"}]},"age":{"allOf":[{"minimum":0,"type":"number"},{"maximum":130,"type":"number"}]}},"required":["first_name"]}}})";
+      R"({"$schema":"https://json-schema.org/draft/2020-12/schema","$ref":"#/$defs/test_json_schema5__Person","$defs":{"test_json_schema5__Person":{"type":"object","properties":{"first_name":{"type":"string","description":"Given name of this person"},"last_name":{"description":"Optional family name of this person","anyOf":[{"type":"string"},{"type":"null"}]},"age":{"allOf":[{"minimum":0,"type":"number"},{"maximum":130,"type":"number"}]},"nickname":{"type":"string"}},"required":["first_name"]}}})";
 
   EXPECT_EQ(json_schema, expected);
 }