postman-code-generators - npm Package Compare versions

Comparing version 0.0.13 to 0.1.0

codegens/curl/lib/index.js

@@ -54,6 +54,9 @@ var sanitize = require('./util').sanitize,
     }
-    headersData = request.getHeaders({ enabled: true });
-    _.forEach(headersData, function (value, key) {
-      snippet += indent + `${form('-H', format)} '${sanitize(key, true)}: ${sanitize(value)}'`;
-    });
+    headersData = request.toJSON().header;
+    if (headersData) {
+      headersData = _.reject(headersData, 'disabled');
+      _.forEach(headersData, (header) => {
+        snippet += indent + `${form('-H', format)} '${sanitize(header.key, true)}: ${sanitize(header.value)}'`;
+      });
+    }
 
@@ -60,0 +63,0 @@ if (request.body) {

codegens/golang/lib/index.js

@@ -120,4 +120,5 @@ var _ = require('./lodash'),
   if (!_.isEmpty(headers)) {
-    _.forEach(headers, function (value, key) {
-      headerSnippet += `${indent}req.Header.Add("${sanitize(key, true)}", "${sanitize(value)}")\n`;
+    headers = _.reject(headers, 'disabled');
+    _.forEach(headers, function (header) {
+      headerSnippet += `${indent}req.Header.Add("${sanitize(header.key, true)}", "${sanitize(header.value)}")\n`;
     });
@@ -202,3 +203,3 @@ }
     }
-    headerSnippet = parseHeaders(request.getHeaders({enabled: true}), indent);
+    headerSnippet = parseHeaders(request.toJSON().header, indent);
     if (headerSnippet !== '') {
@@ -205,0 +206,0 @@ codeSnippet += headerSnippet + '\n';

codegens/java-okhttp/lib/parseRequest.js

@@ -97,9 +97,10 @@
 function parseHeader (request, indentString) {
-  var headerObject = request.getHeaders({enabled: true}),
+  var headerArray = request.toJSON().header,
     headerSnippet = '';
 
-  if (!_.isEmpty(headerObject)) {
-    headerSnippet += _.reduce(Object.keys(headerObject), function (accumalator, key) {
-      accumalator += indentString + `.addHeader("${sanitize(key, true)}", ` +
-                           `"${sanitize(headerObject[key])}")\n`;
+  if (!_.isEmpty(headerArray)) {
+    headerArray = _.reject(headerArray, 'disabled');
+    headerSnippet += _.reduce(headerArray, function (accumalator, header) {
+      accumalator += indentString + `.addHeader("${sanitize(header.key, true)}", ` +
+        `"${sanitize(header.value)}")\n`;
       return accumalator;
@@ -106,0 +107,0 @@ }, '');

codegens/java-unirest/lib/parseRequest.js

@@ -88,3 +88,7 @@ var _ = require('./lodash'),
       case 'formdata':
-        return parseFormData(request.body.toJSON(), indentString, trimField);
+        var formDataContent = parseFormData(request.body.toJSON(), indentString, trimField);
+        if (!formDataContent.includes('.field("file", new File')) {
+          formDataContent = indentString + '.multiPartContent()' + formDataContent;
+        }
+        return formDataContent;
       case 'file':
@@ -107,7 +111,8 @@ return indentString + '.body("<file contents here>")\n';
 function parseHeader (request, indentString) {
-  var headerObject = request.getHeaders({enabled: true}),
+  var headerArray = request.toJSON().header,
     headerSnippet = '';
-  if (!_.isEmpty(headerObject)) {
-    headerSnippet += Object.keys(headerObject).reduce(function (accumlator, key) {
-      accumlator += indentString + `.header("${sanitize(key, true)}", "${sanitize(headerObject[key])}")\n`;
+  if (!_.isEmpty(headerArray)) {
+    headerArray = _.reject(headerArray, 'disabled');
+    headerSnippet += headerArray.reduce(function (accumlator, header) {
+      accumlator += indentString + `.header("${sanitize(header.key, true)}", "${sanitize(header.value)}")\n`;
       return accumlator;
@@ -114,0 +119,0 @@ }, '');

codegens/js-fetch/lib/index.js

@@ -113,4 +113,5 @@ var _ = require('./lodash'),
     headerSnippet = 'var myHeaders = new Headers();\n';
-    _.forEach(headers, function (value, key) {
-      headerSnippet += `myHeaders.append("${sanitize(key, true)}", "${sanitize(value)}");\n`;
+    headers = _.reject(headers, 'disabled');
+    _.forEach(headers, function (header) {
+      headerSnippet += `myHeaders.append("${sanitize(header.key, true)}", "${sanitize(header.value)}");\n`;
     });
@@ -200,3 +201,3 @@ }
 
-  headers = request.getHeaders({enabled: true});
+  headers = request.toJSON().header;
   headerSnippet = parseHeaders(headers);
@@ -203,0 +204,0 @@

codegens/js-jquery/lib/js-jquery.js

@@ -16,9 +16,10 @@ var _ = require('./lodash'),
 function getHeaders (request, indent) {
-  var header = request.getHeaders({enabled: true}),
+  var headerArray = request.toJSON().header,
     headerMap;
 
-  if (!_.isEmpty(header)) {
-    headerMap = _.map(Object.keys(header), function (key) {
-      return `${indent.repeat(2)}"${sanitize(key, 'header', true)}": ` +
-          `"${sanitize(header[key], 'header')}"`;
+  if (!_.isEmpty(headerArray)) {
+    headerArray = _.reject(headerArray, 'disabled');
+    headerMap = _.map(headerArray, function (header) {
+      return `${indent.repeat(2)}"${sanitize(header.key, 'header', true)}": ` +
+          `"${sanitize(header.value, 'header')}"`;
     });
@@ -25,0 +26,0 @@ return `${indent}"headers": {\n${headerMap.join(',\n')}\n${indent}},\n`;

codegens/js-xhr/lib/index.js

@@ -106,4 +106,5 @@ var _ = require('./lodash'),
   if (!_.isEmpty(headers)) {
-    _.forEach(headers, function (value, key) {
-      headerSnippet += `xhr.setRequestHeader("${sanitize(key, true)}", "${sanitize(value)}");\n`;
+    headers = _.reject(headers, 'disabled');
+    _.forEach(headers, function (header) {
+      headerSnippet += `xhr.setRequestHeader("${sanitize(header.key, true)}", "${sanitize(header.value)}");\n`;
     });
@@ -196,3 +197,3 @@ }
 
-  headerSnippet = parseHeaders(request.getHeaders({enabled: true}));
+  headerSnippet = parseHeaders(request.toJSON().header);
 
@@ -199,0 +200,0 @@ codeSnippet += headerSnippet + '\n';

codegens/libcurl/lib/index.js

@@ -50,3 +50,2 @@ var sanitize = require('./util').sanitize,
     snippet += indentString + 'struct curl_slist *headers = NULL;\n';
-    headersData = request.getHeaders({ enabled: true });
     if (request.body && request.body.mode === 'file' && !request.headers.has('Content-Type')) {
@@ -58,5 +57,10 @@ request.addHeader({
     }
-    _.forEach(headersData, function (value, key) {
-      snippet += indentString + `headers = curl_slist_append(headers, "${sanitize(key, true)}: ${sanitize(value)}");\n`;
-    });
+    headersData = request.toJSON().header;
+    if (headersData) {
+      headersData = _.reject(headersData, 'disabled');
+      _.forEach(headersData, function (header) {
+        snippet += indentString + `headers = curl_slist_append(headers, "${sanitize(header.key, true)}:` +
+      ` ${sanitize(header.value)}");\n`;
+      });
+    }
     body = request.body ? request.body.toJSON() : {};
@@ -63,0 +67,0 @@ if (body.mode && body.mode === 'formdata' && !options.useMimeType) {

codegens/nodejs-native/lib/parseRequest.js

@@ -106,5 +106,16 @@ const _ = require('./lodash'),
     headerSnippet += _.reduce(Object.keys(headerObject), function (accumalator, key) {
-      accumalator.push(
-        indentString.repeat(2) + `'${sanitize(key, true)}': '${sanitize(headerObject[key])}'`
-      );
+      if (Array.isArray(headerObject[key])) {
+        var headerValues = [];
+        _.forEach(headerObject[key], (value) => {
+          headerValues.push(`'${sanitize(value)}'`);
+        });
+        accumalator.push(
+          indentString.repeat(2) + `'${sanitize(key, true)}': [${headerValues.join(', ')}]`
+        );
+      }
+      else {
+        accumalator.push(
+          indentString.repeat(2) + `'${sanitize(key, true)}': '${sanitize(headerObject[key])}'`
+        );
+      }
       return accumalator;
@@ -111,0 +122,0 @@ }, []).join(',\n');

codegens/nodejs-request/lib/parseRequest.js

@@ -103,5 +103,16 @@ var _ = require('./lodash'),
     headerSnippet += _.reduce(Object.keys(headerObject), function (accumalator, key) {
-      accumalator.push(
-        indentString.repeat(2) + `'${sanitize(key, true)}': '${sanitize(headerObject[key])}'`
-      );
+      if (Array.isArray(headerObject[key])) {
+        var headerValues = [];
+        _.forEach(headerObject[key], (value) => {
+          headerValues.push(`'${sanitize(value)}'`);
+        });
+        accumalator.push(
+          indentString.repeat(2) + `'${sanitize(key, true)}': [${headerValues.join(', ')}]`
+        );
+      }
+      else {
+        accumalator.push(
+          indentString.repeat(2) + `'${sanitize(key, true)}': '${sanitize(headerObject[key])}'`
+        );
+      }
       return accumalator;
@@ -108,0 +119,0 @@ }, []).join(',\n') + '\n';

codegens/nodejs-unirest/lib/parseRequest.js

@@ -92,3 +92,16 @@ var _ = require('./lodash'),
     headerSnippet += _.reduce(Object.keys(headerObject), function (accumalator, key) {
-      accumalator.push(indentString.repeat(2) + `'${sanitize(key, true)}': '${sanitize(headerObject[key])}'`);
+      if (Array.isArray(headerObject[key])) {
+        var headerValues = [];
+        _.forEach(headerObject[key], (value) => {
+          headerValues.push(`'${sanitize(value)}'`);
+        });
+        accumalator.push(
+          indentString.repeat(2) + `'${sanitize(key, true)}': [${headerValues.join(', ')}]`
+        );
+      }
+      else {
+        accumalator.push(
+          indentString.repeat(2) + `'${sanitize(key, true)}': '${sanitize(headerObject[key])}'`
+        );
+      }
       return accumalator;
@@ -95,0 +108,0 @@ }, []).join(',\n') + '\n';

codegens/ocaml-cohttp/lib/ocaml.js

@@ -151,6 +151,7 @@ var _ = require('./lodash'),
   if (!_.isEmpty(headers)) {
+    headers = _.reject(headers, 'disabled');
     headerSnippet += `${indent}let headers = Header.init ()\n`;
-    _.forEach(headers, function (value, key) {
-      headerSnippet += `${indent.repeat(2)}|> fun h -> Header.add h "${sanitize(key, 'header', true)}" `;
-      headerSnippet += `"${sanitize(value, 'header')}"\n`;
+    _.forEach(headers, function (header) {
+      headerSnippet += `${indent.repeat(2)}|> fun h -> Header.add h "${sanitize(header.key, 'header', true)}" `;
+      headerSnippet += `"${sanitize(header.value, 'header')}"\n`;
     });
@@ -291,3 +292,3 @@ }
     }
-    headerSnippet += parseHeaders(requestBodyMode, request.getHeaders({enabled: true}), indent);
+    headerSnippet += parseHeaders(requestBodyMode, request.toJSON().header, indent);
     bodySnippet = parseBody(requestBody, trim, indent);
@@ -294,0 +295,0 @@

codegens/php-curl/lib/php-curl.js

@@ -15,9 +15,10 @@ var _ = require('./lodash'),
 function getHeaders (request, indentation) {
-  var headerObject = request.getHeaders({enabled: true}),
+  var headerArray = request.toJSON().header,
     headerMap;
 
-  if (!_.isEmpty(headerObject)) {
-    headerMap = _.map(Object.keys(headerObject), function (key) {
-      return `${indentation.repeat(2)}"${sanitize(key, 'header', true)}: ` +
-            `${sanitize(headerObject[key], 'header')}"`;
+  if (!_.isEmpty(headerArray)) {
+    headerArray = _.reject(headerArray, 'disabled');
+    headerMap = _.map(headerArray, function (header) {
+      return `${indentation.repeat(2)}"${sanitize(header.key, 'header', true)}: ` +
+            `${sanitize(header.value, 'header')}"`;
     });
@@ -24,0 +25,0 @@ return `${indentation}CURLOPT_HTTPHEADER => array(\n${headerMap.join(',\n')}\n${indentation}),\n`;

codegens/php-pecl-http/lib/phpPecl.js

@@ -15,9 +15,10 @@ var _ = require('./lodash'),
 function getHeaders (request, indentation) {
-  var headerObject = request.getHeaders({enabled: true}),
+  var headerArray = request.toJSON().header,
     headerMap;
 
-  if (!_.isEmpty(headerObject)) {
-    headerMap = _.map(Object.keys(headerObject), function (key) {
-      return `${indentation}'${sanitize(key, true)}' => ` +
-            `'${sanitize(headerObject[key])}'`;
+  if (!_.isEmpty(headerArray)) {
+    headerArray = _.reject(headerArray, 'disabled');
+    headerMap = _.map(headerArray, function (header) {
+      return `${indentation}'${sanitize(header.key, true)}' => ` +
+            `'${sanitize(header.value)}'`;
     });
@@ -24,0 +25,0 @@ return `$request->setHeaders(array(\n${headerMap.join(',\n')}\n));`;

codegens/powershell-restmethod/lib/index.js

@@ -125,5 +125,6 @@ var _ = require('./lodash'),
   if (!_.isEmpty(headers)) {
+    headers = _.reject(headers, 'disabled');
     headerSnippet = '$headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"\n';
-    _.forEach(headers, function (value, key) {
-      headerSnippet += `$headers.Add("${sanitize(key, true)}", "${sanitize(value)}")\n`;
+    _.forEach(headers, function (header) {
+      headerSnippet += `$headers.Add("${sanitize(header.key, true)}", "${sanitize(header.value)}")\n`;
     });
@@ -197,3 +198,3 @@ }
 
-  headers = request.getHeaders({enabled: true});
+  headers = request.toJSON().header;
   headerSnippet = parseHeaders(headers);
@@ -200,0 +201,0 @@

codegens/python-http.client/lib/python-httpclient.js

@@ -15,10 +15,11 @@ var _ = require('./lodash'),
 function getheaders (request, indentation) {
-  var headerObject = request.getHeaders({enabled: true}),
+  var headerArray = request.toJSON().header,
     requestBodyMode = (request.body ? request.body.mode : 'raw'),
     headerMap;
 
-  if (!_.isEmpty(headerObject)) {
-    headerMap = _.map(Object.keys(headerObject), function (key) {
-      return `${indentation}'${sanitize(key, 'header', true)}': ` +
-            `'${sanitize(headerObject[key], 'header')}'`;
+  if (!_.isEmpty(headerArray)) {
+    headerArray = _.reject(headerArray, 'disabled');
+    headerMap = _.map(headerArray, function (header) {
+      return `${indentation}'${sanitize(header.key, 'header', true)}': ` +
+            `'${sanitize(header.value, 'header')}'`;
     });
@@ -25,0 +26,0 @@ if (requestBodyMode === 'formdata') {

codegens/python-requests/lib/python-requests.js

@@ -15,9 +15,10 @@ var _ = require('./lodash'),
 function getheaders (request, indentation) {
-  var headerObject = request.getHeaders({enabled: true}),
+  var headerArray = request.toJSON().header,
     headerMap;
 
-  if (!_.isEmpty(headerObject)) {
-    headerMap = _.map(Object.keys(headerObject), function (key) {
-      return `${indentation}'${sanitize(key, 'header', true)}': ` +
-            `'${sanitize(headerObject[key], 'header')}'`;
+  if (!_.isEmpty(headerArray)) {
+    headerArray = _.reject(headerArray, 'disabled');
+    headerMap = _.map(headerArray, function (header) {
+      return `${indentation}'${sanitize(header.key, 'header', true)}': ` +
+            `'${sanitize(header.value, 'header')}'`;
     });
@@ -24,0 +25,0 @@ return `headers = {\n${headerMap.join(',\n')}\n}\n`;

codegens/ruby/lib/ruby.js

@@ -17,3 +17,12 @@ var _ = require('./lodash'),
     _.forEach(headers, function (value, key) {
-      headerSnippet += `request["${sanitize(key, 'header', true)}"] = "${sanitize(value, 'header')}"\n`;
+      if (Array.isArray(value)) {
+        var headerValues = [];
+        _.forEach(value, (singleValue) => {
+          headerValues.push(`"${sanitize(singleValue, 'header')}"`);
+        });
+        headerSnippet += `request["${sanitize(key, 'header', true)}"] = [${headerValues.join(', ')}]\n`;
+      }
+      else {
+        headerSnippet += `request["${sanitize(key, 'header', true)}"] = "${sanitize(value, 'header')}"\n`;
+      }
     });
@@ -20,0 +29,0 @@ }

codegens/shell-wget/lib/shell-wget.js

@@ -15,9 +15,10 @@ var _ = require('./lodash'),
 function getHeaders (request, indentation) {
-  var headerObject = request.getHeaders({enabled: true}),
+  var headerArray = request.toJSON().header,
     headerMap;
 
-  if (!_.isEmpty(headerObject)) {
-    headerMap = _.map(Object.keys(headerObject), function (key) {
-      return `${indentation}--header '${sanitize(key, 'header', true)}: ` +
-            `${sanitize(headerObject[key], 'header')}' \\`;
+  if (!_.isEmpty(headerArray)) {
+    headerArray = _.reject(headerArray, 'disabled');
+    headerMap = _.map(headerArray, function (header) {
+      return `${indentation}--header '${sanitize(header.key, 'header', true)}: ` +
+            `${sanitize(header.value, 'header')}' \\`;
     });
@@ -24,0 +25,0 @@ return headerMap.join('\n');

codegens/swift/lib/swift.js

@@ -155,5 +155,6 @@ var _ = require('./lodash'),
   if (!_.isEmpty(headers)) {
-    _.forEach(headers, function (value, key) {
-      headerSnippet += `request.addValue("${sanitize(value, 'header')}", `;
-      headerSnippet += `forHTTPHeaderField: "${sanitize(key, 'header', true)}")\n`;
+    headers = _.reject(headers, 'disabled');
+    _.forEach(headers, function (header) {
+      headerSnippet += `request.addValue("${sanitize(header.value, 'header')}", `;
+      headerSnippet += `forHTTPHeaderField: "${sanitize(header.key, 'header', true)}")\n`;
     });
@@ -272,3 +273,3 @@ }
     }
-    headerSnippet = parseHeaders(request.getHeaders({ enabled: true }), (request.body ? request.body.mode : 'raw'));
+    headerSnippet = parseHeaders(request.toJSON().header, (request.body ? request.body.mode : 'raw'));
     if (headerSnippet !== '') {
@@ -275,0 +276,0 @@ codeSnippet += headerSnippet + '\n';

package.json

 {
   "name": "postman-code-generators",
-  "version": "0.0.13",
+  "version": "0.1.0",
   "description": "Generates code snippets for a postman collection",
@@ -49,3 +49,3 @@ "main": "index.js",
     "mocha": "5.0.3",
-    "newman": "4.5.4",
+    "newman": "4.5.5",
     "nyc": "14.1.1",
@@ -52,0 +52,0 @@ "parse-gitignore": "1.0.1",

No alert changes

Improved metrics

Total package byte prevSize

3588064

increased by0.06%

Lines of code

26733

increased by0.26%

No dependency changes