Update model & codegen

lib/codegen/dart/dio.dart

@@ -1,11 +1,8 @@
 import 'dart:convert';
-
-import 'package:apidash/consts.dart';
-import 'package:apidash/models/request_model.dart' show RequestModel;
-import 'package:apidash/utils/convert_utils.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:dart_style/dart_style.dart';
-
+import 'package:apidash/models/request_model.dart' show RequestModel;
+import 'package:apidash/consts.dart';
 import 'shared.dart';
 
 class DartDioCodeGen {
@@ -25,7 +22,7 @@ class DartDioCodeGen {
         headers: requestModel.enabledHeadersMap,
         body: requestModel.requestBody,
         contentType: requestModel.requestBodyContentType,
-        formData: rowsToFormDataMap(requestModel.formDataList) ?? [],
+        formData: requestModel.formDataMapList,
       );
       return next;
     } catch (e) {

lib/codegen/dart/http.dart

@@ -1,12 +1,9 @@
 import 'dart:convert';
 import 'dart:io';
-
-import 'package:apidash/consts.dart';
-import 'package:apidash/models/models.dart' show RequestModel;
-import 'package:apidash/utils/convert_utils.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:dart_style/dart_style.dart';
-
+import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/consts.dart';
 import 'shared.dart';
 
 class DartHttpCodeGen {
@@ -26,7 +23,7 @@ class DartHttpCodeGen {
         headers: requestModel.enabledHeadersMap,
         body: requestModel.requestBody,
         contentType: requestModel.requestBodyContentType,
-        formData: rowsToFormDataMap(requestModel.formDataList) ?? [],
+        formData: requestModel.formDataMapList,
       );
       return next;
     } catch (e) {
@@ -59,10 +56,11 @@ class DartHttpCodeGen {
       final strContent = CodeExpression(Code('r\'\'\'$body\'\'\''));
       dataExp = declareVar('body', type: refer('String')).assign(strContent);
 
-      final hasContentTypeHeader = composeHeaders.keys.any((k) => k.toLowerCase() == HttpHeaders.contentTypeHeader);
+      final hasContentTypeHeader = composeHeaders.keys
+          .any((k) => k.toLowerCase() == HttpHeaders.contentTypeHeader);
       if (!hasContentTypeHeader) {
         composeHeaders.putIfAbsent(HttpHeaders.contentTypeHeader,
-          () => kContentTypeMap[contentType] ?? '');
+            () => kContentTypeMap[contentType] ?? '');
       }
     }
 

lib/codegen/js/axios.dart

@@ -1,14 +1,9 @@
 import 'dart:convert';
-import 'package:apidash/consts.dart';
-import 'package:apidash/utils/extensions/request_model_extension.dart';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
-    show
+    show padMultilineString, requestModelToHARJsonRequest, stripUrlParams;
-        padMultilineString,
+import 'package:apidash/models/models.dart' show RequestModel;
-        requestModelToHARJsonRequest,
+import 'package:apidash/consts.dart';
-        rowsToFormDataMap,
-        stripUrlParams;
-import 'package:apidash/models/models.dart' show FormDataModel, RequestModel;
 
 class AxiosCodeGen {
   AxiosCodeGen({this.isNodeJs = false});
@@ -80,7 +75,6 @@ async function buildFormData(fields) {
     String defaultUriScheme,
   ) {
     try {
-      List<FormDataModel> formDataList = requestModel.formDataList ?? [];
       jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode);
       String importsData = kNodejsImportTemplate.render({
         "isFormDataRequest": requestModel.isFormDataRequest,
@@ -139,7 +133,7 @@ async function buildFormData(fields) {
 
         result += templateBody.render({
           "body": getFieldDataTemplate.render({
-            "fields_list": json.encode(rowsToFormDataMap(formDataList)),
+            "fields_list": json.encode(requestModel.formDataMapList),
           })
         });
       }

lib/codegen/js/fetch.dart

@@ -1,28 +1,23 @@
 import 'dart:convert';
-
-import 'package:apidash/consts.dart';
-import 'package:apidash/utils/convert_utils.dart';
-import 'package:apidash/utils/extensions/request_model_extension.dart';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show padMultilineString, requestModelToHARJsonRequest;
-import 'package:apidash/models/models.dart' show FormDataModel, RequestModel;
+import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/consts.dart';
 
 class FetchCodeGen {
   FetchCodeGen({this.isNodeJs = false});
 
   final bool isNodeJs;
 
-  String kStringImportNode =
+  String kStringImportNode = """
-      """
 import fetch from 'node-fetch';
 {% if isFormDataRequest %}const fs = require('fs');{% endif %}
 
 
 """;
 
-  String kTemplateStart =
+  String kTemplateStart = """let url = '{{url}}';
-      """let url = '{{url}}';
 
 let options = {
   method: '{{method}}'
@@ -36,8 +31,7 @@ let options = {
   body: {{body}}
 """;
 
-  String kMultiPartBodyTemplate =
+  String kMultiPartBodyTemplate = r'''
-      r'''
 async function buildDataList(fields) {
   var formdata = new FormData();
   for (const field of fields) {
@@ -57,8 +51,7 @@ async function buildDataList(fields) {
 const payload = buildDataList({{fields_list}});
 
 ''';
-  String kStringRequest =
+  String kStringRequest = """
-      """
 
 };
 
@@ -83,7 +76,6 @@ fetch(url, options)
     String defaultUriScheme,
   ) {
     try {
-      List<FormDataModel> formDataList = requestModel.formDataList ?? [];
       jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode);
       String importsData = kNodejsImportTemplate.render({
         "isFormDataRequest": requestModel.isFormDataRequest,
@@ -94,7 +86,7 @@ fetch(url, options)
         var templateMultiPartBody = jj.Template(kMultiPartBodyTemplate);
         result += templateMultiPartBody.render({
           "isNodeJs": isNodeJs,
-          "fields_list": json.encode(rowsToFormDataMap(formDataList)),
+          "fields_list": json.encode(requestModel.formDataMapList),
         });
       }
       String url = requestModel.url;

lib/codegen/kotlin/okhttp.dart

@@ -1,11 +1,9 @@
 import 'dart:convert';
-import 'package:apidash/consts.dart';
-import 'package:apidash/utils/convert_utils.dart';
-import 'package:apidash/utils/extensions/request_model_extension.dart';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show getValidRequestUri, stripUriParams;
 import '../../models/request_model.dart';
+import 'package:apidash/consts.dart';
 
 class KotlinOkHttpCodeGen {
   final String kTemplateStart = """import okhttp3.OkHttpClient
@@ -114,7 +112,7 @@ import okhttp3.MediaType.Companion.toMediaType""";
           var formDataTemplate = jj.Template(kFormDataBody);
 
           result += formDataTemplate.render({
-            "formDataList": rowsToFormDataMap(requestModel.formDataList),
+            "formDataList": requestModel.formDataMapList,
           });
         } else if (kMethodsWithBody.contains(method) && requestBody != null) {
           var contentLength = utf8.encode(requestBody).length;

lib/codegen/python/http_client.dart

@@ -1,11 +1,10 @@
 import 'dart:io';
 import 'dart:convert';
-import 'package:apidash/utils/extensions/request_model_extension.dart';
 import 'package:jinja/jinja.dart' as jj;
-import 'package:apidash/consts.dart';
 import 'package:apidash/utils/utils.dart'
-    show getNewUuid, getValidRequestUri, padMultilineString, rowsToFormDataMap;
+    show getNewUuid, getValidRequestUri, padMultilineString;
-import 'package:apidash/models/models.dart' show FormDataModel, RequestModel;
+import 'package:apidash/models/models.dart' show RequestModel;
+import 'package:apidash/consts.dart';
 
 class PythonHttpClientCodeGen {
   final String kTemplateStart = """import http.client
@@ -91,7 +90,6 @@ body = b'\r\n'.join(dataList)
     RequestModel requestModel,
     String defaultUriScheme,
   ) {
-    List<FormDataModel> formDataList = requestModel.formDataList ?? [];
     String uuid = getNewUuid();
 
     try {
@@ -154,7 +152,8 @@ body = b'\r\n'.join(dataList)
 
           if (headers.isNotEmpty || hasBody) {
             hasHeaders = true;
-            bool hasContentTypeHeader = headers.keys.any((k) => k.toLowerCase() == HttpHeaders.contentTypeHeader);
+            bool hasContentTypeHeader = headers.keys
+                .any((k) => k.toLowerCase() == HttpHeaders.contentTypeHeader);
 
             if (hasBody && !hasContentTypeHeader) {
               headers[HttpHeaders.contentTypeHeader] =
@@ -170,7 +169,7 @@ body = b'\r\n'.join(dataList)
           var formDataBodyData = jj.Template(kStringFormDataBody);
           result += formDataBodyData.render(
             {
-              "fields_list": json.encode(rowsToFormDataMap(formDataList)),
+              "fields_list": json.encode(requestModel.formDataMapList),
               "boundary": uuid,
             },
           );

lib/codegen/python/requests.dart

@@ -1,16 +1,10 @@
 import 'dart:io';
 import 'dart:convert';
-import 'package:apidash/utils/extensions/request_model_extension.dart';
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/consts.dart';
 import 'package:apidash/utils/utils.dart'
-    show
+    show getNewUuid, getValidRequestUri, padMultilineString, stripUriParams;
-        getNewUuid,
+import 'package:apidash/models/models.dart' show RequestModel;
-        getValidRequestUri,
-        padMultilineString,
-        rowsToFormDataMap,
-        stripUriParams;
-import 'package:apidash/models/models.dart' show FormDataModel, RequestModel;
 
 class PythonRequestsCodeGen {
   final String kTemplateStart = """import requests
@@ -107,7 +101,6 @@ print('Response Body:', response.text)
       bool hasHeaders = false;
       bool hasBody = false;
       bool hasJsonBody = false;
-      List<FormDataModel> formDataList = requestModel.formDataList ?? [];
       String uuid = getNewUuid();
 
       String url = requestModel.url;
@@ -181,7 +174,7 @@ print('Response Body:', response.text)
           var formDataBodyData = jj.Template(kStringFormDataBody);
           result += formDataBodyData.render(
             {
-              "fields_list": json.encode(rowsToFormDataMap(formDataList)),
+              "fields_list": json.encode(requestModel.formDataMapList),
               "boundary": uuid,
             },
           );

lib/models/request_model.dart

@@ -1,6 +1,11 @@
 import 'package:flutter/foundation.dart';
-import '../utils/utils.dart';
+import '../utils/utils.dart'
-    show listToFormDataModel, rowsToFormDataMap, mapToRows, rowsToMap, getEnabledRows;
+    show
+        mapListToFormDataModelRows,
+        rowsToFormDataMapList,
+        mapToRows,
+        rowsToMap,
+        getEnabledRows;
 import '../consts.dart';
 import 'models.dart';
 
@@ -19,10 +24,10 @@ class RequestModel {
     this.isParamEnabledList,
     this.requestBodyContentType = ContentType.json,
     this.requestBody,
+    this.requestFormDataList,
     this.responseStatus,
     this.message,
     this.responseModel,
-    this.formDataList,
   });
 
   final String id;
@@ -35,9 +40,9 @@ class RequestModel {
   final List<NameValueModel>? requestParams;
   final List<bool>? isHeaderEnabledList;
   final List<bool>? isParamEnabledList;
-  final List<FormDataModel>? requestFormDataList;
   final ContentType requestBodyContentType;
   final String? requestBody;
+  final List<FormDataModel>? requestFormDataList;
   final int? responseStatus;
   final String? message;
   final ResponseModel? responseModel;
@@ -54,6 +59,10 @@ class RequestModel {
   Map<String, String> get headersMap => rowsToMap(requestHeaders) ?? {};
   Map<String, String> get paramsMap => rowsToMap(requestParams) ?? {};
 
+  List<Map<String, dynamic>> get formDataMapList =>
+      rowsToFormDataMapList(requestFormDataList) ?? [];
+  bool get isFormDataRequest => requestBodyContentType == ContentType.formdata;
+
   RequestModel duplicate({
     required String id,
   }) {
@@ -71,7 +80,8 @@ class RequestModel {
           isParamEnabledList != null ? [...isParamEnabledList!] : null,
       requestBodyContentType: requestBodyContentType,
       requestBody: requestBody,
-      formDataList: formDataList != null ? [...formDataList!] : null,
+      requestFormDataList:
+          requestFormDataList != null ? [...requestFormDataList!] : null,
     );
   }
 
@@ -88,10 +98,10 @@ class RequestModel {
     List<bool>? isParamEnabledList,
     ContentType? requestBodyContentType,
     String? requestBody,
+    List<FormDataModel>? requestFormDataList,
     int? responseStatus,
     String? message,
     ResponseModel? responseModel,
-    List<FormDataModel>? formDataList,
   }) {
     var headers = requestHeaders ?? this.requestHeaders;
     var params = requestParams ?? this.requestParams;
@@ -111,10 +121,10 @@ class RequestModel {
       requestBodyContentType:
           requestBodyContentType ?? this.requestBodyContentType,
       requestBody: requestBody ?? this.requestBody,
+      requestFormDataList: requestFormDataList ?? this.requestFormDataList,
       responseStatus: responseStatus ?? this.responseStatus,
       message: message ?? this.message,
       responseModel: responseModel ?? this.responseModel,
-      formDataList: formDataList ?? this.formDataList,
     );
   }
 
@@ -143,10 +153,10 @@ class RequestModel {
       requestBodyContentType = kDefaultContentType;
     }
     final requestBody = data["requestBody"] as String?;
+    final requestFormDataList = data["requestFormDataList"];
     final responseStatus = data["responseStatus"] as int?;
     final message = data["message"] as String?;
     final responseModelJson = data["responseModel"];
-    final formDataList = data["formDataList"];
 
     if (responseModelJson != null) {
       responseModel =
@@ -172,11 +182,12 @@ class RequestModel {
       isParamEnabledList: isParamEnabledList,
       requestBodyContentType: requestBodyContentType,
       requestBody: requestBody,
+      requestFormDataList: requestFormDataList != null
+          ? mapListToFormDataModelRows(List<Map>.from(requestFormDataList))
+          : null,
       responseStatus: responseStatus,
       message: message,
       responseModel: responseModel,
-      formDataList:
-          formDataList != null ? listToFormDataModel(formDataList) : null,
     );
   }
 
@@ -193,10 +204,10 @@ class RequestModel {
       "isParamEnabledList": isParamEnabledList,
       "requestBodyContentType": requestBodyContentType.name,
       "requestBody": requestBody,
+      "requestFormDataList": rowsToFormDataMapList(requestFormDataList),
       "responseStatus": includeResponse ? responseStatus : null,
       "message": includeResponse ? message : null,
       "responseModel": includeResponse ? responseModel?.toJson() : null,
-      "formDataList": rowsToFormDataMap(formDataList)
     };
   }
 
@@ -215,10 +226,10 @@ class RequestModel {
       "Enabled Params: ${isParamEnabledList.toString()}",
       "Request Body Content Type: ${requestBodyContentType.toString()}",
       "Request Body: ${requestBody.toString()}",
+      "Request FormData: ${requestFormDataList.toString()}",
       "Response Status: $responseStatus",
       "Response Message: $message",
       "Response: ${responseModel.toString()}"
-          "FormData: ${formDataList.toString()}"
     ].join("\n");
   }
 
@@ -238,10 +249,10 @@ class RequestModel {
         listEquals(other.isParamEnabledList, isParamEnabledList) &&
         other.requestBodyContentType == requestBodyContentType &&
         other.requestBody == requestBody &&
+        other.requestFormDataList == requestFormDataList &&
         other.responseStatus == responseStatus &&
         other.message == message &&
-        other.responseModel == responseModel &&
+        other.responseModel == responseModel;
-        other.formDataList == formDataList;
   }
 
   @override
@@ -260,10 +271,10 @@ class RequestModel {
       isParamEnabledList,
       requestBodyContentType,
       requestBody,
+      requestFormDataList,
       responseStatus,
       message,
       responseModel,
-      formDataList,
     );
   }
 }

lib/utils/convert_utils.dart

@@ -79,7 +79,18 @@ Map<String, String>? rowsToMap(List<NameValueModel>? kvRows,
   return finalMap;
 }
 
-List<Map<String, dynamic>>? rowsToFormDataMap(
+List<NameValueModel>? mapToRows(Map<String, String>? kvMap) {
+  if (kvMap == null) {
+    return null;
+  }
+  List<NameValueModel> finalRows = [];
+  for (var k in kvMap.keys) {
+    finalRows.add(NameValueModel(name: k, value: kvMap[k]));
+  }
+  return finalRows;
+}
+
+List<Map<String, dynamic>>? rowsToFormDataMapList(
   List<FormDataModel>? kvRows,
 ) {
   if (kvRows == null) {
@@ -95,18 +106,7 @@ List<Map<String, dynamic>>? rowsToFormDataMap(
   return finalMap;
 }
 
-List<NameValueModel>? mapToRows(Map<String, String>? kvMap) {
+List<FormDataModel>? mapListToFormDataModelRows(List<Map>? kvMap) {
-  if (kvMap == null) {
-    return null;
-  }
-  List<NameValueModel> finalRows = [];
-  for (var k in kvMap.keys) {
-    finalRows.add(NameValueModel(name: k, value: kvMap[k]));
-  }
-  return finalRows;
-}
-
-List<FormDataModel>? listToFormDataModel(List? kvMap) {
   if (kvMap == null) {
     return null;
   }
@@ -123,8 +123,7 @@ List<FormDataModel>? listToFormDataModel(List? kvMap) {
 }
 
 FormDataType getFormDataType(String? type) {
-  List<FormDataType> formData = FormDataType.values;
+  return FormDataType.values.firstWhere((element) => element.name == type,
-  return formData.firstWhere((element) => element.name == type,
       orElse: () => FormDataType.text);
 }
 

lib/utils/extensions/request_model_extension.dart

@@ -1,8 +0,0 @@
-import 'package:apidash/consts.dart';
-import 'package:apidash/models/models.dart';
-
-extension RequestModelExtension on RequestModel {
-  bool get isFormDataRequest {
-    return requestBodyContentType == ContentType.formdata;
-  }
-}