query-string 6.8.2 → 6.10.1

package/index.d.ts

@@ -12,6 +12,8 @@ export interface ParseOptions {
 	- `bracket`: Parse arrays with bracket representation:
 
 		```
+		import queryString = require('query-string');
+
 		queryString.parse('foo[]=1&foo[]=2&foo[]=3', {arrayFormat: 'bracket'});
 		//=> {foo: ['1', '2', '3']}
 		```
@@ -19,6 +21,8 @@ export interface ParseOptions {
 	- `index`: Parse arrays with index representation:
 
 		```
+		import queryString = require('query-string');
+
 		queryString.parse('foo[0]=1&foo[1]=2&foo[3]=3', {arrayFormat: 'index'});
 		//=> {foo: ['1', '2', '3']}
 		```
@@ -26,6 +30,8 @@ export interface ParseOptions {
 	- `comma`: Parse arrays with elements separated by comma:
 
 		```
+		import queryString = require('query-string');
+
 		queryString.parse('foo=1,2,3', {arrayFormat: 'comma'});
 		//=> {foo: ['1', '2', '3']}
 		```
@@ -33,6 +39,8 @@ export interface ParseOptions {
 	- `none`: Parse arrays with elements using duplicate keys:
 
 		```
+		import queryString = require('query-string');
+
 		queryString.parse('foo=1&foo=2&foo=3');
 		//=> {foo: ['1', '2', '3']}
 		```
@@ -48,16 +56,22 @@ export interface ParseOptions {
 
 	@example
 	```
+	import queryString = require('query-string');
+
 	const order = ['c', 'a', 'b'];
 
 	queryString.parse('?a=one&b=two&c=three', {
 		sort: (itemLeft, itemRight) => order.indexOf(itemLeft) - order.indexOf(itemRight)
 	});
-	// => {c: 'three', a: 'one', b: 'two'}
+	//=> {c: 'three', a: 'one', b: 'two'}
+	```
+
+	@example
 	```
+	import queryString = require('query-string');
 
 	queryString.parse('?a=one&c=three&b=two', {sort: false});
-	// => {a: 'one', c: 'three', b: 'two'}
+	//=> {a: 'one', c: 'three', b: 'two'}
 	```
 	*/
 	readonly sort?: ((itemLeft: string, itemRight: string) => number) | false;
@@ -68,7 +82,9 @@ export interface ParseOptions {
 	@default false
 
 	@example
-	```js
+	```
+	import queryString = require('query-string');
+
 	queryString.parse('foo=1', {parseNumbers: true});
 	//=> {foo: 1}
 	```
@@ -82,6 +98,8 @@ export interface ParseOptions {
 
 	@example
 	```
+	import queryString = require('query-string');
+
 	queryString.parse('foo=true', {parseBooleans: true});
 	//=> {foo: true}
 	```
@@ -117,6 +135,8 @@ Extract the URL and the query string as an object.
 
 @example
 ```
+import queryString = require('query-string');
+
 queryString.parseUrl('https://foo.bar?foo=bar');
 //=> {url: 'https://foo.bar', query: {foo: 'bar'}}
 ```
@@ -144,6 +164,8 @@ export interface StringifyOptions {
 	- `bracket`: Serialize arrays using bracket representation:
 
 		```
+		import queryString = require('query-string');
+
 		queryString.stringify({foo: [1, 2, 3]}, {arrayFormat: 'bracket'});
 		//=> 'foo[]=1&foo[]=2&foo[]=3'
 		```
@@ -151,6 +173,8 @@ export interface StringifyOptions {
 	- `index`: Serialize arrays using index representation:
 
 		```
+		import queryString = require('query-string');
+
 		queryString.stringify({foo: [1, 2, 3]}, {arrayFormat: 'index'});
 		//=> 'foo[0]=1&foo[1]=2&foo[2]=3'
 		```
@@ -158,6 +182,8 @@ export interface StringifyOptions {
 	- `comma`: Serialize arrays by separating elements with comma:
 
 		```
+		import queryString = require('query-string');
+
 		queryString.stringify({foo: [1, 2, 3]}, {arrayFormat: 'comma'});
 		//=> 'foo=1,2,3'
 		```
@@ -165,6 +191,8 @@ export interface StringifyOptions {
 	- `none`: Serialize arrays by using duplicate keys:
 
 		```
+		import queryString = require('query-string');
+
 		queryString.stringify({foo: [1, 2, 3]});
 		//=> 'foo=1&foo=2&foo=3'
 		```
@@ -180,18 +208,49 @@ export interface StringifyOptions {
 
 	@example
 	```
+	import queryString = require('query-string');
+
 	const order = ['c', 'a', 'b'];
 
 	queryString.stringify({a: 1, b: 2, c: 3}, {
 		sort: (itemLeft, itemRight) => order.indexOf(itemLeft) - order.indexOf(itemRight)
 	});
-	// => 'c=3&a=1&b=2'
+	//=> 'c=3&a=1&b=2'
+	```
+
+	@example
+	```
+	import queryString = require('query-string');
 
 	queryString.stringify({b: 1, c: 2, a: 3}, {sort: false});
-	// => 'b=1&c=2&a=3'
+	//=> 'b=1&c=2&a=3'
 	```
 	*/
 	readonly sort?: ((itemLeft: string, itemRight: string) => number) | false;
+
+	/**
+	Skip keys with `null` as the value.
+
+	Note that keys with `undefined` as the value are always skipped.
+
+	@default false
+
+	@example
+	```
+	import queryString = require('query-string');
+
+	queryString.stringify({a: 1, b: undefined, c: null, d: 4}, {
+		skipNull: true
+	});
+	//=> 'a=1&d=4'
+
+	queryString.stringify({a: undefined, b: null}, {
+		skipNull: true
+	});
+	//=> ''
+	```
+	*/
+	readonly skipNull?: boolean;
 }
 
 /**
@@ -204,5 +263,26 @@ export function stringify(
 
 /**
 Extract a query string from a URL that can be passed into `.parse()`.
+
+Note: This behaviour can be changed with the `skipNull` option.
 */
 export function extract(url: string): string;
+
+/**
+Stringify an object into a URL with a query string and sorting the keys. The inverse of [`.parseUrl()`](https://github.com/sindresorhus/query-string#parseurlstring-options)
+
+Query items in the `query` property overrides queries in the `url` property.
+
+@example
+```
+queryString.stringifyUrl({url: 'https://foo.bar', query: {foo: 'bar'}});
+//=> 'https://foo.bar?foo=bar'
+
+queryString.stringifyUrl({url: 'https://foo.bar?foo=baz', query: {foo: 'bar'}});
+//=> 'https://foo.bar?foo=bar'
+```
+*/
+export function stringifyUrl(
+	object: ParsedUrl,
+	options?: StringifyOptions
+): string;

package/index.js

@@ -8,7 +8,7 @@ function encoderForArrayFormat(options) {
 		case 'index':
 			return key => (result, value) => {
 				const index = result.length;
-				if (value === undefined) {
+				if (value === undefined || (options.skipNull && value === null)) {
 					return result;
 				}
 
@@ -24,7 +24,7 @@ function encoderForArrayFormat(options) {
 
 		case 'bracket':
 			return key => (result, value) => {
-				if (value === undefined) {
+				if (value === undefined || (options.skipNull && value === null)) {
 					return result;
 				}
 
@@ -36,12 +36,12 @@ function encoderForArrayFormat(options) {
 			};
 
 		case 'comma':
-			return key => (result, value, index) => {
+			return key => (result, value) => {
 				if (value === null || value === undefined || value.length === 0) {
 					return result;
 				}
 
-				if (index === 0) {
+				if (result.length === 0) {
 					return [[encode(key, options), '=', encode(value, options)].join('')];
 				}
 
@@ -50,7 +50,7 @@ function encoderForArrayFormat(options) {
 
 		default:
 			return key => (result, value) => {
-				if (value === undefined) {
+				if (value === undefined || (options.skipNull && value === null)) {
 					return result;
 				}
 
@@ -161,6 +161,16 @@ function removeHash(input) {
 	return input;
 }
 
+function getHash(url) {
+	let hash = '';
+	const hashStart = url.indexOf('#');
+	if (hashStart !== -1) {
+		hash = url.slice(hashStart);
+	}
+
+	return hash;
+}
+
 function extract(input) {
 	input = removeHash(input);
 	const queryStart = input.indexOf('?');
@@ -171,6 +181,16 @@ function extract(input) {
 	return input.slice(queryStart + 1);
 }
 
+function parseValue(value, options) {
+	if (options.parseNumbers && !Number.isNaN(Number(value)) && (typeof value === 'string' && value.trim() !== '')) {
+		value = Number(value);
+	} else if (options.parseBooleans && value !== null && (value.toLowerCase() === 'true' || value.toLowerCase() === 'false')) {
+		value = value.toLowerCase() === 'true';
+	}
+
+	return value;
+}
+
 function parse(input, options) {
 	options = Object.assign({
 		decode: true,
@@ -196,19 +216,23 @@ function parse(input, options) {
 	}
 
 	for (const param of input.split('&')) {
-		let [key, value] = splitOnFirst(param.replace(/\+/g, ' '), '=');
+		let [key, value] = splitOnFirst(options.decode ? param.replace(/\+/g, ' ') : param, '=');
 
 		// Missing `=` should be `null`:
 		// http://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters
 		value = value === undefined ? null : decode(value, options);
+		formatter(decode(key, options), value, ret);
+	}
 
-		if (options.parseNumbers && !Number.isNaN(Number(value)) && (typeof value === 'string' && value.trim() !== '')) {
-			value = Number(value);
-		} else if (options.parseBooleans && value !== null && (value.toLowerCase() === 'true' || value.toLowerCase() === 'false')) {
-			value = value.toLowerCase() === 'true';
+	for (const key of Object.keys(ret)) {
+		const value = ret[key];
+		if (typeof value === 'object' && value !== null) {
+			for (const k of Object.keys(value)) {
+				value[k] = parseValue(value[k], options);
+			}
+		} else {
+			ret[key] = parseValue(value, options);
 		}
-
-		formatter(decode(key, options), value, ret);
 	}
 
 	if (options.sort === false) {
@@ -243,7 +267,17 @@ exports.stringify = (object, options) => {
 	}, options);
 
 	const formatter = encoderForArrayFormat(options);
-	const keys = Object.keys(object);
+
+	const objectCopy = Object.assign({}, object);
+	if (options.skipNull) {
+		for (const key of Object.keys(objectCopy)) {
+			if (objectCopy[key] === undefined || objectCopy[key] === null) {
+				delete objectCopy[key];
+			}
+		}
+	}
+
+	const keys = Object.keys(objectCopy);
 
 	if (options.sort !== false) {
 		keys.sort(options.sort);
@@ -276,3 +310,17 @@ exports.parseUrl = (input, options) => {
 		query: parse(extract(input), options)
 	};
 };
+
+exports.stringifyUrl = (input, options) => {
+	const url = removeHash(input.url).split('?')[0] || '';
+	const queryFromUrl = exports.extract(input.url);
+	const parsedQueryFromUrl = exports.parse(queryFromUrl);
+	const hash = getHash(input.url);
+	const query = Object.assign(parsedQueryFromUrl, input.query);
+	let queryString = exports.stringify(query, options);
+	if (queryString) {
+		queryString = `?${queryString}`;
+	}
+
+	return `${url}${queryString}${hash}`;
+};

package/package.json

@@ -1,9 +1,10 @@
 {
 	"name": "query-string",
-	"version": "6.8.2",
+	"version": "6.10.1",
 	"description": "Parse and stringify URL query strings",
 	"license": "MIT",
 	"repository": "sindresorhus/query-string",
+	"funding": "https://github.com/sponsors/sindresorhus",
 	"author": {
 		"name": "Sindre Sorhus",
 		"email": "sindresorhus@gmail.com",

package/readme.md

@@ -2,6 +2,34 @@
 
 > Parse and stringify URL [query strings](https://en.wikipedia.org/wiki/Query_string)
 
+<br>
+
+---
+
+<div align="center">
+	<p>
+		<p>
+			<sup>
+				<a href="https://github.com/sponsors/sindresorhus">My open source work is supported by the community</a>
+			</sup>
+		</p>
+		<sup>Special thanks to:</sup>
+		<br>
+		<br>
+		<a href="https://github.com/botpress/botpress">
+			<img src="https://sindresorhus.com/assets/thanks/botpress-logo.svg" width="260" alt="Botpress">
+		</a>
+		<br>
+		<sub><b>Botpress is an open-source conversational assistant creation platform.</b></sub>
+		<br>
+		<sub>They <a href="https://github.com/botpress/botpress/blob/master/.github/CONTRIBUTING.md">welcome contributions</a> from anyone, whether you're into machine learning,<br>want to get started in open-source, or just have an improvement idea.</sub>
+		<br>
+	</p>
+</div>
+
+---
+
+<br>
 
 ## Install
 
@@ -9,8 +37,7 @@
 $ npm install query-string
 ```
 
-This module targets Node.js 6 or later and the latest version of Chrome, Firefox, and Safari. If you want support for older browsers, or, [if your project is using create-react-app v1](https://github.com/sindresorhus/query-string/pull/148#issuecomment-399656020), use version 5: `npm install query-string@5`.
-
+This module targets Node.js 6 or later and the latest version of Chrome, Firefox, and Safari. If you want support for older browsers, or, if your project is using create-react-app v1, use version 5: `npm install query-string@5`.
 
 ## Usage
 
@@ -43,7 +70,6 @@ console.log(location.search);
 //=> '?foo=unicorn&ilike=pizza'
 ```
 
-
 ## API
 
 ### .parse(string, options?)
@@ -58,19 +84,21 @@ Type: `object`
 
 ##### decode
 
-Type: `boolean`<br>
+Type: `boolean`\
 Default: `true`
 
 Decode the keys and values. URL components are decoded with [`decode-uri-component`](https://github.com/SamVerschueren/decode-uri-component).
 
 ##### arrayFormat
 
-Type: `string`<br>
+Type: `string`\
 Default: `'none'`
 
 - `'bracket'`: Parse arrays with bracket representation:
 
 ```js
+const queryString = require('query-string');
+
 queryString.parse('foo[]=1&foo[]=2&foo[]=3', {arrayFormat: 'bracket'});
 //=> {foo: ['1', '2', '3']}
 ```
@@ -78,6 +106,8 @@ queryString.parse('foo[]=1&foo[]=2&foo[]=3', {arrayFormat: 'bracket'});
 - `'index'`: Parse arrays with index representation:
 
 ```js
+const queryString = require('query-string');
+
 queryString.parse('foo[0]=1&foo[1]=2&foo[3]=3', {arrayFormat: 'index'});
 //=> {foo: ['1', '2', '3']}
 ```
@@ -85,6 +115,8 @@ queryString.parse('foo[0]=1&foo[1]=2&foo[3]=3', {arrayFormat: 'index'});
 - `'comma'`: Parse arrays with elements separated by comma:
 
 ```js
+const queryString = require('query-string');
+
 queryString.parse('foo=1,2,3', {arrayFormat: 'comma'});
 //=> {foo: ['1', '2', '3']}
 ```
@@ -92,23 +124,27 @@ queryString.parse('foo=1,2,3', {arrayFormat: 'comma'});
 - `'none'`: Parse arrays with elements using duplicate keys:
 
 ```js
+const queryString = require('query-string');
+
 queryString.parse('foo=1&foo=2&foo=3');
 //=> {foo: ['1', '2', '3']}
 ```
 
 ##### sort
 
-Type: `Function | boolean`<br>
+Type: `Function | boolean`\
 Default: `true`
 
 Supports both `Function` as a custom sorting function or `false` to disable sorting.
 
 ##### parseNumbers
 
-Type: `boolean`<br>
+Type: `boolean`\
 Default: `false`
 
 ```js
+const queryString = require('query-string');
+
 queryString.parse('foo=1', {parseNumbers: true});
 //=> {foo: 1}
 ```
@@ -117,17 +153,19 @@ Parse the value as a number type instead of string type if it's a number.
 
 ##### parseBooleans
 
-Type: `boolean`<br>
+Type: `boolean`\
 Default: `false`
 
 ```js
+const queryString = require('query-string');
+
 queryString.parse('foo=true', {parseBooleans: true});
 //=> {foo: true}
 ```
 
 Parse the value as a boolean type instead of string type if it's a boolean.
 
-### .stringify(object, [options])
+### .stringify(object, options?)
 
 Stringify an object into a query string and sorting the keys.
 
@@ -137,26 +175,28 @@ Type: `object`
 
 ##### strict
 
-Type: `boolean`<br>
+Type: `boolean`\
 Default: `true`
 
 Strictly encode URI components with [strict-uri-encode](https://github.com/kevva/strict-uri-encode). It uses [encodeURIComponent](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent) if set to false. You probably [don't care](https://github.com/sindresorhus/query-string/issues/42) about this option.
 
 ##### encode
 
-Type: `boolean`<br>
+Type: `boolean`\
 Default: `true`
 
 [URL encode](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent) the keys and values.
 
 ##### arrayFormat
 
-Type: `string`<br>
+Type: `string`\
 Default: `'none'`
 
 - `'bracket'`: Serialize arrays using bracket representation:
 
 ```js
+const queryString = require('query-string');
+
 queryString.stringify({foo: [1, 2, 3]}, {arrayFormat: 'bracket'});
 //=> 'foo[]=1&foo[]=2&foo[]=3'
 ```
@@ -164,6 +204,8 @@ queryString.stringify({foo: [1, 2, 3]}, {arrayFormat: 'bracket'});
 - `'index'`: Serialize arrays using index representation:
 
 ```js
+const queryString = require('query-string');
+
 queryString.stringify({foo: [1, 2, 3]}, {arrayFormat: 'index'});
 //=> 'foo[0]=1&foo[1]=2&foo[2]=3'
 ```
@@ -171,6 +213,8 @@ queryString.stringify({foo: [1, 2, 3]}, {arrayFormat: 'index'});
 - `'comma'`: Serialize arrays by separating elements with comma:
 
 ```js
+const queryString = require('query-string');
+
 queryString.stringify({foo: [1, 2, 3]}, {arrayFormat: 'comma'});
 //=> 'foo=1,2,3'
 ```
@@ -178,6 +222,8 @@ queryString.stringify({foo: [1, 2, 3]}, {arrayFormat: 'comma'});
 - `'none'`: Serialize arrays by using duplicate keys:
 
 ```js
+const queryString = require('query-string');
+
 queryString.stringify({foo: [1, 2, 3]});
 //=> 'foo=1&foo=2&foo=3'
 ```
@@ -189,6 +235,8 @@ Type: `Function | boolean`
 Supports both `Function` as a custom sorting function or `false` to disable sorting.
 
 ```js
+const queryString = require('query-string');
+
 const order = ['c', 'a', 'b'];
 
 queryString.stringify({a: 1, b: 2, c: 3}, {
@@ -198,16 +246,47 @@ queryString.stringify({a: 1, b: 2, c: 3}, {
 ```
 
 ```js
+const queryString = require('query-string');
+
 queryString.stringify({b: 1, c: 2, a: 3}, {sort: false});
 //=> 'b=1&c=2&a=3'
 ```
 
 If omitted, keys are sorted using `Array#sort()`, which means, converting them to strings and comparing strings in Unicode code point order.
 
+##### skipNull
+
+Skip keys with `null` as the value.
+
+Note that keys with `undefined` as the value are always skipped.
+
+Type: `boolean`\
+Default: `false`
+
+```js
+const queryString = require('query-string');
+
+queryString.stringify({a: 1, b: undefined, c: null, d: 4}, {
+	skipNull: true
+});
+//=> 'a=1&d=4'
+```
+
+```js
+const queryString = require('query-string');
+
+queryString.stringify({a: undefined, b: null}, {
+	skipNull: true
+});
+//=> ''
+```
+
 ### .extract(string)
 
 Extract a query string from a URL that can be passed into `.parse()`.
 
+Note: This behaviour can be changed with the `skipNull` option.
+
 ### .parseUrl(string, options?)
 
 Extract the URL and the query string as an object.
@@ -217,10 +296,45 @@ The `options` are the same as for `.parse()`.
 Returns an object with a `url` and `query` property.
 
 ```js
+const queryString = require('query-string');
+
 queryString.parseUrl('https://foo.bar?foo=bar');
 //=> {url: 'https://foo.bar', query: {foo: 'bar'}}
 ```
 
+### .stringifyUrl(object, options?)
+
+Stringify an object into a URL with a query string and sorting the keys. The inverse of [`.parseUrl()`](https://github.com/sindresorhus/query-string#parseurlstring-options)
+
+The `options` are the same as for `.stringify()`.
+
+Returns a string with the URL and a query string.
+
+Query items in the `query` property overrides queries in the `url` property.
+
+```js
+queryString.stringifyUrl({url: 'https://foo.bar', query: {foo: 'bar'}});
+//=> 'https://foo.bar?foo=bar'
+
+queryString.stringifyUrl({url: 'https://foo.bar?foo=baz', query: {foo: 'bar'}});
+//=> 'https://foo.bar?foo=bar'
+```
+
+#### object
+
+Type: `object`
+
+##### url
+
+Type: `string`
+
+The URL to stringify.
+
+##### query
+
+Type: `object`
+
+Query items to add to the URL.
 
 ## Nesting
 
@@ -229,6 +343,8 @@ This module intentionally doesn't support nesting as it's not spec'd and varies
 You're much better off just converting the object to a JSON string:
 
 ```js
+const queryString = require('query-string');
+
 queryString.stringify({
 	foo: 'bar',
 	nested: JSON.stringify({
@@ -241,6 +357,8 @@ queryString.stringify({
 However, there is support for multiple instances of the same key:
 
 ```js
+const queryString = require('query-string');
+
 queryString.parse('likes=cake&name=bob&likes=icecream');
 //=> {likes: ['cake', 'icecream'], name: 'bob'}
 
@@ -248,12 +366,13 @@ queryString.stringify({color: ['taupe', 'chartreuse'], id: '515'});
 //=> 'color=taupe&color=chartreuse&id=515'
 ```
 
-
 ## Falsy values
 
 Sometimes you want to unset a key, or maybe just make it present without assigning a value to it. Here is how falsy values are stringified:
 
 ```js
+const queryString = require('query-string');
+
 queryString.stringify({foo: false});
 //=> 'foo=false'
 
@@ -264,15 +383,8 @@ queryString.stringify({foo: undefined});
 //=> ''
 ```
 
+## query-string for enterprise
 
----
+Available as part of the Tidelift Subscription.
 
-<div align="center">
-	<b>
-		<a href="https://tidelift.com/subscription/pkg/npm-query-string?utm_source=npm-query-string&utm_medium=referral&utm_campaign=readme">Get professional support for this package with a Tidelift subscription</a>
-	</b>
-	<br>
-	<sub>
-		Tidelift helps make open source sustainable for maintainers while giving companies<br>assurances about security, maintenance, and licensing for their dependencies.
-	</sub>
-</div>
+The maintainers of query-string and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/npm-query-string?utm_source=npm-query-string&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)