@readme/httpsnippet 2.4.5 → 3.0.1

package/src/targets/node/request.js

@@ -8,119 +8,119 @@
  * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author.
  */
 
-'use strict'
-
-var util = require('util')
-var stringifyObject = require('stringify-object')
-var CodeBuilder = require('../../helpers/code-builder')
+const stringifyObject = require('stringify-object');
+const CodeBuilder = require('../../helpers/code-builder');
 
 module.exports = function (source, options) {
-  var opts = Object.assign({
-    indent: '  '
-  }, options)
+  const opts = {
+    indent: '  ',
+    ...options,
+  };
 
-  var includeFS = false
-  var code = new CodeBuilder(opts.indent)
+  let includeFS = false;
+  const code = new CodeBuilder(opts.indent);
 
-  code.push("const request = require('request');")
-      .blank()
+  code.push("const request = require('request');").blank();
 
-  var reqOpts = {
+  const reqOpts = {
     method: source.method,
-    url: source.url
-  }
-
-  if (Object.keys(source.queryObj).length) {
-    reqOpts.qs = source.queryObj
-  }
+    url: source.fullUrl,
+  };
 
   if (Object.keys(source.headersObj).length) {
-    reqOpts.headers = source.headersObj
+    reqOpts.headers = source.headersObj;
   }
 
   switch (source.postData.mimeType) {
     case 'application/x-www-form-urlencoded':
-      reqOpts.form = source.postData.paramsObj
-      break
+      reqOpts.form = source.postData.paramsObj;
+      break;
 
     case 'application/json':
       if (source.postData.jsonObj) {
-        reqOpts.body = source.postData.jsonObj
-        reqOpts.json = true
+        reqOpts.body = source.postData.jsonObj;
+        reqOpts.json = true;
       }
-      break
+      break;
 
     case 'multipart/form-data':
-      reqOpts.formData = {}
+      if (source.postData.params) {
+        reqOpts.formData = {};
 
-      source.postData.params.forEach(function (param) {
-        var attachment = {}
+        source.postData.params.forEach(function (param) {
+          const attachment = {};
 
-        if (!param.fileName && !param.fileName && !param.contentType) {
-          reqOpts.formData[param.name] = param.value
-          return
-        }
+          if (!param.fileName && !param.contentType) {
+            reqOpts.formData[param.name] = param.value;
+            return;
+          }
 
-        if (param.fileName) {
-          includeFS = true
+          if (param.fileName) {
+            includeFS = true;
 
-          attachment.value = 'fs.createReadStream("' + param.fileName + '")'
-        } else if (param.value) {
-          attachment.value = param.value
-        }
+            attachment.value = `fs.createReadStream("${param.fileName}")`;
+          } else if (param.value) {
+            attachment.value = param.value;
+          }
 
-        if (param.fileName) {
-          attachment.options = {
-            filename: param.fileName,
-            contentType: param.contentType ? param.contentType : null
+          if (param.fileName) {
+            attachment.options = {
+              filename: param.fileName,
+              contentType: param.contentType ? param.contentType : null,
+            };
           }
-        }
 
-        reqOpts.formData[param.name] = attachment
-      })
-      break
+          reqOpts.formData[param.name] = attachment;
+        });
+      }
+      break;
 
     default:
       if (source.postData.text) {
-        reqOpts.body = source.postData.text
+        reqOpts.body = source.postData.text;
       }
   }
 
   // construct cookies argument
-  if (source.cookies.length) {
-    reqOpts.jar = 'JAR'
+  if (source.allHeaders.cookie) {
+    reqOpts.jar = 'JAR';
 
-    code.push('const jar = request.jar();')
+    code.push('const jar = request.jar();');
 
-    var url = source.url
+    const url = source.url;
 
-    source.cookies.forEach(function (cookie) {
-      code.push("jar.setCookie(request.cookie('%s=%s'), '%s');", encodeURIComponent(cookie.name), encodeURIComponent(cookie.value), url)
-    })
-    code.blank()
+    // Cookies are already encoded within `source.allHeaders` so we can pull them out of that instead of doing our
+    // own encoding work.
+    source.allHeaders.cookie.split('; ').forEach(function (cookie) {
+      const [name, value] = cookie.split('=');
+      code.push("jar.setCookie(request.cookie('%s=%s'), '%s');", name, value, url);
+    });
+    code.blank();
   }
 
   if (includeFS) {
-    code.unshift("const fs = require('fs');")
+    code.unshift("const fs = require('fs');");
   }
 
-  code.push('const options = %s;', stringifyObject(reqOpts, { indent: '  ', inlineCharacterLimit: 80 }))
-    .blank()
+  code.push('const options = %s;', stringifyObject(reqOpts, { indent: '  ', inlineCharacterLimit: 80 })).blank();
 
-  code.push(util.format('request(options, %s', 'function (error, response, body) {'))
-
-      .push(1, 'if (error) throw new Error(error);')
-      .blank()
-      .push(1, 'console.log(body);')
-      .push('});')
-      .blank()
+  code
+    .push('request(options, function (error, response, body) {')
+    .push(1, 'if (error) throw new Error(error);')
+    .blank()
+    .push(1, 'console.log(body);')
+    .push('});')
+    .blank();
 
-  return code.join().replace('"JAR"', 'jar').replace(/'fs\.createReadStream\("(.+)"\)'/g, "fs.createReadStream('$1')")
-}
+  return code
+    .join()
+    .replace("'JAR'", 'jar')
+    .replace(/'fs\.createReadStream\("(.+)"\)'/g, "fs.createReadStream('$1')");
+};
 
 module.exports.info = {
   key: 'request',
   title: 'Request',
   link: 'https://github.com/request/request',
-  description: 'Simplified HTTP request client'
-}
+  description: 'Simplified HTTP request client',
+};

package/src/targets/node/unirest.js

@@ -8,111 +8,113 @@
  * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author.
  */
 
-'use strict'
-
-var CodeBuilder = require('../../helpers/code-builder')
+const CodeBuilder = require('../../helpers/code-builder');
 
 module.exports = function (source, options) {
-  var opts = Object.assign({
-    indent: '  '
-  }, options)
-
-  var includeFS = false
-  var code = new CodeBuilder(opts.indent)
-
-  code.push('const unirest = require("unirest");')
-      .blank()
-      .push('const req = unirest("%s", "%s");', source.method, source.url)
-      .blank()
-
-  if (source.cookies.length) {
-    code.push('const CookieJar = unirest.jar();')
-
-    source.cookies.forEach(function (cookie) {
-      code.push('CookieJar.add("%s=%s","%s");', encodeURIComponent(cookie.name), encodeURIComponent(cookie.value), source.url)
-    })
-
-    code.push('req.jar(CookieJar);')
-      .blank()
+  const opts = {
+    indent: '  ',
+    ...options,
+  };
+
+  let includeFS = false;
+  const code = new CodeBuilder(opts.indent);
+
+  code
+    .push('const unirest = require("unirest");')
+    .blank()
+    .push('const req = unirest("%s", "%s");', source.method, source.url)
+    .blank();
+
+  if (source.allHeaders.cookie) {
+    code.push('const CookieJar = unirest.jar();');
+
+    // Cookies are already encoded within `source.allHeaders` so we can pull them out of that instead of doing our
+    // own encoding work.
+    source.allHeaders.cookie.split('; ').forEach(function (cookie) {
+      const [name, value] = cookie.split('=');
+      code.push('CookieJar.add("%s=%s","%s");', name, value, source.url);
+    });
+
+    code.push('req.jar(CookieJar);').blank();
   }
 
   if (Object.keys(source.queryObj).length) {
-    code.push('req.query(%s);', JSON.stringify(source.queryObj, null, opts.indent))
-        .blank()
+    code.push('req.query(%s);', JSON.stringify(source.queryObj, null, opts.indent)).blank();
   }
 
   if (Object.keys(source.headersObj).length) {
-    code.push('req.headers(%s);', JSON.stringify(source.headersObj, null, opts.indent))
-        .blank()
+    code.push('req.headers(%s);', JSON.stringify(source.headersObj, null, opts.indent)).blank();
   }
 
   switch (source.postData.mimeType) {
     case 'application/x-www-form-urlencoded':
       if (source.postData.paramsObj) {
-        code.push('req.form(%s);', JSON.stringify(source.postData.paramsObj, null, opts.indent))
-          .blank()
+        code.push('req.form(%s);', JSON.stringify(source.postData.paramsObj, null, opts.indent)).blank();
       }
-      break
+      break;
 
     case 'application/json':
       if (source.postData.jsonObj) {
-        code.push('req.type("json");')
-            .push('req.send(%s);', JSON.stringify(source.postData.jsonObj, null, opts.indent))
-            .blank()
+        code
+          .push('req.type("json");')
+          .push('req.send(%s);', JSON.stringify(source.postData.jsonObj, null, opts.indent))
+          .blank();
       }
-      break
-
-    case 'multipart/form-data':
-      var multipart = []
+      break;
 
-      source.postData.params.forEach(function (param) {
-        var part = {}
+    case 'multipart/form-data': {
+      if (source.postData.params) {
+        const multipart = [];
 
-        if (param.fileName && !param.value) {
-          includeFS = true
+        source.postData.params.forEach(function (param) {
+          const part = {};
 
-          part.body = 'fs.createReadStream("' + param.fileName + '")'
-        } else if (param.value) {
-          part.body = param.value
-        }
+          if (param.fileName && !param.value) {
+            includeFS = true;
 
-        if (part.body) {
-          if (param.contentType) {
-            part['content-type'] = param.contentType
+            part.body = `fs.createReadStream("${param.fileName}")`;
+          } else if (param.value) {
+            part.body = param.value;
           }
 
-          multipart.push(part)
-        }
-      })
+          if (part.body) {
+            if (param.contentType) {
+              part['content-type'] = param.contentType;
+            }
 
-      code.push('req.multipart(%s);', JSON.stringify(multipart, null, opts.indent))
-        .blank()
-      break
+            multipart.push(part);
+          }
+        });
+
+        code.push('req.multipart(%s);', JSON.stringify(multipart, null, opts.indent)).blank();
+      }
+      break;
+    }
 
     default:
       if (source.postData.text) {
-        code.push('req.send(%s);', JSON.stringify(source.postData.text, null, opts.indent))
-          .blank()
+        code.push('req.send(%s);', JSON.stringify(source.postData.text, null, opts.indent)).blank();
       }
   }
 
   if (includeFS) {
-    code.unshift('const fs = require("fs");')
+    code.unshift('const fs = require("fs");');
   }
 
-  code.push('req.end(function (res) {')
-      .push(1, 'if (res.error) throw new Error(res.error);')
-      .blank()
-      .push(1, 'console.log(res.body);')
-      .push('});')
-      .blank()
+  code
+    .push('req.end(function (res) {')
+    .push(1, 'if (res.error) throw new Error(res.error);')
+    .blank()
+    .push(1, 'console.log(res.body);')
+    .push('});')
+    .blank();
 
-  return code.join().replace(/"fs\.createReadStream\(\\"(.+)\\"\)"/, 'fs.createReadStream("$1")')
-}
+  return code.join().replace(/"fs\.createReadStream\(\\"(.+)\\"\)"/, 'fs.createReadStream("$1")');
+};
 
 module.exports.info = {
   key: 'unirest',
   title: 'Unirest',
   link: 'http://unirest.io/nodejs.html',
-  description: 'Lightweight HTTP Request Client Library'
-}
+  description: 'Lightweight HTTP Request Client Library',
+};

package/src/targets/objc/helpers.js

@@ -1,6 +1,4 @@
-'use strict'
-
-var util = require('util')
+const { format } = require('util');
 
 module.exports = {
   /**
@@ -10,7 +8,8 @@ module.exports = {
    * @return {string}
    */
   blankString: function (length) {
-    return Array.apply(null, new Array(length)).map(String.prototype.valueOf, ' ').join('')
+    // eslint-disable-next-line prefer-spread
+    return Array.apply(null, new Array(length)).map(String.prototype.valueOf, ' ').join('');
   },
 
   /**
@@ -33,9 +32,9 @@ module.exports = {
    *   NSDictionary *params = @{ @"a": @"b", @"c": @"d" };
    */
   nsDeclaration: function (nsClass, name, parameters, indent) {
-    var opening = nsClass + ' *' + name + ' = '
-    var literal = this.literalRepresentation(parameters, indent ? opening.length : undefined)
-    return opening + literal + ';'
+    const opening = `${nsClass} *${name} = `;
+    const literal = this.literalRepresentation(parameters, indent ? opening.length : undefined);
+    return `${opening + literal};`;
   },
 
   /**
@@ -45,29 +44,37 @@ module.exports = {
    * @return {string}
    */
   literalRepresentation: function (value, indentation) {
-    var join = indentation === undefined ? ', ' : ',\n   ' + this.blankString(indentation)
+    const join = indentation === undefined ? ', ' : `,\n   ${this.blankString(indentation)}`;
 
     switch (Object.prototype.toString.call(value)) {
       case '[object Number]':
-        return '@' + value
-      case '[object Array]':
-        var valuesRepresentation = value.map(function (v) {
-          return this.literalRepresentation(v)
-        }.bind(this))
-        return '@[ ' + valuesRepresentation.join(join) + ' ]'
-      case '[object Object]':
-        var keyValuePairs = []
-        for (var k in value) {
-          keyValuePairs.push(util.format('@"%s": %s', k, this.literalRepresentation(value[k])))
-        }
-        return '@{ ' + keyValuePairs.join(join) + ' }'
+        return `@${value}`;
+
+      case '[object Array]': {
+        const valuesRepresentation = value.map(
+          function (v) {
+            return this.literalRepresentation(v);
+          }.bind(this)
+        );
+        return `@[ ${valuesRepresentation.join(join)} ]`;
+      }
+
+      case '[object Object]': {
+        const keyValuePairs = [];
+        Object.keys(value).forEach(k => {
+          keyValuePairs.push(format('@"%s": %s', k, this.literalRepresentation(value[k])));
+        });
+        return `@{ ${keyValuePairs.join(join)} }`;
+      }
+
       case '[object Boolean]':
-        return value ? '@YES' : '@NO'
+        return value ? '@YES' : '@NO';
+
       default:
         if (value === null || value === undefined) {
-          return ''
+          return '';
         }
-        return '@"' + value.toString().replace(/"/g, '\\"') + '"'
+        return `@"${value.toString().replace(/"/g, '\\"')}"`;
     }
-  }
-}
+  },
+};

package/src/targets/objc/index.js

@@ -1,12 +1,10 @@
-'use strict'
-
 module.exports = {
   info: {
     key: 'objc',
     title: 'Objective-C',
     extname: '.m',
-    default: 'nsurlsession'
+    default: 'nsurlsession',
   },
 
-  nsurlsession: require('./nsurlsession')
-}
+  nsurlsession: require('./nsurlsession'),
+};