Merge branch 'foss42:main' into feat/URLSession-codegen

This commit is contained in:
Deepraj Baidya
2024-09-23 01:35:04 +05:30
committed by GitHub
43 changed files with 805 additions and 194 deletions

View File

@ -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)
});
}
}

View File

@ -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;

View File

@ -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);

View File

@ -9,7 +9,7 @@ class HARCodeGen {
String? boundary,
}) {
try {
var harString = kEncoder.convert(requestModelToHARJsonRequest(
var harString = kJsonEncoder.convert(requestModelToHARJsonRequest(
requestModel,
defaultUriScheme: defaultUriScheme,
useEnabled: true,

View File

@ -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});
}

View File

@ -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});