Fix json_decode recursive conversion and add OBJECT toString()

Author: Fszontagh

src/Modules/BuiltIn/JsonConverters.cpp

@@ -83,9 +83,10 @@ Symbols::ValuePtr convertJsonNumberToValue(const nlohmann::json& json) {
  * @brief Recursively converts a JSON object to VoidScript ObjectMap
  *
  * @param json The JSON object to convert
+ * @param context Additional context information
  * @return Symbols::ObjectMap The converted ObjectMap
  */
-Symbols::ObjectMap convertJsonObjectToMap(const nlohmann::json& json) {
+Symbols::ObjectMap convertJsonObjectToMap(const nlohmann::json& json, const std::string& context = "") {
     Symbols::ObjectMap result;
 
     for (auto it = json.begin(); it != json.end(); ++it) {
@@ -124,14 +125,14 @@ Symbols::ObjectMap convertJsonObjectToMap(const nlohmann::json& json) {
                 } else if (element.is_string()) {
                     arrayMap[indexKey] = Symbols::ValuePtr(element.get<std::string>());
                 } else if (element.is_object()) {
-                    arrayMap[indexKey] = Symbols::ValuePtr(convertJsonObjectToMap(element));
+                    arrayMap[indexKey] = jsonToValueWithContext(element, context);
                 } else if (element.is_array()) {
-                    arrayMap[indexKey] = Symbols::ValuePtr(convertJsonObjectToMap(element));
+                    arrayMap[indexKey] = jsonToValueWithContext(element, context);
                 }
             }
             result[key] = Symbols::ValuePtr(arrayMap);
         } else if (value.is_object()) {
-            result[key] = Symbols::ValuePtr(convertJsonObjectToMap(value));
+            result[key] = jsonToValueWithContext(value, context);
         }
     }
 
@@ -282,14 +283,14 @@ Symbols::ValuePtr jsonToValueWithContext(const nlohmann::json& json, const std::
             } else if (element.is_string()) {
                 arrayMap[indexKey] = Symbols::ValuePtr(element.get<std::string>());
             } else if (element.is_object()) {
-                arrayMap[indexKey] = Symbols::ValuePtr(convertJsonObjectToMap(element));
+                arrayMap[indexKey] = jsonToValueWithContext(element, context);
             } else if (element.is_array()) {
-                arrayMap[indexKey] = Symbols::ValuePtr(convertJsonObjectToMap(element));
+                arrayMap[indexKey] = jsonToValueWithContext(element, context);
             }
         }
         return Symbols::ValuePtr(arrayMap);
     } else if (json.is_object()) {
-        return Symbols::ValuePtr(convertJsonObjectToMap(json));
+        return Symbols::ValuePtr(convertJsonObjectToMap(json, context));
     } else {
         throw std::runtime_error(createJsonErrorMessage("JSON to ValuePtr conversion",
                                                        "unknown", context));

src/Symbols/Value.cpp

@@ -122,8 +122,7 @@ std::string Value::toString() const {
     if (type_ == Symbols::Variables::Type::UNDEFINED_TYPE) {
         return "undefined";
     }
-    if (is_null() && type_ != Variables::Type::STRING && type_ != Variables::Type::OBJECT &&
-        type_ != Variables::Type::CLASS) {  // Allow toString on null strings/objects
+    if (is_null() && type_ != Variables::Type::STRING) {  // Allow toString on null strings/objects
         if (type_ == Variables::Type::NULL_TYPE || (!data_ && type_ != Variables::Type::STRING)) {
             return "null";
         }
@@ -166,8 +165,22 @@ std::string Value::toString() const {
                     return "[Invalid Class Object]";
                 }
             }
+        case Variables::Type::OBJECT:
+            {
+                const auto & objMap = get<ObjectMap>();
+                if (objMap.empty()) {
+                    return "{}";
+                }
+                std::string result = "{";
+                for (auto it = objMap.begin(); it != objMap.end(); ++it) {
+                    if (it != objMap.begin()) result += ", ";
+                    result += "\"" + it->first + "\": " + it->second.toString();
+                }
+                result += "}";
+                return result;
+            }
         // STRING is handled above
-        // OBJECT, NULL_TYPE will fall to default or handled by isNULL checks
+        // NULL_TYPE will fall to default or handled by isNULL checks
         default:
             return "null";  // Should ideally be covered by isNULL or type checks
     }