enable config files

Author: Tsche

.gitignore

@@ -50,4 +50,6 @@
 .cache
 .pytest_cache
 
-.devcontainer
+.devcontainer
+
+settings.json5

include/rsl/config

@@ -19,6 +19,8 @@
 #include <rsl/cli/annotations.hpp>
 #include <rsl/cli/spec.hpp>
 
+#include <rsl/json5/json5.hpp>
+
 namespace rsl {
 
 class ProgramInfo {
@@ -78,18 +80,19 @@ T load_config(std::vector<std::string_view> args_in) {
 
   _impl::ArgumentTuple<T> args_tuple;
 
-  auto config = T::config_path();
-  std::println("config: {}", config);
+  auto config = json5::load(T::config_path());
+  config.template update_argtuple<T>(args_tuple);
 
+  
   for (auto argument : parsed_args) {
     argument(&args_tuple);
   }
 
-  for (auto arg : spec.arguments | std::views::drop(parsed_args.size())) {
-    if (!arg.is_optional) {
-      parser.fail("Missing required argument `{}`", arg.name);
-    }
-  }
+  // for (auto arg : spec.arguments | std::views::drop(parsed_args.size())) {
+  //   if (!arg.is_optional) {
+  //     parser.fail("Missing required argument `{}`", arg.name);
+  //   }
+  // }
 
   T object = _impl::default_construct<T>(args_tuple);
 

include/rsl/json5/json5.hpp

@@ -4,6 +4,7 @@
 #include <vector>
 #include <charconv>
 
+#include <rsl/constexpr_assert>
 #include <rsl/_impl/default_construct.hpp>
 
 namespace rsl::json5 {
@@ -37,14 +38,16 @@ struct Value {
   template <typename T>
   void update_argtuple(_impl::ArgumentTuple<T>& args) const {
     Object obj = as_object();
-
+    constexpr_assert(obj.size() != 0);
     constexpr auto ctx     = std::meta::access_context::current();
     constexpr auto members = std::define_static_array(nonstatic_data_members_of(dealias(^^T), ctx));
+    constexpr auto base_count = bases_of(dealias(^^T), ctx).size();
     template for (constexpr auto Idx : std::views::iota(0zu, members.size())) {
       constexpr auto name = std::define_static_string(identifier_of(members[Idx]));
       auto it             = obj.find(name);
       if (it != obj.end()) {
-        get<Idx>(args) = it->second.template as<typename[:type_of(members[Idx]):]>();
+        using target_type = [:type_of(members[Idx]):];
+        get<base_count + Idx>(args) = it->second.template as<target_type>();
       }
     }
   }
@@ -92,4 +95,6 @@ struct Parser {
   void expect_more() const;
 };
 
+Value load(std::string_view path);
+
 }  // namespace rsl::json5

src/json5/parser.cpp

@@ -1,7 +1,9 @@
+#include <filesystem>
 #include <algorithm>
+#include <fstream>
+#include <sstream>
 #include <stdexcept>
 #include <format>
-#include <print>
 
 #include <rsl/json5/json5.hpp>
 
@@ -171,4 +173,16 @@ std::string Value::as_string() const {
   return content;
 }
 
+Value load(std::string_view path) {
+  auto config_path = std::filesystem::path(path);
+  if (!exists(config_path)) {
+    throw std::runtime_error(std::format("File {} does not exist.", path));
+  }
+  auto in = std::ifstream(config_path);
+  std::stringstream buffer;
+  buffer << in.rdbuf();
+
+  return Value(buffer.str());
+}
+
 }  // namespace rsl::json5