Skip to content

Commit

Permalink
Merge pull request #15 from cdeutsch/sync-query-string-v6.13.1
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:sindresorhus/query-string
  • Loading branch information
cdeutsch authored Jun 17, 2020
2 parents 57f4744 + 9150771 commit 41d233e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,9 @@ exports.stringifyUrl = function (input, options) {
}, options);
var url = removeHash(input.url).split('?')[0] || '';
var queryFromUrl = exports.extract(input.url);
var parsedQueryFromUrl = exports.parse(queryFromUrl);
var parsedQueryFromUrl = exports.parse(queryFromUrl, {
sort: false
});
var query = Object.assign(parsedQueryFromUrl, input.query);
var queryString = exports.stringify(query, options);

Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ exports.stringifyUrl = (input, options) => {

const url = removeHash(input.url).split('?')[0] || '';
const queryFromUrl = exports.extract(input.url);
const parsedQueryFromUrl = exports.parse(queryFromUrl);
const parsedQueryFromUrl = exports.parse(queryFromUrl, {sort: false});

const query = Object.assign(parsedQueryFromUrl, input.query);
let queryString = exports.stringify(query, options);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "query-string-for-all",
"version": "6.13.0",
"version": "6.13.1",
"description": "Parse and stringify URL query strings",
"license": "MIT",
"repository": "cdeutsch/query-string-for-all",
Expand Down
4 changes: 4 additions & 0 deletions test/stringify-url.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,7 @@ test('stringify URL from the result of `parseUrl` with query string that contain
const parsedUrl = queryString.parseUrl(url);
t.deepEqual(queryString.stringifyUrl(parsedUrl, {encode: false}), url);
});

test('stringify URL without sorting existing query params', t => {
t.deepEqual(queryString.stringifyUrl({url: 'https://foo.bar?C=3&A=1', query: {D: 4, B: 2}}, {sort: false}), 'https://foo.bar?C=3&A=1&D=4&B=2');
});

0 comments on commit 41d233e

Please sign in to comment.