refactor(paws.common): split json_build_any into internal and exported functions with UTF-8 encoding

Author: DyfanJones

paws.common/src/RcppExports.cpp

@@ -68,7 +68,7 @@ BEGIN_RCPP
 END_RCPP
 }
 // json_build_any
-std::string json_build_any(SEXP values);
+CharacterVector json_build_any(SEXP values);
 RcppExport SEXP _paws_common_json_build_any(SEXP valuesSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;

paws.common/src/json_builder.cpp

@@ -135,8 +135,8 @@ std::string type(SEXP object)
 }
 
 // -------------------- Forward declaration --------------------
-// This function will be defined later and called recursively
-std::string json_build_any(SEXP values);
+// Internal function that builds JSON and returns std::string (used internally)
+std::string json_build_internal(SEXP values);
 
 // -------------------- Helper function to safely convert to string --------------------
 // This function converts an SEXP to a string representation, handling various R types.
@@ -255,7 +255,7 @@ std::string json_build_list(SEXP values)
   for (R_xlen_t i = 0; i < n; i++)
   {
     // Recursively build JSON for each element
-    std::string elem_json = json_build_any(VECTOR_ELT(values, i));
+    std::string elem_json = json_build_internal(VECTOR_ELT(values, i));
     // Only add non-empty elements, excluding "empty" JSON array/object strings
     if (!elem_json.empty() && elem_json != "[]" && elem_json != "{}")
     {
@@ -325,7 +325,7 @@ std::string json_build_structure(SEXP values)
     }
 
     // Recursively build JSON for the payload's value
-    return json_build_any(payload_val);
+    return json_build_internal(payload_val);
   }
 
   SEXP names = Rf_getAttrib(values, symbol_cache.names_sym);
@@ -364,7 +364,7 @@ std::string json_build_structure(SEXP values)
     std::string loc_name = tag_get(val, "locationName");  // Check for locationName tag
     std::string name = loc_name.empty() ? key : loc_name; // Use locationName if present
 
-    std::string json_val = json_build_any(val); // Recursively build JSON for field value
+    std::string json_val = json_build_internal(val); // Recursively build JSON for field value
     // Only add non-empty fields, excluding "empty" JSON array/object strings
     if (!json_val.empty() && json_val != "[]" && json_val != "{}")
     {
@@ -442,7 +442,7 @@ inline std::string json_build_map(SEXP values)
     SEXP val = element.second;
 
     // Recursively build JSON for the value
-    std::string json_val = json_build_any(val);
+    std::string json_val = json_build_internal(val);
 
     // Only add non-empty pairs to the final JSON string
     if (!json_val.empty() && json_val != "[]" && json_val != "{}")
@@ -469,17 +469,8 @@ inline std::string json_build_map(SEXP values)
   return result;
 }
 
-/**
- * @brief Build Json Strings Using AWS Attributes for JSON Template
- *
- * @param object A list to be parsed into JSON string
- *
- * @return a JSON String
- */
-//' @useDynLib paws.common _paws_common_json_build_any
-//' @importFrom Rcpp evalCpp
-// [[Rcpp::export]]
-std::string json_build_any(SEXP values)
+// Internal implementation that returns std::string (used by recursive calls)
+std::string json_build_internal(SEXP values)
 {
   // Determine the effective type of the R object for JSON building
   std::string t = type(values);
@@ -494,3 +485,20 @@ std::string json_build_any(SEXP values)
   // Default to scalar if none of the above, or if `type` returns "scalar"
   return json_build_scalar(values);
 }
+
+/**
+ * @brief Build Json Strings Using AWS Attributes for JSON Template
+ *
+ * @param object A list to be parsed into JSON string
+ *
+ * @return a JSON String
+ */
+//' @useDynLib paws.common _paws_common_json_build_any
+//' @importFrom Rcpp evalCpp
+// [[Rcpp::export]]
+CharacterVector json_build_any(SEXP values)
+{
+  // Call internal implementation and UTF-8 encode result
+  std::string result = json_build_internal(values);
+  return CharacterVector::create(String(result, CE_UTF8));
+}