update: bugfixes

lib/codegen/php/guzzle.dart

@@ -1,344 +1,3 @@
-// import 'dart:convert';
-// import 'package:jinja/jinja.dart' as jj;
-// import 'package:apidash/utils/utils.dart'
-//     show padMultilineString, requestModelToHARJsonRequest, stripUrlParams;
-// import 'package:apidash/models/models.dart' show RequestModel;
-// import 'package:apidash/consts.dart';
-
-// class PhpGuzzleCodeGen {
-//   String kStringImportNode = """use GuzzleHttp\\Client;
-// use GuzzleHttp\\Psr7\\Request;
-// {% if isFormDataRequest %}use GuzzleHttp\\Psr7\\MultipartStream;;{% endif %}
-// \
-
-// """;
-
-//   String kTemplateParams = """
-// \$queryParams = [
-// {{params}}
-// ];
-
-// \$queryParamsStr = '?' . http_build_query(\$queryParams);
-// \
-
-// """;
-
-//   String kTemplateHeader = """
-// \$headers = [
-// {{headers}}
-// ];
-// \
-
-// """;
-
-//   String kTemplateBody = """
-// \$body = {{body}};
-// \
-
-// """;
-
-//   String kMultiPartBodyTemplate = r'''
-// //body tempalte
-
-// ''';
-//   var kGetFormDataTemplate = """
-// \$multipart = [
-//     [
-//         'name'     => 'formfield1',
-//         'contents' => 'formdata1'
-//     ],
-//     [
-//         'name'     => 'formfield2',
-//         'contents' => 'formdata2'
-//     ],
-//     [
-//         'name'     => 'formfile1',
-//         'contents' => fopen('C:\\Users\\Ashut\\Downloads\\8h45la.png', 'r')
-//     ]
-// ];
-
-// {{fields_list}};
-// """;
-
-//   String kTemplateStart = """
-// \$client = new Client();
-// \
-
-// """;
-
-//   String kStringRequest = """
-// \$request = new Request('{{method}}', '{{url}}' . \$queryParamsStr, \$headers, \$body);
-
-// \$res = \$client->sendAsync(\$request)->wait();
-
-// echo \$res->getBody();
-
-// """;
-
-//   String? getCode(
-//     RequestModel requestModel,
-//     String defaultUriScheme,
-//   ) {
-//     try {
-//       jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode);
-//       String importsData = kNodejsImportTemplate.render({
-//         "isFormDataRequest": requestModel.isFormDataRequest,
-//       });
-
-//       String result = importsData;
-
-//       if (requestModel.isFormDataRequest &&
-//           requestModel.formDataMapList.isNotEmpty) {
-//         var templateMultiPartBody = jj.Template(kMultiPartBodyTemplate);
-//         var renderedMultiPartBody = templateMultiPartBody.render({});
-//         result += renderedMultiPartBody;
-//       }
-
-//       String url = requestModel.url;
-//       if (!url.contains("://") && url.isNotEmpty) {
-//         url = "$defaultUriScheme://$url";
-//       }
-//       var rM = requestModel.copyWith(url: url);
-
-//       var harJson = requestModelToHARJsonRequest(rM, useEnabled: true);
-
-//       var params = harJson["queryString"];
-//       if (params.isNotEmpty) {
-//         var templateParams = jj.Template(kTemplateParams);
-//         var m = {};
-//         for (var i in params) {
-//           m[i["name"]] = i["value"];
-//         }
-//         var jsonString = '';
-//         m.forEach((key, value) {
-//           jsonString += "\t\t\t\t'$key' => '$value', \n";
-//         });
-//         jsonString = jsonString.substring(
-//             0, jsonString.length - 2); // Removing trailing comma and space
-//         result += templateParams.render({
-//           "params": jsonString,
-//         });
-//       }
-
-//       var headers = harJson["headers"];
-//       if (headers.isNotEmpty || requestModel.isFormDataRequest) {
-//         var templateHeader = jj.Template(kTemplateHeader);
-//         var m = {};
-//         for (var i in headers) {
-//           m[i["name"]] = i["value"];
-//         }
-//         var headersString = '';
-//         m.forEach((key, value) {
-//           headersString += "\t\t\t\t'$key' => '$value', \n";
-//         });
-//         headersString = headersString.substring(
-//             0, headersString.length - 2); // Removing trailing comma and space
-//         result += templateHeader.render({
-//           "headers": headersString,
-//         });
-//       }
-
-//       var templateBody = jj.Template(kTemplateBody);
-
-//       if (requestModel.isFormDataRequest &&
-//           requestModel.formDataMapList.isNotEmpty) {
-//         var getFieldDataTemplate = jj.Template(kGetFormDataTemplate);
-
-//         result += templateBody.render({
-//           "body": getFieldDataTemplate.render({
-//             "fields_list": json.encode(requestModel.formDataMapList),
-//           })
-//         });
-//       }
-//       if (harJson["postData"]?["text"] != null) {
-//         result += templateBody
-//             .render({"body": kEncoder.convert(harJson["postData"]["text"])});
-//       }
-//       result += kStringRequest;
-
-// var templateStart = jj.Template(kTemplateStart);
-// result += templateStart.render({
-//   // "url": stripUrlParams(url),
-//   // "method": harJson["method"].toLowerCase(),
-// });
-
-// var templateRequest = jj.Template(kStringRequest);
-// result += templateRequest.render({
-//   "url": stripUrlParams(url),
-//   "method": harJson["method"].toLowerCase(),
-// });
-
-//       return result;
-//     } catch (e) {
-//       return null;
-//     }
-//   }
-// }
-
-// import 'dart:convert';
-// import 'package:jinja/jinja.dart' as jj;
-// import 'package:apidash/utils/utils.dart'
-//     show padMultilineString, requestModelToHARJsonRequest, stripUrlParams;
-// import 'package:apidash/models/models.dart' show RequestModel;
-// import 'package:apidash/consts.dart';
-
-// class PhpGuzzleCodeGen {
-//   String kStringImportNode = """use GuzzleHttp\\Client;
-// use GuzzleHttp\\Psr7\\Request;
-// {% if isFormDataRequest %}use GuzzleHttp\\Psr7\\MultipartStream;
-// use GuzzleHttp\\Psr7\\Utils;{% endif %}
-// \
-
-// """;
-
-//   String kTemplateParams = """
-// \$queryParams = [
-// {{params}}
-// ];
-
-// \$queryParamsStr = '?' . http_build_query(\$queryParams);
-// \
-
-// """;
-
-//   String kTemplateHeader = """
-// \$headers = [
-// {{headers}}
-// ];
-// \
-
-// """;
-
-//   String kTemplateBody = """
-// \$body = {{body}};
-// \
-
-// """;
-
-//   String kMultiPartBodyTemplate = """
-// \$multipart = [
-// {{fields_list}}
-// ];
-// """;
-
-//   String kTemplateStart = """
-// \$client = new Client();
-// \
-
-// """;
-
-//   String kStringRequest = """
-// \$request = new Request('{{method}}', '{{url}}' . \$queryParamsStr, \$headers, {{body}});
-// \$res = \$client->sendAsync(\$request)->wait();
-// echo \$res->getBody();
-// """;
-
-//   String? getCode(
-//     RequestModel requestModel,
-//     String defaultUriScheme,
-//   ) {
-//     try {
-//       jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode);
-//       String importsData = kNodejsImportTemplate.render({
-//         "isFormDataRequest": requestModel.isFormDataRequest,
-//       });
-
-//       String result = importsData;
-
-//       if (requestModel.isFormDataRequest &&
-//           requestModel.formDataMapList.isNotEmpty) {
-//         var templateMultiPartBody = jj.Template(kMultiPartBodyTemplate);
-//         var renderedMultiPartBody = templateMultiPartBody.render({
-//           "fields_list": requestModel.formDataMapList.map((
-//             field,
-//           ) {
-//             return '''
-//     [
-//         'name'     => '${field['name']}',
-//         'contents' => '${field['contents']}'
-//     ],
-// ''';
-//           }).join(),
-//         });
-//         result += renderedMultiPartBody;
-//       }
-
-//       String url = requestModel.url;
-//       if (!url.contains("://") && url.isNotEmpty) {
-//         url = "$defaultUriScheme://$url";
-//       }
-//       var rM = requestModel.copyWith(url: url);
-
-//       var harJson = requestModelToHARJsonRequest(rM, useEnabled: true);
-
-//       var params = harJson["queryString"];
-//       if (params.isNotEmpty) {
-//         var templateParams = jj.Template(kTemplateParams);
-//         var m = {};
-//         for (var i in params) {
-//           m[i["name"]] = i["value"];
-//         }
-//         var jsonString = '';
-//         m.forEach((key, value) {
-//           jsonString += "\t\t\t\t'$key' => '$value', \n";
-//         });
-//         jsonString = jsonString.substring(
-//             0, jsonString.length - 2); // Removing trailing comma and space
-//         result += templateParams.render({
-//           "params": jsonString,
-//         });
-//       }
-
-//       var headers = harJson["headers"];
-//       if (headers.isNotEmpty || requestModel.isFormDataRequest) {
-//         var templateHeader = jj.Template(kTemplateHeader);
-//         var m = {};
-//         for (var i in headers) {
-//           m[i["name"]] = i["value"];
-//         }
-//         var headersString = '';
-//         m.forEach((key, value) {
-//           headersString += "\t\t\t\t'$key' => '$value', \n";
-//         });
-//         headersString = headersString.substring(
-//             0, headersString.length - 2); // Removing trailing comma and space
-//         result += templateHeader.render({
-//           "headers": headersString,
-//         });
-//       }
-
-//       var templateBody = jj.Template(kTemplateBody);
-
-//       if (requestModel.isFormDataRequest &&
-//           requestModel.formDataMapList.isNotEmpty) {
-//         result += templateBody.render({
-//           "body": "new MultipartStream(\$multipart)",
-//         });
-//       }
-//       if (harJson["postData"]?["text"] != null) {
-//         result += templateBody
-//             .render({"body": kEncoder.convert(harJson["postData"]["text"])});
-//       }
-
-//       var templateStart = jj.Template(kTemplateStart);
-//       result += templateStart.render({
-//         // "url": stripUrlParams(url),
-//         // "method": harJson["method"].toLowerCase(),
-//       });
-
-//       var templateRequest = jj.Template(kStringRequest);
-//       result += templateRequest.render({
-//         "url": stripUrlParams(url),
-//         "method": harJson["method"].toLowerCase(),
-//       });
-
-//       return result;
-//     } catch (e) {
-//       return null;
-//     }
-//   }
-// }
-
 import 'package:jinja/jinja.dart' as jj;
 import 'package:apidash/utils/utils.dart'
     show padMultilineString, requestModelToHARJsonRequest, stripUrlParams;
@@ -479,8 +138,6 @@ echo \$res->getBody();
             .render({"body": kEncoder.convert(harJson["postData"]["text"])});
       }
 
-      //result += kStringRequest;
-
       String getRequestBody(Map harJson) {
         if (harJson.containsKey("postData")) {
           var postData = harJson["postData"];
@@ -493,7 +150,7 @@ echo \$res->getBody();
             }
           }
         }
-        return ""; // Return empty string if postData is not present or if mimeType is not supported
+        return ""; // Return empty string if postData or formdata is not present
       }
 
       var templateRequest = jj.Template(kStringRequest);
@@ -501,7 +158,7 @@ echo \$res->getBody();
         "url": stripUrlParams(url),
         "method": harJson["method"].toLowerCase(),
         "queryParams":
-            harJson["queryString"].isNotEmpty ? " \$queryParamsStr," : "",
+            harJson["queryString"].isNotEmpty ? ". \$queryParamsStr," : "",
         "headers": harJson["headers"].isNotEmpty ? " \$headers," : "",
         "body": getRequestBody(harJson),
       });