diff --git a/include/rfl/parsing/is_empty.hpp b/include/rfl/parsing/is_empty.hpp index 41d5b851..7f77a7c7 100644 --- a/include/rfl/parsing/is_empty.hpp +++ b/include/rfl/parsing/is_empty.hpp @@ -5,7 +5,9 @@ #include "../internal/has_reflection_method_v.hpp" #include "../internal/has_reflection_type_v.hpp" +#include "../internal/is_positional.hpp" #include "../internal/is_rename.hpp" +#include "../internal/is_short.hpp" #include "../internal/is_skip.hpp" #include "is_map_like.hpp" #include "is_vector_like.hpp" @@ -34,7 +36,9 @@ static bool is_empty(const T& _var) { const auto& [r] = _var; return is_empty(r); } - } else if constexpr (internal::is_rename_v) { + } else if constexpr (internal::is_rename_v || + internal::is_short_v || + internal::is_positional_v) { return is_empty(_var.value()); } else if constexpr (is_map_like_v || is_vector_like_v) { return _var.begin() == _var.end(); diff --git a/tests/cli/test_optional_short_and_positional.cpp b/tests/cli/test_optional_short_and_positional.cpp new file mode 100644 index 00000000..43396c2f --- /dev/null +++ b/tests/cli/test_optional_short_and_positional.cpp @@ -0,0 +1,45 @@ +#include +#include +#include +#include +#include +#include + +namespace test_optional_short_and_positional { + +struct Config { + rfl::Positional> input; + rfl::Short<"f", std::optional> format; + bool verbose = false; +}; + +TEST(cli, test_optional_positional_and_short_given) { + const char* args[] = { + "program", + "data.csv", + "-f", "json", + "--verbose" + }; + const auto result = rfl::cli::read(5, const_cast(args)); + ASSERT_TRUE(result) << result.error().what(); + ASSERT_TRUE(result.value().input().has_value()); + EXPECT_EQ(*result.value().input(), "data.csv"); + ASSERT_TRUE(result.value().format().has_value()); + EXPECT_EQ(*result.value().format(), "json"); + EXPECT_EQ(rfl::json::write(result.value()), + R"({"input":"data.csv","format":"json","verbose":true})"); +} + +TEST(cli, test_optional_positional_and_short_omitted) { + const char* args[] = { + "program", + "--verbose" + }; + const auto result = rfl::cli::read(2, const_cast(args)); + ASSERT_TRUE(result) << result.error().what(); + EXPECT_FALSE(result.value().input().has_value()); + EXPECT_FALSE(result.value().format().has_value()); + EXPECT_EQ(rfl::json::write(result.value()), R"({"verbose":true})"); +} + +} // namespace test_optional_short_and_positional diff --git a/tests/generic/test_wrapped_optionals_and_defaults.cpp b/tests/generic/test_wrapped_optionals_and_defaults.cpp new file mode 100644 index 00000000..fdd9162c --- /dev/null +++ b/tests/generic/test_wrapped_optionals_and_defaults.cpp @@ -0,0 +1,24 @@ +#include +#include +#include + +#include "write_and_read.hpp" + +namespace test_wrapped_optionals_and_defaults { + +struct Optionals { + rfl::Short<"f", std::optional> format; + rfl::Positional> input; + rfl::Description<"Log file", rfl::Short<"l", std::optional>> log; +}; + +TEST(generic, test_wrapped_optionals) { + write_and_read(Optionals{}); + write_and_read(Optionals{.format = std::string("csv"), + .input = std::string("in.txt"), + .log = std::string("log.txt")}); + + EXPECT_EQ(rfl::to_generic(Optionals{}).to_object().value().size(), 0u); +} + +} // namespace test_wrapped_optionals_and_defaults diff --git a/tests/json/test_wrapped_optionals_and_defaults.cpp b/tests/json/test_wrapped_optionals_and_defaults.cpp new file mode 100644 index 00000000..0d5d1258 --- /dev/null +++ b/tests/json/test_wrapped_optionals_and_defaults.cpp @@ -0,0 +1,43 @@ +#include + +#include +#include +#include +#include + +#include "write_and_read.hpp" + +// rfl::Short, rfl::Positional and rfl::Description are transparent for JSON, +// so a std::optional inside them is written as on its own: omitted when +// empty. +namespace test_wrapped_optionals_and_defaults { + +struct Optionals { + rfl::Short<"f", std::optional> format; + rfl::Positional> input; +}; + +struct NestedOptionals { + rfl::Description<"Log file", rfl::Short<"l", std::optional>> log; + rfl::Short<"t", rfl::Description<"Title", std::optional>> title; + rfl::Positional>> + config; + rfl::Rename<"outDir", rfl::Positional>> out_dir; +}; + +TEST(json, test_wrapped_optionals_write_and_read) { + write_and_read(Optionals{}, R"({})"); + write_and_read( + Optionals{.format = std::string("csv"), .input = std::string("in.txt")}, + R"({"format":"csv","input":"in.txt"})"); + + write_and_read(NestedOptionals{}, R"({})"); + write_and_read( + NestedOptionals{.log = std::string("log.txt"), + .title = std::string("Report"), + .config = std::string("config.json"), + .out_dir = std::string("out")}, + R"({"log":"log.txt","title":"Report","config":"config.json","outDir":"out"})"); +} + +} // namespace test_wrapped_optionals_and_defaults