diff --git a/lib/codegen/java/okhttp.dart b/lib/codegen/java/okhttp.dart index 12b2f90f..9045aa55 100644 --- a/lib/codegen/java/okhttp.dart +++ b/lib/codegen/java/okhttp.dart @@ -140,7 +140,7 @@ import okhttp3.MultipartBody;"""; var templateBody = jj.Template(kTemplateRequestBody); result += templateBody.render({ "contentType": contentType, - "body": kEncoder.convert(requestBody) + "body": kJsonEncoder.convert(requestBody) }); } } diff --git a/lib/codegen/js/axios.dart b/lib/codegen/js/axios.dart index faf97304..6314bdcd 100644 --- a/lib/codegen/js/axios.dart +++ b/lib/codegen/js/axios.dart @@ -79,7 +79,7 @@ axios(config) m[i["name"]] = i["value"]; } result += templateParams - .render({"params": padMultilineString(kEncoder.convert(m), 2)}); + .render({"params": padMultilineString(kJsonEncoder.convert(m), 2)}); } var headers = harJson["headers"]; @@ -92,8 +92,8 @@ axios(config) if (requestModel.hasFormData) { m[kHeaderContentType] = ContentType.formdata.header; } - result += templateHeader - .render({"headers": padMultilineString(kEncoder.convert(m), 2)}); + result += templateHeader.render( + {"headers": padMultilineString(kJsonEncoder.convert(m), 2)}); } var templateBody = jj.Template(kTemplateBody); if (requestModel.hasFormData && requestModel.formDataMapList.isNotEmpty) { @@ -108,12 +108,13 @@ axios(config) : "fileInput$formFileCounter.files[0]"; if (element["type"] == "file") formFileCounter++; } - var sanitizedJSObject = sanitzeJSObject(kEncoder.convert(formParams)); + var sanitizedJSObject = + sanitzeJSObject(kJsonEncoder.convert(formParams)); result += templateBody .render({"body": padMultilineString(sanitizedJSObject, 2)}); } else if (harJson["postData"]?["text"] != null) { - result += templateBody - .render({"body": kEncoder.convert(harJson["postData"]["text"])}); + result += templateBody.render( + {"body": kJsonEncoder.convert(harJson["postData"]["text"])}); } result += kStringRequest; return result; diff --git a/lib/codegen/js/fetch.dart b/lib/codegen/js/fetch.dart index 21c4f238..c4ca14b0 100644 --- a/lib/codegen/js/fetch.dart +++ b/lib/codegen/js/fetch.dart @@ -106,7 +106,7 @@ fetch(url, options) } if (m.isNotEmpty) { result += templateHeader.render({ - "headers": padMultilineString(kEncoder.convert(m), 2), + "headers": padMultilineString(kJsonEncoder.convert(m), 2), }); } } @@ -114,7 +114,7 @@ fetch(url, options) if (harJson["postData"]?["text"] != null) { var templateBody = jj.Template(kTemplateBody); result += templateBody.render({ - "body": kEncoder.convert(harJson["postData"]["text"]), + "body": kJsonEncoder.convert(harJson["postData"]["text"]), }); } else if (requestModel.hasFormData) { var templateBody = jj.Template(kTemplateBody); diff --git a/lib/codegen/others/har.dart b/lib/codegen/others/har.dart index 32a35abe..acef6357 100644 --- a/lib/codegen/others/har.dart +++ b/lib/codegen/others/har.dart @@ -9,7 +9,7 @@ class HARCodeGen { String? boundary, }) { try { - var harString = kEncoder.convert(requestModelToHARJsonRequest( + var harString = kJsonEncoder.convert(requestModelToHARJsonRequest( requestModel, defaultUriScheme: defaultUriScheme, useEnabled: true, diff --git a/lib/codegen/python/http_client.dart b/lib/codegen/python/http_client.dart index ea783ebe..f58607c2 100644 --- a/lib/codegen/python/http_client.dart +++ b/lib/codegen/python/http_client.dart @@ -111,7 +111,7 @@ body = b'\r\n'.join(dataList) if (params.isNotEmpty) { hasQuery = true; var templateParams = jj.Template(kTemplateParams); - var paramsString = kEncoder.convert(params); + var paramsString = kJsonEncoder.convert(params); result += templateParams.render({"params": paramsString}); } } @@ -143,7 +143,7 @@ body = b'\r\n'.join(dataList) }); } } - var headersString = kEncoder.convert(headers); + var headersString = kJsonEncoder.convert(headers); var templateHeaders = jj.Template(kTemplateHeaders); result += templateHeaders.render({"headers": headersString}); } diff --git a/lib/codegen/python/requests.dart b/lib/codegen/python/requests.dart index bb41ad9d..8ca4c152 100644 --- a/lib/codegen/python/requests.dart +++ b/lib/codegen/python/requests.dart @@ -107,7 +107,7 @@ print('Response Body:', response.text) if (params.isNotEmpty) { hasQuery = true; var templateParams = jj.Template(kTemplateParams); - var paramsString = kEncoder.convert(params); + var paramsString = kJsonEncoder.convert(params); result += templateParams.render({"params": paramsString}); } } @@ -162,7 +162,7 @@ print('Response Body:', response.text) } if (headers.isNotEmpty) { hasHeaders = true; - var headersString = kEncoder.convert(headers); + var headersString = kJsonEncoder.convert(headers); headersString = refactorHeaderString(headersString); var templateHeaders = jj.Template(kTemplateHeaders); result += templateHeaders.render({"headers": headersString}); diff --git a/lib/consts.dart b/lib/consts.dart index 9d72e0e3..1681069a 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -413,7 +413,8 @@ enum ImportFormat { final String label; } -const JsonEncoder kEncoder = JsonEncoder.withIndent(' '); +const JsonEncoder kJsonEncoder = JsonEncoder.withIndent(' '); +const JsonDecoder kJsonDecoder = JsonDecoder(); const LineSplitter kSplitter = LineSplitter(); const String kGlobalEnvironmentId = "global"; diff --git a/lib/utils/convert_utils.dart b/lib/utils/convert_utils.dart index d0b2ac26..b3c3b2bc 100644 --- a/lib/utils/convert_utils.dart +++ b/lib/utils/convert_utils.dart @@ -150,7 +150,7 @@ Uint8List jsonMapToBytes(Map? map) { if (map == null) { return Uint8List.fromList([]); } else { - String text = kEncoder.convert(map); + String text = kJsonEncoder.convert(map); var l = utf8.encode(text); var bytes = Uint8List.fromList(l); return bytes; diff --git a/lib/utils/http_utils.dart b/lib/utils/http_utils.dart index 4688d2af..e323939a 100644 --- a/lib/utils/http_utils.dart +++ b/lib/utils/http_utils.dart @@ -138,7 +138,7 @@ String? formatBody(String? body, MediaType? mediaType) { try { if (subtype.contains(kSubTypeJson)) { final tmp = jsonDecode(body); - String result = kEncoder.convert(tmp); + String result = kJsonEncoder.convert(tmp); return result; } if (subtype.contains(kSubTypeXml)) { diff --git a/lib/widgets/json_previewer.dart b/lib/widgets/json_previewer.dart index 3a4f5648..020015d6 100644 --- a/lib/widgets/json_previewer.dart +++ b/lib/widgets/json_previewer.dart @@ -182,7 +182,7 @@ class _JsonPreviewerState extends State { TextButton( onPressed: () async { await _copy( - kEncoder.convert(widget.code), sm); + kJsonEncoder.convert(widget.code), sm); }, child: const Text( 'Copy', @@ -215,7 +215,7 @@ class _JsonPreviewerState extends State { visualDensity: VisualDensity.compact, onPressed: () async { await _copy( - kEncoder.convert(widget.code), sm); + kJsonEncoder.convert(widget.code), sm); }, icon: const Icon( Icons.copy, @@ -273,7 +273,7 @@ class _JsonPreviewerState extends State { ), onPressed: () async { await _copy( - kEncoder.convert(toJson(node)), sm); + kJsonEncoder.convert(toJson(node)), sm); }, ), ) diff --git a/lib/widgets/response_widgets.dart b/lib/widgets/response_widgets.dart index 0df9343b..42154478 100644 --- a/lib/widgets/response_widgets.dart +++ b/lib/widgets/response_widgets.dart @@ -262,7 +262,7 @@ class ResponseHeadersHeader extends StatelessWidget { ), if (map.isNotEmpty) CopyButton( - toCopy: kEncoder.convert(map), + toCopy: kJsonEncoder.convert(map), ), ], ),