Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion include/rfl/parsing/is_empty.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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<Type>) {
} else if constexpr (internal::is_rename_v<Type> ||
internal::is_short_v<Type> ||
internal::is_positional_v<Type>) {
return is_empty(_var.value());
} else if constexpr (is_map_like_v<Type> || is_vector_like_v<Type>) {
return _var.begin() == _var.end();
Expand Down
45 changes: 45 additions & 0 deletions tests/cli/test_optional_short_and_positional.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#include <gtest/gtest.h>
#include <optional>
#include <rfl.hpp>
#include <rfl/cli.hpp>
#include <rfl/json.hpp>
#include <string>

namespace test_optional_short_and_positional {

struct Config {
rfl::Positional<std::optional<std::string>> input;
rfl::Short<"f", std::optional<std::string>> 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<Config>(5, const_cast<char**>(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<Config>(2, const_cast<char**>(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
24 changes: 24 additions & 0 deletions tests/generic/test_wrapped_optionals_and_defaults.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#include <optional>
#include <rfl.hpp>
#include <string>

#include "write_and_read.hpp"

namespace test_wrapped_optionals_and_defaults {

struct Optionals {
rfl::Short<"f", std::optional<std::string>> format;
rfl::Positional<std::optional<std::string>> input;
rfl::Description<"Log file", rfl::Short<"l", std::optional<std::string>>> 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
43 changes: 43 additions & 0 deletions tests/json/test_wrapped_optionals_and_defaults.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#include <gtest/gtest.h>

#include <optional>
#include <rfl.hpp>
#include <rfl/json.hpp>
#include <string>

#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<std::string>> format;
rfl::Positional<std::optional<std::string>> input;
};

struct NestedOptionals {
rfl::Description<"Log file", rfl::Short<"l", std::optional<std::string>>> log;
rfl::Short<"t", rfl::Description<"Title", std::optional<std::string>>> title;
rfl::Positional<rfl::Description<"Config file", std::optional<std::string>>>
config;
rfl::Rename<"outDir", rfl::Positional<std::optional<std::string>>> 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