feat: update subproject commits for json, plexa, and rationet; enhance CMakeLists and main.cpp for additional config options; add nullable property support in coco_server

Author: riccardodebenedictis

extern/json

@@ -10,8 +10,8 @@ setup_sanitizers(ConfigGenerator)
 function(coco_config)
     set(options ROS_INTERFACE)
     set(oneValueArgs PROJ_NAME)
-    set(multiValueArgs TYPE_FILES RULE_FILES ITEM_FILES)
-    cmake_parse_arguments(COCO_CONFIG "${options}" "${oneValueArgs}" "${multiValueArgs}" "${multiValueArgs}" ${ARGN})
+    set(multiValueArgs TYPE_FILES TYPE_FOLDERS RULE_FILES RULE_FOLDERS ITEM_FILES ITEM_FOLDERS)
+    cmake_parse_arguments(COCO_CONFIG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/${COCO_CONFIG_PROJ_NAME}_config")
     file(MAKE_DIRECTORY "${GENERATED_DIR}")
@@ -38,8 +38,11 @@ function(coco_config)
         OUTPUT "${GENERATED_HEADER}"
         COMMAND $<TARGET_FILE:ConfigGenerator>
             -t ${COCO_CONFIG_TYPE_FILES}
+            -tf ${COCO_CONFIG_TYPE_FOLDERS}
             -r ${COCO_CONFIG_RULE_FILES}
+            -rf ${COCO_CONFIG_RULE_FOLDERS}
             -i ${COCO_CONFIG_ITEM_FILES}
+            -if ${COCO_CONFIG_ITEM_FOLDERS}
             -o "${GENERATED_HEADER}"
         DEPENDS ConfigGenerator
             ${COCO_CONFIG_TYPE_FILES}

extern/plexa

@@ -4,8 +4,11 @@
 enum ParType
 {
     Type,
+    TypeFolder,
     Rule,
+    RuleFolder,
     Item,
+    ItemFolder,
     Output
 };
 
@@ -24,33 +27,63 @@ int main(int argc, char const *argv[])
             current_par = Type;
             continue;
         }
+        else if (std::string(argv[i]) == "-tf")
+        {
+            current_par = TypeFolder;
+            continue;
+        }
         else if (std::string(argv[i]) == "-r")
         {
             current_par = Rule;
             continue;
         }
-        else if (std::string(argv[i]) == "-o")
+        else if (std::string(argv[i]) == "-rf")
         {
-            current_par = Output;
+            current_par = RuleFolder;
             continue;
         }
         else if (std::string(argv[i]) == "-i")
         {
             current_par = Item;
             continue;
         }
+        else if (std::string(argv[i]) == "-if")
+        {
+            current_par = ItemFolder;
+            continue;
+        }
+        else if (std::string(argv[i]) == "-o")
+        {
+            current_par = Output;
+            continue;
+        }
 
         switch (current_par)
         {
         case Type:
             type_files.push_back(argv[i]);
             break;
+        case TypeFolder:
+            for (const auto &entry : std::filesystem::directory_iterator(argv[i]))
+                if (entry.is_regular_file())
+                    type_files.push_back(entry.path().string());
+            break;
         case Rule:
             rule_files.push_back(argv[i]);
             break;
+        case RuleFolder:
+            for (const auto &entry : std::filesystem::directory_iterator(argv[i]))
+                if (entry.is_regular_file())
+                    rule_files.push_back(entry.path().string());
+            break;
         case Item:
             items_files.push_back(argv[i]);
             break;
+        case ItemFolder:
+            for (const auto &entry : std::filesystem::directory_iterator(argv[i]))
+                if (entry.is_regular_file())
+                    items_files.push_back(entry.path().string());
+            break;
         case Output:
             output = argv[i];
             break;

extern/rationet

@@ -46,7 +46,7 @@ namespace coco
             get_coco().set_value(get_coco().get_item(msg->get_topic().substr(strlen(COCO_NAME "/data/"))), json::load(msg->to_string())); // Set value for the item based on the topic
     }
 
-    void coco_mqtt::on_connect(const std::string &cause)
+    void coco_mqtt::on_connect([[maybe_unused]] const std::string &cause)
     {
         LOG_DEBUG("Connected to MQTT broker: " << cause);
 

src/config/CMakeLists.txt

@@ -71,6 +71,7 @@ namespace coco
             {"description", "A property that holds integer values, with optional constraints and default values."},
             {"properties",
              {{"type", {{"type", "string"}, {"enum", {"int"}}, {"description", "The property type identifier."}}},
+              {"nullable", {{"type", "boolean"}, {"description", "Whether this property can be null."}}},
               {"multiple", {{"type", "boolean"}, {"description", "Whether this property can hold multiple values (array)."}}},
               {"default", {{"oneOf", std::vector<json::json>{{{"type", "integer"}}, {{"type", "array"}, {"items", {{"type", "integer"}}}}}}, {"description", "Default value(s) for this property."}}},
               {"min", {{"type", "integer"}, {"description", "Minimum allowed value for this property."}}},
@@ -81,6 +82,7 @@ namespace coco
             {"description", "A property that holds floating-point numbers, with optional constraints and default values."},
             {"properties",
              {{"type", {{"type", "string"}, {"enum", {"float"}}, {"description", "The property type identifier."}}},
+              {"nullable", {{"type", "boolean"}, {"description", "Whether this property can be null."}}},
               {"multiple", {{"type", "boolean"}, {"description", "Whether this property can hold multiple values (array)."}}},
               {"default", {{"oneOf", std::vector<json::json>{{{"type", "number"}}, {{"type", "array"}, {"items", {{"type", "number"}}}}}}, {"description", "Default value(s) for this property."}}},
               {"min", {{"type", "number"}, {"description", "Minimum allowed value for this property."}}},
@@ -91,6 +93,7 @@ namespace coco
             {"description", "A property that holds string values, with optional default values."},
             {"properties",
              {{"type", {{"type", "string"}, {"enum", {"string"}}, {"description", "The property type identifier."}}},
+              {"nullable", {{"type", "boolean"}, {"description", "Whether this property can be null."}}},
               {"multiple", {{"type", "boolean"}, {"description", "Whether this property can hold multiple values (array)."}}},
               {"default", {{"oneOf", std::vector<json::json>{{{"type", "string"}}, {{"type", "array"}, {"items", {{"type", "string"}}}}}}, {"description", "Default value(s) for this property."}}}}},
             {"required", std::vector<json::json>{"type"}}};
@@ -99,6 +102,7 @@ namespace coco
             {"description", "A property that holds predefined symbolic values from a restricted set of allowed values."},
             {"properties",
              {{"type", {{"type", "string"}, {"enum", {"symbol"}}, {"description", "The property type identifier."}}},
+              {"nullable", {{"type", "boolean"}, {"description", "Whether this property can be null."}}},
               {"values", {{"type", "array"}, {"items", {{"type", "string"}}}, {"description", "The allowed symbolic values for this property."}}},
               {"multiple", {{"type", "boolean"}, {"description", "Whether this property can hold multiple values (array)."}}},
               {"default", {{"oneOf", std::vector<json::json>{{{"type", "string"}}, {{"type", "array"}, {"items", {{"type", "string"}}}}}}, {"description", "Default value(s) for this property."}}}}},
@@ -108,6 +112,7 @@ namespace coco
             {"description", "A property that holds references to other items by their ID, restricted to a specific domain type."},
             {"properties",
              {{"type", {{"type", "string"}, {"enum", {"item"}}, {"description", "The property type identifier."}}},
+              {"nullable", {{"type", "boolean"}, {"description", "Whether this property can be null."}}},
               {"domain", {{"type", "string"}, {"description", "The type of objects that are allowed as values for this property."}}},
               {"multiple", {{"type", "boolean"}, {"description", "Whether this property can hold multiple values (array)."}}},
               {"default", {{"oneOf", std::vector<json::json>{{{"type", "string"}, {"pattern", "^[a-fA-F0-9]{24}$"}}, {{"type", "array"}, {"items", {{"type", "string"}, {"pattern", "^[a-fA-F0-9]{24}$"}}}}}}, {"description", "Default ID value(s) for this property."}}}}},
@@ -117,6 +122,7 @@ namespace coco
             {"description", "A property that holds arbitrary JSON objects conforming to a specified JSON schema."},
             {"properties",
              {{"type", {{"type", "string"}, {"enum", {"json"}}, {"description", "The property type identifier."}}},
+              {"nullable", {{"type", "boolean"}, {"description", "Whether this property can be null."}}},
               {"schema", {{"type", "object"}, {"description", "The JSON schema that validates the property's value."}}},
               {"default", {{"type", "object"}, {"description", "Default JSON object for this property."}}}}},
             {"required", std::vector<json::json>{"type", "schema"}}};