From 7e1ca33a28921789f0720542e63b2c520e553fcf Mon Sep 17 00:00:00 2001 From: ch1nru5t Date: Sat, 24 Feb 2024 12:48:53 +0530 Subject: [PATCH 1/3] fixed curl code gen error for empty url --- lib/codegen/others/curl.dart | 65 +++++++++++++++++++---------- pubspec.lock | 40 ++++++++++++++---- test/codegen/curl_codegen_test.dart | 5 ++- 3 files changed, 78 insertions(+), 32 deletions(-) diff --git a/lib/codegen/others/curl.dart b/lib/codegen/others/curl.dart index 4ae610de..638e9da5 100644 --- a/lib/codegen/others/curl.dart +++ b/lib/codegen/others/curl.dart @@ -1,6 +1,7 @@ -import 'package:jinja/jinja.dart' as jj; -import 'package:apidash/utils/utils.dart' show requestModelToHARJsonRequest; import 'package:apidash/models/models.dart' show RequestModel; +import 'package:jinja/jinja.dart' as jj; + +import '../../consts.dart'; // ignore: camel_case_types class cURLCodeGen { @@ -29,30 +30,48 @@ class cURLCodeGen { if (!url.contains("://") && url.isNotEmpty) { url = "$defaultUriScheme://$url"; } + if (requestModel.enabledParamsMap.isNotEmpty) { + if (!url.contains('?')) { + url += "?"; + } else { + url += "&"; + } + for (MapEntry entry + in requestModel.enabledParamsMap.entries) { + url += "${Uri.encodeFull(entry.key)}=${Uri.encodeFull(entry.value)}&"; + } + url = url.substring(0, url.length - 1); + } var rM = requestModel.copyWith(url: url); - - var harJson = requestModelToHARJsonRequest(rM, useEnabled: true); - var templateStart = jj.Template(kTemplateStart); result += templateStart.render({ - "method": switch (harJson["method"]) { + "method": switch (rM.method.name.toUpperCase()) { "GET" => "", "HEAD" => " --head", - _ => " --request ${harJson["method"]} \\\n" + _ => " --request ${rM.method.name.toUpperCase()} \\\n" }, - "url": harJson["url"], + "url": rM.url, }); - var headers = harJson["headers"]; - if (headers.isNotEmpty) { - for (var item in headers) { - var templateHeader = jj.Template(kTemplateHeader); - result += templateHeader - .render({"name": item["name"], "value": item["value"]}); - } + Map headers = rM.enabledHeadersMap; + if (rM.requestBody != null && + rM.requestBody!.isNotEmpty && + rM.method != HTTPVerb.get && + rM.requestBodyContentType != ContentType.formdata) { + var templateHeader = jj.Template(kTemplateHeader); + result += templateHeader.render({ + "name": "Content-Type", + "value": rM.requestBodyContentType.header + }); } - if (harJson['formData'] != null) { - var formDataList = harJson['formData'] as List>; + for (MapEntry header in headers.entries) { + var templateHeader = jj.Template(kTemplateHeader); + result += + templateHeader.render({"name": header.key, "value": header.value}); + } + + if (rM.requestBodyContentType == ContentType.formdata) { + List> formDataList = rM.formDataMapList; for (var formData in formDataList) { var templateFormData = jj.Template(kTemplateFormData); if (formData['type'] != null && @@ -67,11 +86,13 @@ class cURLCodeGen { }); } } - } - - if (harJson["postData"]?["text"] != null) { - var templateBody = jj.Template(kTemplateBody); - result += templateBody.render({"body": harJson["postData"]["text"]}); + } else { + if (rM.requestBody != null && + rM.requestBody!.isNotEmpty && + rM.method != HTTPVerb.get) { + var templateBody = jj.Template(kTemplateBody); + result += templateBody.render({"body": rM.requestBody}); + } } return result; } catch (e) { diff --git a/pubspec.lock b/pubspec.lock index 2f3f7f55..1737f75f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -625,6 +625,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -661,26 +685,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" mime: dependency: transitive description: @@ -757,10 +781,10 @@ packages: dependency: "direct main" description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: diff --git a/test/codegen/curl_codegen_test.dart b/test/codegen/curl_codegen_test.dart index e9bb7f60..b62de8b4 100644 --- a/test/codegen/curl_codegen_test.dart +++ b/test/codegen/curl_codegen_test.dart @@ -1,7 +1,8 @@ import 'package:apidash/codegen/others/curl.dart'; -import '../request_models.dart'; import 'package:test/test.dart'; +import '../request_models.dart'; + void main() { final curlCodeGen = cURLCodeGen(); @@ -19,7 +20,7 @@ void main() { test('GET 3', () { const expectedCode = - r"""curl --url 'https://api.foss42.com/country/data?code=IND'"""; + r"""curl --url 'https://api.foss42.com/country/data?code=US&code=IND'"""; expect(curlCodeGen.getCode(requestModelGet3, "https"), expectedCode); }); From 28516cd1c92ec4b2604b572cf79b70fdc33ac226 Mon Sep 17 00:00:00 2001 From: Ankit Mahato Date: Sun, 10 Mar 2024 06:59:31 +0530 Subject: [PATCH 2/3] Revert "fixed curl code gen error for empty url" This reverts commit 7e1ca33a28921789f0720542e63b2c520e553fcf. --- lib/codegen/others/curl.dart | 65 ++++++++++------------------- pubspec.lock | 40 ++++-------------- test/codegen/curl_codegen_test.dart | 5 +-- 3 files changed, 32 insertions(+), 78 deletions(-) diff --git a/lib/codegen/others/curl.dart b/lib/codegen/others/curl.dart index 638e9da5..4ae610de 100644 --- a/lib/codegen/others/curl.dart +++ b/lib/codegen/others/curl.dart @@ -1,7 +1,6 @@ -import 'package:apidash/models/models.dart' show RequestModel; import 'package:jinja/jinja.dart' as jj; - -import '../../consts.dart'; +import 'package:apidash/utils/utils.dart' show requestModelToHARJsonRequest; +import 'package:apidash/models/models.dart' show RequestModel; // ignore: camel_case_types class cURLCodeGen { @@ -30,48 +29,30 @@ class cURLCodeGen { if (!url.contains("://") && url.isNotEmpty) { url = "$defaultUriScheme://$url"; } - if (requestModel.enabledParamsMap.isNotEmpty) { - if (!url.contains('?')) { - url += "?"; - } else { - url += "&"; - } - for (MapEntry entry - in requestModel.enabledParamsMap.entries) { - url += "${Uri.encodeFull(entry.key)}=${Uri.encodeFull(entry.value)}&"; - } - url = url.substring(0, url.length - 1); - } var rM = requestModel.copyWith(url: url); + + var harJson = requestModelToHARJsonRequest(rM, useEnabled: true); + var templateStart = jj.Template(kTemplateStart); result += templateStart.render({ - "method": switch (rM.method.name.toUpperCase()) { + "method": switch (harJson["method"]) { "GET" => "", "HEAD" => " --head", - _ => " --request ${rM.method.name.toUpperCase()} \\\n" + _ => " --request ${harJson["method"]} \\\n" }, - "url": rM.url, + "url": harJson["url"], }); - Map headers = rM.enabledHeadersMap; - if (rM.requestBody != null && - rM.requestBody!.isNotEmpty && - rM.method != HTTPVerb.get && - rM.requestBodyContentType != ContentType.formdata) { - var templateHeader = jj.Template(kTemplateHeader); - result += templateHeader.render({ - "name": "Content-Type", - "value": rM.requestBodyContentType.header - }); + var headers = harJson["headers"]; + if (headers.isNotEmpty) { + for (var item in headers) { + var templateHeader = jj.Template(kTemplateHeader); + result += templateHeader + .render({"name": item["name"], "value": item["value"]}); + } } - for (MapEntry header in headers.entries) { - var templateHeader = jj.Template(kTemplateHeader); - result += - templateHeader.render({"name": header.key, "value": header.value}); - } - - if (rM.requestBodyContentType == ContentType.formdata) { - List> formDataList = rM.formDataMapList; + if (harJson['formData'] != null) { + var formDataList = harJson['formData'] as List>; for (var formData in formDataList) { var templateFormData = jj.Template(kTemplateFormData); if (formData['type'] != null && @@ -86,13 +67,11 @@ class cURLCodeGen { }); } } - } else { - if (rM.requestBody != null && - rM.requestBody!.isNotEmpty && - rM.method != HTTPVerb.get) { - var templateBody = jj.Template(kTemplateBody); - result += templateBody.render({"body": rM.requestBody}); - } + } + + if (harJson["postData"]?["text"] != null) { + var templateBody = jj.Template(kTemplateBody); + result += templateBody.render({"body": harJson["postData"]["text"]}); } return result; } catch (e) { diff --git a/pubspec.lock b/pubspec.lock index 1737f75f..2f3f7f55 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -625,30 +625,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.0" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" - url: "https://pub.dev" - source: hosted - version: "10.0.0" - leak_tracker_flutter_testing: - dependency: transitive - description: - name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 - url: "https://pub.dev" - source: hosted - version: "2.0.1" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 - url: "https://pub.dev" - source: hosted - version: "2.0.1" lints: dependency: transitive description: @@ -685,26 +661,26 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.10.0" mime: dependency: transitive description: @@ -781,10 +757,10 @@ packages: dependency: "direct main" description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.8.3" path_parsing: dependency: transitive description: diff --git a/test/codegen/curl_codegen_test.dart b/test/codegen/curl_codegen_test.dart index b62de8b4..e9bb7f60 100644 --- a/test/codegen/curl_codegen_test.dart +++ b/test/codegen/curl_codegen_test.dart @@ -1,7 +1,6 @@ import 'package:apidash/codegen/others/curl.dart'; -import 'package:test/test.dart'; - import '../request_models.dart'; +import 'package:test/test.dart'; void main() { final curlCodeGen = cURLCodeGen(); @@ -20,7 +19,7 @@ void main() { test('GET 3', () { const expectedCode = - r"""curl --url 'https://api.foss42.com/country/data?code=US&code=IND'"""; + r"""curl --url 'https://api.foss42.com/country/data?code=IND'"""; expect(curlCodeGen.getCode(requestModelGet3, "https"), expectedCode); }); From d23019a43d911ecad964d03635ae0877b2cded4e Mon Sep 17 00:00:00 2001 From: Ankit Mahato Date: Sun, 10 Mar 2024 07:02:23 +0530 Subject: [PATCH 3/3] Accept test change --- test/codegen/curl_codegen_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/codegen/curl_codegen_test.dart b/test/codegen/curl_codegen_test.dart index e9bb7f60..6ba9c01b 100644 --- a/test/codegen/curl_codegen_test.dart +++ b/test/codegen/curl_codegen_test.dart @@ -1,6 +1,6 @@ +import 'package:test/test.dart'; import 'package:apidash/codegen/others/curl.dart'; import '../request_models.dart'; -import 'package:test/test.dart'; void main() { final curlCodeGen = cURLCodeGen();