Scrub list indices from query strings

src/pathgen.rs

@@ -66,7 +66,7 @@ fn gen_fn(name: &str, op_type: &str, op: &Operation) -> String {
                 };
                 // Format as a struct field.
                 fn_query_params.push(format!(
-                    "{}\tpub {}: Option<{}>,\n",
+                    "{}\t{}: Option<{}>,\n",
                     make_comment(parameter_data.description, 1),
                     parameter_data.name.into_safe(),
                     bindgen::type_to_string(query_param_type)
@@ -193,7 +193,13 @@ fn gen_fn(name: &str, op_type: &str, op: &Operation) -> String {
     result += ", Error>";
 
     // Build the function body.
-    result += " {\n\tlet r#response = state.client.";
+    if need_query {
+        result += " {\n\tlet qstring = serde_qs::to_string(&query).unwrap();";
+        result += "\n\tlet qstring_clean = remove_square_braces(&qstring);";
+        result += "\n\tlet r#response = state.client."
+    } else {
+        result += " {\n\tlet r#response = state.client.";
+    }
     result += op_type;
     result += "(format!(\"{}";
     result += name;
@@ -202,7 +208,7 @@ fn gen_fn(name: &str, op_type: &str, op: &Operation) -> String {
     }
     result += "\", state.base_url";
     if need_query {
-        result += ", serde_qs::to_string(&query).unwrap()";
+        result += ", qstring_clean";
     }
     result += "))\n";
 
@@ -242,7 +248,7 @@ fn gen_fn(name: &str, op_type: &str, op: &Operation) -> String {
     result += &fn_response_name;
     result += "::Other(r#response)) }\n\t}\n}\n";
 
-    result
+    return result;
 }
 
 fn make_fn_name_from_path(input: &str) -> String {

src/templates/Cargo.toml.template

@@ -17,3 +17,4 @@ serde_json = "1.0.108"
 serde_qs = "0.12.0"
 chrono = "0.4.31"
 reqwest = {{ version = "0.11.22", features = ["blocking", "json"] }}
+regex = "1.10.6"

src/templates/usings.template

@@ -1,6 +1,6 @@
 #![allow(warnings)]
 
-use crate::util::ThanixClient;
+use crate::util::{ThanixClient, remove_square_braces};
 use crate::types::*;
 use serde_qs;
 use reqwest::{Error, blocking::Response};

src/templates/util.rs.template

@@ -1,6 +1,13 @@
+use regex::Regex;
+
 pub struct ThanixClient {
     pub client: reqwest::blocking::Client,
     pub base_url: String,
     pub authentication_token: String,
 }
 
+pub fn remove_square_braces(s: &str) -> String {
+    let re = Regex::new(r"\[\d+\]").unwrap();
+
+    re.replace_all(s, "").to_string()
+}