Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed swift Code (Tested) #693

Merged
merged 3 commits into from
Mar 30, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 44 additions & 29 deletions lib/codegen/swift/urlsession.dart
Original file line number Diff line number Diff line change
@@ -37,14 +37,16 @@ let multipartFormData = try! MultipartFormData(boundary: boundary) {
''';

final String kTemplateJsonData = '''
let parameters = "{{jsonData}}"
let postData = parameters.data(using: .utf8)
let postData = """
{{jsonData}}
""".data(using: .utf8)
''';

final String kTemplateTextData = '''
let parameters = "{{textData}}"
let postData = parameters.data(using: .utf8)
let postData = """
{{textData}}
""".data(using: .utf8)
''';

@@ -61,46 +63,55 @@ request.addValue("{{value}}", forHTTPHeaderField: "{{header}}")
""";

final String kTemplateBody = """
final String kTemplateFormDataBody = """
request.httpBody = try! multipartFormData.encode()
""";

final String kTemplateJsonTextBody = """
request.httpBody = postData
""";

final String kTemplateEnd = """
let semaphore = DispatchSemaphore(value: 0)
let task = URLSession.shared.dataTask(with: request) { data, response, error in
defer { semaphore.signal() }
if let error = error {
print("Error: (error.localizedDescription)")
print("Error: \\(error.localizedDescription)")
return
}
guard let data = data else {
print("No data received")
return
}
if let responseString = String(data: data, encoding: .utf8) {
print("Response: (responseString)")
print("Response: \\(responseString)")
}
}
task.resume()
semaphore.wait()
""";


String? getCode(HttpRequestModel requestModel) {
try {
String result = kTemplateStart;

if (requestModel.hasFormData) {
result += kTemplateFormDataImport;
}

var rec =
getValidRequestUri(requestModel.url, requestModel.enabledParams);
var rec = getValidRequestUri(requestModel.url, requestModel.enabledParams);
Uri? uri = rec.$1;

if (requestModel.hasFormData) {
result += kTemplateFormDataImport;

var formDataList = requestModel.formDataMapList.map((param) {
if (param['type'] == 'file') {
final filePath = param['value'] as String;
final fileName = path.basename(filePath);
final fileExtension =
final fileExtension =
path.extension(fileName).toLowerCase().replaceFirst('.', '');
return {
'type': 'file',
@@ -122,17 +133,19 @@ task.resume()
result += templateFormData.render({
"formData": formDataList,
});
} else if (requestModel.hasJsonData) {
}
// Handle JSON data
else if (requestModel.hasJsonData) {
var templateJsonData = jj.Template(kTemplateJsonData);
result += templateJsonData.render({
"jsonData":
requestModel.body!.replaceAll('"', '\\"').replaceAll('\n', '\\n'),
});
} else if (requestModel.hasTextData) {
"jsonData": requestModel.body!
});
}
// Handle text data
else if (requestModel.hasTextData) {
var templateTextData = jj.Template(kTemplateTextData);
result += templateTextData.render({
"textData":
requestModel.body!.replaceAll('"', '\\"').replaceAll('\n', '\\n'),
"textData": requestModel.body!
});
}

@@ -144,19 +157,21 @@ task.resume()

var headers = requestModel.enabledHeadersMap;
if (requestModel.hasFormData) {
headers.putIfAbsent("Content-Type",
() => "multipart/form-data; boundary=(boundary.stringValue)");
} else if (requestModel.hasJsonData || requestModel.hasTextData) {
headers.putIfAbsent(
kHeaderContentType, () => requestModel.bodyContentType.header);
}
headers['Content-Type'] =
"multipart/form-data; boundary=\\(boundary.stringValue)";
} else if(requestModel.hasJsonData||requestModel.hasTextData){
headers['Content-Type'] = 'application/json';
}

if (headers.isNotEmpty) {
var templateHeader = jj.Template(kTemplateHeaders);
result += templateHeader.render({"headers": headers});
}

if (requestModel.hasFormData || requestModel.hasBody) {
result += kTemplateBody;
if (requestModel.hasFormData) {
result += kTemplateFormDataBody;
} else if (requestModel.hasJsonData || requestModel.hasTextData) {
result += kTemplateJsonTextBody;
}

result += kTemplateEnd;
1,255 changes: 761 additions & 494 deletions test/codegen/swift_urlsession_test.dart

Large diffs are not rendered by default.