Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/targets/node/fetch.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,15 @@ module.exports = function (source, options) {

switch (source.postData.mimeType) {
case 'application/x-www-form-urlencoded':
reqOpts.body = source.postData.paramsObj
code.unshift('const { URLSearchParams } = require(\'url\');')
code.push('const encodedParams = new URLSearchParams();')
code.blank()

source.postData.params.forEach(function (param) {
code.push('encodedParams.set(\'' + param.name + '\', \'' + param.value + '\');')
})

reqOpts.body = 'encodedParams'
break

case 'application/json':
Expand All @@ -49,15 +57,16 @@ module.exports = function (source, options) {
case 'multipart/form-data':
code.unshift('const FormData = require(\'form-data\');')
code.push('const formData = new FormData();')
code.blank()

source.postData.params.forEach(function (param) {
if (!param.fileName && !param.fileName && !param.contentType) {
code.push('formData.append(\'' + param.name + '\',\'' + param.value + '\');')
code.push('formData.append(\'' + param.name + '\', \'' + param.value + '\');')
return
}

if (param.fileName) {
includeFS = true
code.blank()
code.push('formData.append(\'' + param.name + '\', fs.createReadStream(\'' + param.fileName + '\'));')
}
})
Expand Down Expand Up @@ -100,7 +109,9 @@ module.exports = function (source, options) {
.push(1, '.then(json => console.log(json))')
.push(1, '.catch(err => console.error(\'error:\' + err));')

return code.join().replace(/"fs\.createReadStream\(\\"(.+)\\"\)"/, 'fs.createReadStream("$1")')
return code.join()
.replace(/'encodedParams'/, 'encodedParams')
.replace(/"fs\.createReadStream\(\\"(.+)\\"\)"/, 'fs.createReadStream("$1")')
}

module.exports.info = {
Expand Down
7 changes: 6 additions & 1 deletion test/fixtures/output/node/fetch/application-form-encoded.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
const { URLSearchParams } = require('url');
const fetch = require('node-fetch');
const encodedParams = new URLSearchParams();

encodedParams.set('foo', 'bar');
encodedParams.set('hello', 'world');

let url = 'http://mockbin.com/har';

let options = {
method: 'POST',
headers: {'content-type': 'application/x-www-form-urlencoded'},
body: {foo: 'bar', hello: 'world'}
body: encodedParams
};

fetch(url, options)
Expand Down
6 changes: 5 additions & 1 deletion test/fixtures/output/node/fetch/full.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
const { URLSearchParams } = require('url');
const fetch = require('node-fetch');
const encodedParams = new URLSearchParams();

encodedParams.set('foo', 'bar');

let url = 'http://mockbin.com/har';

Expand All @@ -10,7 +14,7 @@ let options = {
'content-type': 'application/x-www-form-urlencoded',
cookie: 'foo=bar; bar=baz; '
},
body: {foo: 'bar'}
body: encodedParams
};

fetch(url, options)
Expand Down
3 changes: 2 additions & 1 deletion test/fixtures/output/node/fetch/multipart-form-data.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
const FormData = require('form-data');
const fetch = require('node-fetch');
const formData = new FormData();
formData.append('foo','bar');

formData.append('foo', 'bar');

let url = 'http://mockbin.com/har';

Expand Down