Skip to content

Swift Language Update #660

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 28, 2023
Merged

Swift Language Update #660

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d49494
updated swift styling
maxxfrazer Jan 9, 2023
b170f13
lowered indentation by calling continue if disabled is not nil
maxxfrazer Jan 9, 2023
06812bc
added a couple other missed spaces after colons
maxxfrazer Feb 27, 2023
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
40 changes: 20 additions & 20 deletions codegens/swift/lib/swift.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,30 +109,30 @@ function parseFormData (body, mode, trim, indent) {
}
});
parameters = '[\n' + _.join(parameters, ',\n') + ']';
bodySnippet = `let parameters = ${parameters} as [[String : Any]]\n\n`;
bodySnippet = `let parameters = ${parameters} as [[String: Any]]\n\n`;
bodySnippet += 'let boundary = "Boundary-\\(UUID().uuidString)"\n';
bodySnippet += 'var body = ""\nvar error: Error? = nil\n';
bodySnippet += 'for param in parameters {\n';
bodySnippet += `${indent}if param["disabled"] == nil {\n`;
bodySnippet += `${indent.repeat(2)}let paramName = param["key"]!\n`;
bodySnippet += `${indent.repeat(2)}body += "--\\(boundary)\\r\\n"\n`;
bodySnippet += `${indent}if param["disabled"] != nil { continue }\n`;
bodySnippet += `${indent}let paramName = param["key"]!\n`;
bodySnippet += `${indent}body += "--\\(boundary)\\r\\n"\n`;
// eslint-disable-next-line no-useless-escape
bodySnippet += `${indent.repeat(2)}body += "Content-Disposition:form-data; name=\\"\\(paramName)\\"\"\n`;
bodySnippet += `${indent.repeat(2)}if param["contentType"] != nil {\n`;
bodySnippet += `${indent.repeat(3)}body += "\\r\\nContent-Type: \\(param["contentType"] as! String)"\n`;
bodySnippet += `${indent.repeat(2)}}\n`;
bodySnippet += `${indent.repeat(2)}let paramType = param["type"] as! String\n`;
bodySnippet += `${indent.repeat(2)}if paramType == "text" {\n`;
bodySnippet += `${indent.repeat(3)}let paramValue = param["value"] as! String\n`;
bodySnippet += `${indent.repeat(3)}body += "\\r\\n\\r\\n\\(paramValue)\\r\\n"\n`;
bodySnippet += `${indent.repeat(2)}} else {\n`;
bodySnippet += `${indent.repeat(3)}let paramSrc = param["src"] as! String\n`;
bodySnippet += `${indent.repeat(3)}let fileData = try NSData(contentsOfFile:paramSrc, options:[]) as Data\n`;
bodySnippet += `${indent.repeat(3)}let fileContent = String(data: fileData, encoding: .utf8)!\n`;
bodySnippet += `${indent.repeat(3)}body += "; filename=\\"\\(paramSrc)\\"\\r\\n"\n`;
bodySnippet += `${indent.repeat(3)} + "Content-Type: \\"content-type header\\"\\r\\n\\r\\n`;
bodySnippet += `${indent}body += "Content-Disposition:form-data; name=\\"\\(paramName)\\"\"\n`;
bodySnippet += `${indent}if param["contentType"] != nil {\n`;
bodySnippet += `${indent.repeat(2)}body += "\\r\\nContent-Type: \\(param["contentType"] as! String)"\n`;
bodySnippet += `${indent}}\n`;
bodySnippet += `${indent}let paramType = param["type"] as! String\n`;
bodySnippet += `${indent}if paramType == "text" {\n`;
bodySnippet += `${indent.repeat(2)}let paramValue = param["value"] as! String\n`;
bodySnippet += `${indent.repeat(2)}body += "\\r\\n\\r\\n\\(paramValue)\\r\\n"\n`;
bodySnippet += `${indent}} else {\n`;
bodySnippet += `${indent.repeat(2)}let paramSrc = param["src"] as! String\n`;
bodySnippet += `${indent.repeat(2)}let fileData = try NSData(contentsOfFile: paramSrc, options: []) as Data\n`;
bodySnippet += `${indent.repeat(2)}let fileContent = String(data: fileData, encoding: .utf8)!\n`;
bodySnippet += `${indent.repeat(2)}body += "; filename=\\"\\(paramSrc)\\"\\r\\n"\n`;
bodySnippet += `${indent.repeat(2)} + "Content-Type: \\"content-type header\\"\\r\\n\\r\\n`;
bodySnippet += '\\(fileContent)\\r\\n"\n';
bodySnippet += `${indent.repeat(2)}}\n${indent}}\n}\nbody += "--\\(boundary)--\\r\\n";\n`;
bodySnippet += `${indent}}\n}\nbody += "--\\(boundary)--\\r\\n";\n`;
bodySnippet += 'let postData = body.data(using: .utf8)';
return bodySnippet;
}
Expand All @@ -147,7 +147,7 @@ function parseFile () {
// var bodySnippet = 'let filename = "{Insert_File_Name}", postData = Data()\n';
// bodySnippet += 'if let path = Bundle.main.path(forResource: filename, ofType: nil) {\n';
// bodySnippet += `${indent}do {\n${indent.repeat(2)}postData =
// try NSData(contentsOfFile:path, options:[]) as Data\n`;
// try NSData(contentsOfFile: path, options: []) as Data\n`;
// bodySnippet += `${indent}} catch {\n`;
// bodySnippet += `${indent.repeat(2)}print("Failed to read from \\(String(describing: filename))")\n`;
// bodySnippet += `${indent}}\n} else {\n`;
Expand Down