@readme/httpsnippet 10.0.0 → 10.0.2

package/dist/index.cjs

@@ -3292,22 +3292,22 @@ var literalRepresentation3 = (value, opts, indentLevel) => {
       return value.toString();
     default:
       if (value === null || value === void 0) {
-        return "";
+        return "nil";
       }
       return `"${value.toString().replace(/"/g, '\\"')}"`;
   }
 };
 
-// src/targets/swift/nsurlsession/client.ts
-var nsurlsession2 = {
+// src/targets/swift/urlsession/client.ts
+var urlsession = {
   info: {
-    key: "nsurlsession",
-    title: "NSURLSession",
-    link: "https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLSession_class/index.html",
-    description: "Foundation's NSURLSession request",
+    key: "urlsession",
+    title: "URLSession",
+    link: "https://developer.apple.com/documentation/foundation/urlsession",
+    description: "Foundation's URLSession request",
     extname: ".swift"
   },
-  convert: ({ allHeaders, postData, fullUrl, method }, options) => {
+  convert: ({ allHeaders, postData, uriObj, queryObj, method }, options) => {
     const opts = {
       indent: "  ",
       pretty: true,
@@ -3320,6 +3320,9 @@ var nsurlsession2 = {
       hasBody: false
     };
     push("import Foundation");
+    push("#if canImport(FoundationNetworking)");
+    push("  import FoundationNetworking");
+    push("#endif");
     if (Object.keys(allHeaders).length) {
       req.hasHeaders = true;
       blank();
@@ -3332,9 +3335,9 @@ var nsurlsession2 = {
           blank();
           if (postData.params?.length) {
             const [head, ...tail] = postData.params;
-            push(`let postData = NSMutableData(data: "${head.name}=${head.value}".data(using: String.Encoding.utf8)!)`);
+            push(`${tail.length > 0 ? "var" : "let"} postData = Data("${head.name}=${head.value}".utf8)`);
             tail.forEach(({ name, value }) => {
-              push(`postData.append("&${name}=${value}".data(using: String.Encoding.utf8)!)`);
+              push(`postData.append(Data("&${name}=${value}".utf8))`);
             });
           } else {
             req.hasBody = false;
@@ -3344,7 +3347,7 @@ var nsurlsession2 = {
           if (postData.jsonObj) {
             push(`${literalDeclaration("parameters", postData.jsonObj, opts)} as [String : Any]`);
             blank();
-            push("let postData = JSONSerialization.data(withJSONObject: parameters, options: [])");
+            push("let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])");
           }
           break;
         case "multipart/form-data":
@@ -3374,37 +3377,47 @@ var nsurlsession2 = {
           break;
         default:
           blank();
-          push(`let postData = NSData(data: "${postData.text}".data(using: String.Encoding.utf8)!)`);
+          push(`let postData = Data("${postData.text}".utf8)`);
       }
     }
     blank();
-    push(`let request = NSMutableURLRequest(url: NSURL(string: "${fullUrl}")! as URL,`);
-    push("                                        cachePolicy: .useProtocolCachePolicy,");
-    push(
-      // @ts-expect-error needs better types
-      `                                    timeoutInterval: ${parseInt(opts.timeout, 10).toFixed(1)})`
-    );
+    push(`let url = URL(string: "${uriObj.href}")!`);
+    const queries = queryObj ? Object.entries(queryObj) : [];
+    if (queries.length < 1) {
+      push("var request = URLRequest(url: url)");
+    } else {
+      push("var components = URLComponents(url: url, resolvingAgainstBaseURL: true)!");
+      push("let queryItems: [URLQueryItem] = [");
+      queries.forEach((query) => {
+        const key = query[0];
+        const value = query[1];
+        switch (Object.prototype.toString.call(value)) {
+          case "[object String]":
+            push(`${opts.indent}URLQueryItem(name: "${key}", value: "${value}"),`);
+            break;
+          case "[object Array]":
+            value.forEach((val) => {
+              push(`${opts.indent}URLQueryItem(name: "${key}", value: "${val}"),`);
+            });
+            break;
+        }
+      });
+      push("]");
+      push("components.queryItems = components.queryItems.map { $0 + queryItems } ?? queryItems");
+      blank();
+      push("var request = URLRequest(url: components.url!)");
+    }
     push(`request.httpMethod = "${method}"`);
     if (req.hasHeaders) {
       push("request.allHTTPHeaderFields = headers");
     }
     if (req.hasBody) {
-      push("request.httpBody = postData as Data");
+      push("request.httpBody = postData");
     }
     blank();
-    push("let session = URLSession.shared");
-    push(
-      "let dataTask = session.dataTask(with: request as URLRequest, completionHandler: { (data, response, error) -> Void in"
-    );
-    push("if (error != nil) {", 1);
-    push("print(error as Any)", 2);
-    push("} else {", 1);
-    push("let httpResponse = response as? HTTPURLResponse", 2);
-    push("print(httpResponse)", 2);
-    push("}", 1);
-    push("})");
+    push("let (data, response) = try await URLSession.shared.data(for: request)");
+    push("print(String(decoding: data, as: UTF8.self))");
     blank();
-    push("dataTask.resume()");
     return join();
   }
 };
@@ -3414,10 +3427,10 @@ var swift = {
   info: {
     key: "swift",
     title: "Swift",
-    default: "nsurlsession"
+    default: "urlsession"
   },
   clientsById: {
-    nsurlsession: nsurlsession2
+    urlsession
   }
 };