@readme/httpsnippet 10.0.2 → 10.0.4

package/dist/index.cjs

@@ -3311,36 +3311,28 @@ var urlsession = {
     const opts = {
       indent: "  ",
       pretty: true,
-      timeout: "10",
+      timeout: 10,
       ...options
     };
     const { push, blank, join } = new CodeBuilder({ indent: opts.indent });
-    const req = {
-      hasHeaders: false,
-      hasBody: false
-    };
     push("import Foundation");
-    push("#if canImport(FoundationNetworking)");
-    push("  import FoundationNetworking");
-    push("#endif");
-    if (Object.keys(allHeaders).length) {
-      req.hasHeaders = true;
-      blank();
-      push(literalDeclaration("headers", allHeaders, opts));
-    }
-    if (postData.text || postData.jsonObj || postData.params) {
-      req.hasBody = true;
+    blank();
+    const hasBody = postData.text || postData.jsonObj || postData.params;
+    if (hasBody) {
       switch (postData.mimeType) {
         case "application/x-www-form-urlencoded":
-          blank();
           if (postData.params?.length) {
-            const [head, ...tail] = postData.params;
-            push(`${tail.length > 0 ? "var" : "let"} postData = Data("${head.name}=${head.value}".utf8)`);
-            tail.forEach(({ name, value }) => {
-              push(`postData.append(Data("&${name}=${value}".utf8))`);
-            });
-          } else {
-            req.hasBody = false;
+            const parameters = postData.params.map((p) => `"${p.name}": "${p.value}"`);
+            if (opts.pretty) {
+              push("let parameters = [");
+              parameters.forEach((param) => push(`${param},`, 1));
+              push("]");
+            } else {
+              push(`let parameters = [${parameters.join(", ")}]`);
+            }
+            push('let joinedParameters = parameters.map { "\\($0.key)=\\($0.value)" }.joined(separator: "&")');
+            push("let postData = Data(joinedParameters.utf8)");
+            blank();
           }
           break;
         case "application/json":
@@ -3348,6 +3340,7 @@ var urlsession = {
             push(`${literalDeclaration("parameters", postData.jsonObj, opts)} as [String : Any]`);
             blank();
             push("let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])");
+            blank();
           }
           break;
         case "multipart/form-data":
@@ -3356,17 +3349,13 @@ var urlsession = {
           push(`let boundary = "${postData.boundary}"`);
           blank();
           push('var body = ""');
-          push("var error: NSError? = nil");
           push("for param in parameters {");
           push('let paramName = param["name"]!', 1);
           push('body += "--\\(boundary)\\r\\n"', 1);
           push('body += "Content-Disposition:form-data; name=\\"\\(paramName)\\""', 1);
           push('if let filename = param["fileName"] {', 1);
           push('let contentType = param["content-type"]!', 2);
-          push("let fileContent = String(contentsOfFile: filename, encoding: String.Encoding.utf8)", 2);
-          push("if (error != nil) {", 2);
-          push("print(error as Any)", 3);
-          push("}", 2);
+          push("let fileContent = try String(contentsOfFile: filename, encoding: .utf8)", 2);
           push('body += "; filename=\\"\\(filename)\\"\\r\\n"', 2);
           push('body += "Content-Type: \\(contentType)\\r\\n\\r\\n"', 2);
           push("body += fileContent", 2);
@@ -3374,13 +3363,15 @@ var urlsession = {
           push('body += "\\r\\n\\r\\n\\(paramValue)"', 2);
           push("}", 1);
           push("}");
+          blank();
+          push("let postData = Data(body.utf8)");
+          blank();
           break;
         default:
-          blank();
           push(`let postData = Data("${postData.text}".utf8)`);
+          blank();
       }
     }
-    blank();
     push(`let url = URL(string: "${uriObj.href}")!`);
     const queries = queryObj ? Object.entries(queryObj) : [];
     if (queries.length < 1) {
@@ -3393,11 +3384,11 @@ var urlsession = {
         const value = query[1];
         switch (Object.prototype.toString.call(value)) {
           case "[object String]":
-            push(`${opts.indent}URLQueryItem(name: "${key}", value: "${value}"),`);
+            push(`URLQueryItem(name: "${key}", value: "${value}"),`, 1);
             break;
           case "[object Array]":
             value.forEach((val) => {
-              push(`${opts.indent}URLQueryItem(name: "${key}", value: "${val}"),`);
+              push(`URLQueryItem(name: "${key}", value: "${val}"),`, 1);
             });
             break;
         }
@@ -3408,16 +3399,16 @@ var urlsession = {
       push("var request = URLRequest(url: components.url!)");
     }
     push(`request.httpMethod = "${method}"`);
-    if (req.hasHeaders) {
-      push("request.allHTTPHeaderFields = headers");
+    push(`request.timeoutInterval = ${opts.timeout}`);
+    if (Object.keys(allHeaders).length) {
+      push(`request.allHTTPHeaderFields = ${literalRepresentation3(allHeaders, opts)}`);
     }
-    if (req.hasBody) {
+    if (hasBody) {
       push("request.httpBody = postData");
     }
     blank();
     push("let (data, response) = try await URLSession.shared.data(for: request)");
     push("print(String(decoding: data, as: UTF8.self))");
-    blank();
     return join();
   }
 };