@readme/httpsnippet 10.0.4 → 10.1.0

package/dist/targets/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var stringifyObject9 = require('stringify-object');
+var stringifyObject7 = require('stringify-object');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var stringifyObject9__default = /*#__PURE__*/_interopDefault(stringifyObject9);
+var stringifyObject7__default = /*#__PURE__*/_interopDefault(stringifyObject7);
 
 // src/helpers/code-builder.ts
 var DEFAULT_INDENTATION_CHARACTER = "";
@@ -529,8 +529,7 @@ var restsharp = {
     });
     switch (postData.mimeType) {
       case "multipart/form-data":
-        if (!postData.params)
-          break;
+        if (!postData.params) break;
         postData.params.forEach((param) => {
           if (param.fileName) {
             push(`request.AddFile("${param.name}", "${param.fileName}");`);
@@ -540,22 +539,19 @@ var restsharp = {
         });
         break;
       case "application/x-www-form-urlencoded":
-        if (!postData.params)
-          break;
+        if (!postData.params) break;
         postData.params.forEach((param) => {
           push(`request.AddParameter("${param.name}", "${param.value}");`);
         });
         break;
       case "application/json": {
-        if (!postData.text)
-          break;
+        if (!postData.text) break;
         const text = JSON.stringify(postData.text);
         push(`request.AddJsonBody(${text}, false);`);
         break;
       }
       default:
-        if (!postData.text)
-          break;
+        if (!postData.text) break;
         push(`request.AddStringBody("${postData.text}", "${postData.mimeType}");`);
     }
     push(`var response = await client.${title(method)}Async(request);
@@ -963,7 +959,7 @@ var axios = {
           requestOptions.data = postData.text;
         }
     }
-    const optionString = stringifyObject9__default.default(requestOptions, {
+    const optionString = stringifyObject7__default.default(requestOptions, {
       indent: "  ",
       inlineCharacterLimit: 80
     }).replace('"[form]"', "form");
@@ -971,12 +967,8 @@ var axios = {
     blank();
     push("axios");
     push(".request(options)", 1);
-    push(".then(function (response) {", 1);
-    push("console.log(response.data);", 2);
-    push("})", 1);
-    push(".catch(function (error) {", 1);
-    push("console.error(error);", 2);
-    push("});", 1);
+    push(".then(res => console.log(res.data))", 1);
+    push(".catch(err => console.error(err));", 1);
     return join();
   }
 };
@@ -1036,7 +1028,7 @@ var fetch = {
       delete options.headers;
     }
     push(
-      `const options = ${stringifyObject9__default.default(options, {
+      `const options = ${stringifyObject7__default.default(options, {
         indent: opts.indent,
         inlineCharacterLimit: 80,
         // The Fetch API body only accepts string parameters, but stringified JSON can be difficult
@@ -1060,8 +1052,8 @@ var fetch = {
       blank();
     }
     push(`fetch('${fullUrl}', options)`);
-    push(".then(response => response.json())", 1);
-    push(".then(response => console.log(response))", 1);
+    push(".then(res => res.json())", 1);
+    push(".then(res => console.log(res))", 1);
     push(".catch(err => console.error(err));", 1);
     return join();
   }
@@ -1122,11 +1114,11 @@ var jquery = {
           settings.data = postData.text;
         }
     }
-    const stringifiedSettings = stringifyObject9__default.default(settings, { indent: opts.indent }).replace("'[form]'", "form");
+    const stringifiedSettings = stringifyObject7__default.default(settings, { indent: opts.indent }).replace("'[form]'", "form");
     push(`const settings = ${stringifiedSettings};`);
     blank();
-    push("$.ajax(settings).done(function (response) {");
-    push("console.log(response);", 1);
+    push("$.ajax(settings).done(res => {");
+    push("console.log(res);", 1);
     push("});");
     return join();
   }
@@ -1149,7 +1141,7 @@ var xhr = {
     switch (postData.mimeType) {
       case "application/json":
         push(
-          `const data = JSON.stringify(${stringifyObject9__default.default(postData.jsonObj, {
+          `const data = JSON.stringify(${stringifyObject7__default.default(postData.jsonObj, {
             indent: opts.indent
           })});`
         );
@@ -1203,7 +1195,7 @@ var javascript = {
   info: {
     key: "javascript",
     title: "JavaScript",
-    default: "xhr"
+    default: "fetch"
   },
   clientsById: {
     xhr,
@@ -1342,7 +1334,7 @@ var axios2 = {
     title: "Axios",
     link: "https://github.com/axios/axios",
     description: "Promise based HTTP client for the browser and node.js",
-    extname: ".cjs",
+    extname: ".js",
     installation: "npm install axios --save"
   },
   convert: ({ method, fullUrl, allHeaders, postData }, options) => {
@@ -1351,7 +1343,8 @@ var axios2 = {
       ...options
     };
     const { blank, join, push, addPostProcessor } = new CodeBuilder({ indent: opts.indent });
-    push("const axios = require('axios');");
+    push("import axios from 'axios';");
+    blank();
     const reqOpts = {
       method,
       url: fullUrl
@@ -1362,8 +1355,6 @@ var axios2 = {
     switch (postData.mimeType) {
       case "application/x-www-form-urlencoded":
         if (postData.params) {
-          push("const { URLSearchParams } = require('url');");
-          blank();
           push("const encodedParams = new URLSearchParams();");
           postData.params.forEach((param) => {
             push(`encodedParams.set('${param.name}', '${param.value}');`);
@@ -1374,39 +1365,32 @@ var axios2 = {
         }
         break;
       case "application/json":
-        blank();
         if (postData.jsonObj) {
           reqOpts.data = postData.jsonObj;
         }
         break;
       default:
-        blank();
         if (postData.text) {
           reqOpts.data = postData.text;
         }
     }
-    const stringifiedOptions = stringifyObject9__default.default(reqOpts, { indent: "  ", inlineCharacterLimit: 80 });
+    const stringifiedOptions = stringifyObject7__default.default(reqOpts, { indent: "  ", inlineCharacterLimit: 80 });
     push(`const options = ${stringifiedOptions};`);
     blank();
     push("axios");
     push(".request(options)", 1);
-    push(".then(function (response) {", 1);
-    push("console.log(response.data);", 2);
-    push("})", 1);
-    push(".catch(function (error) {", 1);
-    push("console.error(error);", 2);
-    push("});", 1);
+    push(".then(res => console.log(res.data))", 1);
+    push(".catch(err => console.error(err));", 1);
     return join();
   }
 };
 var fetch2 = {
   info: {
     key: "fetch",
-    title: "Fetch",
-    link: "https://github.com/bitinn/node-fetch",
-    description: "Simplified HTTP node-fetch client",
-    extname: ".cjs",
-    installation: "npm install node-fetch@2 --save"
+    title: "fetch",
+    link: "https://nodejs.org/docs/latest/api/globals.html#fetch",
+    description: "Perform asynchronous HTTP requests with the Fetch API",
+    extname: ".js"
   },
   convert: ({ method, fullUrl, postData, headersObj, cookies }, options) => {
     const opts = {
@@ -1415,7 +1399,6 @@ var fetch2 = {
     };
     let includeFS = false;
     const { blank, push, join, unshift } = new CodeBuilder({ indent: opts.indent });
-    push("const fetch = require('node-fetch');");
     const url = fullUrl;
     const reqOpts = {
       method
@@ -1425,13 +1408,12 @@ var fetch2 = {
     }
     switch (postData.mimeType) {
       case "application/x-www-form-urlencoded":
-        unshift("const { URLSearchParams } = require('url');");
         push("const encodedParams = new URLSearchParams();");
-        blank();
         postData.params?.forEach((param) => {
           push(`encodedParams.set('${param.name}', '${param.value}');`);
         });
         reqOpts.body = "encodedParams";
+        blank();
         break;
       case "application/json":
         if (postData.jsonObj) {
@@ -1446,9 +1428,7 @@ var fetch2 = {
         if (contentTypeHeader) {
           delete headersObj[contentTypeHeader];
         }
-        unshift("const FormData = require('form-data');");
         push("const formData = new FormData();");
-        blank();
         postData.params.forEach((param) => {
           if (!param.fileName && !param.fileName && !param.contentType) {
             push(`formData.append('${param.name}', '${param.value}');`);
@@ -1456,9 +1436,13 @@ var fetch2 = {
           }
           if (param.fileName) {
             includeFS = true;
-            push(`formData.append('${param.name}', fs.createReadStream('${param.fileName}'));`);
+            push(
+              `formData.append('${param.name}', await new Response(fs.createReadStream('${param.fileName}')).blob());`
+            );
           }
         });
+        reqOpts.body = "formData";
+        blank();
         break;
       default:
         if (postData.text) {
@@ -1474,12 +1458,11 @@ var fetch2 = {
         reqOpts.headers.cookie = cookiesString;
       }
     }
-    blank();
     push(`const url = '${url}';`);
     if (reqOpts.headers && !Object.keys(reqOpts.headers).length) {
       delete reqOpts.headers;
     }
-    const stringifiedOptions = stringifyObject9__default.default(reqOpts, {
+    const stringifiedOptions = stringifyObject7__default.default(reqOpts, {
       indent: "  ",
       inlineCharacterLimit: 80,
       // The Fetch API body only accepts string parameters, but stringified JSON can be difficult to
@@ -1495,17 +1478,13 @@ var fetch2 = {
     push(`const options = ${stringifiedOptions};`);
     blank();
     if (includeFS) {
-      unshift("const fs = require('fs');");
-    }
-    if (postData.params && postData.mimeType === "multipart/form-data") {
-      push("options.body = formData;");
-      blank();
+      unshift("import fs from 'fs';\n");
     }
     push("fetch(url, options)");
     push(".then(res => res.json())", 1);
     push(".then(json => console.log(json))", 1);
-    push(".catch(err => console.error('error:' + err));", 1);
-    return join().replace(/'encodedParams'/, "encodedParams").replace(/"fs\.createReadStream\(\\"(.+)\\"\)"/, 'fs.createReadStream("$1")');
+    push(".catch(err => console.error(err));", 1);
+    return join().replace(/'encodedParams'/, "encodedParams").replace(/'formData'/, "formData");
   }
 };
 var native3 = {
@@ -1528,7 +1507,7 @@ var native3 = {
     };
     push(`const http = require('${uriObj.protocol?.replace(":", "")}');`);
     blank();
-    push(`const options = ${stringifyObject9__default.default(reqOpts, { indent })};`);
+    push(`const options = ${stringifyObject7__default.default(reqOpts, { indent })};`);
     blank();
     push("const req = http.request(options, function (res) {");
     push("const chunks = [];", 1);
@@ -1548,7 +1527,7 @@ var native3 = {
         if (postData.paramsObj) {
           unshift("const qs = require('querystring');");
           push(
-            `req.write(qs.stringify(${stringifyObject9__default.default(postData.paramsObj, {
+            `req.write(qs.stringify(${stringifyObject7__default.default(postData.paramsObj, {
               indent: "  ",
               inlineCharacterLimit: 80
             })}));`
@@ -1558,7 +1537,7 @@ var native3 = {
       case "application/json":
         if (postData.jsonObj) {
           push(
-            `req.write(JSON.stringify(${stringifyObject9__default.default(postData.jsonObj, {
+            `req.write(JSON.stringify(${stringifyObject7__default.default(postData.jsonObj, {
               indent: "  ",
               inlineCharacterLimit: 80
             })}));`
@@ -1567,208 +1546,24 @@ var native3 = {
         break;
       default:
         if (postData.text) {
-          push(`req.write(${stringifyObject9__default.default(postData.text, { indent })});`);
+          push(`req.write(${stringifyObject7__default.default(postData.text, { indent })});`);
         }
     }
     push("req.end();");
     return join();
   }
 };
-var request = {
-  info: {
-    key: "request",
-    title: "Request",
-    link: "https://github.com/request/request",
-    description: "Simplified HTTP request client",
-    extname: ".cjs",
-    installation: "npm install request --save"
-  },
-  convert: ({ method, url, fullUrl, postData, headersObj, cookies }, options) => {
-    const opts = {
-      indent: "  ",
-      ...options
-    };
-    let includeFS = false;
-    const { push, blank, join, unshift, addPostProcessor } = new CodeBuilder({ indent: opts.indent });
-    push("const request = require('request');");
-    blank();
-    const reqOpts = {
-      method,
-      url: fullUrl
-    };
-    if (Object.keys(headersObj).length) {
-      reqOpts.headers = headersObj;
-    }
-    switch (postData.mimeType) {
-      case "application/x-www-form-urlencoded":
-        reqOpts.form = postData.paramsObj;
-        break;
-      case "application/json":
-        if (postData.jsonObj) {
-          reqOpts.body = postData.jsonObj;
-          reqOpts.json = true;
-        }
-        break;
-      case "multipart/form-data":
-        if (!postData.params) {
-          break;
-        }
-        reqOpts.formData = {};
-        postData.params.forEach((param) => {
-          if (!param.fileName && !param.fileName && !param.contentType) {
-            reqOpts.formData[param.name] = param.value;
-            return;
-          }
-          let attachment = {};
-          if (param.fileName) {
-            includeFS = true;
-            attachment = {
-              value: `fs.createReadStream(${param.fileName})`,
-              options: {
-                filename: param.fileName,
-                contentType: param.contentType ? param.contentType : null
-              }
-            };
-          } else if (param.value) {
-            attachment.value = param.value;
-          }
-          reqOpts.formData[param.name] = attachment;
-        });
-        addPostProcessor((code) => code.replace(/'fs\.createReadStream\((.*)\)'/, "fs.createReadStream('$1')"));
-        break;
-      default:
-        if (postData.text) {
-          reqOpts.body = postData.text;
-        }
-    }
-    if (cookies.length) {
-      reqOpts.jar = "JAR";
-      push("const jar = request.jar();");
-      cookies.forEach(({ name, value }) => {
-        push(`jar.setCookie(request.cookie('${encodeURIComponent(name)}=${encodeURIComponent(value)}'), '${url}');`);
-      });
-      blank();
-      addPostProcessor((code) => code.replace(/'JAR'/, "jar"));
-    }
-    if (includeFS) {
-      unshift("const fs = require('fs');");
-    }
-    push(`const options = ${stringifyObject9__default.default(reqOpts, { indent: "  ", inlineCharacterLimit: 80 })};`);
-    blank();
-    push("request(options, function (error, response, body) {");
-    push("if (error) throw new Error(error);", 1);
-    blank();
-    push("console.log(body);", 1);
-    push("});");
-    return join();
-  }
-};
-var unirest2 = {
-  info: {
-    key: "unirest",
-    title: "Unirest",
-    link: "http://unirest.io/nodejs.html",
-    description: "Lightweight HTTP Request Client Library",
-    extname: ".cjs"
-  },
-  convert: ({ method, url, cookies, queryObj, postData, headersObj }, options) => {
-    const opts = {
-      indent: "  ",
-      ...options
-    };
-    let includeFS = false;
-    const { addPostProcessor, blank, join, push, unshift } = new CodeBuilder({
-      indent: opts.indent
-    });
-    push("const unirest = require('unirest');");
-    blank();
-    push(`const req = unirest('${method}', '${url}');`);
-    blank();
-    if (cookies.length) {
-      push("const CookieJar = unirest.jar();");
-      cookies.forEach((cookie) => {
-        push(`CookieJar.add('${encodeURIComponent(cookie.name)}=${encodeURIComponent(cookie.value)}', '${url}');`);
-      });
-      push("req.jar(CookieJar);");
-      blank();
-    }
-    if (Object.keys(queryObj).length) {
-      push(`req.query(${stringifyObject9__default.default(queryObj, { indent: opts.indent })});`);
-      blank();
-    }
-    if (Object.keys(headersObj).length) {
-      push(`req.headers(${stringifyObject9__default.default(headersObj, { indent: opts.indent })});`);
-      blank();
-    }
-    switch (postData.mimeType) {
-      case "application/x-www-form-urlencoded":
-        if (postData.paramsObj) {
-          push(`req.form(${stringifyObject9__default.default(postData.paramsObj, { indent: opts.indent })});`);
-          blank();
-        }
-        break;
-      case "application/json":
-        if (postData.jsonObj) {
-          push("req.type('json');");
-          push(`req.send(${stringifyObject9__default.default(postData.jsonObj, { indent: opts.indent })});`);
-          blank();
-        }
-        break;
-      case "multipart/form-data": {
-        if (!postData.params) {
-          break;
-        }
-        const multipart = [];
-        postData.params.forEach((param) => {
-          const part = {};
-          if (param.fileName && !param.value) {
-            includeFS = true;
-            part.body = `fs.createReadStream('${param.fileName}')`;
-            addPostProcessor((code) => code.replace(/'fs\.createReadStream\(\\'(.+)\\'\)'/, "fs.createReadStream('$1')"));
-          } else if (param.value) {
-            part.body = param.value;
-          }
-          if (part.body) {
-            if (param.contentType) {
-              part["content-type"] = param.contentType;
-            }
-            multipart.push(part);
-          }
-        });
-        push(`req.multipart(${stringifyObject9__default.default(multipart, { indent: opts.indent })});`);
-        blank();
-        break;
-      }
-      default:
-        if (postData.text) {
-          push(`req.send(${stringifyObject9__default.default(postData.text, { indent: opts.indent })});`);
-          blank();
-        }
-    }
-    if (includeFS) {
-      unshift("const fs = require('fs');");
-    }
-    push("req.end(function (res) {");
-    push("if (res.error) throw new Error(res.error);", 1);
-    blank();
-    push("console.log(res.body);", 1);
-    push("});");
-    return join();
-  }
-};
 
 // src/targets/node/target.ts
 var node = {
   info: {
     key: "node",
     title: "Node.js",
-    default: "native",
+    default: "fetch",
     cli: "node %s"
   },
   clientsById: {
     native: native3,
-    request,
-    unirest: unirest2,
     axios: axios2,
     fetch: fetch2
   }
@@ -2719,22 +2514,22 @@ var requests = {
       push("}");
       blank();
     }
-    let request2 = builtInMethods.includes(method) ? `response = requests.${method.toLowerCase()}(url` : `response = requests.request("${method}", url`;
+    let request = builtInMethods.includes(method) ? `response = requests.${method.toLowerCase()}(url` : `response = requests.request("${method}", url`;
     if (hasPayload) {
       if (jsonPayload) {
-        request2 += ", json=payload";
+        request += ", json=payload";
       } else {
-        request2 += ", data=payload";
+        request += ", data=payload";
       }
     }
     if (hasFiles) {
-      request2 += ", files=files";
+      request += ", files=files";
     }
     if (headerCount > 0) {
-      request2 += ", headers=headers";
+      request += ", headers=headers";
     }
-    request2 += ")";
-    push(request2);
+    request += ")";
+    push(request);
     blank();
     push("print(response.text)");
     return join();
@@ -2819,22 +2614,22 @@ var httr = {
     const setContentType = `content_type("${escapeForDoubleQuotes(postData.mimeType)}")`;
     const otherHeaders = Object.entries(allHeaders).filter(([key]) => !["cookie", "accept", "content-type"].includes(key.toLowerCase())).map(([key, value]) => `'${key}' = '${escapeForSingleQuotes(value)}'`).join(", ");
     const setHeaders = otherHeaders ? `add_headers(${otherHeaders})` : void 0;
-    let request2 = `response <- VERB("${method}", url`;
+    let request = `response <- VERB("${method}", url`;
     if (payload) {
-      request2 += ", body = payload";
+      request += ", body = payload";
     }
     if (queryString.length) {
-      request2 += ", query = queryString";
+      request += ", query = queryString";
     }
     const headerAdditions = [setHeaders, setContentType, setAccept, setCookies].filter((x) => !!x).join(", ");
     if (headerAdditions) {
-      request2 += `, ${headerAdditions}`;
+      request += `, ${headerAdditions}`;
     }
     if (postData.text || postData.jsonObj || postData.params) {
-      request2 += ", encode = encode";
+      request += ", encode = encode";
     }
-    request2 += ")";
-    push(request2);
+    request += ")";
+    push(request);
     blank();
     push('content(response, "text")');
     return join();
@@ -3318,7 +3113,7 @@ var urlsession = {
           break;
         case "application/json":
           if (postData.jsonObj) {
-            push(`${literalDeclaration("parameters", postData.jsonObj, opts)} as [String : Any]`);
+            push(`${literalDeclaration("parameters", postData.jsonObj, opts)} as [String : Any?]`);
             blank();
             push("let postData = try JSONSerialization.data(withJSONObject: parameters, options: [])");
             blank();
@@ -3335,7 +3130,7 @@ var urlsession = {
           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 contentType = param["contentType"]!', 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);
@@ -3388,7 +3183,7 @@ var urlsession = {
       push("request.httpBody = postData");
     }
     blank();
-    push("let (data, response) = try await URLSession.shared.data(for: request)");
+    push("let (data, _) = try await URLSession.shared.data(for: request)");
     push("print(String(decoding: data, as: UTF8.self))");
     return join();
   }
@@ -3525,5 +3320,5 @@ exports.addTargetClient = addTargetClient;
 exports.isClient = isClient;
 exports.isTarget = isTarget;
 exports.targets = targets;
-//# sourceMappingURL=out.js.map
+//# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map