query-string 6.8.2 → 6.8.3

package/index.d.ts

@@ -53,11 +53,11 @@ export interface ParseOptions {
 	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'}
 	```
 
 	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;
@@ -185,10 +185,10 @@ export interface StringifyOptions {
 	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'
 
 	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;

package/index.js

@@ -171,6 +171,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,
@@ -201,14 +211,18 @@ function parse(input, options) {
 		// 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "query-string",
-	"version": "6.8.2",
+	"version": "6.8.3",
 	"description": "Parse and stringify URL query strings",
 	"license": "MIT",
 	"repository": "sindresorhus/query-string",