@readme/httpsnippet 10.1.0 → 10.1.1

package/dist/index.js

@@ -1,6 +1,6 @@
 import { reducer } from './chunk-KT7MO6Z4.js';
-import { targets, getHeaderName } from './chunk-452Q5GGQ.js';
-export { addClientPlugin, addTarget, addTargetClient } from './chunk-452Q5GGQ.js';
+import { targets, getHeaderName } from './chunk-532RKFLR.js';
+export { addClientPlugin, addTarget, addTargetClient } from './chunk-532RKFLR.js';
 import './chunk-Y7NI4MMY.js';
 import { parse, format } from 'url';
 import { stringify } from 'qs';

package/dist/targets/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var stringifyObject7 = require('stringify-object');
+var stringifyObject9 = require('stringify-object');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var stringifyObject7__default = /*#__PURE__*/_interopDefault(stringifyObject7);
+var stringifyObject9__default = /*#__PURE__*/_interopDefault(stringifyObject9);
 
 // src/helpers/code-builder.ts
 var DEFAULT_INDENTATION_CHARACTER = "";
@@ -959,7 +959,7 @@ var axios = {
           requestOptions.data = postData.text;
         }
     }
-    const optionString = stringifyObject7__default.default(requestOptions, {
+    const optionString = stringifyObject9__default.default(requestOptions, {
       indent: "  ",
       inlineCharacterLimit: 80
     }).replace('"[form]"', "form");
@@ -967,8 +967,12 @@ var axios = {
     blank();
     push("axios");
     push(".request(options)", 1);
-    push(".then(res => console.log(res.data))", 1);
-    push(".catch(err => console.error(err));", 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);
     return join();
   }
 };
@@ -1028,7 +1032,7 @@ var fetch = {
       delete options.headers;
     }
     push(
-      `const options = ${stringifyObject7__default.default(options, {
+      `const options = ${stringifyObject9__default.default(options, {
         indent: opts.indent,
         inlineCharacterLimit: 80,
         // The Fetch API body only accepts string parameters, but stringified JSON can be difficult
@@ -1052,8 +1056,8 @@ var fetch = {
       blank();
     }
     push(`fetch('${fullUrl}', options)`);
-    push(".then(res => res.json())", 1);
-    push(".then(res => console.log(res))", 1);
+    push(".then(response => response.json())", 1);
+    push(".then(response => console.log(response))", 1);
     push(".catch(err => console.error(err));", 1);
     return join();
   }
@@ -1114,11 +1118,11 @@ var jquery = {
           settings.data = postData.text;
         }
     }
-    const stringifiedSettings = stringifyObject7__default.default(settings, { indent: opts.indent }).replace("'[form]'", "form");
+    const stringifiedSettings = stringifyObject9__default.default(settings, { indent: opts.indent }).replace("'[form]'", "form");
     push(`const settings = ${stringifiedSettings};`);
     blank();
-    push("$.ajax(settings).done(res => {");
-    push("console.log(res);", 1);
+    push("$.ajax(settings).done(function (response) {");
+    push("console.log(response);", 1);
     push("});");
     return join();
   }
@@ -1141,7 +1145,7 @@ var xhr = {
     switch (postData.mimeType) {
       case "application/json":
         push(
-          `const data = JSON.stringify(${stringifyObject7__default.default(postData.jsonObj, {
+          `const data = JSON.stringify(${stringifyObject9__default.default(postData.jsonObj, {
             indent: opts.indent
           })});`
         );
@@ -1195,7 +1199,7 @@ var javascript = {
   info: {
     key: "javascript",
     title: "JavaScript",
-    default: "fetch"
+    default: "xhr"
   },
   clientsById: {
     xhr,
@@ -1334,7 +1338,7 @@ var axios2 = {
     title: "Axios",
     link: "https://github.com/axios/axios",
     description: "Promise based HTTP client for the browser and node.js",
-    extname: ".js",
+    extname: ".cjs",
     installation: "npm install axios --save"
   },
   convert: ({ method, fullUrl, allHeaders, postData }, options) => {
@@ -1343,8 +1347,7 @@ var axios2 = {
       ...options
     };
     const { blank, join, push, addPostProcessor } = new CodeBuilder({ indent: opts.indent });
-    push("import axios from 'axios';");
-    blank();
+    push("const axios = require('axios');");
     const reqOpts = {
       method,
       url: fullUrl
@@ -1355,6 +1358,8 @@ 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}');`);
@@ -1365,32 +1370,39 @@ 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 = stringifyObject7__default.default(reqOpts, { indent: "  ", inlineCharacterLimit: 80 });
+    const stringifiedOptions = stringifyObject9__default.default(reqOpts, { indent: "  ", inlineCharacterLimit: 80 });
     push(`const options = ${stringifiedOptions};`);
     blank();
     push("axios");
     push(".request(options)", 1);
-    push(".then(res => console.log(res.data))", 1);
-    push(".catch(err => console.error(err));", 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);
     return join();
   }
 };
 var fetch2 = {
   info: {
     key: "fetch",
-    title: "fetch",
-    link: "https://nodejs.org/docs/latest/api/globals.html#fetch",
-    description: "Perform asynchronous HTTP requests with the Fetch API",
-    extname: ".js"
+    title: "Fetch",
+    link: "https://github.com/bitinn/node-fetch",
+    description: "Simplified HTTP node-fetch client",
+    extname: ".cjs",
+    installation: "npm install node-fetch@2 --save"
   },
   convert: ({ method, fullUrl, postData, headersObj, cookies }, options) => {
     const opts = {
@@ -1399,6 +1411,7 @@ 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
@@ -1408,12 +1421,13 @@ 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) {
@@ -1428,7 +1442,9 @@ 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}');`);
@@ -1436,13 +1452,9 @@ var fetch2 = {
           }
           if (param.fileName) {
             includeFS = true;
-            push(
-              `formData.append('${param.name}', await new Response(fs.createReadStream('${param.fileName}')).blob());`
-            );
+            push(`formData.append('${param.name}', fs.createReadStream('${param.fileName}'));`);
           }
         });
-        reqOpts.body = "formData";
-        blank();
         break;
       default:
         if (postData.text) {
@@ -1458,11 +1470,12 @@ var fetch2 = {
         reqOpts.headers.cookie = cookiesString;
       }
     }
+    blank();
     push(`const url = '${url}';`);
     if (reqOpts.headers && !Object.keys(reqOpts.headers).length) {
       delete reqOpts.headers;
     }
-    const stringifiedOptions = stringifyObject7__default.default(reqOpts, {
+    const stringifiedOptions = stringifyObject9__default.default(reqOpts, {
       indent: "  ",
       inlineCharacterLimit: 80,
       // The Fetch API body only accepts string parameters, but stringified JSON can be difficult to
@@ -1478,13 +1491,17 @@ var fetch2 = {
     push(`const options = ${stringifiedOptions};`);
     blank();
     if (includeFS) {
-      unshift("import fs from 'fs';\n");
+      unshift("const fs = require('fs');");
+    }
+    if (postData.params && postData.mimeType === "multipart/form-data") {
+      push("options.body = formData;");
+      blank();
     }
     push("fetch(url, options)");
     push(".then(res => res.json())", 1);
     push(".then(json => console.log(json))", 1);
-    push(".catch(err => console.error(err));", 1);
-    return join().replace(/'encodedParams'/, "encodedParams").replace(/'formData'/, "formData");
+    push(".catch(err => console.error('error:' + err));", 1);
+    return join().replace(/'encodedParams'/, "encodedParams").replace(/"fs\.createReadStream\(\\"(.+)\\"\)"/, 'fs.createReadStream("$1")');
   }
 };
 var native3 = {
@@ -1507,7 +1524,7 @@ var native3 = {
     };
     push(`const http = require('${uriObj.protocol?.replace(":", "")}');`);
     blank();
-    push(`const options = ${stringifyObject7__default.default(reqOpts, { indent })};`);
+    push(`const options = ${stringifyObject9__default.default(reqOpts, { indent })};`);
     blank();
     push("const req = http.request(options, function (res) {");
     push("const chunks = [];", 1);
@@ -1527,7 +1544,7 @@ var native3 = {
         if (postData.paramsObj) {
           unshift("const qs = require('querystring');");
           push(
-            `req.write(qs.stringify(${stringifyObject7__default.default(postData.paramsObj, {
+            `req.write(qs.stringify(${stringifyObject9__default.default(postData.paramsObj, {
               indent: "  ",
               inlineCharacterLimit: 80
             })}));`
@@ -1537,7 +1554,7 @@ var native3 = {
       case "application/json":
         if (postData.jsonObj) {
           push(
-            `req.write(JSON.stringify(${stringifyObject7__default.default(postData.jsonObj, {
+            `req.write(JSON.stringify(${stringifyObject9__default.default(postData.jsonObj, {
               indent: "  ",
               inlineCharacterLimit: 80
             })}));`
@@ -1546,24 +1563,208 @@ var native3 = {
         break;
       default:
         if (postData.text) {
-          push(`req.write(${stringifyObject7__default.default(postData.text, { indent })});`);
+          push(`req.write(${stringifyObject9__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: "fetch",
+    default: "native",
     cli: "node %s"
   },
   clientsById: {
     native: native3,
+    request,
+    unirest: unirest2,
     axios: axios2,
     fetch: fetch2
   }
@@ -2514,22 +2715,22 @@ var requests = {
       push("}");
       blank();
     }
-    let request = builtInMethods.includes(method) ? `response = requests.${method.toLowerCase()}(url` : `response = requests.request("${method}", url`;
+    let request2 = builtInMethods.includes(method) ? `response = requests.${method.toLowerCase()}(url` : `response = requests.request("${method}", url`;
     if (hasPayload) {
       if (jsonPayload) {
-        request += ", json=payload";
+        request2 += ", json=payload";
       } else {
-        request += ", data=payload";
+        request2 += ", data=payload";
       }
     }
     if (hasFiles) {
-      request += ", files=files";
+      request2 += ", files=files";
     }
     if (headerCount > 0) {
-      request += ", headers=headers";
+      request2 += ", headers=headers";
     }
-    request += ")";
-    push(request);
+    request2 += ")";
+    push(request2);
     blank();
     push("print(response.text)");
     return join();
@@ -2614,22 +2815,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 request = `response <- VERB("${method}", url`;
+    let request2 = `response <- VERB("${method}", url`;
     if (payload) {
-      request += ", body = payload";
+      request2 += ", body = payload";
     }
     if (queryString.length) {
-      request += ", query = queryString";
+      request2 += ", query = queryString";
     }
     const headerAdditions = [setHeaders, setContentType, setAccept, setCookies].filter((x) => !!x).join(", ");
     if (headerAdditions) {
-      request += `, ${headerAdditions}`;
+      request2 += `, ${headerAdditions}`;
     }
     if (postData.text || postData.jsonObj || postData.params) {
-      request += ", encode = encode";
+      request2 += ", encode = encode";
     }
-    request += ")";
-    push(request);
+    request2 += ")";
+    push(request2);
     blank();
     push('content(response, "text")');
     return join();