@readme/httpsnippet 3.1.0 → 3.1.3

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.1.0",
+  "version": "3.1.3",
   "name": "@readme/httpsnippet",
   "description": "HTTP Request snippet generator for *most* languages",
   "homepage": "https://github.com/readmeio/httpsnippet",
@@ -55,8 +55,8 @@
   "devDependencies": {
     "@readme/eslint-config": "^8.0.2",
     "eslint": "^8.3.0",
-    "glob": "^7.1.7",
-    "jest": "^27.2.0",
+    "glob": "^8.0.1",
+    "jest": "^28.0.3",
     "prettier": "^2.5.0",
     "require-directory": "^2.1.1"
   },

package/src/targets/javascript/axios.js

@@ -36,7 +36,14 @@ module.exports = function (source, options) {
 
   switch (source.postData.mimeType) {
     case 'application/x-www-form-urlencoded':
-      reqOpts.data = source.postData.paramsObj;
+      code.push('const encodedParams = new URLSearchParams();');
+      source.postData.params.forEach(function (param) {
+        code.push(`encodedParams.set('${param.name}', '${param.value}');`);
+      });
+
+      code.blank();
+
+      reqOpts.data = 'encodedParams';
       break;
 
     case 'application/json':
@@ -83,7 +90,7 @@ module.exports = function (source, options) {
     .push(1, 'console.error(error);')
     .push('});');
 
-  return code.join();
+  return code.join().replace(/'encodedParams'/, 'encodedParams,');
 };
 
 module.exports.info = {

package/src/targets/javascript/fetch.js

@@ -10,6 +10,7 @@
 
 const stringifyObject = require('stringify-object');
 const CodeBuilder = require('../../helpers/code-builder');
+const { getHeaderName } = require('../../helpers/headers');
 
 module.exports = function (source, options) {
   const opts = {
@@ -45,6 +46,15 @@ module.exports = function (source, options) {
 
     case 'multipart/form-data':
       if (source.postData.params) {
+        // The FormData API automatically adds a `Content-Type` header for `multipart/form-data`
+        // content and if we add our own here data won't be correctly transmitted.
+        if (reqOptions.headers) {
+          const contentTypeHeader = getHeaderName(reqOptions.headers, 'content-type');
+          if (contentTypeHeader) {
+            delete reqOptions.headers[contentTypeHeader];
+          }
+        }
+
         code.push('const form = new FormData();');
 
         source.postData.params.forEach(function (param) {
@@ -65,6 +75,12 @@ module.exports = function (source, options) {
       }
   }
 
+  // If we ultimately don't have any headers to send then we shouldn't add an empty object into the
+  // request options.
+  if (reqOptions.headers && !Object.keys(reqOptions.headers).length) {
+    delete reqOptions.headers;
+  }
+
   code
     .push(
       'const options = %s;',

package/src/targets/node/axios.js

@@ -33,9 +33,9 @@ module.exports = function (source, options) {
   switch (source.postData.mimeType) {
     case 'application/x-www-form-urlencoded':
       code.push("const { URLSearchParams } = require('url');");
-      code.push('const encodedParams = new URLSearchParams();');
       code.blank();
 
+      code.push('const encodedParams = new URLSearchParams();');
       source.postData.params.forEach(function (param) {
         code.push(`encodedParams.set('${param.name}', '${param.value}');`);
       });
@@ -65,7 +65,7 @@ module.exports = function (source, options) {
     .push(1, 'console.error(error);')
     .push('});');
 
-  return code.join().replace(/'encodedParams'/, 'encodedParams');
+  return code.join().replace(/'encodedParams'/, 'encodedParams,');
 };
 
 module.exports.info = {

package/src/targets/node/fetch.js

@@ -27,18 +27,6 @@ module.exports = function (source, options) {
     method: source.method,
   };
 
-  // The `form-data` library automatically adds a `Content-Type` header for `multipart/form-data` content and if we
-  // add our own here, data won't be correctly transferred.
-  if (source.postData.mimeType === 'multipart/form-data') {
-    if (source.postData.params) {
-      const contentTypeHeader = headerHelpers.getHeaderName(source.allHeaders, 'content-type');
-      if (contentTypeHeader) {
-        // eslint-disable-next-line no-param-reassign
-        delete source.allHeaders[contentTypeHeader];
-      }
-    }
-  }
-
   if (Object.keys(source.allHeaders).length) {
     reqOpts.headers = source.allHeaders;
   }
@@ -64,6 +52,16 @@ module.exports = function (source, options) {
 
     case 'multipart/form-data':
       if (source.postData.params) {
+        // The `form-data` library automatically adds a `Content-Type` header for
+        // `multipart/form-data` content and if we add our own here, data won't be correctly
+        // transferred.
+        if (reqOpts.headers) {
+          const contentTypeHeader = headerHelpers.getHeaderName(reqOpts.headers, 'content-type');
+          if (contentTypeHeader) {
+            delete reqOpts.headers[contentTypeHeader];
+          }
+        }
+
         code.unshift("const FormData = require('form-data');");
         code.push('const formData = new FormData();');
         code.blank();
@@ -88,6 +86,12 @@ module.exports = function (source, options) {
       }
   }
 
+  // If we ultimately don't have any headers to send then we shouldn't add an empty object into
+  // the request options.
+  if (reqOpts.headers && !Object.keys(reqOpts.headers).length) {
+    delete reqOpts.headers;
+  }
+
   code.blank();
   code.push(`const url = '${url}';`);
   code

package/src/targets/php/guzzle.js

@@ -129,7 +129,7 @@ module.exports = function (source, options) {
 
 module.exports.info = {
   key: 'guzzle',
-  title: 'Guzzle v7',
+  title: 'Guzzle',
   link: 'http://docs.guzzlephp.org/en/stable/',
-  description: 'PHP with guzzle v7',
+  description: 'PHP with guzzle',
 };

package/src/targets/r/httr.js

@@ -23,20 +23,17 @@ module.exports = function (source) {
 
   // Construct query string
   const qs = source.queryObj;
-  const queryCount = Object.keys(qs).length;
   // eslint-disable-next-line no-param-reassign
   delete source.queryObj.key;
 
-  if (source.queryString.length === 1) {
+  const queryCount = Object.keys(qs).length;
+  if (queryCount === 1) {
     code.push('queryString <- list(%s = "%s")', Object.keys(qs), Object.values(qs).toString()).blank();
-  } else if (source.queryString.length > 1) {
-    let count = 1;
-
+  } else if (queryCount > 1) {
     code.push('queryString <- list(');
 
-    Object.keys(qs).forEach(query => {
-      // eslint-disable-next-line no-plusplus
-      if (count++ !== queryCount - 1) {
+    Object.keys(qs).forEach((query, i) => {
+      if (i !== queryCount - 1) {
         code.push('  %s = "%s",', query, qs[query].toString());
       } else {
         code.push('  %s = "%s"', query, qs[query].toString());
@@ -75,24 +72,20 @@ module.exports = function (source) {
   }
 
   // Construct headers
-  const headers = source.allHeaders;
-  let headerCount = 0;
-  let header = '';
+  const headers = [];
   let cookies;
   let accept;
 
-  Object.keys(headers).forEach(head => {
-    if (head.toLowerCase() === 'accept') {
-      accept = `, accept("${headers[head]}")`;
-      headerCount += 1;
-    } else if (head.toLowerCase() === 'cookie') {
-      cookies = `, set_cookies(\`${headers[head].replace(/;/g, '", `').replace(/` /g, '`').replace(/=/g, '` = "')}")`;
-      headerCount += 1;
-    } else if (head.toLowerCase() !== 'content-type') {
-      header = `${header + head.replace('-', '_')} = '${headers[head]}`;
-      if (headerCount > 1) {
-        header += "', ";
-      }
+  Object.keys(source.allHeaders).forEach(header => {
+    if (header.toLowerCase() === 'accept') {
+      accept = `, accept("${source.allHeaders[header]}")`;
+    } else if (header.toLowerCase() === 'cookie') {
+      cookies = `, set_cookies(\`${source.allHeaders[header]
+        .replace(/;/g, '", `')
+        .replace(/` /g, '`')
+        .replace(/=/g, '` = "')}")`;
+    } else if (header.toLowerCase() !== 'content-type') {
+      headers.push(`'${header}' = '${source.allHeaders[header]}'`);
     }
   });
 
@@ -104,8 +97,8 @@ module.exports = function (source) {
     request += ', body = payload';
   }
 
-  if (header !== '') {
-    request += `, add_headers(${header}')`;
+  if (headers.length) {
+    request += `, add_headers(${headers.join(', ')})`;
   }
 
   if (source.queryString.length) {