datatype changes

Author: badnikhil

packages/better_networking/lib/models/http_request_model.dart

@@ -31,25 +31,25 @@ class HttpRequestModel with _$HttpRequestModel {
       _$HttpRequestModelFromJson(json);
 
   Map<String, String> get headersMap => rowsToMap(headers) ?? {};
-  Map<String, dynamic> get paramsMap => rowsToRequestMap(params) ?? {};
+  Map<String, List<String>> get paramsMap => rowsToRequestMap(params) ?? {};
   List<NameValueModel>? get enabledHeaders =>
       getEnabledRows(headers, isHeaderEnabledList);
   List<NameValueModel>? get enabledParams =>
       getEnabledRows(params, isParamEnabledList);
 
   Map<String, String> get enabledHeadersMap => rowsToMap(enabledHeaders) ?? {};
-Map<String, dynamic> get enabledParamsMap {
+Map<String, List<String>> get enabledParamsMap {  
   var extractedParams = Uri.parse(url).queryParametersAll;  
   var userParams = rowsToRequestMap(enabledParams) ?? {};  
-
-  extractedParams.forEach((key, value) {
-    userParams[key] = [
-      ...value, 
-      if (userParams.containsKey(key)) 
-        ...(userParams[key] is List ? List.from(userParams[key]) : [userParams[key]])
-    ];
+  
+  extractedParams.forEach((key, values) {
+    if (userParams.containsKey(key)) {
+      userParams[key]!.addAll(values);
+    } else {
+      userParams[key] = List.from(values);
+    }
   });
-
+  
   return userParams;
 }
 

packages/better_networking/lib/utils/http_request_utils.dart

@@ -97,52 +97,34 @@ String? getRequestBody(APIType type, HttpRequestModel httpRequestModel) {
     APIType.graphql => getGraphQLBody(httpRequestModel),
   };
 }
-Map<String, dynamic>? rowsToRequestMap(List<NameValueModel>? rows) {
+Map<String, List<String>>? rowsToRequestMap(List<NameValueModel>? rows) {
   if (rows == null) {
     return null;
   }
-  
-  final Map<String, dynamic> finalMap = {};
-  
+  final Map<String, List<String>> finalMap = {};
   for (var row in rows) {
     final key = row.name.trim();
     if (key.isEmpty) continue;
-    
     final value = row.value.toString();
-    
     if (finalMap.containsKey(key)) {
-     
-      if (finalMap[key] is List) {
-        (finalMap[key] as List).add(value);
-      } else {
-        finalMap[key] = [finalMap[key], value];
-      }
+      finalMap[key]!.add(value);
     } else {
-      
-      finalMap[key] = value;
+      finalMap[key] = [value];
     }
   }
-  
   return finalMap;
 }
 
-List<NameValueModel>? requestMapToRows(Map<String, dynamic>? requestMap) {
+List<NameValueModel>? requestMapToRows(Map<String, List<String>>? requestMap) {
   if (requestMap == null) {
     return null;
   }
-  
   final List<NameValueModel> finalRows = [];
-  
-  requestMap.forEach((key, value) {
-    if (value is List) {
-      for (var item in value) {
-        finalRows.add(NameValueModel(name: key, value: item.toString()));
-      }
-    } else {
-      finalRows.add(NameValueModel(name: key, value: value.toString()));
+  requestMap.forEach((key, values) {
+    for (var value in values) {
+      finalRows.add(NameValueModel(name: key, value: value));
     }
   });
-  
   return finalRows;
 }
 // TODO: Expose this function to remove JSON comments

packages/better_networking/lib/utils/uri_utils.dart

@@ -57,13 +57,11 @@ String stripUrlParams(String url) {
 
   Map<String, List<String>> queryParams = uri.queryParametersAll;
 
-  Map<String, dynamic>? requestQueryParams = rowsToRequestMap(requestParams);
-  if (requestQueryParams != null) {
-    Map<String, List<String>> queryParamsList = requestQueryParams.map((key, value) {
-      return MapEntry(key, List<String>.from(value is String ? [value] : value));
-    });
-    queryParams = mergeMaps(queryParams, queryParamsList, value: (v1, v2) => v1 + v2);
-  }
+  Map<String, List<String>>? requestQueryParams = rowsToRequestMap(requestParams);
+ if (requestQueryParams != null) {
+  queryParams = mergeMaps(queryParams, requestQueryParams, value: (v1, v2) => v1 + v2);
+}
+  
   if (queryParams.isNotEmpty) {
     uri = uri.replace(queryParameters: queryParams);
   }