minor optimisation/fixes in codegen

badnikhil · badnikhil · commit bf0f7e7b93f9 · 2025-07-09T05:37:43.000+05:30
diff --git a/lib/codegen/csharp/http_client.dart b/lib/codegen/csharp/http_client.dart
@@ -19,15 +19,10 @@ string baseUri = "{{ baseUri }}";
 
 var query = new Dictionary<string, List<string>>();
 {%- for key, values in queryParams %}
-  {%- if values is string %}
-    query["{{ key }}"] = new List<string>(); 
-      query["{{ key }}"].Add("{{ values }}");
-  {%- else %}
     query["{{ key }}"] = new List<string>();
     {%- for value in values %}
       query["{{ key }}"].Add("{{ value }}");
     {%- endfor %}
-  {%- endif %}
 {%- endfor %}
 
 var queryString = string.Join("&", query.SelectMany(kv => kv.Value.Select(v => string.Format("{0}={1}", kv.Key, v))));
diff --git a/lib/codegen/csharp/rest_sharp.dart b/lib/codegen/csharp/rest_sharp.dart
@@ -118,14 +118,10 @@ class Program
           String paramsResult = "";
           
           requestModel.enabledParamsMap.forEach((key, values) {
-            if (values is List) {
-              for (var value in values) {
-                paramsResult += templateParams.render({"param": key, "value": value});
-              }
-            } else {
-              paramsResult += templateParams.render({"param": key, "value": values});
+            for (var value in values) {
+              paramsResult += templateParams.render({"param": key, "value": value});
             }
-          });
+                    });
 
           result += "$paramsResult\n";
         }
diff --git a/lib/codegen/go/http.dart b/lib/codegen/go/http.dart
@@ -128,14 +128,10 @@ url.RawQuery = query.Encode()
       if (requestModel.enabledParamsMap.isNotEmpty) {
       var queryParams = [];
       requestModel.enabledParamsMap.forEach((key, value) {
-        if (value is List) {
-          for (var v in value) {
-            queryParams.add({'key': key, 'value': v});
-          }
-        } else {
-          queryParams.add({'key': key, 'value': value});
+        for (var v in value) {
+          queryParams.add({'key': key, 'value': v});
         }
-      });
+            });
 
       var templateQueryParam = jj.Template(kTemplateQueryParam);
       result += templateQueryParam.render({"params": queryParams});
diff --git a/lib/codegen/java/async_http_client.dart b/lib/codegen/java/async_http_client.dart
@@ -39,10 +39,9 @@ public class Main {
             BoundRequestBuilder requestBuilder = asyncHttpClient.prepare("{{ method|upper }}", url);
 ''';
 
-  final String kTemplateUrlQueryParam = ''' {% for name, value in queryParams %}
-{% if value is not string %}
-        {% for v in value %} requestBuilder.addQueryParam("{{ name }}", "{{ v }}");
-        {% endfor %}  {% else %}         requestBuilder.addQueryParam("{{ name }}", "{{ value }}");{% endif %}{% endfor %}\n\n
+  final String kTemplateUrlQueryParam = ''' 
+          {% for name, value in queryParams %} {% for v in value %}
+            requestBuilder.addQueryParam("{{ name }}", "{{ v }}"); {% endfor %}{% endfor %}\n
 ''';
   final String kTemplateRequestHeader = '''
             requestBuilder{% for name, value in headers %}
diff --git a/lib/codegen/java/okhttp.dart b/lib/codegen/java/okhttp.dart
@@ -37,19 +37,15 @@ import okhttp3.MultipartBody;""";
 ''';
 
 final String kTemplateUrlQuery = '''
-
         HttpUrl.Builder urlBuilder = HttpUrl.parse("{{url}}").newBuilder();
-        {% for name, value in queryParams %}{% if value is not string %} {% for v in value %} urlBuilder.addQueryParameter("{{ name }}", "{{ v }}");
-         {% endfor %}  
-        {% else %}  urlBuilder.addQueryParameter("{{ name }}", "{{ value }}"); {% endif %}{% endfor %}
-        
-        HttpUrl url = urlBuilder.build();
-
-''';
+        {% for name, value in queryParams %}{% for v in value %} 
+        urlBuilder.addQueryParameter("{{ name }}", "{{ v }}");{% endfor %}{% endfor %}  
+        HttpUrl url = urlBuilder.build();      
+        ''';
 
 
   String kTemplateRequestBody = '''
-
+        
         MediaType mediaType = MediaType.parse("{{contentType}}");
 
         RequestBody body = RequestBody.create({{body}}, mediaType);
diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart
@@ -27,20 +27,17 @@ public class Main {
 ''';
 
   final String kTemplateRequestCreation = '''
-        HttpResponse<JsonNode> response = Unirest
-                .{{method}}(requestURL)\n
+        HttpResponse<JsonNode> response = Unirest.{{method}}(requestURL)\n
 ''';
 
   final String kTemplateRequestHeader = '''
                 .header("{{name}}", "{{value}}")\n
 ''';
 
     final String kTemplateUrlQueryParam = '''
-              {% for name, value in queryParams %}
-            {% if value is iterable and value is not string %}  {% for v in value -%}
-                  .queryString("{{name}}", "{{v}}"){% if not loop.last %} {% endif %}
-              {% endfor %}  {% else %} 
-              .queryString("{{name}}", "{{value}}")  {% endif %} {% if not loop.last %}{% endif %} {% endfor %}
+              {% for name, value in queryParams %}{% for v in value -%}
+                  .queryString("{{name}}", "{{v}}")
+              {% endfor %}{% endfor %}
 ''';
 
 
@@ -58,7 +55,7 @@ public class Main {
 ''';
 
   final String kStringRequestEnd = """
-                .asJson();
+        .asJson();
         System.out.println(response.getStatus());
         System.out.println(response.getBody());
     }
diff --git a/lib/codegen/js/fetch.dart b/lib/codegen/js/fetch.dart
@@ -15,17 +15,11 @@ import { {% if hasFileInFormData %}fileFromSync, {% endif %}FormData } from 'nod
 
 """;
 
-  String kTemplateStart = """const url = new URL('{{url}}');
-  
+  String kTemplateStart = """const url = new URL('{{url}}'); 
 {% for key, value in params -%}
-{% if value is iterable and (value is not string) -%}
 {% for item in value -%}
 url.searchParams.append('{{key}}', '{{item}}');
 {% endfor -%}
-{% else -%}
-
-url.searchParams.append('{{key}}', '{{value}}');
-{% endif -%}
 {% endfor -%}
 const options = {
   method: '{{method}}'
diff --git a/lib/codegen/julia/http.dart b/lib/codegen/julia/http.dart
@@ -16,9 +16,9 @@ url = "{{url}}"
 String kTemplateParams = """
 params = Dict(
 {%- for name, value in params %}
-    "{{ name }}" => {%- if value is iterable and not value is string -%}[
+    "{{ name }}" =>[
         {%- for v in value -%}"{{ v }}"{%- if not loop.last -%}, {%- endif -%}{%- endfor -%}
-    ]{%- else -%}"{{ value }}"{%- endif -%},
+    ],
 {%- endfor %}
 )
 \n
diff --git a/lib/codegen/kotlin/okhttp.dart b/lib/codegen/kotlin/okhttp.dart
@@ -40,15 +40,11 @@ import okhttp3.MediaType.Companion.toMediaType""";
 
     val url = "{{url}}".toHttpUrl().newBuilder()
 {%- for name, values in params %}
-    {%- if values is iterable and not values is string %}
         {%- for value in values %}
             .addQueryParameter("{{ name }}", "{{ value }}")
         {%- endfor %}
-    {%- else %}
-        .addQueryParameter("{{ name }}", "{{ values }}")
-    {%- endif %}
 {%- endfor %}
-        .build()
+            .build()
 
 """;
 
diff --git a/lib/codegen/php/curl.dart b/lib/codegen/php/curl.dart
@@ -126,12 +126,8 @@ if (params.isNotEmpty) {
   List<String> paramList = [];
 
   params.forEach((key, value) {
-    if (value is List) {
-      paramList.add("'$key' => [${value.map((v) => "'$v'").join(", ")}]");
-    } else {
-      paramList.add("'$key' => '$value'");
-    }
-  });
+    paramList.add("'$key' => [${value.map((v) => "'$v'").join(", ")}]");
+    });
 
   result += templateParams.render({
     "params": paramList.join(",\n"),
diff --git a/lib/codegen/php/guzzle.dart b/lib/codegen/php/guzzle.dart
@@ -86,12 +86,8 @@ if (params.isNotEmpty) {
   List<String> paramList = [];
 
   params.forEach((key, value) {
-    if (value is List) {
-      paramList.add("'$key' => [${value.map((v) => "'$v'").join(", ")}]");
-    } else {
-      paramList.add("'$key' => '$value'");
-    }
-  });
+    paramList.add("'$key' => [${value.map((v) => "'$v'").join(", ")}]");
+    });
 
   result += templateParams.render({
     "params": paramList.join(",\n"),
diff --git a/lib/codegen/php/http_plug.dart b/lib/codegen/php/http_plug.dart
@@ -97,12 +97,8 @@ echo \$response->getBody();
         List<String> paramList = [];
 
         params.forEach((key, value) {
-          if (value is List) {
-            paramList.add("'$key' => [${value.map((v) => "'$v'").join(", ")}]");
-          } else {
-            paramList.add("'$key' => '$value'");
-          }
-        });
+          paramList.add("'$key' => [${value.map((v) => "'$v'").join(", ")}]");
+                });
 
         result += templateParams.render({
           "params": paramList.join(",\n"),
diff --git a/lib/codegen/python/http_client.dart b/lib/codegen/python/http_client.dart
@@ -108,12 +108,8 @@ body = b'\r\n'.join(dataList)
       List<String> paramList = [];
 
       params.forEach((key, value) {
-        if (value is List) {
-          paramList.add("'$key': [${value.map((v) => "'$v'").join(", ")}]");
-        } else {
-          paramList.add("'$key': '$value'");
-        }
-      });
+        paramList.add("'$key': [${value.map((v) => "'$v'").join(", ")}]");
+            });
 
       result += templateParams.render({
         "params": paramList.join(",\n"),
diff --git a/lib/codegen/python/requests.dart b/lib/codegen/python/requests.dart
@@ -105,12 +105,8 @@ print('Response Body:', response.text)
       List<String> paramList = [];
 
       params.forEach((key, value) {
-        if (value is List) {
-          paramList.add("'$key': [${value.map((v) => "'$v'").join(", ")}]");
-        } else {
-          paramList.add("'$key': '$value'");
-        }
-      });
+        paramList.add("'$key': [${value.map((v) => "'$v'").join(", ")}]");
+            });
 
       result += templateParams.render({
         "params": paramList.join(",\n"),
diff --git a/lib/codegen/ruby/net_http.dart b/lib/codegen/ruby/net_http.dart
@@ -10,7 +10,7 @@ url = URI("{{url}}")
 
   String kTemplateRequestParams = """
 \nparams = {
-{% for key, val in params %} "{{ key }}" => {% if val is list %}[{% for v in val %}"{{ v|string }}"{% if not loop.last %}, {% endif %}{% endfor %}]{% else %}"{{ val|string }}"{% endif %},
+{% for key, val in params %} "{{ key }}" => [{% for v in val %}"{{ v|string }}"{% if not loop.last %}, {% endif %}{% endfor %}],
 {% endfor %}}
 url.query = URI.encode_www_form(params)\n
 """;
diff --git a/lib/codegen/rust/actix.dart b/lib/codegen/rust/actix.dart
@@ -20,13 +20,9 @@ String kTemplateParams = """
     
     let query_params = [
     {%- for key, values in params %}
-      {%- if values is iterable and values is not string %}
         {%- for val in values %}
         ("{{key}}", "{{val}}"),
         {%- endfor %}
-      {%- else %}
-        ("{{key}}", "{{values}}"),
-      {%- endif %}
     {%- endfor %}
     ];
     request = request.query(&query_params).unwrap();
diff --git a/lib/codegen/rust/curl_rust.dart b/lib/codegen/rust/curl_rust.dart
@@ -18,7 +18,7 @@ fn main() {
   {% if params %}
   let params: Vec<(&str, Vec<&str>)> = vec![
     {%- for key, values in params %}
-    ("{{key}}", vec![{% if values is iterable and values is not string %}{% for val in values %}"{{val}}", {% endfor %}{% else %}"{{values}}"{% endif %}]),
+    ("{{key}}", vec![{% for val in values %}"{{val}}", {% endfor %}]),
     {%- endfor %}
   ];
   let query_string: String = params.iter().flat_map(|(key, values)| values.iter().map(move |val| format!("{}={}", key, val)))      .collect::<Vec<_>>().join("&");
diff --git a/lib/codegen/rust/hyper.dart b/lib/codegen/rust/hyper.dart
@@ -17,15 +17,12 @@ use url::Url;
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let http{% if isHttps %}s{% endif %} = Http{% if isHttps %}s{% endif %}Connector::new();
     let client = Client::builder().build::<_, hyper::Body>(http{% if isHttps %}s{% endif %});
-    let mut url = Url::parse("{{ baseUrl }}")?;\n
+    let mut url = Url::parse("{{ baseUrl }}")?;
     """;
 
   final String kTemplateParams = """
-    {% for key, values in params %}{% if values is iterable and values is not string %}{% for val in values %}\n     url.query_pairs_mut().append_pair("{{ key }}", "{{ val }}");{% endfor %}
-    {% else %}
-    url.query_pairs_mut().append_pair("{{ key }}", "{{ values }}");
-    {% endif %}
-    {% endfor %}
+    {% for key, values in params %}{% for val in values %}
+    url.query_pairs_mut().append_pair("{{ key }}", "{{ val }}");{% endfor %}{% endfor %}
 """;
 
   final String kTemplateMethod = """
diff --git a/lib/codegen/rust/reqwest.dart b/lib/codegen/rust/reqwest.dart
@@ -13,13 +13,9 @@ class RustReqwestCodeGen {
   String kTemplateParamsDef = """
     let query_params = [
     {%- for key, values in params %}
-      {%- if values is iterable and values is not string %}
         {%- for val in values %}
         ("{{key}}", "{{val}}"),
         {%- endfor %}
-      {%- else %}
-        ("{{key}}", "{{values}}"),
-      {%- endif %}
     {%- endfor %}
     ];
 """;
diff --git a/lib/codegen/rust/ureq.dart b/lib/codegen/rust/ureq.dart
@@ -18,13 +18,9 @@ fn main() -> Result<(), ureq::Error> {
 
   String kTemplateParams = """
     {%- for key, values in params %}
-      {%- if values is iterable and values is not string %}
         {%- for val in values %}
         .query("{{key}}", "{{val}}")
         {%- endfor %}
-      {%- else %}
-        .query("{{key}}", "{{values}}")
-      {%- endif %}
     {%- endfor %}
 """;
 
diff --git a/lib/codegen/swift/alamofire.dart b/lib/codegen/swift/alamofire.dart
diff --git a/lib/codegen/swift/urlsession.dart b/lib/codegen/swift/urlsession.dart
