Fix using the parseNumbers and parseBooleans options together (#187)

felixoi · sindresorhus · commit 90eb40e46af7 · 2019-06-21T20:11:00.000+07:00
diff --git a/index.js b/index.js
@@ -204,9 +204,7 @@ function parse(input, options) {
 
 		if (options.parseNumbers && !Number.isNaN(Number(value))) {
 			value = Number(value);
-		}
-
-		if (options.parseBooleans && value !== null && (value.toLowerCase() === 'true' || value.toLowerCase() === 'false')) {
+		} else if (options.parseBooleans && value !== null && (value.toLowerCase() === 'true' || value.toLowerCase() === 'false')) {
 			value = value.toLowerCase() === 'true';
 		}
 
diff --git a/test/parse.js b/test/parse.js
@@ -253,3 +253,8 @@ test('boolean value returns as boolean if option is set', t => {
 	t.deepEqual(queryString.parse('foo=true', {parseBooleans: true}), {foo: true});
 	t.deepEqual(queryString.parse('foo=false&bar=true', {parseBooleans: true}), {foo: false, bar: true});
 });
+
+test('boolean value returns as boolean and number value as number if both options are set', t => {
+	t.deepEqual(queryString.parse('foo=true&bar=1.12', {parseNumbers: true, parseBooleans: true}), {foo: true, bar: 1.12});
+	t.deepEqual(queryString.parse('foo=16.32&bar=false', {parseNumbers: true, parseBooleans: true}), {foo: 16.32, bar: false});
+});

Original file line number	Diff line number	Diff line change
`@@ -204,9 +204,7 @@ function parse(input, options) {`
`204`	`204`
`205`	`205`	`if (options.parseNumbers && !Number.isNaN(Number(value))) {`
`206`	`206`	`value = Number(value);`
`207`		`- }`
`208`		`-`
`209`		`- if (options.parseBooleans && value !== null && (value.toLowerCase() === 'true' \|\| value.toLowerCase() === 'false')) {`
	`207`	`+ } else if (options.parseBooleans && value !== null && (value.toLowerCase() === 'true' \|\| value.toLowerCase() === 'false')) {`
`210`	`208`	`value = value.toLowerCase() === 'true';`
`211`	`209`	`}`
`212`	`210`